Merge staging-next into staging
This commit is contained in:
@@ -364,6 +364,8 @@
|
|||||||
|
|
||||||
### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}
|
### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}
|
||||||
|
|
||||||
|
- `lib.options.mkAliasOptionModuleMD` is now obsolete; use the identical [`lib.options.mkAliasOptionModule`] instead.
|
||||||
|
|
||||||
- `types.either` silently accepted mismatching types when used in `freeformType`. Module maintainers should fix the used type
|
- `types.either` silently accepted mismatching types when used in `freeformType`. Module maintainers should fix the used type
|
||||||
In most cases wrapping `either` with `attrsOf` should be sufficient.
|
In most cases wrapping `either` with `attrsOf` should be sufficient.
|
||||||
|
|
||||||
|
|||||||
@@ -1787,11 +1787,10 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Transitional version of mkAliasOptionModule that uses MD docs.
|
Deprecated alias of mkAliasOptionModule that uses MD docs.
|
||||||
|
This function is no longer necessary will be removed in 26.05`.
|
||||||
This function is no longer necessary and merely an alias of `mkAliasOptionModule`.
|
|
||||||
*/
|
*/
|
||||||
mkAliasOptionModuleMD = mkAliasOptionModule;
|
mkAliasOptionModuleMD = lib.warn "mkAliasOptionModuleMD is deprecated and will be removed in 26.05; please use mkAliasOptionModule." mkAliasOptionModule;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b
|
mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b
|
||||||
|
|||||||
@@ -1464,7 +1464,7 @@ let
|
|||||||
One or more definitions did not pass the type-check of the 'either' type.
|
One or more definitions did not pass the type-check of the 'either' type.
|
||||||
${headError.message}
|
${headError.message}
|
||||||
If `either`, `oneOf` or similar is used in freeformType, ensure that it is preceded by an 'attrsOf' such as: `freeformType = types.attrsOf (types.either t1 t2)`.
|
If `either`, `oneOf` or similar is used in freeformType, ensure that it is preceded by an 'attrsOf' such as: `freeformType = types.attrsOf (types.either t1 t2)`.
|
||||||
Otherwise consider using the correct type for the option `${showOption loc}`. This will be an error in Nixpkgs 26.06.
|
Otherwise consider using the correct type for the option `${showOption loc}`. This will be an error in Nixpkgs 26.05.
|
||||||
'' (mergeOneOption loc defs);
|
'' (mergeOneOption loc defs);
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ let
|
|||||||
mapAttrs'
|
mapAttrs'
|
||||||
mapAttrsToList
|
mapAttrsToList
|
||||||
match
|
match
|
||||||
mkAliasOptionModuleMD
|
mkAliasOptionModule
|
||||||
mkDefault
|
mkDefault
|
||||||
mkIf
|
mkIf
|
||||||
mkMerge
|
mkMerge
|
||||||
@@ -666,8 +666,8 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(mkAliasOptionModuleMD [ "users" "extraUsers" ] [ "users" "users" ])
|
(mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
|
||||||
(mkAliasOptionModuleMD [ "users" "extraGroups" ] [ "users" "groups" ])
|
(mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
|
||||||
(mkRenamedOptionModule
|
(mkRenamedOptionModule
|
||||||
[ "security" "initialRootPassword" ]
|
[ "security" "initialRootPassword" ]
|
||||||
[ "users" "users" "root" "initialHashedPassword" ]
|
[ "users" "users" "root" "initialHashedPassword" ]
|
||||||
|
|||||||
@@ -397,7 +397,6 @@
|
|||||||
./security/pam_mount.nix
|
./security/pam_mount.nix
|
||||||
./security/please.nix
|
./security/please.nix
|
||||||
./security/polkit.nix
|
./security/polkit.nix
|
||||||
./security/rngd.nix
|
|
||||||
./security/rtkit.nix
|
./security/rtkit.nix
|
||||||
./security/soteria.nix
|
./security/soteria.nix
|
||||||
./security/sudo-rs.nix
|
./security/sudo-rs.nix
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib)
|
inherit (lib)
|
||||||
mkAliasOptionModuleMD
|
mkAliasOptionModule
|
||||||
mkRemovedOptionModule
|
mkRemovedOptionModule
|
||||||
;
|
;
|
||||||
in
|
in
|
||||||
@@ -18,7 +18,7 @@ in
|
|||||||
|
|
||||||
# This alias module can't be where _module.check is defined because it would
|
# This alias module can't be where _module.check is defined because it would
|
||||||
# be added to submodules as well there
|
# be added to submodules as well there
|
||||||
(mkAliasOptionModuleMD [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
|
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
|
||||||
|
|
||||||
# Completely removed modules
|
# Completely removed modules
|
||||||
(mkRemovedOptionModule [ "boot" "loader" "raspberryPi" ]
|
(mkRemovedOptionModule [ "boot" "loader" "raspberryPi" ]
|
||||||
@@ -411,6 +411,12 @@ in
|
|||||||
(mkRemovedOptionModule [ "services" "simplesamlphp" ] ''
|
(mkRemovedOptionModule [ "services" "simplesamlphp" ] ''
|
||||||
services.simplesamlphp has been vulnerable and unmaintained in nixpkgs.
|
services.simplesamlphp has been vulnerable and unmaintained in nixpkgs.
|
||||||
'')
|
'')
|
||||||
|
(mkRemovedOptionModule [ "security" "rngd" ] ''
|
||||||
|
rngd is not necessary for any device that the kernel recognises
|
||||||
|
as an hardware RNG, as it will automatically run the krngd task
|
||||||
|
to periodically collect random data from the device and mix it
|
||||||
|
into the kernel's RNG.
|
||||||
|
'')
|
||||||
# Do NOT add any option renames here, see top of the file
|
# Do NOT add any option renames here, see top of the file
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
{ lib, ... }:
|
|
||||||
let
|
|
||||||
removed =
|
|
||||||
k:
|
|
||||||
lib.mkRemovedOptionModule [
|
|
||||||
"security"
|
|
||||||
"rngd"
|
|
||||||
k
|
|
||||||
];
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
(removed "enable" ''
|
|
||||||
rngd is not necessary for any device that the kernel recognises
|
|
||||||
as an hardware RNG, as it will automatically run the krngd task
|
|
||||||
to periodically collect random data from the device and mix it
|
|
||||||
into the kernel's RNG.
|
|
||||||
'')
|
|
||||||
(removed "debug" "The rngd module was removed, so its debug option does nothing.")
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -177,8 +177,8 @@ in
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(lib.mkAliasOptionModuleMD [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
|
(lib.mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
|
||||||
(lib.mkAliasOptionModuleMD [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
|
(lib.mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
|
||||||
(lib.mkRenamedOptionModule
|
(lib.mkRenamedOptionModule
|
||||||
[ "services" "openssh" "challengeResponseAuthentication" ]
|
[ "services" "openssh" "challengeResponseAuthentication" ]
|
||||||
[ "services" "openssh" "kbdInteractiveAuthentication" ]
|
[ "services" "openssh" "kbdInteractiveAuthentication" ]
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
let
|
let
|
||||||
inherit (lib)
|
inherit (lib)
|
||||||
mkRenamedOptionModule
|
mkRenamedOptionModule
|
||||||
mkAliasOptionModuleMD
|
mkAliasOptionModule
|
||||||
mkEnableOption
|
mkEnableOption
|
||||||
mkOption
|
mkOption
|
||||||
types
|
types
|
||||||
@@ -26,7 +26,6 @@ let
|
|||||||
|
|
||||||
cfg = config.services.transmission;
|
cfg = config.services.transmission;
|
||||||
opt = options.services.transmission;
|
opt = options.services.transmission;
|
||||||
inherit (config.environment) etc;
|
|
||||||
apparmor = config.security.apparmor;
|
apparmor = config.security.apparmor;
|
||||||
rootDir = "/run/transmission";
|
rootDir = "/run/transmission";
|
||||||
settingsDir = ".config/transmission-daemon";
|
settingsDir = ".config/transmission-daemon";
|
||||||
@@ -51,7 +50,7 @@ in
|
|||||||
"rpc-port"
|
"rpc-port"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
(mkAliasOptionModuleMD
|
(mkAliasOptionModule
|
||||||
[
|
[
|
||||||
"services"
|
"services"
|
||||||
"transmission"
|
"transmission"
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ in
|
|||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
(mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
|
(mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ])
|
||||||
(mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
|
(mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
|
||||||
This option corresponds to `refresh-rate`, which has been unused
|
This option corresponds to `refresh-rate`, which has been unused
|
||||||
since picom v6 and was subsequently removed by upstream.
|
since picom v6 and was subsequently removed by upstream.
|
||||||
|
|||||||
@@ -5,13 +5,13 @@
|
|||||||
}:
|
}:
|
||||||
mkLibretroCore {
|
mkLibretroCore {
|
||||||
core = "nestopia";
|
core = "nestopia";
|
||||||
version = "0-unstable-2025-10-15";
|
version = "0-unstable-2025-10-16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "libretro";
|
owner = "libretro";
|
||||||
repo = "nestopia";
|
repo = "nestopia";
|
||||||
rev = "3ac52e67c4a7fa696ee37e48bbcec93611277288";
|
rev = "e9429844f2e16a284a8cdf663589634fd4c6345f";
|
||||||
hash = "sha256-TDv+HTOtNEmel1lZlnlAGMVM8nEYdHLH7Rw6WBviGGw=";
|
hash = "sha256-Ss4AuIuwEbaQOUcnGfXbJbEw/1HkyGZSRD2ody+wSSU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
makefile = "Makefile";
|
makefile = "Makefile";
|
||||||
|
|||||||
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8=";
|
sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs =
|
||||||
|
lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||||
binutils
|
binutils
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
|||||||
@@ -7,16 +7,16 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "air-formatter";
|
pname = "air-formatter";
|
||||||
version = "0.7.1";
|
version = "0.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "posit-dev";
|
owner = "posit-dev";
|
||||||
repo = "air";
|
repo = "air";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-FGucu5emmBtxVloun7Kh+MWKZDYdKw+75L7g3GqQ7Tw=";
|
hash = "sha256-LNU//dQico54GhZdehynEuukfGuU8rQvfFO4zvRsZL0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-+cksQnHNXGyqbu+CoGhCEmQux7zfLIt5K5rWABfppDo=";
|
cargoHash = "sha256-9HRDUTYzKLYuh9KCcnvPXB6gDKcht79TOZZ3ze9+gbg=";
|
||||||
|
|
||||||
useNextest = true;
|
useNextest = true;
|
||||||
|
|
||||||
|
|||||||
@@ -7,16 +7,16 @@
|
|||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "all-the-package-names";
|
pname = "all-the-package-names";
|
||||||
version = "2.0.2235";
|
version = "2.0.2241";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nice-registry";
|
owner = "nice-registry";
|
||||||
repo = "all-the-package-names";
|
repo = "all-the-package-names";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-I2E1V296tljsvtpfU5xlUkKNEeEZb4qtM1WDLXQZHbg=";
|
hash = "sha256-jiHYGxESaEKQ6g4Bz7fZNz24PFmF/PWKc3ySqZzFDa8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-p1IBNK6dRBnEUEZ4bIMoGcVSPoecnKWgRtuUJTYW7q8=";
|
npmDepsHash = "sha256-KtfzWr8I0fmZfIgkVAohgd0UlJY1DeP6Q0n8e7YENrs=";
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
|||||||
@@ -8,14 +8,14 @@
|
|||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "blint";
|
pname = "blint";
|
||||||
version = "3.0.1";
|
version = "3.0.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "owasp-dep-scan";
|
owner = "owasp-dep-scan";
|
||||||
repo = "blint";
|
repo = "blint";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-E4hOTDYJzavWM0/YGclhddS0eZE9eJLQmeS4Fpbysic=";
|
hash = "sha256-ell0/opQso7/qD6d6i18vU55TfTgdcZwVFXD+yZg9/g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "cargo-mobile2";
|
pname = "cargo-mobile2";
|
||||||
version = "0.21.1";
|
version = "0.22.1";
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
@@ -18,14 +18,14 @@ rustPlatform.buildRustPackage {
|
|||||||
owner = "tauri-apps";
|
owner = "tauri-apps";
|
||||||
repo = "cargo-mobile2";
|
repo = "cargo-mobile2";
|
||||||
rev = "cargo-mobile2-v${version}";
|
rev = "cargo-mobile2-v${version}";
|
||||||
hash = "sha256-w95UAtAP11jaW4EqprGv+duBf81rLv8y7+Ej5SFeRAs=";
|
hash = "sha256-+U/uTbTGa3NPK5WpyvR5C5L1ozl+fa15pNNWYZJXgnk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||||
# sourceRoot = "${src.name}/tooling/cli";
|
# sourceRoot = "${src.name}/tooling/cli";
|
||||||
|
|
||||||
cargoHash = "sha256-Aa4Iubl8l+tss0ClF93RqVUsB4Jg4/MQCeKSr/iY5tA=";
|
cargoHash = "sha256-fMtFvPrWMLHE4N9WJv6J4pqHbHPnNKhQWz5qEvB8jKQ=";
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
mkdir -p $out/share/
|
mkdir -p $out/share/
|
||||||
|
|||||||
@@ -7,16 +7,16 @@
|
|||||||
|
|
||||||
buildGo125Module (finalAttrs: {
|
buildGo125Module (finalAttrs: {
|
||||||
pname = "chezmoi";
|
pname = "chezmoi";
|
||||||
version = "2.66.0";
|
version = "2.66.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "twpayne";
|
owner = "twpayne";
|
||||||
repo = "chezmoi";
|
repo = "chezmoi";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-r49KRq6PIB6gRnudY9HMm0UBjd07J6tUpA3oTOyJzGI=";
|
hash = "sha256-DwMkfS+D9o10Dk3jEzgkDcSoblbpoimN6RPV2iZTLcg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-ioRFzkp4aSUdPq3NSKDj05DbTp6PwAjVkf7VtdpaI2w=";
|
vendorHash = "sha256-g9bzsmLKJ7pCmTnO8N9Um1FDBvQA0mqw14fwGYMb/K0=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
|
|||||||
@@ -34,6 +34,11 @@ stdenv.mkDerivation {
|
|||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Simple batch tool to customize pak files in chrome or chromium-based browser";
|
description = "Simple batch tool to customize pak files in chrome or chromium-based browser";
|
||||||
homepage = "https://github.com/myfreeer/chrome-pak-customizer";
|
homepage = "https://github.com/myfreeer/chrome-pak-customizer";
|
||||||
|
|||||||
@@ -12,14 +12,14 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cmdstan";
|
pname = "cmdstan";
|
||||||
version = "2.36.0";
|
version = "2.37.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stan-dev";
|
owner = "stan-dev";
|
||||||
repo = "cmdstan";
|
repo = "cmdstan";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
hash = "sha256-9Dan86C0nxxxkIXaOSKExY0hngAgWTpL4RlI3rTnBZo=";
|
hash = "sha256-bKkzzFkMF8+Ufz/EdKLJdB290Fvc2t8b47xB8oPz/sk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "coroot-node-agent";
|
pname = "coroot-node-agent";
|
||||||
version = "1.26.3";
|
version = "1.26.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "coroot";
|
owner = "coroot";
|
||||||
repo = "coroot-node-agent";
|
repo = "coroot-node-agent";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-IdDH+jFVRbquM+9VkPw/Sb2dc6eajLpNsLlYkUEUNAo=";
|
hash = "sha256-bm3zMk44FNZ3vb9fP1Szbmi+0I1kOas0es8Cqu3yWeA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-LJq45IGXgYNx0Hky2w+O5Enwc5EvD79/cJRQ/iCythk=";
|
vendorHash = "sha256-LJq45IGXgYNx0Hky2w+O5Enwc5EvD79/cJRQ/iCythk=";
|
||||||
|
|||||||
@@ -6,13 +6,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "do-agent";
|
pname = "do-agent";
|
||||||
version = "3.18.4";
|
version = "3.18.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "digitalocean";
|
owner = "digitalocean";
|
||||||
repo = "do-agent";
|
repo = "do-agent";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Pn53zNp3D0NcEQqfiv4ZceLT2Pgvz7oZYZAhk2D1SCc=";
|
sha256 = "sha256-Wc0VqBiIAQGtORdm0paAm9vnbThc+5seHXmpnYcyNh8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
"yarn_offline_cache_hash": "sha256-jzBjZAqvEVGlk+5ii5s8aWvoYJKVBsh+RGcp63oim5Y="
|
"yarn_offline_cache_hash": "sha256-EZ8dVRfzAFr8wepLuS90YHvAi9BA+4etVz+Vji+bQVA="
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "draupnir",
|
"name": "draupnir",
|
||||||
"version": "2.7.0",
|
"version": "2.7.1",
|
||||||
"description": "A moderation tool for Matrix",
|
"description": "A moderation tool for Matrix",
|
||||||
"main": "lib/index.js",
|
"main": "lib/index.js",
|
||||||
"repository": "https://github.com/the-draupnir-project/Draupnir.git",
|
"repository": "https://github.com/the-draupnir-project/Draupnir.git",
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
"@sinclair/typebox": "0.34.13",
|
"@sinclair/typebox": "0.34.13",
|
||||||
"@the-draupnir-project/interface-manager": "4.2.5",
|
"@the-draupnir-project/interface-manager": "4.2.5",
|
||||||
"@the-draupnir-project/matrix-basic-types": "1.4.1",
|
"@the-draupnir-project/matrix-basic-types": "1.4.1",
|
||||||
"@the-draupnir-project/mps-interface-adaptor": "0.5.1",
|
"@the-draupnir-project/mps-interface-adaptor": "0.5.2",
|
||||||
"better-sqlite3": "^9.4.3",
|
"better-sqlite3": "^9.4.3",
|
||||||
"body-parser": "^1.20.2",
|
"body-parser": "^1.20.2",
|
||||||
"config": "^3.3.9",
|
"config": "^3.3.9",
|
||||||
@@ -65,7 +65,7 @@
|
|||||||
"matrix-appservice-bridge": "^10.3.1",
|
"matrix-appservice-bridge": "^10.3.1",
|
||||||
"matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
|
"matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
|
||||||
"matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@4.1.0",
|
"matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@4.1.0",
|
||||||
"matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@4.0.0",
|
"matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@4.0.2",
|
||||||
"pg": "^8.8.0",
|
"pg": "^8.8.0",
|
||||||
"yaml": "^2.3.2"
|
"yaml": "^2.3.2"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -22,13 +22,13 @@ let
|
|||||||
in
|
in
|
||||||
mkYarnPackage rec {
|
mkYarnPackage rec {
|
||||||
pname = "draupnir";
|
pname = "draupnir";
|
||||||
version = "2.7.0";
|
version = "2.7.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "the-draupnir-project";
|
owner = "the-draupnir-project";
|
||||||
repo = "Draupnir";
|
repo = "Draupnir";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-ZzwZg7sevX0qKnlZ4snCcwSejWqA6JHCx3e6vWucO8U=";
|
hash = "sha256-PJg+ybWe7mtLgqrBZP0xKeKWc2FPv7koyjsHyK5uRKs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -22,13 +22,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "drawterm";
|
pname = "drawterm";
|
||||||
version = "0-unstable-2025-09-11";
|
version = "0-unstable-2025-10-11";
|
||||||
|
|
||||||
src = fetchFrom9Front {
|
src = fetchFrom9Front {
|
||||||
owner = "plan9front";
|
owner = "plan9front";
|
||||||
repo = "drawterm";
|
repo = "drawterm";
|
||||||
rev = "7523180ec9e5210e28eb0191268066188cdf91ab";
|
rev = "48d53278a8273bb39ca295e8f163563ab04b3530";
|
||||||
hash = "sha256-IOZCpNXJcTpqCRsNp8aaP2vORvusLktLtyoQ7gykJB8=";
|
hash = "sha256-SReZ6A5xEpi0vL2bchVszRl3Dvm4Rw8e/5TQa+8TPto=";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|||||||
@@ -47,6 +47,18 @@ stdenv.mkDerivation {
|
|||||||
libjack2
|
libjack2
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt --replace-fail \
|
||||||
|
'cmake_minimum_required(VERSION "3.3")' \
|
||||||
|
'cmake_minimum_required(VERSION 4.0)'
|
||||||
|
substituteInPlace thirdparty/gsl-lite/CMakeLists.txt --replace-fail \
|
||||||
|
'cmake_minimum_required( VERSION 3.0 FATAL_ERROR )' \
|
||||||
|
'cmake_minimum_required(VERSION 4.0)'
|
||||||
|
substituteInPlace thirdparty/jsl/CMakeLists.txt --replace-fail \
|
||||||
|
'cmake_minimum_required(VERSION 3.3)' \
|
||||||
|
'cmake_minimum_required(VERSION 4.0)'
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/jpcima/ensemble-chorus";
|
homepage = "https://github.com/jpcima/ensemble-chorus";
|
||||||
description = "Digital model of electronic string ensemble chorus";
|
description = "Digital model of electronic string ensemble chorus";
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "exoscale-cli";
|
pname = "exoscale-cli";
|
||||||
version = "1.85.4";
|
version = "1.86.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "exoscale";
|
owner = "exoscale";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-rulleAbiwnUABnHLpfHFjGXK3/DxFJLmse3NIClSpMQ=";
|
sha256 = "sha256-AlpCTeopNfaN4IeumaEFTZNrBfIJH2RbfVoZaFRCy2Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = null;
|
vendorHash = null;
|
||||||
|
|||||||
@@ -74,6 +74,10 @@ stdenv.mkDerivation {
|
|||||||
./flopoco BuildAutocomplete
|
./flopoco BuildAutocomplete
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
|
||||||
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
|
|||||||
@@ -7,16 +7,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gcsfuse";
|
pname = "gcsfuse";
|
||||||
version = "3.4.0";
|
version = "3.4.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "googlecloudplatform";
|
owner = "googlecloudplatform";
|
||||||
repo = "gcsfuse";
|
repo = "gcsfuse";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-PdYHsHIlq77QnsjD1z3KliW3JHLZ0M26I4Z7v0SuvlU=";
|
hash = "sha256-KB7iq92U5NIchC3Lj2q2eesYLlKa1zee0rUPU81xb5k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-w5EOHPOJLfINILrP3ipZwYUAcAJIlGw1HlVAUAzW3x4=";
|
vendorHash = "sha256-BirzhmYwFSs2poA5tNOlK2bDO71mCkgSck7fE9la2wA=";
|
||||||
|
|
||||||
subPackages = [
|
subPackages = [
|
||||||
"."
|
"."
|
||||||
|
|||||||
@@ -7,16 +7,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "hcloud";
|
pname = "hcloud";
|
||||||
version = "1.54.0";
|
version = "1.55.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hetznercloud";
|
owner = "hetznercloud";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-PpCEdhEjfd7d8DdU2ABAjL8O98cLR20xWwhcESJK4uI=";
|
hash = "sha256-4UPZ3SCKTjmSt6mm0zHwecVq3UtR+cSkQmNdbkq/dMY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-tJwd/qLs0QvnjKi0B2NBTosGt7qCzJCHxZ5LYJB4vjA=";
|
vendorHash = "sha256-heCGRW8yT/aTrh4PKj62P8EPT7mXVDMo9Z8pIypOT6o=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|||||||
@@ -15,14 +15,20 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hdrmerge";
|
pname = "hdrmerge";
|
||||||
version = "0.5.0-unstable-2024-08-02";
|
version = "0.5.0-unstable-2025-04-26";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jcelaya";
|
owner = "jcelaya";
|
||||||
repo = "hdrmerge";
|
repo = "hdrmerge";
|
||||||
rev = "e2a46f97498b321b232cc7f145461212677200f1";
|
rev = "3bbe43771ba15b899151721bc14aa57e86b60f2f";
|
||||||
hash = "sha256-471gJtF9M36pAId9POG8ZIpNk9H/157EdHqXSAPlhN0=";
|
hash = "sha256-4FIGchwROXe8qLRBaYih2k9zDll2YoYGDj06SrIqK9Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Disable find_package(ALGLIB REQUIRED) in the CMake file by providing a empty
|
||||||
|
# FindALGLIB.cmake, and provide ALGLIB_INCLUDES and ALGLIB_LIBRARIES ourselves
|
||||||
|
preConfigure = ''
|
||||||
|
touch cmake/FindALGLIB.cmake
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkg-config
|
pkg-config
|
||||||
@@ -39,12 +45,8 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DALGLIB_DIR:PATH=${alglib}"
|
(lib.cmakeFeature "ALGLIB_INCLUDES" "${alglib}/include/alglib")
|
||||||
];
|
(lib.cmakeFeature "ALGLIB_LIBRARIES" "alglib3")
|
||||||
|
|
||||||
CXXFLAGS = [
|
|
||||||
# GCC 13: error: 'uint32_t' does not name a type
|
|
||||||
"-include cstdint"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
desktopItems = [
|
desktopItems = [
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchpatch,
|
||||||
cmake,
|
cmake,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
hyprutils,
|
hyprutils,
|
||||||
@@ -23,6 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
hash = "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=";
|
hash = "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# this should be removed in the next release
|
||||||
|
(fetchpatch {
|
||||||
|
name = "Fix build with Qt 6.10";
|
||||||
|
url = "https://github.com/hyprwm/hyprland-qtutils/commit/5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c.patch";
|
||||||
|
hash = "sha256-5nVj4AFJpmazX9o9tQD6mzBW9KtRYov4yRbGpUwFcgc=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
@@ -6,13 +6,13 @@
|
|||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "infrastructure-agent";
|
pname = "infrastructure-agent";
|
||||||
version = "1.69.0";
|
version = "1.70.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "newrelic";
|
owner = "newrelic";
|
||||||
repo = "infrastructure-agent";
|
repo = "infrastructure-agent";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-6yoHx1fVDaJZsQKFSfOCau/BrB6zcT52yrLbPp8ZiKQ=";
|
hash = "sha256-VdBcVFDtPajmAAQe2aZONf0/pCMf98gtR9zoeqL1aKQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-KBzckYxiQ4/nhm7ZfGQDGi5uN652oZgdc9i0UexMr24=";
|
vendorHash = "sha256-KBzckYxiQ4/nhm7ZfGQDGi5uN652oZgdc9i0UexMr24=";
|
||||||
|
|||||||
@@ -3,8 +3,10 @@
|
|||||||
lib,
|
lib,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
fetchFromGitLab,
|
fetchFromGitLab,
|
||||||
|
fetchpatch,
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
ffmpeg_6,
|
ffmpeg_6,
|
||||||
|
ninja,
|
||||||
|
|
||||||
# for daemon
|
# for daemon
|
||||||
autoreconfHook,
|
autoreconfHook,
|
||||||
@@ -12,7 +14,7 @@
|
|||||||
alsa-lib,
|
alsa-lib,
|
||||||
asio,
|
asio,
|
||||||
dbus,
|
dbus,
|
||||||
sdbus-cpp,
|
sdbus-cpp_2,
|
||||||
fmt,
|
fmt,
|
||||||
gmp,
|
gmp,
|
||||||
gnutls,
|
gnutls,
|
||||||
@@ -62,25 +64,32 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jami";
|
pname = "jami";
|
||||||
version = "20250718.0";
|
version = "20251003.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "git.jami.net";
|
domain = "git.jami.net";
|
||||||
owner = "savoirfairelinux";
|
owner = "savoirfairelinux";
|
||||||
repo = "jami-client-qt";
|
repo = "jami-client-qt";
|
||||||
rev = "stable/${version}";
|
rev = "stable/${version}";
|
||||||
hash = "sha256-EEiuymfu28bJ6pfBKwlsCGDq7XlKGZYK+2WjPJ+tcxw=";
|
hash = "sha256-CYKrIWGTmGvHIhNdyEhDKE1Rm84O7X3yPVLkF6qakwU=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jami-qt/-/raw/0ecbaf3b101bbdd0d4a06b06f3ce1ff654abf0b5/fix-link.patch";
|
||||||
|
hash = "sha256-VsQbOPHyNFcRhpae+9UCaUJdHH8bMGf3ZIAW3RKiu6k=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
pjsip-jami = pjsip.overrideAttrs (old: {
|
pjsip-jami = pjsip.overrideAttrs (old: {
|
||||||
version = "sfl-2.15-unstable-2025-02-24";
|
version = "sfl-2.15-unstable-2025-09-18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "savoirfairelinux";
|
owner = "savoirfairelinux";
|
||||||
repo = "pjproject";
|
repo = "pjproject";
|
||||||
rev = "37130c943d59f25a71935803ea2d84515074a237";
|
rev = "93dc96918bb6ba74e1e1d00c40c80402e856f2ac";
|
||||||
hash = "sha256-7gAiriuooqqF38oajAuD/Lj5trn/9VMkCGOumcV45NA=";
|
hash = "sha256-wsbKa3TXqj+nQMtAaEAD0Zh248QdNMhKnIOnq08MPI0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
@@ -118,14 +127,14 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
dhtnet = stdenv.mkDerivation {
|
dhtnet = stdenv.mkDerivation {
|
||||||
pname = "dhtnet";
|
pname = "dhtnet";
|
||||||
version = "unstable-2025-05-26";
|
version = "unstable-2025-09-15";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "git.jami.net";
|
domain = "git.jami.net";
|
||||||
owner = "savoirfairelinux";
|
owner = "savoirfairelinux";
|
||||||
repo = "dhtnet";
|
repo = "dhtnet";
|
||||||
rev = "6c5ee3a21556d668d047cdedb5c4b746c3c6bdb2";
|
rev = "7861b4620b4cec5fa34c5d1bb2b304912730f638";
|
||||||
hash = "sha256-uweYSEysVMUC7DhI9BhS1TDZ6ZY7WQ9JS3ZF9lKA4Fo=";
|
hash = "sha256-nhGB4u12Ubmc7lLVOAwycRsP+cWzn4A9bYH0+sSBQTg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
@@ -177,12 +186,6 @@ stdenv.mkDerivation rec {
|
|||||||
inherit src version meta;
|
inherit src version meta;
|
||||||
sourceRoot = "${src.name}/daemon";
|
sourceRoot = "${src.name}/daemon";
|
||||||
|
|
||||||
# Fix for libgit2 breaking changes
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace src/jamidht/conversationrepository.cpp \
|
|
||||||
--replace-fail "git_commit* const" "const git_commit*"
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
pkg-config
|
pkg-config
|
||||||
@@ -194,7 +197,7 @@ stdenv.mkDerivation rec {
|
|||||||
asio
|
asio
|
||||||
dbus
|
dbus
|
||||||
dhtnet
|
dhtnet
|
||||||
sdbus-cpp
|
sdbus-cpp_2
|
||||||
fmt
|
fmt
|
||||||
ffmpeg_6
|
ffmpeg_6
|
||||||
gmp
|
gmp
|
||||||
@@ -233,7 +236,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake
|
sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake
|
||||||
sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt
|
|
||||||
cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit
|
cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
--replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)'
|
--replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)'
|
||||||
@@ -257,6 +259,7 @@ stdenv.mkDerivation rec {
|
|||||||
git
|
git
|
||||||
python3
|
python3
|
||||||
qt6Packages.qttools # for translations
|
qt6Packages.qttools # for translations
|
||||||
|
ninja
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@@ -284,7 +287,11 @@ stdenv.mkDerivation rec {
|
|||||||
++ lib.optionals withWebengine [ qtwebengine ]
|
++ lib.optionals withWebengine [ qtwebengine ]
|
||||||
);
|
);
|
||||||
|
|
||||||
cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ];
|
cmakeFlags = [
|
||||||
|
(lib.cmakeBool "JAMICORE_AS_SUBDIR" false)
|
||||||
|
(lib.cmakeBool "DWITH_WEBENGINE" withWebengine)
|
||||||
|
"-DLIBJAMI_INCLUDE_DIRS=${daemon}/include/jami"
|
||||||
|
];
|
||||||
|
|
||||||
qtWrapperArgs = [
|
qtWrapperArgs = [
|
||||||
# With wayland the titlebar is not themed and the wmclass is wrong.
|
# With wayland the titlebar is not themed and the wmclass is wrong.
|
||||||
@@ -295,7 +302,10 @@ stdenv.mkDerivation rec {
|
|||||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.updateScript = gitUpdater { rev-prefix = "stable/"; };
|
passthru = {
|
||||||
|
updateScript = gitUpdater { rev-prefix = "stable/"; };
|
||||||
|
inherit daemon pjsip dhtnet;
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://jami.net/";
|
homepage = "https://jami.net/";
|
||||||
|
|||||||
@@ -18,11 +18,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "jenkins";
|
pname = "jenkins";
|
||||||
version = "2.516.3";
|
version = "2.528.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
|
url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
|
||||||
hash = "sha256-gbOrzA8kzqSOdO/+FS9p3F8NiA7cDCc3xhRGs8WZLAA=";
|
hash = "sha256-1jDcomX3Wo1YHxJ6kjTxZ51LCACo83DQOtShVM63KVs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|||||||
@@ -53,6 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||||
doInstallCheck = true;
|
doInstallCheck = true;
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|||||||
@@ -9,16 +9,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "juju";
|
pname = "juju";
|
||||||
version = "3.6.10";
|
version = "3.6.11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "juju";
|
owner = "juju";
|
||||||
repo = "juju";
|
repo = "juju";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-J3AFH6kg+M6/8posiUaVP4biQpKPQ07Qp5BU3prAG/A=";
|
hash = "sha256-jeRA2HwXJt1FLQrUsE/OrpeRib5VRbNk84FTHCBeHiM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-zTavqjEH4maEMj+AuYMcjT289peVNIc0rysBnnMxFNU=";
|
vendorHash = "sha256-pa6NOoC4OakJdKB2cWtQVoEt2UX/xv8mDOHmlDSk8Z8=";
|
||||||
|
|
||||||
subPackages = [
|
subPackages = [
|
||||||
"cmd/juju"
|
"cmd/juju"
|
||||||
|
|||||||
@@ -6,13 +6,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kafkactl";
|
pname = "kafkactl";
|
||||||
version = "5.13.0";
|
version = "5.14.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "deviceinsight";
|
owner = "deviceinsight";
|
||||||
repo = "kafkactl";
|
repo = "kafkactl";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-YJpRXCTI0Mwi4Zxeex8oxgzElk7l8Qus75lR42/wSww=";
|
hash = "sha256-WBycrpte3LSwAAjeD+gHXLEz9Y7075Ryip58fIGdJ8Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-sVvEHMXpjas+l93IZfAChDX5eDm0lkUNCr5r1JaVQ9I=";
|
vendorHash = "sha256-sVvEHMXpjas+l93IZfAChDX5eDm0lkUNCr5r1JaVQ9I=";
|
||||||
|
|||||||
48
pkgs/by-name/ke/keyoxide-cli/package.nix
Normal file
48
pkgs/by-name/ke/keyoxide-cli/package.nix
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitea,
|
||||||
|
fetchYarnDeps,
|
||||||
|
yarnConfigHook,
|
||||||
|
yarnBuildHook,
|
||||||
|
yarnInstallHook,
|
||||||
|
nodejs,
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "keyoxide-cli";
|
||||||
|
version = "0.4.4";
|
||||||
|
|
||||||
|
src = fetchFromGitea {
|
||||||
|
domain = "codeberg.org";
|
||||||
|
owner = "keyoxide";
|
||||||
|
repo = "keyoxide-cli";
|
||||||
|
tag = finalAttrs.version;
|
||||||
|
hash = "sha256-lQEvtqFq3OBlXdYdrhMsAns4kimR2RfRx3VFNy4nEu8=";
|
||||||
|
};
|
||||||
|
|
||||||
|
yarnOfflineCache = fetchYarnDeps {
|
||||||
|
inherit (finalAttrs) src;
|
||||||
|
hash = "sha256-UxP5NkmA3MsrXhoa+JviDdW19HKE6Xpj1dkN7h0ggck=";
|
||||||
|
};
|
||||||
|
|
||||||
|
yarnBuildScript = "prettier";
|
||||||
|
yarnBuildFlags = "src/commands.js";
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
yarnConfigHook
|
||||||
|
yarnBuildHook
|
||||||
|
yarnInstallHook
|
||||||
|
# Needed for executing package.json scripts
|
||||||
|
nodejs
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
changelog = "https://codeberg.org/keyoxide/keyoxide-cli/releases/tag/${finalAttrs.version}";
|
||||||
|
description = "Command-line interface to locally verify decentralized identities";
|
||||||
|
homepage = "https://codeberg.org/keyoxide/keyoxide-cli";
|
||||||
|
license = lib.licenses.agpl3Plus;
|
||||||
|
maintainers = [ lib.maintainers.pyrox0 ];
|
||||||
|
mainProgram = "keyoxide";
|
||||||
|
};
|
||||||
|
})
|
||||||
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://knightos.org/";
|
homepage = "https://knightos.org/";
|
||||||
description = "Utility to write a KFS filesystem into a ROM file";
|
description = "Utility to write a KFS filesystem into a ROM file";
|
||||||
|
|||||||
@@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [ boost ];
|
buildInputs = [ boost ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/KnightOS/kcc";
|
homepage = "https://github.com/KnightOS/kcc";
|
||||||
description = "KnightOS C compiler";
|
description = "KnightOS C compiler";
|
||||||
|
|||||||
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://knightos.org/";
|
homepage = "https://knightos.org/";
|
||||||
description = "Converts image formats supported by stb_image to the KnightOS image format";
|
description = "Converts image formats supported by stb_image to the KnightOS image format";
|
||||||
|
|||||||
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
hardeningDisable = [ "fortify" ];
|
hardeningDisable = [ "fortify" ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://knightos.org/";
|
homepage = "https://knightos.org/";
|
||||||
description = "Tool to create or extract KnightOS packages";
|
description = "Tool to create or extract KnightOS packages";
|
||||||
|
|||||||
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://knightos.org/";
|
homepage = "https://knightos.org/";
|
||||||
description = "Makes TI calculator upgrade files from ROM dumps";
|
description = "Makes TI calculator upgrade files from ROM dumps";
|
||||||
|
|||||||
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://knightos.org/";
|
homepage = "https://knightos.org/";
|
||||||
description = "Patches jumptables into TI calculator ROM files and generates an include file";
|
description = "Patches jumptables into TI calculator ROM files and generates an include file";
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
|
|||||||
cmakeFlags = [ "-DSCAS_LIBRARY=1" ];
|
cmakeFlags = [ "-DSCAS_LIBRARY=1" ];
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
--replace "TARGETS scas scdump scwrap" "TARGETS scas scdump scwrap generate_tables"
|
--replace-fail "TARGETS scas scdump scwrap" "TARGETS scas scdump scwrap generate_tables" \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
'';
|
'';
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,15 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
cmakeFlags = [ "-Denable-sdl=YES" ];
|
cmakeFlags = [ "-Denable-sdl=YES" ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
substituteInPlace libz80e/CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
substituteInPlace frontends/libz80e/CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://knightos.org/";
|
homepage = "https://knightos.org/";
|
||||||
description = "Z80 calculator emulator and debugger";
|
description = "Z80 calculator emulator and debugger";
|
||||||
|
|||||||
@@ -17,14 +17,14 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libcmatrix";
|
pname = "libcmatrix";
|
||||||
version = "0.0.3";
|
version = "0.0.4";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "source.puri.sm";
|
domain = "source.puri.sm";
|
||||||
owner = "Librem5";
|
owner = "Librem5";
|
||||||
repo = "libcmatrix";
|
repo = "libcmatrix";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-Usaqkb6zClVtYCL1VUv4iNeKs2GZECO9sOdPk3N8iLM=";
|
hash = "sha256-MyjgxOJmaDylPA2AENZPR+dfh2UN1H93ZOLMlycEmTw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "litmusctl";
|
pname = "litmusctl";
|
||||||
version = "1.18.0";
|
version = "1.19.0";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
@@ -23,7 +23,7 @@ buildGoModule rec {
|
|||||||
owner = "litmuschaos";
|
owner = "litmuschaos";
|
||||||
repo = "litmusctl";
|
repo = "litmusctl";
|
||||||
rev = "${version}";
|
rev = "${version}";
|
||||||
hash = "sha256-lfR4Nk9n6mpfQVrVoI2iaCYkJelgGi5QLdZN9n0qPVQ=";
|
hash = "sha256-0fHkUKU1MwvPuM+20dH7W/GFdhzY+avgCufpKEDnPZQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0=";
|
vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0=";
|
||||||
|
|||||||
@@ -6,14 +6,14 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "loco";
|
pname = "loco";
|
||||||
version = "0.16.2";
|
version = "0.16.3";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-yctOGUfKd1zaIArtHESYEr1q79ZrJqL7H6bvpAFrE+8=";
|
hash = "sha256-DdrLABMiTutIhUHvUw29DYZIT+YHLNJjoTT5kWMeAkU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-IdYicJ7ZIoVOQU91S8yIPYGeY+DaeAMztGOmriTGW38=";
|
cargoHash = "sha256-01IQxfeOzxOHqRovmNV3q/ZSdESWi7Gb6F7o51Rbkw4=";
|
||||||
|
|
||||||
#Skip trycmd integration tests
|
#Skip trycmd integration tests
|
||||||
checkFlags = [ "--skip=cli_tests" ];
|
checkFlags = [ "--skip=cli_tests" ];
|
||||||
|
|||||||
@@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "mtail";
|
pname = "mtail";
|
||||||
version = "3.2.20";
|
version = "3.2.21";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jaqx0r";
|
owner = "jaqx0r";
|
||||||
repo = "mtail";
|
repo = "mtail";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-w895q6J0o4a4y3YwGWyu5tpv7ow9RNWEFQVIMDJo43Y=";
|
hash = "sha256-i5c9e7b7PmvFdNddngsCIx4GKYqPPwTZSUoNAIL8RZ4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-hVguLf/EkTz7Z8lTT9tCQ8iGO5asSkrsW+u8D1ND+dw=";
|
vendorHash = "sha256-hVguLf/EkTz7Z8lTT9tCQ8iGO5asSkrsW+u8D1ND+dw=";
|
||||||
|
|||||||
@@ -118,13 +118,13 @@ in
|
|||||||
goBuild (finalAttrs: {
|
goBuild (finalAttrs: {
|
||||||
pname = "ollama";
|
pname = "ollama";
|
||||||
# don't forget to invalidate all hashes each update
|
# don't forget to invalidate all hashes each update
|
||||||
version = "0.12.5";
|
version = "0.12.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ollama";
|
owner = "ollama";
|
||||||
repo = "ollama";
|
repo = "ollama";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-X5xxM53DfN8EW29hfJiAeADKLvKdmdNYE2NBa05T82k=";
|
hash = "sha256-Ttwcpg2bgz7D8IqPRTNeZUQFA/HsGc8gCOiXRs7onBg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";
|
vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";
|
||||||
|
|||||||
@@ -22,13 +22,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "opendht";
|
pname = "opendht";
|
||||||
version = "3.4.0";
|
version = "3.5.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "savoirfairelinux";
|
owner = "savoirfairelinux";
|
||||||
repo = "opendht";
|
repo = "opendht";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-WNN4aCZiJuz9CgEKIzFmy50HBj0ZL/d1uU7L518lPhk=";
|
hash = "sha256-mnnd6yATIk/TEuFG/M98d+pfeh42IKWBBYjkTP52xeM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -1,38 +1,26 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchurl,
|
fetchFromGitLab,
|
||||||
fetchpatch,
|
|
||||||
cmake,
|
cmake,
|
||||||
unzip,
|
|
||||||
gmp,
|
gmp,
|
||||||
scalp,
|
scalp,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation {
|
||||||
pname = "pagsuite";
|
pname = "pagsuite";
|
||||||
version = "1.80";
|
version = "1.80-unstable-2025-05-03";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitLab {
|
||||||
url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${
|
domain = "gitlab.com";
|
||||||
lib.replaceStrings [ "." ] [ "_" ] version
|
owner = "kumm";
|
||||||
}.zip";
|
repo = "pagsuite";
|
||||||
hash = "sha256-TYd+dleVPWEWU9Cb3XExd7ixJZyiUAp9QLtorYJSIbQ=";
|
rev = "1cc657765658cb2eb622d4a9c656ab9854150e7d";
|
||||||
|
hash = "sha256-jyp3h5n6SkyTpLzqMezvu2nri6rDkX3ACcCO9r4/bBA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix issue with latest ScaLP update
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.com/kumm/pagsuite/-/commit/cae9f78bec93a7f197461358f2f796f6b5778781.patch";
|
|
||||||
hash = "sha256-12IisS6oGYLRicORTemHB7bw9EB9cuQjxG8f6X0WMrU=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
sourceRoot = "pagsuite_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
unzip
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@@ -40,6 +28,9 @@ stdenv.mkDerivation rec {
|
|||||||
scalp
|
scalp
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# make[2]: *** No rule to make target 'lib/libpag.dylib', needed by 'bin/osr'. Stop.
|
||||||
|
enableParallelBuilding = false;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Optimization tools for the (P)MCM problem";
|
description = "Optimization tools for the (P)MCM problem";
|
||||||
homepage = "https://gitlab.com/kumm/pagsuite";
|
homepage = "https://gitlab.com/kumm/pagsuite";
|
||||||
|
|||||||
@@ -7,16 +7,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "pocketbase";
|
pname = "pocketbase";
|
||||||
version = "0.30.2";
|
version = "0.30.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pocketbase";
|
owner = "pocketbase";
|
||||||
repo = "pocketbase";
|
repo = "pocketbase";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-7XpusTwdocLsJBHWU71nHMmY0T05d4fKHe5XKvHSPR0=";
|
hash = "sha256-n2xBwonQOEk2LVQePxdO/PraM75FFDmOqZ9fIL2xd+I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-ft+hs1VfCZrWceVDqO7ThRE1tiyozMFsYMclsKKdEBo=";
|
vendorHash = "sha256-Zo0b0MTIRpLGPIg288ROFPIdHfMzZdFLbFZPAffWPxU=";
|
||||||
|
|
||||||
# This is the released subpackage from upstream repo
|
# This is the released subpackage from upstream repo
|
||||||
subPackages = [ "examples/base" ];
|
subPackages = [ "examples/base" ];
|
||||||
|
|||||||
@@ -14,13 +14,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "projectm-sdl-cpp";
|
pname = "projectm-sdl-cpp";
|
||||||
version = "0-unstable-2025-10-08";
|
version = "0-unstable-2025-10-17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "projectM-visualizer";
|
owner = "projectM-visualizer";
|
||||||
repo = "frontend-sdl-cpp";
|
repo = "frontend-sdl-cpp";
|
||||||
rev = "7131af0618e4d7f4b64c623ad92795fef5a2d87a";
|
rev = "72e5632897c9d9bef452c679d3cbe8c7b4bb4157";
|
||||||
hash = "sha256-pXQGMwjOh7LjDuUPbXp5l9O4aSWqnTxdZSMtDzZ8118=";
|
hash = "sha256-uO2+CX2DqVn6NdcZhBlKFIPuUQpz6N8LazG3ALJTSx0=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -6,16 +6,16 @@
|
|||||||
|
|
||||||
buildGoModule (finalAttrs: {
|
buildGoModule (finalAttrs: {
|
||||||
pname = "reaper-go";
|
pname = "reaper-go";
|
||||||
version = "0.2.3";
|
version = "0.2.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ghostsecurity";
|
owner = "ghostsecurity";
|
||||||
repo = "reaper";
|
repo = "reaper";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-NXRqKO76RoxEvR7slMmUDdesRFMxDJpX/IGxoTDwJVU=";
|
hash = "sha256-3kTGlGvuTSB3KOeQvhF/pNaWVU153qGqqskJd+G6FF4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-PxZ+fx5wkYuggMfpTfkc8quSssCzXdIcwjdR4qhDbqE=";
|
vendorHash = "sha256-T9qTfGRLhlYrezraRRztZC2Kw4L6Fap1YQgQdnlxKhE=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|||||||
@@ -9,13 +9,13 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "reindeer";
|
pname = "reindeer";
|
||||||
version = "2025.10.13.00";
|
version = "2025.10.20.00";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "facebookincubator";
|
owner = "facebookincubator";
|
||||||
repo = "reindeer";
|
repo = "reindeer";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-jbxTHu8IoUsQMkH2u82T6XsRKto7Z3ehEOAL9v0WGxE=";
|
hash = "sha256-SHJIDFhK5y+XxOS76pbSXW8Hr1Y5g0uhSw4km5usIsM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-XTp0GaqJhNf6auZzdv0+aGgIJ6hh3027EqPr90nWB3I=";
|
cargoHash = "sha256-XTp0GaqJhNf6auZzdv0+aGgIJ6hh3027EqPr90nWB3I=";
|
||||||
|
|||||||
@@ -6,16 +6,16 @@
|
|||||||
|
|
||||||
buildGoModule (finalAttrs: {
|
buildGoModule (finalAttrs: {
|
||||||
pname = "rqlite";
|
pname = "rqlite";
|
||||||
version = "9.1.2";
|
version = "9.1.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rqlite";
|
owner = "rqlite";
|
||||||
repo = "rqlite";
|
repo = "rqlite";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-7QAJofhssL2N5szD4j9rcv830sEnMyrS2Mg4s4G33HI=";
|
hash = "sha256-BybfZio4SSlpTbNHWfiA/2lVcNXhKWaBNTEoCSDxMSE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-zGAC7yDccfhZ+2WeiN9DAsOFTa3j4ymPxeFNwam7+Ts=";
|
vendorHash = "sha256-bkAlZT0bntSdVwioEaqBK7XObGwJuIG7tfF7XOr3lKQ=";
|
||||||
|
|
||||||
subPackages = [
|
subPackages = [
|
||||||
"cmd/rqlite"
|
"cmd/rqlite"
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required (VERSION 3.3.2)" "cmake_minimum_required (VERSION 3.5)" \
|
||||||
--replace-fail "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" \
|
--replace-fail "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" \
|
||||||
--replace-fail "-m64" ""
|
--replace-fail "-m64" ""
|
||||||
substituteInPlace src/tests/CMakeLists.txt \
|
substituteInPlace src/tests/CMakeLists.txt \
|
||||||
|
|||||||
@@ -48,6 +48,9 @@ stdenv.mkDerivation {
|
|||||||
# replace bundled version of mpreal/mpfrc++
|
# replace bundled version of mpreal/mpfrc++
|
||||||
rm -r src/mpfr
|
rm -r src/mpfr
|
||||||
cp -r ${mpreal} src/mpfr
|
cp -r ${mpreal} src/mpfr
|
||||||
|
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|||||||
51
pkgs/by-name/si/sigsum/package.nix
Normal file
51
pkgs/by-name/si/sigsum/package.nix
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
buildGoModule,
|
||||||
|
fetchFromGitLab,
|
||||||
|
versionCheckHook,
|
||||||
|
nix-update-script,
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildGoModule (finalAttrs: {
|
||||||
|
pname = "sigsum";
|
||||||
|
version = "0.11.2";
|
||||||
|
|
||||||
|
src = fetchFromGitLab {
|
||||||
|
domain = "git.glasklar.is";
|
||||||
|
group = "sigsum";
|
||||||
|
owner = "core";
|
||||||
|
repo = "sigsum-go";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-oaYquy0N8yHfKLoNEv8Vte3dpp/UQFZ74mZHin8dDzw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace internal/version/version.go \
|
||||||
|
--replace-fail "info.Main.Version" '"${finalAttrs.version}"'
|
||||||
|
'';
|
||||||
|
|
||||||
|
vendorHash = "sha256-8Tyhd13PRTO2dGOdhkgYmwsVzWfqwOpZ9XSsAtiCcyM=";
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-s"
|
||||||
|
"-w"
|
||||||
|
];
|
||||||
|
|
||||||
|
excludedPackages = [ "./test" ];
|
||||||
|
|
||||||
|
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||||
|
versionCheckProgram = "${placeholder "out"}/bin/sigsum-key";
|
||||||
|
versionCheckProgramArg = "--version";
|
||||||
|
doInstallCheck = true;
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "System for public and transparent logging of signed checksums";
|
||||||
|
homepage = "https://www.sigsum.org/";
|
||||||
|
downloadPage = "https://git.glasklar.is/sigsum/core/sigsum-go";
|
||||||
|
changelog = "https://git.glasklar.is/sigsum/core/sigsum-go/-/blob/v${finalAttrs.version}/NEWS";
|
||||||
|
license = lib.licenses.bsd2;
|
||||||
|
maintainers = with lib.maintainers; [ defelo ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
diff --git a/libsofia-sip-ua-glib/su-glib/Makefile.am b/libsofia-sip-ua-glib/su-glib/Makefile.am
|
||||||
|
index 6f54d34..c5bfd82 100644
|
||||||
|
--- a/libsofia-sip-ua-glib/su-glib/Makefile.am
|
||||||
|
+++ b/libsofia-sip-ua-glib/su-glib/Makefile.am
|
||||||
|
@@ -20,12 +20,12 @@ AM_CPPFLAGS = -I$(S_BASE)/su -I$(B_BASE)/su $(GLIB_CFLAGS) \
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES = libsu-glib.la
|
||||||
|
|
||||||
|
-check_PROGRAMS = su_source_test torture_su_glib_timer
|
||||||
|
+check_PROGRAMS =
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
# Tests
|
||||||
|
|
||||||
|
-TESTS = su_source_test torture_su_glib_timer
|
||||||
|
+TESTS =
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
# Rules for building the targets
|
||||||
|
diff --git a/libsofia-sip-ua/nta/Makefile.am b/libsofia-sip-ua/nta/Makefile.am
|
||||||
|
index c450fd1..4f322c3 100644
|
||||||
|
--- a/libsofia-sip-ua/nta/Makefile.am
|
||||||
|
+++ b/libsofia-sip-ua/nta/Makefile.am
|
||||||
|
@@ -26,9 +26,9 @@ AM_CPPFLAGS = -I$(srcdir)/../ipt -I../ipt \
|
||||||
|
noinst_LTLIBRARIES = libnta.la
|
||||||
|
|
||||||
|
check_PROGRAMS = check_nta test_nta_api test_nta portbind
|
||||||
|
-dist_noinst_SCRIPTS = run_test_nta_api run_test_nta
|
||||||
|
+dist_noinst_SCRIPTS = run_test_nta_api
|
||||||
|
|
||||||
|
-TESTS = run_check_nta run_test_nta_api run_test_nta
|
||||||
|
+TESTS = run_test_nta_api
|
||||||
|
|
||||||
|
TESTS_ENVIRONMENT = $(SHELL)
|
||||||
|
|
||||||
|
diff --git a/libsofia-sip-ua/nua/Makefile.am b/libsofia-sip-ua/nua/Makefile.am
|
||||||
|
index 6b6dfaa..73ffd70 100644
|
||||||
|
--- a/libsofia-sip-ua/nua/Makefile.am
|
||||||
|
+++ b/libsofia-sip-ua/nua/Makefile.am
|
||||||
|
@@ -17,8 +17,8 @@ check_PROGRAMS =
|
||||||
|
TESTS =
|
||||||
|
|
||||||
|
if HAVE_CHECK
|
||||||
|
-check_PROGRAMS += check_nua
|
||||||
|
-TESTS += check_nua
|
||||||
|
+check_PROGRAMS +=
|
||||||
|
+TESTS +=
|
||||||
|
endif
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
diff --git a/libsofia-sip-ua/su/Makefile.am b/libsofia-sip-ua/su/Makefile.am
|
||||||
|
index db3a331..0a31c72 100644
|
||||||
|
--- a/libsofia-sip-ua/su/Makefile.am
|
||||||
|
+++ b/libsofia-sip-ua/su/Makefile.am
|
||||||
|
@@ -20,7 +20,7 @@ check_PROGRAMS = torture_su torture_su_port \
|
||||||
|
torture_su_alloc torture_su_time torture_su_tag \
|
||||||
|
test_htable test_htable2 torture_rbtree torture_heap \
|
||||||
|
test_memmem torture_su_bm \
|
||||||
|
- torture_su_root torture_su_timer \
|
||||||
|
+ torture_su_timer \
|
||||||
|
test_su su_proxy test_poll $(OSXPROGS)
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
@@ -30,8 +30,8 @@ TESTS = torture_su torture_su_port \
|
||||||
|
torture_su_alloc torture_su_time torture_su_tag \
|
||||||
|
test_htable test_htable2 torture_rbtree torture_heap \
|
||||||
|
test_memmem torture_su_bm \
|
||||||
|
- torture_su_root torture_su_timer \
|
||||||
|
- run_addrinfo run_localinfo run_test_su \
|
||||||
|
+ torture_su_timer \
|
||||||
|
+ run_localinfo run_test_su \
|
||||||
|
$(OSXTESTS)
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
@@ -98,7 +98,7 @@ LDADD = libsu.la
|
||||||
|
# Install and distribution rules
|
||||||
|
|
||||||
|
EXTRA_DIST += su.docs \
|
||||||
|
- run_addrinfo run_localinfo run_test_su
|
||||||
|
+ run_localinfo run_test_su
|
||||||
|
|
||||||
|
dist_pkgdata_SCRIPTS = tag_dll.awk
|
||||||
|
|
||||||
|
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||||
|
index cabc2b5..0184017 100644
|
||||||
|
--- a/tests/Makefile.am
|
||||||
|
+++ b/tests/Makefile.am
|
||||||
|
@@ -5,8 +5,8 @@
|
||||||
|
# Contact: Pekka Pessi <pekka.pessi@nokia.com>
|
||||||
|
# Licensed under LGPL. See file COPYING.
|
||||||
|
|
||||||
|
-TESTS = test_nua
|
||||||
|
-check_PROGRAMS = test_nua
|
||||||
|
+TESTS =
|
||||||
|
+check_PROGRAMS =
|
||||||
|
|
||||||
|
EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c
|
||||||
|
|
||||||
|
@@ -33,8 +33,8 @@ libtestproxy_a_SOURCES = test_proxy.h test_proxy.c
|
||||||
|
libtestnat_a_SOURCES = test_nat.h test_nat.c test_nat_tags.c
|
||||||
|
|
||||||
|
if HAVE_CHECK
|
||||||
|
-TESTS += check_dlopen_sofia check_sofia
|
||||||
|
-check_PROGRAMS += check_dlopen_sofia check_sofia
|
||||||
|
+TESTS += check_dlopen_sofia
|
||||||
|
+check_PROGRAMS += check_dlopen_sofia
|
||||||
|
endif
|
||||||
|
|
||||||
|
check_sofia_CFLAGS = @CHECK_CFLAGS@
|
||||||
@@ -3,45 +3,109 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch2,
|
fetchpatch2,
|
||||||
|
gitUpdater,
|
||||||
|
testers,
|
||||||
|
autoconf,
|
||||||
|
automake,
|
||||||
|
check,
|
||||||
glib,
|
glib,
|
||||||
|
libtool,
|
||||||
openssl,
|
openssl,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
autoreconfHook,
|
valgrind,
|
||||||
|
zlib,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "sofia-sip";
|
pname = "sofia-sip";
|
||||||
version = "1.13.17";
|
version = "1.13.17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "freeswitch";
|
owner = "freeswitch";
|
||||||
repo = "sofia-sip";
|
repo = "sofia-sip";
|
||||||
rev = "v${version}";
|
rev = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
|
hash = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fix build with gcc 14 from https://github.com/freeswitch/sofia-sip/pull/249
|
# Fix build with gcc 14 from https://github.com/freeswitch/sofia-sip/pull/249
|
||||||
(fetchpatch2 {
|
(fetchpatch2 {
|
||||||
name = "sofia-sip-fix-incompatible-pointer-type.patch";
|
name = "sofia-sip-fix-incompatible-pointer-type.patch";
|
||||||
url = "https://github.com/freeswitch/sofia-sip/commit/46b02f0655af0a9594e805f09a8ee99278f84777.diff";
|
url = "https://github.com/freeswitch/sofia-sip/commit/46b02f0655af0a9594e805f09a8ee99278f84777.patch?full_index=1";
|
||||||
hash = "sha256-4uZVtKnXG+BPW8byjd7tu4uEZo9SYq9EzTEvMwG0Bak=";
|
hash = "sha256-bZzjg7GBxR2wSlPH81krZRCK43OirGLWH/lrLRZ0L0k=";
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# Disable some failing tests
|
||||||
|
# https://github.com/freeswitch/sofia-sip/issues/234
|
||||||
|
# run_addrinfo: Fails due to limited networking during build
|
||||||
|
# torture_su_root: Aborts with: bit out of range 0 - FD_SETSIZE on fd_set
|
||||||
|
# run_check_nta: Times out in client_2_1_1 test, which seems to test some connection protocol fallback thing
|
||||||
|
# run_test_nta: "no valid IPv6 addresses available", likely due to no networking in sandbox
|
||||||
|
# check_nua, check_sofia, test_nua: Times out no matter how much time is given to it
|
||||||
|
./2001-sofia-sip-Disable-some-tests.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
# This actually breaks these tests, leading to bash trying to execute itself
|
||||||
|
# https://github.com/freeswitch/sofia-sip/issues/234
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace libsofia-sip-ua/nta/Makefile.am \
|
||||||
|
--replace-fail 'TESTS_ENVIRONMENT =' '#TESTS_ENVIRONMENT ='
|
||||||
|
'';
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
autoconf
|
||||||
|
automake
|
||||||
|
libtool
|
||||||
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib
|
glib
|
||||||
openssl
|
openssl
|
||||||
];
|
];
|
||||||
nativeBuildInputs = [
|
|
||||||
autoreconfHook
|
nativeCheckInputs = [
|
||||||
pkg-config
|
valgrind
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
checkInputs = [
|
||||||
|
check
|
||||||
|
zlib
|
||||||
|
];
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
./bootstrap.sh
|
||||||
|
'';
|
||||||
|
|
||||||
|
configureFlags = [
|
||||||
|
(lib.strings.enableFeature true "expensive-checks")
|
||||||
|
];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
tests.pkg-config = testers.hasPkgConfigModules {
|
||||||
|
package = finalAttrs.finalPackage;
|
||||||
|
versionCheck = true;
|
||||||
|
};
|
||||||
|
updateScript = gitUpdater {
|
||||||
|
rev-prefix = "v";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
|
description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
|
||||||
homepage = "https://github.com/freeswitch/sofia-sip";
|
homepage = "https://github.com/freeswitch/sofia-sip";
|
||||||
platforms = platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
license = licenses.lgpl2;
|
license = lib.licenses.lgpl2Plus;
|
||||||
|
teams = [ lib.teams.ngi ];
|
||||||
|
pkgConfigModules = [
|
||||||
|
"sofia-sip-ua"
|
||||||
|
"sofia-sip-ua-glib"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
ocamlPackages.buildDunePackage rec {
|
ocamlPackages.buildDunePackage rec {
|
||||||
pname = "stanc";
|
pname = "stanc";
|
||||||
version = "2.36.0";
|
version = "2.37.0";
|
||||||
|
|
||||||
minimalOCamlVersion = "4.12";
|
minimalOCamlVersion = "4.12";
|
||||||
duneVersion = "3";
|
duneVersion = "3";
|
||||||
@@ -14,8 +14,8 @@ ocamlPackages.buildDunePackage rec {
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stan-dev";
|
owner = "stan-dev";
|
||||||
repo = "stanc3";
|
repo = "stanc3";
|
||||||
rev = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-IrpHV00Fn3Nxail4Xgv/8ezclKpyVuQa1F34kF07wwA=";
|
hash = "sha256-d+sInQfnlT1gLbtIRPD+LUZgIdl519OrfvgSNYdYeII=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = with ocamlPackages; [ menhir ];
|
nativeBuildInputs = with ocamlPackages; [ menhir ];
|
||||||
@@ -26,6 +26,7 @@ ocamlPackages.buildDunePackage rec {
|
|||||||
ppx_deriving
|
ppx_deriving
|
||||||
fmt
|
fmt
|
||||||
yojson
|
yojson
|
||||||
|
cmdliner
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|||||||
@@ -8,13 +8,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "syft";
|
pname = "syft";
|
||||||
version = "1.34.0";
|
version = "1.34.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "anchore";
|
owner = "anchore";
|
||||||
repo = "syft";
|
repo = "syft";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-J9ia5VjEItwDS2YjKAGAuQTTig5IIQA70yBYM/2r4B4=";
|
hash = "sha256-1RdJpjUVenmfx6dIme97f1N4zAWFt5Z25IfIjZLIAPI=";
|
||||||
# populate values that require us to use git. By doing this in postFetch we
|
# populate values that require us to use git. By doing this in postFetch we
|
||||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
libxkbcommon,
|
libxkbcommon,
|
||||||
libgbm,
|
libgbm,
|
||||||
nss,
|
nss,
|
||||||
|
pipewire,
|
||||||
udev,
|
udev,
|
||||||
libGL,
|
libGL,
|
||||||
xorg,
|
xorg,
|
||||||
@@ -29,11 +30,11 @@
|
|||||||
|
|
||||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
pname = "teamspeak6-client";
|
pname = "teamspeak6-client";
|
||||||
version = "6.0.0-beta2";
|
version = "6.0.0-beta3.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz";
|
url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz";
|
||||||
hash = "sha256-3jNPv3uQ2RztR1p4XQNLUg5IVrvW/dcdtqXdiGJKVSs=";
|
hash = "sha256-CWKyn49DSWgrkJyYcPwKUz2PBykvFQc1f7G/yvrHbWU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = ".";
|
sourceRoot = ".";
|
||||||
@@ -55,6 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||||||
libxkbcommon
|
libxkbcommon
|
||||||
libgbm
|
libgbm
|
||||||
nss
|
nss
|
||||||
|
pipewire
|
||||||
xorg.libX11
|
xorg.libX11
|
||||||
xorg.libXScrnSaver
|
xorg.libXScrnSaver
|
||||||
xorg.libXdamage
|
xorg.libXdamage
|
||||||
@@ -102,6 +104,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||||||
udev
|
udev
|
||||||
libGL
|
libGL
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
|
pipewire
|
||||||
]
|
]
|
||||||
}"
|
}"
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "telegraf";
|
pname = "telegraf";
|
||||||
version = "1.36.2";
|
version = "1.36.3";
|
||||||
|
|
||||||
subPackages = [ "cmd/telegraf" ];
|
subPackages = [ "cmd/telegraf" ];
|
||||||
|
|
||||||
@@ -18,10 +18,10 @@ buildGoModule rec {
|
|||||||
owner = "influxdata";
|
owner = "influxdata";
|
||||||
repo = "telegraf";
|
repo = "telegraf";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-nIYAGsGYZUK5o1KqcH4bI3wPRRXCynN6N5T6f2oy2bo=";
|
hash = "sha256-aEMvBKDE+fbjXyvi3MkbV1/Bu0q4F7W7DPwTRUcWY8M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-k4hI/qIQgV1qChOWDCqWcMboaVoDe3k/DP/wNa0Aqg4=";
|
vendorHash = "sha256-BofW6hvcpQb1OWTbfoS+o2RJg4N0zMqid1ergeVh/wM=";
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
buildGoModule {
|
buildGoModule {
|
||||||
pname = "txtpbfmt";
|
pname = "txtpbfmt";
|
||||||
version = "0-unstable-2025-10-15";
|
version = "0-unstable-2025-10-16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "protocolbuffers";
|
owner = "protocolbuffers";
|
||||||
repo = "txtpbfmt";
|
repo = "txtpbfmt";
|
||||||
rev = "0b0c2708cf8453209ac9864099a502d5d1723ee4";
|
rev = "16587c79cd916daf09ade0a7d72e6a5de7c81f81";
|
||||||
hash = "sha256-d6fT98Po7c+ZIwn3UG4JlsLRVjurnE0htrCUzM9sxGk=";
|
hash = "sha256-3rzsw6CvN8mzjRM8OCDNvVquQNx+82NPeHizNOF+g54=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-aeYa7a/oKH2dxXHRkkqyh7f04citRDGQxAaKQTJst4o=";
|
vendorHash = "sha256-aeYa7a/oKH2dxXHRkkqyh7f04citRDGQxAaKQTJst4o=";
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
nix-update-script,
|
nix-update-script,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "4.18.6";
|
version = "4.18.7";
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
desktopItem = makeDesktopItem {
|
||||||
name = "unciv";
|
name = "unciv";
|
||||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||||
hash = "sha256-UKm5lJ378AZ016To5eC6EpFFNfbINCeHZdUyv+MN0X4=";
|
hash = "sha256-bZzF8WUDw2rrF8Qi6PKBA9F5EUDZGwgXegcHDFgQxJY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
pname = "wait4x";
|
pname = "wait4x";
|
||||||
version = "3.5.1";
|
version = "3.6.0";
|
||||||
in
|
in
|
||||||
buildGoModule {
|
buildGoModule {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
@@ -14,10 +14,10 @@ buildGoModule {
|
|||||||
owner = "wait4x";
|
owner = "wait4x";
|
||||||
repo = "wait4x";
|
repo = "wait4x";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-VAt61k2eHQwyLSsvbWxe7jJ/Wyj4U4O2+LzCsoP/Yq4=";
|
hash = "sha256-RiF5tcnzMteXaYmw4mfQdamwV1PAyNC8pUownJzfACs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-KJOKLTjwwgu2MFNIRDk8eeSVnZyjO9dfVyWrF5vqj9g=";
|
vendorHash = "sha256-fa3XEqLkzriMFYea3bv4FzaKgK2FsGwn5IQG48vh7+M=";
|
||||||
|
|
||||||
# Tests make network access
|
# Tests make network access
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|||||||
@@ -13,20 +13,20 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "wasmtime";
|
pname = "wasmtime";
|
||||||
version = "37.0.2";
|
version = "38.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bytecodealliance";
|
owner = "bytecodealliance";
|
||||||
repo = "wasmtime";
|
repo = "wasmtime";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-OQyGcxWMOxxzBHyOg2LUVsFuBEow6NIJCfrnsYWZtzk=";
|
hash = "sha256-Arb4wUIJx3OyE8wbshotpy5Br7ZHHA7zXP98uGm/gyo=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||||
auditable = false;
|
auditable = false;
|
||||||
|
|
||||||
cargoHash = "sha256-PXvhwnfGvGF4D6U+2dKp3wg6cbk/i+0bWRAMSkyd6i8=";
|
cargoHash = "sha256-ZF+uaMjhBMdLPp8TP4DnPB23igOE92YuhQ1US65NNRk=";
|
||||||
cargoBuildFlags = [
|
cargoBuildFlags = [
|
||||||
"--package"
|
"--package"
|
||||||
"wasmtime-cli"
|
"wasmtime-cli"
|
||||||
|
|||||||
@@ -120,6 +120,13 @@ stdenv.mkDerivation rec {
|
|||||||
(mkFlag vtuneSupport "ENABLE_VTUNE")
|
(mkFlag vtuneSupport "ENABLE_VTUNE")
|
||||||
(mkFlag werrorSupport "WARNINGS_AS_ERRORS")
|
(mkFlag werrorSupport "WARNINGS_AS_ERRORS")
|
||||||
]
|
]
|
||||||
|
++ lib.optionals stdenv.hostPlatform.isPower [
|
||||||
|
# baseline for everything but ppc64le doesn't have AltiVec
|
||||||
|
# ppc64le: https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
|
||||||
|
(lib.cmakeBool "ENABLE_ALTIVEC" false)
|
||||||
|
# baseline for everything but ppc64le is pre-POWER8
|
||||||
|
(lib.cmakeBool "CPU_POWER8" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian))
|
||||||
|
]
|
||||||
# Clang does not support the endfunc directive so use GCC.
|
# Clang does not support the endfunc directive so use GCC.
|
||||||
++ lib.optional (
|
++ lib.optional (
|
||||||
stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
|
stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
|
||||||
@@ -137,9 +144,6 @@ stdenv.mkDerivation rec {
|
|||||||
"-DENABLE_SHARED=OFF"
|
"-DENABLE_SHARED=OFF"
|
||||||
"-DEXPORT_C_API=OFF"
|
"-DEXPORT_C_API=OFF"
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isPower [
|
|
||||||
"-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
|
|
||||||
]
|
|
||||||
++ lib.optionals isCross [
|
++ lib.optionals isCross [
|
||||||
(mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM")
|
(mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM")
|
||||||
(mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64")
|
(mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64")
|
||||||
|
|||||||
@@ -7,7 +7,9 @@
|
|||||||
libpng,
|
libpng,
|
||||||
libwebp,
|
libwebp,
|
||||||
libtiff,
|
libtiff,
|
||||||
|
libjpeg,
|
||||||
jasper,
|
jasper,
|
||||||
|
libxrandr,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@@ -28,7 +30,9 @@ stdenv.mkDerivation rec {
|
|||||||
libpng
|
libpng
|
||||||
libwebp
|
libwebp
|
||||||
libtiff
|
libtiff
|
||||||
|
libjpeg
|
||||||
jasper
|
jasper
|
||||||
|
libxrandr
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
buildGoModule (finalAttrs: {
|
buildGoModule (finalAttrs: {
|
||||||
pname = "yamlfmt";
|
pname = "yamlfmt";
|
||||||
version = "0.18.0";
|
version = "0.19.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "yamlfmt";
|
repo = "yamlfmt";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-ifrRqa6GRwzwr9ORsmvDaLmznDp3KVtFyEzaG3EqEhY=";
|
hash = "sha256-SIjWBXhi5uy34KySxMCTrTDdXXvtVCWWj4LhYcXq5MU=";
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
postFetch = ''
|
postFetch = ''
|
||||||
git -C "$out" rev-parse --short HEAD > "$out/.git_head"
|
git -C "$out" rev-parse --short HEAD > "$out/.git_head"
|
||||||
|
|||||||
@@ -78,6 +78,7 @@
|
|||||||
&& !isAarch32
|
&& !isAarch32
|
||||||
&& !hostPlatform.isLoongArch64
|
&& !hostPlatform.isLoongArch64
|
||||||
&& !hostPlatform.isRiscV
|
&& !hostPlatform.isRiscV
|
||||||
|
&& !(hostPlatform.isPower && hostPlatform.isBigEndian)
|
||||||
&& hostPlatform == buildPlatform
|
&& hostPlatform == buildPlatform
|
||||||
), # dynamically linked Nvidia code
|
), # dynamically linked Nvidia code
|
||||||
withFlite ? withFullDeps, # Voice Synthesis
|
withFlite ? withFullDeps, # Voice Synthesis
|
||||||
@@ -798,6 +799,25 @@ stdenv.mkDerivation (
|
|||||||
(enableFeature withExtraWarnings "extra-warnings")
|
(enableFeature withExtraWarnings "extra-warnings")
|
||||||
(enableFeature withStripping "stripping")
|
(enableFeature withStripping "stripping")
|
||||||
]
|
]
|
||||||
|
++ optionals (stdenv.hostPlatform.isPower) [
|
||||||
|
# FFmpeg expects us to pass `--cpu=` to pick a specific feature set to compile for. If unset, it defaults to `generic`.
|
||||||
|
# For POWER, the default doesn't produce baseline-compliant settings. Passing a baseline-like CPU as a target doesn't
|
||||||
|
# produce entirely correct settings either - POWER4 leaves AltiVec enabled, but that's only guaranteed with POWER6.
|
||||||
|
# Just configure together everything on our own.
|
||||||
|
|
||||||
|
# Easy: Only ppc64le's baseline is recent enough to guarantee all of these.
|
||||||
|
(enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "altivec")
|
||||||
|
(enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "vsx")
|
||||||
|
(enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "power8")
|
||||||
|
(enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "ldbrx")
|
||||||
|
|
||||||
|
# Instructions that are highly specific to that series of 32-bit embedded CPUs. Never try to enable them.
|
||||||
|
(enableFeature false "ppc4xx")
|
||||||
|
|
||||||
|
# I *think* enabling this on 64-bit POWER is correct? Struggling to find much info on when/where this was introduced.
|
||||||
|
# Definitely present on the Apple G5, and likely Freescale e5500/e6500 as well.
|
||||||
|
(enableFeature (stdenv.hostPlatform.isPower64) "dcbzl")
|
||||||
|
]
|
||||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||||
"--cross-prefix=${stdenv.cc.targetPrefix}"
|
"--cross-prefix=${stdenv.cc.targetPrefix}"
|
||||||
"--enable-cross-compile"
|
"--enable-cross-compile"
|
||||||
|
|||||||
@@ -146,6 +146,7 @@ mapAliases {
|
|||||||
inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
|
inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
|
||||||
inherit (pkgs) kaput-cli; # added 2024-12-03
|
inherit (pkgs) kaput-cli; # added 2024-12-03
|
||||||
karma = pkgs.karma-runner; # added 2023-07-29
|
karma = pkgs.karma-runner; # added 2023-07-29
|
||||||
|
keyoxide = pkgs.keyoxide-cli; # Added 2025-10-20
|
||||||
leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31
|
leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31
|
||||||
inherit (pkgs) lerna; # added 2025-02-12
|
inherit (pkgs) lerna; # added 2025-02-12
|
||||||
less = pkgs.lessc; # added 2024-06-15
|
less = pkgs.lessc; # added 2024-06-15
|
||||||
|
|||||||
@@ -96,7 +96,6 @@
|
|||||||
, "jsonlint"
|
, "jsonlint"
|
||||||
, "jsonplaceholder"
|
, "jsonplaceholder"
|
||||||
, "katex"
|
, "katex"
|
||||||
, "keyoxide"
|
|
||||||
, "lcov-result-merger"
|
, "lcov-result-merger"
|
||||||
, "live-server"
|
, "live-server"
|
||||||
, "livedown"
|
, "livedown"
|
||||||
|
|||||||
2002
pkgs/development/node-packages/node-packages.nix
generated
2002
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@@ -111,15 +111,6 @@ final: prev: {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
keyoxide = prev.keyoxide.override {
|
|
||||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
|
||||||
buildInputs = with pkgs; [
|
|
||||||
pixman
|
|
||||||
cairo
|
|
||||||
pango
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
makam = prev.makam.override {
|
makam = prev.makam.override {
|
||||||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
pytest-asyncio,
|
pytest-asyncio,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
python-dotenv,
|
python-dotenv,
|
||||||
pythonOlder,
|
|
||||||
setuptools,
|
setuptools,
|
||||||
syrupy,
|
syrupy,
|
||||||
yarl,
|
yarl,
|
||||||
@@ -17,16 +16,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bring-api";
|
pname = "bring-api";
|
||||||
version = "1.1.0";
|
version = "1.1.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.11";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "miaucl";
|
owner = "miaucl";
|
||||||
repo = "bring-api";
|
repo = "bring-api";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-OxY9G7zy5VSpTOARoManJNvMg6ghIK0KJunanSgXKm0=";
|
hash = "sha256-BslU1ekbQIZh1f1zRYXbZdbOepB2+NWIuWZI4L/oxSg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|||||||
@@ -67,20 +67,19 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "chromadb";
|
pname = "chromadb";
|
||||||
version = "1.1.1";
|
version = "1.2.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "chroma-core";
|
owner = "chroma-core";
|
||||||
repo = "chroma";
|
repo = "chroma";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-WFN4z+LQwqy6bd59yWlglpXFqNZPEd3jcgeWhdphxYM=";
|
hash = "sha256-xEXW88iV9lqDOGrnoH0ZsoGMajATShA9HC+G79EdS9s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||||
inherit src;
|
inherit pname version src;
|
||||||
name = "${pname}-${version}-vendor";
|
hash = "sha256-GlF8Fp42ra5d55PIGOS4zOHXPSaIZGI/l8sHz/wyDgo=";
|
||||||
hash = "sha256-LZXtAt4rP0rKaleMht1eFPdqgE8nu5NdLzhWBW69WW8=";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Can't use fetchFromGitHub as the build expects a zipfile
|
# Can't use fetchFromGitHub as the build expects a zipfile
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "clarifai";
|
pname = "clarifai";
|
||||||
version = "11.8.3";
|
version = "11.8.5";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
@@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||||||
owner = "Clarifai";
|
owner = "Clarifai";
|
||||||
repo = "clarifai-python";
|
repo = "clarifai-python";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-sl9x8VqGGgUfPSRZiMP6edLeUUTpASp8kdRLl0Kxclc=";
|
hash = "sha256-c0lCbkHOIbzgaVLyGfJ8mbgtePTpv+PbsmErI4ZuLq4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
|||||||
@@ -16,14 +16,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "cmdstanpy";
|
pname = "cmdstanpy";
|
||||||
version = "1.2.5";
|
version = "1.3.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stan-dev";
|
owner = "stan-dev";
|
||||||
repo = "cmdstanpy";
|
repo = "cmdstanpy";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-/MiWawB1Y4/eMBHXQLjd+P+Pe8EtsLbGFrzQa1RNf6g=";
|
hash = "sha256-XVviGdJ41mcjCscL3jvcpHi6zMREHsuShGHpnMQX6V8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|||||||
@@ -18,14 +18,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "fast-array-utils";
|
pname = "fast-array-utils";
|
||||||
version = "1.2.4";
|
version = "1.2.5";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "scverse";
|
owner = "scverse";
|
||||||
repo = "fast-array-utils";
|
repo = "fast-array-utils";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-R8pOID9Lws29OCMWb7RZNDsWakEYDf7bya6iSXp8Ips=";
|
hash = "sha256-iJcnmCh0AssbUEJg62cKURu1afHQiS/cZhYmGsZQM9I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# hatch-min-requirements tries to talk to PyPI by default. See https://github.com/tlambert03/hatch-min-requirements?tab=readme-ov-file#environment-variables.
|
# hatch-min-requirements tries to talk to PyPI by default. See https://github.com/tlambert03/hatch-min-requirements?tab=readme-ov-file#environment-variables.
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
async-timeout,
|
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
certifi,
|
certifi,
|
||||||
faker,
|
faker,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchpatch,
|
||||||
googleapis-common-protos,
|
googleapis-common-protos,
|
||||||
h2,
|
h2,
|
||||||
multidict,
|
multidict,
|
||||||
@@ -28,6 +28,15 @@ buildPythonPackage rec {
|
|||||||
hash = "sha256-Z+DMwGMUxNTQ7ABd4q/FgMHEZ/NCOtst+6QfQJm3jVU=";
|
hash = "sha256-Z+DMwGMUxNTQ7ABd4q/FgMHEZ/NCOtst+6QfQJm3jVU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# https://github.com/vmagamedov/grpclib/pull/209
|
||||||
|
(fetchpatch {
|
||||||
|
name = "replace-async-timeout-with-asyncio-timeout-patch";
|
||||||
|
url = "https://github.com/vmagamedov/grpclib/commit/36b23ce3ca3f1742e39b50f939d13cd08b4f28ac.patch";
|
||||||
|
hash = "sha256-3ztLBOFpTK8CFIp8a6suhWXY5kIBCBRWBX/oAyYU4yI=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
@@ -38,7 +47,6 @@ buildPythonPackage rec {
|
|||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
pytest-asyncio_0
|
pytest-asyncio_0
|
||||||
async-timeout
|
|
||||||
faker
|
faker
|
||||||
googleapis-common-protos
|
googleapis-common-protos
|
||||||
certifi
|
certifi
|
||||||
|
|||||||
@@ -8,14 +8,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "json-repair";
|
pname = "json-repair";
|
||||||
version = "0.52.0";
|
version = "0.52.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mangiucugna";
|
owner = "mangiucugna";
|
||||||
repo = "json_repair";
|
repo = "json_repair";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-RK5VycwcI6EhFkejbSwr96iF12O22nIGQzbOIlo/Mhk=";
|
hash = "sha256-NYW2PJ329c8EYfQrRl1mi+leUR7Afz2J0N9HVD1xyT0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|||||||
@@ -111,6 +111,8 @@ buildPythonPackage rec {
|
|||||||
"test_delete"
|
"test_delete"
|
||||||
# Insufficient access privileges for operation
|
# Insufficient access privileges for operation
|
||||||
"test_regression_is_hidden"
|
"test_regression_is_hidden"
|
||||||
|
# Fails under load (which causes failure on Hydra)
|
||||||
|
"test_execution_state"
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
# Failed: DID NOT RAISE <class 'tornado.web.HTTPError'>
|
# Failed: DID NOT RAISE <class 'tornado.web.HTTPError'>
|
||||||
@@ -120,7 +122,6 @@ buildPythonPackage rec {
|
|||||||
# TypeError: the JSON object must be str, bytes or bytearray, not NoneType
|
# TypeError: the JSON object must be str, bytes or bytearray, not NoneType
|
||||||
"test_terminal_create_with_cwd"
|
"test_terminal_create_with_cwd"
|
||||||
# Fails under load (which causes failure on Hydra)
|
# Fails under load (which causes failure on Hydra)
|
||||||
"test_execution_state"
|
|
||||||
"test_cull_connected"
|
"test_cull_connected"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -228,6 +228,17 @@ let
|
|||||||
"tests/"
|
"tests/"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
disabledTests = [
|
||||||
|
# AssertionError: The following responses are mocked but not requested:
|
||||||
|
# - Match POST request on https://api.openai.com/v1/chat/completions
|
||||||
|
# https://github.com/simonw/llm/issues/1292
|
||||||
|
"test_gpt4o_mini_sync_and_async"
|
||||||
|
|
||||||
|
# TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr
|
||||||
|
# https://github.com/simonw/llm/issues/1293
|
||||||
|
"test_embed_multi_files_encoding"
|
||||||
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "llm" ];
|
pythonImportsCheck = [ "llm" ];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
|||||||
@@ -1,34 +1,34 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchPypi,
|
fetchFromGitHub,
|
||||||
pythonOlder,
|
|
||||||
poetry-core,
|
poetry-core,
|
||||||
dataprep-ml,
|
dataprep-ml,
|
||||||
numpy,
|
numpy,
|
||||||
pandas,
|
pandas,
|
||||||
scikit-learn,
|
scikit-learn,
|
||||||
type-infer,
|
type-infer,
|
||||||
|
pytestCheckHook,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "mindsdb-evaluator";
|
pname = "mindsdb-evaluator";
|
||||||
version = "0.0.18";
|
version = "0.0.20";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
src = fetchFromGitHub {
|
||||||
|
owner = "mindsdb";
|
||||||
# using PyPI as git repository does not have release tags or branches
|
repo = "mindsdb_evaluator";
|
||||||
src = fetchPypi {
|
tag = "v${version}";
|
||||||
pname = "mindsdb_evaluator";
|
hash = "sha256-ZeJABMbyRdGrZGkWWXcjleOeDQBSicGR06hZAPUKvgI=";
|
||||||
inherit version;
|
|
||||||
hash = "sha256-UGg7P/OKmRi70z2roRBsA95FAXm7CG+TdPzTRy7+p4w=";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ poetry-core ];
|
build-system = [ poetry-core ];
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
"dataprep-ml"
|
||||||
"numpy"
|
"numpy"
|
||||||
|
"scikit-learn"
|
||||||
];
|
];
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
@@ -41,10 +41,15 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
pythonImportsCheck = [ "mindsdb_evaluator" ];
|
pythonImportsCheck = [ "mindsdb_evaluator" ];
|
||||||
|
|
||||||
meta = with lib; {
|
nativeCheckInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
changelog = "https://github.com/mindsdb/mindsdb_evaluator/releases/tag/${src.tag}";
|
||||||
description = "Model evaluation for Machine Learning pipelines";
|
description = "Model evaluation for Machine Learning pipelines";
|
||||||
homepage = "https://pypi.org/project/mindsdb-evaluator/";
|
homepage = "https://github.com/mindsdb/mindsdb_evaluator";
|
||||||
license = licenses.gpl3Only;
|
license = lib.licenses.gpl3Only;
|
||||||
maintainers = with maintainers; [ mbalatsko ];
|
maintainers = with lib.maintainers; [ mbalatsko ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,14 +40,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "niworkflows";
|
pname = "niworkflows";
|
||||||
version = "1.14.2";
|
version = "1.14.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nipreps";
|
owner = "nipreps";
|
||||||
repo = "niworkflows";
|
repo = "niworkflows";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-LzzbletoZdI9HuaBWhFB6IGs1nX6ZItNP6cWlw5m5EE=";
|
hash = "sha256-wdPHXVgMvd+Od3M2j7S43gBRSh4yiPeu+HM6EyiakwU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [ "traits" ];
|
pythonRelaxDeps = [ "traits" ];
|
||||||
|
|||||||
@@ -10,14 +10,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pglast";
|
pname = "pglast";
|
||||||
version = "7.7";
|
version = "7.8";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-Xfv8H6OYGWQ6O5FaE2aOQ7vWwLAUqt9dC0MJ6GC6y7A=";
|
hash = "sha256-2tSZKS3dXK6236Q1sox4wpCAgkQ91eqr0RZWMmY/Fz8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|||||||
@@ -9,13 +9,13 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pip-system-certs";
|
pname = "pip-system-certs";
|
||||||
version = "5.2";
|
version = "5.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit version;
|
inherit version;
|
||||||
pname = "pip_system_certs";
|
pname = "pip_system_certs";
|
||||||
hash = "sha256-gLd2tc8XGRv5nTE2mbf84v24Tre7siX9E0EJqCcGQG8=";
|
hash = "sha256-Gci/mVe8zn1pxNvC0LLvE94ZhNU/UKWQEubbutCvZ8Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "prophet";
|
pname = "prophet";
|
||||||
version = "1.1.7";
|
version = "1.2.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
@@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||||||
owner = "facebook";
|
owner = "facebook";
|
||||||
repo = "prophet";
|
repo = "prophet";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-94hxpfpZN3yvDUu+kM7Oc2Yu8+z0Gv6zqYRAwKXgHk4=";
|
hash = "sha256-SCd/PhchLbkb63HEEmRlfX2VruLo2jpweRkidgqNzE8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "${src.name}/python";
|
sourceRoot = "${src.name}/python";
|
||||||
|
|||||||
@@ -12,21 +12,18 @@
|
|||||||
pytest-aiohttp,
|
pytest-aiohttp,
|
||||||
pytest-freezegun,
|
pytest-freezegun,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
pythonOlder,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pylitterbot";
|
pname = "pylitterbot";
|
||||||
version = "2024.2.4";
|
version = "2024.2.6";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.10";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "natekspencer";
|
owner = "natekspencer";
|
||||||
repo = "pylitterbot";
|
repo = "pylitterbot";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-/GN2b4rlE6j60O5ZxH8I58qwcZewAYJu0EHwQ7mrdBY=";
|
hash = "sha256-oQuEo0np+e+HfsQoWbv84BNpxNJQO3ZjocaCfllqkts=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [ "deepdiff" ];
|
pythonRelaxDeps = [ "deepdiff" ];
|
||||||
@@ -52,11 +49,11 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
pythonImportsCheck = [ "pylitterbot" ];
|
pythonImportsCheck = [ "pylitterbot" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Modulefor controlling a Litter-Robot";
|
description = "Modulefor controlling a Litter-Robot";
|
||||||
homepage = "https://github.com/natekspencer/pylitterbot";
|
homepage = "https://github.com/natekspencer/pylitterbot";
|
||||||
changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${src.tag}";
|
changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${src.tag}";
|
||||||
license = with licenses; [ mit ];
|
license = lib.licenses.mit;
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with lib.maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,14 +15,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyportainer";
|
pname = "pyportainer";
|
||||||
version = "1.0.3";
|
version = "1.0.4";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "erwindouna";
|
owner = "erwindouna";
|
||||||
repo = "pyportainer";
|
repo = "pyportainer";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-Y/O2lhsjkSEKQL7HhdmlzMjY1597uuUOFfI05aLiBXg=";
|
hash = "sha256-jEUVAbNwBil5k6eNtuzspMvXDhFXktopwl/YCvnK2ko=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ poetry-core ];
|
build-system = [ poetry-core ];
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pytensor";
|
pname = "pytensor";
|
||||||
version = "2.35.0";
|
version = "2.35.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
@@ -43,7 +43,7 @@ buildPythonPackage rec {
|
|||||||
postFetch = ''
|
postFetch = ''
|
||||||
sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py
|
sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py
|
||||||
'';
|
'';
|
||||||
hash = "sha256-xQ9qFQhVSxdCB+jsfcxy04HySl7Mq0lGd4cg9bTxU5E=";
|
hash = "sha256-5+yMZysK69g+3uYrP12WK3ngpAYn8XrHoVjLqjvbobg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
@@ -173,7 +173,7 @@ buildPythonPackage rec {
|
|||||||
description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";
|
description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";
|
||||||
mainProgram = "pytensor-cache";
|
mainProgram = "pytensor-cache";
|
||||||
homepage = "https://github.com/pymc-devs/pytensor";
|
homepage = "https://github.com/pymc-devs/pytensor";
|
||||||
changelog = "https://github.com/pymc-devs/pytensor/releases/tag/rel-${src.tag}";
|
changelog = "https://github.com/pymc-devs/pytensor/releases/tag/${src.tag}";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = with lib.maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
bcdarwin
|
bcdarwin
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
aiohttp,
|
|
||||||
buildPythonPackage,
|
|
||||||
fetchFromGitHub,
|
|
||||||
pythonOlder,
|
|
||||||
setuptools,
|
|
||||||
}:
|
|
||||||
|
|
||||||
buildPythonPackage {
|
|
||||||
pname = "python-bring-api";
|
|
||||||
version = "3.0.0-unstable-2024-02-03";
|
|
||||||
pyproject = true;
|
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "eliasball";
|
|
||||||
repo = "python-bring-api";
|
|
||||||
# https://github.com/eliasball/python-bring-api/issues/16
|
|
||||||
rev = "8043562b22be1f6421a8771774868b105b6ca375";
|
|
||||||
hash = "sha256-VCGCm9N6pMhEYT9WuWh7qKacZEf6bcIpEsILfCC6his=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ setuptools ];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ aiohttp ];
|
|
||||||
|
|
||||||
# Module has no tests
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
pythonImportsCheck = [ "python_bring_api" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Module to access the Bring! shopping lists API";
|
|
||||||
homepage = "https://github.com/eliasball/python-bring-api";
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = with maintainers; [ fab ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,29 +1,27 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchPypi,
|
fetchFromGitHub,
|
||||||
pytest-mock,
|
pytest-mock,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
pythonAtLeast,
|
|
||||||
pythonOlder,
|
|
||||||
setuptools,
|
setuptools,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "restrictedpython";
|
pname = "restrictedpython";
|
||||||
version = "8.0";
|
version = "8.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
src = fetchFromGitHub {
|
||||||
|
owner = "zopefoundation";
|
||||||
src = fetchPypi {
|
repo = "RestrictedPython";
|
||||||
inherit pname version;
|
tag = version;
|
||||||
hash = "sha256-OvIxK8Z+X87Yh/uFsAbImGHackiBKLFVvuqB62oKmyQ=";
|
hash = "sha256-UcmH1I2p+XmQm4Y5M+Ms/LMSchor6GD6V9dxippa4HI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace pyproject.toml \
|
substituteInPlace pyproject.toml \
|
||||||
--replace-fail "setuptools <= 75.6.0" setuptools
|
--replace-fail "setuptools >= 78.1.1,< 81" setuptools
|
||||||
'';
|
'';
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
@@ -33,15 +31,13 @@ buildPythonPackage rec {
|
|||||||
pytest-mock
|
pytest-mock
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = lib.optionals (pythonAtLeast "3.11") [ "test_compile__compile_restricted_exec__5" ];
|
|
||||||
|
|
||||||
pythonImportsCheck = [ "RestrictedPython" ];
|
pythonImportsCheck = [ "RestrictedPython" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Restricted execution environment for Python to run untrusted code";
|
description = "Restricted execution environment for Python to run untrusted code";
|
||||||
homepage = "https://github.com/zopefoundation/RestrictedPython";
|
homepage = "https://github.com/zopefoundation/RestrictedPython";
|
||||||
changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${version}/CHANGES.rst";
|
changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${src.tag}/CHANGES.rst";
|
||||||
license = licenses.zpl21;
|
license = lib.licenses.zpl21;
|
||||||
maintainers = with maintainers; [ juaningan ];
|
maintainers = with lib.maintainers; [ juaningan ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,14 +21,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "rigour";
|
pname = "rigour";
|
||||||
version = "1.3.11";
|
version = "1.3.13";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "opensanctions";
|
owner = "opensanctions";
|
||||||
repo = "rigour";
|
repo = "rigour";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-ahHrNky8dGcH8UmpnZ8avfzyrz5RIvsL9YOe4V8EeE4=";
|
hash = "sha256-mcQ1GqmNWv4/ul9oRw/+MnTEcIcn3OP0C5eXi4HWKMU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user