Merge branch 'master' into staging-next

This commit is contained in:
Vladimír Čunát
2024-01-04 15:07:44 +01:00
220 changed files with 8334 additions and 1523 deletions
+6
View File
@@ -17,6 +17,7 @@ import http
import json
import logging
import os
import re
import subprocess
import sys
import time
@@ -192,6 +193,11 @@ class RepoGitHub(Repo):
with urllib.request.urlopen(commit_req, timeout=10) as req:
self._check_for_redirect(commit_url, req)
xml = req.read()
# Filter out illegal XML characters
illegal_xml_regex = re.compile(b"[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F]")
xml = illegal_xml_regex.sub(b"", xml)
root = ET.fromstring(xml)
latest_entry = root.find(ATOM_ENTRY)
assert latest_entry is not None, f"No commits found in repository {self}"
@@ -58,6 +58,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- Invidious has changed its default database username from `kemal` to `invidious`. Setups involving an externally provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857)
- `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`.
- `mkosi` was updated to v19. Parts of the user interface have changed. Consult the
[release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.
+24 -23
View File
@@ -10,7 +10,7 @@ let
defaultFont = "${pkgs.liberation_ttf}/share/fonts/truetype/LiberationSerif-Regular.ttf";
# Don't start a redis instance if the user sets a custom redis connection
enableRedis = !hasAttr "PAPERLESS_REDIS" cfg.extraConfig;
enableRedis = !(cfg.settings ? PAPERLESS_REDIS);
redisServer = config.services.redis.servers.paperless;
env = {
@@ -24,9 +24,11 @@ let
PAPERLESS_TIME_ZONE = config.time.timeZone;
} // optionalAttrs enableRedis {
PAPERLESS_REDIS = "unix://${redisServer.unixSocket}";
} // (
lib.mapAttrs (_: toString) cfg.extraConfig
);
} // (lib.mapAttrs (_: s:
if (lib.isAttrs s || lib.isList s) then builtins.toJSON s
else if lib.isBool s then lib.boolToString s
else toString s
) cfg.settings);
manage = pkgs.writeShellScript "manage" ''
set -o allexport # Export the following env vars
@@ -82,6 +84,7 @@ in
imports = [
(mkRenamedOptionModule [ "services" "paperless-ng" ] [ "services" "paperless" ])
(mkRenamedOptionModule [ "services" "paperless" "extraConfig" ] [ "services" "paperless" "settings" ])
];
options.services.paperless = {
@@ -160,32 +163,30 @@ in
description = lib.mdDoc "Web interface port.";
};
# FIXME this should become an RFC42-style settings attr
extraConfig = mkOption {
type = types.attrs;
settings = mkOption {
type = lib.types.submodule {
freeformType = with lib.types; attrsOf (let
typeList = [ bool float int str path package ];
in oneOf (typeList ++ [ (listOf (oneOf typeList)) (attrsOf (oneOf typeList)) ]));
};
default = { };
description = lib.mdDoc ''
Extra paperless config options.
See [the documentation](https://docs.paperless-ngx.com/configuration/)
for available options.
See [the documentation](https://docs.paperless-ngx.com/configuration/) for available options.
Note that some options such as `PAPERLESS_CONSUMER_IGNORE_PATTERN` expect JSON values. Use `builtins.toJSON` to ensure proper quoting.
Note that some settings such as `PAPERLESS_CONSUMER_IGNORE_PATTERN` expect JSON values.
Settings declared as lists or attrsets will automatically be serialised into JSON strings for your convenience.
'';
example = literalExpression ''
{
PAPERLESS_OCR_LANGUAGE = "deu+eng";
PAPERLESS_DBHOST = "/run/postgresql";
PAPERLESS_CONSUMER_IGNORE_PATTERN = builtins.toJSON [ ".DS_STORE/*" "desktop.ini" ];
PAPERLESS_OCR_USER_ARGS = builtins.toJSON {
optimize = 1;
pdfa_image_compression = "lossless";
};
example = {
PAPERLESS_OCR_LANGUAGE = "deu+eng";
PAPERLESS_DBHOST = "/run/postgresql";
PAPERLESS_CONSUMER_IGNORE_PATTERN = [ ".DS_STORE/*" "desktop.ini" ];
PAPERLESS_OCR_USER_ARGS = {
optimize = 1;
pdfa_image_compression = "lossless";
};
'';
};
};
user = mkOption {
@@ -3,6 +3,7 @@
let
cfg = config.services.eris-server;
stateDirectoryPath = "\${STATE_DIRECTORY}";
nullOrStr = with lib.types; nullOr str;
in {
options.services.eris-server = {
@@ -26,7 +27,7 @@ in {
};
listenCoap = lib.mkOption {
type = lib.types.str;
type = nullOrStr;
default = ":5683";
example = "[::1]:5683";
description = ''
@@ -39,8 +40,8 @@ in {
};
listenHttp = lib.mkOption {
type = lib.types.str;
default = "";
type = nullOrStr;
default = null;
example = "[::1]:8080";
description = "Server HTTP listen address. Do not listen by default.";
};
@@ -58,8 +59,8 @@ in {
};
mountpoint = lib.mkOption {
type = lib.types.str;
default = "";
type = nullOrStr;
default = null;
example = "/eris";
description = ''
Mountpoint for FUSE namespace that exposes "urn:eris:" files.
@@ -69,33 +70,44 @@ in {
};
config = lib.mkIf cfg.enable {
assertions = [{
assertion = lib.strings.versionAtLeast cfg.package.version "20231219";
message =
"Version of `config.services.eris-server.package` is incompatible with this module";
}];
systemd.services.eris-server = let
cmd =
"${cfg.package}/bin/eris-go server --coap '${cfg.listenCoap}' --http '${cfg.listenHttp}' ${
lib.optionalString cfg.decode "--decode "
}${
lib.optionalString (cfg.mountpoint != "")
''--mountpoint "${cfg.mountpoint}" ''
}${lib.strings.escapeShellArgs cfg.backends}";
cmd = "${cfg.package}/bin/eris-go server"
+ (lib.optionalString (cfg.listenCoap != null)
" --coap '${cfg.listenCoap}'")
+ (lib.optionalString (cfg.listenHttp != null)
" --http '${cfg.listenHttp}'")
+ (lib.optionalString cfg.decode " --decode")
+ (lib.optionalString (cfg.mountpoint != null)
" --mountpoint '${cfg.mountpoint}'");
in {
description = "ERIS block server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
script = lib.mkIf (cfg.mountpoint != "") ''
environment.ERIS_STORE_URL = toString cfg.backends;
script = lib.mkIf (cfg.mountpoint != null) ''
export PATH=${config.security.wrapperDir}:$PATH
${cmd}
'';
serviceConfig = let
umounter = lib.mkIf (cfg.mountpoint != "")
umounter = lib.mkIf (cfg.mountpoint != null)
"-${config.security.wrapperDir}/fusermount -uz ${cfg.mountpoint}";
in {
ExecStartPre = umounter;
ExecStart = lib.mkIf (cfg.mountpoint == "") cmd;
ExecStopPost = umounter;
Restart = "always";
RestartSec = 20;
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
};
in if (cfg.mountpoint == null) then {
ExecStart = cmd;
} else
{
ExecStartPre = umounter;
ExecStopPost = umounter;
} // {
Restart = "always";
RestartSec = 20;
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
};
};
};
@@ -130,9 +130,9 @@ let cfg = config.services.xserver.libinput;
default = true;
description =
lib.mdDoc ''
Disables horizontal scrolling. When disabled, this driver will discard any horizontal scroll
events from libinput. Note that this does not disable horizontal scrolling, it merely
discards the horizontal axis from any scroll events.
Enables or disables horizontal scrolling. When disabled, this driver will discard any
horizontal scroll events from libinput. This does not disable horizontal scroll events
from libinput; it merely discards the horizontal axis from any scroll events.
'';
};
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3
{ lib, stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyed3
, lame, flac, glyr
, perlPackages
, makeWrapper }:
@@ -40,7 +40,7 @@ in
--prefix PERL5LIB : "$PERL5LIB" \
--prefix PATH ":" ${lib.makeBinPath [
"$out" which libcdio-paranoia cddiscid wget
vorbis-tools id3v2 eyeD3 lame flac glyr
vorbis-tools id3v2 eyed3 lame flac glyr
]}
done
'';
+1 -1
View File
@@ -57,7 +57,7 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
pygobject3
eyeD3
eyed3
pillow
mutagen
pytaglib
+1 -1
View File
@@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec {
mygpoclient
requests
pygobject3
eyeD3
eyed3
podcastparser
html5lib
mutagen
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "yoshimi";
version = "2.3.1";
version = "2.3.1.3";
src = fetchFromGitHub {
owner = "Yoshimi";
repo = pname;
rev = version;
hash = "sha256-NMgy/ucuSRFX2zlO8GhL4QSP4NZo1QKZJYTc2eXzWUA=";
hash = "sha256-G4XLRYFndXW6toRyL7n1xV1ueGKVnkY1NgtpzaZ8h+I=";
};
sourceRoot = "${src.name}/src";
@@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "exodus";
version = "23.12.7";
version = "23.12.21";
src = fetchurl {
name = "exodus-linux-x64-${version}.zip";
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
sha256 = "sha256-qx0p+4jAuv2koaOuEgQ42jpJ5HysRX81PPrMOWp2Snw=";
sha256 = "sha256-sQKbwrnq/hSkeF99KA3cIA757IMr1g3xfe7FsgtyvOA=";
};
nativeBuildInputs = [ unzip ];
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "2.0.4";
version = "2.0.5";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
sha256 = "sha256-VYyf9rKBRPpnxuaeO6aAq7cQwDfBRLRbH4SlPS+bxFQ=";
sha256 = "sha256-1AgX+Klw/IsRRBV2M1OkLGE4DPqq6hX2h72RNzad2DM=";
};
dontBuild = true;
@@ -23,6 +23,8 @@ in
control-lock = callPackage ./manual-packages/control-lock { };
copilot = callPackage ./manual-packages/copilot { };
ebuild-mode = callPackage ./manual-packages/ebuild-mode { };
el-easydraw = callPackage ./manual-packages/el-easydraw { };
@@ -0,0 +1,37 @@
{
dash,
editorconfig,
fetchFromGitHub,
nodejs,
s,
trivialBuild,
}:
trivialBuild {
pname = "copilot";
version = "unstable-2023-12-26";
src = fetchFromGitHub {
owner = "zerolfx";
repo = "copilot.el";
rev = "d4fa14cea818e041b4a536c5052cf6d28c7223d7";
sha256 = "sha256-Tzs0Dawqa+OD0RSsf66ORbH6MdBp7BMXX7z+5UuNwq4=";
};
packageRequires = [
dash
editorconfig
nodejs
s
];
postInstall = ''
cp -r $src/dist $LISPDIR
'';
meta = {
description = "An unofficial copilot plugin for Emacs";
homepage = "https://github.com/zerolfx/copilot.el";
platforms = [
"x86_64-darwin"
"x86_64-linux"
"x86_64-windows"
];
};
}
@@ -16359,5 +16359,17 @@ final: prev:
meta.homepage = "https://github.com/jhradilek/vim-snippets/";
};
roslyn-nvim = buildVimPlugin {
pname = "roslyn-nvim";
version = "2023-12-12";
src = fetchFromGitHub {
owner = "jmederosalvarado";
repo = "roslyn.nvim";
rev = "3e360ea5a15f3cf7ddef02ff003ef24244cdff3a";
sha256 = "sha256-0mvlEE3/qGkv2dLzthWwGgdVTmp2Y/WJLv9ihcPumBo=";
};
meta.homepage = "https://github.com/jmederosalvarado/roslyn.nvim/";
};
}
@@ -315,17 +315,78 @@
src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx";
};
codeium-nvim = super.codeium-nvim.overrideAttrs {
codeium-nvim = let
# Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
codeiumVersion = "1.6.7";
codeiumHashes = {
x86_64-linux = "sha256-z1cZ6xmP25iPezeLpz4xRh7czgx1JLwsYwGAEUA6//I=";
aarch64-linux = "sha256-8cSdCiIVbqv91lUMOLV1Xld8KuIzJA5HCIDbhyyc404=";
x86_64-darwin = "sha256-pjW7tNyO0cIFdIm69H6I3HDBpFwnJIRmIN7WRi1OfLw=";
aarch64-darwin = "sha256-DgE4EVNCM9+YdTVJeVYnrDGAXOJV1VrepiVeX3ziwfg=";
};
codeium' = codeium.overrideAttrs rec {
version = codeiumVersion;
src = let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
platform = {
x86_64-linux = "linux_x64";
aarch64-linux = "linux_arm";
x86_64-darwin = "macos_x64";
aarch64-darwin = "macos_arm";
}.${system} or throwSystem;
hash = codeiumHashes.${system} or throwSystem;
in fetchurl {
name = "codeium-${version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${version}/language_server_${platform}.gz";
inherit hash;
};
};
in super.codeium-nvim.overrideAttrs {
dependencies = with self; [ nvim-cmp plenary-nvim ];
buildPhase = ''
cat << EOF > lua/codeium/installation_defaults.lua
return {
tools = {
language_server = "${codeium}/bin/codeium_language_server"
language_server = "${codeium'}/bin/codeium_language_server"
};
};
EOF
'';
doCheck = true;
checkInputs = [ jq ];
checkPhase = ''
runHook preCheck
expected_codeium_version=$(jq -r '.version' lua/codeium/versions.json)
actual_codeium_version=$(${codeium'}/bin/codeium_language_server --version)
expected_codeium_stamp=$(jq -r '.stamp' lua/codeium/versions.json)
actual_codeium_stamp=$(${codeium'}/bin/codeium_language_server --stamp | grep STABLE_BUILD_SCM_REVISION | cut -d' ' -f2)
if [ "$actual_codeium_stamp" != "$expected_codeium_stamp" ]; then
echo "
The version of codeium patched in vimPlugins.codeium-nvim is incorrect.
Expected stamp: $expected_codeium_stamp
Actual stamp: $actual_codeium_stamp
Expected codeium version: $expected_codeium_version
Actual codeium version: $actual_codeium_version
Please, update 'codeiumVersion' in pkgs/applications/editors/vim/plugins/overrides.nix accordingly to:
https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json
"
exit 1
fi
runHook postCheck
'';
};
command-t = super.command-t.overrideAttrs {
@@ -1022,6 +1083,10 @@
];
};
roslyn-nvim = super.roslyn-nvim.overrideAttrs {
dependencies = with self; [ nvim-lspconfig ];
};
sg-nvim = super.sg-nvim.overrideAttrs (old:
let
sg-nvim-rust = rustPlatform.buildRustPackage {
File diff suppressed because it is too large Load Diff
@@ -11,13 +11,13 @@
}:
let
version = "0.47";
version = "0.49";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "v${version}";
hash = "sha256-CYv5AZsGvN2dtN7t58b50a8PH7804Lnm4d4wAX6Mm5Q=";
hash = "sha256-xir0v3SzfkxNXKR6N7Rso0QFtVQIRfu0TIPGWSEwsHM=";
};
meta = with lib; {
@@ -36,6 +36,7 @@ let
lockFile = ./Cargo.lock;
outputHashes = {
"subprocess-0.2.10" = "sha256-WcGrJ103ofGlQwi32kRGM3Z+uvKSCFBmFZbZXAtuWwM=";
"tree-sitter-vim-0.3.1-dev.0" = "sha256-CWxZ28LdptiMNO2VIk+Ny/DhQXdN604EuqRIb9oaCmI=";
};
};
@@ -47,7 +48,9 @@ let
libgit2
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.SystemConfiguration
];
};
in
@@ -739,6 +739,7 @@ https://github.com/gu-fan/riv.vim/,,
https://github.com/kevinhwang91/rnvimr/,,
https://github.com/mfukar/robotframework-vim/,,
https://github.com/ron-rs/ron.vim/,,
https://github.com/jmederosalvarado/roslyn.nvim/,HEAD,
https://github.com/keith/rspec.vim/,,
https://github.com/ccarpita/rtorrent-syntax-file/,,
https://github.com/simrat39/rust-tools.nvim/,,
@@ -49,13 +49,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-24";
version = "7.1.1-25";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-oQ/g2/OhZWKvh//QevYsyi8uNwgo1yuihT5728eVKF8=";
hash = "sha256-HKDeeh8DNj0y7wS4DqctXhmNaOqZ02JeBXRFrEpH0M4=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -13,19 +13,19 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "22.1.2";
version = "22.1.16";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-4S4N7vfDwzlNutPfHozy/z0LOAr8q8EepXV4tsy+yAU=";
hash = "sha256-97y6AdU5Pb1zK9m7ny3sd7DCuul3RpYFVR6cLXP8NLA=";
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-QM7qazr8Iv4gjO7vF5Wj564D/yB+ZWmMGQDtTFytK00=";
hash = "sha256-RXTsGxoRnkpu4fArSMkwDAOsEFCFY2OPjh6uTZCuR/M=";
};
nativeBuildInputs = [
@@ -50,14 +50,14 @@
stdenv.mkDerivation {
pname = "monado";
version = "unstable-2023-11-09";
version = "unstable-2024-01-02";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "monado";
rev = "e983eecd73b1b91d2dfb356e1bc054e9202b2a7f";
hash = "sha256-a4ukfmJbDkhr7P3NMTfbuhXjyOta3WCc5gswX7KUAw0=";
rev = "bfa1c16ff9fc759327ca251a5d086b958b1a3b8a";
hash = "sha256-wXRwOs9MkDre/VeW686DzmvKjX0qCSS13MILbYQD6OY=";
};
nativeBuildInputs = [
@@ -43,9 +43,15 @@ in mkDerivation rec {
# Test suite does nothing.
doCheck = false;
# Add systemd user unit.
postPatch = ''
substituteInPlace src/NotificationCenter.hs \
--replace '/etc/xdg/deadd/deadd.css' "$out/etc/deadd.css"
'';
# Add systemd user unit and install default style.
postInstall = ''
mkdir -p $out/lib/systemd/user
install -Dm644 style.css $out/etc/deadd.css
echo "${systemd-service}" > $out/lib/systemd/user/deadd-notification-center.service
'';
@@ -20,13 +20,13 @@ let
in
maven.buildMavenPackage rec {
pname = "ns-usbloader";
version = "7.0";
version = "7.1";
src = fetchFromGitHub {
owner = "developersu";
repo = "ns-usbloader";
rev = "v${version}";
sha256 = "sha256-x4zGwsDUVUHI4AUMPSqgnZVyZx+pWQA5xvtrFE8U3QU=";
sha256 = "sha256-gSf5SCIhcUEYGsYssXVGjUweVU+guxOI+lzD3ANr96w=";
};
patches = [ ./no-launch4j.patch ./make-deterministic.patch ];
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "tui-journal";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "AmmarAbouZor";
repo = "tui-journal";
rev = "v${version}";
hash = "sha256-uZjepaNFZCjCOnLwATP6fqza7p+Fvu/8egPRXgTkzDs=";
hash = "sha256-0qedRXjuISJst6cZ7rwz/4a935XsBMSzGN8JrzBKjeQ=";
};
cargoHash = "sha256-MFo5e2tmhYvSUgrAA8RS4MnEXMvrY7xGiVrsT+2NWsk=";
cargoHash = "sha256-d79NTaW0zs8g62EKqiphWEdgYEnLeRk4NFog0rivr3s=";
nativeBuildInputs = [
pkg-config
@@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec {
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Security
];
@@ -943,6 +943,15 @@
"spdx": "MPL-2.0",
"vendorHash": "sha256-LWyfkhyTr6xHtt8nCdqid/zKwGerYVxSEpqSe853S9w="
},
"porkbun": {
"hash": "sha256-YWUccesHNy8mdP5iWtXP1macOLGRKqqla6dWGYihJAo=",
"homepage": "https://registry.terraform.io/providers/cullenmcdermott/porkbun",
"owner": "cullenmcdermott",
"repo": "terraform-provider-porkbun",
"rev": "v0.2.5",
"spdx": "MPL-2.0",
"vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ="
},
"postgresql": {
"hash": "sha256-r1Im4bhAakBe0PoDTpiQWPfnoFBtMCrAyL7qBa1yTQc=",
"homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql",
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "zarf";
version = "0.31.0";
version = "0.32.0";
src = fetchFromGitHub {
owner = "defenseunicorns";
repo = "zarf";
rev = "v${version}";
hash = "sha256-E/M0GliZwe8aDZDtuCea5II452Zy9pD+9MmYFSkmjE8=";
hash = "sha256-ijEzPY5J/qqMxhGkbiY5r4JnFNSiT+Sl5NZ7qV1qQwo=";
};
vendorHash = "sha256-VmukCrEl2hldN0kBgDycp/junmXCZsH+utNJGNjodW0=";
vendorHash = "sha256-UDfeARPIade3Gal7NETXexvYYKQmx4gr69PmUjtdSJQ=";
proxyVendor = true;
preBuild = ''
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20231211";
version = "20240103-1";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-L8yfuaM/gyRknIM/ER0DfAZj6X9G0rAVVvAE9MtYF0g=";
hash = "sha256-KWfZTtSx1fBBVRpmmksfea+T1YsY3BJCFClGstzdvdQ=";
};
postPatch = ''
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cvc5";
version = "1.0.9";
version = "1.1.0";
src = fetchFromGitHub {
owner = "cvc5";
repo = "cvc5";
rev = "cvc5-${version}";
hash = "sha256-AwUQHFftn51Xt6HtmDsWAdkOS8i64r2FhaHu31KYwZA=";
hash = "sha256-BWmIxQz+if402f7zsFROWG1TXbcsg50FJbnffJFYun4=";
};
nativeBuildInputs = [ pkg-config cmake flex ];
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "uarmsolver";
version = "0.2.5";
version = "0.2.6";
src = fetchFromGitHub {
owner = "firefly-cpp";
repo = "uARMSolver";
rev = version;
sha256 = "sha256-t5Nep99dH/TvJzI9woLSuBrAWSqXZvLncXl7/43Z7sA=";
sha256 = "sha256-E8hc7qoIDaNERMUhVlh+iBvQX1odzd/szeMSh8TCNFo=";
};
nativeBuildInputs = [ cmake ];
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "tulip";
version = "5.7.2";
version = "5.7.3";
src = fetchurl {
url = "mirror://sourceforge/auber/tulip-${version}_src.tar.gz";
hash = "sha256-b+XFCS6Ks+EpwxgYFzWdRomfCpHXmZHXnrQM+ZSLN/0=";
hash = "sha256-arpC+FsDYGMf47phtSzyjjvDg/UYZS+akOe5CYfajdU=";
};
nativeBuildInputs = [ cmake wrapQtAppsHook ]
@@ -20,8 +20,12 @@ stdenv.mkDerivation rec {
qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ];
# error: format string is not a string literal (potentially insecure)
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-format-security";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [
# fatal error: 'Python.h' file not found
"-I${python3}/include/${python3.libPrefix}"
# error: format string is not a string literal (potentially insecure)
"-Wno-format-security"
]);
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
doCheck = false;
@@ -12,7 +12,7 @@
let
pname = "gfold";
version = "4.4.0";
version = "4.4.1";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage {
owner = "nickgerace";
repo = pname;
rev = version;
sha256 = "sha256-2rBKf7+brd2NbukJYmeRpn7skxrLbMGYC9+VLqmdFfw=";
sha256 = "sha256-KKuWPitm7oD2mXPSu2rbOyzwJ9JJ23LBQIIkkPHm1w4=";
};
cargoHash = "sha256-7yPKZJKJF/ISfYfqpWLMApcNHqv3aFXL1a/cGtmbMVg=";
cargoHash = "sha256-wDUOYK9e0i600UnJ0w0FPI2GhTa/QTq/2+ICiDWrmEU=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitmux";
version = "0.10.3";
version = "0.10.4";
src = fetchFromGitHub {
owner = "arl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BvjBEhu6696DkT4GEg2gYTovZEnRosnBD3kzym536e0=";
sha256 = "sha256-toEKWkyCmeoG6eVK19RKipCqHM7OhZrkWRHNAclFgoI=";
};
vendorHash = "sha256-PHY020MIuLlC1LqNGyBJRNd7J+SzoHbNMPAil7CKP/M=";
@@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
version = "1.0.0-beta.7";
version = "1.0.0-beta.8";
src = fetchCrate {
inherit version pname;
hash = "sha256-BXDz9po8i937/xYoIW4S/FddtcWxSmtRUWYIphgh060=";
hash = "sha256-BQic+E+SOfZYHJcYMaUmfjlIfop0YcVcASSjtnRtwD4=";
};
cargoHash = "sha256-+KF1G4bDfcjHHzZR93lIR8muO6s3j5jDobr3A7Arr+Q=";
cargoHash = "sha256-D5P9pizerJiZK4UhCKEY1DXvaBMiWBXGu6Azlv6AjQA=";
doCheck = false;
nativeBuildInputs = [ installShellFiles pkg-config ];
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "flowblade";
version = "2.12";
version = "2.12.0.2";
src = fetchFromGitHub {
owner = "jliljebl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HVDyrEgQ5Lgqpagh+DEb4BjoByJz6VdE/NWMCX1mabU=";
sha256 = "sha256-SZ/J03PYeAbqQlNQXdqLSduo/5VjQ7VH4eErJqO3Ua0=";
};
buildInputs = [
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "youki";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XoHGRCGLEG/a6gb+3ejYoeOuIml64U/p6CcxsFLoTWY=";
sha256 = "sha256-BZhg4VhJbAo6XO4w01zguodyr3KEbav+PON0aOmi2bI=";
};
nativeBuildInputs = [ pkg-config installShellFiles ];
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p" "youki" ];
cargoTestFlags = [ "-p" "youki" ];
cargoHash = "sha256-L5IhOPo8BDQAvaSs3IJzJHN0TbgmUcEyv60IDLN4kn0=";
cargoHash = "sha256-IkL0gS3hht1XBnOy0YHO02vfw4sljtwfNImfojiLIE4=";
meta = with lib; {
description = "A container runtime written in Rust";
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "miriway";
version = "unstable-2023-11-22";
version = "unstable-2024-01-01";
src = fetchFromGitHub {
owner = "Miriway";
repo = "Miriway";
rev = "7d324c3d890b745a1d470ce085d91aaedf0fc6cf";
hash = "sha256-/pA24HSDco2uavIKb7t5DfGHwO7E/NANvLUMwZqnpQY=";
rev = "58fac84a9c3a049d2e71ffc125e157a906897aa8";
hash = "sha256-Tx+BWaiFHJ54K2eHbHVnkePV+YIktGFWbs/rLoNINPY=";
};
strictDeps = true;
+7 -7
View File
@@ -3,6 +3,13 @@
{ buildPackages, runCommand, lib, substituteAll }:
let
builder = substituteAll {
src = ./builder.pl;
inherit (builtins) storeDir;
};
in
lib.makeOverridable
({ name
@@ -43,13 +50,6 @@ lib.makeOverridable
, meta ? {}
}:
let
builder = substituteAll {
src = ./builder.pl;
inherit (builtins) storeDir;
};
in
runCommand name
rec {
inherit manifest ignoreCollisions checkCollisionContents passthru
File diff suppressed because it is too large Load Diff
+97
View File
@@ -0,0 +1,97 @@
{
lib,
stdenv,
fetchFromGitHub,
rust,
rustPlatform,
cmake,
makeBinaryWrapper,
cosmic-icons,
just,
pkg-config,
libxkbcommon,
glib,
gtk3,
libinput,
fontconfig,
freetype,
wayland,
xorg
}:
rustPlatform.buildRustPackage rec {
pname = "cosmic-term";
version = "unstable-2023-12-26";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "bf3f507fdd73a06ab1f9b199a98dca6988aafec2";
hash = "sha256-c5RNrC0AZvz+O3nj7VvMQuA/U0sgxZCVHn+cc+4pIN8=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"cosmic-config-0.1.0" = "sha256-V371fmSmLIwUxtx6w+C55cBJ8oyYgN86r3FZ8rGBLEs=";
"cosmic-text-0.10.0" = "sha256-/4Hg+7R0LRF4paXIREkMOTtbQ1xgONym5nKb/TuyeD4=";
"glyphon-0.3.0" = "sha256-T7hvqtR3zi9wNemFrPPGakq2vEraLpnPkN7umtumwVg=";
"sctk-adwaita-0.5.4" = "sha256-yK0F2w/0nxyKrSiHZbx7+aPNY2vlFs7s8nu/COp2KqQ=";
"softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k=";
"smithay-client-toolkit-0.16.1" = "sha256-z7EZThbh7YmKzAACv181zaEZmWxTrMkFRzP0nfsHK6c=";
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
"winit-0.28.6" = "sha256-FhW6d2XnXCGJUMoT9EMQew9/OPXiehy/JraeCiVd76M=";
};
};
postPatch = ''
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
'';
nativeBuildInputs = [
cmake
just
pkg-config
makeBinaryWrapper
];
buildInputs = [
libxkbcommon
xorg.libX11
libinput
fontconfig
freetype
wayland
glib
gtk3
];
dontUseJustBuild = true;
justFlags = [
"--set"
"prefix"
(placeholder "out")
"--set"
"bin-src"
"target/${
rust.lib.toRustTargetSpecShort stdenv.hostPlatform
}/release/cosmic-term"
];
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
postInstall = ''
wrapProgram "$out/bin/${pname}" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 wayland libxkbcommon ]}
'';
meta = with lib; {
homepage = "https://github.com/pop-os/cosmic-term";
description = "Terminal for the COSMIC Desktop Environment";
license = licenses.gpl3Only;
maintainers = with maintainers; [ ahoneybun ];
platforms = platforms.linux;
};
}
+27
View File
@@ -0,0 +1,27 @@
{ stdenv, lib, fetchFromGitHub, python3 }:
stdenv.mkDerivation {
pname = "encled";
version = "unstable-2022-07-23";
src = fetchFromGitHub {
owner = "amarao";
repo = "sdled";
rev = "60fd6c728112f2f1feb317355bdb1faf9d2f76da";
sha256 = "1qygzjzsv305662317435nsc6r15k7r6qidp48lgspvy9x5xli73";
};
buildInputs = [ python3 ];
dontBuild = true;
installPhase = ''
install -Dm0755 -t $out/bin/ encled
install -Dm0644 -t $out/share/man/man8 encled.8
'';
meta = {
description = "Control fault/locate indicators in disk slots in enclosures";
homepage = "https://github.com/amarao/sdled";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.lheckemann ];
};
}
@@ -1,18 +1,30 @@
{ lib, stdenv, buildGoModule, fetchFromGitea, nixosTests }:
{ lib, stdenv, buildGoModule, fetchFromGitea, mandoc, tup, nixosTests }:
buildGoModule rec {
pname = "eris-go";
version = "20230914";
version = "20231219";
outputs = [ "out" "man" ];
src = fetchFromGitea {
domain = "codeberg.org";
owner = "eris";
repo = "eris-go";
rev = version;
hash = "sha256-7aEsCQ+bZ//6Z+XXAEHgsAd61L+QgRl77+UtHr/BM1g=";
hash = "sha256-eXLfBkJgG51ZjR1qXRE2BgTrIpQsPW5SKeMlGd3J1NE=";
};
vendorHash = "sha256-Z6rirsiiBzH0herQAkxZp1Xr++489qNoiD4fqoLt9/A=";
vendorHash = "sha256-pA/fz7JpDwdTRFfLDY0M6p9TeBOK68byhy/0Cw53p4M=";
nativeBuildInputs = [ mandoc tup ];
postConfigure = ''
rm -f *.md
tupConfigure
'';
postBuild = "tupBuild";
postInstall = ''
install -D *.1.man -t $man/share/man/man1
'';
skipNetworkTests = true;
+40
View File
@@ -0,0 +1,40 @@
{ lib, fetchFromGitHub, cmake, stdenv, nix-update-script }:
stdenv.mkDerivation rec {
pname = "espresso";
version = "2.4";
src = fetchFromGitHub {
owner = "chipsalliance";
repo = "espresso";
rev = "v${version}";
hash = "sha256-z5By57VbmIt4sgRgvECnLbZklnDDWUA6fyvWVyXUzsI=";
};
nativeBuildInputs = [ cmake ];
doCheck = true;
outputs = [ "out" "man" ];
passthru.updateScript = nix-update-script { };
meta = with lib;{
description = "Multi-valued PLA minimization";
# from manual
longDescription = ''
Espresso takes as input a two-level representation of a
two-valued (or multiple-valued) Boolean function, and produces a
minimal equivalent representation. The algorithms used are new and
represent an advance in both speed and optimality of solution in
heuristic Boolean minimization.
'';
homepage = "https://github.com/chipsalliance/espresso";
maintainers = with maintainers;[ pineapplehunter ];
mainProgram = "espresso";
platforms = lib.platforms.all;
# The license is not provided in the GitHub repo,
# so until there's an update on the license, it is marked as unfree.
# See: https://github.com/chipsalliance/espresso/issues/4
license = licenses.unfree;
};
}
@@ -1,6 +1,7 @@
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
, acl
, cowsql
, hwdata
@@ -27,6 +28,14 @@ buildGoModule rec {
vendorHash = "sha256-YfUvkN1qUS3FFKb1wysg40WcJA8fT9SGDChSdT+xnkc=";
patches = [
# remove with > 0.4.0
(fetchpatch {
url = "https://github.com/lxc/incus/commit/c0200b455a1468685d762649120ce7e2bb25adc9.patch";
hash = "sha256-4fiSv6GcsKpdLh3iNbw3AGuDzcw1EadUvxtSjxRjtTA=";
})
];
postPatch = ''
substituteInPlace internal/usbid/load.go \
--replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids"
@@ -77,9 +86,15 @@ buildGoModule rec {
'';
postInstall = ''
# use custom bash completion as it has extra logic for e.g. instance names
installShellCompletion --bash --name incus ./scripts/bash/incus
installShellCompletion --cmd incus \
--fish <($out/bin/incus completion fish) \
--zsh <($out/bin/incus completion zsh)
'';
passthru = {
tests.incus = nixosTests.incus;
@@ -1,6 +1,8 @@
{ lib
, fetchFromGitHub
, rustPlatform
, stdenv
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
@@ -16,10 +18,21 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-DiorrgTH9lIdmaZL7451uCXj9X7M6eHf4MQc85MpU7s=";
nativeBuildInputs = [
installShellFiles
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd lutgen \
--bash <($out/bin/lutgen completions bash) \
--fish <($out/bin/lutgen completions fish) \
--zsh <($out/bin/lutgen completions zsh)
'';
meta = with lib; {
description = "A blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes";
homepage = "https://github.com/ozwaldorf/lutgen-rs";
maintainers = with maintainers; [ zzzsy ];
maintainers = with maintainers; [ zzzsy donovanglover ];
mainProgram = "lutgen";
license = licenses.mit;
};
+37
View File
@@ -0,0 +1,37 @@
{ lib
, stdenvNoCC
, fetchurl
, unzip
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "maccy";
version = "0.28.0";
src = fetchurl {
url = "https://github.com/p0deje/Maccy/releases/download/${finalAttrs.version}/Maccy.app.zip";
hash = "sha256-dxjt5skIHN6VlkWpcmj+ZSovVARuQETKoyKMkMtUhHQ=";
};
dontUnpack = true;
nativeBuildInputs = [ unzip ];
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
unzip -d $out/Applications $src
runHook postInstall
'';
meta = with lib; {
description = "Simple clipboard manager for macOS";
homepage = "https://maccy.app";
license = licenses.mit;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ emilytrau Enzime ];
platforms = platforms.darwin;
};
})
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "minetest-mapserver";
version = "4.7.0";
version = "4.8.0";
src = fetchFromGitHub {
owner = pname;
repo = "mapserver";
rev = "v${version}";
hash = "sha256-qThdNXb17mh3Ph57d3oUl/KhP64AKPZJOCVsvr2SDWk=";
hash = "sha256-MKWC8m+7QN1gq+jmUqsadX+OKRF3/jVdoYTuaODCOtM=";
};
vendorHash = "sha256-VSyzdiPNcHDH/ebM2A0pTAyiMblMaJGEIULsIzupmaw=";
vendorHash = "sha256-q8l0wFXsR32dznB0oYiG9K/2+YQx6kOGtSSnznXLr5E=";
meta = with lib; {
description = "Realtime mapserver for minetest";
+45
View File
@@ -0,0 +1,45 @@
{ lib
, stdenv
, fetchFromGitHub
, elfutils
, pcre
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mkbootimage";
version = "2.3-unstable-2022-05-26";
src = fetchFromGitHub {
owner = "antmicro";
repo = "zynq-mkbootimage";
rev = "872363ce32c249f8278cf107bc6d3bdeb38d849f";
hash = "sha256-5FPyAhUWZDwHbqmp9J2ZXTmjaXPz+dzrJMolaNwADHs=";
};
# Using elfutils because libelf is being discontinued
# See https://github.com/NixOS/nixpkgs/pull/271568
buildInputs = [ elfutils pcre ];
postPatch = ''
substituteInPlace Makefile --replace "git rev-parse --short HEAD" "echo ${finalAttrs.src.rev}"
'';
installPhase = ''
runHook preInstall
install -Dm755 mkbootimage -t $out/bin
runHook postInstall
'';
hardeningDisable = [ "fortify" ];
meta = with lib; {
description = "An open source replacement of the Xilinx bootgen application";
homepage = "https://github.com/antmicro/zynq-mkbootimage";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.fsagbuya ];
mainProgram = "mkbootimage";
};
})
+3
View File
@@ -8,6 +8,7 @@
, ncurses
, sqlite
, yajl
, nix-update-script
}:
stdenv.mkDerivation (finalAttrs: {
@@ -27,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [ "PREFIX=$(out)" ];
passthru.updateScript = nix-update-script {};
meta = with lib; {
description = "Feed reader for terminal";
homepage = "https://codeberg.org/grisha/newsraft";
+3 -3
View File
@@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "promptfoo";
version = "0.28.0";
version = "0.33.2";
src = fetchFromGitHub {
owner = "promptfoo";
repo = "promptfoo";
rev = "${version}";
hash = "sha256-fJZeao5/iTF1QTSdhUT4VurH0witOAVs0NT2sb2McYM=";
hash = "sha256-FzjPP7Xwz5jhtXSYxXAx3w428YGBrGgXwpwen10jaDQ=";
};
npmDepsHash = "sha256-IcMD8t+2Z2RwQ87j08zNQWlNhtRqDi2cD60ZPEAezww=";
npmDepsHash = "sha256-vEK2it8WZfzNi6wO1/DQTJjWW3+OhN1+ob5Qi1MQu5s=";
dontNpmBuild = true;
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "prr";
version = "0.11.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "danobi";
repo = pname;
rev = "v${version}";
hash = "sha256-mPFnMoYlOU0oJcasrCEHO+Ze1YuwJ0ap7+p2Fs75pcY=";
hash = "sha256-aEugpAa1W7iBMQDojs38mYH8xZ/VMd47Bv3toFQhTSs=";
};
cargoHash = "sha256-HDNJ17SB9XdqDAAmEBJz/P52/QJcuV6sVsgxBVWKIRg=";
cargoHash = "sha256-+CrBsQFOfw8vCafk66Wmatcf2t5gu4gEXAKjxvvPgEg=";
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
+48
View File
@@ -0,0 +1,48 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, openssl
, darwin
, pkg-config
, testers
, fetchzip
, ripunzip
}:
rustPlatform.buildRustPackage rec {
pname = "ripunzip";
version = "1.1.0";
src = fetchFromGitHub {
owner = "google";
repo = "ripunzip";
rev = "v${version}";
hash = "sha256-GyP4OPnPKhu9nXYXIfWCVLF/thwWiP0OqAQY/1D05LE=";
};
cargoHash = "sha256-Jv9bCHT5xl/2CPnSuWd9HZuaGOttBC5iAbbpr3jaIhM=";
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
nativeBuildInputs = [ pkg-config ];
setupHook = ./setup-hook.sh;
passthru.tests = {
fetchzipWithRipunzip = testers.invalidateFetcherByDrvHash (fetchzip.override { unzip = ripunzip; }) {
url = "https://github.com/google/ripunzip/archive/cb9caa3ba4b0e27a85e165be64c40f1f6dfcc085.zip";
hash = "sha256-BoErC5VL3Vpvkx6xJq6J+eUJrBnjVEdTuSo7zh98Jy4=";
};
version = testers.testVersion {
package = ripunzip;
};
};
meta = with lib; {
description = "A tool to unzip files in parallel";
homepage = "https://github.com/google/ripunzip";
license = with lib.licenses; [ mit asl20 ];
maintainers = [ maintainers.lesuisse ];
};
}
+6
View File
@@ -0,0 +1,6 @@
unpackCmdHooks+=(_tryRipunzip)
_tryRipunzip() {
if ! [[ "$curSrc" =~ \.zip$ ]]; then return 1; fi
ripunzip unzip-file "$curSrc" 2> /dev/null
}
@@ -1,8 +1,6 @@
#!/bin/sh
tupConfigurePhase() {
runHook preConfigure
tupConfigure() {
echo -n CONFIG_TUP_ARCH= >> tup.config
case "$system" in
"i686-*") echo i386 >> tup.config;;
@@ -20,7 +18,11 @@ tupConfigurePhase() {
tup init
tup generate --verbose tupBuild.sh
}
tupConfigurePhase() {
runHook preConfigure
tupConfigure
runHook postConfigure
}
@@ -28,14 +30,15 @@ if [ -z "${dontUseTupConfigure-}" -a -z "${configurePhase-}" ]; then
configurePhase=tupConfigurePhase
fi
tupBuildPhase() {
runHook preBuild
tupBuild() {
pushd .
./tupBuild.sh
popd
}
tupBuildPhase() {
runHook preBuild
tupBuild
runHook postBuild
}
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "valijson";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "tristanpenman";
repo = "valijson";
rev = "v${version}";
hash = "sha256-COVFBZtuTd1nyI/25feUYCurBwPlQV3qbxSSkn6aLl4=";
hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo=";
};
nativeBuildInputs = [
@@ -1,52 +1,38 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, rustPlatform
, cmake
, pkg-config
, openssl
, oniguruma
, CoreServices
, darwin
, installShellFiles
, libsass
, zola
, testers
}:
rustPlatform.buildRustPackage rec {
pname = "zola";
version = "0.17.2";
version = "0.18.0";
src = fetchFromGitHub {
owner = "getzola";
repo = "zola";
rev = "v${version}";
hash = "sha256-br7VpxkVMZ/TgwMaFbnVMOw9RemNjur/UYnloMoDzHs=";
hash = "sha256-kNlFmCqWEfU2ktAMxXNKe6dmAV25voHjHYaovBYsOu8=";
};
cargoHash = "sha256-AAub8UwAvX3zNX+SM/T9biyNxFTgfqUQG/MUGfwWuno=";
patches = [
(fetchpatch {
name = "CVE-2023-40274.patch";
url = "https://github.com/getzola/zola/commit/fe1967fb0fe063b1cee1ad48820870ab2ecc0e5b.patch";
hash = "sha256-B/SVGhVX5hAbvMhBYO+mU5+xdZXU2JyS4uKmOj+aZuI=";
})
];
cargoHash = "sha256-JWYuolHh/qdWF+i6WTgz/uDrkQ6V+SDFhEzGGkUA0E4=";
nativeBuildInputs = [
cmake
pkg-config
installShellFiles
];
buildInputs = [
openssl
oniguruma
libsass
] ++ lib.optionals stdenv.isDarwin [
CoreServices
];
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreServices SystemConfiguration
]);
RUSTONIG_SYSTEM_LIBONIG = true;
+3 -3
View File
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "zwave-js-server";
version = "1.33.0";
version = "1.34.0";
src = fetchFromGitHub {
owner = "zwave-js";
repo = pname;
rev = version;
hash = "sha256-Lll3yE1v4ybJTjKO8dhPXMD/3VCn+9+fpnN7XczqaE4=";
hash = "sha256-aTUV9FYE4m/f7rGv7BBFNzCVQpSO9vK1QkeofnMnbzM=";
};
npmDepsHash = "sha256-Re9fo+9+Z/+UGyDPlNWelH/4tLxcITPYXOCddQE9YDY=";
npmDepsHash = "sha256-Jne4vzPcNNfHO1LQa609Jdv22Nh3md9KfBXuQoILpbY=";
# For some reason the zwave-js dependency is in devDependencies
npmFlags = [ "--include=dev" ];
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "aspectj";
version = "1.9.20.1";
version = "1.9.21";
builder = ./builder.sh;
src = let
versionSnakeCase = builtins.replaceStrings ["."] ["_"] version;
in fetchurl {
url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar";
sha256 = "sha256-nzeDi1WdnIZ5DFxpZFSB/4c6FgV7wRQyO1uxRlaTZBY=";
sha256 = "sha256-/cdfEpUrK39ssVualCKWdGhpymIhq7y2oRxYJAENhU0=";
};
inherit jre;
+6 -6
View File
@@ -1,24 +1,24 @@
let version = "3.2.0"; in
let version = "3.2.4"; in
{ fetchurl }: {
versionUsed = version;
"${version}-x86_64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
sha256 = "0a1mbi2si0ww9b96hx633xviwrbqk4skf7gxs0h95npw2cf6n9kd";
sha256 = "107sq5m684mxw5k21zfs3iyihzbqkfmh0vpj17qca19rghnxgn02";
};
"${version}-aarch64-darwin" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
sha256 = "0yhmhvfq8w6l8q5ahlxk5qbr3ji319snb8ghpi6y7px2pfbv5gwr";
sha256 = "08jbcdm5li30xdy85whdah186g0yiasgl12h6vi1vgld15ifjsab";
};
"${version}-aarch64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
sha256 = "052vz5zjjwjbww81qws3vyj39wkw2i9mqqs8fcifzgzbfdyc8lb0";
sha256 = "0f40riqcdnjwjnv6si5186h6akrnhnwqrfrgfvm4y0gpblw88c2s";
};
"${version}-x86_64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "0wvpyjpvyaasazjmizb0ha3p70q3rhqpqq8bzl1bv9jrsgcniqsf";
sha256 = "1bkrfg3xzkc4zrbl5ialg5jwpb7l0xmrd9aj7x5kwz2v8n8w013n";
};
"${version}-i686-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "1z187sl652fzkp3nf044snjh09svnvmlxh0ribzf3b955a40l8cd";
sha256 = "0jddia0s7byl7p6qbljp444qs11r8ff58s5fbchcrsmkry3pg8gi";
};
}
@@ -158,7 +158,7 @@ in let
[
./lldb/procfs.patch
resourceDirPatch
./lldb/gnu-install-dirs.patch
../common/lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
@@ -157,7 +157,7 @@ in let
[
./lldb/procfs.patch
resourceDirPatch
./lldb/gnu-install-dirs.patch
../common/lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
@@ -1,23 +0,0 @@
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
index 3291a7c808e1..b27d27ce6a87 100644
--- a/cmake/modules/AddLLDB.cmake
+++ b/cmake/modules/AddLLDB.cmake
@@ -109,7 +109,7 @@ function(add_lldb_library name)
endif()
if(PARAM_SHARED)
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
if(PARAM_INSTALL_PREFIX)
set(install_dest ${PARAM_INSTALL_PREFIX})
endif()
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
index 7d48491ec89a..c04543585588 100644
--- a/tools/intel-features/CMakeLists.txt
+++ b/tools/intel-features/CMakeLists.txt
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
)
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
@@ -162,7 +162,7 @@ in let
[
# FIXME: do we need this? ./procfs.patch
resourceDirPatch
./lldb/gnu-install-dirs.patch
../common/lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
@@ -1,23 +0,0 @@
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
index 3291a7c808e1..b27d27ce6a87 100644
--- a/cmake/modules/AddLLDB.cmake
+++ b/cmake/modules/AddLLDB.cmake
@@ -109,7 +109,7 @@ function(add_lldb_library name)
endif()
if(PARAM_SHARED)
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
if(PARAM_INSTALL_PREFIX)
set(install_dest ${PARAM_INSTALL_PREFIX})
endif()
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
index 7d48491ec89a..c04543585588 100644
--- a/tools/intel-features/CMakeLists.txt
+++ b/tools/intel-features/CMakeLists.txt
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
)
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
@@ -153,7 +153,7 @@ in let
patches =
[
# FIXME: do we need this? ./procfs.patch
./lldb/gnu-install-dirs.patch
../common/lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
@@ -1,23 +0,0 @@
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
index 3291a7c808e1..b27d27ce6a87 100644
--- a/cmake/modules/AddLLDB.cmake
+++ b/cmake/modules/AddLLDB.cmake
@@ -109,7 +109,7 @@ function(add_lldb_library name)
endif()
if(PARAM_SHARED)
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
if(PARAM_INSTALL_PREFIX)
set(install_dest ${PARAM_INSTALL_PREFIX})
endif()
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
index 7d48491ec89a..c04543585588 100644
--- a/tools/intel-features/CMakeLists.txt
+++ b/tools/intel-features/CMakeLists.txt
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
)
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
@@ -69,6 +69,11 @@ stdenv.mkDerivation (rec {
libedit
libxml2
libllvm
] ++ lib.optionals (lib.versionAtLeast release_version "16") [
# Starting with LLVM 16, the resource dir patch is no longer enough to get
# libclang into the rpath of the lldb executables. By putting it into
# buildInputs cc-wrapper will set up rpath correctly for us.
(lib.getLib libclang)
] ++ lib.optionals stdenv.isDarwin [
darwin.libobjc
darwin.apple_sdk.libs.xpc
@@ -158,7 +158,7 @@ in let
patches =
[
# FIXME: do we need this? ./procfs.patch
./lldb/gnu-install-dirs.patch
../common/lldb/gnu-install-dirs.patch
]
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
@@ -1,23 +0,0 @@
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
index 3291a7c808e1..b27d27ce6a87 100644
--- a/cmake/modules/AddLLDB.cmake
+++ b/cmake/modules/AddLLDB.cmake
@@ -109,7 +109,7 @@ function(add_lldb_library name)
endif()
if(PARAM_SHARED)
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
if(PARAM_INSTALL_PREFIX)
set(install_dest ${PARAM_INSTALL_PREFIX})
endif()
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
index 7d48491ec89a..c04543585588 100644
--- a/tools/intel-features/CMakeLists.txt
+++ b/tools/intel-features/CMakeLists.txt
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
)
install(TARGETS lldbIntelFeatures
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "wazero";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "tetratelabs";
repo = "wazero";
rev = "v${version}";
hash = "sha256-iUPAVOmZNX4qs7bHu9dXtQP/G8FwyblJvZ3pauA9ev0=";
hash = "sha256-s01NoliiS8SqoHUjEUUsFcK82nt3xQgmAQZdrEtrOS0=";
};
vendorHash = null;
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cpp-utilities";
version = "5.24.4";
version = "5.24.5";
src = fetchFromGitHub {
owner = "Martchus";
repo = "cpp-utilities";
rev = "v${finalAttrs.version}";
sha256 = "sha256-YQNnf/DAtc58OwOWa2SBijIDpuhqWxFZHZCXLJ8PstI=";
sha256 = "sha256-bU1rVEwM+VDMviuTOsX4V9/BdZTPqzwW7b/KjPmlPeE=";
};
nativeBuildInputs = [ cmake ];
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "eccodes";
version = "2.32.1";
version = "2.33.0";
src = fetchurl {
url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
sha256 = "sha256-rSrBvzZXex01xKdxtNF0oG9SKh5e9sH15Tp5X7Ykhj4=";
sha256 = "sha256-vc7IzmNlTsaANADFB/ASIKmqQDpF+mtb3/f9zET9fa8=";
};
postPatch = ''
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = lib.optional (stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=OFF"
# fastcdr doesn't respect BUILD_TESTING
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "-DEPROSIMA_BUILD_TESTS=ON"
# upstream turns BUILD_TESTING=OFF by default and doesn't honor cmake's default (=ON)
++ lib.optional (finalAttrs.finalPackage.doCheck) "-DBUILD_TESTING=ON"
++ lib.optional withDocs "-DBUILD_DOCUMENTATION=ON";
outputs = [ "out" ] ++ lib.optional withDocs "doc";
@@ -29,12 +29,13 @@ stdenv.mkDerivation rec {
let
libSuff = stdenv.hostPlatform.extensions.sharedLibrary;
soVersion = "3";
libName = if stdenv.isDarwin then "libsvm.${soVersion}${libSuff}" else "libsvm${libSuff}.${soVersion}";
in
''
runHook preInstall
install -D libsvm.so.${soVersion} $out/lib/libsvm.${soVersion}${libSuff}
ln -s $out/lib/libsvm.${soVersion}${libSuff} $out/lib/libsvm${libSuff}
install -D libsvm.so.${soVersion} $out/lib/${libName}
ln -s $out/lib/${libName} $out/lib/libsvm${libSuff}
install -Dt $bin/bin/ svm-scale svm-train svm-predict
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wcslib";
version = "8.1";
version = "8.2.2";
src = fetchurl {
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
sha256 = "sha256-K/I+b6vRC4rs/6VEMb8lqiJP8BnGCp5naqVlYfm0Ep4=";
sha256 = "sha256-YpgiCugX9OVSJkOsTD2iYjvnCjSEsaTzcGC+4+S9eDM=";
};
nativeBuildInputs = [ flex ];
+6 -1
View File
@@ -4,9 +4,12 @@
, sqlite
, postgresql
, boost
, darwin
, lib, stdenv
}:
let
inherit (darwin.apple_sdk_11_0.frameworks) Kerberos;
in
stdenv.mkDerivation rec {
pname = "soci";
version = "4.0.2";
@@ -34,6 +37,8 @@ stdenv.mkDerivation rec {
sqlite
postgresql
boost
] ++ lib.optionals stdenv.isDarwin [
Kerberos
];
meta = with lib; {
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "vcg";
version = "2022.02";
version = "2023.12";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "vcglib";
rev = version;
sha256 = "sha256-XCjbVlgE0C9UagPj4fraA7BNsM6ONKo66aKQ87gQOfE=";
sha256 = "sha256-U3pu1k2pCH+G4CtacaDQ9SgkFX5A9/O/qrdpgWvB1+U=";
};
propagatedBuildInputs = [ eigen ];
+2 -2
View File
@@ -7,13 +7,13 @@
}:
stdenv.mkDerivation rec {
pname = "xtl";
version = "0.7.5";
version = "0.7.7";
src = fetchFromGitHub {
owner = "xtensor-stack";
repo = "xtl";
rev = version;
hash = "sha256-Vc1VKOWmG1sAw3UQpNJAhm9PvXSqJ0iO2qLjP6/xjtI=";
hash = "sha256-f8qYh8ibC/ToHsUv3OF1ujzt3fUe7kW9cNpGyLqsgqw=";
};
nativeBuildInputs = [ cmake ];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "aiokafka";
version = "0.8.1";
version = "0.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "aio-libs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-O5cDP0PWFrxNSdwWqUUkErUKf1Tt9agKJqWIjd4jGqk=";
hash = "sha256-G9Q77nWUUW+hG/wm9z/S8gea4U1wHZdj7WdK2LsKBos=";
};
nativeBuildInputs = [
@@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
# build-system
, setuptools
# dependencies
, dpkt
# tests
, mock
, pytestCheckHook
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "aiortsp";
version = "1.3.7";
pyproject = true;
src = fetchFromGitHub {
owner = "marss";
repo = "aiortsp";
rev = version;
hash = "sha256-bxfnKAzMYh0lhS3he617eGhO7hmNbiwEYHh8k/PZ6r4=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
dpkt
];
nativeCheckInputs = [
mock
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [
"aiortsp"
];
meta = with lib; {
description = "An Asyncio-based RTSP library";
homepage = "https://github.com/marss/aiortsp";
changelog = "https://github.com/marss/aiortsp/blob/${src.rev}/CHANGELOG.rst";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ hexa ];
};
}
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "6.1.0";
version = "7.0.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-LkcUcGx31GwrbmBWCyEuD5x9yzeszUHBCYSBgTzgz9A=";
hash = "sha256-+sE/nppRu6XTvXzWlXc+4clLOI/KvVdfRDl9FUhy8fg=";
};
propagatedBuildInputs = [
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "apispec";
version = "6.3.0";
version = "6.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-bLCNks5z/ws79Gyy6lwA1XKJsPJ5+wJWo99GgYK6U0Q=";
hash = "sha256-s45EeZFtQ/Kx6IzhX8L66TrfLo1Vy1nsdKxmqCeUFIM=";
};
propagatedBuildInputs = [
@@ -1,22 +1,29 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
# build-system
, setuptools
# dependencies
, aiohttp
, async-timeout
, buildPythonPackage
, defusedxml
, fetchFromGitHub
, python-didl-lite
, voluptuous
# tests
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
, python-didl-lite
, pythonOlder
, voluptuous
}:
buildPythonPackage rec {
pname = "async-upnp-client";
version = "0.36.2";
format = "setuptools";
version = "0.38.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,9 +31,13 @@ buildPythonPackage rec {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = "refs/tags/${version}";
hash = "sha256-f3x5adxLHT/C5dXfdBH6stKv0y2nuhbpe8jkJex1DKU=";
hash = "sha256-hCgZsoccrHCXTZPnFX5OFhCGnd2WufxWo84jW3k9KiY=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiohttp
async-timeout
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "awacs";
version = "2.4.0";
version = "2.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-iflg6tjqFl1gWOzlJhQwGHhAQ/pKm9n8GVvUz6fSboM=";
hash = "sha256-sNo1auVjdOqHLGzbAJRrsi6c2BfD861rAIAZ46RdgEA=";
};
propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
version = "9.3.0";
version = "9.4.0";
format = "setuptools";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-02DisUN2/auBDhPgE9aUvEvYwoQUQC4NYGD/PQZOl/Y=";
hash = "sha256-yruCHNRGsJ5z0kwxwoemD8w2I0iPH/qTNcaSJn55w0E=";
};
propagatedBuildInputs = [
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "bc-python-hcl2";
version = "0.4.1";
version = "0.4.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-cqQ4zuztfS5MiY4hj1WipKunqIfB1kpM+RODcZPERrY=";
hash = "sha256-rI/1n7m9Q36im4mn18UH/QoelXhFuumurGnyiSuNaB4=";
};
# Nose is required during build process, so can not use `nativeCheckInputs`.
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.37.4";
version = "0.37.6";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
hash = "sha256-9LrgerS8yC45BKKjBWt/QQlyA6rPsL8AGOI0kFhUosk=";
hash = "sha256-S3Yf0C+KInYoDaixlJf+9WSPIcEhfQCdcwEuNQYxugU=";
};
postPatch = ''
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bluetooth-data-tools";
version = "1.18.0";
version = "1.19.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-AN0zalYQ4JQCaBDrE4tq2WwVEXz0LBlfvrxNiPL4oOs=";
hash = "sha256-G345Nz0iVUQWOCEnf5UqUa49kAXCmNY22y4v+J2/G2Q=";
};
# The project can build both an optimized cython version and an unoptimized
@@ -7,22 +7,27 @@
, pytest-error-for-skips
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "brother";
version = "2.3.0";
format = "setuptools";
version = "3.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-f55daLPBepNDIfZFAZWdkAvEkNb0cyYQt9LkqyIMrnY=";
hash = "sha256-rRzcWT9DcNTBUYxyYYC7WORBbrkgj0toCp2e8ADUN5s=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
dacite
pysnmplib
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "bugsnag";
version = "4.6.0";
version = "4.6.1";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
hash = "sha256-q+hxYDajPVkR/AHLfTRq/E8ofO3UepLNooUS/CLIN/4=";
hash = "sha256-GzpupL+wE2JJPT92O6yZNWZowo6fXzUvkuBDtKL1Hao=";
};
propagatedBuildInputs = [
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "cantools";
version = "39.4.0";
version = "39.4.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-44zzlyOIQ2qo4Zq5hb+xnCy0ANm6iCpcBww0l2KWdMs=";
hash = "sha256-gGmo9HO7FnmZC+oJA/OiLVjfVJWuu/CfWNSfYnURthk=";
};
postPatch = ''
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "command_runner";
version = "1.5.0";
version = "1.5.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-UIDzLLIm69W53jvS9M2LVclM+OqRYmLtvuXVAv54ltg=";
sha256 = "sha256-jzTckxDQxY8nIvQE3l0RTfpOH8RVIylS3YN3izr7Ns8=";
};
propagatedBuildInputs = [ psutil ];
@@ -40,14 +40,14 @@ let
in
buildPythonPackage rec {
pname = "cupy";
version = "12.2.0";
version = "12.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+V/9Cv6sthewSP4Cjt4HuX3J6VrKFhCgIrHz0gqaAn4=";
hash = "sha256-R9syEU5v3UjQUQy/Cwiwk1Ui19+j45QWsMDaORQyNSQ=";
};
# See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both
@@ -11,15 +11,15 @@
buildPythonPackage rec {
pname = "cx-freeze";
version = "6.15.11";
format = "pyproject";
version = "6.15.12";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "cx_Freeze";
inherit version;
hash = "sha256-xf5Ez5eC+qXAaMoc1d6RPv4PmY1ry82oQ9aGod+W7lY=";
hash = "sha256-Ak4OC94xD21daVdsbYSvFxO1YKJcccJ8xoCBk50cWww=";
};
nativeBuildInputs = [
@@ -35,11 +35,10 @@ buildPythonPackage rec {
postPatch = ''
# timestamp need to come after 1980 for zipfiles and nix store is set to epoch
substituteInPlace cx_Freeze/freezer.py --replace "st.st_mtime" "time.time()"
substituteInPlace cx_Freeze/freezer.py \
--replace "st.st_mtime" "time.time()"
sed -i /patchelf/d pyproject.toml
substituteInPlace pyproject.toml \
--replace 'setuptools>=61.2,<67' setuptools
'';
makeWrapperArgs = [
@@ -1,13 +1,14 @@
{ lib, buildPythonPackage, fetchPypi, odpic }:
buildPythonPackage rec {
pname = "cx_Oracle";
pname = "cx-oracle";
version = "8.3.0";
buildInputs = [ odpic ];
src = fetchPypi {
inherit pname version;
pname = "cx_Oracle";
inherit version;
sha256 = "3b2d215af4441463c97ea469b9cc307460739f89fdfa8ea222ea3518f1a424d9";
};
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "dbt-redshift";
version = "1.7.0";
version = "1.7.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "dbt-labs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-wonwDrRvfX5/0yQXL05SDLutXFAAyLmhtpI0rm01AOg=";
hash = "sha256-ONXrA8ABTYxkBm56TdFPhzjF/nngUQyecdgr2WO/5mE=";
};
nativeBuildInputs = [
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "dbus-fast";
version = "2.20.0";
version = "2.21.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-dvgexjzA/1/0p2xgjTWBQeaEKWEv/7XdhtSkyT/DN6I=";
hash = "sha256-P2Czo7XRJLDnR62eLb2lYn97nS5x6LsnYHs47+mvktQ=";
};
# The project can build both an optimized cython version and an unoptimized
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, six, requests, websocket-client, docker_pycreds }:
{ lib, buildPythonPackage, fetchPypi, six, requests, websocket-client, docker-pycreds }:
buildPythonPackage rec {
version = "1.10.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
six
requests
websocket-client
docker_pycreds
docker-pycreds
];
meta = {

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