Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -12,12 +12,12 @@ By default, root logins using a password are disallowed. They can be
|
||||
disabled entirely by setting
|
||||
[](#opt-services.openssh.settings.PermitRootLogin) to `"no"`.
|
||||
|
||||
You can declaratively specify authorised RSA/DSA public keys for a user
|
||||
You can declaratively specify authorised public keys for a user
|
||||
as follows:
|
||||
|
||||
```nix
|
||||
{
|
||||
users.users.alice.openssh.authorizedKeys.keys =
|
||||
[ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
|
||||
[ "ssh-ed25519 AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
|
||||
}
|
||||
```
|
||||
|
||||
@@ -191,6 +191,8 @@
|
||||
|
||||
- `forgejo` and `forgejo-lts` no longer support the opt-in feature [PAM (Pluggable Authentication Module)](https://forgejo.org/docs/latest/user/authentication/#pam-pluggable-authentication-module).
|
||||
|
||||
- `gitea` no longer supports the opt-in feature [PAM (Pluggable Authentication Module)][https://docs.gitea.com/usage/authentication#pam-pluggable-authentication-module].
|
||||
|
||||
- `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead.
|
||||
|
||||
- `services.pgbouncer` systemd service is configured with `Type=notify-reload` and allows reloading configuration without process restart. PgBouncer configuration options were moved to the free-form type option named [`services.pgbouncer.settings`](#opt-services.pgbouncer.settings) according to the NixOS RFC 0042.
|
||||
|
||||
@@ -209,7 +209,7 @@ in
|
||||
# type=b is 'W95 FAT32', type=83 is 'Linux'.
|
||||
# The "bootable" partition is where u-boot will look file for the bootloader
|
||||
# information (dtbs, extlinux.conf file).
|
||||
sfdisk $img <<EOF
|
||||
sfdisk --no-reread --no-tell-kernel $img <<EOF
|
||||
label: dos
|
||||
label-id: ${config.sdImage.firmwarePartitionID}
|
||||
|
||||
|
||||
@@ -164,6 +164,10 @@ in
|
||||
environment.etc."clamav/freshclam.conf".source = freshclamConfigFile;
|
||||
environment.etc."clamav/clamd.conf".source = clamdConfigFile;
|
||||
|
||||
systemd.slices.system-clamav = {
|
||||
description = "ClamAV slice";
|
||||
};
|
||||
|
||||
systemd.services.clamav-daemon = mkIf cfg.daemon.enable {
|
||||
description = "ClamAV daemon (clamd)";
|
||||
after = optionals cfg.updater.enable [ "clamav-freshclam.service" ];
|
||||
@@ -181,6 +185,7 @@ in
|
||||
PrivateTmp = "yes";
|
||||
PrivateDevices = "yes";
|
||||
PrivateNetwork = "yes";
|
||||
Slice = "system-clamav.slice";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -208,6 +213,7 @@ in
|
||||
Group = clamavGroup;
|
||||
PrivateTmp = "yes";
|
||||
PrivateDevices = "yes";
|
||||
Slice = "system-clamav.slice";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -229,6 +235,7 @@ in
|
||||
Group = clamavGroup;
|
||||
PrivateTmp = "yes";
|
||||
PrivateDevices = "yes";
|
||||
Slice = "system-clamav.slice";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -255,6 +262,7 @@ in
|
||||
Group = clamavGroup;
|
||||
PrivateTmp = "yes";
|
||||
PrivateDevices = "yes";
|
||||
Slice = "system-clamav.slice";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -275,6 +283,7 @@ in
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${cfg.package}/bin/clamdscan --multiscan --fdpass --infected --allmatch ${lib.concatStringsSep " " cfg.scanner.scanDirectories}";
|
||||
Slice = "system-clamav.slice";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,40 +1,49 @@
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) mkDefault mkEnableOption mkIf mkOption types mkPackageOption;
|
||||
inherit (lib)
|
||||
mkDefault
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkOption
|
||||
mkPackageOption
|
||||
mkRenamedOptionModule
|
||||
types
|
||||
;
|
||||
|
||||
cfg = config.services.engelsystem;
|
||||
in {
|
||||
options = {
|
||||
services.engelsystem = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = ''
|
||||
Whether to enable engelsystem, an online tool for coordinating volunteers
|
||||
and shifts on large events.
|
||||
'';
|
||||
type = lib.types.bool;
|
||||
};
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "services" "engelsystem" "config" ] [ "services" "engelsystem" "settings" ])
|
||||
];
|
||||
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
example = "engelsystem.example.com";
|
||||
description = "Domain to serve on.";
|
||||
};
|
||||
options.services.engelsystem = {
|
||||
enable = mkEnableOption "engelsystem, an online tool for coordinating volunteers and shifts on large events";
|
||||
|
||||
package = mkPackageOption pkgs "engelsystem" { };
|
||||
package = mkPackageOption pkgs "engelsystem" { };
|
||||
|
||||
createDatabase = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to create a local database automatically.
|
||||
This will override every database setting in {option}`services.engelsystem.config`.
|
||||
'';
|
||||
};
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
example = "engelsystem.example.com";
|
||||
description = "Domain to serve on.";
|
||||
};
|
||||
|
||||
services.engelsystem.config = mkOption {
|
||||
createDatabase = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to create a local database automatically.
|
||||
This will override every database setting in {option}`services.engelsystem.config`.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = types.attrs;
|
||||
default = {
|
||||
database = {
|
||||
@@ -144,7 +153,7 @@ in {
|
||||
script =
|
||||
let
|
||||
genConfigScript = pkgs.writeScript "engelsystem-gen-config.sh"
|
||||
(utils.genJqSecretsReplacementSnippet cfg.config "config.json");
|
||||
(utils.genJqSecretsReplacementSnippet cfg.settings "config.json");
|
||||
in ''
|
||||
umask 077
|
||||
mkdir -p /var/lib/engelsystem/storage/app
|
||||
@@ -163,7 +172,17 @@ in {
|
||||
Group = "engelsystem";
|
||||
};
|
||||
script = ''
|
||||
${cfg.package}/bin/migrate
|
||||
versionFile="/var/lib/engelsystem/.version"
|
||||
version=$(cat "$versionFile" 2>/dev/null || echo 0)
|
||||
|
||||
if [[ $version != ${cfg.package.version} ]]; then
|
||||
# prune template cache between releases
|
||||
rm -rfv /var/lib/engelsystem/storage/cache/*
|
||||
|
||||
${cfg.package}/bin/migrate
|
||||
|
||||
echo ${cfg.package.version} > "$versionFile"
|
||||
fi
|
||||
'';
|
||||
after = [ "engelsystem-init.service" "mysql.service" ];
|
||||
};
|
||||
|
||||
@@ -453,6 +453,8 @@ in
|
||||
description = "Contents of the first Monitor section of the X server configuration file.";
|
||||
};
|
||||
|
||||
enableTearFree = mkEnableOption "the TearFree option in the first Device section";
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
@@ -810,6 +812,7 @@ in
|
||||
Section "Device"
|
||||
Identifier "Device-${driver.name}[0]"
|
||||
Driver "${driver.driverName or driver.name}"
|
||||
${indent (optionalString cfg.enableTearFree ''Option "TearFree" "true"'')}
|
||||
${indent cfg.deviceSection}
|
||||
${indent (driver.deviceSection or "")}
|
||||
${indent xrandrDeviceSection}
|
||||
|
||||
@@ -1043,19 +1043,27 @@ let
|
||||
"Managed"
|
||||
"OtherInformation"
|
||||
"RouterLifetimeSec"
|
||||
"RetransmitSec"
|
||||
"RouterPreference"
|
||||
"HopLimit"
|
||||
"UplinkInterface"
|
||||
"EmitDNS"
|
||||
"DNS"
|
||||
"EmitDomains"
|
||||
"Domains"
|
||||
"DNSLifetimeSec"
|
||||
"HomeAgent"
|
||||
"HomeAgentLifetimeSec"
|
||||
"HomeAgentPreference"
|
||||
])
|
||||
(assertValueOneOf "Managed" boolValues)
|
||||
(assertValueOneOf "OtherInformation" boolValues)
|
||||
(assertValueOneOf "RouterPreference" ["high" "medium" "low" "normal" "default"])
|
||||
(assertInt "HopLimit")
|
||||
(assertValueOneOf "EmitDNS" boolValues)
|
||||
(assertValueOneOf "EmitDomains" boolValues)
|
||||
(assertValueOneOf "HomeAgent" boolValues)
|
||||
(assertInt "HomeAgentPreference")
|
||||
];
|
||||
|
||||
sectionIPv6PREF64Prefix = checkUnitConfigWithLegacyKey "ipv6PREF64PrefixConfig" "IPv6PREF64Prefix" [
|
||||
|
||||
@@ -55,15 +55,18 @@ in
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "dbus";
|
||||
UMask = "0022";
|
||||
ExecStart = "${pkgs.waydroid}/bin/waydroid -w container start";
|
||||
ExecStop = "${pkgs.waydroid}/bin/waydroid container stop";
|
||||
ExecStopPost = "${pkgs.waydroid}/bin/waydroid session stop";
|
||||
BusName = "id.waydro.Container";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
|
||||
];
|
||||
|
||||
services.dbus.packages = with pkgs; [ waydroid ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -7324,6 +7324,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/miversen33/netman.nvim/";
|
||||
};
|
||||
|
||||
netrw-nvim = buildVimPlugin {
|
||||
pname = "netrw.nvim";
|
||||
version = "2024-03-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prichrd";
|
||||
repo = "netrw.nvim";
|
||||
rev = "c64f60b8a613900aad82ef1c285b892eb43e9e15";
|
||||
sha256 = "1ng0lm2774ghgq9lk2104s6qy21qgwzz2pqkvd706b34vckbb2q3";
|
||||
};
|
||||
meta.homepage = "https://github.com/prichrd/netrw.nvim/";
|
||||
};
|
||||
|
||||
neuron-nvim = buildVimPlugin {
|
||||
pname = "neuron.nvim";
|
||||
version = "2022-02-27";
|
||||
|
||||
@@ -36,8 +36,22 @@ let
|
||||
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars
|
||||
withPlugins =
|
||||
f: self.nvim-treesitter.overrideAttrs {
|
||||
passthru.dependencies = map grammarToPlugin
|
||||
(f (tree-sitter.builtGrammars // builtGrammars));
|
||||
passthru.dependencies =
|
||||
let
|
||||
grammars = map grammarToPlugin
|
||||
(f (tree-sitter.builtGrammars // builtGrammars));
|
||||
copyGrammar = grammar:
|
||||
let name = lib.last (lib.splitString "-" grammar.name); in
|
||||
"ln -s ${grammar}/parser/${name}.so $out/parser/${name}.so";
|
||||
in
|
||||
[
|
||||
(runCommand "vimplugin-treesitter-grammars"
|
||||
{ meta.platforms = lib.platforms.all; }
|
||||
''
|
||||
mkdir -p $out/parser
|
||||
${lib.concatMapStringsSep "\n" copyGrammar grammars}
|
||||
'')
|
||||
];
|
||||
};
|
||||
|
||||
withAllGrammars = withPlugins (_: allGrammars);
|
||||
|
||||
@@ -616,6 +616,7 @@ https://github.com/preservim/nerdtree/,,
|
||||
https://github.com/Xuyuanp/nerdtree-git-plugin/,,
|
||||
https://github.com/miversen33/netman.nvim/,HEAD,
|
||||
https://github.com/oberblastmeister/neuron.nvim/,,
|
||||
https://github.com/prichrd/netrw.nvim/,HEAD,
|
||||
https://github.com/fiatjaf/neuron.vim/,,
|
||||
https://github.com/Olical/nfnl/,main,
|
||||
https://github.com/chr4/nginx.vim/,,
|
||||
|
||||
@@ -6,7 +6,7 @@ rec {
|
||||
|
||||
inherit (src) packageVersion firefox source;
|
||||
|
||||
extraPatches = [ ];
|
||||
extraPatches = [ "${source}/patches/pref-pane/pref-pane-small.patch" ];
|
||||
|
||||
extraConfigureFlags = [
|
||||
"--with-app-name=librewolf"
|
||||
@@ -25,6 +25,12 @@ rec {
|
||||
cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json
|
||||
sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure
|
||||
sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure
|
||||
|
||||
cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences
|
||||
cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences
|
||||
cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences
|
||||
cp ${source}/patches/pref-pane/librewolf.js browser/components/preferences
|
||||
cat ${source}/patches/pref-pane/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl
|
||||
'';
|
||||
|
||||
extraPrefsFiles = [ "${src.settings}/librewolf.cfg" ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2024.8.2";
|
||||
version = "2024.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CAg5mBDcwIFstp8YrWpqwLSzK46+u35ZcaifV8Zk+rE=";
|
||||
hash = "sha256-w0VocNM3KVu4TG5s9vdGV4Au+Hz7PfPoaksqidMRJ+E=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, ocaml }:
|
||||
{ lib, stdenv, fetchurl, ocaml, writeScript }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cryptoverif";
|
||||
version = "2.09";
|
||||
version = "2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-FJlPZgTUZ+6HzhG/B0dOiVIjDvoCnF6yg2E9UriSojw=";
|
||||
hash = "sha256-Gg7PYMB5cYWk9+xuxxcFY9L9vynHX2xYyMDo/0DauPM=";
|
||||
};
|
||||
|
||||
/* Fix up the frontend to load the 'default' cryptoverif library
|
||||
@@ -40,10 +40,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "update-cryptoverif" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl pcre2
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
version="$(curl -s https://bblanche.gitlabpages.inria.fr/CryptoVerif/ |
|
||||
pcre2grep -o1 '\bCryptoVerif version ([.[:alnum:]]+),')"
|
||||
|
||||
update-source-version "$UPDATE_NIX_ATTR_PATH" "$version"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Cryptographic protocol verifier in the computational model";
|
||||
mainProgram = "cryptoverif";
|
||||
homepage = "https://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/";
|
||||
homepage = "https://bblanche.gitlabpages.inria.fr/CryptoVerif/";
|
||||
license = lib.licenses.cecill-b;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.thoughtpolice ];
|
||||
|
||||
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
|
||||
"-DANTLR3_JAR=${antlr3_4}/lib/antlr/antlr-3.4-complete.jar"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-performance theorem prover and SMT solver";
|
||||
mainProgram = "cvc5";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick
|
||||
, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
|
||||
, libxkbcommon, libXi, libXext, wayland-protocols, wayland, xxHash
|
||||
, nerdfonts
|
||||
, lcms2
|
||||
, librsync
|
||||
, openssl
|
||||
@@ -32,20 +33,20 @@
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.35.2";
|
||||
version = "0.36.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5ZkQfGlW7MWYCJZSwK/u8x9jKrZEqupsNvW30DLipDM=";
|
||||
hash = "sha256-7+MxxgQQlAje7klfJvvEWe8CfxyN0oTGQJ/QOORFUsY=";
|
||||
};
|
||||
|
||||
goModules = (buildGoModule {
|
||||
pname = "kitty-go-modules";
|
||||
inherit src version;
|
||||
vendorHash = "sha256-NzDA9b3RAfMx+Jj7cSF8pEsKUkoBECBUXl2QFSmkmwM=";
|
||||
vendorHash = "sha256-YN4sSdDNDIVgtcykg60H0bZEryRHJJfZ5rXWUMYXGr4=";
|
||||
}).goModules;
|
||||
|
||||
buildInputs = [
|
||||
@@ -82,6 +83,8 @@ buildPythonApplication rec {
|
||||
sphinxext-opengraph
|
||||
sphinx-inline-tabs
|
||||
go
|
||||
fontconfig
|
||||
(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
imagemagick
|
||||
libicns # For the png2icns tool.
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = "delta";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1UOVRAceZ4QlwrHWqN7YI2bMyuhwLnxJWpfyaHNNLYg=";
|
||||
hash = "sha256-9hi3efHzJV9jKJPSkyBaRO7hCYT17QPhw9pP/GwkMdo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/h7djtaTm799gjNrC6vKulwwuvrTHjlsEXbK2lDH+rc=";
|
||||
cargoHash = "sha256-aQaqQApoPlm/VhGs11RI9+Fk8s2czuJbOreSr3fEX+g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
Generated
+57
-31
@@ -198,7 +198,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -215,7 +215,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -726,7 +726,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"scratch",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -743,7 +743,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -818,6 +818,16 @@ dependencies = [
|
||||
"pem-rfc7468",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "deranged"
|
||||
version = "0.3.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
|
||||
dependencies = [
|
||||
"powerfmt",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "digest"
|
||||
version = "0.10.6"
|
||||
@@ -1047,7 +1057,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1774,6 +1784,12 @@ dependencies = [
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.45"
|
||||
@@ -1844,7 +1860,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2072,6 +2088,12 @@ dependencies = [
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "powerfmt"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.17"
|
||||
@@ -2113,9 +2135,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.56"
|
||||
version = "1.0.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
|
||||
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@@ -2215,9 +2237,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.27"
|
||||
version = "1.0.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
|
||||
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
@@ -2557,7 +2579,7 @@ dependencies = [
|
||||
"serde_json",
|
||||
"sqlx",
|
||||
"thiserror",
|
||||
"time 0.3.21",
|
||||
"time 0.3.36",
|
||||
"tracing",
|
||||
"url",
|
||||
"uuid",
|
||||
@@ -2620,7 +2642,7 @@ dependencies = [
|
||||
"rust_decimal",
|
||||
"sea-query-derive",
|
||||
"serde_json",
|
||||
"time 0.3.21",
|
||||
"time 0.3.36",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
@@ -2636,7 +2658,7 @@ dependencies = [
|
||||
"sea-query",
|
||||
"serde_json",
|
||||
"sqlx",
|
||||
"time 0.3.21",
|
||||
"time 0.3.36",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
@@ -2729,22 +2751,22 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.163"
|
||||
version = "1.0.208"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
|
||||
checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.163"
|
||||
version = "1.0.208"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
|
||||
checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2984,7 +3006,7 @@ dependencies = [
|
||||
"sqlx-rt",
|
||||
"stringprep",
|
||||
"thiserror",
|
||||
"time 0.3.21",
|
||||
"time 0.3.36",
|
||||
"tokio-stream",
|
||||
"url",
|
||||
"uuid",
|
||||
@@ -3057,9 +3079,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.15"
|
||||
version = "2.0.75"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
|
||||
checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -3117,7 +3139,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3143,11 +3165,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.21"
|
||||
version = "0.3.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
|
||||
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"num-conv",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
"time-macros",
|
||||
@@ -3155,16 +3180,17 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
version = "0.1.1"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
|
||||
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.9"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
|
||||
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
@@ -3210,7 +3236,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3416,7 +3442,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3566,7 +3592,7 @@ dependencies = [
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.15",
|
||||
"syn 2.0.75",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -35,6 +35,12 @@ rustPlatform.buildRustPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
# FIXME: Remove this after https://github.com/GRA0007/crab.fit/pull/341 is merged,
|
||||
# or upstream bumps their locked version of 0.3 time to 0.3.36 or later
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flashmq";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halfgaar";
|
||||
repo = "FlashMQ";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oKH2cH1GuNrBzxAVvmO01+IfkuNzQEgGpL4gSfjpjqg=";
|
||||
hash = "sha256-HcpNPkG1gd5Gb5z//DrU8Rxf+dZWKMwHtj62k4N1S3U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake installShellFiles ];
|
||||
|
||||
@@ -10,9 +10,7 @@
|
||||
, gitea
|
||||
, gzip
|
||||
, openssh
|
||||
, pam
|
||||
, sqliteSupport ? true
|
||||
, pamSupport ? stdenv.hostPlatform.isLinux
|
||||
, nixosTests
|
||||
, buildNpmPackage
|
||||
}:
|
||||
@@ -64,10 +62,7 @@ in buildGoModule rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = lib.optional pamSupport pam;
|
||||
|
||||
tags = lib.optional pamSupport "pam"
|
||||
++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ];
|
||||
tags = lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "lunarclient";
|
||||
version = "3.2.15";
|
||||
version = "3.2.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
|
||||
hash = "sha512-j2UuZXyjKev3me3b45/7NrWyfi3dbz8vgnEDF6m9Mv0ZT4CWi+A+h2V5DkJoUERWR8Pv4SJ4/GiwzftO9KSAZQ==";
|
||||
hash = "sha512-p+a7zirfM4rR4CPsXGa6jPhh0sFvoQN1O/roSZYA+qbhhtRS0MgnvuSN6EKdH37M5cF2KoNOqfapWE3PWWK19A==";
|
||||
};
|
||||
|
||||
extraInstallCommands =
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
{
|
||||
version,
|
||||
hash,
|
||||
updateScriptArgs ? "",
|
||||
}:
|
||||
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
gnused,
|
||||
libbpf,
|
||||
libcap_ng,
|
||||
numactl,
|
||||
openssl,
|
||||
pkg-config,
|
||||
procps,
|
||||
python3,
|
||||
unbound,
|
||||
xdp-tools,
|
||||
writeScript,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ovn";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ovn-org";
|
||||
repo = "ovn";
|
||||
rev = "refs/tags/v${version}";
|
||||
inherit hash;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libbpf
|
||||
libcap_ng
|
||||
numactl
|
||||
openssl
|
||||
unbound
|
||||
xdp-tools
|
||||
];
|
||||
|
||||
# need to build the ovs submodule first
|
||||
preConfigure = ''
|
||||
pushd ovs
|
||||
./boot.sh
|
||||
./configure
|
||||
make -j $NIX_BUILD_CORES
|
||||
popd
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# disable tests due to networking issues and because individual tests can't be skipped easily
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
gnused
|
||||
procps
|
||||
];
|
||||
|
||||
# https://docs.ovn.org/en/latest/topics/testing.html
|
||||
preCheck = ''
|
||||
export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
|
||||
# allow rechecks to retry flaky tests
|
||||
export RECHECK=yes
|
||||
|
||||
# hack to stop tests from trying to read /etc/resolv.conf
|
||||
export OVS_RESOLV_CONF="$PWD/resolv.conf"
|
||||
touch $OVS_RESOLV_CONF
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "ovs-update.nu" ''
|
||||
${./update.nu} ${updateScriptArgs}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open Virtual Network";
|
||||
longDescription = ''
|
||||
OVN (Open Virtual Network) is a series of daemons that translates virtual network configuration into OpenFlow, and installs them into Open vSwitch.
|
||||
'';
|
||||
homepage = "https://github.com/ovn-org/ovn";
|
||||
changelog = "https://github.com/ovn-org/ovn/blob/${src.rev}/NEWS";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ adamcstephens ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
import ./generic.nix {
|
||||
version = "24.03.3";
|
||||
hash = "sha256-W25Tq5Z7SYIBkq6doNz9WPiPsdDhnbys03rmF4m02eM=";
|
||||
updateScriptArgs = "--lts=true --regex '24.03.*'";
|
||||
}
|
||||
@@ -1,4 +1,91 @@
|
||||
import ./generic.nix {
|
||||
version = "24.03.2";
|
||||
hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ=";
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
gnused,
|
||||
libbpf,
|
||||
libcap_ng,
|
||||
nix-update-script,
|
||||
numactl,
|
||||
openssl,
|
||||
pkg-config,
|
||||
procps,
|
||||
python3,
|
||||
unbound,
|
||||
xdp-tools,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ovn";
|
||||
version = "24.03.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ovn-org";
|
||||
repo = "ovn";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-W25Tq5Z7SYIBkq6doNz9WPiPsdDhnbys03rmF4m02eM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libbpf
|
||||
libcap_ng
|
||||
numactl
|
||||
openssl
|
||||
unbound
|
||||
xdp-tools
|
||||
];
|
||||
|
||||
# need to build the ovs submodule first
|
||||
preConfigure = ''
|
||||
pushd ovs
|
||||
./boot.sh
|
||||
./configure
|
||||
make -j $NIX_BUILD_CORES
|
||||
popd
|
||||
'';
|
||||
|
||||
configureFlags = [ "--localstatedir=/var" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# disable tests due to networking issues and because individual tests can't be skipped easily
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
gnused
|
||||
procps
|
||||
];
|
||||
|
||||
# https://docs.ovn.org/en/latest/topics/testing.html
|
||||
preCheck = ''
|
||||
export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
|
||||
# allow rechecks to retry flaky tests
|
||||
export RECHECK=yes
|
||||
|
||||
# hack to stop tests from trying to read /etc/resolv.conf
|
||||
export OVS_RESOLV_CONF="$PWD/resolv.conf"
|
||||
touch $OVS_RESOLV_CONF
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open Virtual Network";
|
||||
longDescription = ''
|
||||
OVN (Open Virtual Network) is a series of daemons that translates virtual network configuration into OpenFlow, and installs them into Open vSwitch.
|
||||
'';
|
||||
homepage = "https://github.com/ovn-org/ovn";
|
||||
changelog = "https://github.com/ovn-org/ovn/blob/${src.rev}/NEWS";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ adamcstephens ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i nu -p nushell common-updater-scripts
|
||||
|
||||
def main [--lts = false, --regex: string] {
|
||||
let tags = list-git-tags --url=https://github.com/ovn-org/ovn | lines | sort --natural | str replace v ''
|
||||
|
||||
let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last
|
||||
let current_version = nix eval --raw -f default.nix $"ovn(if $lts {"-lts"}).version" | str trim
|
||||
|
||||
if $latest_tag != $current_version {
|
||||
if $lts {
|
||||
update-source-version ovn-lts $latest_tag $"--file=(pwd)/pkgs/by-name/ov/ovn/lts.nix"
|
||||
} else {
|
||||
update-source-version ovn $latest_tag $"--file=(pwd)/pkgs/by-name/ov/ovn/package.nix"
|
||||
}
|
||||
}
|
||||
|
||||
{"lts?": $lts, before: $current_version, after: $latest_tag}
|
||||
}
|
||||
@@ -9,6 +9,7 @@
|
||||
boolector,
|
||||
z3,
|
||||
aiger,
|
||||
btor2tools,
|
||||
python3Packages,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -36,49 +37,53 @@ stdenv.mkDerivation rec {
|
||||
yices
|
||||
z3
|
||||
aiger
|
||||
btor2tools
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs .
|
||||
postPatch = ''
|
||||
patchShebangs docs/source/conf.py \
|
||||
docs/source/conf.diff \
|
||||
tests/autotune/*.sh \
|
||||
tests/keepgoing/*.sh \
|
||||
tests/junit/*.sh
|
||||
|
||||
# Fix up Yosys imports
|
||||
substituteInPlace sbysrc/sby.py \
|
||||
--replace "##yosys-sys-path##" \
|
||||
--replace-fail "##yosys-sys-path##" \
|
||||
"sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
|
||||
|
||||
# Fix various executable references
|
||||
substituteInPlace sbysrc/sby_core.py \
|
||||
--replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \
|
||||
--replace ', "btormc"' ', "${boolector}/bin/btormc"' \
|
||||
--replace ', "aigbmc"' ', "${aiger}/bin/aigbmc"'
|
||||
--replace-fail '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \
|
||||
--replace-fail ', "btormc"' ', "${boolector}/bin/btormc"' \
|
||||
--replace-fail ', "aigbmc"' ', "${aiger}/bin/aigbmc"'
|
||||
|
||||
substituteInPlace sbysrc/sby_core.py \
|
||||
--replace '##yosys-program-prefix##' '"${yosys}/bin/"'
|
||||
--replace-fail '##yosys-program-prefix##' '"${yosys}/bin/"'
|
||||
|
||||
substituteInPlace sbysrc/sby.py \
|
||||
--replace '/usr/bin/env python3' '${pythonEnv}/bin/python'
|
||||
--replace-fail '/usr/bin/env python3' '${pythonEnv}/bin/python'
|
||||
substituteInPlace sbysrc/sby_autotune.py \
|
||||
--replace-fail '["btorsim", "--vcd"]' '["${btor2tools}/bin/btorsim", "--vcd"]'
|
||||
substituteInPlace tests/make/required_tools.py \
|
||||
--replace-fail '["btorsim", "--vcd"]' '["${btor2tools}/bin/btorsim", "--vcd"]'
|
||||
'';
|
||||
|
||||
buildPhase = "true";
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share/yosys/python3
|
||||
|
||||
cp sbysrc/sby_*.py $out/share/yosys/python3/
|
||||
cp sbysrc/sby.py $out/bin/sby
|
||||
|
||||
chmod +x $out/bin/sby
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [
|
||||
pythonEnv
|
||||
yosys
|
||||
boolector
|
||||
yices
|
||||
z3
|
||||
aiger
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make test
|
||||
@@ -93,7 +98,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "SymbiYosys (sby) -- Front-end for Yosys-based formal verification flows";
|
||||
description = "SymbiYosys, a front-end for Yosys-based formal verification flows";
|
||||
homepage = "https://symbiyosys.readthedocs.io/";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
||||
+27
-9
@@ -1,16 +1,25 @@
|
||||
{ lib, stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
blas,
|
||||
lapack,
|
||||
gfortran,
|
||||
fixDarwinDylibNames,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scs";
|
||||
version = "3.2.3";
|
||||
version = "3.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvxgrp";
|
||||
repo = "scs";
|
||||
rev = version;
|
||||
sha256 = "sha256-0g0r3DNgkPZgag0qtz79Wk3Cre1I2yaabFi3OgUzgfc=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Y28LrYUuDaXPO8sce1pJIfG3A03rw7BumVgxCIKRn+U=";
|
||||
};
|
||||
|
||||
# Actually link and add libgfortran to the rpath
|
||||
@@ -22,7 +31,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
buildInputs = [ blas lapack gfortran.cc.lib ];
|
||||
buildInputs = [
|
||||
blas
|
||||
lapack
|
||||
gfortran.cc.lib
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -39,14 +52,19 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Splitting Conic Solver";
|
||||
longDescription = ''
|
||||
Numerical optimization package for solving large-scale convex cone problems
|
||||
'';
|
||||
homepage = "https://github.com/cvxgrp/scs";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.bhipple ];
|
||||
changelog = "https://github.com/cvxgrp/scs/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ bhipple ];
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tippecanoe";
|
||||
version = "2.58.0";
|
||||
version = "2.60.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "felt";
|
||||
repo = "tippecanoe";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-YeK036tiU5Z/tf4L+islWJuqbhaNCTtVMoY7jvPPhm4=";
|
||||
hash = "sha256-29jQiPyHotvBm/puoT/WOVgX1Y3N3Q94O+oJ1IjaoKM=";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite zlib ];
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
, bzrtp
|
||||
, cmake
|
||||
, fetchFromGitLab
|
||||
, ffmpeg_4
|
||||
, fetchpatch2
|
||||
, ffmpeg_7
|
||||
, glew
|
||||
, gsm
|
||||
, lib
|
||||
@@ -43,6 +44,12 @@ stdenv.mkDerivation rec {
|
||||
# plugin directory with desired plugins and wrap executables so that the
|
||||
# environment variable points to that directory.
|
||||
./plugins_dir.patch
|
||||
|
||||
# Port to ffmpeg 5.0 API
|
||||
(fetchpatch2 {
|
||||
url = "https://salsa.debian.org/pkg-voip-team/linphone-stack/mediastreamer2/-/raw/4e7784802d2eac57dffe210c8c23e696f40ac6ec/debian/patches/ffmpeg_5_0_fixes.patch";
|
||||
hash = "sha256-5ay4iVbx8IOX952HEFaKLBGKLRYUWRntufciApUVhh0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -58,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||
bzrtp
|
||||
ortp
|
||||
|
||||
ffmpeg_4
|
||||
ffmpeg_7
|
||||
glew
|
||||
libX11
|
||||
libXext
|
||||
|
||||
@@ -2469,14 +2469,14 @@ buildLuarocksPackage {
|
||||
lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "lz.n";
|
||||
version = "2.0.0-1";
|
||||
version = "2.2.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/lz.n-2.0.0-1.rockspec";
|
||||
sha256 = "1p77m6r1a4a3p96hzwx7i6svdkiy2nfb2xj37axvay7psbqcyd51";
|
||||
url = "mirror://luarocks/lz.n-2.2.0-1.rockspec";
|
||||
sha256 = "0ybdmsv7lxgmv5g8dmgsw8qa20lxxj8736814iw9hwynndwl7gck";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-neorocks/lz.n/archive/v2.0.0.zip";
|
||||
sha256 = "1i55ilg57n2hl0r81a5jqk5ar1bchgavqcscnj6j62ag1dfv6l7f";
|
||||
url = "https://github.com/nvim-neorocks/lz.n/archive/v2.2.0.zip";
|
||||
sha256 = "16z7q6jp53gjmj2vn5vy2bv5x8p18hlxs28apsw59nk0wwz1s9s4";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
@@ -156,6 +156,7 @@ mapAliases {
|
||||
surge = pkgs.surge-cli; # Added 2023-09-08
|
||||
inherit (pkgs) svelte-language-server; # Added 2024-05-12
|
||||
swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09
|
||||
teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
|
||||
tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09
|
||||
inherit (pkgs) terser; # Added 2023-08-31
|
||||
inherit (pkgs) textlint; # Added 2024-05-13
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
purty = "purty";
|
||||
pscid = "pscid";
|
||||
remod-cli = "remod";
|
||||
teck-programmer = "teck-firmware-upgrade";
|
||||
vscode-json-languageserver = "vscode-json-languageserver";
|
||||
webtorrent-cli = "webtorrent";
|
||||
}
|
||||
|
||||
@@ -194,7 +194,6 @@
|
||||
, "svelte-check"
|
||||
, "svgo"
|
||||
, "tailwindcss"
|
||||
, "teck-programmer"
|
||||
, "tern"
|
||||
, "thelounge-plugin-closepms"
|
||||
, "thelounge-plugin-giphy"
|
||||
|
||||
-24
@@ -83954,30 +83954,6 @@ in
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
teck-programmer = nodeEnv.buildNodePackage {
|
||||
name = "teck-programmer";
|
||||
packageName = "teck-programmer";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/teck-programmer/-/teck-programmer-1.1.1.tgz";
|
||||
sha512 = "bfg3TwaPBG/R2FGPyUQD/MDhWcdqvuflBzI5VsQPJD/EuPnCE/rUPKXaLvhDaz2szzz8xYcv+t10yhKuX5PYWA==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."node-addon-api-4.3.0"
|
||||
sources."node-gyp-build-4.8.1"
|
||||
sources."q-1.5.1"
|
||||
sources."usb-1.9.2"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Programmer for TECK keyboards.";
|
||||
homepage = "https://github.com/m-ou-se/teck-programmer";
|
||||
license = "GPL-3.0+";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
tern = nodeEnv.buildNodePackage {
|
||||
name = "tern";
|
||||
packageName = "tern";
|
||||
|
||||
@@ -332,12 +332,6 @@ final: prev: {
|
||||
};
|
||||
};
|
||||
|
||||
teck-programmer = prev.teck-programmer.override ({ meta, ... }: {
|
||||
nativeBuildInputs = [ final.node-gyp-build ];
|
||||
buildInputs = [ pkgs.libusb1 ];
|
||||
meta = meta // { license = lib.licenses.gpl3Plus; };
|
||||
});
|
||||
|
||||
thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override {
|
||||
nativeBuildInputs = [ pkgs.node-pre-gyp ];
|
||||
};
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
setuptools,
|
||||
cython_0,
|
||||
zfs,
|
||||
}:
|
||||
@@ -27,16 +28,16 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cython_0 ];
|
||||
build-system = [ cython_0 ];
|
||||
buildInputs = [ zfs ];
|
||||
|
||||
# Passing CFLAGS in configureFlags does not work, see https://github.com/truenas/py-libzfs/issues/107
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace configure \
|
||||
--replace \
|
||||
--replace-fail \
|
||||
'CFLAGS="-DCYTHON_FALLTHROUGH"' \
|
||||
'CFLAGS="-DCYTHON_FALLTHROUGH -I${zfs.dev}/include/libzfs -I${zfs.dev}/include/libspl"' \
|
||||
--replace 'zof=false' 'zof=true'
|
||||
--replace-fail 'zof=false' 'zof=true'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "libzfs" ];
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pygmt";
|
||||
version = "0.11.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
hypothesis,
|
||||
pythonOlder,
|
||||
pytestCheckHook,
|
||||
@@ -11,15 +12,17 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pyisbn";
|
||||
version = "1.3.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "06fm9rn31cb4b61hzy63cnwfjpppgyy517k8a04gzcv9g60n7xbh";
|
||||
hash = "sha256-cPVjgXlps/8IUGieULx/917puGXD+A+DWWSxMGxO1Rk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pymarshal";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stargateaudio";
|
||||
@@ -23,12 +23,12 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
--replace-fail "'pytest-runner'" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ bson ];
|
||||
dependencies = [ bson ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
||||
@@ -4,26 +4,29 @@
|
||||
buildPythonPackage,
|
||||
isPy3k,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymetar";
|
||||
version = "1.4";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "48dbe6c4929961021cb61e49bb9e0605b54c4b61b9fb9ade51076705a08ecd54";
|
||||
hash = "sha256-SNvmxJKZYQIcth5Ju54GBbVMS2G5+5reUQdnBaCOzVQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
checkPhase = ''
|
||||
cd testing/smoketest
|
||||
tar xzf reports.tgz
|
||||
mkdir logs
|
||||
patchShebangs runtests.sh
|
||||
substituteInPlace runtests.sh --replace "break" "exit 1" # fail properly
|
||||
substituteInPlace runtests.sh --replace-fail "break" "exit 1" # fail properly
|
||||
export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}"
|
||||
./runtests.sh
|
||||
'';
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
writeText,
|
||||
autograd,
|
||||
@@ -21,7 +22,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pymoo";
|
||||
version = "0.6.0.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyoptimization";
|
||||
@@ -45,19 +46,21 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "cma==3.2.2" "cma" \
|
||||
--replace "'alive-progress'," ""
|
||||
pythonRelaxDeps = [ "cma" ];
|
||||
pythonRemoveDeps = [ "alive-progress" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pymoo/util/display/display.py \
|
||||
--replace "from pymoo.util.display.progress import ProgressBar" "" \
|
||||
--replace "ProgressBar() if progress else None" \
|
||||
--replace-fail "from pymoo.util.display.progress import ProgressBar" "" \
|
||||
--replace-fail "ProgressBar() if progress else None" \
|
||||
"print('Missing alive_progress needed for progress=True!') if progress else None"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
cython
|
||||
];
|
||||
dependencies = [
|
||||
autograd
|
||||
cma
|
||||
deprecated
|
||||
@@ -70,7 +73,7 @@ buildPythonPackage rec {
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
substituteInPlace pymoo/config.py \
|
||||
--replace "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \
|
||||
--replace-fail "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \
|
||||
"file://$pymoo_data/"
|
||||
'';
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -3,13 +3,14 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
requests,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyosf";
|
||||
version = "1.0.5";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -22,12 +23,14 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner', " ""
|
||||
--replace-fail "'pytest-runner', " ""
|
||||
'';
|
||||
|
||||
preBuild = "export HOME=$TMP";
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ requests ];
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@@ -25,18 +25,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-7FLGmmndrFqSl4oC8QFIYNlFJPr+xbiZG5ZRt4vx8+s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/osohotwateriot/apyosohotwaterapi/pull/3
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "pre-commit" ""
|
||||
'';
|
||||
# https://github.com/osohotwateriot/apyosohotwaterapi/pull/3
|
||||
pythonRemoveDeps = [ "pre-commit" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
unasync
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
loguru
|
||||
numpy
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
numpy,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
@@ -10,7 +11,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pysrim";
|
||||
version = "0.5.10";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -21,10 +22,12 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner', " ""
|
||||
--replace-fail "'pytest-runner', " ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
pyyaml
|
||||
];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
requests,
|
||||
requests-cache,
|
||||
beautifulsoup4,
|
||||
@@ -10,6 +11,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pysychonaut";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PySychonaut";
|
||||
@@ -18,10 +20,12 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace setup.py --replace "bs4" "beautifulsoup4"
|
||||
substituteInPlace setup.py --replace-fail "bs4" "beautifulsoup4"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
requests-cache
|
||||
beautifulsoup4
|
||||
|
||||
@@ -29,18 +29,18 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/conftest.py inventory \
|
||||
--replace '/usr/bin/env' '${coreutils}/bin/env'
|
||||
substituteInPlace inventory \
|
||||
--replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
ansible-core
|
||||
ansible-compat
|
||||
packaging
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
pylint,
|
||||
pytest,
|
||||
pytestCheckHook,
|
||||
@@ -12,7 +13,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-pylint";
|
||||
version = "0.21.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -23,12 +24,14 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytest-runner" ""
|
||||
--replace-fail "pytest-runner" ""
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
pylint
|
||||
toml
|
||||
];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
py,
|
||||
pytest,
|
||||
}:
|
||||
@@ -9,24 +10,20 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-raisesregexp";
|
||||
version = "2.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b54372494fc1f11388b1b9348aeb36b69609699eb8f46e0e010afc733d78236a";
|
||||
hash = "sha256-tUNySU/B8ROIsbk0ius2tpYJaZ649G4OAQr8cz14I2o=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
buildInputs = [
|
||||
py
|
||||
pytest
|
||||
];
|
||||
|
||||
# https://github.com/kissgyorgy/pytest-raisesregexp/pull/3
|
||||
prePatch = ''
|
||||
sed -i '3i\import io' setup.py
|
||||
substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read(),"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple pytest plugin to look for regex in Exceptions";
|
||||
homepage = "https://github.com/Walkman/pytest_raisesregexp";
|
||||
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
# Fix django tests
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_project/settings.py \
|
||||
--replace "USE_L10N = True" ""
|
||||
--replace-fail "USE_L10N = True" ""
|
||||
'';
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -26,12 +26,12 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "version.get_git_version()" '"${version}"'
|
||||
--replace-fail "version.get_git_version()" '"${version}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
dependencies = [ six ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
||||
@@ -53,7 +53,7 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
--replace-fail "'pytest-runner'" ""
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
jinja2,
|
||||
ply,
|
||||
iverilog,
|
||||
@@ -12,7 +13,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pyverilog";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@@ -24,10 +25,14 @@ buildPythonPackage rec {
|
||||
patchPhase = ''
|
||||
# The path to Icarus can still be overridden via an environment variable at runtime.
|
||||
substituteInPlace pyverilog/vparser/preprocessor.py \
|
||||
--replace "iverilog = 'iverilog'" "iverilog = '${iverilog}/bin/iverilog'"
|
||||
--replace-fail \
|
||||
"iverilog = 'iverilog'" \
|
||||
"iverilog = '${lib.getExe' iverilog "iverilog"}'"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
jinja2
|
||||
ply
|
||||
iverilog
|
||||
@@ -35,7 +40,7 @@ buildPythonPackage rec {
|
||||
|
||||
preCheck = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "python_paths" "pythonpath"
|
||||
--replace-fail "python_paths" "pythonpath"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pyweatherflowrest";
|
||||
version = "1.0.11";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -21,14 +21,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-l1V3HgzqnnoY6sWHwfgBtcIR782RwKhekY2qOLrUMNY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov=pyweatherflowrest --cov-append" ""
|
||||
'';
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
# Module has no tests. test.py is a demo script
|
||||
doCheck = false;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
certifi,
|
||||
charset-normalizer,
|
||||
fetchFromGitHub,
|
||||
@@ -17,7 +18,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "qualysclient";
|
||||
version = "0.0.4.8.3";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@@ -30,10 +31,12 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "version=__version__," 'version="${version}",'
|
||||
--replace-fail "version=__version__," 'version="${version}",'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
certifi
|
||||
charset-normalizer
|
||||
idna
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "quart-cors";
|
||||
version = "0.7.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgjones";
|
||||
@@ -29,9 +29,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-qUzs0CTZHf3fGADBXPkd3CjZ6dnz1t3cTxflMErvz/k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [ quart ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
|
||||
dependencies = [ quart ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
|
||||
|
||||
pythonImportsCheck = [ "quart_cors" ];
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
absl-py,
|
||||
nltk,
|
||||
numpy,
|
||||
@@ -22,7 +23,7 @@ in
|
||||
buildPythonPackage rec {
|
||||
pname = "rouge-score";
|
||||
version = "0.1.2";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
@@ -35,10 +36,14 @@ buildPythonPackage rec {
|
||||
# the tar file from pypi doesn't come with the test data
|
||||
postPatch = ''
|
||||
substituteInPlace rouge_score/test_util.py \
|
||||
--replace 'os.path.join(os.path.dirname(__file__), "testdata")' '"${testdata}/rouge/testdata/"'
|
||||
--replace-fail \
|
||||
'os.path.join(os.path.dirname(__file__), "testdata")' \
|
||||
'"${testdata}/rouge/testdata/"'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
absl-py
|
||||
nltk
|
||||
numpy
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
sanic,
|
||||
sanic-testing,
|
||||
pytestCheckHook,
|
||||
@@ -10,15 +11,17 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "sanic-auth";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Sanic-Auth";
|
||||
inherit version;
|
||||
sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198";
|
||||
hash = "sha256-KAU066S70GO1hURQrW0n+L5/kFzpgen341hlia0ngjU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sanic ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ sanic ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
@@ -33,7 +36,7 @@ buildPythonPackage rec {
|
||||
postPatch = ''
|
||||
# Support for httpx>=0.20.0
|
||||
substituteInPlace tests/test_auth.py \
|
||||
--replace "allow_redirects=False" "follow_redirects=False"
|
||||
--replace-fail "allow_redirects=False" "follow_redirects=False"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "sanic_auth" ];
|
||||
|
||||
@@ -51,7 +51,7 @@ buildPythonPackage rec {
|
||||
|
||||
# Strip out references to unfree fonts from the test suite
|
||||
postPatch = ''
|
||||
substituteInPlace test/test_styles.ipynb --replace "font='Times', " ""
|
||||
substituteInPlace test/test_backend.ipynb --replace-fail "(font='Times')" "()"
|
||||
'';
|
||||
|
||||
preCheck = "rm test/test_pictorial.ipynb"; # Tries to download files
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
fake-useragent,
|
||||
faker,
|
||||
fetchFromGitHub,
|
||||
pytest-cov-stub,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
@@ -13,7 +15,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "scrapy-fake-useragent";
|
||||
version = "1.4.4";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -27,15 +29,18 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --cov=scrapy_fake_useragent --cov-report=term --cov-report=html --fulltrace" ""
|
||||
--replace-fail " --fulltrace" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
fake-useragent
|
||||
faker
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
scrapy
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scs";
|
||||
version = "3.2.6";
|
||||
version = "3.2.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bodono";
|
||||
repo = "scs-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Sl0+1/uEXAg+V2ijDFGmez6hBKQjbi63gN26lPCiEnI=";
|
||||
hash = "sha256-ZhY4h0C8aF3IjD9NMtevcNTSqX+tIUao9bC+WlP+uDk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
python-dateutil,
|
||||
attrs,
|
||||
anyio,
|
||||
@@ -10,18 +11,22 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "semaphore-bot";
|
||||
version = "0.17.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-3zb6+HdOB6+YrVRcmIHsokFKUOlFmKCoVNllvM+aOXQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "anyio>=3.5.0,<=3.6.2" "anyio"
|
||||
'';
|
||||
pythonRelaxDeps = [
|
||||
"anyio"
|
||||
"attrs"
|
||||
"python-dateutil"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
anyio
|
||||
attrs
|
||||
python-dateutil
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "shapely";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-v/I2a8eGv6bLNT1rR9BEPFcMMndmEuUn7ke232P8/jI=";
|
||||
hash = "sha256-mX9hWbFIQFnsI5ysqlNGf9i1Vk2r4YbNhKwpRGY7C/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
certifi,
|
||||
numpy,
|
||||
sgp4,
|
||||
@@ -16,7 +17,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "skyfield";
|
||||
version = "1.45";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyfielders";
|
||||
@@ -29,10 +30,12 @@ buildPythonPackage rec {
|
||||
# https://github.com/skyfielders/python-skyfield/issues/582#issuecomment-822033858
|
||||
postPatch = ''
|
||||
substituteInPlace skyfield/tests/test_planetarylib.py \
|
||||
--replace "if IS_32_BIT" "if True"
|
||||
--replace-fail "if IS_32_BIT" "if True"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
certifi
|
||||
numpy
|
||||
sgp4
|
||||
|
||||
@@ -2,24 +2,27 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
protobuf,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snakebite";
|
||||
version = "2.11.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "085238b4944cb9c658ee62d5794de936ac3d0c337c504b2cc86424a205ae978a";
|
||||
hash = "sha256-CFI4tJRMucZY7mLVeU3pNqw9DDN8UEssyGQkogWul4o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ protobuf ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ protobuf ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'argparse'" ""
|
||||
--replace-fail "'argparse'" ""
|
||||
'';
|
||||
|
||||
# Tests require hadoop hdfs
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "snakemake-storage-plugin-s3";
|
||||
version = "0.2.12";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
@@ -23,14 +23,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-TKv/7b3+uhY18v7p1ZSya5KJEMUv4M1NkObP9vPzMxU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace ">=2.0,<2.2" "*"
|
||||
'';
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
boto3
|
||||
botocore
|
||||
snakemake-interface-storage-plugins
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "snakemake-storage-plugin-xrootd";
|
||||
version = "unstable-2023-12-16";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
@@ -22,14 +22,11 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
# xrootd<6.0.0,>=5.6.4 not satisfied by version 5.7rc20240303
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'xrootd = "^5.6.4"' ""
|
||||
'';
|
||||
pythonRelaxDeps = [ "xrootd" ];
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
snakemake-interface-storage-plugins
|
||||
snakemake-interface-common
|
||||
xrootd
|
||||
|
||||
@@ -34,18 +34,19 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [ "dataclasses" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'dataclasses~=0.6'," "" \
|
||||
--replace "dataclasses-json~=0.5.4" "dataclasses-json>=0.5.4" \
|
||||
--replace "responses~=0.13.3" "responses>=0.13.3" \
|
||||
--replace "limiter~=0.1.2" "limiter>=0.1.2" \
|
||||
--replace "requests~=2.26.0" "requests>=2.26.0"
|
||||
--replace-fail "dataclasses-json~=0.5.4" "dataclasses-json>=0.5.4" \
|
||||
--replace-fail "responses~=0.13.3" "responses>=0.13.3" \
|
||||
--replace-fail "limiter~=0.1.2" "limiter>=0.1.2" \
|
||||
--replace-fail "requests~=2.26.0" "requests>=2.26.0"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
requests
|
||||
dataclasses-json
|
||||
responses
|
||||
|
||||
@@ -2,11 +2,13 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "testing.common.database";
|
||||
version = "2.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@@ -15,9 +17,11 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/testing/common/database.py \
|
||||
--replace "collections.Callable" "collections.abc.Callable"
|
||||
--replace-fail "collections.Callable" "collections.abc.Callable"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# There are no unit tests
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pg8000,
|
||||
postgresql,
|
||||
psycopg2,
|
||||
@@ -15,7 +16,7 @@ buildPythonPackage rec {
|
||||
pname = "testing-postgresql";
|
||||
# Version 1.3.0 isn't working so let's use the latest commit from GitHub
|
||||
version = "unstable-2017-10-31";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -26,7 +27,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-A4tahAaa98X66ZYa3QxIQDZkwAwVB6ZDRObEhkbUWKs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
testing-common-database
|
||||
pg8000
|
||||
];
|
||||
@@ -40,12 +43,14 @@ buildPythonPackage rec {
|
||||
# Add PostgreSQL to search path
|
||||
prePatch = ''
|
||||
substituteInPlace src/testing/postgresql.py \
|
||||
--replace "/usr/local/pgsql" "${postgresql}"
|
||||
--replace-fail "/usr/local/pgsql" "${postgresql}"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [ "pg8000" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pg8000 >= 1.10" "pg8000"
|
||||
--replace-fail "pg8000 >= 1.10" "pg8000"
|
||||
substituteInPlace tests/test_postgresql.py \
|
||||
--replace-fail "self.assertRegexpMatches" "self.assertRegex"
|
||||
'';
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "timm";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "pytorch-image-models";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-z7v1CTwIqdF8xhfGa2mtFi0sFjhOhM7X/q1OQ5qHA7c=";
|
||||
hash = "sha256-iWZXile3hCUMx2q3VHJasX7rlJmT0OKBm9rkCXuWISw=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
substituteInPlace requirements.txt \
|
||||
--replace-fail "==" ">="
|
||||
substituteInPlace pytest.ini \
|
||||
--replace ' -m "not premium"' ""
|
||||
--replace-fail ' -m "not premium"' ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
requests,
|
||||
rx,
|
||||
pytestCheckHook,
|
||||
@@ -12,7 +13,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "twitch-python";
|
||||
version = "0.0.20";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@@ -22,10 +23,12 @@ buildPythonPackage rec {
|
||||
disabled = !isPy3k;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "'pipenv'," ""
|
||||
substituteInPlace setup.py --replace-fail "'pipenv'," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
rx
|
||||
];
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
git,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "versiontag";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thelabnyc";
|
||||
@@ -19,9 +20,11 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "get_version(pypi=True)" '"${version}"'
|
||||
--replace-fail "get_version(pypi=True)" '"${version}"'
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
pythonImportsCheck = [ "versiontag" ];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
levenshtein,
|
||||
pytesseract,
|
||||
opencv4,
|
||||
@@ -11,14 +12,16 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "videocr";
|
||||
version = "0.1.6";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1clifwczvhvbaw2spgxkkyqsbqh21vyfw3rh094pxfmq89ylyj63";
|
||||
hash = "sha256-w0hPfUK4un5JAjAP7vwOAuKlsZ+zv6sFV2vD/Rl3kbI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
levenshtein
|
||||
pytesseract
|
||||
opencv4
|
||||
@@ -27,12 +30,12 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "python-Levenshtein" "Levenshtein" \
|
||||
--replace "opencv-python" "opencv"
|
||||
--replace-fail "python-Levenshtein" "Levenshtein" \
|
||||
--replace-fail "opencv-python" "opencv"
|
||||
substituteInPlace videocr/constants.py \
|
||||
--replace "master" "main"
|
||||
--replace-fail "master" "main"
|
||||
substituteInPlace videocr/video.py \
|
||||
--replace '--tessdata-dir "{}"' '--tessdata-dir="{}"'
|
||||
--replace-fail '--tessdata-dir "{}"' '--tessdata-dir="{}"'
|
||||
'';
|
||||
|
||||
# Project has no tests
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
httpx,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
python-dateutil,
|
||||
pythonOlder,
|
||||
wsgidav,
|
||||
@@ -29,17 +30,12 @@ buildPythonPackage rec {
|
||||
hash = "sha256-LgWYgERRuUODFzUnC08kDJTVRx9vanJ+OU8sREEMVwM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
httpx
|
||||
python-dateutil
|
||||
];
|
||||
@@ -49,6 +45,7 @@ buildPythonPackage rec {
|
||||
colorama
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
wsgidav
|
||||
] ++ passthru.optional-dependencies.fsspec;
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
pythonOlder,
|
||||
isPy3k,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
appdirs,
|
||||
consonance,
|
||||
protobuf,
|
||||
@@ -16,7 +17,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "yowsup";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
# The Python 2.x support of this package is incompatible with `six==1.11`:
|
||||
# https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486
|
||||
@@ -29,15 +30,14 @@ buildPythonPackage rec {
|
||||
sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "argparse" "" \
|
||||
--replace "==" ">=" \
|
||||
'';
|
||||
pythonRelaxDeps = true;
|
||||
pythonRemoveDeps = [ "argparse" ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
appdirs
|
||||
consonance
|
||||
protobuf
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
dos2unix,
|
||||
httpx,
|
||||
pytest-asyncio,
|
||||
pytest-cov-stub,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
@@ -15,24 +16,25 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "zeversolarlocal";
|
||||
version = "1.1.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ExZy5k5RE7k+D0lGmuIkGWrWQ+m24K2oqbUEg4BAVuY=";
|
||||
hash = "sha256-ExZy5k5RE7k+D0lGmuIkGWrWQ+m24K2oqbUEg4BAVuY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
flit-core
|
||||
dos2unix
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ httpx ];
|
||||
dependencies = [ httpx ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
@@ -51,11 +53,6 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov zeversolarlocal --cov-report xml:cov.xml --cov-report term-missing -vv" ""
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Test requires network access
|
||||
"test_httpx_timeout"
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, go
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "maligned";
|
||||
version = "unstable-2022-02-04";
|
||||
rev = "d7cd9a96ae47d02b08234503b54709ad4ae82105";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdempsky";
|
||||
repo = "maligned";
|
||||
inherit rev;
|
||||
sha256 = "sha256-exljmDNtVhjJkvh0EomcbBXSsmQx4I59MHDfMWSQyKk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-q/0lxZWk3a7brMsbLvZUSZ8XUHfWfx79qxjir1Vygx4=";
|
||||
|
||||
allowGoReference = true;
|
||||
|
||||
nativeCheckInputs = [ go ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to detect Go structs that would take less memory if their fields were sorted";
|
||||
mainProgram = "maligned";
|
||||
homepage = "https://github.com/mdempsky/maligned";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ kalbasit ];
|
||||
};
|
||||
}
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-clone";
|
||||
version = "1.2.1";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janlikar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-al+C3p9jzPbykflt3WN+SibHm/AN4BdTxuTGmFiGGrE=";
|
||||
sha256 = "sha256-kK0J1Vfx1T17CgZ3DV9kQbAUxk4lEfje5p6QvdBS5VQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sQVjK6i+wXwOfQMvnatl6PQ1S+91I58YEtRjzjSNNo8=";
|
||||
cargoHash = "sha256-6UUaOwu6N/XFdGEnoAX5zM4xTsqwHwPrmZ1t5huF6nM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -156,7 +156,6 @@ in {
|
||||
platform = "rk3588";
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"];
|
||||
platformCanUseHDCPBlob = true;
|
||||
|
||||
# TODO: remove this once the following get merged:
|
||||
# 1: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/21840
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
{ lib, stdenv, teck-programmer }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "teck-udev-rules";
|
||||
version = lib.getVersion teck-programmer;
|
||||
|
||||
inherit (teck-programmer) src;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install 40-teck.rules -D -t $out/etc/udev/rules.d/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "udev rules for TECK keyboards";
|
||||
inherit (teck-programmer.meta) license;
|
||||
maintainers = [ lib.maintainers.bbjubjub ];
|
||||
};
|
||||
}
|
||||
Generated
+4066
-1679
File diff suppressed because it is too large
Load Diff
@@ -1,35 +1,47 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, openssl
|
||||
, sqlite
|
||||
, zstd
|
||||
, stdenv
|
||||
, darwin
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
openssl,
|
||||
sqlite,
|
||||
zstd,
|
||||
stdenv,
|
||||
darwin,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sqld";
|
||||
version = "0.17.2";
|
||||
version = "0.24.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsql";
|
||||
repo = "sqld";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KoEscrzkFJnxxJKL/2r4cY0oLpKdQMjFR3daryzrVKQ=";
|
||||
owner = "tursodatabase";
|
||||
repo = "libsql";
|
||||
rev = "libsql-server-v${version}";
|
||||
hash = "sha256-/0Sk55GBjUk/FeIoq/hGVaNGB0EM8CxygAXZ+ufvWKg=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin"
|
||||
"sqld"
|
||||
];
|
||||
|
||||
cargoHash = "";
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libsqlite3-sys-0.26.0" = "sha256-JzSGpqYtkIq0mVYD0kERIB6rmZUttqkCGne+M4vqTJU=";
|
||||
"octopod-0.1.0" = "sha256-V16fOlIp9BCpyzgh1Aei3Mra/y15v8dQFA8tHdOwZm4=";
|
||||
"console-api-0.5.0" = "sha256-MfaxtzOqyblk6aTMqJGRP+123aK0Kq7ODNp/3lehkpQ=";
|
||||
"hyper-rustls-0.24.1" = "sha256-dYN42bnbY+4+etmimrnoyzmrKvCZ05fYr1qLQFvzRTk=";
|
||||
"rheaper-0.2.0" = "sha256-u5z6J1nmUbIQjDDqqdkT0axNBOvwbFBYghYW/r1rDHc=";
|
||||
"s3s-0.10.1-dev" = "sha256-y4DZnRsQzRNsCIp6vrppZkfXSP50LCHWYrKRoIHYPik=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
protobuf
|
||||
rustPlatform.bindgenHook
|
||||
@@ -39,9 +51,7 @@ rustPlatform.buildRustPackage rec {
|
||||
openssl
|
||||
sqlite
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
env.ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
|
||||
@@ -50,7 +60,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "LibSQL with extended capabilities like HTTP protocol, replication, and more";
|
||||
homepage = "https://github.com/libsql/sqld";
|
||||
homepage = "https://github.com/tursodatabase/libsql";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dit7ya ];
|
||||
};
|
||||
|
||||
@@ -38,5 +38,6 @@ in stdenv.mkDerivation {
|
||||
jlesquembre
|
||||
cpcloud
|
||||
];
|
||||
hydraPlatforms = [ ]; # Hydra fails with "Output limit exceeded"
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
Adapted from https://github.com/LibVNC/libvncserver/commit/c5ba3fee85a7ecbbca1df5ffd46d32b92757bc2a
|
||||
diff --git a/vncviewer/rfbproto.c b/vncviewer/rfbproto.c
|
||||
index 04b0230..47a6863 100644
|
||||
--- a/vncviewer/rfbproto.c
|
||||
+++ b/vncviewer/rfbproto.c
|
||||
@@ -1217,6 +1217,12 @@ HandleRFBServerMessage()
|
||||
if (serverCutText)
|
||||
free(serverCutText);
|
||||
|
||||
+ if (msg.sct.length > 1<<20) {
|
||||
+ fprintf(stderr,"Ignoring too big cut text length sent by server: %u B > 1 MB\n",
|
||||
+ (unsigned int)msg.sct.length);
|
||||
+ return False;
|
||||
+ }
|
||||
+
|
||||
serverCutText = malloc(msg.sct.length+1);
|
||||
|
||||
if (!ReadFromRFBServer(serverCutText, msg.sct.length))
|
||||
@@ -1,19 +0,0 @@
|
||||
Adapted from https://github.com/LibVNC/libvncserver/commit/c2c4b81e6cb3b485fb1ec7ba9e7defeb889f6ba7
|
||||
diff --git a/vncviewer/rfbproto.c b/vncviewer/rfbproto.c
|
||||
index 04b0230..bd11b54 100644
|
||||
--- a/vncviewer/rfbproto.c
|
||||
+++ b/vncviewer/rfbproto.c
|
||||
@@ -303,7 +303,12 @@ InitialiseRFBConnection(void)
|
||||
si.format.blueMax = Swap16IfLE(si.format.blueMax);
|
||||
si.nameLength = Swap32IfLE(si.nameLength);
|
||||
|
||||
- /* FIXME: Check arguments to malloc() calls. */
|
||||
+ if (si.nameLength > 1<<20) {
|
||||
+ fprintf(stderr, "Too big desktop name length sent by server: %lu B > 1 MB\n",
|
||||
+ (unsigned long)si.nameLength);
|
||||
+ return False;
|
||||
+ }
|
||||
+
|
||||
desktopName = malloc(si.nameLength + 1);
|
||||
if (!desktopName) {
|
||||
fprintf(stderr, "Error allocating memory for desktop name, %lu bytes\n",
|
||||
@@ -1,16 +0,0 @@
|
||||
diff --git a/vncviewer/zlib.c b/vncviewer/zlib.c
|
||||
index 80c4eee..76998d8 100644
|
||||
--- a/vncviewer/zlib.c
|
||||
+++ b/vncviewer/zlib.c
|
||||
@@ -55,6 +55,11 @@ HandleZlibBPP (int rx, int ry, int rw, int rh)
|
||||
raw_buffer_size = (( rw * rh ) * ( BPP / 8 ));
|
||||
raw_buffer = (char*) malloc( raw_buffer_size );
|
||||
|
||||
+ if ( raw_buffer == NULL ) {
|
||||
+ fprintf(stderr,
|
||||
+ "couldn't allocate raw_buffer in HandleZlibBPP");
|
||||
+ return False;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (!ReadFromRFBServer((char *)&hdr, sz_rfbZlibHeader))
|
||||
@@ -1,14 +0,0 @@
|
||||
Adapted from https://github.com/LibVNC/libvncserver/commit/7b1ef0ffc4815cab9a96c7278394152bdc89dc4d
|
||||
diff --git a/vncviewer/corre.c b/vncviewer/corre.c
|
||||
index c846a10..a4c272d 100644
|
||||
--- a/vncviewer/corre.c
|
||||
+++ b/vncviewer/corre.c
|
||||
@@ -56,7 +56,7 @@ HandleCoRREBPP (int rx, int ry, int rw, int rh)
|
||||
XChangeGC(dpy, gc, GCForeground, &gcv);
|
||||
XFillRectangle(dpy, desktopWin, gc, rx, ry, rw, rh);
|
||||
|
||||
- if (!ReadFromRFBServer(buffer, hdr.nSubrects * (4 + (BPP / 8))))
|
||||
+ if (hdr.nSubrects > BUFFER_SIZE / (4 + (BPP / 8)) || !ReadFromRFBServer(buffer, hdr.nSubrects * (4 + (BPP / 8))))
|
||||
return False;
|
||||
|
||||
ptr = (CARD8 *)buffer;
|
||||
@@ -1,116 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, zlib
|
||||
, libjpeg
|
||||
, imake
|
||||
, gccmakedep
|
||||
, libXaw
|
||||
, libXext
|
||||
, libXmu
|
||||
, libXp
|
||||
, libXpm
|
||||
, perl
|
||||
, xauth
|
||||
, fontDirectories
|
||||
, openssh
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tightvnc";
|
||||
version = "1.3.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/vnc-tight/tightvnc-${version}_unixsrc.tar.bz2";
|
||||
sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./1.3.10-CVE-2019-15678.patch
|
||||
./1.3.10-CVE-2019-15679.patch
|
||||
./1.3.10-CVE-2019-15680.patch
|
||||
./1.3.10-CVE-2019-8287.patch
|
||||
];
|
||||
|
||||
# for the builder script
|
||||
inherit fontDirectories;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
libjpeg
|
||||
imake
|
||||
gccmakedep
|
||||
libXaw
|
||||
libXext
|
||||
libXmu
|
||||
libXp
|
||||
libXpm
|
||||
xauth
|
||||
openssh
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
fontPath=
|
||||
for i in $fontDirectories; do
|
||||
for j in $(find $i -name fonts.dir); do
|
||||
addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j)
|
||||
done
|
||||
done
|
||||
|
||||
sed -i "s@/usr/bin/ssh@${openssh}/bin/ssh@g" vncviewer/vncviewer.h
|
||||
|
||||
sed -e 's@/usr/bin/perl@${perl}/bin/perl@' \
|
||||
-e 's@unix/:7100@'$fontPath'@' \
|
||||
-i vncserver
|
||||
|
||||
sed -e 's@.* CppCmd .*@#define CppCmd cpp@' -i Xvnc/config/cf/linux.cf
|
||||
sed -e 's@.* CppCmd .*@#define CppCmd cpp@' -i Xvnc/config/cf/Imake.tmpl
|
||||
sed -i \
|
||||
-e 's@"uname","xauth","Xvnc","vncpasswd"@"uname","Xvnc","vncpasswd"@g' \
|
||||
-e "s@\<xauth\>@${xauth}/bin/xauth@g" \
|
||||
vncserver
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/man/man1
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
./vncinstall $out/bin $out/share/man
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# fix HTTP client:
|
||||
mkdir -p $out/share/tightvnc
|
||||
cp -r classes $out/share/tightvnc
|
||||
substituteInPlace $out/bin/vncserver \
|
||||
--replace /usr/local/vnc/classes $out/share/tightvnc/classes
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
homepage = "https://vnc-tight.sourceforge.net/";
|
||||
description = "Improved version of VNC";
|
||||
|
||||
longDescription = ''
|
||||
TightVNC is an improved version of VNC, the great free
|
||||
remote-desktop tool. The improvements include bandwidth-friendly
|
||||
"tight" encoding, file transfers in the Windows version, enhanced
|
||||
GUI, many bugfixes, and more.
|
||||
'';
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
knownVulnerabilities = [ "CVE-2021-42785" ];
|
||||
# Unfortunately, upstream doesn't maintain the 1.3 branch anymore, and the
|
||||
# new 2.x branch is substantially different (requiring either Windows or Java)
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg_4, libebur128
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg_7, libebur128
|
||||
, libresample, taglib, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -12,8 +12,22 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-XLj+n0GlY/GAkJlW2JVMd0jxMzgdv/YeSTuF6QUIGwU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# src/scan.c: Only call av_register_all() if using libavformat < 58.9.100
|
||||
# https://github.com/Moonbase59/loudgain/pull/50
|
||||
./support-ffmpeg-5.patch
|
||||
|
||||
# src/scan.c: Declare "AVCodec" to be "const AVCodec"
|
||||
# https://github.com/Moonbase59/loudgain/pull/65
|
||||
./fix-gcc-14.patch
|
||||
|
||||
# src/scan.c: Update for FFmpeg 7.0
|
||||
# https://github.com/Moonbase59/loudgain/pull/66
|
||||
./support-ffmpeg-7.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ ffmpeg_4 libebur128 libresample taglib zlib ];
|
||||
buildInputs = [ ffmpeg_7 libebur128 libresample taglib zlib ];
|
||||
|
||||
postInstall = ''
|
||||
sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm"
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
From ad9c7f8ddf0907d408b3d2fbf4d00ecb55af8d13 Mon Sep 17 00:00:00 2001
|
||||
From: Hugh McMaster <hugh.mcmaster@outlook.com>
|
||||
Date: Mon, 29 Jul 2024 23:13:16 +1000
|
||||
Subject: [PATCH] src/scan.c: Declare "AVCodec" to be "const AVCodec"
|
||||
|
||||
This fixes compilation with GCC-14.
|
||||
---
|
||||
src/scan.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/scan.c b/src/scan.c
|
||||
index 85b36b3..e02ed86 100644
|
||||
--- a/src/scan.c
|
||||
+++ b/src/scan.c
|
||||
@@ -115,7 +115,7 @@ int scan_file(const char *file, unsigned index) {
|
||||
|
||||
AVFormatContext *container = NULL;
|
||||
|
||||
- AVCodec *codec;
|
||||
+ const AVCodec *codec;
|
||||
AVCodecContext *ctx;
|
||||
|
||||
AVFrame *frame;
|
||||
@@ -0,0 +1,29 @@
|
||||
From 977332e9e45477b1b41a5af7a2484f92b340413b Mon Sep 17 00:00:00 2001
|
||||
From: Hugh McMaster <hugh.mcmaster@outlook.com>
|
||||
Date: Thu, 1 Sep 2022 14:44:17 +1000
|
||||
Subject: [PATCH] src/scan.c: Only call av_register_all() if using libavformat
|
||||
< 58.9.100
|
||||
|
||||
This function is deprecated.
|
||||
|
||||
Thanks to Leigh Scott for suggesting this patch.
|
||||
---
|
||||
src/scan.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/scan.c b/src/scan.c
|
||||
index 85b36b3..ee72cf8 100644
|
||||
--- a/src/scan.c
|
||||
+++ b/src/scan.c
|
||||
@@ -69,9 +69,9 @@ int scan_init(unsigned nb_files) {
|
||||
* It is now useless
|
||||
* https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
|
||||
*/
|
||||
- if (avformat_version() < AV_VERSION_INT(58,9,100))
|
||||
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100)
|
||||
av_register_all();
|
||||
-
|
||||
+#endif
|
||||
av_log_set_callback(scan_av_log);
|
||||
|
||||
scan_nb_files = nb_files;
|
||||
@@ -0,0 +1,123 @@
|
||||
From 50741b98fb4b932759f05e8d208d80d93bcc8261 Mon Sep 17 00:00:00 2001
|
||||
From: Hugh McMaster <hugh.mcmaster@outlook.com>
|
||||
Date: Mon, 29 Jul 2024 23:15:35 +1000
|
||||
Subject: [PATCH] src/scan.c: Update for FFmpeg 7.0
|
||||
|
||||
---
|
||||
src/scan.c | 40 +++++++++++++++++++++-------------------
|
||||
1 file changed, 21 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/src/scan.c b/src/scan.c
|
||||
index 85b36b3..91eb261 100644
|
||||
--- a/src/scan.c
|
||||
+++ b/src/scan.c
|
||||
@@ -119,7 +119,7 @@ int scan_file(const char *file, unsigned index) {
|
||||
AVCodecContext *ctx;
|
||||
|
||||
AVFrame *frame;
|
||||
- AVPacket packet;
|
||||
+ AVPacket *packet;
|
||||
|
||||
SwrContext *swr;
|
||||
|
||||
@@ -177,8 +177,8 @@ int scan_file(const char *file, unsigned index) {
|
||||
}
|
||||
|
||||
// try to get default channel layout (they aren’t specified in .wav files)
|
||||
- if (!ctx->channel_layout)
|
||||
- ctx->channel_layout = av_get_default_channel_layout(ctx->channels);
|
||||
+ if (ctx->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC)
|
||||
+ av_channel_layout_default(&ctx->ch_layout, ctx->ch_layout.nb_channels);
|
||||
|
||||
// show some information about the file
|
||||
// only show bits/sample where it makes sense
|
||||
@@ -187,21 +187,21 @@ int scan_file(const char *file, unsigned index) {
|
||||
snprintf(infotext, sizeof(infotext), "%d bit, ",
|
||||
ctx->bits_per_raw_sample > 0 ? ctx->bits_per_raw_sample : ctx->bits_per_coded_sample);
|
||||
}
|
||||
- av_get_channel_layout_string(infobuf, sizeof(infobuf), -1, ctx->channel_layout);
|
||||
+ av_channel_layout_describe(&ctx->ch_layout, infobuf, sizeof(infobuf));
|
||||
ok_printf("Stream #%d: %s, %s%d Hz, %d ch, %s",
|
||||
- stream_id, codec->long_name, infotext, ctx->sample_rate, ctx->channels, infobuf);
|
||||
+ stream_id, codec->long_name, infotext, ctx->sample_rate, ctx->ch_layout.nb_channels, infobuf);
|
||||
|
||||
scan_codecs[index] = codec -> id;
|
||||
|
||||
- av_init_packet(&packet);
|
||||
+ packet = av_packet_alloc();
|
||||
|
||||
- packet.data = buffer;
|
||||
- packet.size = buffer_size;
|
||||
+ packet->data = buffer;
|
||||
+ packet->size = buffer_size;
|
||||
|
||||
swr = swr_alloc();
|
||||
|
||||
*ebur128 = ebur128_init(
|
||||
- ctx -> channels, ctx -> sample_rate,
|
||||
+ ctx->ch_layout.nb_channels, ctx->sample_rate,
|
||||
EBUR128_MODE_S | EBUR128_MODE_I | EBUR128_MODE_LRA |
|
||||
EBUR128_MODE_SAMPLE_PEAK | EBUR128_MODE_TRUE_PEAK
|
||||
);
|
||||
@@ -222,10 +222,10 @@ int scan_file(const char *file, unsigned index) {
|
||||
|
||||
progress_bar(0, 0, 0, 0);
|
||||
|
||||
- while (av_read_frame(container, &packet) >= 0) {
|
||||
- if (packet.stream_index == stream_id) {
|
||||
+ while (av_read_frame(container, packet) >= 0) {
|
||||
+ if (packet->stream_index == stream_id) {
|
||||
|
||||
- rc = avcodec_send_packet(ctx, &packet);
|
||||
+ rc = avcodec_send_packet(ctx, packet);
|
||||
if (rc < 0) {
|
||||
err_printf("Error while sending a packet to the decoder");
|
||||
break;
|
||||
@@ -252,7 +252,7 @@ int scan_file(const char *file, unsigned index) {
|
||||
av_frame_unref(frame);
|
||||
}
|
||||
|
||||
- av_packet_unref(&packet);
|
||||
+ av_packet_unref(packet);
|
||||
}
|
||||
|
||||
// complete progress bar for very short files (only cosmetic)
|
||||
@@ -263,9 +263,11 @@ int scan_file(const char *file, unsigned index) {
|
||||
|
||||
av_frame_free(&frame);
|
||||
|
||||
+ av_packet_free(&packet);
|
||||
+
|
||||
swr_free(&swr);
|
||||
|
||||
- avcodec_close(ctx);
|
||||
+ avcodec_free_context(&ctx);
|
||||
|
||||
avformat_close_input(&container);
|
||||
|
||||
@@ -413,12 +415,12 @@ static void scan_frame(ebur128_state *ebur128, AVFrame *frame,
|
||||
int out_linesize;
|
||||
enum AVSampleFormat out_fmt = AV_SAMPLE_FMT_S16;
|
||||
|
||||
- av_opt_set_channel_layout(swr, "in_channel_layout", frame -> channel_layout, 0);
|
||||
- av_opt_set_channel_layout(swr, "out_channel_layout", frame -> channel_layout, 0);
|
||||
+ av_opt_set_chlayout(swr, "in_chlayout", &frame->ch_layout, 0);
|
||||
+ av_opt_set_chlayout(swr, "out_chlayout", &frame->ch_layout, 0);
|
||||
|
||||
// add channel count to properly handle .wav reading
|
||||
- av_opt_set_int(swr, "in_channel_count", frame -> channels, 0);
|
||||
- av_opt_set_int(swr, "out_channel_count", frame -> channels, 0);
|
||||
+ av_opt_set_int(swr, "in_channel_count", frame->ch_layout.nb_channels, 0);
|
||||
+ av_opt_set_int(swr, "out_channel_count", frame->ch_layout.nb_channels, 0);
|
||||
|
||||
av_opt_set_int(swr, "in_sample_rate", frame -> sample_rate, 0);
|
||||
av_opt_set_int(swr, "out_sample_rate", frame -> sample_rate, 0);
|
||||
@@ -434,7 +436,7 @@ static void scan_frame(ebur128_state *ebur128, AVFrame *frame,
|
||||
}
|
||||
|
||||
out_size = av_samples_get_buffer_size(
|
||||
- &out_linesize, frame -> channels, frame -> nb_samples, out_fmt, 0
|
||||
+ &out_linesize, frame->ch_layout.nb_channels, frame->nb_samples, out_fmt, 0
|
||||
);
|
||||
|
||||
out_data = av_malloc(out_size);
|
||||
@@ -34,6 +34,8 @@ rustPlatform.buildRustPackage rec {
|
||||
installShellCompletion \
|
||||
target/tmp/bottom/completion/btm.{bash,fish} \
|
||||
--zsh target/tmp/bottom/completion/_btm
|
||||
|
||||
install -Dm444 desktop/bottom.desktop -t $out/share/applications
|
||||
'';
|
||||
|
||||
BTM_GENERATE = true;
|
||||
|
||||
@@ -933,6 +933,7 @@ mapAliases ({
|
||||
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
|
||||
markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22
|
||||
markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12
|
||||
maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24
|
||||
marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08
|
||||
marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01
|
||||
marwaita-ubuntu = lib.warn "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
|
||||
@@ -1127,6 +1128,7 @@ mapAliases ({
|
||||
onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
|
||||
oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10
|
||||
osxfuse = macfuse-stubs; # Added 2021-03-20
|
||||
ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
|
||||
oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09
|
||||
|
||||
### P ###
|
||||
@@ -1458,6 +1460,7 @@ mapAliases ({
|
||||
taplo-lsp = taplo; # Added 2022-07-30
|
||||
taro = taproot-assets; # Added 2023-07-04
|
||||
tdesktop = telegram-desktop; # Added 2023-04-07
|
||||
teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
|
||||
telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28
|
||||
teleport_11 = throw "teleport 11 has been removed as it is EOL. Please upgrade to Teleport 12 or later"; # Added 2023-11-27
|
||||
teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04
|
||||
@@ -1478,6 +1481,7 @@ mapAliases ({
|
||||
invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
|
||||
timescale-prometheus = promscale; # Added 2020-09-29
|
||||
tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25
|
||||
tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
|
||||
tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17
|
||||
tkcvs = tkrev; # Added 2022-03-07
|
||||
tokodon = plasma5Packages.tokodon;
|
||||
|
||||
@@ -11115,8 +11115,6 @@ with pkgs;
|
||||
openvswitch-lts = callPackage ../by-name/op/openvswitch/lts.nix { };
|
||||
openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; };
|
||||
|
||||
ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { };
|
||||
|
||||
optifinePackages = callPackage ../tools/games/minecraft/optifine { };
|
||||
|
||||
optifine = optifinePackages.optifine-latest;
|
||||
@@ -13083,8 +13081,6 @@ with pkgs;
|
||||
|
||||
teavpn2 = callPackage ../tools/networking/teavpn2 { };
|
||||
|
||||
inherit (nodePackages) teck-programmer;
|
||||
|
||||
ted = callPackage ../tools/typesetting/ted { };
|
||||
|
||||
teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
|
||||
@@ -13944,11 +13940,6 @@ with pkgs;
|
||||
|
||||
tigervnc = callPackage ../tools/admin/tigervnc { };
|
||||
|
||||
tightvnc = callPackage ../tools/admin/tightvnc {
|
||||
fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
|
||||
xorg.fontbhlucidatypewriter75dpi ];
|
||||
};
|
||||
|
||||
time = callPackage ../tools/misc/time { };
|
||||
|
||||
tweet-hs = haskell.lib.compose.justStaticExecutables haskellPackages.tweet-hs;
|
||||
@@ -27236,8 +27227,6 @@ with pkgs;
|
||||
# FIXME: `tcp-wrapper' is actually not OS-specific.
|
||||
tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { };
|
||||
|
||||
teck-udev-rules = callPackage ../os-specific/linux/teck-udev-rules { };
|
||||
|
||||
tiptop = callPackage ../os-specific/linux/tiptop { };
|
||||
|
||||
tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { };
|
||||
@@ -28438,8 +28427,6 @@ with pkgs;
|
||||
|
||||
hasklig = callPackage ../data/fonts/hasklig { };
|
||||
|
||||
maligned = callPackage ../development/tools/maligned { };
|
||||
|
||||
inter = callPackage ../data/fonts/inter { };
|
||||
|
||||
open-fonts = callPackage ../data/fonts/open-fonts { };
|
||||
@@ -37182,8 +37169,6 @@ with pkgs;
|
||||
|
||||
QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { };
|
||||
|
||||
scs = callPackage ../development/libraries/science/math/scs { };
|
||||
|
||||
sage = callPackage ../applications/science/math/sage { };
|
||||
sageWithDoc = sage.override { withDoc = true; };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user