gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-05-16 18:01:25 +00:00
committed by GitHub
parent 350d12c2fb 66cebe4330
commit 5ba1706aa5
109 changed files with 1059 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+8
View File
@@ -2986,6 +2986,14 @@
githubId = 184563;
name = "Bruno Paz";
};
brsvh = {
email = "bsc@brsvh.org";
github = "brsvh";
githubId = 63050399;
keys = [ { fingerprint = "7B74 0DB9 F2AC 6D3B 226B C530 78D7 4502 D92E 0218"; } ];
matrix = "@brsvh:mozilla.org";
name = "Burgess Chang";
};
bryanasdev000 = {
email = "bryanasdev000@gmail.com";
matrix = "@bryanasdev000:matrix.org";
nixos/doc/manual/development/settings-options.section.md
+21
View File
@@ -146,6 +146,27 @@ have a predefined type and string generator already declared under
: Outputs the given attribute set as an Elixir map, instead of the
default Elixir keyword list
`pkgs.formats.php { finalVariable }` []{#pkgs-formats-php}
: A function taking an attribute set with values
`finalVariable`
: The variable that will store generated expression (usually `config`). If set to `null`, generated expression will contain `return`.
It returns a set with PHP-Config-specific attributes `type`, `lib`, and
`generate` as specified [below](#pkgs-formats-result).
The `lib` attribute contains functions to be used in settings, for
generating special PHP values:
`mkRaw phpCode`
: Outputs the given string as raw PHP code
`mkMixedArray list set`
: Creates PHP array that contains both indexed and associative values. For example, `lib.mkMixedArray [ "hello" "world" ] { "nix" = "is-great"; }` returns `['hello', 'world', 'nix' => 'is-great']`
[]{#pkgs-formats-result}
These functions all return an attribute set with these values:
nixos/doc/manual/release-notes/rl-2405.section.md
+4
View File
@@ -254,6 +254,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information.
- `percona-server` now follows [the same two-fold release cycle](https://www.percona.com/blog/lts-and-innovation-releases-for-percona-server-for-mysql/) as Oracle MySQL and provides a *Long-Term-Support (LTS)* in parallel with a continuous-delivery *Innovation* release. `percona-server` defaults to `percona-server_lts`, will be backed by the same release branch throughout the lifetime of this stable NixOS release, and is still available under the versioned attribute `percona-server_8_0`.
The `percona-server_innovation` releases however have support periods shorter than the lifetime of this NixOS release and will continuously be updated to newer Percona releases. Note that Oracle considers the *Innovation* releases to be production-grade, but each release might include backwards-incompatible changes, even in its on-disk format.
The same release scheme is applied to the supporting `percona-xtrabackup` tool as well.
- `git-town` was updated from version 11 to 13. See the [changelog](https://github.com/git-town/git-town/blob/main/CHANGELOG.md#1300-2024-03-22) for breaking changes.
- `k9s` was updated to v0.31. There have been various breaking changes in the config file format,
nixos/modules/programs/atop.nix
+2 -2
View File
@@ -120,8 +120,8 @@ in
wantedBy = [ (if type == "services" then "multi-user.target" else if type == "timers" then "timers.target" else null) ];
};
};
mkService = lib.mkSystemd "services";
mkTimer = lib.mkSystemd "timers";
mkService = mkSystemd "services";
mkTimer = mkSystemd "timers";
in
{
packages = [ atop (lib.mkIf cfg.netatop.enable cfg.netatop.package) ];
nixos/modules/programs/virt-manager.nix
+15 -3
View File
@@ -2,15 +2,27 @@
let
cfg = config.programs.virt-manager;
in {
in
{
options.programs.virt-manager = {
enable = lib.mkEnableOption "virt-manager, an UI for managing virtual machines in libvirt";
package = lib.mkPackageOption pkgs "virt-manager" {};
package = lib.mkPackageOption pkgs "virt-manager" { };
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
programs.dconf.enable = true;
programs.dconf = {
profiles.user.databases = [
{
settings = {
"org/virt-manager/virt-manager/connections" = {
autoconnect = [ "qemu:///system" ];
uris = [ "qemu:///system" ];
};
};
}
];
};
};
}
nixos/modules/services/misc/llama-cpp.nix
-1
View File
@@ -92,7 +92,6 @@ in {
SystemCallFilter = [
"@system-service"
"~@privileged"
"~@resources"
];
SystemCallErrorNumber = "EPERM";
ProtectProc = "invisible";
nixos/modules/system/boot/binfmt.nix
+1 -1
View File
@@ -280,7 +280,7 @@ in {
};
config = {
boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.system; {
boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.stdenv.hostPlatform.system; {
name = system;
value = { config, ... }: let
interpreter = getEmulator system;
nixos/modules/virtualisation/lxc-image-metadata.nix
+2 -2
View File
@@ -87,10 +87,10 @@ in {
contents = [
{
source = toYAML "metadata.yaml" {
architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.system)) 0;
architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.stdenv.hostPlatform.system)) 0;
creation_date = 1;
properties = {
description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}";
description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.stdenv.hostPlatform.system}";
os = "${config.system.nixos.distroId}";
release = "${config.system.nixos.codeName}";
};
nixos/modules/virtualisation/qemu-vm.nix
+1 -1
View File
@@ -912,7 +912,7 @@ in
"ppc64-linux" = "tpm-spapr";
"armv7-linux" = "tpm-tis-device";
"aarch64-linux" = "tpm-tis-device";
}.${pkgs.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU"));
}.${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU"));
defaultText = ''
Based on the guest platform Linux system:
nixos/tests/installer.nix
+5 -6
View File
@@ -249,12 +249,11 @@ let
with subtest("Check whether nixos-rebuild works"):
target.succeed("nixos-rebuild switch >&2")
# FIXME: Nix 2.4 broke nixos-option, someone has to fix it.
# with subtest("Test nixos-option"):
# kernel_modules = target.succeed("nixos-option boot.initrd.kernelModules")
# assert "virtio_console" in kernel_modules
# assert "List of modules" in kernel_modules
# assert "qemu-guest.nix" in kernel_modules
with subtest("Test nixos-option"):
kernel_modules = target.succeed("nixos-option boot.initrd.kernelModules")
assert "virtio_console" in kernel_modules
assert "List of modules" in kernel_modules
assert "qemu-guest.nix" in kernel_modules
target.shutdown()
nixos/tests/mysql/common.nix
+1 -1
View File
@@ -4,7 +4,7 @@
inherit (pkgs) mysql80;
};
perconaPackages = {
inherit (pkgs) percona-server_8_0;
inherit (pkgs) percona-server_lts percona-server_innovation;
};
mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
}
nixos/tests/mysql/mysql.nix
+1 -1
View File
@@ -146,6 +146,6 @@ in
}) mariadbPackages)
// (lib.mapAttrs (_: package: makeMySQLTest {
inherit package;
name = "percona_8_0";
name = builtins.replaceStrings ["-"] ["_"] package.pname;
hasMroonga = false; useSocketAuth = false;
}) perconaPackages)
nixos/tests/stub-ld.nix
+2 -2
View File
@@ -45,10 +45,10 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
with subtest("Try FHS executable"):
machine.copy_from_host('${test-exec.${pkgs.system}}','test-exec')
machine.copy_from_host('${test-exec.${pkgs.stdenv.hostPlatform.system}}','test-exec')
machine.succeed('if test-exec/${exec-name} 2>outfile; then false; else [ $? -eq 127 ];fi')
machine.succeed('grep -qi nixos outfile')
${if32 "machine.copy_from_host('${test-exec.${pkgs32.system}}','test-exec32')"}
${if32 "machine.copy_from_host('${test-exec.${pkgs32.stdenv.hostPlatform.system}}','test-exec32')"}
${if32 "machine.succeed('if test-exec32/${exec-name} 2>outfile32; then false; else [ $? -eq 127 ];fi')"}
${if32 "machine.succeed('grep -qi nixos outfile32')"}
pkgs/applications/audio/zam-plugins/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zam-plugins";
version = "4.2";
version = "4.3";
src = fetchFromGitHub {
owner = "zamaudio";
repo = pname;
rev = version;
sha256 = "sha256-6TPZMDhGHqXjY8UYEqlr4hweF+W19IpIfSa9Bo9Ta1A=";
sha256 = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y=";
fetchSubmodules = true;
};
pkgs/applications/blockchains/bitcoin-abc/default.nix
+2 -2
View File
@@ -25,13 +25,13 @@
mkDerivation rec {
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
version = "0.29.3";
version = "0.29.4";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
hash = "sha256-hYA0O7nDT8J1EnpW4i1+eBzkNw77JC6M7GwO3BdBh3U=";
hash = "sha256-RT9sdwwF39arW2AnoQ9KnRzYqhnQhpjWU1eykTiKWSo=";
};
nativeBuildInputs = [ pkg-config cmake ];
pkgs/applications/radio/gnuradio/wrapper.nix
+1
View File
@@ -95,6 +95,7 @@ let
"--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share"
"--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share/gsettings-schemas/${unwrapped.gtk.name}"
"--prefix" "GI_TYPELIB_PATH" ":" "${lib.makeSearchPath "lib/girepository-1.0" [
(lib.getLib glib)
unwrapped.gtk
gsettings-desktop-schemas
atk
pkgs/applications/radio/qlog/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "qlog";
version = "0.35.0";
version = "0.35.1";
src = fetchFromGitHub {
owner = "foldynl";
repo = "QLog";
rev = "v${version}";
hash = "sha256-f+H1NglsNhUTbH0JOWmvERrEQEwDAIRkJCD4ELC4oA8=";
hash = "sha256-qmTep8cwNFxgvWO6tOtk+kwjhEltjJTc0Fo4o01GzIo=";
fetchSubmodules = true;
};
pkgs/by-name/ee/eepers/package.nix
+81
View File
@@ -0,0 +1,81 @@
{
lib,
stdenv,
fetchFromGitHub,
gnat,
raylib,
alsa-lib,
wayland,
}:
stdenv.mkDerivation rec {
pname = "eepers";
version = "1.3";
src = fetchFromGitHub {
owner = "tsoding";
repo = "eepers";
rev = "refs/tags/v${version}";
hash = "sha256-KG7ci327qlTtlN4yV54P8Q34ExFLJfTGMTZxN3RtZbc=";
};
postPatch = ''
substituteInPlace eepers.adb \
--replace-fail "assets/" "$out/assets/"
'';
buildInputs = [
gnat
raylib
];
buildPhase = ''
runHook preBuild
gnatmake -f -O3 \
-Wall \
-Wextra \
-gnat2012 \
-o eepers-linux eepers.adb \
-bargs \
-largs -lraylib -lm \
-pthread
runHook postBuild
'';
postFixup = ''
patchelf $out/bin/eepers \
--add-needed libwayland-client.so \
--add-needed libwayland-cursor.so \
--add-needed libwayland-egl.so \
--add-needed libasound.so \
--add-rpath ${
lib.makeLibraryPath [
alsa-lib
wayland
]
}
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp ./eepers-linux $out/bin/eepers
cp -r ./assets $out/
runHook postInstall
'';
meta = {
description = "Simple Turn-based Game";
homepage = "https://github.com/tsoding/eepers";
changelog = "https://github.com/tsoding/eepers/blob/${src.rev}/CHANGELOG.txt";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ GaetanLepage ];
mainProgram = "eepers";
platforms = lib.platforms.all;
};
}
pkgs/servers/mqtt/flashmq/default.nix → pkgs/by-name/fl/flashmq/package.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flashmq";
version = "1.9.1";
version = "1.13.0";
src = fetchFromGitHub {
owner = "halfgaar";
repo = "FlashMQ";
rev = "v${version}";
hash = "sha256-LxmD/NfD4OJR77erwRnHoe6VRiytqzMlWvRtgY8RD94=";
hash = "sha256-MoBLV39auDz5oicpX6CVvrHMifGpUozocq4E3J+8xWA=";
};
nativeBuildInputs = [ cmake installShellFiles ];
pkgs/by-name/fo/fooyin/package.nix
+61
View File
@@ -0,0 +1,61 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, alsa-lib
, ffmpeg
, kdePackages
, kdsingleapplication
, openssl
, pipewire
, taglib
, zlib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fooyin";
version = "0.4.2";
src = fetchFromGitHub {
owner = "ludouzi";
repo = "fooyin";
rev = "v" + finalAttrs.version;
hash = "sha256-1U7eqXVcp0lO/X92oNQ3mWdozgJ1eroQPojscSWH6+I=";
};
buildInputs = [
alsa-lib
ffmpeg
kdsingleapplication
pipewire
kdePackages.qcoro
kdePackages.qtbase
kdePackages.qtsvg
taglib
];
nativeBuildInputs = [
cmake
pkg-config
kdePackages.qttools
kdePackages.wrapQtAppsHook
];
cmakeFlags = [
(lib.cmakeBool "BUILD_TESTING" (finalAttrs.doCheck or false))
# we need INSTALL_FHS to be true as the various artifacts are otherwise just dumped in the root
# of $out and the fixupPhase cleans things up anyway
(lib.cmakeBool "INSTALL_FHS" true)
];
env.LANG = "C.UTF-8";
meta = with lib; {
description = "A customisable music player";
mainProgram = "fooyin";
license = licenses.gpl3Only;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
})
pkgs/applications/version-management/gitprompt-rs/default.nix → pkgs/by-name/gi/gitprompt-rs/package.nix
+12 -6
View File
@@ -4,13 +4,16 @@
rustPlatform,
git,
}:
rustPlatform.buildRustPackage rec {
pname = "gitprompt-rs";
let
version = "0.3.0";
in
rustPlatform.buildRustPackage {
pname = "gitprompt-rs";
inherit version;
src = fetchFromGitHub {
owner = "9ary";
repo = pname;
repo = "gitprompt-rs";
rev = version;
hash = "sha256-BqI3LbG7I/0wjzJaP8bxRwTM56joLqVaQCmAydX5vQM=";
};
@@ -22,11 +25,14 @@ rustPlatform.buildRustPackage rec {
--replace 'Command::new("git")' 'Command::new("${git}/bin/git")'
'';
meta = with lib; {
meta = {
description = "Simple Git prompt";
homepage = "https://github.com/9ary/gitprompt-rs";
license = with licenses; [ mpl20 ];
maintainers = with maintainers; [ isabelroses cafkafk ];
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [
isabelroses
cafkafk
];
mainProgram = "gitprompt-rs";
};
}
pkgs/tools/networking/goflow2/default.nix → pkgs/by-name/go/goflow2/package.nix
+9 -6
View File
@@ -3,13 +3,16 @@
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "goflow2";
let
version = "2.1.3";
in
buildGoModule {
pname = "goflow2";
inherit version;
src = fetchFromGitHub {
owner = "netsampler";
repo = pname;
repo = "goflow2";
rev = "v${version}";
hash = "sha256-wtvBkk+Y4koGDGN+N/w4FsdejgpCIio0g2QV35Pr/fo=";
};
@@ -22,10 +25,10 @@ buildGoModule rec {
vendorHash = "sha256-qcWeIg278V2bgFGpWwUT5JCblxfBv0/gWV1oXul/nCQ=";
meta = with lib; {
meta = {
description = "High performance sFlow/IPFIX/NetFlow Collector";
homepage = "https://github.com/netsampler/goflow2";
license = licenses.bsd3;
maintainers = with maintainers; [ isabelroses ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ isabelroses ];
};
}
pkgs/by-name/ha/hare/003-hardcode-qbe-and-harec.patch
+24
View File
@@ -0,0 +1,24 @@
diff --git a/cmd/hare/build.ha b/cmd/hare/build.ha
index b2ac6518..417b46c6 100644
--- a/cmd/hare/build.ha
+++ b/cmd/hare/build.ha
@@ -37,7 +37,7 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
case let ncpu: size =>
yield ncpu;
},
- version = build::get_version(os::tryenv("HAREC", "harec"))?,
+ version = build::get_version(os::tryenv("HAREC", "@harec@"))?,
arch = arch.qbe_name,
platform = build::get_platform(os::sysname())?,
...
@@ -145,8 +145,8 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
set_arch_tags(&ctx.ctx.tags, arch);
ctx.cmds = ["",
- os::tryenv("HAREC", "harec"),
- os::tryenv("QBE", "qbe"),
+ os::tryenv("HAREC", "@harec@"),
+ os::tryenv("QBE", "@qbe@"),
os::tryenv("AS", arch.as_cmd),
os::tryenv("LD", arch.ld_cmd),
];
pkgs/by-name/ha/hare/package.nix
+55 -59
View File
@@ -2,9 +2,7 @@
lib,
stdenv,
fetchFromSourcehut,
binutils-unwrapped,
harec,
makeWrapper,
qbe,
gitUpdater,
scdoc,
@@ -34,7 +32,9 @@ assert
'';
let
buildArch = stdenv.buildPlatform.uname.processor;
arch = stdenv.hostPlatform.uname.processor;
platform = lib.toLower stdenv.hostPlatform.uname.system;
qbePlatform =
{
x86_64 = "amd64_sysv";
@@ -42,32 +42,38 @@ let
riscv64 = "rv64";
}
.${arch};
platform = lib.toLower stdenv.hostPlatform.uname.system;
embeddedOnBinaryTools =
let
genToolsFromToolchain =
genPaths =
toolchain:
let
crossTargetPrefix = toolchain.stdenv.cc.targetPrefix;
toolchainArch = toolchain.stdenv.hostPlatform.uname.processor;
absOrRelPath =
toolDrv: toolBasename:
if arch == toolchainArch then
toolBasename
else
lib.getExe' toolDrv "${crossTargetPrefix}${toolBasename}";
inherit (toolchain.stdenv.cc) targetPrefix;
inherit (toolchain.stdenv.targetPlatform.uname) processor;
in
{
"ld" = absOrRelPath toolchain.buildPackages.binutils "ld";
"as" = absOrRelPath toolchain.buildPackages.binutils "as";
"cc" = absOrRelPath toolchain.stdenv.cc "cc";
"${processor}" = {
"ld" = lib.getExe' toolchain.buildPackages.binutils "${targetPrefix}ld";
"as" = lib.getExe' toolchain.buildPackages.binutils "${targetPrefix}as";
"cc" = lib.getExe' toolchain.stdenv.cc "${targetPrefix}cc";
};
};
in
{
x86_64 = genToolsFromToolchain x86_64PkgsCrossToolchain;
aarch64 = genToolsFromToolchain aarch64PkgsCrossToolchain;
riscv64 = genToolsFromToolchain riscv64PkgsCrossToolchain;
};
builtins.foldl' (acc: elem: acc // (genPaths elem)) { } [
x86_64PkgsCrossToolchain
aarch64PkgsCrossToolchain
riscv64PkgsCrossToolchain
];
crossCompMakeFlags = builtins.filter (x: !(lib.hasPrefix (lib.toUpper buildArch) x)) [
"RISCV64_AS=${embeddedOnBinaryTools.riscv64.as}"
"RISCV64_CC=${embeddedOnBinaryTools.riscv64.cc}"
"RISCV64_LD=${embeddedOnBinaryTools.riscv64.ld}"
"AARCH64_AS=${embeddedOnBinaryTools.aarch64.as}"
"AARCH64_CC=${embeddedOnBinaryTools.aarch64.cc}"
"AARCH64_LD=${embeddedOnBinaryTools.aarch64.ld}"
"X86_64_AS=${embeddedOnBinaryTools.x86_64.as}"
"X86_64_CC=${embeddedOnBinaryTools.x86_64.cc}"
"X86_64_LD=${embeddedOnBinaryTools.x86_64.ld}"
];
in
stdenv.mkDerivation (finalAttrs: {
pname = "hare";
@@ -99,6 +105,12 @@ stdenv.mkDerivation (finalAttrs: {
# Don't build haredoc since it uses the build `hare` bin, which breaks
# cross-compilation.
./002-dont-build-haredoc.patch
# Hardcode harec and qbe.
(substituteAll {
src = ./003-hardcode-qbe-and-harec.patch;
harec = lib.getExe harec;
qbe = lib.getExe qbe;
})
# Display toolchains when using `hare version -v`.
(fetchpatch {
url = "https://git.sr.ht/~sircmpwn/hare/commit/e35f2284774436f422e06f0e8d290b173ced1677.patch";
@@ -108,42 +120,37 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
harec
makeWrapper
qbe
scdoc
];
buildInputs = [
binutils-unwrapped
# Needed for build frameworks like `haredo`, which set the HAREC and QBE env vars to `harec` and
# `qbe` respectively.
propagatedBuildInputs = [
harec
qbe
tzdata
];
makeFlags =
[
"HARECACHE=.harecache"
"PREFIX=${builtins.placeholder "out"}"
"ARCH=${arch}"
"VERSION=${finalAttrs.version}-nixpkgs"
"QBEFLAGS=-t${qbePlatform}"
"AS=${stdenv.cc.targetPrefix}as"
"LD=${stdenv.cc.targetPrefix}ld"
# Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does
# not follow the FHS.
"HAREPATH=$(SRCDIR)/hare/stdlib"
]
++ lib.optionals enableCrossCompilation [
"RISCV64_AS=${embeddedOnBinaryTools.riscv64.as}"
"RISCV64_CC=${embeddedOnBinaryTools.riscv64.cc}"
"RISCV64_LD=${embeddedOnBinaryTools.riscv64.ld}"
"AARCH64_AS=${embeddedOnBinaryTools.aarch64.as}"
"AARCH64_CC=${embeddedOnBinaryTools.aarch64.cc}"
"AARCH64_LD=${embeddedOnBinaryTools.aarch64.ld}"
"X86_64_AS=${embeddedOnBinaryTools.x86_64.as}"
"X86_64_CC=${embeddedOnBinaryTools.x86_64.cc}"
"X86_64_LD=${embeddedOnBinaryTools.x86_64.ld}"
];
buildInputs = [
harec
qbe
];
makeFlags = [
"HARECACHE=.harecache"
"PREFIX=${builtins.placeholder "out"}"
"ARCH=${arch}"
"VERSION=${finalAttrs.version}-nixpkgs"
"QBEFLAGS=-t${qbePlatform}"
"AS=${stdenv.cc.targetPrefix}as"
"LD=${stdenv.cc.targetPrefix}ld"
"${lib.toUpper buildArch}_AS=${embeddedOnBinaryTools.${buildArch}.as}"
"${lib.toUpper buildArch}_CC=${embeddedOnBinaryTools.${buildArch}.cc}"
"${lib.toUpper buildArch}_LD=${embeddedOnBinaryTools.${buildArch}.ld}"
# Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does
# not follow the FHS.
"HAREPATH=$(SRCDIR)/hare/stdlib"
] ++ lib.optionals enableCrossCompilation crossCompMakeFlags;
enableParallelBuilding = true;
@@ -158,17 +165,6 @@ stdenv.mkDerivation (finalAttrs: {
ln -s configs/${platform}.mk config.mk
'';
postFixup = ''
wrapProgram $out/bin/hare \
--prefix PATH : ${
lib.makeBinPath [
binutils-unwrapped
harec
qbe
]
}
'';
setupHook = ./setup-hook.sh;
passthru = {
pkgs/by-name/ig/igvm-tooling/package.nix
+8
View File
@@ -35,6 +35,14 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-hNfkclxaYViy66TPHqLV3mqD7wqBuBN9MnMLaDOeRNM=";
stripLen = 1;
})
# allow for determinist id block signing
# remove once https://github.com/microsoft/igvm-tooling/pull/55 is merged
(fetchpatch {
name = "0003-add-deterministic-id-block-signature-mode.patch";
url = "https://github.com/microsoft/igvm-tooling/commit/03ad7825ade76ac25e308bb85f92e89b732e0bf1.patch";
sha256 = "sha256-Y7DFr0KgGtY8KOt6fLWd32sTaig/zHFe7n83+Yb9ls8=";
stripLen = 1;
})
];
postPatch = ''
pkgs/by-name/li/libewf-legacy/package.nix
+2 -2
View File
@@ -11,11 +11,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libewf-legacy";
version = "20140814";
version = "20140816";
src = fetchurl {
url = "https://github.com/libyal/libewf-legacy/releases/download/${finalAttrs.version}/libewf-${finalAttrs.version}.tar.gz";
hash = "sha256-OM3QXwnaIDeo66UNjzmu6to53SxgCMn/rE9VTPlX5BQ=";
hash = "sha256-ay0Hj7OGFnm6g5Qv6lHp5gKcN+wuoMN/V0QlbW9wJak=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/ne/neovim-unwrapped/package.nix
+2 -2
View File
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs:
in {
pname = "neovim-unwrapped";
version = "0.9.5";
version = "0.10.0";
__structuredAttrs = true;
@@ -74,7 +74,7 @@ in {
owner = "neovim";
repo = "neovim";
rev = "v${finalAttrs.version}";
hash = "sha256-CcaBqA0yFCffNPmXOJTo8c9v1jrEBiqAl8CG5Dj5YxE=";
hash = "sha256-FCOipXHkAbkuFw9JjEpOIJ8BkyMkjkI0Dp+SzZ4yZlw=";
};
patches = [
pkgs/by-name/pa/parinfer-rust-emacs/package.nix
+27
View File
@@ -0,0 +1,27 @@
{
fetchFromGitHub,
lib,
llvmPackages,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "parinfer-rust-emacs";
version = "0.4.6";
src = fetchFromGitHub {
owner = "justinbarclay";
repo = "parinfer-rust-emacs";
rev = "v${version}";
hash = "sha256-SNs/75beomxvexfE4+3v/l9Xl5w5SY0EWcORHvRitOw=";
};
cargoHash = "sha256-LmfcY9iR7BGh3dF/raSZTIwburtaQRI3I3XvOZG343M=";
meta = with lib; {
description = "An emacs centric fork of parinfer-rust";
mainProgram = "parinfer-rust";
homepage = "https://github.com/justinbarclay/parinfer-rust-emacs";
license = licenses.isc;
maintainers = with maintainers; [ brsvh ];
};
}
pkgs/by-name/rw/rwpspread/package.nix
+3 -3
View File
@@ -8,15 +8,15 @@
rustPlatform.buildRustPackage rec {
pname = "rwpspread";
version = "0.2.6";
version = "0.3.0";
src = fetchFromGitHub {
owner = "0xk1f0";
repo = "rwpspread";
rev = "v${version}";
hash = "sha256-6pYMKBm3f0kH+KD6yWy7/H/bg8v7hNm81KAKHp02HY8=";
hash = "sha256-B8K8/M5cUSchG54ar0ZY2XOH6lYLimdZr+dk5ffdplY=";
};
cargoHash = "sha256-/SjSwjrqODx9imtVxmOCrG4KwhXymHokyQ8FSC1SOd8=";
cargoHash = "sha256-bTCXgaE8+nxuEFeOMSihL3lfmbIxiv1f400rmyV2b8k=";
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/sc/scion/package.nix
+3 -29
View File
@@ -5,19 +5,7 @@
, nixosTests
}:
let
version = "0.10.0";
# Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here.
# ref: https://github.com/NixOS/nixpkgs/blob/047bc33866bf7004d0ce9ed0af78dab5ceddaab0/pkgs/by-name/vi/vikunja/package.nix#L96
skipTest = lineOffset: testCase: file:
let
jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]);
in
''
sed -i -e '/${testCase}/{
${jumpAndAppend} t.Skip();
}' ${file}
'';
version = "0.11.0";
in
buildGoModule {
@@ -29,20 +17,13 @@ buildGoModule {
owner = "scionproto";
repo = "scion";
rev = "v${version}";
hash = "sha256-8yXjEDo1k0+7O0gx2acAZMrG/r+iePfNCG+FolCSKwI=";
hash = "sha256-JemqSr1XBwW1hLuWQrApY/hqLj/VpW3xSJedVIoFSiY=";
};
vendorHash = "sha256-4nTp6vOyS7qDn8HmNO0NGCNU7wCb8ww8a15Yv3MPEq8=";
vendorHash = "sha256-akFbHgo8xI2/4aQsyutjhXPM5d0A3se3kG/6Ebw1Qcs=";
excludedPackages = [ "acceptance" "demo" "tools" "pkg/private/xtest/graphupdater" ];
# This can be removed in the next release of scion since its fixed upstream
# https://github.com/scionproto/scion/pull/4476
postConfigure = ''
# This test needs docker, so lets skip it
${skipTest 1 "TestOpensslCompatible" "scion-pki/trcs/sign_test.go"}
'';
postInstall = ''
set +e
mv $out/bin/gateway $out/bin/scion-ip-gateway
@@ -55,13 +36,6 @@ buildGoModule {
doCheck = true;
patches = [
(fetchpatch2 {
url = "https://github.com/scionproto/scion/commit/cb7fa6d6aab55c9eb90556c2b996b87539f8aa02.patch";
hash = "sha256-mMGJMPB6T7KeDXjEXffdrhzyKwaFmhuisK6PjHOJIdU=";
})
];
passthru.tests = {
inherit (nixosTests) scion-freestanding-deployment;
};
pkgs/by-name/ve/vesktop/package.nix
+107 -71
View File
@@ -1,25 +1,26 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, substituteAll
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, vencord
, electron
, libicns
, jq
, moreutils
, cacert
, nodePackages
, pipewire
, libpulseaudio
, autoPatchelfHook
, withTTS ? true
{
lib,
stdenv,
stdenvNoCC,
fetchFromGitHub,
substituteAll,
makeWrapper,
makeDesktopItem,
copyDesktopItems,
vencord,
electron,
libicns,
jq,
moreutils,
cacert,
nodePackages,
pipewire,
libpulseaudio,
autoPatchelfHook,
withTTS ? true,
# Enables the use of vencord from nixpkgs instead of
# letting vesktop manage it's own version
, withSystemVencord ? true
withSystemVencord ? false,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vesktop";
@@ -38,68 +39,80 @@ stdenv.mkDerivation (finalAttrs: {
assert lib.versionAtLeast nodePackages.pnpm.version "8.10.0";
stdenvNoCC.mkDerivation {
pname = "${finalAttrs.pname}-pnpm-deps";
inherit (finalAttrs) src version patches ELECTRON_SKIP_BINARY_DOWNLOAD;
inherit (finalAttrs)
src
version
patches
ELECTRON_SKIP_BINARY_DOWNLOAD
;
nativeBuildInputs = [
cacert
jq
moreutils
nodePackages.pnpm
cacert
];
pnpmPatch = builtins.toJSON {
pnpm.supportedArchitectures = {
os = [ "linux" ];
cpu = [ "x64" "arm64" ];
};
};
# inspired by https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56
# and based on https://github.com/NixOS/nixpkgs/pull/290715
installPhase = ''
runHook preInstall
export HOME=$(mktemp -d)
pnpm config set store-dir $out
# Some packages produce platform dependent outputs. We do not want to cache those in the global store
pnpm config set side-effects-cache false
# pnpm is going to warn us about using --force
# --force allows us to fetch all dependencies including ones that aren't meant for our host platform
pnpm install --force --frozen-lockfile --ignore-script
postPatch = ''
mv package.json package.json.orig
jq --raw-output ". * $pnpmPatch" package.json.orig > package.json
'';
# https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56
installPhase = ''
export HOME=$(mktemp -d)
pnpm config set store-dir $out
pnpm install --frozen-lockfile --ignore-script
fixupPhase = ''
runHook preFixup
# Remove timestamp and sort the json files
rm -rf $out/v3/tmp
for f in $(find $out -name "*.json"); do
sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
jq --sort-keys . $f | sponge $f
done
runHook postFixup
'';
dontConfigure = true;
dontBuild = true;
dontFixup = true;
outputHashMode = "recursive";
outputHash = "sha256-6ezEBeYmK5va3gCh00YnJzZ77V/Ql7A3l/+csohkz68=";
outputHash = "sha256-PogE8uf3W5cKSCqFHMz7FOvT7ONUP4FiFWGBgtk3UC8=";
};
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
makeWrapper
nodePackages.pnpm
nodePackages.nodejs
makeWrapper
autoPatchelfHook
];
buildInputs = [
pipewire
libpulseaudio
pipewire
stdenv.cc.cc.lib
];
patches = [
./disable_update_checking.patch
] ++ lib.optional withSystemVencord (substituteAll { inherit vencord; src = ./use_system_vencord.patch; });
patches =
[ ./disable_update_checking.patch ]
++ lib.optional withSystemVencord (substituteAll {
inherit vencord;
src = ./use_system_vencord.patch;
});
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
preBuild = ''
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
export STORE_PATH=$(mktemp -d)
@@ -107,11 +120,15 @@ stdenv.mkDerivation (finalAttrs: {
chmod -R +w "$STORE_PATH"
pnpm config set store-dir "$STORE_PATH"
pnpm install --offline --frozen-lockfile --ignore-script
pnpm install --frozen-lockfile --ignore-script --offline
patchShebangs node_modules/{*,.*}
runHook postConfigure
'';
postBuild = ''
buildPhase = ''
runHook preBuild
pnpm build
# using `pnpm exec` here apparently makes it ignore ELECTRON_SKIP_BINARY_DOWNLOAD
./node_modules/.bin/electron-builder \
@@ -119,30 +136,31 @@ stdenv.mkDerivation (finalAttrs: {
-c.asarUnpack="**/*.node" \
-c.electronDist=${electron}/libexec/electron \
-c.electronVersion=${electron.version}
runHook postBuild
'';
# this is consistent with other nixpkgs electron packages and upstream, as far as I am aware
installPhase =
''
runHook preInstall
installPhase = ''
runHook preInstall
mkdir -p $out/opt/Vesktop
cp -r dist/linux-*unpacked/resources $out/opt/Vesktop/
mkdir -p $out/opt/Vesktop
cp -r dist/linux-*unpacked/resources $out/opt/Vesktop/
pushd build
${libicns}/bin/icns2png -x icon.icns
for file in icon_*x32.png; do
file_suffix=''${file//icon_}
install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png
done
pushd build
${libicns}/bin/icns2png -x icon.icns
for file in icon_*x32.png; do
file_suffix=''${file//icon_}
install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png
done
makeWrapper ${electron}/bin/electron $out/bin/vesktop \
--add-flags $out/opt/Vesktop/resources/app.asar \
${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
makeWrapper ${electron}/bin/electron $out/bin/vesktop \
--add-flags $out/opt/Vesktop/resources/app.asar \
${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
runHook postInstall
'';
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
@@ -152,8 +170,17 @@ stdenv.mkDerivation (finalAttrs: {
icon = "vesktop";
startupWMClass = "Vesktop";
genericName = "Internet Messenger";
keywords = [ "discord" "vencord" "electron" "chat" ];
categories = [ "Network" "InstantMessaging" "Chat" ];
keywords = [
"discord"
"vencord"
"electron"
"chat"
];
categories = [
"Network"
"InstantMessaging"
"Chat"
];
})
];
@@ -161,12 +188,21 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pnpmDeps;
};
meta = with lib; {
meta = {
description = "An alternate client for Discord with Vencord built-in";
homepage = "https://github.com/Vencord/Vesktop";
license = licenses.gpl3Only;
maintainers = with maintainers; [ getchoo Scrumplex vgskye pluiedev ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
changelog = "https://github.com/Vencord/Vesktop/releases/tag/${finalAttrs.src.rev}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
getchoo
Scrumplex
vgskye
pluiedev
];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
mainProgram = "vesktop";
};
})
pkgs/data/documentation/man-pages/default.nix
+8
View File
@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
enableParallelInstalling = true;
postInstall = ''
# The manpath executable looks up manpages from PATH. And this package won't
# appear in PATH unless it has a /bin folder. Without the change
# 'nix-shell -p man-pages' does not pull in the search paths.
# See 'man 5 manpath' for the lookup order.
mkdir -p $out/bin
'';
meta = with lib; {
description = "Linux development manual pages";
homepage = "https://www.kernel.org/doc/man-pages/";
pkgs/development/libraries/ngtcp2/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "v${version}";
hash = "sha256-te/kFt7/09QpmkHZ7dJxyKvvxP+mHtIQIgESkJATR38=";
hash = "sha256-Ez97uFzXvI7cE2TIk4/RCAwbAf+vXG1PlPaSvdSrcnE=";
fetchSubmodules = true;
};
pkgs/development/ocaml-modules/ocamlformat/generic.nix
+2 -1
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, version ? "0.26.1", astring, base, camlp-streams, cmdliner_1_0
{ lib, fetchurl, version ? "0.26.2", astring, base, camlp-streams, cmdliner_1_0
, cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk
, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf, ... }:
@@ -24,6 +24,7 @@ rec {
"0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0=";
"0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30=";
"0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc=";
"0.26.2" = "sha256-Lk9Za/eqNnqET+g7oPawvxSyplF53cCCNj/peT0DdcU=";
}."${version}";
};
pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
+2 -1
View File
@@ -12,7 +12,8 @@
let inherit (callPackage ./generic.nix args) src version library_deps;
in
lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23")
lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23"
|| lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2")
"ocamlformat ${version} is not available for OCaml ${ocaml.version}"
buildDunePackage {
pkgs/development/python-modules/aiocoap/default.nix
+46 -61
View File
@@ -1,44 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonAtLeast
, pythonOlder
# build-system
, setuptools
# optionals
, cbor2
, cbor-diag
, cryptography
, filelock
, ge25519
, dtlssocket
, websockets
, termcolor
, pygments
# tests
, pytestCheckHook
{
lib,
buildPythonPackage,
cbor-diag,
cbor2,
cryptography,
dtlssocket,
fetchFromGitHub,
filelock,
ge25519,
pygments,
pytestCheckHook,
pythonAtLeast,
pythonOlder,
setuptools,
termcolor,
websockets,
}:
buildPythonPackage rec {
pname = "aiocoap";
version = "0.4.7";
version = "0.4.8";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "chrysn";
repo = pname;
repo = "aiocoap";
rev = "refs/tags/${version}";
hash = "sha256-4iwoPfmIwk+PlWUp60aqA5qZgzyj34pnZHf9uH5UhnY=";
hash = "sha256-jBRxorHr5/CgAR6WVXBUycZpJ6n1DYVFQk6kqVv8D1Q=";
};
nativeBuildInputs = [
setuptools
];
build-system = [ setuptools ];
passthru.optional-dependencies = {
oscore = [
@@ -47,12 +40,8 @@ buildPythonPackage rec {
filelock
ge25519
];
tinydtls = [
dtlssocket
];
ws = [
websockets
];
tinydtls = [ dtlssocket ];
ws = [ websockets ];
prettyprint = [
termcolor
cbor2
@@ -61,26 +50,7 @@ buildPythonPackage rec {
];
};
nativeCheckInputs = [
pytestCheckHook
];
pytestFlagsArray = lib.optionals (pythonAtLeast "3.12") [
# https://github.com/chrysn/aiocoap/issues/339
"--deselect=tests/test_server.py::TestServerTCP::test_big_resource"
"--deselect=tests/test_server.py::TestServerTCP::test_empty_accept"
"--deselect=tests/test_server.py::TestServerTCP::test_error_resources"
"--deselect=tests/test_server.py::TestServerTCP::test_fast_resource"
"--deselect=tests/test_server.py::TestServerTCP::test_js_accept"
"--deselect=tests/test_server.py::TestServerTCP::test_manualbig_resource"
"--deselect=tests/test_server.py::TestServerTCP::test_nonexisting_resource"
"--deselect=tests/test_server.py::TestServerTCP::test_replacing_resource"
"--deselect=tests/test_server.py::TestServerTCP::test_root_resource"
"--deselect=tests/test_server.py::TestServerTCP::test_slow_resource"
"--deselect=tests/test_server.py::TestServerTCP::test_slowbig_resource"
"--deselect=tests/test_server.py::TestServerTCP::test_spurious_resource"
"--deselect=tests/test_server.py::TestServerTCP::test_unacceptable_accept"
];
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [
# Don't test the plugins
@@ -89,14 +59,29 @@ buildPythonPackage rec {
"tests/test_oscore_plugtest.py"
];
disabledTests = [
# Communication is not properly mocked
"test_uri_parser"
];
disabledTests =
[
# Communication is not properly mocked
"test_uri_parser"
]
++ lib.optionals (pythonAtLeast "3.12") [
# https://github.com/chrysn/aiocoap/issues/339
"TestServerTCP::test_big_resource"
"TestServerTCP::test_empty_accept"
"TestServerTCP::test_error_resources"
"TestServerTCP::test_fast_resource"
"TestServerTCP::test_js_accept"
"TestServerTCP::test_manualbig_resource"
"TestServerTCP::test_nonexisting_resource"
"TestServerTCP::test_replacing_resource"
"TestServerTCP::test_root_resource"
"TestServerTCP::test_slow_resource"
"TestServerTCP::test_slowbig_resource"
"TestServerTCP::test_spurious_resource"
"TestServerTCP::test_unacceptable_accept"
];
pythonImportsCheck = [
"aiocoap"
];
pythonImportsCheck = [ "aiocoap" ];
meta = with lib; {
description = "Python CoAP library";
pkgs/development/python-modules/aioconsole/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
# wrapped to be able to find aioconsole and any other packages.
buildPythonPackage rec {
pname = "aioconsole";
version = "0.7.0";
version = "0.7.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "vxgmichel";
repo = "aioconsole";
rev = "refs/tags/v${version}";
hash = "sha256-SKJLc1Tauwpmh2xtFFyHqKRaaQAK99SpbbGLFmAbKcQ=";
hash = "sha256-c8zeKebS04bZS9pMIKAauaLPvRrWaGoDKbnF906tFzQ=";
};
nativeBuildInputs = [
pkgs/development/python-modules/aws-lambda-builders/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.48.0";
version = "1.49.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "refs/tags/v${version}";
hash = "sha256-g1f0OL41lvs8OLyLcBk6XJk9wZO/oWluUj5sUcXlUIE=";
hash = "sha256-14qG3AuIlQI6n2XouPfUx7LNZqR0gSnI4OlkiYS62jA=";
};
postPatch = ''
pkgs/development/python-modules/boto3-stubs/default.nix
+2 -2
View File
@@ -366,7 +366,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.105";
version = "1.34.106";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -374,7 +374,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-auwBMUR4haJNuCJ5YJoIEwxdCw9zjfxwpZ/z9FPASmg=";
hash = "sha256-1IQhTwKkT27syAEO82MwPclTfxPoElur9HYGaYrGjCA=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/cnvkit/default.nix
+2 -2
View File
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "cnvkit";
version = "0.9.10";
version = "0.9.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "etal";
repo = "cnvkit";
rev = "refs/tags/v${version}";
hash = "sha256-mCQXo3abwC06x/g51UBshqUk3dpqEVNUvx+cJ/EdYGQ=";
hash = "sha256-tlR1LsR+M1nkzk3CgrkkNcSGP3juv25GXddWDDWJ5ao=";
};
postPatch = ''
pkgs/development/python-modules/curl-cffi/default.nix
+3 -3
View File
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "curl-cffi";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "yifeikong";
repo = "curl_cffi";
rev = "v${version}";
hash = "sha256-VeBh5wp/VEMDGR2YK06w34hBv9qHIyA+EiZHrhEhAGw=";
rev = "refs/tags/v${version}";
hash = "sha256-bNBpZAIdfub2osByo827RBw/gouCmNt8uVN0y1KdcUk=";
};
patches = [
pkgs/development/python-modules/cvelib/default.nix
+28 -21
View File
@@ -1,48 +1,55 @@
{ lib
, buildPythonPackage
, click
, fetchFromGitHub
, jsonschema
, pytestCheckHook
, pythonOlder
, requests
, testers
, cve
{
lib,
buildPythonPackage,
click,
cve,
fetchFromGitHub,
jsonschema,
pytestCheckHook,
pythonOlder,
requests,
setuptools,
testers,
}:
buildPythonPackage rec {
pname = "cvelib";
version = "1.3.0";
format = "setuptools";
version = "1.4.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "RedHatProductSecurity";
repo = "cvelib";
rev = "tags/${version}";
hash = "sha256-PCZUAKgE80PD//4qK8ap55IN9vtx9WdpRZUAC3UdaWM=";
rev = "refs/tags/${version}";
hash = "sha256-nj5bkep8jYJE1qh2zNxivjKOpHj93UZ8bU+qNs2On8s=";
};
propagatedBuildInputs = [
postPatch = ''
# collective.checkdocs is unmaintained for over 10 years
substituteInPlace pyproject.toml \
--replace-fail '"collective.checkdocs",' ""
'';
build-system = [ setuptools ];
dependencies = [
click
jsonschema
requests
];
nativeCheckInputs = [
pytestCheckHook
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [
"cvelib"
];
pythonImportsCheck = [ "cvelib" ];
passthru.tests.version = testers.testVersion { package = cve; };
meta = with lib; {
description = "Library and a command line interface for the CVE Services API";
homepage = "https://github.com/RedHatProductSecurity/cvelib";
changelog = "https://github.com/RedHatProductSecurity/cvelib/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ raboof ];
mainProgram = "cve";
pkgs/development/python-modules/dash/default.nix
+2 -2
View File
@@ -36,7 +36,7 @@
buildPythonPackage rec {
pname = "dash";
version = "2.16.1";
version = "2.17.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
owner = "plotly";
repo = "dash";
rev = "refs/tags/v${version}";
hash = "sha256-IPyGQXrC2FTTSIC4IFGwKTceyzPYAe4jwDoO5C9YeF0=";
hash = "sha256-45nSQ3N7VcPsXthmMj3gMWFPi/i9z0peI1Wc6fUT7So=";
};
nativeBuildInputs = [
pkgs/development/python-modules/dataprep-ml/default.nix
+2 -2
View File
@@ -27,7 +27,7 @@ let
in
buildPythonPackage rec {
pname = "dataprep-ml";
version = "0.0.23";
version = "24.5.1.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "dataprep_ml";
inherit version;
hash = "sha256-NYlKLdV2xZPODXpHvaFB8cRFTdCndl3UOd6bCfNbsZo=";
hash = "sha256-pZhHlNcQJLBww7ur2Z6Yb2IdbRsBtjzQAzfa4UzGKt4=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/dbt-bigquery/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dbt-bigquery";
version = "1.7.7";
version = "1.7.8";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "dbt-labs";
repo = "dbt-bigquery";
rev = "refs/tags/v${version}";
hash = "sha256-+UF49ReSxKQ8ouutOv1b9JcU/6CNk7Yw8f1/tlRvwnU=";
hash = "sha256-Uc842hkrCYDR92ACDtNW+Iqq5l54CSp40D1tOL7wt8o=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/django-allauth/default.nix
+2 -1
View File
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, python
# build-system
, setuptools
@@ -56,7 +57,7 @@ buildPythonPackage rec {
requests-oauthlib
] ++ pyjwt.optional-dependencies.crypto;
preBuild = "python -m django compilemessages";
preBuild = "${python.interpreter} -m django compilemessages";
passthru.optional-dependencies = {
saml = [
pkgs/development/python-modules/dramatiq/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dramatiq";
version = "1.16.0";
version = "1.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "Bogdanp";
repo = "dramatiq";
rev = "refs/tags/v${version}";
hash = "sha256-gC1vWnG3zDuFT61i2VgDrP/qIwmGN5GkGv6EVxqUf4U=";
hash = "sha256-xKHTBo2AirxDXe/CLSqo++3AgxP4pVkGTNdgS5CCZ3c=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/dtlssocket/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "dtlssocket";
version = "0.1.16";
version = "0.1.18";
format = "pyproject";
src = fetchPypi {
pname = "DTLSSocket";
inherit version;
hash = "sha256-MLEIrkX84cAz4+9sLd1+dBgGKuN0Io46f6lpslQ2ajk=";
hash = "sha256-TnS2LYe6CeAlezc83bGpRqOpQbPJMQHzJn6PnXon4FI=";
};
nativeBuildInputs = [
pkgs/development/python-modules/dvclive/default.nix
+2 -2
View File
@@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "dvclive";
version = "3.45.0";
version = "3.46.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = "dvclive";
rev = "refs/tags/${version}";
hash = "sha256-76PjBPr3m1y5osW024dkhuvuXl2FiZ5oxlJ1Ucq8msI=";
hash = "sha256-yIViKlkCdoG2vSZdScL38fZd9musLRKzBd9wSR6lJdk=";
};
build-system = [
pkgs/development/python-modules/gcal-sync/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "gcal-sync";
version = "6.0.4";
version = "6.1.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "gcal_sync";
rev = "refs/tags/${version}";
hash = "sha256-ufoe9+4zhlixcSGMAhuhJx2Y2vrN036N8UvyP3xuTRQ=";
hash = "sha256-mZn/3oROIUSv6cCxXs3rBJtlmKsqNflTW2pcER8GisE=";
};
nativeBuildInputs = [
pkgs/development/python-modules/globus-sdk/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "globus-sdk";
version = "3.39.0";
version = "3.41.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "globus";
repo = "globus-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-DjGwwpXzYRq5/hiUs/l8kD/yA58vbhvrKirKDlWoAmY=";
hash = "sha256-FQO1D960mg0G/zYMo4J5MtJbPID4oE8UWNpTPKWtsic=";
};
build-system = [
pkgs/development/python-modules/imgtool/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "imgtool";
version = "2.0.0";
version = "2.1.0";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-elQSVeae7B8Sqjjc4fHU/iDYISZ3xoqbbsY0ypGgZhI=";
hash = "sha256-T3+831PETqqmImUEUQzLUvfvAMmXUDz5STSzMMlge2A=";
};
nativeBuildInputs = [
pkgs/development/python-modules/justext/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "justext";
version = "3.0.0";
version = "3.0.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "miso-belica";
repo = "jusText";
rev = "refs/tags/v${version}";
hash = "sha256-WNxDoM5666tEHS9pMl5dOoig4S7dSYaCLZq71tehWqw=";
hash = "sha256-9i7hzCK/ijh8xw9l2ZbVhVj5IBf0WD/49/R1tSWgqrQ=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/langchain-text-splitters/default.nix
+13 -16
View File
@@ -1,15 +1,16 @@
{ lib
, buildPythonPackage
, fetchPypi
, poetry-core
, langchain-core
, lxml
, pythonOlder
{
lib,
buildPythonPackage,
fetchPypi,
poetry-core,
langchain-core,
lxml,
pythonOlder,
}:
buildPythonPackage rec {
pname = "langchain-text-splitters";
version = "0.0.1";
version = "0.0.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -17,14 +18,12 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "langchain_text_splitters";
inherit version;
hash = "sha256-rEWfqYeZ9RF61UJakzCyGWEyHjC8GaKi+fdh3a3WKqE=";
hash = "sha256-rIkn3AugjrpwL2lhye19986tjeGan3EBqyteo0IBs8E=";
};
nativeBuildInputs = [
poetry-core
];
build-system = [ poetry-core ];
propagatedBuildInputs = [
dependencies = [
langchain-core
lxml
];
@@ -32,9 +31,7 @@ buildPythonPackage rec {
# PyPI source does not have tests
doCheck = false;
pythonImportsCheck = [
"langchain_text_splitters"
];
pythonImportsCheck = [ "langchain_text_splitters" ];
meta = with lib; {
description = "Build context-aware reasoning applications";
pkgs/development/python-modules/langsmith/default.nix
+2 -2
View File
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "langsmith";
version = "0.1.57";
version = "0.1.59";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langsmith-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-L725AfkmBEe44LkJ0y6PdDvbnbCf31LXL3YdnOshnqE=";
hash = "sha256-k9WsJUiJPCahwUHzsOblBCm58z2dHQZGk3U6GMm7SpQ=";
};
sourceRoot = "${src.name}/python";
pkgs/development/python-modules/limnoria/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "limnoria";
version = "2023.11.18";
version = "2024.4.26";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-Ftm5OGTt1emQsYso3hAUA9yMNBkIK5jybdFaRKJJk0o=";
hash = "sha256-H8GAJvmkYJy8PJsXn4Yl9qY3zb9aFBa7sr4DN0bKYfQ=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/line-profiler/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "line-profiler";
version = "4.1.2";
version = "4.1.3";
format = "setuptools";
disabled = pythonOlder "3.6" || isPyPy;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "line_profiler";
inherit version;
hash = "sha256-qlZXiw/1p1b+GAs/2nvWfCe71Hiz0BJGEtjPAOSiHfI=";
hash = "sha256-5fESPDZywyGLoGPCO9ZKURWeRGSf7WeAuZPHgfte0xg=";
};
nativeBuildInputs = [
pkgs/development/python-modules/llm/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
let
llm = buildPythonPackage rec {
pname = "llm";
version = "0.13.1";
version = "0.14";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ let
owner = "simonw";
repo = "llm";
rev = "refs/tags/${version}";
hash = "sha256-Nq6pduzl8IK+nA3pctst/W4ux7+P6mBFTEHMF+vtBQw=";
hash = "sha256-CgGVFUsntVkF0zORAtYQQMAeGtIwBbj9hE0Ei1OCGq4=";
};
patches = [
pkgs/development/python-modules/lmfit/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "lmfit";
version = "1.3.0";
version = "1.3.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-foI668BSN8qA0z0mDO27peJhkMzsn69ZXmgUOQneDJM=";
hash = "sha256-vDhiRK29EO8aKixPnRez3vkFVSwKZK74VPCtRswwnMU=";
};
postPatch = ''
pkgs/development/python-modules/nbdev/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "nbdev";
version = "2.3.20";
version = "2.3.21";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-tBrWdG8njNQzQ3kc0ATeu3ToP34gdmOBKj2jcB0X8+8=";
hash = "sha256-H3KHnVOdy+Hdpka+dxp/qPj1HZSXIbXJshnZuXVo9DQ=";
};
nativeBuildInputs = [
pkgs/development/python-modules/nethsm/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
let
pname = "nethsm";
version = "1.0.0";
version = "1.1.0";
in
buildPythonPackage {
@@ -21,7 +21,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-sENuSdA4pYt8v2w2RvDkcQLYCP9V0vZOdWOlkNBi3/o=";
hash = "sha256-CQhheHQ0BlfznKjoOSRvbDtnlTvv/SLtl0GWd7LUSt8=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/niaaml/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "niaaml";
version = "1.2.0";
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "lukapecnik";
repo = "NiaAML";
rev = "refs/tags/${version}";
hash = "sha256-jGbsxYlRJ81g74LqSKpquciPsLP+KSoNBTJPEaD/CHM=";
hash = "sha256-d6UlpMrT0GBZlcD1BCZxInXTdyFMBVltxnSyUFbSy0g=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/nocaselist/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "nocaselist";
version = "2.0.0";
version = "2.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-RWqgAMZ3fF0hsCnFLlMvlDKNT7TxWtKk3T3WLbMLOJI=";
hash = "sha256-MnCLcAoaUxM+a7XMUzMsl3Wwx8lZpflyV5MXH9L0yKU=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/paste/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "paste";
version = "3.10.0";
version = "3.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "cdent";
repo = "paste";
rev = "refs/tags/${version}";
hash = "sha256-gl0+mw0D0iGVmOc5jQP7b3EL1ZmT1lAr9ffx+XegdU0=";
hash = "sha256-NY/h6hbpluEu1XAv3o4mqoG+l0LXfM1dw7+G0Rm1E4o=";
};
postPatch = ''
pkgs/development/python-modules/pgspecial/default.nix
+21 -13
View File
@@ -1,24 +1,31 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, psycopg
, click
, configobj
, sqlparse
{
lib,
buildPythonPackage,
click,
configobj,
fetchPypi,
psycopg,
pytestCheckHook,
pythonOlder,
setuptools,
sqlparse,
}:
buildPythonPackage rec {
pname = "pgspecial";
version = "2.1.1";
format = "setuptools";
version = "2.1.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-o4I5zZYfrDPObaNcRm11istvlCkBWY19905bgv5vVjY=";
hash = "sha256-8EGeGzt4+zpy/jtUb2eIpxIJFTLVmf51k7X27lWoj4c=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
click
sqlparse
psycopg
@@ -30,13 +37,14 @@ buildPythonPackage rec {
];
disabledTests = [
# requires a postgresql server
# Test requires a Postgresql server
"test_slash_dp_pattern_schema"
];
meta = with lib; {
description = "Meta-commands handler for Postgres Database";
homepage = "https://github.com/dbcli/pgspecial";
changelog = "https://github.com/dbcli/pgspecial/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
pkgs/development/python-modules/phonopy/default.nix
+2 -2
View File
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "phonopy";
version = "2.22.1";
version = "2.23.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nux6/1z1xBr+4+fWrR/oOc+zVOI9j60p/SHHAPZ+hWI=";
hash = "sha256-xJohROJNAPdEITtM/VncAYL8ASkfgThKy8XXnqiS3hU=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pipetools/default.nix
+32
View File
@@ -0,0 +1,32 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
setuptools,
}:
buildPythonPackage rec {
pname = "pipetools";
version = "1.1.0";
# Used github as the src since the pypi package does not include the tests
src = fetchFromGitHub {
owner = "0101";
repo = pname;
rev = "6cba9fadab07a16fd85eed16d5cffc609f84c62b";
hash = "sha256-BoZFePQCQfz1dkct5p/WQLuXoNX3eLcnKf3Mf0fG6u8=";
};
nativeCheckInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ setuptools ];
pythonImportsCheck = [ "pipetools" ];
meta = {
description = "A library that enables function composition similar to using Unix pipes";
homepage = "https://0101.github.io/pipetools/";
license = lib.licenses.mit;
};
}
pkgs/development/python-modules/pygount/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pygount";
version = "1.6.1";
version = "1.8.0";
pyproject = true;
src = fetchFromGitHub {
owner = "roskakori";
repo = "pygount";
rev = "refs/tags/v${version}";
hash = "sha256-j+mXIyF/54MCm0yv7Z+ymy/EeZz7iS/a+/5I9lo1+Zo=";
hash = "sha256-PFqcSnJoGL4bXFy3hu3Iurbb8QK1NqCDs8aJmMxP4Hc=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pymatgen/default.nix
+2 -2
View File
@@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "pymatgen";
version = "2024.4.13";
version = "2024.5.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = "materialsproject";
repo = "pymatgen";
rev = "refs/tags/v${version}";
hash = "sha256-vjasWQgwjtoM/6Y1HwK1otMFejRWEj+YBxaIYDDSeeo=";
hash = "sha256-ZMOZ4eFtIaIcBPGT6bgAV+47LEGWAAnF/ml68j0fXws=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/pypng/default.nix
+5 -5
View File
@@ -1,20 +1,20 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchFromGitLab
, pytestCheckHook
, setuptools
}:
buildPythonPackage rec {
pname = "pypng";
version = "0.0.21";
format = "pyproject";
version = "0.20220715.0";
pyproject = true;
src = fetchFromGitHub {
src = fetchFromGitLab {
owner = "drj11";
repo = "pypng";
rev = "refs/tags/${pname}-${version}";
hash = "sha256-JU1GCSTm2s6Kczn6aRcF5DizPJVpizNtnAMJxTBi9vo=";
hash = "sha256-tTnsGCAmHexDWm/T5xpHpcBaQcBEqMfTFaoOAeC+pDs=";
};
nativeBuildInputs = [
pkgs/development/python-modules/pyrainbird/default.nix
+28 -31
View File
@@ -1,29 +1,30 @@
{ lib
, aiohttp-retry
, buildPythonPackage
, fetchFromGitHub
, freezegun
, ical
, parameterized
, pycryptodome
, pydantic
, pytest-aiohttp
, pytest-asyncio
, pytest-golden
, pytest-mock
, pytestCheckHook
, python-dateutil
, pythonOlder
, pyyaml
, requests
, requests-mock
, responses
, setuptools
{
lib,
aiohttp-retry,
buildPythonPackage,
fetchFromGitHub,
freezegun,
ical,
mashumaro,
parameterized,
pycryptodome,
pytest-aiohttp,
pytest-asyncio,
pytest-golden,
pytest-mock,
pytestCheckHook,
python-dateutil,
pythonOlder,
pyyaml,
requests,
requests-mock,
responses,
setuptools,
}:
buildPythonPackage rec {
pname = "pyrainbird";
version = "4.0.2";
version = "6.0.1";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -32,7 +33,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "pyrainbird";
rev = "refs/tags/${version}";
hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg=";
hash = "sha256-kRPRyEt31SJpNRXcTshGByKAfPzEj+CDNpEQp4Klgks=";
};
postPatch = ''
@@ -40,15 +41,13 @@ buildPythonPackage rec {
--replace-fail "--cov=pyrainbird --cov-report=term-missing" ""
'';
nativeBuildInputs = [
setuptools
];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
aiohttp-retry
ical
mashumaro
pycryptodome
pydantic
python-dateutil
pyyaml
requests
@@ -68,9 +67,7 @@ buildPythonPackage rec {
responses
];
pythonImportsCheck = [
"pyrainbird"
];
pythonImportsCheck = [ "pyrainbird" ];
meta = with lib; {
description = "Module to interact with Rainbird controllers";
pkgs/development/python-modules/pytado/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pytado";
version = "0.17.5";
version = "0.17.6";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "wmalgadey";
repo = "PyTado";
rev = "refs/tags/${version}";
hash = "sha256-FjdqZc4Zt2sLYJpnD/MAzr8Y9lGHteHB5psQqheS84I=";
hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-ironicclient/default.nix
+2 -2
View File
@@ -20,12 +20,12 @@
buildPythonPackage rec {
pname = "python-ironicclient";
version = "5.5.0";
version = "5.6.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-JlO487QSPsBJZqPYRhsQYFA7noIN2q/stH4eZXAFLnY=";
hash = "sha256-zWlfy+Pfu0l7vBQnLOIP9vaXzx+i35k4oQqPUtLg3cE=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pytorch-lightning/default.nix
+2 -2
View File
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "pytorch-lightning";
version = "2.2.3";
version = "2.2.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "Lightning-AI";
repo = "pytorch-lightning";
rev = "refs/tags/${version}";
hash = "sha256-5dz4NQZC0tKIYA9omRZAsSlvH5hpyCSmV0yvoRICcqg=";
hash = "sha256-IkoSID7nEPbKrhEMlo/UaMcF80HYldvndFA54DoHT+M=";
};
preConfigure = ''
pkgs/development/python-modules/pywbem/default.nix
+2 -2
View File
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "pywbem";
version = "1.7.1";
version = "1.7.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-6jx5H4FtM93JToXQwq9ihiPfMw7nX4KwFFQzHkAgnP4=";
hash = "sha256-3Dt4WEABf1/LY4HFZoJZjOu/yEUYUXaPheIxioTga2g=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/queuelib/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "queuelib";
version = "1.6.2";
version = "1.7.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "4b207267f2642a8699a1f806045c56eb7ad1a85a10c0e249884580d139c2fcd2";
sha256 = "sha256-KFUWIJbPAjBRCJCzVDeeocD/GdEF0xR9NJ0kM7siKwg=";
};
buildInputs = [ pytest ];
pkgs/development/python-modules/rotary-embedding-torch/default.nix
+2 -2
View File
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "rotary-embedding-torch";
version = "0.5.3";
version = "0.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "lucidrains";
repo = "rotary-embedding-torch";
rev = "refs/tags/${version}";
hash = "sha256-CCz/va5oydgU1JRDHKooRezbDbeGZHtD8Zy6fWJ2uRg=";
hash = "sha256-/gVBQ9lUzVN/eEtm6qPajw0TZs87JOC7d02qnQ8sdVk=";
};
nativeBuildInputs = [
pkgs/development/python-modules/stripe/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "stripe";
version = "9.5.0";
version = "9.6.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-zTg2lkGuYUDhzp7c1UAK7NsaELpwTmU6Lyp1UMuPJ34=";
hash = "sha256-kwXYSc6nFdxZxeOdAYkUdbguEO252V7h2BiUV+XeeS8=";
};
nativeBuildInputs = [
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1146";
version = "3.0.1148";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-4U+nI5DODPLgQXzzgZKVTZdKPVneUQVomsdpoQHRqdE=";
hash = "sha256-dGLc/oPwQlzNKuw/xszgld0KQf/l7roG3H7jIlJspp0=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/torchmetrics/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
let
pname = "torchmetrics";
version = "1.4.0";
version = "1.4.0.post0";
in
buildPythonPackage {
inherit pname version;
@@ -33,7 +33,7 @@ buildPythonPackage {
owner = "Lightning-AI";
repo = "torchmetrics";
rev = "refs/tags/v${version}";
hash = "sha256-5ANEpUdd5eyzBhhAEHrvHNHMOQuXhkkKuL1t3dJLhdE=";
hash = "sha256-tQqlLfdk8rSJqwR3rC7kqnM+pLFYZSPHfI7RmIi2Iq4=";
};
dependencies = [
pkgs/development/python-modules/trytond/default.nix
+2 -2
View File
@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "trytond";
version = "7.0.10";
version = "7.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-N/O27qQBD18lncW0hCfJkUlmCuej8HtV2x/MnRUDGcc=";
hash = "sha256-gIWWzm7emSwgKoO5geNIXUqKNsDiq6fle5OHb+KvhLE=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/unstructured/default.nix
+2 -2
View File
@@ -56,7 +56,7 @@
, grpcio
}:
let
version = "0.13.4";
version = "0.13.7";
optional-dependencies = {
huggingflace = [
langdetect
@@ -90,7 +90,7 @@ buildPythonPackage {
owner = "Unstructured-IO";
repo = "unstructured";
rev = "refs/tags/${version}";
hash = "sha256-HAZVnyjbeHF6knipTxmmy/BI1wvoJ8c65PiMAIqgJ+0=";
hash = "sha256-Ekfa454mL7isMX79bd/YXPPHnetSzo1Mlg/XJakYyDM=";
};
propagatedBuildInputs = [
pkgs/development/tools/analysis/checkov/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.91";
version = "3.2.92";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-lw89E7xD1tSAxgf1bwuPojOikOqIBfisePAtTGHXr4c=";
hash = "sha256-v1StSo9j0Psr3om3qbcE+Ha9Wz7t6EfGzbyAe34M2qY=";
};
patches = [ ./flake8-compat-5.x.patch ];
pkgs/development/tools/goda/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "goda";
version = "0.5.7";
version = "0.5.8";
src = fetchFromGitHub {
owner = "loov";
repo = "goda";
rev = "v${version}";
sha256 = "sha256-kilFb/2wXdzn/gXy9mBg0PZH8rd+MFIom4AGAZLgnBo=";
hash = "sha256-WmOe3MfFWUnFSuwntHUjN+NeeT7TdxfBOgciviYZC0Y=";
};
vendorHash = "sha256-FYjlOYB0L4l6gF8hYtJroV1qMQD0ZmKWXBarjyConRs=";
pkgs/development/tools/grpc-gateway/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grpc-gateway";
version = "2.19.1";
version = "2.20.0";
src = fetchFromGitHub {
owner = "grpc-ecosystem";
repo = "grpc-gateway";
rev = "v${version}";
sha256 = "sha256-CdGQpQfOSimeio8v1lZ7xzE/oAS2qFyu+uN+H9i7vpo=";
sha256 = "sha256-CnnJRgEGarwIaE2LkphN3gogzIhwQ5hAaUZFpLR/HxU=";
};
vendorHash = "sha256-no7kZGpf/VOuceC3J+izGFQp5aMS3b+Rn+x4BFZ2zgs=";
vendorHash = "sha256-aNOWu+TXbXn3jZ29BwU+x+vWMtL76NZoPElFuUwcHiI=";
ldflags = [
"-X=main.version=${version}"
pkgs/development/tools/misc/strace/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "strace";
version = "6.8";
version = "6.9";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-umlQqWgkzfk6WE+gTwpzOJbSprxfCtn/5QXZtB6XAUk=";
sha256 = "sha256-2hiemQqC48o6WkYxAS9+z9SJ2rRZhU2C2Mr2qGXBNWo=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
pkgs/development/tools/skaffold/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "skaffold";
version = "2.11.0";
version = "2.12.0";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
hash = "sha256-xaRVgvYK6xWSy75K7AOkSw4ZjXn3xR0NqbBBbbK5MVU=";
hash = "sha256-q57n5Jo682u/YK+5bgYqMufjPuPOPsBgJzxSl1fdqxA=";
};
vendorHash = null;
pkgs/development/web/nodejs/v22.nix
+2 -2
View File
@@ -8,8 +8,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "22.0.0";
sha256 = "sha256-IuKPv/MfaQc7gCTLQnReUQX4QEHzR1smC5fVoUEDnRo=";
version = "22.2.0";
sha256 = "sha256-iJkIqIKNFISRDX5lm2qlet6NUo/w45Dpp372WadihHQ=";
patches = [
./disable-darwin-v8-system-instrumentation-node19.patch
./bypass-darwin-xcrun-node16.patch
pkgs/os-specific/darwin/raycast/default.nix
+2 -2
View File
@@ -10,12 +10,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.73.0";
version = "1.74.0";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-TiHFuU54+IDBrdIMSI397ysm8uOb2/oRhSyoy+5yzTw=";
hash = "sha256-aPpxPjEhy1uLekHMLyI18mlSozffMA+HB1OdqpULVnw=";
};
dontPatch = true;
pkgs/pkgs-lib/formats.nix
+2
View File
@@ -43,6 +43,8 @@ rec {
hocon = (import ./formats/hocon/default.nix { inherit lib pkgs; }).format;
php = (import ./formats/php/default.nix { inherit lib pkgs; }).format;
json = {}: {
type = with lib.types; let
pkgs/pkgs-lib/formats/php/default.nix
+69
View File
@@ -0,0 +1,69 @@
{pkgs, lib}: {
# Format for defining configuration of some PHP services, that use "include 'config.php';" approach.
format = {finalVariable ? null}: let
toPHP = value: {
"null" = "null";
"bool" = if value then "true" else "false";
"int" = toString value;
"float" = toString value;
"string" = string value;
"set" = attrs value;
"list" = list value;
}
.${builtins.typeOf value} or
(abort "should never happen: unknown value type ${builtins.typeOf value}");
# https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single
escapeSingleQuotedString = lib.escape [ "'" "\\" ];
string = value: "'${escapeSingleQuotedString value}'";
listContent = values: lib.concatStringsSep ", " (map toPHP values);
list = values: "[" + (listContent values) + "]";
attrsContent = values: lib.pipe values [
(lib.mapAttrsToList (k: v: "${toPHP k} => ${toPHP v}"))
(lib.concatStringsSep ", ")
];
attrs = set:
if set ? _phpType then specialType set
else
"[" + attrsContent set + "]";
mixedArray = {list, set}: if list == [] then attrs set else "[${listContent list}, ${attrsContent set}]";
specialType = {value, _phpType}: {
"mixed_array" = mixedArray value;
"raw" = value;
}.${_phpType};
type = with lib.types;
nullOr (oneOf [
bool
int
float
str
(attrsOf type)
(listOf type)
])
// {
description = "PHP value";
};
in {
inherit type;
lib = {
mkMixedArray = list: set: {_phpType = "mixed_array"; value = { inherit list set;}; };
mkRaw = raw: {_phpType = "raw"; value = raw;};
};
generate = name: value: pkgs.writeTextFile {
inherit name;
text = let
# strict_types enabled here to easily debug problems when calling functions of incorrect type using `mkRaw`.
phpHeader = "<?php\ndeclare(strict_types=1);\n";
in if finalVariable == null then phpHeader + "return ${toPHP value};\n" else phpHeader + "\$${finalVariable} = ${toPHP value};\n";
};
};
}
pkgs/pkgs-lib/tests/formats.nix
+44
View File
@@ -425,4 +425,48 @@ in runBuildTests {
\u0627\u0644\u062c\u0628\u0631 = \u0623\u0643\u062b\u0631 \u0645\u0646 \u0645\u062c\u0631\u062f \u0623\u0631\u0642\u0627\u0645
'';
};
phpAtoms = shouldPass rec {
format = formats.php { finalVariable = "config"; };
input = {
null = null;
false = false;
true = true;
int = 10;
float = 3.141;
str = "foo";
str_special = "foo\ntesthello'''";
attrs.foo = null;
list = [ null null ];
mixed = format.lib.mkMixedArray [ 10 3.141 ] {
str = "foo";
attrs.foo = null;
};
raw = format.lib.mkRaw "random_function()";
};
expected = ''
<?php
declare(strict_types=1);
$config = ['attrs' => ['foo' => null], 'false' => false, 'float' => 3.141000, 'int' => 10, 'list' => [null, null], 'mixed' => [10, 3.141000, 'attrs' => ['foo' => null], 'str' => 'foo'], 'null' => null, 'raw' => random_function(), 'str' => 'foo', 'str_special' => 'foo
testhello\'\'\'${"'"}, 'true' => true];
'';
};
phpReturn = shouldPass {
format = formats.php { };
input = {
int = 10;
float = 3.141;
str = "foo";
str_special = "foo\ntesthello'''";
attrs.foo = null;
};
expected = ''
<?php
declare(strict_types=1);
return ['attrs' => ['foo' => null], 'float' => 3.141000, 'int' => 10, 'str' => 'foo', 'str_special' => 'foo
testhello\'\'\'${"'"}];
'';
};
}
pkgs/servers/radarr/default.nix
+5 -5
View File
@@ -10,15 +10,15 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
x64-linux_hash = "sha256-eFJ31tZPxzK1Vx2EOZ1AMrzCUL7pXJIb5J1joL/ZIgs=";
arm64-linux_hash = "sha256-BtxHBHc2dYYdqZxwga7K49aGfSq5a8Z1TLjMPH4ldlw=";
x64-osx_hash = "sha256-GQ8wHU4wWu6fpjiLI9yQyMvhP1DS5FE+YQu2uLFdto4=";
arm64-osx_hash = "sha256-AnZ+mGeafJsRb6Koj0+oaER8d6vuDQ0x+Wc1eflzupo=";
x64-linux_hash = "sha256-rKe1xQR3lkPXQBUWmKdHUu/AQ99U1kCINeXV2z/ZG5o=";
arm64-linux_hash = "sha256-O/6brSo25E4BxvxAUQvwQa9kMY/Ga3YxgS+fuaL6/n0=";
x64-osx_hash = "sha256-oVBs0evwPl3Dd6GZlzUWqopB0Zq4mOCUwmLOjs44d6Q=";
arm64-osx_hash = "sha256-iUBy9ob2zOdKVhGbwsJx1ZrT9tD4D1BPLqjB46tCW08=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "radarr";
version = "5.4.6.8723";
version = "5.6.0.8846";
src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";
pkgs/servers/sql/percona-server/default.nix
+15
View File
@@ -0,0 +1,15 @@
pkgs: {
percona-server_lts = pkgs.callPackage ./lts.nix {
inherit (pkgs.darwin) cctools developer_cmds DarwinTools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
boost = pkgs.boost177; # Configure checks for specific version.
icu = pkgs.icu69;
protobuf = pkgs.protobuf_21;
};
percona-server_innovation = pkgs.callPackage ./innovation.nix {
inherit (pkgs.darwin) cctools developer_cmds DarwinTools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
# newer versions cause linking failures against `libabsl_spinlock_wait`
protobuf = pkgs.protobuf_21;
};
}
pkgs/servers/sql/percona-server/innovation.nix
+112
View File
@@ -0,0 +1,112 @@
{ lib, stdenv, fetchurl, bison, cmake, pkg-config
, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2
, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
, systemd
# Percona-specific deps
, coreutils, cyrus_sasl, gnumake, openldap
# optional: different malloc implementations
, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools
}:
assert !(withJemalloc && withTcmalloc);
stdenv.mkDerivation (finalAttrs: {
pname = "percona-server_innovation";
version = "8.3.0-1";
src = fetchurl {
url = "https://downloads.percona.com/downloads/percona-distribution-mysql-ps/percona-distribution-mysql-ps-${builtins.head (lib.strings.split "-" finalAttrs.version)}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg";
};
nativeBuildInputs = [ bison cmake pkg-config ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
patches = [
./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
];
## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
postPatch = ''
substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
# The rocksdb setup script is called with `env -i` and cannot find anything in PATH.
patchShebangs storage/rocksdb/get_rocksdb_files.sh
substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp
substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE"
substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
'';
buildInputs = [
boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
zstd libfido2 openldap perl cyrus_sasl
] ++ lib.optionals stdenv.isLinux [
numactl libtirpc systemd
] ++ lib.optionals stdenv.isDarwin [
cctools CoreServices developer_cmds DarwinTools
]
++ lib.optional (stdenv.isLinux && withJemalloc) jemalloc
++ lib.optional (stdenv.isLinux && withTcmalloc) gperftools;
outputs = [ "out" "static" ];
cmakeFlags = [
# Percona-specific flags.
"-DPORTABLE=1"
"-DWITH_LDAP=system"
"-DROCKSDB_DISABLE_AVX2=1"
"-DROCKSDB_DISABLE_MARCH_NATIVE=1"
# Flags taken from mysql package.
"-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
"-DWITH_ROUTER=OFF" # It may be packaged separately.
"-DWITH_SYSTEM_LIBS=ON"
"-DWITH_UNIT_TESTS=OFF"
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DMYSQL_DATADIR=/var/lib/mysql"
"-DINSTALL_INFODIR=share/mysql/docs"
"-DINSTALL_MANDIR=share/man"
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
"-DINSTALL_INCLUDEDIR=include/mysql"
"-DINSTALL_DOCREADMEDIR=share/mysql"
"-DINSTALL_SUPPORTFILESDIR=share/mysql"
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
"-DINSTALL_MYSQLTESTDIR="
"-DINSTALL_DOCDIR=share/mysql/docs"
"-DINSTALL_SHAREDIR=share/mysql"
] ++ lib.optionals stdenv.isLinux [
"-DWITH_SYSTEMD=1"
"-DWITH_SYSTEMD_DEBUG=1"
]
++ lib.optional (stdenv.isLinux && withJemalloc) "-DWITH_JEMALLOC=1"
++ lib.optional (stdenv.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1";
postInstall = ''
moveToOutput "lib/*.a" $static
so=${stdenv.hostPlatform.extensions.sharedLibrary}
ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
'';
passthru = {
client = finalAttrs.finalPackage;
connector-c = finalAttrs.finalPackage;
server = finalAttrs.finalPackage;
mysqlVersion = lib.versions.majorMinor finalAttrs.version;
tests = nixosTests.mysql.percona-server_innovation;
};
meta = with lib; {
homepage = "https://www.percona.com/software/mysql-database/percona-server";
description = ''
A free, fully compatible, enhanced, open source drop-in replacement for
MySQL® that provides superior performance, scalability and instrumentation.
'';
license = licenses.gpl2;
maintainers = teams.flyingcircus.members;
platforms = platforms.unix;
};
})
pkgs/servers/sql/percona-server/8.0.x.nix → pkgs/servers/sql/percona-server/lts.nix
+2 -2
View File
@@ -6,7 +6,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "percona-server";
pname = "percona-server_lts";
version = "8.0.36-28";
src = fetchurl {
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
connector-c = finalAttrs.finalPackage;
server = finalAttrs.finalPackage;
mysqlVersion = lib.versions.majorMinor finalAttrs.version;
tests = nixosTests.mysql.percona-server_8_0;
tests = nixosTests.mysql.percona-server_lts;
};
meta = with lib; {
pkgs/tools/backup/percona-xtrabackup/default.nix
+6
View File
@@ -0,0 +1,6 @@
pkgs: {
percona-xtrabackup_lts = pkgs.callPackage ./lts.nix {
boost = pkgs.boost177;
};
percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { };
}
pkgs/tools/backup/percona-xtrabackup/generic.nix
+5 -3
View File
@@ -5,14 +5,14 @@
, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ...
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "percona-xtrabackup";
inherit version;
src = fetchFromGitHub {
owner = "percona";
repo = "percona-xtrabackup";
rev = "${pname}-${version}";
rev = "${finalAttrs.pname}-${finalAttrs.version}";
inherit hash fetchSubmodules;
};
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
rm -r "$out"/lib/plugin/debug
'' + extraPostInstall;
passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version;
meta = with lib; {
description = "Non-blocking backup tool for MySQL";
homepage = "http://www.percona.com/software/percona-xtrabackup";
@@ -54,4 +56,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ];
};
}
})
pkgs/tools/backup/percona-xtrabackup/innovation.nix
+15
View File
@@ -0,0 +1,15 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "8.3.0-1";
hash = "sha256-qZM2AFhpwrN0BR+DdozYn7s2I+c1tWpD5QvppTEfGEY=";
# includes https://github.com/Percona-Lab/libkmip.git
fetchSubmodules = true;
extraPatches = [
];
extraPostInstall = ''
'';
})
pkgs/tools/backup/percona-xtrabackup/8_0.nix → pkgs/tools/backup/percona-xtrabackup/lts.nix
View File

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