Merge commit '7825177de326a90aafad173c347a1a6adea16c3e' into haskell-updates
This commit is contained in:
@@ -32,5 +32,6 @@ urxvt.section.md
|
||||
vcpkg.section.md
|
||||
weechat.section.md
|
||||
xorg.section.md
|
||||
uv.section.md
|
||||
build-support.md
|
||||
```
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
# uv {#sec-uv}
|
||||
|
||||
`uv` is an extremely fast Python package installer and resolver, written in Rust.
|
||||
It manages project dependencies and environments, with support for lockfiles, workspaces, and more.
|
||||
|
||||
Due to `uv` being unaware that it is running on a NixOS system, by default, it will fetch dynamically-linked Python executables that will fail to run, as NixOS cannot run executables intended for generic Linux environments out of the box.
|
||||
To learn more on this, please visit
|
||||
https://nix.dev/guides/faq.html#how-to-run-non-nix-executables
|
||||
|
||||
There are two ways to mitigate this:
|
||||
|
||||
1. Provide `uv` with a statically-linked Python executable (ideally from `nixpkgs`) via the [`UV_PYTHON` environment variable](https://docs.astral.sh/uv/reference/environment/#uv_python). Alternatively, the `--python` flag can also be used, but this is easy to forget. It is also helpful to forbid `uv` from downloading any Python binaries via the [`UV_PYTHON_DOWNLOADS` environment variable](https://docs.astral.sh/uv/reference/environment/#uv_python_downloads) by setting it to `never`.
|
||||
These variables can be set in `shell.nix` and `.env` files, which can be redistributed with the project to ensure other NixOS machines can execute the project.
|
||||
|
||||
2. Add `programs.nix-ld.enable = true` to your NixOS config. While functional, the previous option is to be preferred, as this is the "works on my machine" option, because redistributing Python projects that use `uv` to another NixOS machine that does not have `nix-ld` enabled will cause the same errors to occur.
|
||||
|
||||
Additionally, there is the issue of modules from PyPI vendoring dynamically-linked libraries, such as `numpy`, which will also fail to work.
|
||||
This topic is not local to `uv`, but is deserving of documentation nonetheless.
|
||||
Setting `LD_LIBRARY_PATH` should be the solution of choice here. Either:
|
||||
|
||||
1. Use `lib.makeLibraryPath` to set `LD_LIBRARY_PATH` from a `shell.nix`, e.g. `LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.openssl pkgs.zlib pkgs.curl ]`
|
||||
2. (If you have already enabled `nix-ld`) set `LD_LIBRARY_PATH` to `NIX_LD_LIBRARY_PATH`. Be aware this is not a silver bullet solution, as this simply provides a list of commonly used libraries, as is shown in `nixos/modules/programs/nix-ld.nix`.
|
||||
@@ -4594,6 +4594,9 @@
|
||||
"sec-interop.cylonedx-fod": [
|
||||
"index.html#sec-interop.cylonedx-fod"
|
||||
],
|
||||
"sec-uv": [
|
||||
"index.html#sec-uv"
|
||||
],
|
||||
"module-system-module-argument-_prefix": [
|
||||
"index.html#module-system-module-argument-_prefix"
|
||||
],
|
||||
|
||||
@@ -893,6 +893,12 @@
|
||||
githubId = 4717906;
|
||||
name = "Jakub Skokan";
|
||||
};
|
||||
aiyion = {
|
||||
email = "git@aiyionpri.me";
|
||||
github = "AiyionPrime";
|
||||
githubId = 6937725;
|
||||
name = "Jan-Niklas Burfeind";
|
||||
};
|
||||
ajaxbits = {
|
||||
email = "contact@ajaxbits.com";
|
||||
github = "ajaxbits";
|
||||
|
||||
@@ -74,6 +74,8 @@
|
||||
|
||||
- [postfix-tlspol](https://github.com/Zuplu/postfix-tlspol), MTA-STS and DANE resolver and TLS policy server for Postfix. Available as [services.postfix-tlspol](#opt-services.postfix-tlspol.enable).
|
||||
|
||||
- [crowdsec](https://www.crowdsec.net/), a free, open-source and collaborative IPS. Available as [services.crowdsec](#opt-services.crowdsec.enable).
|
||||
|
||||
- [Newt](https://github.com/fosrl/newt), a fully user space WireGuard tunnel client and TCP/UDP proxy, designed to securely expose private resources controlled by Pangolin. Available as [services.newt](options.html#opt-services.newt.enable).
|
||||
|
||||
- [IfState](https://ifstate.net), manage host interface settings in a declarative manner. Available as [networking.ifstate](options.html#opt-networking.ifstate.enable) and [boot.initrd.network.ifstate](options.html#opt-boot.initrd.network.ifstate.enable).
|
||||
|
||||
@@ -81,6 +81,7 @@
|
||||
./hardware/keyboard/teck.nix
|
||||
./hardware/keyboard/uhk.nix
|
||||
./hardware/keyboard/zsa.nix
|
||||
./hardware/kryoflux.nix
|
||||
./hardware/ksm.nix
|
||||
./hardware/ledger.nix
|
||||
./hardware/libftdi.nix
|
||||
@@ -536,6 +537,7 @@
|
||||
./services/databases/postgresql.nix
|
||||
./services/databases/postgrest.nix
|
||||
./services/databases/redis.nix
|
||||
./services/databases/rethinkdb.nix
|
||||
./services/databases/surrealdb.nix
|
||||
./services/databases/tigerbeetle.nix
|
||||
./services/databases/victorialogs.nix
|
||||
@@ -1133,6 +1135,7 @@
|
||||
./services/networking/dnsproxy.nix
|
||||
./services/networking/doh-proxy-rust.nix
|
||||
./services/networking/doh-server.nix
|
||||
./services/networking/dsnet.nix
|
||||
./services/networking/easytier.nix
|
||||
./services/networking/ejabberd.nix
|
||||
./services/networking/envoy.nix
|
||||
@@ -1446,6 +1449,7 @@
|
||||
./services/security/certmgr.nix
|
||||
./services/security/cfssl.nix
|
||||
./services/security/clamav.nix
|
||||
./services/security/crowdsec.nix
|
||||
./services/security/e-imzo.nix
|
||||
./services/security/endlessh-go.nix
|
||||
./services/security/endlessh.nix
|
||||
|
||||
@@ -10,9 +10,6 @@ let
|
||||
|
||||
cfg = config.services.postgrey;
|
||||
|
||||
natural = with types; addCheck int (x: x >= 0);
|
||||
natural' = with types; addCheck int (x: x > 0);
|
||||
|
||||
socket =
|
||||
with types;
|
||||
addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? path || x ? port);
|
||||
@@ -127,17 +124,17 @@ in
|
||||
description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host";
|
||||
};
|
||||
delay = mkOption {
|
||||
type = natural;
|
||||
type = ints.unsigned;
|
||||
default = 300;
|
||||
description = "Greylist for N seconds";
|
||||
};
|
||||
maxAge = mkOption {
|
||||
type = natural;
|
||||
type = ints.unsigned;
|
||||
default = 35;
|
||||
description = "Delete entries from whitelist if they haven't been seen for N days";
|
||||
};
|
||||
retryWindow = mkOption {
|
||||
type = either str natural;
|
||||
type = either str ints.unsigned;
|
||||
default = 2;
|
||||
example = "12h";
|
||||
description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours";
|
||||
@@ -148,12 +145,12 @@ in
|
||||
description = "Strip the last N bits from IP addresses, determined by IPv4CIDR and IPv6CIDR";
|
||||
};
|
||||
IPv4CIDR = mkOption {
|
||||
type = natural;
|
||||
type = ints.unsigned;
|
||||
default = 24;
|
||||
description = "Strip N bits from IPv4 addresses if lookupBySubnet is true";
|
||||
};
|
||||
IPv6CIDR = mkOption {
|
||||
type = natural;
|
||||
type = ints.unsigned;
|
||||
default = 64;
|
||||
description = "Strip N bits from IPv6 addresses if lookupBySubnet is true";
|
||||
};
|
||||
@@ -163,7 +160,7 @@ in
|
||||
description = "Store data using one-way hash functions (SHA1)";
|
||||
};
|
||||
autoWhitelist = mkOption {
|
||||
type = nullOr natural';
|
||||
type = nullOr ints.positive;
|
||||
default = 5;
|
||||
description = "Whitelist clients after successful delivery of N messages";
|
||||
};
|
||||
|
||||
@@ -107,7 +107,7 @@ in
|
||||
};
|
||||
|
||||
mining.threads = lib.mkOption {
|
||||
type = lib.types.addCheck lib.types.int (x: x >= 0);
|
||||
type = lib.types.ints.unsigned;
|
||||
default = 0;
|
||||
description = ''
|
||||
Number of threads used for mining.
|
||||
@@ -174,7 +174,7 @@ in
|
||||
};
|
||||
|
||||
limits.threads = lib.mkOption {
|
||||
type = lib.types.addCheck lib.types.int (x: x >= 0);
|
||||
type = lib.types.ints.unsigned;
|
||||
default = 0;
|
||||
description = ''
|
||||
Maximum number of threads used for a parallel job.
|
||||
@@ -183,7 +183,7 @@ in
|
||||
};
|
||||
|
||||
limits.syncSize = lib.mkOption {
|
||||
type = lib.types.addCheck lib.types.int (x: x >= 0);
|
||||
type = lib.types.ints.unsigned;
|
||||
default = 0;
|
||||
description = ''
|
||||
Maximum number of blocks to sync at once.
|
||||
|
||||
@@ -42,7 +42,7 @@ let
|
||||
};
|
||||
|
||||
prefixLength = mkOption {
|
||||
type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));
|
||||
type = types.ints.between 0 (if v == 4 then 32 else 128);
|
||||
description = ''
|
||||
Subnet mask of the interface, specified as the number of
|
||||
bits in the prefix ("${if v == 4 then "24" else "64"}").
|
||||
|
||||
@@ -72,7 +72,7 @@ let
|
||||
};
|
||||
|
||||
prefixLength = mkOption {
|
||||
type = with types; nullOr (addCheck int (n: n >= 0 && n <= 128));
|
||||
type = with types; nullOr (ints.between 0 128);
|
||||
default = null;
|
||||
description = ''
|
||||
The prefix length of the subnet.
|
||||
@@ -227,7 +227,7 @@ in
|
||||
|
||||
debugLevel = mkOption {
|
||||
default = 0;
|
||||
type = types.addCheck types.int (l: l >= 0 && l <= 5);
|
||||
type = types.ints.between 0 5;
|
||||
description = ''
|
||||
The amount of debugging information to add to the log. 0 means little
|
||||
logging while 5 is the most logging. {command}`man tincd` for
|
||||
|
||||
@@ -170,6 +170,11 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
The set of parser specifications.
|
||||
|
||||
See <https://docs.crowdsec.net/docs/parsers/intro> for details.
|
||||
'';
|
||||
default = { };
|
||||
};
|
||||
postOverflows = lib.mkOption {
|
||||
@@ -198,6 +203,11 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
The set of Postoverflows specifications.
|
||||
|
||||
See <https://docs.crowdsec.net/docs/next/log_processor/parsers/intro#postoverflows> for details.
|
||||
'';
|
||||
default = { };
|
||||
};
|
||||
contexts = lib.mkOption {
|
||||
@@ -306,6 +316,9 @@ in
|
||||
};
|
||||
patterns = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
description = ''
|
||||
A list of files containing custom grok patterns.
|
||||
'';
|
||||
default = [ ];
|
||||
example = lib.literalExpression ''
|
||||
[ (pkgs.writeTextDir "custom_service_logs" (builtins.readFile ./custom_service_logs)) ]
|
||||
@@ -313,6 +326,9 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
The configuration for a crowdsec security engine.
|
||||
'';
|
||||
default = { };
|
||||
};
|
||||
|
||||
@@ -473,6 +489,9 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
description = ''
|
||||
Set of various configuration attributes
|
||||
'';
|
||||
};
|
||||
};
|
||||
config =
|
||||
|
||||
@@ -82,7 +82,7 @@ let
|
||||
};
|
||||
|
||||
prefixLength = mkOption {
|
||||
type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));
|
||||
type = types.ints.between 0 (if v == 4 then 32 else 128);
|
||||
description = ''
|
||||
Subnet mask of the interface, specified as the number of
|
||||
bits in the prefix (`${if v == 4 then "24" else "64"}`).
|
||||
@@ -99,7 +99,7 @@ let
|
||||
};
|
||||
|
||||
prefixLength = mkOption {
|
||||
type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128));
|
||||
type = types.ints.between 0 (if v == 4 then 32 else 128);
|
||||
description = ''
|
||||
Subnet mask of the network, specified as the number of
|
||||
bits in the prefix (`${if v == 4 then "24" else "64"}`).
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "gpsp";
|
||||
version = "0-unstable-2025-08-21";
|
||||
version = "0-unstable-2025-09-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "gpsp";
|
||||
rev = "143b0abb02a6ff501757674c9fdf47e0fcd7cbd3";
|
||||
hash = "sha256-XdcoM0hzVvuZZn7kXh1X8HSUGGEm/0Uqh7du7nx4sIE=";
|
||||
rev = "f7a6a4314697ea5e4821a15aa7110795679f6ade";
|
||||
hash = "sha256-g63KIeQUvCg9LbixeXF2JRgUEFlzBMctXV8IFqvR0sg=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame2003-plus";
|
||||
version = "0-unstable-2025-08-26";
|
||||
version = "0-unstable-2025-09-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame2003-plus-libretro";
|
||||
rev = "250d22b0cba0f145c7b958821fa7d1f839f4a37b";
|
||||
hash = "sha256-jonFTHNuO7w2gypPyjx6DML8vNBIa+9Ur9Fa48WBNq4=";
|
||||
rev = "1e2be6664685efd7805ca19031f279fcaec25e15";
|
||||
hash = "sha256-PhWlrp+ILgBh6GUI+hkWO513dTQqDJIx+n0YZEaNlyw=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -62,6 +62,10 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
pandoc
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals waylandSupport [
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
];
|
||||
buildInputs = [
|
||||
cairo
|
||||
@@ -76,7 +80,6 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals waylandSupport [
|
||||
wayland
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
]
|
||||
++ lib.optionals x11Support [
|
||||
libxcb
|
||||
|
||||
@@ -9,15 +9,15 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubernetes-helm";
|
||||
version = "3.18.6";
|
||||
version = "3.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = "helm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-aUnPLjSt1law6O2M4IQnHB3QiMDYVQ6h//zJbE2vap8=";
|
||||
sha256 = "sha256-ssOebBeIFVd6N0CDWfAU3HN0j4Rw7twncokzorHWJig=";
|
||||
};
|
||||
vendorHash = "sha256-Gn2h7a4bu9nWPEiqW9uN8SnKSZ7NRfchfRoFfpp49+M=";
|
||||
vendorHash = "sha256-G3PLT2jE+Oitct5F+o/hr8GDAKWcvp23dcpezuBge6k=";
|
||||
|
||||
subPackages = [ "cmd/helm" ];
|
||||
ldflags = [
|
||||
|
||||
@@ -90,9 +90,9 @@ rec {
|
||||
|
||||
nomad_1_10 = generic {
|
||||
buildGoModule = buildGo124Module;
|
||||
version = "1.10.4";
|
||||
hash = "sha256-lQtKSU0wcrU+HEUc6N/svpf5uAaWK68G5kY/tI2Sy8Q=";
|
||||
vendorHash = "sha256-tclD02oinoypx80TLni+DUpB5mYKRBqsmScp2VsUDc0=";
|
||||
version = "1.10.5";
|
||||
hash = "sha256-NFH++oYWb6vQN6cOPByscI/ZBWDNy4YbcLiBMO3/jVU=";
|
||||
vendorHash = "sha256-QcTw9kKwoHIvXZoxfDohFG+sBs8OLvYPeygygDClsn8=";
|
||||
license = lib.licenses.bsl11;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{
|
||||
mkDerivation,
|
||||
haskellPackages,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "nota";
|
||||
version = "1.0";
|
||||
|
||||
# Can't use fetchFromGitLab since codes.kary.us doesn't support https
|
||||
src = fetchurl {
|
||||
url = "http://codes.kary.us/nota/nota/-/archive/V${version}/nota-V${version}.tar.bz2";
|
||||
sha256 = "0bbs6bm9p852hvqadmqs428ir7m65h2prwyma238iirv42pk04v8";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
export sourceRoot=$sourceRoot/source
|
||||
'';
|
||||
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
|
||||
libraryHaskellDepends = with haskellPackages; [
|
||||
base
|
||||
bytestring
|
||||
array
|
||||
split
|
||||
scientific
|
||||
parsec
|
||||
ansi-terminal
|
||||
regex-compat
|
||||
containers
|
||||
terminal-size
|
||||
numbers
|
||||
text
|
||||
time
|
||||
];
|
||||
|
||||
description = "Most beautiful command line calculator";
|
||||
homepage = "https://kary.us/nota";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = [ ];
|
||||
mainProgram = "nota";
|
||||
}
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SY7pf6bHvX6tezTYpOu/pqda3IsIqaR5g7JZS+eEEZw=";
|
||||
hash = "sha256-sYhmXVc1pU0nzG57AIuaLqUOWz9MfFlpJZQ9B5Ki5ik=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atac";
|
||||
version = "0.20.2";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Julien-cpsn";
|
||||
repo = "ATAC";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m+2D1Vrh6Qi7iDOCuio76p7d4eAkjuCSZXxJD9spPrw=";
|
||||
hash = "sha256-NTdz7NtjvVQolSiqyCdR0P4dD0+ZQBKMEXTzwHPZgxU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-W94oaBgws5FUF2Xax+O7faiQgfhcyTeGoCu+VJD0Wd0=";
|
||||
cargoHash = "sha256-iLExF4lwXQ1BVBxEK+iD5HDkbjk38AbLaIirS04C4iw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bash-pinyin-completion-rs";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AOSC-Dev";
|
||||
repo = "bash-pinyin-completion-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tcgpPFB/BHVbGFYHfs8y0yOVK/KJmjNJ95I41TX+pu4=";
|
||||
hash = "sha256-TBTVUDtlBCvfmWcwcSr9xLXE1cBLHeptklwR3hD+49Y=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
fetchPypi,
|
||||
python3Packages,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -9,8 +10,6 @@ python3Packages.buildPythonApplication rec {
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w=";
|
||||
@@ -21,7 +20,6 @@ python3Packages.buildPythonApplication rec {
|
||||
dependencies = with python3Packages; [
|
||||
babel
|
||||
pbr
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
@@ -39,12 +37,12 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
pythonImportsCheck = [ "bashate" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Style enforcement for bash programs";
|
||||
mainProgram = "bashate";
|
||||
homepage = "https://opendev.org/openstack/bashate";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
teams = [ teams.openstack ];
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
teams = [ lib.teams.openstack ];
|
||||
};
|
||||
}
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tauri";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
tag = "tauri-cli-v${finalAttrs.version}";
|
||||
hash = "sha256-bubC2cGlZDam0IGGwB/GSiVt9LFfKmy0uZwwPhAPrl0=";
|
||||
hash = "sha256-fp/ODsbZTQdMkkRu9QqTQfavq0RPfSzZm1l4sE1hacc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LJYAVism63OVzAEJS8WeaL+XTpxOTCy22U5MUPu8rA4=";
|
||||
cargoHash = "sha256-l1IF9R+KeXAjs8Dy59mZNOCX0eoskotBPbltKU3nHQ8=";
|
||||
|
||||
nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
|
||||
pkg-config
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
diff --git a/cfitsio.pc.cmake b/cfitsio.pc.cmake
|
||||
index 949b80e..6ffcaa6 100644
|
||||
--- a/cfitsio.pc.cmake
|
||||
+++ b/cfitsio.pc.cmake
|
||||
@@ -1,7 +1,7 @@
|
||||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
exec_prefix=${prefix}
|
||||
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
+libdir="@CMAKE_INSTALL_FULL_LIBDIR@"
|
||||
+includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@"
|
||||
|
||||
Name: cfitsio
|
||||
Description: FITS File Subroutine Library
|
||||
@@ -1,21 +0,0 @@
|
||||
diff -ruN cfitsio/configure cfitsio-rpath-universal/configure
|
||||
--- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200
|
||||
+++ cfitsio-rpath-universal/configure 2021-10-27 12:02:25.000000000 +0200
|
||||
@@ -4829,16 +4829,7 @@
|
||||
SHLIB_SUFFIX=".dylib"
|
||||
CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}"
|
||||
CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}"
|
||||
- case $host in
|
||||
- *darwin[56789]*)
|
||||
- SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}"
|
||||
- ;;
|
||||
- *)
|
||||
- # Build 'Universal' binaries (i386 & x86_64 architectures) and
|
||||
- # use rpath token on Darwin 10.x or newer:
|
||||
- SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}.\${CFITSIO_MICRO}"
|
||||
- ;;
|
||||
- esac
|
||||
+ SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
|
||||
|
||||
lhea_shlib_cflags="-fPIC -fno-common"
|
||||
;;
|
||||
@@ -1,7 +1,9 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
bzip2,
|
||||
curl,
|
||||
zlib,
|
||||
@@ -9,15 +11,28 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cfitsio";
|
||||
version = "4.4.1";
|
||||
version = "4.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ZqHcPyGAD57qvZ6sV3uR/N2aq7pnj7ujuFJzGRENHSU=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "HEASARC";
|
||||
repo = finalAttrs.pname;
|
||||
tag = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
hash = "sha256-WLsX23hNhaITjCvMEV7NUEvyDfQiObSJt1qFC12z7wY=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
"dev"
|
||||
"out"
|
||||
"doc"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./darwin-rpath-universal.patch
|
||||
./cfitsio-pc-cmake.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -26,9 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zlib
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-bzip2=${bzip2.out}"
|
||||
"--enable-reentrant"
|
||||
cmakeFlags = [
|
||||
"-DUSE_PTHREADS=ON"
|
||||
"-DTESTS=ON"
|
||||
"-DUTILS=ON"
|
||||
"-DUSE_BZIP2=ON"
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isFreeBSD {
|
||||
@@ -36,16 +53,31 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# not showing us gethostbyname()
|
||||
NIX_CFLAGS_COMPILE = "-D__BSD_VISIBLE=1";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# Shared-only build
|
||||
buildFlags = [ "shared" ];
|
||||
doCheck = true;
|
||||
doInstallCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
|
||||
# On testing cfitsio: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/README
|
||||
installCheckPhase = ''
|
||||
./TestProg > testprog.lis
|
||||
diff -s testprog.lis ../testprog.out
|
||||
cmp testprog.fit ../testprog.std
|
||||
'';
|
||||
|
||||
# Fixup installation
|
||||
# Remove installed test tools and benchmark
|
||||
postInstall = ''
|
||||
install -Dm644 -t "$out/share/doc/${finalAttrs.pname}" ../docs/*.pdf
|
||||
rm "$out/bin/cookbook"
|
||||
rmdir "$out/bin"
|
||||
rm "$bin/bin/smem" "$bin/bin/speed"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater { rev-prefix = "${finalAttrs.pname}-"; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://heasarc.gsfc.nasa.gov/fitsio/";
|
||||
description = "Library for reading and writing FITS data files";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "converseen";
|
||||
version = "0.15.0.2";
|
||||
version = "0.15.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Faster3ck";
|
||||
repo = "Converseen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zBTADXacQ9hIc6+3QpPseYSGsCnslNJY+ZCa5BJZUjg=";
|
||||
hash = "sha256-ZC7D+0tonAIkbDaoqw+RarIVuNcDQe410JrfC2kG+B8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.7.7";
|
||||
version = "0.7.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rQtQUt/XOZpHxS2l4qhwrQ5cW0Q+JQW1D6GvPxkSMuk=";
|
||||
hash = "sha256-z7x//aTJCcAa3RkB8QOtdeU9dBcOKkJD3ftFiCt/WQo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-k7yfCyfeW2TW5DpVmxfNLXV08FxhpW4SQNAcDyrYKPc=";
|
||||
vendorHash = "sha256-AZOX2aRYkuLx0DRCS5dqsRCPwpHngqDc+97luRr0m0g=";
|
||||
|
||||
# rename TestMain to prevent it from running, as it panics in the sandbox.
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.0d";
|
||||
version = "3.0.1";
|
||||
pname = "discount";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Orc";
|
||||
repo = "discount";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fFSlW9qnH3NL9civ793LrScOJSuRe9i377BgpNzOXa0=";
|
||||
hash = "sha256-Bb6vcEICzxaQmBIm9xQy5dKV485iwcxgkA3PAHaR2cw=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-configure-path.patch ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.11.110";
|
||||
"version" = "1.11.111";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-iWdNiihpU29nek+EQjHmRi7dXadPYYoIt6bhufauKf8=";
|
||||
"desktopYarnHash" = "sha256-l/hclDXT1JeToQPnWFDXU8JSN+oEm5hPYm4OQ7QJONk=";
|
||||
"desktopSrcHash" = "sha256-QRnMHlq/gBoptJ/0iBdKUXbnR/oLVeA+ybF/0YFVBlo=";
|
||||
"desktopYarnHash" = "sha256-U+MuOe0N29AFrLCi7Xa9bDW70SmhQqqtjim+x7QAiJg=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -105,7 +105,6 @@ stdenv.mkDerivation (
|
||||
mkdir -p "$out/share/element"
|
||||
ln -s '${element-web}' "$out/share/element/webapp"
|
||||
cp -r '.' "$out/share/element/electron"
|
||||
cp -r './res/img' "$out/share/element"
|
||||
chmod -R "a+w" "$out/share/element/electron/node_modules"
|
||||
rm -rf "$out/share/element/electron/node_modules"
|
||||
cp -r './node_modules' "$out/share/element/electron"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.11.110";
|
||||
"version" = "1.11.111";
|
||||
"hashes" = {
|
||||
"webSrcHash" = "sha256-9NOotUTcB2S6SSH620Em0YOwy6mxrWhChqdOZj0Leu0=";
|
||||
"webYarnHash" = "sha256-TimQp6qcgszOuxRUOsN0Ey+pVVUGbEC6aRJ5gYXZ3dg=";
|
||||
"webSrcHash" = "sha256-dNkt8fybwTM0/27L+6o3QuhQJiwTDAN2ez+hUG/0VwE=";
|
||||
"webYarnHash" = "sha256-2QKZu/HObwW1ugUUuSAn2zV3OESgLa6PNizL6hhCBjg=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "eza";
|
||||
version = "0.23.1";
|
||||
version = "0.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4t/t/dUpQRO1AJ8jnmjxnJ/wLyYi/wv6Yg+9LwPavzw=";
|
||||
hash = "sha256-7YQj2QYWn4GHSYBX8MlqPjdFZMpP1ZdzEHInMJaesKc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/tDvG5ogJOxnBA7oe5pVDik5JvqmMhFGHF9TURaSukc=";
|
||||
cargoHash = "sha256-QS6iQP5PBHKcQEsr97FawUCkMCswAYg7Ua2ZeIvL7CM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ffsubsync";
|
||||
version = "0.4.29";
|
||||
version = "0.4.30";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smacke";
|
||||
repo = "ffsubsync";
|
||||
tag = version;
|
||||
hash = "sha256-XMFobdr/nzr5pXjz/jWa/Pp14ITdbxAce0Iz+5qcBO4=";
|
||||
hash = "sha256-Px4WaeFn6SS6VUsm0bAKmdVtqQzXX12PRKO1n6UNxdM=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@@ -2,23 +2,43 @@
|
||||
lib,
|
||||
buildDartApplication,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
runCommand,
|
||||
yq-go,
|
||||
_experimental-update-script-combinators,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
buildDartApplication rec {
|
||||
pname = "fvm";
|
||||
version = "3.2.1";
|
||||
let
|
||||
version = "4.0.0-beta.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leoafarias";
|
||||
repo = "fvm";
|
||||
tag = version;
|
||||
hash = "sha256-i7sJRBrS5qyW8uGlx+zg+wDxsxgmolTMcikHyOzv3Bs=";
|
||||
hash = "sha256-O2VU0cXgrm+Xf85e5l31kfnUOCUI9ZuVQCVRUppqCE4=";
|
||||
};
|
||||
in
|
||||
buildDartApplication {
|
||||
pname = "fvm";
|
||||
inherit version src;
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
pubspecSource =
|
||||
runCommand "pubspec.lock.json"
|
||||
{
|
||||
inherit src;
|
||||
nativeBuildInputs = [ yq-go ];
|
||||
}
|
||||
''
|
||||
yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
|
||||
'';
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(gitUpdater { })
|
||||
(_experimental-update-script-combinators.copyAttrOutputToFile "fvm.pubspecSource" ./pubspec.lock.json)
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Simple CLI to manage Flutter SDK versions";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
pname = "gallery-dl";
|
||||
version = "1.30.5";
|
||||
version = "1.30.6";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
inherit pname version;
|
||||
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
|
||||
owner = "mikf";
|
||||
repo = "gallery-dl";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RsYg3DSiB6DWVlwAJT7iN7rNxUJqT5EAIGNEuMuIm8Y=";
|
||||
hash = "sha256-UCioROzdfYYtTzKegEUNsF1ecKxbwW4k1cPygjpiXjo=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gittuf";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gittuf";
|
||||
repo = "gittuf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-atC9YsffhXvWAQzrIVwOCpcP73HhGa5x19mXm4+yLuU=";
|
||||
hash = "sha256-/PKbo8LPvU6ZTav9n82mrj2h6z6AyJ225mCH7EfazVU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SqXwxt6TWPyuwx7gDnEUk5487z3mlYtQ+Cho+lUcN+M=";
|
||||
vendorHash = "sha256-unj9PpRkfNHWQzeCmcjppMFGAlHNcP0/j9EiGvpRzRc=";
|
||||
|
||||
ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ];
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
gettext,
|
||||
coreutils,
|
||||
gnused,
|
||||
gnome,
|
||||
adwaita-icon-theme,
|
||||
gnugrep,
|
||||
parted,
|
||||
@@ -17,7 +16,7 @@
|
||||
gpart,
|
||||
hdparm,
|
||||
procps,
|
||||
util-linux,
|
||||
util-linuxMinimal,
|
||||
polkit,
|
||||
wrapGAppsHook3,
|
||||
replaceVars,
|
||||
@@ -26,13 +25,13 @@
|
||||
xhost,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gparted";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gparted/gparted-${version}.tar.gz";
|
||||
sha256 = "sha256-hK47mXPkQ6IXXweqDcKs7q2xUB4PiVPOyDsOwzR7fVI=";
|
||||
url = "mirror://sourceforge/gparted/gparted-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-hK47mXPkQ6IXXweqDcKs7q2xUB4PiVPOyDsOwzR7fVI=";
|
||||
};
|
||||
|
||||
# Tries to run `pkexec --version` to get version.
|
||||
@@ -77,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||
lib.makeBinPath [
|
||||
gpart
|
||||
hdparm
|
||||
util-linux
|
||||
util-linuxMinimal
|
||||
procps
|
||||
coreutils
|
||||
gnused
|
||||
@@ -108,4 +107,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "gparted";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "juce";
|
||||
version = "8.0.8";
|
||||
version = "8.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juce-framework";
|
||||
repo = "juce";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kp3rMaHWBbEh4UaRMxcLo/DiSJV942OY+LYxh6W7dFc=";
|
||||
hash = "sha256-RUrKQFRLX68L3ROCUFaODSaRMH6zPpAKbc4/e5yDcZ4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "katawa-shoujo-re-engineered";
|
||||
version = "2.0.2-1";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitea {
|
||||
# GitHub mirror at fleetingheart/ksre
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
owner = "fhs";
|
||||
repo = "katawa-shoujo-re-engineered";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-skCcNFUmAQMZWRCXsABJR6elDlbVZFRParq7nOzZL4M=";
|
||||
hash = "sha256-M2TWc5dl7lkwM/oisM6xtJwb3Dw9i6qUadBHGdEO2bs=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@@ -2,37 +2,41 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kor";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yonahd";
|
||||
repo = "kor";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hGiak28gwxwYOogYyZjTgQ+aGSumxzeZiQKlbVvvrIU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-a7B0cJi71mqGDPbXaWYKZ2AeuuQyNDxwWNgahTN5AW8=";
|
||||
|
||||
preCheck = ''
|
||||
HOME=$(mktemp -d)
|
||||
export HOME
|
||||
'';
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/yonahd/kor/pkg/utils.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Golang Tool to discover unused Kubernetes Resources";
|
||||
homepage = "https://github.com/yonahd/kor";
|
||||
changelog = "https://github.com/yonahd/kor/releases/tag/v${version}";
|
||||
changelog = "https://github.com/yonahd/kor/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ivankovnatsky ];
|
||||
mainProgram = "kor";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EoRUoZz2L+k9M5J5OQUFUOkjUc1Qqy8ERZkdtG3ur+k=";
|
||||
hash = "sha256-ZKLdCyg0wypJA16QHLWENiE20hUzr53BPHuwjSIhSOc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "chatmail-core";
|
||||
inherit version src;
|
||||
hash = "sha256-PNi1oA9iBBQZRQXIHcWMAmLlgzlzt0nxh8hkPsFEx28=";
|
||||
hash = "sha256-swPk+KMOnvKcYznA6aHoQff6TRZ8npqfWmI/4Jr9fkw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -91,6 +91,6 @@ stdenv.mkDerivation rec {
|
||||
mpl11
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
teams = [ teams.geospatial ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lock";
|
||||
version = "1.7.5";
|
||||
version = "1.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "konstantintutsch";
|
||||
repo = "Lock";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vm1Tv3av9x5KZcUwL/yvnE7MeHhdFEutOpbgyWJRR0g=";
|
||||
hash = "sha256-DfHQKz+DuBnISsX4s0I4+3dvSsCDVGHYp5kcSaUrfjM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau-lsp";
|
||||
version = "1.53.2";
|
||||
version = "1.53.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JohnnyMorganz";
|
||||
repo = "luau-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7dEYtL+ouvSbQ7B2gcgpwcPSFLIQ4ZYvHXgpFkNilms=";
|
||||
hash = "sha256-JO0RVrixjJWCQTVHIU/rcf78QyIb1rYGXP8+mnTpmvg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -22,13 +22,13 @@ assert (
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mctc-lib";
|
||||
version = "0.4.2";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grimme-lab";
|
||||
repo = "mctc-lib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Qd7mpNE23Z+LuiUwhUzfVzVZEQ+sdnkxMm+W7Hlrss4=";
|
||||
hash = "sha256-MWqvFxFGnFrGppiSy97oUWz7p1sD6GkTrMEZTFgSExg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdwatch";
|
||||
version = "0.1.12";
|
||||
version = "0.1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "santoshxshrestha";
|
||||
repo = "mdwatch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o9WQiwftaNl7TeR+5CqkT3BmDnm2laiD8NFPPyurYYQ=";
|
||||
hash = "sha256-zwlbWxvdtZJuz7gFdgmny6s1FsoxoBXkP4s7vF77oEo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qOQR/JHjfU4e60FrwwJB/5uWIficiSlKKNEVra6xLF0=";
|
||||
cargoHash = "sha256-9XD8HbgnXhGsg1iZ/zYlk5080AhKqb8JxKKx5bxFE8M=";
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "moq";
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matryer";
|
||||
repo = "moq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Yk0lGu6wHF5OBFx/yZPJr3h3DVMvyBV8pi5eSxl7hpw=";
|
||||
sha256 = "sha256-veAfQ9dFt6s6xQace0nkcbAirl98UekJx+0qPHnQVGg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Mwx2Z2oVFepNr911zERuoM79NlpXu13pVpXPJox86BA=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mpd-discord-rpc";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakeStanger";
|
||||
repo = "mpd-discord-rpc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6PSwfvmGdcxQvmnbloTBWEiz5vbN/RxK4Afq1PgUX94=";
|
||||
hash = "sha256-Aqxh6dVZI59FGFtuyC5KcuaEr2OZL/A4UHSpnthR0Uk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ecGhzcaqvTDAvbeWkr/3uXu5GD3NqlgHAiywzHfmsaA=";
|
||||
cargoHash = "sha256-L4hQ1NAzddiPv6DxY8mcMQ6GlRdhIr+LeY9TtFbx3Mw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
haskellPackages,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
}:
|
||||
|
||||
haskellPackages.mkDerivation rec {
|
||||
pname = "nota";
|
||||
version = "1.0-unstable-2023-03-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pouyakary";
|
||||
repo = "Nota";
|
||||
rev = "3548b864e5aa30ffbf1704a79dbb3bd3aab813be";
|
||||
hash = "sha256-96T9uxUEV22/vn6aoInG1UPXbzlDHswOSkywkdwsMeY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/source";
|
||||
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
|
||||
libraryHaskellDepends = with haskellPackages; [
|
||||
base
|
||||
bytestring
|
||||
array
|
||||
split
|
||||
scientific
|
||||
parsec
|
||||
ansi-terminal
|
||||
regex-compat
|
||||
containers
|
||||
terminal-size
|
||||
numbers
|
||||
text
|
||||
time
|
||||
];
|
||||
|
||||
description = "Command line calculator";
|
||||
homepage = "https://pouyakary.org/nota/";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = [ ];
|
||||
mainProgram = "nota";
|
||||
}
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openbao";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openbao";
|
||||
repo = "openbao";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VJCKZYBuw6fenTqRDxvLVNMXlPuDEq43WB7TI2RNWvc=";
|
||||
hash = "sha256-HfPkjeScegylpA/i8KlS3t468pmD5sRwp2Ct164fkTo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4SWpWGWoesUCgSpgOpblkxOpPbBC/grC2S1m7R9qasY=";
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ovn";
|
||||
version = "25.03.1";
|
||||
version = "25.09.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ovn-org";
|
||||
repo = "ovn";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nDW3jwZ0RE9i+5+8eRKb7P7KQxiGd22dn/s7bzx/CjQ=";
|
||||
hash = "sha256-DNaf3vWb6tlzViMEI02+3st/0AiMVAomSaiGplcjkIc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ramalama";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "ramalama";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BFJoM9MEprCdCANQntb4IIuWhtUXvCnK/mE7vOdf2PM=";
|
||||
hash = "sha256-v9/cE6GFOUT5urHQwif7skP5vnRCdu435QGAAypWX0w=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
||||
@@ -13,14 +13,14 @@ in
|
||||
python.pkgs.toPythonModule (
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "0-unstable-2025-08-29";
|
||||
version = "0-unstable-2025-09-11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "searxng";
|
||||
repo = "searxng";
|
||||
rev = "b8085d27aca35b3c60ef50bf0683018d6a6b51b3";
|
||||
hash = "sha256-kBToxtvuWFZ3ZSLj2Mxb+7zDabpZJX9JC0msKkIy/fE=";
|
||||
rev = "7c1ebc01489a5b96d4abb0ad9c1180701eb4456c";
|
||||
hash = "sha256-nOIt4PyO6DALz7gw5Hh1w1ZDyEAsQAVp4O/eFOLYZ0A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
|
||||
@@ -31,6 +31,7 @@ python.pkgs.toPythonModule (
|
||||
"flask-babel"
|
||||
"httpx-socks"
|
||||
"lxml"
|
||||
"typer-slim"
|
||||
];
|
||||
|
||||
preBuild =
|
||||
|
||||
@@ -22,16 +22,16 @@ let
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "shogihome";
|
||||
version = "1.24.3";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunfish-shogi";
|
||||
repo = "shogihome";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q0d+SKCLtT/gv9mrx0o8qIdWYVwNM2x8/LfRsG4J4rw=";
|
||||
hash = "sha256-Qa8ykN514Moc/PpBhD/X+mzfclQPp3yiriwTJCtmMA8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-mCECqh2iRVD4lsCWYdf15VMuaH8dqpDfWWs/6q4H6Lo=";
|
||||
npmDepsHash = "sha256-rcrj3dG96oNbmp3cXw1qRJPi1SZdBcG9paAShSfb/0E=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json \
|
||||
|
||||
@@ -47,6 +47,8 @@ buildGoModule rec {
|
||||
"-X 'github.com/FriendsOfShopware/shopware-cli/cmd.version=${version}'"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "Command line tool for Shopware 6";
|
||||
mainProgram = "shopware-cli";
|
||||
|
||||
Generated
+76
-111
@@ -1,18 +1,18 @@
|
||||
[
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-GbZIXopQh6VSRLAg47TRWHvMYEl5/c7rtvNmFnlDhAo="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-gW1t+B32H9aVC+ogE5X+4bwjsmbdOcyH83T8Br7IDuY="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.22045.20230930",
|
||||
"hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
|
||||
"version": "2.1.25547.20250602",
|
||||
"hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.AvaloniaEdit",
|
||||
"version": "11.2.0",
|
||||
"hash": "sha256-AFe1jt9xR8XGq4tKkxOdUd7aQOGRSE+M2EQ8fOiV6xo="
|
||||
"version": "11.3.0",
|
||||
"hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
@@ -21,43 +21,43 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-jcCErs44R9tl6zjMkRxdwU9lBxv13MOZMi9Hcm7Tals="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-umZ6rfL9Qw1/jWpAiMyPu8f6i8ah4u3iR6uJVS6IUfw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.DataGrid",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-bAbHI5bKyTYksXsnOS5poBBxdhYQE/HSj52YxqGvkok="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-JgMIQ2aFgLkLcL/auPUwQTlmPlurree5HXfLYGGP3o8="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-Mr2x3hm3ArlQwGlWO9MuFWUelf4EVmVPAGANm1MxM1o="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-SJyN+znfG/GUYkw3yNFMxd0Y7Hc9QvckRHPRc/QpkvM="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-3+88G0O1LrQSCSxI6s0aFD34nhgqTH1b3rMXBaXqY0M="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-7GORVuABhwQymfvSclY6ZGtRN6yXaKs1FKuXuR3ZXmo="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Fonts.Inter",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-NEi00PZS1sMHl94FuPIdd7PvHPk/kryszT5NHBJdiyg="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-bBqFtDwB9C6cNlrrr2gnqv1YpNVAlEXjmLiv86CrU/o="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-X9VxRmeK6Vu8c9ILtF/KyDi0B0CmjeZcTRnwouCYOWg="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-Kq5rZkiQWayrMRD90ex24zxESHTxof0PX8IvA+RutAc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-YVjhd2fjOamYdYEh4jGGZy06xPAq3juTH2nC7cOlGOA="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-EIpaS2XtO/1Dx0XVSf9XapKMUHmVSXwK/rwgeioPCDo="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-v30kDbStvHAS4IOV0wEkWYXOdh4SdjaDEcKVD+6xpzc="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-1bAKPdK+ftcdfdiUkwasmpjf3ai07T81PkRjKWFyNf8="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
@@ -66,43 +66,43 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-V84jNsrMNguAt9ZdSEf74F4OTC3WyXLuLrkByxfHJe4="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-DW2ectX/V583KqirUetmFioMNsuUa0ai2k5WKObFMO4="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Fluent",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-qHwn8BPAPHxNJ3Ya3xPUhEzItXVjNbI5YjEsNqQLJ8s="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-BXf+iZxBEO2pFeAiN0bJNOndFJE+L573qZFiLqRRWG8="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-vEFjwS+X6EkxVXDFk97b4S4AjbLVjPD3dYVADrBnoXo="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-hkEJC/2usaYDDdIeVKuWfORd+tlg39+xf/2Eiflvb8I="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-3XYJXXT9IMECwCNbrzV49x0pyJZx6Vbib53Vbe9Gfjg="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-SNAx4QaNyrhE0BLWhHFtdsB35a5T9qfIQhdMC1YUrzA="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.2.8",
|
||||
"hash": "sha256-+m8pNxda2vyFVBR+7IhkTaQ4Zm7gqkT0XgKSp+lWWmA="
|
||||
"version": "11.3.5",
|
||||
"hash": "sha256-v85I2pFMOixIANKCngr2/HyTflYxiSihe08q6Z4513Q="
|
||||
},
|
||||
{
|
||||
"pname": "AvaloniaEdit.TextMate",
|
||||
"version": "11.2.0",
|
||||
"hash": "sha256-O9uQHHMwXCf6xaK+oUNRPJUQC6+p97UmZU1OsLOeroI="
|
||||
"version": "11.3.0",
|
||||
"hash": "sha256-VyXRytKE0aaWirvfr5Hm5uJm8Ckbu/+4wnTjmomgM5s="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.AI.OpenAI",
|
||||
"version": "2.2.0-beta.4",
|
||||
"hash": "sha256-aEvGCQxOBZifg5nDSDILvQhLkmcbH/iIqtUMwfclDRA="
|
||||
"version": "2.3.0-beta.2",
|
||||
"hash": "sha256-kAl8ylr8ghuXsGNFrzVS5e12xOrsmT9VieSVgmKJCyY="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Core",
|
||||
"version": "1.44.1",
|
||||
"hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk="
|
||||
"version": "1.47.3",
|
||||
"hash": "sha256-fWyfqF1lpnap4cF3l9J0fYtZbxIqm6UFsuJgN+/hwW4="
|
||||
},
|
||||
{
|
||||
"pname": "BitMiracle.LibTiff.NET",
|
||||
@@ -119,25 +119,30 @@
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Linux",
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.macOS",
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Win32",
|
||||
"version": "7.3.0.3",
|
||||
"hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
|
||||
},
|
||||
{
|
||||
"pname": "LiveChartsCore",
|
||||
@@ -161,23 +166,28 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="
|
||||
"version": "8.0.3",
|
||||
"hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
|
||||
},
|
||||
{
|
||||
"pname": "Onigwrap",
|
||||
"version": "1.0.6",
|
||||
"hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU="
|
||||
"version": "1.0.8",
|
||||
"hash": "sha256-lH9nH74cPMQnWKO8mwgg+nX4iMUXuh7McfeRL9asQIY="
|
||||
},
|
||||
{
|
||||
"pname": "OpenAI",
|
||||
"version": "2.2.0-beta.4",
|
||||
"hash": "sha256-kkNb9Jp7djvE2060+HIGoqnkFpOzQ5l/PK5oH4FO3e4="
|
||||
"version": "2.3.0",
|
||||
"hash": "sha256-nIpYfGvE8FaEnE2y+98CAoLoz3+MWo+2eyb3Rgh7qgY="
|
||||
},
|
||||
{
|
||||
"pname": "Pfim",
|
||||
@@ -216,23 +226,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM="
|
||||
"version": "1.5.1",
|
||||
"hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.2.1",
|
||||
"hash": "sha256-MNFNrCAhD+vj97gVXdJIm3QmY++y25zBZtiIXrGdQ2c="
|
||||
},
|
||||
{
|
||||
"pname": "System.ClientModel",
|
||||
"version": "1.4.0-beta.1",
|
||||
"hash": "sha256-FcIblwx2HJU2zJI5tjvMqwWVe5eJcACZt12fRPNppak="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.DiagnosticSource",
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
|
||||
"version": "1.6.1",
|
||||
"hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
@@ -241,62 +241,27 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory.Data",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory.Data",
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-RXS82gmLtIOAUaGqTc8J3bVbHTL5pnW3QFE3G+Xb5Jk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "6.0.10",
|
||||
"hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "8.0.5",
|
||||
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading.Tasks.Extensions",
|
||||
"version": "4.5.4",
|
||||
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
|
||||
},
|
||||
{
|
||||
"pname": "TextMateSharp",
|
||||
"version": "1.0.66",
|
||||
"hash": "sha256-2oYPcRboJhXp4UAwyGy814zFaKX4YiyfR5571gUvKl8="
|
||||
"version": "1.0.70",
|
||||
"hash": "sha256-fzmSGU8fT/J6W+Yx/qgUqPEiC1Og9ctUyQGDleOggrM="
|
||||
},
|
||||
{
|
||||
"pname": "TextMateSharp.Grammars",
|
||||
"version": "1.0.66",
|
||||
"hash": "sha256-ep1PCf/FuD34Q2BvmCYBfyGGXu4ov05N+kFRUSagJdk="
|
||||
"version": "1.0.70",
|
||||
"hash": "sha256-AAH3SXLyIUIfJgdPhwIRPZhdcxdNhis2ODLd9mh1PuE="
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus.Protocol",
|
||||
"version": "0.20.0",
|
||||
"hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
|
||||
"version": "0.21.2",
|
||||
"hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
|
||||
}
|
||||
]
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "sourcegit";
|
||||
version = "2025.29";
|
||||
version = "2025.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegit-scm";
|
||||
repo = "sourcegit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ptHiC5BaX0EP2uInGE7/FV61wsCU2V+FE1VHxJKN+70=";
|
||||
hash = "sha256-O7HzbrcQGgP3mRSfqLxoHPswVW99S9chb7ZWBeEelsY=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-darwin-git-path.patch ];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
buildGoModule,
|
||||
coreutils,
|
||||
pcsclite,
|
||||
@@ -26,6 +27,16 @@ buildGoModule rec {
|
||||
hash = "sha256-ZIpsSNdQVkelo5b3H03N8qToHU7z+lalAE7Ur6m2YwY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix broken test TestHandler_RevokeCert
|
||||
# https://github.com/smallstep/certificates/pull/2370
|
||||
# TODO: remove at next release
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/smallstep/certificates/commit/b7e59c97f3b8a95a24153aeb85959118953f2bb4.patch?full_index=1";
|
||||
hash = "sha256-GKGKUj4hpS4jo6sMvUhnD3BeE+f5vnxY5tK0a2pwpNM=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-gGPrrl5J8UrjUpof2DaSs1fAQsMSsyAMlC67h5V75+k=";
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tailscale";
|
||||
version = "1.86.4";
|
||||
version = "1.86.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cYj04DtoYKejygz1Euir/6/Eq1M046nzzhqSfpTi0OE=";
|
||||
hash = "sha256-fEQsusnp/XtKyXQD+M3nAP7zpsnr/TD5rt1b366LtKw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4QTSspHLYJfzlontQ7msXyOB5gzq7ZwSvWmKuYY5klA=";
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchCrate,
|
||||
pkg-config,
|
||||
openssl,
|
||||
withLsp ? true,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -20,6 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoHash = "sha256-tvijtB5fwOzQnnK/ClIvTbjCcMeqZpXcRdWWKZPIulM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@@ -29,6 +32,21 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildFeatures = lib.optional withLsp "lsp";
|
||||
|
||||
postInstall =
|
||||
lib.optionalString
|
||||
(
|
||||
stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
&&
|
||||
# Creation of the completions fails on Darwin platforms.
|
||||
!stdenv.hostPlatform.isDarwin
|
||||
)
|
||||
''
|
||||
installShellCompletion --cmd taplo \
|
||||
--bash <($out/bin/taplo completions bash) \
|
||||
--fish <($out/bin/taplo completions fish) \
|
||||
--zsh <($out/bin/taplo completions zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "TOML toolkit written in Rust";
|
||||
homepage = "https://taplo.tamasfe.dev";
|
||||
|
||||
@@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
|
||||
hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
|
||||
})
|
||||
# Fix 32-bit PowerPC build
|
||||
(fetchpatch {
|
||||
url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch";
|
||||
hash = "sha256-faNiVdHRIkmavufDHQQ8vHppvdahZ7yhJVL3bOwNTFg=";
|
||||
})
|
||||
];
|
||||
|
||||
patchFlags = [
|
||||
|
||||
@@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/uxlfoundation/oneTBB/pull/1696.patch";
|
||||
hash = "sha256-yjX2FkOK8bz29a/XSA7qXgQw9lxzx8VIgEBREW32NN4=";
|
||||
})
|
||||
# Fix 32-bit PowerPC build
|
||||
(fetchpatch {
|
||||
url = "https://github.com/uxlfoundation/oneTBB/pull/987/commits/c828ae47b8f4bea7736d2f9d05460e2b529c9d7d.patch";
|
||||
hash = "sha256-faNiVdHRIkmavufDHQQ8vHppvdahZ7yhJVL3bOwNTFg=";
|
||||
})
|
||||
];
|
||||
|
||||
# Fix build with modern gcc
|
||||
|
||||
@@ -3,33 +3,36 @@
|
||||
stdenv,
|
||||
fetchgit,
|
||||
which,
|
||||
SDL,
|
||||
SDL_mixer,
|
||||
SDL_image,
|
||||
SDL_ttf,
|
||||
SDL_net,
|
||||
SDL2,
|
||||
SDL2_gfx,
|
||||
SDL2_mixer,
|
||||
SDL2_image,
|
||||
SDL2_ttf,
|
||||
SDL2_net,
|
||||
python3,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tennix";
|
||||
version = "1.3.1";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://repo.or.cz/tennix.git";
|
||||
tag = "tennix-${version}";
|
||||
hash = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk=";
|
||||
tag = "tennix-${finalAttrs.version}";
|
||||
hash = "sha256-siGfnpZPMYMTgYzaPVhNXEuA/OSWmEl891cLhvgGr7o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
SDL
|
||||
SDL_mixer
|
||||
SDL_image
|
||||
SDL_ttf
|
||||
SDL_net
|
||||
SDL2
|
||||
SDL2_gfx
|
||||
SDL2_mixer
|
||||
SDL2_image
|
||||
SDL2_ttf
|
||||
SDL2_net
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
@@ -40,12 +43,14 @@ stdenv.mkDerivation rec {
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "tennix-"; };
|
||||
|
||||
meta = {
|
||||
homepage = "https://icculus.org/tennix/";
|
||||
description = "Classic Championship Tour 2011";
|
||||
mainProgram = "tennix";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ pSub ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
testers,
|
||||
twitch-cli,
|
||||
@@ -33,6 +35,18 @@ buildGoModule rec {
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
$out/bin/twitch-cli completion bash > twitch-cli.bash
|
||||
$out/bin/twitch-cli completion fish > twitch-cli.fish
|
||||
$out/bin/twitch-cli completion zsh > _twitch-cli
|
||||
installShellCompletion --cmd twitch-cli \
|
||||
--bash twitch-cli.bash \
|
||||
--fish twitch-cli.fish \
|
||||
--zsh _twitch-cli
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
||||
@@ -10,17 +10,17 @@ let
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "typescript-go";
|
||||
version = "0-unstable-2025-08-30";
|
||||
version = "0-unstable-2025-09-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "typescript-go";
|
||||
rev = "0a3c816da9be581f3b567df9f05b73533f5c9384";
|
||||
hash = "sha256-OAOQgHAojYadrv6bn2kXGHYisB928zW0c1g2Hx3jK50=";
|
||||
rev = "4c9b8f6b7856de7e5598350424f243e6d17d73a6";
|
||||
hash = "sha256-8qxq9JR+w7Dy1Mm2Y1wKDuYzRwvo5ORNZ7vdJla51EI=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-w+v74GjOKyhBLj557m2yjgtCqcBOi+IKJ6kkI68AjKk=";
|
||||
vendorHash = "sha256-k1fKa93zxMnORDPWnZrMahNHG0sCa3JOJl+d4T8PyIM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "uradvd";
|
||||
version = "0-unstable-2025-08-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freifunk-gluon";
|
||||
repo = "uradvd";
|
||||
rev = "b37524dfb0292c425fd61f5bffb3101fb1979264";
|
||||
hash = "sha256-PyOAt9dTFdHHF7OlHi9BBTjCN2Hmk8BsHkD2rV94ZDM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D --mode=0755 uradvd -t "$out/bin"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tiny IPv6 Router Advertisement Daemon";
|
||||
homepage = "https://github.com/freifunk-gluon/uradvd";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ aiyion ];
|
||||
mainProgram = "uradvd";
|
||||
};
|
||||
}
|
||||
@@ -69,6 +69,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Extremely fast Python package installer and resolver, written in Rust";
|
||||
longDescription = ''
|
||||
`uv` manages project dependencies and environments, with support for lockfiles, workspaces, and more.
|
||||
|
||||
Due to `uv`'s (over)eager fetching of dynamically-linked Python executables,
|
||||
as well as vendoring of dynamically-linked libraries within Python modules distributed via PyPI,
|
||||
NixOS users can run into issues when managing Python projects.
|
||||
See the Nixpkgs Reference Manual entry for `uv` for information on how to mitigate these issues:
|
||||
https://nixos.org/manual/nixpkgs/unstable/#sec-uv.
|
||||
|
||||
For building Python projects with `uv` and Nix outside of nixpkgs, check out `uv2nix` at https://github.com/pyproject-nix/uv2nix.
|
||||
'';
|
||||
homepage = "https://github.com/astral-sh/uv";
|
||||
changelog = "https://github.com/astral-sh/uv/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "vunnel";
|
||||
version = "0.38.2";
|
||||
version = "0.39.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "vunnel";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ec6gPwg5I5QplILFXlwl6AmwlaBytkRiQ9+FoRKdhTY=";
|
||||
hash = "sha256-7dguSGEDnshjBw6ImtteE39oLbbvsMdX9hz+wmOCcYU=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
autoreconfHook,
|
||||
fig2dev,
|
||||
readline,
|
||||
libX11,
|
||||
bluez,
|
||||
SDL2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "x11basic";
|
||||
version = "1.28-65";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "kollo";
|
||||
repo = "X11Basic";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-07sRUFKJ4CYMtQhRu18PElvNQN2DyKkRJUt7oIhenkA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
postPatch = ''
|
||||
chmod -R u+w examples/compiler
|
||||
substituteInPlace configure.in \
|
||||
--replace-fail "main(foo)" "int main(int foo)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
fig2dev
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
readline
|
||||
libX11
|
||||
SDL2
|
||||
bluez
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-bluetooth"
|
||||
"--with-usb"
|
||||
"--with-readline"
|
||||
"--with-sdl"
|
||||
"--with-x"
|
||||
"--enable-cryptography"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
touch x11basic.{eps,svg}
|
||||
mkdir -p $out/{bin,lib}
|
||||
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
|
||||
cp -r ../examples $out/share/.
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://x11-basic.codeberg.page";
|
||||
description = "Basic interpreter and compiler with graphics capabilities";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ edwtjo ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xmake";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmake-io";
|
||||
repo = "xmake";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PlSNeC5h2C+cQMHqN1dD6prfZIenZXEHa1nWD2SgMIU=";
|
||||
hash = "sha256-GZ296Bn+jtJKPaqVLpyDgiYwrej8CDHIudkqNJ3KUfA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deviceinfo";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/deviceinfo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Tc/jbiEoekudfy9Si6Jy51wYue6cqlMigpDHJtFl64I=";
|
||||
hash = "sha256-eZQyTRhMRobufPk5AcTY8G718T+/e3teFtqV5kGspxw=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
let
|
||||
version = "3.8.2";
|
||||
version = "3.9.2";
|
||||
in
|
||||
{ fetchurl }:
|
||||
{
|
||||
versionUsed = version;
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
|
||||
hash = "sha256-30f5sONEzlXcf8NrNPPK0vUYclULhIfj3H+Q9tlRuJE=";
|
||||
hash = "sha256-TGel6P9oew5ao8DAMS5kCxLl1eknjZG7Jc7A32YofXk=";
|
||||
};
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
|
||||
hash = "sha256-PO/YQEIKNSl302T9Lq+4pfOoUVrkJjFZ9bEETWujUpE=";
|
||||
hash = "sha256-AdBnLbgmZvcvlFLfOO4VFqcs2bwpgYvT6t34LkBVYVI=";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
|
||||
hash = "sha256-YFfbTNkJ437F99zzSsCmW8NPtBMwtMNxjEPbGlDokG8=";
|
||||
hash = "sha256-1i918/G/tEoi+9XPCltHx1hRbOyl3Me87IiJbiWD57o=";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
|
||||
hash = "sha256-KUW6qxHPdHIyjlVzcTmTuvkXlX+taRwUYcq9WglugxE=";
|
||||
hash = "sha256-7CLoEnFYLe+B0+EOKlVa5dPYHGlRRlo9Fs/EeTjp+So=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -439,7 +439,10 @@ let
|
||||
}
|
||||
.${name};
|
||||
in
|
||||
"${tools}/bin/${tools.targetPrefix}${name}";
|
||||
getToolExe tools name;
|
||||
|
||||
# targetPrefix aware lib.getExe'
|
||||
getToolExe = drv: name: lib.getExe' drv "${drv.targetPrefix or ""}${name}";
|
||||
|
||||
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
|
||||
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
|
||||
@@ -533,8 +536,15 @@ stdenv.mkDerivation (
|
||||
export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
|
||||
''
|
||||
+ lib.optionalString useLLVM ''
|
||||
export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc"
|
||||
export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt"
|
||||
export LLC="${getToolExe buildTargetLlvmPackages.llvm "llc"}"
|
||||
export OPT="${getToolExe buildTargetLlvmPackages.llvm "opt"}"
|
||||
''
|
||||
# LLVMAS should be a "specific LLVM compatible assembler" which needs to understand
|
||||
# assembly produced by LLVM. The easiest way to be sure is to use clang from the same
|
||||
# version as llc and opt. Note that the naming chosen by GHC is misleading, clang can
|
||||
# be used as an assembler, llvm-as converts IR into machine code.
|
||||
+ lib.optionalString (useLLVM && lib.versionAtLeast version "9.10") ''
|
||||
export LLVMAS="${getToolExe buildTargetLlvmPackages.clang "clang"}"
|
||||
''
|
||||
+ lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
|
||||
# LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
|
||||
@@ -544,11 +554,12 @@ stdenv.mkDerivation (
|
||||
# the assembly it is given, we need to make sure that it matches the LLVM version of $CC if possible.
|
||||
# It is unclear (at the time of writing 2024-09-01) whether $CC should match the LLVM version we use
|
||||
# for llc and opt which would require using a custom darwin stdenv for targetCC.
|
||||
# 2025-09-06: The existence of LLVMAS suggests that matching $CC is fine (correct?) here.
|
||||
export CLANG="${
|
||||
if targetCC.isClang then
|
||||
toolPath "clang" targetCC
|
||||
else
|
||||
"${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
|
||||
getToolExe buildTargetLlvmPackages.clang "clang"
|
||||
}"
|
||||
''
|
||||
# Haddock and sphinx need a working locale
|
||||
@@ -835,17 +846,19 @@ stdenv.mkDerivation (
|
||||
''
|
||||
+ lib.optionalString useLLVM ''
|
||||
ghc-settings-edit "$settingsFile" \
|
||||
"LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \
|
||||
"LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt"
|
||||
"LLVM llc command" "${getToolExe llvmPackages.llvm "llc"}" \
|
||||
"LLVM opt command" "${getToolExe llvmPackages.llvm "opt"}"
|
||||
''
|
||||
# See comment for LLVMAS in preConfigure
|
||||
+ lib.optionalString (useLLVM && lib.versionAtLeast version "9.10") ''
|
||||
ghc-settings-edit "$settingsFile" \
|
||||
"LLVM llvm-as command" "${getToolExe llvmPackages.clang "clang"}"
|
||||
''
|
||||
+ lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
|
||||
ghc-settings-edit "$settingsFile" \
|
||||
"LLVM clang command" "${
|
||||
# See comment for CLANG in preConfigure
|
||||
if installCC.isClang then
|
||||
toolPath "clang" installCC
|
||||
else
|
||||
"${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang"
|
||||
if installCC.isClang then toolPath "clang" installCC else getToolExe llvmPackages.clang "clang"
|
||||
}"
|
||||
''
|
||||
+ lib.optionalString stdenv.targetPlatform.isWindows ''
|
||||
|
||||
@@ -225,7 +225,10 @@ let
|
||||
}
|
||||
.${name};
|
||||
in
|
||||
"${tools}/bin/${tools.targetPrefix}${name}";
|
||||
getToolExe tools name;
|
||||
|
||||
# targetPrefix aware lib.getExe'
|
||||
getToolExe = drv: name: lib.getExe' drv "${drv.targetPrefix or ""}${name}";
|
||||
|
||||
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
|
||||
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
|
||||
@@ -405,8 +408,8 @@ stdenv.mkDerivation (
|
||||
export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
|
||||
''
|
||||
+ lib.optionalString useLLVM ''
|
||||
export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc"
|
||||
export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt"
|
||||
export LLC="${getToolExe buildTargetLlvmPackages.llvm "llc"}"
|
||||
export OPT="${getToolExe buildTargetLlvmPackages.llvm "opt"}"
|
||||
''
|
||||
+ lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
|
||||
# LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
|
||||
@@ -420,7 +423,7 @@ stdenv.mkDerivation (
|
||||
if targetCC.isClang then
|
||||
toolPath "clang" targetCC
|
||||
else
|
||||
"${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
|
||||
getToolExe buildTargetLlvmPackages.clang "clang"
|
||||
}"
|
||||
''
|
||||
+ ''
|
||||
@@ -627,17 +630,14 @@ stdenv.mkDerivation (
|
||||
''
|
||||
+ lib.optionalString useLLVM ''
|
||||
ghc-settings-edit "$settingsFile" \
|
||||
"LLVM llc command" "${lib.getBin llvmPackages.llvm}/bin/llc" \
|
||||
"LLVM opt command" "${lib.getBin llvmPackages.llvm}/bin/opt"
|
||||
"LLVM llc command" "${getToolExe llvmPackages.llvm "llc"}" \
|
||||
"LLVM opt command" "${getToolExe llvmPackages.llvm "opt"}"
|
||||
''
|
||||
+ lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) ''
|
||||
ghc-settings-edit "$settingsFile" \
|
||||
"LLVM clang command" "${
|
||||
# See comment for CLANG in preConfigure
|
||||
if installCC.isClang then
|
||||
toolPath "clang" installCC
|
||||
else
|
||||
"${llvmPackages.clang}/bin/${llvmPackages.clang.targetPrefix}clang"
|
||||
if installCC.isClang then toolPath "clang" installCC else getToolExe llvmPackages.clang "clang"
|
||||
}"
|
||||
''
|
||||
+ ''
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
automake,
|
||||
autoconf,
|
||||
readline,
|
||||
libX11,
|
||||
bluez,
|
||||
SDL2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "X11basic";
|
||||
version = "1.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kollokollo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
];
|
||||
buildInputs = [
|
||||
readline
|
||||
libX11
|
||||
SDL2
|
||||
bluez
|
||||
];
|
||||
|
||||
preConfigure = "cd src;autoconf";
|
||||
|
||||
configureFlags = [
|
||||
"--with-bluetooth"
|
||||
"--with-usb"
|
||||
"--with-readline"
|
||||
"--with-sdl"
|
||||
"--with-x"
|
||||
"--enable-cryptography"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
touch x11basic.{eps,svg}
|
||||
mkdir -p $out/{bin,lib}
|
||||
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
|
||||
cp -r ../examples $out/share/.
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://x11-basic.sourceforge.net/";
|
||||
description = "Basic interpreter and compiler with graphics capabilities";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -734,6 +734,13 @@ package-set { inherit pkgs lib callPackage; } self
|
||||
*/
|
||||
forceLlvmCodegenBackend = overrideCabal (drv: {
|
||||
configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ];
|
||||
buildTools = drv.buildTools or [ ] ++ [ self.ghc.llvmPackages.llvm ];
|
||||
buildTools =
|
||||
drv.buildTools or [ ]
|
||||
++ [ self.ghc.llvmPackages.llvm ]
|
||||
# GHC >= 9.10 needs LLVM specific assembler, i.e. clang
|
||||
# On Darwin clang is always required
|
||||
++ lib.optionals (lib.versionAtLeast self.ghc.version "9.10" || stdenv.hostPlatform.isDarwin) [
|
||||
self.ghc.llvmPackages.clang
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
@@ -68,10 +68,14 @@ let
|
||||
)
|
||||
);
|
||||
hasLibraries = lib.any (x: x.isHaskellLibrary) paths;
|
||||
# CLang is needed on Darwin for -fllvm to work:
|
||||
# Clang is needed on Darwin for -fllvm to work.
|
||||
# GHC >= 9.10 needs an LLVM specific assembler which we use clang for.
|
||||
# https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
|
||||
llvm = lib.makeBinPath (
|
||||
[ ghc.llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin ghc.llvmPackages.clang
|
||||
[ ghc.llvmPackages.llvm ]
|
||||
++ lib.optionals (lib.versionAtLeast ghc.version "9.10" || stdenv.targetPlatform.isDarwin) [
|
||||
ghc.llvmPackages.clang
|
||||
]
|
||||
);
|
||||
in
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
texinfo6,
|
||||
texinfo,
|
||||
libXext,
|
||||
xorgproto,
|
||||
libX11,
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
texinfo6
|
||||
texinfo
|
||||
libXext
|
||||
xorgproto
|
||||
libX11
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "malcontent";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "pwithnall";
|
||||
repo = "malcontent";
|
||||
rev = version;
|
||||
hash = "sha256-DVoTJrpXk5AoRMz+TxEP3NIAA/OOGRzZurLyGp0UBUo=";
|
||||
hash = "sha256-ekRi4yXu8u8t1AjyS3bD6tdqqnqtKyI6yZs+28LnfRY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -121,9 +121,9 @@ let
|
||||
in
|
||||
{
|
||||
ogre_14 = common {
|
||||
version = "14.4.0";
|
||||
hash = "sha256-hRHjgJgnSc8saOoLoyBCQKrLpbUVpUxuS/zsZEoulKA=";
|
||||
# https://github.com/OGRECave/ogre/blob/v14.4.0/Components/Overlay/CMakeLists.txt
|
||||
version = "14.4.1";
|
||||
hash = "sha256-G7Pf4vYoZhTmsG2AJhIR+xxtj0SHbN0dCkhtieBWm8Q=";
|
||||
# https://github.com/OGRECave/ogre/blob/v14.4.1/Components/Overlay/CMakeLists.txt
|
||||
imguiVersion = "1.91.9b";
|
||||
imguiHash = "sha256-dkukDP0HD8CHC2ds0kmqy7KiGIh4148hMCyA1QF3IMo=";
|
||||
};
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = "aioairzone";
|
||||
tag = version;
|
||||
hash = "sha256-/ZzswdGGA4IGc7djTuSIzLtBLA9oRhJBQHMBUlPci7o=";
|
||||
hash = "sha256-pFbX92UxhNcbHjU1Leoyr225Q6lCHT3hfv/mLSm7y2c=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioecowitt";
|
||||
version = "2025.9.0";
|
||||
version = "2025.9.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "aioecowitt";
|
||||
tag = version;
|
||||
hash = "sha256-i8F7vEtuorBHY7/bm+RqnUmb9CR4iopjlyPJPQ5GoMg=";
|
||||
hash = "sha256-NLVxQ7xQJiI0G9MXuVK+dWSYbA9AS7NAEEOBSCCQI88=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
babel,
|
||||
buildPythonPackage,
|
||||
certifi,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
hatchling,
|
||||
@@ -28,7 +29,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiogram";
|
||||
version = "3.21.0";
|
||||
version = "3.22.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -37,7 +38,7 @@ buildPythonPackage rec {
|
||||
owner = "aiogram";
|
||||
repo = "aiogram";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2DRKJiIZXMK2PgAQFfa0GBgVITiOrNQTM8/fnCHiiw8=";
|
||||
hash = "sha256-4LZ4+bt9n0q8WMaMEaAAIFnEuDUSd+Aq+YW49Xbcp5c=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -64,6 +65,7 @@ buildPythonPackage rec {
|
||||
redis = [ redis ];
|
||||
proxy = [ aiohttp-socks ];
|
||||
i18n = [ babel ];
|
||||
signature = [ cryptography ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioharmony";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Harmony-Libs";
|
||||
repo = "aioharmony";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QFl+OqduNGxs/+QNXpNZqtys0OTCWGmKTNa1Xht4Fuw=";
|
||||
hash = "sha256-H5zVY7LvTP8/CQtUGtXCXxOfG8GFQgdp7BY8jl9X+Gc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiontfy";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tr4nt0r";
|
||||
repo = "aiontfy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kJ6hf7CaE0uTZ7w3ggErDbXm8tYzSxstQ0qjKHlVytI=";
|
||||
hash = "sha256-mWpMMhAMb5q7gcbfqDHi4CFgQOgRAvmpFDW57qMkGkk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-detect-secrets";
|
||||
version = "1.5.44";
|
||||
version = "1.5.45";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "bridgecrewio";
|
||||
repo = "detect-secrets";
|
||||
tag = version;
|
||||
hash = "sha256-cEhZo/HfCp6Cpx2zEX7THQQJH264NJvoCRrM+ci3RrE=";
|
||||
hash = "sha256-/0VHhKcYcXYXosInjsgBf6eR7kcfLiLSyxFuaIqTbiQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.40.27";
|
||||
version = "1.40.28";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-0PC11/PsEACqI/Tt2pYEZ2eHpVaxdGsqduHoMkNtbGw=";
|
||||
hash = "sha256-DZHXS8e88DDjFVdoaJmbrSri9/OyEc5KGA3YfSFN5Zg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.40.27";
|
||||
version = "1.40.28";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-AicOiBPMx/xNBvc2ZT5aHXbo7i3VYPhex22srJfqQB8=";
|
||||
hash = "sha256-aGbQa+t4oekxPIKX20xor6UXRYalEVgaH899JLgv5Uc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dissect-target";
|
||||
version = "3.22";
|
||||
version = "3.23.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -54,7 +54,7 @@ buildPythonPackage rec {
|
||||
owner = "fox-it";
|
||||
repo = "dissect.target";
|
||||
tag = version;
|
||||
hash = "sha256-N7GxaXQj7mrTOsNGek4ZZlVF9GH/rm5CFKpYFMLJw8k=";
|
||||
hash = "sha256-WOFtDFCN3OfhEjfhEgwtJN/tQVRGvd2RMQzcKtf0atU=";
|
||||
fetchLFS = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
charset-normalizer,
|
||||
tomli,
|
||||
untokenize,
|
||||
mock,
|
||||
pytestCheckHook,
|
||||
@@ -14,10 +13,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "docformatter";
|
||||
version = "1.7.7";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyCQA";
|
||||
@@ -29,17 +25,14 @@ buildPythonPackage rec {
|
||||
patches = [ ./test-path.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'charset_normalizer = "^2.0.0"' 'charset_normalizer = ">=2.0.0"'
|
||||
substituteInPlace tests/conftest.py \
|
||||
--subst-var-by docformatter $out/bin/docformatter
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
charset-normalizer
|
||||
tomli
|
||||
untokenize
|
||||
];
|
||||
|
||||
@@ -49,10 +42,8 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Disable failing tests until https://github.com/PyCQA/docformatter/issues/274 is fixed upstream
|
||||
"test_do_format_code.py"
|
||||
"test_docformatter.py"
|
||||
# some different issue
|
||||
# AssertionError: assert 'utf_16' == 'latin-1'
|
||||
# fixed by https://github.com/PyCQA/docformatter/pull/323
|
||||
"test_detect_encoding_with_undetectable_encoding"
|
||||
];
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
pytest-mock,
|
||||
pytest-random-order,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
sanic,
|
||||
sanic-testing,
|
||||
setuptools,
|
||||
@@ -33,28 +32,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elastic-apm";
|
||||
version = "6.23.0";
|
||||
version = "6.24.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "apm-agent-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-S1Ebo9AWN+Mf3OFwxNTiR/AZtje3gNiYkZnVqGb7D4c=";
|
||||
hash = "sha256-mHDUcIII1gERlGMJvXPe3Hb38wNAylfMQpeLjA1Xbuk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-tests-with-latest-starlette-and-sanic.patch";
|
||||
url = "https://github.com/elastic/apm-agent-python/commit/80d167f54b6bf1db8b6e7ee52e2ac6803bc64f54.patch";
|
||||
hash = "sha256-VtA7+SyEZiL3aqpikyYJQ4tmdmsUpIdkSx6RtC1AzqY=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "wrapt" ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -94,6 +81,8 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Exclude tornado tests
|
||||
"tests/contrib/asyncio/tornado/tornado_tests.py"
|
||||
# Exclude client tests
|
||||
"tests/instrumentation/asyncio_tests/aiohttp_client_tests.py"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Flaky tests on Darwin
|
||||
@@ -105,8 +94,8 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python agent for the Elastic APM";
|
||||
homepage = "https://github.com/elastic/apm-agent-python";
|
||||
changelog = "https://github.com/elastic/apm-agent-python/releases/tag/v${version}";
|
||||
license = with licenses; [ bsd3 ];
|
||||
changelog = "https://github.com/elastic/apm-agent-python/releases/tag/${src.tag}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "elasticapm-run";
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "garminconnect";
|
||||
version = "0.2.28";
|
||||
version = "0.2.30";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "cyberjunky";
|
||||
repo = "python-garminconnect";
|
||||
tag = version;
|
||||
hash = "sha256-dx1MqsZRDjz0U8RU2idW5GiJBQaSyXPxnEDPk0XkLCI=";
|
||||
hash = "sha256-JCcQl7awYUnRWWVoKgirgn494HM9uXqT69f3XauTG5E=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -19,27 +19,27 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hap-python";
|
||||
version = "4.9.2";
|
||||
version = "5.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikalchev";
|
||||
repo = "HAP-python";
|
||||
tag = version;
|
||||
hash = "sha256-mBjVUfNHuGSeLRisqu9ALpTDwpxHir+6X0scq+HrzxA=";
|
||||
hash = "sha256-+EhxoO5X/ANGh008WE0sJeBsu8SRnuds3hXGxNWpKnk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
async-timeout
|
||||
chacha20poly1305-reuseable
|
||||
cryptography
|
||||
h11
|
||||
orjson
|
||||
zeroconf
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.11") [
|
||||
async-timeout
|
||||
];
|
||||
|
||||
optional-dependencies.QRCode = [
|
||||
@@ -54,30 +54,13 @@ buildPythonPackage rec {
|
||||
]
|
||||
++ optional-dependencies.QRCode;
|
||||
|
||||
disabledTestPaths = [
|
||||
# Disable tests requiring network access
|
||||
"tests/test_accessory_driver.py"
|
||||
"tests/test_hap_handler.py"
|
||||
"tests/test_hap_protocol.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_persist_and_load"
|
||||
"test_we_can_connect"
|
||||
"test_idle_connection_cleanup"
|
||||
"test_we_can_start_stop"
|
||||
"test_push_event"
|
||||
"test_bridge_run_stop"
|
||||
"test_migration_to_include_client_properties"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyhap" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "HomeKit Accessory Protocol implementation";
|
||||
homepage = "https://github.com/ikalchev/HAP-python";
|
||||
changelog = "https://github.com/ikalchev/HAP-python/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ oro ];
|
||||
changelog = "https://github.com/ikalchev/HAP-python/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ oro ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
aiohttp,
|
||||
aioresponses,
|
||||
poetry-core,
|
||||
hatchling,
|
||||
pydantic,
|
||||
pytest-asyncio,
|
||||
pytest-httpx,
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "intellifire4py";
|
||||
version = "4.1.9";
|
||||
version = "4.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -25,12 +25,12 @@ buildPythonPackage rec {
|
||||
owner = "jeeftor";
|
||||
repo = "intellifire4py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dMhm2gntLV7ev6UIfHFMATytZo5blTlALuh9sBirkqI=";
|
||||
hash = "sha256-kCZkIR8SmrLTm86M87juV7oQ+O01AA4pzkBMnKCnbNA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
aenum
|
||||
pydantic
|
||||
@@ -48,10 +48,11 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to read Intellifire fireplace status data";
|
||||
mainProgram = "intellifire4py";
|
||||
homepage = "https://github.com/jeeftor/intellifire4py";
|
||||
changelog = "https://github.com/jeeftor/intellifire4py/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
changelog = "https://github.com/jeeftor/intellifire4py/releases/tag/v${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "intellifire4py";
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-txtai";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_txtai";
|
||||
inherit version;
|
||||
hash = "sha256-0eOJ9r27lG6WwOz27+N5qldROoaU5UAewtY4N4m8Kcs=";
|
||||
hash = "sha256-GMloD+eqjYdMCqFM03NhdKjN9bMHqIdZYORA1OtWd/0=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-google";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_google";
|
||||
inherit version;
|
||||
hash = "sha256-EjokpP+46z/OwgmtQO4OnL+w4mUFR0M+2MmycojAc7E=";
|
||||
hash = "sha256-+7Lx//NNjYe0UWWOmLTxajKrfjG9OReVpPgOoO2fczk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "google-generativeai" ];
|
||||
|
||||
@@ -1001,8 +1001,8 @@ rec {
|
||||
"sha256-PgXa3veO1qGxxUBwZe2bxauFNT3nc0j8vEVk0Q4NtVU=";
|
||||
|
||||
mypy-boto3-payment-cryptography =
|
||||
buildMypyBoto3Package "payment-cryptography" "1.40.0"
|
||||
"sha256-TLCQDRpGN61tRE49LnH3wdi5rl/LV64WO6tDN30+74E=";
|
||||
buildMypyBoto3Package "payment-cryptography" "1.40.28"
|
||||
"sha256-kVtSgmoVmZ2QJ1qSBlXLrFxob3ZbO3qvoJoM/1zlSYk=";
|
||||
|
||||
mypy-boto3-payment-cryptography-data =
|
||||
buildMypyBoto3Package "payment-cryptography-data" "1.40.0"
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netutils";
|
||||
version = "1.14.1";
|
||||
version = "1.15.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "networktocode";
|
||||
repo = "netutils";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-w+31rv/0EgAT8gv/Oqlbq/djbHIgK3YF792sxBDXHEQ=";
|
||||
hash = "sha256-BdxmzxnuccAb8BiE48KSYLXJzAaz7eSYMJA2bgSbWj4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user