Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -4668,6 +4668,13 @@
|
||||
name = "Carl Richard Theodor Schneider";
|
||||
keys = [ { fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; } ];
|
||||
};
|
||||
cryo = {
|
||||
email = "cryo@disroot.org";
|
||||
github = "cry0ice";
|
||||
githubId = 176274027;
|
||||
name = "Cryo";
|
||||
keys = [ { fingerprint = "2CF7 F8E8 2258 5751 2591 F97F 4B12 E34A 25A9 AB35"; } ];
|
||||
};
|
||||
Cryolitia = {
|
||||
name = "Cryolitia PukNgae";
|
||||
email = "Cryolitia@gmail.com";
|
||||
|
||||
@@ -35,6 +35,8 @@
|
||||
|
||||
- [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).
|
||||
|
||||
- [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
|
||||
@@ -79,7 +81,7 @@
|
||||
files have changed from `$out/share/fonts/{opentype,truetype}/NerdFonts` to
|
||||
`$out/share/fonts/{opentype,truetype}/NerdFonts/<fontDirName>`, where `<fontDirName>` can be found in the
|
||||
[official website](https://www.nerdfonts.com/font-downloads) as the titles in preview images, with the "Nerd Font"
|
||||
suffix and any whitespaces trimmed.
|
||||
suffix and any whitespaces trimmed. Configuration changes are required, see build output.
|
||||
|
||||
- `retroarch` has been refactored and the older `retroarch.override { cores = [ ... ]; }` to create a RetroArch derivation with custom cores doesn't work anymore, use `retroarch.withCores (cores: [ ... ])` instead. If you need more customization (e.g.: custom settings), use `wrapRetroArch` instead.
|
||||
|
||||
|
||||
@@ -588,6 +588,7 @@
|
||||
./services/hardware/bluetooth.nix
|
||||
./services/hardware/bolt.nix
|
||||
./services/hardware/brltty.nix
|
||||
./services/hardware/buffyboard.nix
|
||||
./services/hardware/ddccontrol.nix
|
||||
./services/hardware/display.nix
|
||||
./services/hardware/fancontrol.nix
|
||||
|
||||
@@ -170,15 +170,6 @@ static int make_caps_ambient(const char *self_path) {
|
||||
"MALLOC_ARENA_TEST\0"
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
ASSERT(argc >= 1);
|
||||
|
||||
// argv[0] goes into a lot of places, to a far greater degree than other elements
|
||||
// of argv. glibc has had buffer overflows relating to argv[0], eg CVE-2023-6246.
|
||||
// Since we expect the wrappers to be invoked from either $PATH or /run/wrappers/bin,
|
||||
// there should be no reason to pass any particularly large values here, so we can
|
||||
// be strict for strictness' sake.
|
||||
ASSERT(strlen(argv[0]) < 512);
|
||||
|
||||
int debug = getenv(wrapper_debug) != NULL;
|
||||
|
||||
// Drop insecure environment variables explicitly
|
||||
@@ -209,10 +200,22 @@ int main(int argc, char **argv) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
char *replacement_argv[2] = {SOURCE_PROG, NULL};
|
||||
char *old_argv0;
|
||||
// Replace untrusted or missing argv[0] by the wrapped program path.
|
||||
// This mitigates vulnerabilities caused by incorrect handling in privileged code.
|
||||
if (argv[0]) {
|
||||
old_argv0 = argv[0];
|
||||
argv[0] = SOURCE_PROG;
|
||||
} else {
|
||||
old_argv0 = "«nullptr»";
|
||||
argv = replacement_argv;
|
||||
}
|
||||
|
||||
execve(SOURCE_PROG, argv, environ);
|
||||
|
||||
|
||||
fprintf(stderr, "%s: cannot run `%s': %s\n",
|
||||
argv[0], SOURCE_PROG, strerror(errno));
|
||||
old_argv0, SOURCE_PROG, strerror(errno));
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
# INTEGRATION NOTES:
|
||||
# Buffyboard integrates as a virtual device in /dev/input
|
||||
# which reads touch or pointer events from other input devices
|
||||
# and generates events based on where those map to the keys it renders to the framebuffer.
|
||||
#
|
||||
# Buffyboard generates these events whether or not its onscreen keyboard is actually visible.
|
||||
# Hence special care is needed if running anything which claims ownership of the display (such as a desktop environment),
|
||||
# to avoid unwanted input events being triggered during normal desktop operation.
|
||||
#
|
||||
# Desktop users are recommended to either:
|
||||
# 1. Stop buffyboard once your DE is started.
|
||||
# e.g. `services.buffyboard.unitConfig.Conflicts = [ "my-de.service" ];`
|
||||
# 2. Configure your DE to ignore input events from buffyboard (product-id=25209; vendor-id=26214; name=rd)
|
||||
# e.g. `echo 'input "26214:25209:rd" events disabled' > ~/.config/sway/config`
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.buffyboard;
|
||||
ini = pkgs.formats.ini { };
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ colinsane ];
|
||||
|
||||
options = {
|
||||
services.buffyboard = with lib; {
|
||||
enable = mkEnableOption "buffyboard framebuffer keyboard (on-screen keyboard)";
|
||||
package = mkPackageOption pkgs "buffybox" { };
|
||||
|
||||
extraFlags = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Extra CLI arguments to pass to buffyboard.
|
||||
'';
|
||||
example = [
|
||||
"--geometry=1920x1080@640,0"
|
||||
"--dpi=192"
|
||||
"--rotate=2"
|
||||
"--verbose"
|
||||
];
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = lib.types.path;
|
||||
default = ini.generate "buffyboard.conf" (lib.filterAttrsRecursive (_: v: v != null) cfg.settings);
|
||||
defaultText = lib.literalExpression ''ini.generate "buffyboard.conf" cfg.settings'';
|
||||
description = ''
|
||||
Path to an INI format configuration file to provide Buffyboard.
|
||||
By default, this is generated from whatever you've set in `settings`.
|
||||
If specified manually, then `settings` is ignored.
|
||||
|
||||
For an example config file see [here](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/blob/master/buffyboard/buffyboard.conf)
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
description = ''
|
||||
Settings to include in /etc/buffyboard.conf.
|
||||
Every option here is strictly optional:
|
||||
Buffyboard will use its own baked-in defaults for those options left unset.
|
||||
'';
|
||||
type = types.submodule {
|
||||
freeformType = ini.type;
|
||||
|
||||
options.input.pointer = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = ''
|
||||
Enable or disable the use of a hardware mouse or other pointing device.
|
||||
'';
|
||||
};
|
||||
options.input.touchscreen = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = ''
|
||||
Enable or disable the use of the touchscreen.
|
||||
'';
|
||||
};
|
||||
|
||||
options.theme.default = mkOption {
|
||||
type = types.either types.str (
|
||||
types.enum [
|
||||
null
|
||||
"adwaita-dark"
|
||||
"breezy-dark"
|
||||
"breezy-light"
|
||||
"nord-dark"
|
||||
"nord-light"
|
||||
"pmos-dark"
|
||||
"pmos-light"
|
||||
]
|
||||
);
|
||||
default = null;
|
||||
description = ''
|
||||
Selects the default theme on boot. Can be changed at runtime to the alternative theme.
|
||||
'';
|
||||
};
|
||||
options.quirks.fbdev_force_refresh = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = ''
|
||||
If true and using the framebuffer backend, this triggers a display refresh after every draw operation.
|
||||
This has a negative performance impact.
|
||||
'';
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.services.buffyboard = {
|
||||
# upstream provides the service (including systemd hardening): we just configure it to start by default
|
||||
# and override ExecStart so as to optionally pass extra arguments
|
||||
serviceConfig.ExecStart = [
|
||||
"" # clear default ExecStart
|
||||
(utils.escapeSystemdExecArgs (
|
||||
[
|
||||
(lib.getExe' cfg.package "buffyboard")
|
||||
"--config-override"
|
||||
cfg.configFile
|
||||
]
|
||||
++ cfg.extraFlags
|
||||
))
|
||||
];
|
||||
wantedBy = [ "getty.target" ];
|
||||
before = [ "getty.target" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -300,7 +300,7 @@ in {
|
||||
|
||||
capabilities = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = ["HT40" "HT40-" "SHORT-GI-20" "SHORT-GI-40"];
|
||||
default = ["HT40" "SHORT-GI-20" "SHORT-GI-40"];
|
||||
example = ["LDPC" "HT40+" "HT40-" "GF" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1"];
|
||||
description = ''
|
||||
HT (High Throughput) capabilities given as a list of flags.
|
||||
|
||||
@@ -4,7 +4,7 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
inherit (pkgs) cups-pk-helper cups-filters xdg-utils;
|
||||
inherit (pkgs) cups-pk-helper libcupsfilters cups-filters xdg-utils;
|
||||
|
||||
cfg = config.services.printing;
|
||||
cups = cfg.package;
|
||||
@@ -35,7 +35,7 @@ let
|
||||
bindir = pkgs.buildEnv {
|
||||
name = "cups-progs";
|
||||
paths =
|
||||
[ cups.out additionalBackends cups-filters pkgs.ghostscript ]
|
||||
[ cups.out additionalBackends libcupsfilters cups-filters pkgs.ghostscript ]
|
||||
++ cfg.drivers;
|
||||
pathsToLink = [ "/lib" "/share/cups" "/bin" ];
|
||||
postBuild = cfg.bindirCmds;
|
||||
@@ -278,6 +278,8 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
browsed.package = lib.mkPackageOption pkgs "cups-browsed" {};
|
||||
|
||||
browsedConf = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
@@ -436,7 +438,7 @@ in
|
||||
|
||||
path = [ cups ];
|
||||
|
||||
serviceConfig.ExecStart = "${cups-filters}/bin/cups-browsed";
|
||||
serviceConfig.ExecStart = "${cfg.browsed.package}/bin/cups-browsed";
|
||||
|
||||
restartTriggers = [ browsedFile ];
|
||||
};
|
||||
|
||||
@@ -761,6 +761,7 @@ in
|
||||
lib.nameValuePair "zfs-sync-${pool}" {
|
||||
description = "Sync ZFS pool \"${pool}\"";
|
||||
wantedBy = [ "shutdown.target" ];
|
||||
before = [ "final.target" ];
|
||||
unitConfig = {
|
||||
DefaultDependencies = false;
|
||||
};
|
||||
|
||||
@@ -17,13 +17,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpxsee";
|
||||
version = "13.26";
|
||||
version = "13.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-EIeUcSHJXpd1/90fAPrP9F/DVyZhkcZk8MJd9VO1D70=";
|
||||
hash = "sha256-wz5cYZe7OHfIgoHrYRj0DKNFjYjb+CGlLnDItRNu+bk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "discordo";
|
||||
version = "0-unstable-2024-10-13";
|
||||
version = "0-unstable-2024-11-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = pname;
|
||||
rev = "26b77d9385daa2dc056930fa302a3c06595680ba";
|
||||
hash = "sha256-zXqYj8IBDVeDKjm0m8CYEX+tmHLpY2u7A4g38IiDNZk=";
|
||||
rev = "3286ebecaab3c05ddbab9e6b502a750d07cea5aa";
|
||||
hash = "sha256-DaD6Rv/dzky3gjjqtjObTFZp7EJ8+UK6CoFpqZ/HO9U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-68NGcdyKuabSdW6CKAJUaJ0k2dpO0bm3OfNQ7qEVcqk=";
|
||||
vendorHash = "sha256-66Y5hmEEQUBsSfYaj6UzCsFhDkwCDs6y2WOsnYby1gE=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -1,30 +1,34 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, qemu
|
||||
, sigtool
|
||||
, makeWrapper
|
||||
, nix-update-script
|
||||
, apple-sdk_15
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
qemu,
|
||||
sigtool,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
apple-sdk_15,
|
||||
lima,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = pname;
|
||||
repo = "lima";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XYB8Nxbs76xmiiZ7IYfgn+UgUr6CLOalQrl6Ibo+DRc=";
|
||||
hash = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nNSBwvhKSWs6to37+RLziYQqVOYfvjYib3fRRALACho=";
|
||||
vendorHash = "sha256-taozyQBJvkCsJAaOHg1gFK4qOnepRbzIn4jHzxfAn6A=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];
|
||||
|
||||
@@ -48,23 +52,34 @@ buildGoModule rec {
|
||||
export LIMA_HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r _output/* $out
|
||||
wrapProgram $out/bin/limactl \
|
||||
--prefix PATH : ${lib.makeBinPath [ qemu ]}
|
||||
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd limactl \
|
||||
--bash <($out/bin/limactl completion bash) \
|
||||
--fish <($out/bin/limactl completion fish) \
|
||||
--zsh <($out/bin/limactl completion zsh)
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
installPhase =
|
||||
''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r _output/* $out
|
||||
wrapProgram $out/bin/limactl \
|
||||
--prefix PATH : ${lib.makeBinPath [ qemu ]}
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd limactl \
|
||||
--bash <($out/bin/limactl completion bash) \
|
||||
--fish <($out/bin/limactl completion fish) \
|
||||
--zsh <($out/bin/limactl completion zsh)
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
# Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/v1.0.2/pkg/limayaml/defaults.go#L52
|
||||
# Don't use versionCheckHook for this package. It cannot inject environment variables.
|
||||
installCheckPhase = ''
|
||||
if [[ "$(HOME="$(mktemp -d)" "$out/bin/limactl" --version | cut -d ' ' -f 3)" == "${version}" ]]; then
|
||||
echo '${pname} smoke check passed'
|
||||
else
|
||||
echo '${pname} smoke check failed'
|
||||
return 1
|
||||
fi
|
||||
USER=nix $out/bin/limactl validate templates/default.yaml
|
||||
'';
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ad-miner";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mazars-Tech";
|
||||
repo = "AD_Miner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/TIG1UUfLct9MxCmahWk7F6KlypNan+zk/02zVpPV+w=";
|
||||
hash = "sha256-Uzt7tKRj+iq4UR0gUpfhiTzMjecVBcp7jsXC7lSADeg=";
|
||||
};
|
||||
|
||||
# All requirements are pinned
|
||||
|
||||
@@ -2,34 +2,31 @@
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
fetchPypi,
|
||||
git,
|
||||
}:
|
||||
|
||||
let
|
||||
changeVersion =
|
||||
overrideFunc: version: hash:
|
||||
overrideFunc (oldAttrs: rec {
|
||||
inherit version;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version hash;
|
||||
};
|
||||
});
|
||||
|
||||
localPython = python3.override {
|
||||
self = localPython;
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
cement =
|
||||
changeVersion super.cement.overridePythonAttrs "2.10.14"
|
||||
"sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg=";
|
||||
cement = super.cement.overridePythonAttrs (old: rec {
|
||||
pname = "cement";
|
||||
version = "2.10.14";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NC4n21SmYW3RiS7QuzWXoifO4z3C2FVgQm3xf8qQcFg=";
|
||||
};
|
||||
build-system = old.build-system or [ ] ++ (with python.pkgs; [ setuptools ]);
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
localPython.pkgs.buildPythonApplication rec {
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "awsebcli";
|
||||
version = "3.21";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
@@ -38,12 +35,23 @@ localPython.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-VU8bXvS4m4eIamjlgGmHE2qwDXWAXvWTa0QHomXR5ZE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"botocore"
|
||||
"colorama"
|
||||
"pathspec"
|
||||
"PyYAML"
|
||||
"six"
|
||||
"termcolor"
|
||||
"urllib3"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/aws/aws-elastic-beanstalk-cli/pull/469
|
||||
substituteInPlace setup.py --replace-fail "scripts=['bin/eb']," ""
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "scripts=['bin/eb']," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with localPython.pkgs; [
|
||||
dependencies = with python.pkgs; [
|
||||
blessed
|
||||
botocore
|
||||
cement
|
||||
@@ -59,20 +67,11 @@ localPython.pkgs.buildPythonApplication rec {
|
||||
websocket-client
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"botocore"
|
||||
"colorama"
|
||||
"pathspec"
|
||||
"PyYAML"
|
||||
"six"
|
||||
"termcolor"
|
||||
];
|
||||
|
||||
nativeCheckInputs = with localPython.pkgs; [
|
||||
pytestCheckHook
|
||||
pytest-socket
|
||||
mock
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
git
|
||||
mock
|
||||
pytest-socket
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
@@ -92,11 +91,11 @@ localPython.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://aws.amazon.com/elasticbeanstalk/";
|
||||
description = "Command line interface for Elastic Beanstalk";
|
||||
homepage = "https://aws.amazon.com/elasticbeanstalk/";
|
||||
changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst";
|
||||
maintainers = with maintainers; [ kirillrdy ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ kirillrdy ];
|
||||
mainProgram = "eb";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
{
|
||||
fetchFromGitLab,
|
||||
inih,
|
||||
lib,
|
||||
libdrm,
|
||||
libinput,
|
||||
libxkbcommon,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
scdoc,
|
||||
stdenv,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "buffybox";
|
||||
version = "3.2.0-unstable-2024-11-10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.postmarketos.org";
|
||||
owner = "postmarketOS";
|
||||
repo = "buffybox";
|
||||
fetchSubmodules = true; # to use its vendored lvgl
|
||||
rev = "07e324c17564cb9aab573259a8e0824a6806a751";
|
||||
hash = "sha256-JY9WqtRjDsQf1UVFnM6oTwyAuhlJvrhcSNJdEZ0zIus=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
scdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
inih
|
||||
libdrm
|
||||
libinput
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
env.PKG_CONFIG_SYSTEMD_SYSTEMD_SYSTEM_UNIT_DIR = "${placeholder "out"}/lib/systemd/system";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A suite of graphical applications for the terminal";
|
||||
homepage = "https://gitlab.postmarketos.org/postmarketOS/buffybox";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ colinsane ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,14 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 99065da..2415738 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -16,9 +16,6 @@ endif
|
||||
ifeq ($(CC), clang)
|
||||
CFLAGS += $(CLANG_FLAGS)
|
||||
endif
|
||||
-ifeq ($(shell uname), Linux)
|
||||
- CFLAGS += -static
|
||||
-endif
|
||||
|
||||
Target = chsrc
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
texinfo,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chsrc";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RubyMetric";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ texinfo ];
|
||||
|
||||
patches = [
|
||||
./disable-static-compiling.patch
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 chsrc $out/bin/chsrc
|
||||
install -Dm644 doc/chsrc.1 -t $out/share/man/man1/
|
||||
makeinfo doc/chsrc.texi --output=chsrc.info
|
||||
install -Dm 644 chsrc.info -t $out/share/info/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Change Source everywhere for every software";
|
||||
homepage = "https://chsrc.run/";
|
||||
changelog = "https://github.com/RubyMetric/chsrc/releases/tag/v${finalAttrs.version}";
|
||||
license = with lib.licenses; [
|
||||
gpl3Plus
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ cryo ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "chsrc";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
autoreconfHook,
|
||||
avahi,
|
||||
cups,
|
||||
fetchFromGitHub,
|
||||
glib,
|
||||
lib,
|
||||
libcupsfilters,
|
||||
libppd,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cups-browsed";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenPrinting";
|
||||
repo = "cups-browsed";
|
||||
rev = version;
|
||||
hash = "sha256-UkPJqVWG6obIW0jGXsnnYB2lmIm/uiMuPYSGY3+M4Gw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
cups
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
avahi
|
||||
libcupsfilters
|
||||
libppd
|
||||
glib
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-rcdir=no"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"CUPS_SERVERBIN=$(out)/lib/cups"
|
||||
"CUPS_DATADIR=$(out)/share/cups"
|
||||
"CUPS_SERVERROOT=$(out)/etc/cups"
|
||||
];
|
||||
}
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbeaver-bin";
|
||||
version = "24.2.3";
|
||||
version = "24.3.0";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
aarch64-darwin = "macos-aarch64.dmg";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-TvDpoEcnZBS8ORggFwLM80FXsJ8EXKvRSPUn+VtNTk8=";
|
||||
aarch64-linux = "sha256-59khU3VQzpNeZv69pbeeE4ZAFajyI5gUUw9baOWPIFM=";
|
||||
x86_64-darwin = "sha256-/YyN5daeoxq0oii6qYRpZ8cb43u6n8HuVc2JqVOhrxs=";
|
||||
aarch64-darwin = "sha256-Stb76QpLnpmpBYDm+6fgkcx+TlY8hVkNtvGgdMWbaHg=";
|
||||
x86_64-linux = "sha256-7tmz6ThT6oH2eMRl5XTf1+nr/ufDlp4BvGyKFICiTRw=";
|
||||
aarch64-linux = "sha256-idnTeh37Ew6fg1gdJaoFF+wpgoShcJZokmWsid6g3ow=";
|
||||
x86_64-darwin = "sha256-P1XseM1Al7y1JFVe/8VCIE84nMT4l9KF+Ik+rHjrv20=";
|
||||
aarch64-darwin = "sha256-Xl4D8qTwB0tccuXqon4DApOOM95swxbfwSTD8gqc7jo=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
|
||||
@@ -40,7 +40,7 @@ buildDotnetModule rec {
|
||||
license = licenses.gpl3Plus;
|
||||
changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md";
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "discordchatexporter-cli";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.194.0";
|
||||
version = "0.197.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-BjMM2xjDA9rteT1dFE1DENEzM5226GW+Zv2gtZNCzNo=";
|
||||
hash = "sha256-JHhZFcjnURgt+HqRwy/0rZ2qrzpeX/WGeXJ0arhRDq8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3BVy2e2cbxtWP7yP4UTXvtH1Hr/Vl06e6Dsr+FLhtZg=";
|
||||
vendorHash = "sha256-f7+IlOcGJL5G52wPZz1oeHmR8LR8XZh6ASV1qi7hXi0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "epic5";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-F7lnxh5Yh08HdeH9CwYH+FxktjJYwaxNQInoETUqOUU=";
|
||||
hash = "sha256-QiD9Lx4IxbR+w0NFw5cANqN9cvu1QR45wQ87zlV8FNU=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fedifetcher";
|
||||
version = "7.1.12";
|
||||
version = "7.1.14";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanos";
|
||||
repo = "FediFetcher";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DWex4pZV9ZVR1bqYcOpTe74ZQCQCQQxjWrv0QgtRY40=";
|
||||
hash = "sha256-SfR4CYVs2kLLguKCau+x5vy6ha48Zd43OJ+tsA6M9yg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.4.0";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "lazyjournal";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lifailon";
|
||||
repo = "lazyjournal";
|
||||
tag = version;
|
||||
hash = "sha256-Ce5xodkWgMMRRqsKLZNt0cNspsUFXTHQHXmQbphOS2w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jh99+zlhr4ogig4Z2FFO6SZ2qTBkOUuiXo5iNk0VTi0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "TUI for journalctl, file system logs, as well as Docker and Podman containers";
|
||||
homepage = "https://github.com/Lifailon/lazyjournal";
|
||||
license = with lib.licenses; [ mit ];
|
||||
platforms = with lib.platforms; unix ++ windows;
|
||||
maintainers = with lib.maintainers; [ pluiedev ];
|
||||
mainProgram = "lazyjournal";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
{
|
||||
autoreconfHook,
|
||||
cups,
|
||||
dbus,
|
||||
dejavu_fonts,
|
||||
fetchFromGitHub,
|
||||
fontconfig,
|
||||
ghostscript,
|
||||
lcms2,
|
||||
libexif,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libtiff,
|
||||
mupdf,
|
||||
pkg-config,
|
||||
poppler,
|
||||
poppler_utils,
|
||||
qpdf,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcupsfilters";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenPrinting";
|
||||
repo = "libcupsfilters";
|
||||
rev = "2.1.0";
|
||||
hash = "sha256-tnQqM4stUJseDO9BG+PRUSFafjgpQQklTDsDsB9zQ4Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
cups
|
||||
];
|
||||
buildInputs = [
|
||||
dbus
|
||||
fontconfig
|
||||
ghostscript
|
||||
lcms2
|
||||
libexif
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
mupdf
|
||||
poppler
|
||||
poppler_utils
|
||||
qpdf
|
||||
];
|
||||
configureFlags = [
|
||||
"--with-mutool-path=${mupdf}/bin/mutool"
|
||||
"--with-gs-path=${ghostscript}/bin/gs"
|
||||
"--with-ippfind-path=${cups}/bin/ippfind"
|
||||
"--enable-imagefilters"
|
||||
"--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf"
|
||||
];
|
||||
makeFlags = [
|
||||
"CUPS_SERVERBIN=$(out)/lib/cups"
|
||||
"CUPS_DATADIR=$(out)/share/cups"
|
||||
"CUPS_SERVERROOT=$(out)/etc/cups"
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
autoreconfHook,
|
||||
cups,
|
||||
fetchFromGitHub,
|
||||
ghostscript,
|
||||
libcupsfilters,
|
||||
libz,
|
||||
mupdf,
|
||||
pkg-config,
|
||||
poppler_utils,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libppd";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenPrinting";
|
||||
repo = "libppd";
|
||||
rev = version;
|
||||
hash = "sha256-vT4h3dnMu4yHNk0ExGZjuChdu0kAcxsla7vJupZpLaY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
cups
|
||||
];
|
||||
buildInputs = [
|
||||
ghostscript
|
||||
libcupsfilters
|
||||
mupdf
|
||||
libz
|
||||
];
|
||||
configureFlags = [
|
||||
"--with-mutool-path=${mupdf}/bin/mutool"
|
||||
"--with-pdftops=pdftops"
|
||||
"--with-pdftops-path=${poppler_utils}/bin/pdftops"
|
||||
"--with-gs-path=${ghostscript}/bin/gs"
|
||||
"--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo"
|
||||
];
|
||||
makeFlags = [
|
||||
"CUPS_SERVERBIN=$(out)/lib/cups"
|
||||
"CUPS_DATADIR=$(out)/share/cups"
|
||||
"CUPS_SERVERROOT=$(out)/etc/cups"
|
||||
];
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
#! @shell@
|
||||
#! @runtimeShell@
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
|
||||
@@ -1,22 +1,26 @@
|
||||
{ substituteAll, lib
|
||||
, coreutils, getopt
|
||||
{
|
||||
replaceVars,
|
||||
runCommand,
|
||||
lib,
|
||||
runtimeShell,
|
||||
coreutils,
|
||||
getopt,
|
||||
}:
|
||||
|
||||
substituteAll {
|
||||
name = "lsb_release";
|
||||
|
||||
src = ./lsb_release.sh;
|
||||
|
||||
dir = "bin";
|
||||
isExecutable = true;
|
||||
|
||||
inherit coreutils getopt;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prints certain LSB (Linux Standard Base) and Distribution information";
|
||||
mainProgram = "lsb_release";
|
||||
license = [ licenses.mit ];
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
runCommand "lsb_release"
|
||||
{
|
||||
meta = with lib; {
|
||||
description = "Prints certain LSB (Linux Standard Base) and Distribution information";
|
||||
mainProgram = "lsb_release";
|
||||
license = [ licenses.mit ];
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
''
|
||||
install -Dm 555 ${
|
||||
replaceVars ./lsb_release.sh {
|
||||
inherit runtimeShell coreutils getopt;
|
||||
}
|
||||
} $out/bin/lsb_release
|
||||
''
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minijinja";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "minijinja";
|
||||
rev = version;
|
||||
hash = "sha256-8ZAc5ALhpPyFCCsC0f22fSZKRmevFLLFFC0drUuXxg4=";
|
||||
hash = "sha256-rRNikxSgr3isXkp/2oqPQ3JkugxuLgYlcT5c+4yIYBc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2aeRb5jNZbpzAgpne494BMr7rkDqZUJEpITtHbdmhxY=";
|
||||
cargoHash = "sha256-ksdCvl8x6KfqNRnTeIKkL6nnr4d53wMv7pr2rupVkTI=";
|
||||
|
||||
# The tests relies on the presence of network connection
|
||||
doCheck = false;
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitea,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mitra";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "silverpill";
|
||||
repo = "mitra";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-reBG9h3jI4ONxYIwM2QdXlTC8ohmSrPm18sLOeI/2wY=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-WoJzFhxBDHuUNGaNsqieev93hg0Eo604tAM0HZJv9tA=";
|
||||
|
||||
# MEMO: mitra v3.9.0 tests failed with cargo option, "--offline"
|
||||
doCheck = false;
|
||||
|
||||
RUSTFLAGS = [
|
||||
# MEMO: mitra use ammonia crate with unstable rustc flag
|
||||
"--cfg=ammonia_unstable"
|
||||
];
|
||||
|
||||
buildFeatures = [
|
||||
"production"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Federated micro-blogging platform";
|
||||
homepage = "https://codeberg.org/silverpill/mitra";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ haruki7049 ];
|
||||
mainProgram = "mitra";
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "morewaita-icon-theme";
|
||||
version = "47.1";
|
||||
version = "47.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "somepaulo";
|
||||
repo = "MoreWaita";
|
||||
rev = "${version}";
|
||||
hash = "sha256-/ANzNQi+H2UzRlLrMBBMxEA/TGNpCwf8lNn6sHEKfQE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LvkYLY8PYajCb1x1p0HfpKoMq+t4XwH/w9Hvy9YXzk0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ndcurves";
|
||||
version = "1.4.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loco-3d";
|
||||
repo = "ndcurves";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-XJ3VSSGKSJ+x3jc4408PGHTYg3nC7o/EeFnbKBELefs=";
|
||||
hash = "sha256-dDH2XpnlBlhG5Q8N9Aljxvf/K9jFuiAx0lyBIcXNOZE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
kdePackages,
|
||||
glib,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plasma-panel-spacer-extended";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luisbocanegra";
|
||||
repo = "plasma-panel-spacer-extended";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-3ediynClboG6/dBQTih6jJPGjsTBZhZKOPQAjGLRNmk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
kdePackages.extra-cmake-modules
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kdePackages.kdeplasma-addons
|
||||
kdePackages.plasma-desktop
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [ (lib.cmakeFeature "Qt6_DIR" "${kdePackages.qtbase}/lib/cmake/Qt6") ];
|
||||
|
||||
propagatedUserEnvPkgs = [ glib ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Spacer with mouse gestures for the KDE Plasma Panel";
|
||||
homepage = "https://github.com/luisbocanegra/plasma-panel-spacer-extended";
|
||||
changelog = "https://github.com/luisbocanegra/plasma-panel-spacer-extended/blob/main/CHANGELOG.md";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
|
||||
inherit (kdePackages.kwindowsystem.meta) platforms;
|
||||
};
|
||||
})
|
||||
@@ -9,6 +9,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-+6zwyB5iQp3z4zvaTO44dWYE8Y4B2XczjiMwaj47Uh4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes cross-compilation to riscv64-linux
|
||||
./time-1.9-implicit-func-decl-clang.patch
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Tool that runs programs and summarizes the system resources they use";
|
||||
longDescription = ''
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
https://lists.gnu.org/archive/html/bug-time/2022-08/msg00001.html
|
||||
|
||||
From c8deae54f92d636878097063b411af9fb5262ad3 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 15 Aug 2022 07:24:24 -0700
|
||||
Subject: [PATCH] include string.h for memset()
|
||||
|
||||
Fixes implicit function declaration warning e.g.
|
||||
|
||||
resuse.c:103:3: error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)'
|
||||
|
||||
Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-time/2022-08/msg00001.html]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
--- a/src/resuse.c
|
||||
+++ b/src/resuse.c
|
||||
@@ -22,6 +22,7 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
+#include <string.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/resource.h>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform, testers, ttags }:
|
||||
let version = "0.4.1";
|
||||
let version = "0.4.2";
|
||||
in rustPlatform.buildRustPackage {
|
||||
pname = "ttags";
|
||||
inherit version;
|
||||
@@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage {
|
||||
owner = "npezza93";
|
||||
repo = "ttags";
|
||||
rev = "${version}";
|
||||
hash = "sha256-yKg0KUA/Wa7B/sU1uxgGQR0Wat/bFv3ascqnUCdWKw0=";
|
||||
hash = "sha256-z0IxGdveMtCXmCKD4jp/BEA6mtTl4CitIrVhM6BtHzA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MZ9QRF5yNw+YtSEu+Qc/J3Ap7+nRDZT7aitunk+x38Y=";
|
||||
cargoHash = "sha256-kyduUQcc3w5JyQICwTu9GdNRJF6H5353Ow05oKg6Ozg=";
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = ttags;
|
||||
|
||||
@@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec {
|
||||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2024.12.3";
|
||||
version = "2024.12.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "yt_dlp";
|
||||
hash = "sha256-Nav/UcV2IDMQPyMwugqKH0jEOIpBOi2M3JuEZC/o7dQ=";
|
||||
hash = "sha256-dD2+CB6ocb4/X/CD4s2V2oZt6nc/xwrmsQmDjPv3KsQ=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zizmor";
|
||||
version = "0.5.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woodruffw";
|
||||
repo = "zizmor";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dYM8Zkri0H/olODF2weOqdVg1NcPltzu1PZ92IbGLVE=";
|
||||
hash = "sha256-fZD8wXKS8bGh6P+KS2VM3pCuEDIEeNrK5iAykxzC/2Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-18DWe1MHABz1SMg72NcYTSCGvevchqZ3asb8+lg5MwE=";
|
||||
cargoHash = "sha256-n9VLK9i7YayiLD8pnEns19vbtlEktjFutYoKwpXgBCw=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
|
||||
@@ -46,10 +46,10 @@ in {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "9";
|
||||
patch = "20";
|
||||
patch = "21";
|
||||
suffix = "";
|
||||
};
|
||||
hash = "sha256-aygSee/YUpTS1pk+FzmDpXRkwBM5Vvu7VTbslka+rww=";
|
||||
hash = "sha256-MSb1lZLJsNeYWEdV8r97CB+hyjXOem/qmAEI11KgW7E=";
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
@@ -58,10 +58,10 @@ in {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "10";
|
||||
patch = "15";
|
||||
patch = "16";
|
||||
suffix = "";
|
||||
};
|
||||
hash = "sha256-qrCVCBdzUXJgGHmHLZN8HkkopXxAmuAjaew9kdzOvnk=";
|
||||
hash = "sha256-v7JJYJmQIgSRobkoUKBxNe0IMeQXOM9oHWPPAbKo+9E=";
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "art";
|
||||
version = "6.3";
|
||||
version = "6.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sepandhaghighi";
|
||||
repo = "art";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9kz6uyLdcrQqgWzT9g2qI9a+IituY/OFmbot+HlQsCE=";
|
||||
hash = "sha256-qA1fhqNJbhSOvsPSgbnuRTs40OJsn7tYHWzujN2RVK8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,33 +1,86 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
colorlog,
|
||||
fetchFromGitHub,
|
||||
jinja2,
|
||||
mock,
|
||||
pdm-backend,
|
||||
pylibmc,
|
||||
pystache,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
redis,
|
||||
requests,
|
||||
tabulate,
|
||||
watchdog,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cement";
|
||||
version = "3.0.10";
|
||||
format = "setuptools";
|
||||
version = "3.0.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-c9EBXr+bjfE+a8mH7fDUvj8ci0Q4kh7qjWbLtVBK7hU=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "datafolklabs";
|
||||
repo = "cement";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-weBqmNEjeSh5YQfHK48VVFW3UbZQmV4MiIQ3UPQKTTI=";
|
||||
};
|
||||
|
||||
# Disable test tests since they depend on a memcached server running on
|
||||
# 127.0.0.1:11211.
|
||||
doCheck = false;
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
optional-dependencies = {
|
||||
colorlog = [ colorlog ];
|
||||
jinja2 = [ jinja2 ];
|
||||
mustache = [ pystache ];
|
||||
generate = [ pyyaml ];
|
||||
redis = [ redis ];
|
||||
memcached = [ pylibmc ];
|
||||
tabulate = [ tabulate ];
|
||||
watchdog = [ watchdog ];
|
||||
yaml = [ pyyaml ];
|
||||
cli = [
|
||||
jinja2
|
||||
pyyaml
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
requests
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "cement" ];
|
||||
|
||||
# Tests are failing on Darwin
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
disabledTests = [
|
||||
# Test only works with the source from PyPI
|
||||
"test_get_version"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"tests/ext/test_ext_memcached.py"
|
||||
"tests/ext/test_ext_redis.py"
|
||||
"tests/ext/test_ext_smtp.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI Application Framework for Python";
|
||||
mainProgram = "cement";
|
||||
homepage = "https://builtoncement.com/";
|
||||
changelog = "https://github.com/datafolklabs/cement/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ eqyiel ];
|
||||
mainProgram = "cement";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "commitizen";
|
||||
version = "3.30.0";
|
||||
version = "4.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "commitizen-tools";
|
||||
repo = "commitizen";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8ULIoFKrDAGHwz0EZzYJtl/4h6UVUECLUDbvTJbdD60=";
|
||||
hash = "sha256-M6JoBVst2aJwxr/SyMpXXOnMKIl9gX0ltg3H0SpU7uQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -7,13 +7,14 @@
|
||||
pyopenssl,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
pyvmomi,
|
||||
qemu,
|
||||
requests,
|
||||
distutils,
|
||||
setuptools,
|
||||
stdenv,
|
||||
verboselogs,
|
||||
versioneer,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -26,8 +27,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
versioneer
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorlog
|
||||
distutils
|
||||
pyvmomi
|
||||
requests
|
||||
verboselogs
|
||||
@@ -46,6 +53,7 @@ buildPythonPackage rec {
|
||||
# argparse is part of the standardlib
|
||||
substituteInPlace setup.py \
|
||||
--replace "'argparse'," ""
|
||||
rm versioneer.py
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
@@ -84,6 +92,5 @@ buildPythonPackage rec {
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ evanjs ];
|
||||
broken = pythonAtLeast "3.12"; # Because it requires packages removed from 3.12 onwards
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,16 +34,15 @@
|
||||
python-dateutil,
|
||||
# duecredit
|
||||
duecredit,
|
||||
# python>=3.8
|
||||
distro,
|
||||
# win
|
||||
colorama,
|
||||
# python-version-dependent
|
||||
pythonOlder,
|
||||
importlib-resources,
|
||||
importlib-metadata,
|
||||
typing-extensions,
|
||||
# tests
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
p7zip,
|
||||
curl,
|
||||
@@ -52,13 +51,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datalad";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datalad";
|
||||
repo = pname;
|
||||
repo = "datalad";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Y7P9vRfFUJ5ZhVRTAYeImI9cv1LtWVAeBoBl6wANnrc=";
|
||||
hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -79,49 +79,44 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies =
|
||||
[
|
||||
# core
|
||||
platformdirs
|
||||
chardet
|
||||
iso8601
|
||||
humanize
|
||||
fasteners
|
||||
packaging
|
||||
patool
|
||||
tqdm
|
||||
annexremote
|
||||
looseversion
|
||||
setuptools
|
||||
git-annex
|
||||
optional-dependencies.core ++ optional-dependencies.downloaders ++ optional-dependencies.publish;
|
||||
|
||||
# downloaders-extra
|
||||
# requests-ftp # not in nixpkgs yet
|
||||
|
||||
# downloaders
|
||||
optional-dependencies = {
|
||||
core =
|
||||
[
|
||||
platformdirs
|
||||
chardet
|
||||
distro
|
||||
iso8601
|
||||
humanize
|
||||
fasteners
|
||||
packaging
|
||||
patool
|
||||
tqdm
|
||||
annexremote
|
||||
looseversion
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
|
||||
++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
|
||||
++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
|
||||
downloaders = [
|
||||
boto3
|
||||
keyrings-alt
|
||||
keyring
|
||||
msgpack
|
||||
requests
|
||||
|
||||
# publish
|
||||
python-gitlab
|
||||
|
||||
# misc
|
||||
];
|
||||
downloaders-extra = [
|
||||
# requests-ftp # not in nixpkgs yet
|
||||
];
|
||||
publish = [ python-gitlab ];
|
||||
misc = [
|
||||
argcomplete
|
||||
pyperclip
|
||||
python-dateutil
|
||||
|
||||
# duecredit
|
||||
duecredit
|
||||
|
||||
# python>=3.8
|
||||
distro
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
|
||||
++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]
|
||||
++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]
|
||||
++ lib.optionals (pythonOlder "3.11") [ typing-extensions ];
|
||||
];
|
||||
duecredit = [ duecredit ];
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd datalad \
|
||||
@@ -228,6 +223,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
p7zip
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
git-annex
|
||||
curl
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
fetchFromGitHub,
|
||||
psycopg2,
|
||||
python,
|
||||
pythonOlder,
|
||||
pytz,
|
||||
setuptools-scm,
|
||||
tablib,
|
||||
@@ -15,23 +14,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-import-export";
|
||||
version = "4.1.1";
|
||||
version = "4.3.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-import-export";
|
||||
repo = "django-import-export";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kD/9cpFqjipP3onMHCfimu0ffzGQAoEspjc4IfyuZak=";
|
||||
hash = "sha256-1vb8a0ntp5ikWrJ3aI4KsGlraXRoFa7o+sP2sJpFbVc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "tablib" ];
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
|
||||
dependencies = [
|
||||
diff-match-patch
|
||||
django
|
||||
|
||||
@@ -3,8 +3,10 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
setuptools,
|
||||
absl-py,
|
||||
flax,
|
||||
jax,
|
||||
jaxlib,
|
||||
jmp,
|
||||
numpy,
|
||||
@@ -25,14 +27,14 @@
|
||||
let
|
||||
dm-haiku = buildPythonPackage rec {
|
||||
pname = "dm-haiku";
|
||||
version = "0.0.12";
|
||||
format = "setuptools";
|
||||
version = "0.0.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = "dm-haiku";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aJRXlMq4CNMH3ZSTDP8MgnVltdSc8l5raw4//KccL48=";
|
||||
hash = "sha256-RJpQ9BzlbQ4X31XoJFnsZASiaC9fP2AdyuTAGINhMxs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -44,15 +46,24 @@ let
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
absl-py
|
||||
flax
|
||||
jaxlib
|
||||
jaxlib # implicit runtime dependency
|
||||
jmp
|
||||
numpy
|
||||
tabulate
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
jax = [
|
||||
jax
|
||||
jaxlib
|
||||
];
|
||||
flax = [ flax ];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "haiku" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.48.0";
|
||||
version = "3.49.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NYDmDhsgYNMZZDiSZ5ZtRauTzzckjqtETbfs8OvkgE4=";
|
||||
hash = "sha256-gqY26EoVUgpNQ83Egmnb/mBnLcB6MmFNs4W7ZsZziK0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -4,30 +4,27 @@
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
swig,
|
||||
wheel,
|
||||
msgpack,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ihm";
|
||||
version = "1.7";
|
||||
version = "1.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihmwg";
|
||||
repo = "python-ihm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-jQm8Xl2yyR+y1Leyz8naT1rFJpgK5XdUd7YgnhDuBWo=";
|
||||
hash = "sha256-Uz/4Egd7swY4kDl6FR564eiaYEdY9IUoz2Lv5pJ1C30=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
swig
|
||||
wheel
|
||||
];
|
||||
nativeBuildInputs = [ swig ];
|
||||
|
||||
propagatedBuildInputs = [ msgpack ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ msgpack ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
|
||||
@@ -3,20 +3,23 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "itemadapter";
|
||||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
version = "0.10.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5PlYpra29YMfogc3MBADGgvX7QQp3dCbUZecARR1yv0=";
|
||||
hash = "sha256-JlXIxQ8ahAXJ+nS4zcTaf+xUHKIXvIIbkKzIRRyYqdI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Infinite recursion with Scrapy
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langsmith";
|
||||
version = "0.1.137";
|
||||
version = "0.1.147";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langsmith-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nR3fb3MHBxFvI4qrsTpElLWTDUESZ8J78GsVoCGTIyQ=";
|
||||
hash = "sha256-d0PJaC1MhVS3i4AtXUjSkkq/Yj2Pi42H/cW/XML/94o=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marimo";
|
||||
version = "0.9.14";
|
||||
version = "0.9.27";
|
||||
pyproject = true;
|
||||
|
||||
# The github archive does not include the static assets
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Q3dnRuAS8B4cWvF04GGg5OOZtmAJPKa2fHwnoO2DXDs=";
|
||||
hash = "sha256-vs1miLjM/xRrnFYpHte65CfDt4ZRoCKjFMClWukIWZY=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -70,14 +70,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mlflow";
|
||||
version = "2.17.2";
|
||||
version = "2.18.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mlflow";
|
||||
repo = "mlflow";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-s3t6RAJh129d5XJKtMNxS0wgGO4mKbAfMCXDBXEKBxM=";
|
||||
hash = "sha256-etfgdSf3pbcKtCOk9MOgcR+Tzg4cmLbdadAOtQqN4PM=";
|
||||
};
|
||||
|
||||
# Remove currently broken dependency `shap`, a model explainability package.
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "optimum";
|
||||
version = "1.23.0";
|
||||
version = "1.23.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "optimum";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1A430tvuUsMiVmDbISdj2g5l05D6FswGKsjdUBpZrP0=";
|
||||
hash = "sha256-GJp1ukrYxEEwmkge31b02ROWZW5V23TtoEUjhycHpSg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,9 +12,6 @@
|
||||
isodate,
|
||||
pyparsing,
|
||||
|
||||
# propagates <3.8
|
||||
importlib-metadata,
|
||||
|
||||
# extras: networkx
|
||||
networkx,
|
||||
|
||||
@@ -24,31 +21,29 @@
|
||||
# tests
|
||||
pip,
|
||||
pytest-cov-stub,
|
||||
pytest7CheckHook,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rdflib";
|
||||
version = "7.0.0";
|
||||
format = "pyproject";
|
||||
version = "7.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RDFLib";
|
||||
repo = pname;
|
||||
repo = "rdflib";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VCjvgXMun1Hs+gPeqjzLXbIX1NBQ5aMLz0aWlwsm0iY=";
|
||||
hash = "sha256-/jRUV7H6JBWBv/gphjLjjifbEwMSxWke5STqkeSzwoE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
isodate
|
||||
html5lib
|
||||
dependencies = [
|
||||
pyparsing
|
||||
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
|
||||
] ++ lib.optionals (pythonOlder "3.11") [ isodate ];
|
||||
|
||||
optional-dependencies = {
|
||||
html = [ html5lib ];
|
||||
@@ -60,8 +55,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pip
|
||||
pytest-cov-stub
|
||||
# Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted.
|
||||
pytest7CheckHook
|
||||
pytestCheckHook
|
||||
setuptools
|
||||
] ++ optional-dependencies.networkx ++ optional-dependencies.html;
|
||||
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "replicate";
|
||||
version = "1.0.1";
|
||||
version = "1.0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "replicate";
|
||||
repo = "replicate-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-q//RV4Y9k2KXXgZGfBF/XObxsBfAHE50oG+r/Vvu9BY=";
|
||||
hash = "sha256-VXJBArFzVPls0ZWL8o6hkOiTtjYRxkdNDiWCPN/hW48=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
wheel,
|
||||
matplotlib,
|
||||
numpy,
|
||||
pandas,
|
||||
@@ -16,22 +15,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-posthocs";
|
||||
version = "0.9.1";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maximtrp";
|
||||
repo = "scikit-posthocs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ssaTd+A7lzd4tlKHGkgKixi3XjZLQBcPs6UOEzX/hrk=";
|
||||
hash = "sha256-KrQqd3zChw9sxjbrTrxXInXAJLyXwPkhbPa9One6I+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
matplotlib
|
||||
numpy
|
||||
pandas
|
||||
|
||||
@@ -12,15 +12,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-confluencebuilder";
|
||||
version = "2.7.1";
|
||||
version = "2.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "sphinxcontrib_confluencebuilder";
|
||||
inherit version;
|
||||
hash = "sha256-Tj9m0TcPkg+FIWwYixahpox27Yn+0tXPppwb5EwmBk0=";
|
||||
hash = "sha256-2lF8iS8c7KXDdXT2IuApFnx0g4syWmIP1y25W5DkkJA=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -4,28 +4,24 @@
|
||||
fetchFromGitHub,
|
||||
googleapis-common-protos,
|
||||
protobuf,
|
||||
setuptools,
|
||||
lib,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow-metadata";
|
||||
version = "1.15.0";
|
||||
format = "setuptools";
|
||||
version = "1.16.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "metadata";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-f3bkDTy45uwqVJaXFb0Dmaj9U1lJTP5R5Ej1yzobEV4=";
|
||||
hash = "sha256-MP5P4kFACT1guZVU3f9YrnKeQaUK0Tnu7edKRy4yvlM=";
|
||||
};
|
||||
|
||||
patches = [ ./build.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'protobuf>=3.13,<4' 'protobuf>=3.13'
|
||||
'';
|
||||
|
||||
# Default build pulls in Bazel + extra deps, given the actual build
|
||||
# is literally three lines (see below) - replace it with custom build.
|
||||
preBuild = ''
|
||||
@@ -34,7 +30,9 @@ buildPythonPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
absl-py
|
||||
googleapis-common-protos
|
||||
protobuf
|
||||
|
||||
@@ -5,43 +5,41 @@
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
pycodestyle,
|
||||
pytest-cov-stub,
|
||||
pyyaml,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tinydb";
|
||||
version = "4.8.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
format = "pyproject";
|
||||
version = "4.8.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msiemens";
|
||||
repo = pname;
|
||||
repo = "tinydb";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sdWcpkjC8LtOI1k0Wyk4vLXBcwYe1vuQON9J7P8JPxA=";
|
||||
hash = "sha256-N/45XB7ZuZiq25v6DQx4K9NRVnBbUHPeiKKbxQ9YB3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--cov-append --cov-report term --cov tinydb" ""
|
||||
'';
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pycodestyle
|
||||
pytest-cov-stub
|
||||
pyyaml
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tinydb" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Lightweight document oriented database written in Python";
|
||||
homepage = "https://tinydb.readthedocs.org/";
|
||||
changelog = "https://tinydb.readthedocs.io/en/latest/changelog.html";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marcus7070 ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ marcus7070 ];
|
||||
};
|
||||
}
|
||||
|
||||
+17
-46
@@ -1,18 +1,18 @@
|
||||
{ lib
|
||||
, avahi
|
||||
, bc
|
||||
, coreutils
|
||||
, cups
|
||||
, dbus
|
||||
, dejavu_fonts
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, fontconfig
|
||||
, gawk
|
||||
, ghostscript
|
||||
, gnugrep
|
||||
, gnused
|
||||
, ijs
|
||||
, libcupsfilters
|
||||
, libppd
|
||||
, libexif
|
||||
, libjpeg
|
||||
, liblouis
|
||||
@@ -30,70 +30,41 @@
|
||||
, withAvahi ? true
|
||||
}:
|
||||
|
||||
let
|
||||
(if !withAvahi then lib.warn "the 'withAvahi' parameter to 'cups-filters' is deprecated, as the cups-browsed component (which does not make sense without avahi) has been split out of the cups-filters package (which no longer needs avahi)" else lib.id)
|
||||
|
||||
(let
|
||||
binPath = lib.makeBinPath [ bc coreutils gawk gnused gnugrep which ];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cups-filters";
|
||||
version = "1.28.17";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OpenPrinting/cups-filters/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-Jwo3UqlgNoqpnUMftdNPQDmyrJQ8V22EBhLR2Bhcm7k=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenPrinting";
|
||||
repo = "cups-filters";
|
||||
rev = version;
|
||||
hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-24805.patch";
|
||||
url = "https://github.com/OpenPrinting/cups-filters/commit/93e60d3df358c0ae6f3dba79e1c9684657683d89.patch";
|
||||
hash = "sha256-KgWTYFr2uShL040azzE+KaNyBPy7Gs/hCnEgQmmPCys=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2024-47076.patch";
|
||||
url = "https://github.com/OpenPrinting/libcupsfilters/commit/95576ec3d20c109332d14672a807353cdc551018.patch";
|
||||
hash = "sha256-MXWllrdWt8n7zqvumQNg34dBgWMwMTwf9lrD+ZZP8Wk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "remove-cups-ldap-browse-protocols_CVE-2024-47176_CVE-2024-47850.patch";
|
||||
url = "https://github.com/OpenPrinting/cups-filters/commit/6fd2bdfbdce76149af531ce9fca9062304238451.patch";
|
||||
hash = "sha256-XS1ODy7i7ilgEjsKuEvOUiRN9pqsj+bOktKoshKcg8Q=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ];
|
||||
|
||||
buildInputs = [
|
||||
cups
|
||||
dbus
|
||||
fontconfig
|
||||
ghostscript
|
||||
ijs
|
||||
libexif
|
||||
libjpeg
|
||||
liblouis # braille embosser support
|
||||
libpng
|
||||
libcupsfilters
|
||||
libppd
|
||||
mupdf
|
||||
perl
|
||||
poppler
|
||||
poppler_utils
|
||||
qpdf
|
||||
] ++ lib.optionals withAvahi [ avahi ];
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-mutool-path=${mupdf}/bin/mutool"
|
||||
"--with-pdftops=pdftops"
|
||||
"--with-pdftops-path=${poppler_utils}/bin/pdftops"
|
||||
"--with-gs-path=${ghostscript}/bin/gs"
|
||||
"--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo"
|
||||
"--with-ippfind-path=${cups}/bin/ippfind"
|
||||
"--enable-imagefilters"
|
||||
"--with-rcdir=no"
|
||||
"--with-shell=${stdenv.shell}"
|
||||
"--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf"
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
] ++ lib.optionals (!withAvahi) [ "--disable-avahi" ];
|
||||
];
|
||||
|
||||
makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ];
|
||||
|
||||
@@ -130,4 +101,4 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,19 +11,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wiki-tui";
|
||||
version = "0.8.2";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Builditluc";
|
||||
repo = "wiki-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-euyg4wYWYerYT3hKdOCjokx8lJldGN7E3PHimDgQy3U=";
|
||||
hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w=";
|
||||
};
|
||||
|
||||
# Note: bump `time` dependency to be able to build with rust 1.80, should be removed on the next
|
||||
# release (see: https://github.com/NixOS/nixpkgs/issues/332957)
|
||||
cargoPatches = [ ./time.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
@@ -31,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
|
||||
|
||||
cargoHash = "sha256-XovbT+KC0va7yC5j7kf6t1SnXe1uyy1KI8FRV1AwkS0=";
|
||||
cargoHash = "sha256-fLA7dF91mEgjTnbhujTKaHX+qmpzYaqzL8cc/x+mrUk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and easy to use Wikipedia Text User Interface";
|
||||
|
||||
@@ -1,211 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index e66f0ac..918c3b2 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -318,7 +318,7 @@ dependencies = [
|
||||
"log",
|
||||
"num",
|
||||
"owning_ref",
|
||||
- "time 0.3.22",
|
||||
+ "time 0.3.36",
|
||||
"unicode-segmentation",
|
||||
"unicode-width",
|
||||
"xi-unicode",
|
||||
@@ -344,7 +344,7 @@ dependencies = [
|
||||
"ident_case",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -355,7 +355,16 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
|
||||
dependencies = [
|
||||
"darling_core",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "deranged"
|
||||
+version = "0.3.11"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
|
||||
+dependencies = [
|
||||
+ "powerfmt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -427,7 +436,7 @@ checksum = "8560b409800a72d2d7860f8e5f4e0b0bd22bea6a352ea2a9ce30ccdef7f16d2f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -448,7 +457,7 @@ dependencies = [
|
||||
"darling",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1025,6 +1034,12 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
+[[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"
|
||||
@@ -1129,7 +1144,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1282,6 +1297,12 @@ version = "0.3.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
|
||||
|
||||
+[[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"
|
||||
@@ -1518,9 +1539,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
-version = "1.0.167"
|
||||
+version = "1.0.193"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237"
|
||||
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
@@ -1537,13 +1558,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
-version = "1.0.167"
|
||||
+version = "1.0.193"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9"
|
||||
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1565,7 +1586,7 @@ checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1750,9 +1771,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
-version = "2.0.23"
|
||||
+version = "2.0.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
|
||||
+checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -1832,7 +1853,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1859,13 +1880,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.3.22"
|
||||
+version = "0.3.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
|
||||
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
+ "deranged",
|
||||
"itoa",
|
||||
"libc",
|
||||
+ "num-conv",
|
||||
"num_threads",
|
||||
+ "powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
"time-macros",
|
||||
@@ -1873,16 +1897,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",
|
||||
]
|
||||
|
||||
@@ -2133,7 +2158,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@@ -2167,7 +2192,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 2.0.23",
|
||||
+ "syn 2.0.32",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
@@ -118,13 +118,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mpd";
|
||||
version = "0.23.15";
|
||||
version = "0.23.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MusicPlayerDaemon";
|
||||
repo = "MPD";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QURq7ysSsxmBOtoBlPTPWiloXQpjEdxnM0L1fLwXfpw=";
|
||||
sha256 = "sha256-0To+V+4xLjymGpRSpsyE/Une5uUpCEiAg+d041guPA0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -10,8 +10,8 @@ let
|
||||
in
|
||||
buildMongoDB {
|
||||
inherit avxSupport;
|
||||
version = "6.0.18";
|
||||
sha256 = "sha256-Nq3xwR/z11HsZs8cC9Yr0Xkjg0l1MLb0YRFHsAeQKTM=";
|
||||
version = "6.0.19";
|
||||
sha256 = "sha256-qcf+6hMg0LASeOoZJPoRCQ9ajCJBqSsBDg2Wp+2SMKY=";
|
||||
patches = [
|
||||
# Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing
|
||||
./fix-gcc-13-ctype-6_0.patch
|
||||
|
||||
@@ -25,8 +25,8 @@ let
|
||||
in
|
||||
buildMongoDB {
|
||||
inherit avxSupport;
|
||||
version = "7.0.14";
|
||||
sha256 = "sha256-3NUv/Rr6V0rH6zHCXJwHZ7ZQOqMJvYGessNVemUF6g0=";
|
||||
version = "7.0.15";
|
||||
sha256 = "sha256-oVH0pBV22J//hVhrwx3uuBT/ML8W2N2HvzqYhuRuM68=";
|
||||
patches = [
|
||||
# ModuleNotFoundError: No module named 'mongo_tooling_metrics':
|
||||
# NameError: name 'SConsToolingMetrics' is not defined:
|
||||
|
||||
@@ -31,7 +31,7 @@ buildNpmPackage {
|
||||
prisma
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-IeryDlBFG+fu0FyqlNujkF+O+YwfQm0hoMMvp/vN0IQ=";
|
||||
npmDepsHash = "sha256-2q+3NgXkpqdljW/AnBU44002arMc0K/Rl15eqr+oa9E=";
|
||||
makeCacheWritable = true;
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.4.0";
|
||||
version = "1.6.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stonith404";
|
||||
repo = "pingvin-share";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5tu81kB9UDui2/n5KJLRug4IHeDihuv8+HWeo0saqAM=";
|
||||
hash = "sha256-uoOkr5awBa7MQA4tNUzFp7we5zVnBpjX6V6fNcTI84o=";
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ buildNpmPackage {
|
||||
buildInputs = [ vips ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
npmDepsHash = "sha256-G9UzA/laXEiU101ehFwhi0i6PAeErNWqmb1fu4W+cII=";
|
||||
npmDepsHash = "sha256-TC3I3suUJTCmKykitpf2vvO6aGUSoYWOnB3jFwV2W/4=";
|
||||
makeCacheWritable = true;
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, docbook_xml_dtd_412, docbook_xsl
|
||||
, libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify
|
||||
, gobject-introspection, libsecret, packagekit
|
||||
, cups-filters, gettext, libtool, autoconf-archive
|
||||
, libcupsfilters, gettext, libtool, autoconf-archive
|
||||
, python3Packages, autoreconfHook, bash, fetchpatch
|
||||
}:
|
||||
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
buildPythonPath "$out $pythonPath"
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : "$program_PATH"
|
||||
--set CUPS_DATADIR "${cups-filters}/share/cups"
|
||||
--set CUPS_DATADIR "${libcupsfilters}/share/cups"
|
||||
)
|
||||
|
||||
find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do
|
||||
|
||||
@@ -190,7 +190,7 @@ stdenv.mkDerivation {
|
||||
[
|
||||
# Enable LTO, since it improves eval performance a fair amount
|
||||
# LTO is disabled on static due to strange linking errors
|
||||
(lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.mesonBool "b_lto" (!stdenv.hostPlatform.isStatic && stdenv.cc.isGNU))
|
||||
(lib.mesonEnable "gc" true)
|
||||
(lib.mesonBool "enable-tests" true)
|
||||
(lib.mesonBool "enable-docs" enableDocumentation)
|
||||
|
||||
@@ -873,7 +873,21 @@ mapAliases {
|
||||
nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25
|
||||
nagiosPluginsOfficial = monitoring-plugins;
|
||||
neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
|
||||
nerdfonts = throw "nerdfonts has been separated into individual font packages under the namespace nerd-fonts. To list all fonts use `builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)`."; # Added 2024-11-09
|
||||
nerdfonts = throw ''nerdfonts has been separated into individual font packages under the namespace nerd-fonts.
|
||||
For example change:
|
||||
fonts.packages = [
|
||||
...
|
||||
(pkgs.nerdfonts.override { fonts = [ "0xproto" "DroidSansMono" ]; })
|
||||
]
|
||||
to
|
||||
fonts.packages = [
|
||||
...
|
||||
pkgs.nerd-fonts._0xproto
|
||||
pkgs.nerd-fonts.droid_sans_mono
|
||||
]
|
||||
or for all fonts
|
||||
font.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)
|
||||
''; # Added 2024-11-09
|
||||
newlibCross = newlib; # Added 2024-09-06
|
||||
newlib-nanoCross = newlib-nano; # Added 2024-09-06
|
||||
nix-direnv-flakes = nix-direnv;
|
||||
|
||||
@@ -18691,7 +18691,13 @@ with self; {
|
||||
url = "mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.64.tar.gz";
|
||||
hash = "sha256-17x3/w9iv4dMhDxZDrEqgLvUR0mi+3Tb7URcNdDoWoU=";
|
||||
};
|
||||
buildInputs = [ pkgs.cups pkgs.cups-filters ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://git.launchpad.net/ubuntu/+source/libnet-cups-perl/plain/debian/patches/cupsfilters-2.0.patch?id=a47b8df8551853c12a7f965ae60bb52333883c88";
|
||||
hash = "sha256-ouOrUsRHD1qxu8B6rZiqs9LXYIymX5kSuu99KnmP8Bo=";
|
||||
})
|
||||
];
|
||||
buildInputs = [ pkgs.cups pkgs.libcupsfilters ];
|
||||
NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.cups}/lib -lcups";
|
||||
meta = {
|
||||
description = "Common Unix Printing System Interface";
|
||||
|
||||
Reference in New Issue
Block a user