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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2022-09-28 00:23:19 +00:00 committed by GitHub
commit b193231a39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
71 changed files with 634 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View File

@ -233,6 +233,13 @@
<link xlink:href="options.html#opt-services.languagetool.enable">services.languagetool</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master">OpenRGB</link>,
a FOSS tool for controlling RGB lighting. Available as
<link xlink:href="options.html#opt-services-hardware-openrgb-enable">services.hardware.openrgb.enable</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://www.getoutline.com/">Outline</link>,

2
nixos/doc/manual/release-notes/rl-2211.section.md
View File

@ -85,6 +85,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker.
Available as [services.languagetool](options.html#opt-services.languagetool.enable).
- [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB/-/tree/master), a FOSS tool for controlling RGB lighting. Available as [services.hardware.openrgb.enable](options.html#opt-services-hardware-openrgb-enable).
- [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable).
- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable).

1
nixos/modules/module-list.nix
View File

@ -455,6 +455,7 @@
./services/hardware/lcd.nix
./services/hardware/lirc.nix
./services/hardware/nvidia-optimus.nix
./services/hardware/openrgb.nix
./services/hardware/pcscd.nix
./services/hardware/pommed.nix
./services/hardware/power-profiles-daemon.nix

52
nixos/modules/services/hardware/openrgb.nix Normal file
View File

@ -0,0 +1,52 @@
{ pkgs, lib, config, ... }:
with lib;
let
cfg = config.services.hardware.openrgb;
in {
options.services.hardware.openrgb = {
enable = mkEnableOption (lib.mdDoc "OpenRGB server");
package = mkOption {
type = types.package;
default = pkgs.openrgb;
defaultText = literalMD "pkgs.openrgb";
description = lib.mdDoc "Set version of openrgb package to use.";
};
motherboard = mkOption {
type = types.nullOr (types.enum [ "amd" "intel" ]);
default = null;
description = lib.mdDoc "CPU family of motherboard. Allows for addition motherboard i2c support.";
};
server.port = mkOption {
type = types.port;
default = 6742;
description = lib.mdDoc "Set server port of openrgb.";
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
services.udev.packages = [ cfg.package ];
boot.kernelModules = [ "i2c-dev" ]
++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix" ]
++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ];
systemd.services.openrgb = {
description = "OpenRGB server daemon";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}";
Restart = "always";
};
};
};
meta.maintainers = with lib.maintainers; [ jonringer ];
}

78
nixos/modules/services/misc/klipper.nix
View File

@ -35,6 +35,30 @@ in
description = lib.mdDoc "Path of the API socket to create.";
};
mutableConfig = mkOption {
type = types.bool;
default = false;
example = true;
description = lib.mdDoc ''
Whether to copy the config to a mutable directory instead of using the one directly from the nix store.
This will only copy the config if the file at `services.klipper.mutableConfigPath` doesn't exist.
'';
};
mutableConfigFolder = mkOption {
type = types.path;
default = "/var/lib/klipper";
description = lib.mdDoc "Path to mutable Klipper config file.";
};
configFile = mkOption {
type = types.nullOr types.path;
default = null;
description = lib.mdDoc ''
Path to default Klipper config.
'';
};
octoprintIntegration = mkOption {
type = types.bool;
default = false;
@ -62,8 +86,8 @@ in
};
settings = mkOption {
type = format.type;
default = { };
type = types.nullOr format.type;
default = null;
description = lib.mdDoc ''
Configuration for Klipper. See the [documentation](https://www.klipper3d.org/Overview.html#configuration-and-tuning-guides)
for supported values.
@ -80,6 +104,10 @@ in
building of firmware and addition of klipper-flash tools for manual flashing.
This will add `klipper-flash-$mcu` scripts to your environment which can be called to flash the firmware.
'');
serial = mkOption {
type = types.nullOr path;
description = lib.mdDoc "Path to serial port this printer is connected to. Leave `null` to derive it from `service.klipper.settings`.";
};
configFile = mkOption {
type = path;
description = lib.mdDoc "Path to firmware config which is generated using `klipper-genconf`";
@ -95,19 +123,25 @@ in
assertions = [
{
assertion = cfg.octoprintIntegration -> config.services.octoprint.enable;
message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it.";
message = "Option services.klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it.";
}
{
assertion = cfg.user != null -> cfg.group != null;
message = "Option klipper.group is not set when a user is specified.";
message = "Option services.klipper.group is not set when services.klipper.user is specified.";
}
{
assertion = foldl (a: b: a && b) true (mapAttrsToList (mcu: _: mcu != null -> (hasAttrByPath [ "${mcu}" "serial" ] cfg.settings)) cfg.firmwares);
message = "Option klipper.settings.$mcu.serial must be set when klipper.firmware.$mcu is specified";
assertion = cfg.settings != null -> foldl (a: b: a && b) true (mapAttrsToList (mcu: _: mcu != null -> (hasAttrByPath [ "${mcu}" "serial" ] cfg.settings)) cfg.firmwares);
message = "Option services.klipper.settings.$mcu.serial must be set when settings.klipper.firmware.$mcu is specified";
}
{
assertion = (cfg.configFile != null) != (cfg.settings != null);
message = "You need to either specify services.klipper.settings or services.klipper.defaultConfig.";
}
];
environment.etc."klipper.cfg".source = format.generate "klipper.cfg" cfg.settings;
environment.etc = mkIf (!cfg.mutableConfig) {
"klipper.cfg".source = if cfg.settings != null then format.generate "klipper.cfg" cfg.settings else cfg.configFile;
};
services.klipper = mkIf cfg.octoprintIntegration {
user = config.services.octoprint.user;
@ -118,15 +152,34 @@ in
let
klippyArgs = "--input-tty=${cfg.inputTTY}"
+ optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}";
printerConfigPath =
if cfg.mutableConfig
then cfg.mutableConfigFolder + "/printer.cfg"
else "/etc/klipper.cfg";
printerConfigFile =
if cfg.settings != null
then format.generate "klipper.cfg" cfg.settings
else cfg.configFile;
in
{
description = "Klipper 3D Printer Firmware";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
preStart = ''
mkdir -p ${cfg.mutableConfigFolder}
${lib.optionalString (cfg.mutableConfig) ''
[ -e ${printerConfigPath} ] || {
cp ${printerConfigFile} ${printerConfigPath}
chmod +w ${printerConfigPath}
}
''}
mkdir -p ${cfg.mutableConfigFolder}/gcodes
'';
serviceConfig = {
ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} /etc/klipper.cfg";
ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} ${printerConfigPath}";
RuntimeDirectory = "klipper";
StateDirectory = "klipper";
SupplementaryGroups = [ "dialout" ];
WorkingDirectory = "${cfg.package}/lib";
OOMScoreAdjust = "-999";
@ -134,6 +187,7 @@ in
CPUSchedulingPriority = 99;
IOSchedulingClass = "realtime";
IOSchedulingPriority = 0;
UMask = "0002";
} // (if cfg.user != null then {
Group = cfg.group;
User = cfg.user;
@ -146,8 +200,9 @@ in
environment.systemPackages =
with pkgs;
let
default = a: b: if a != null then a else b;
firmwares = filterAttrs (n: v: v!= null) (mapAttrs
(mcu: { enable, configFile }: if enable then pkgs.klipper-firmware.override {
(mcu: { enable, configFile, serial }: if enable then pkgs.klipper-firmware.override {
mcu = lib.strings.sanitizeDerivationName mcu;
firmwareConfig = configFile;
} else null)
@ -156,11 +211,14 @@ in
(mcu: firmware: pkgs.klipper-flash.override {
mcu = lib.strings.sanitizeDerivationName mcu;
klipper-firmware = firmware;
flashDevice = cfg.settings."${mcu}".serial;
flashDevice = default cfg.firmwares."${mcu}".serial cfg.settings."${mcu}".serial;
firmwareConfig = cfg.firmwares."${mcu}".configFile;
})
firmwares;
in
[ klipper-genconf ] ++ firmwareFlasher ++ attrValues firmwares;
};
meta.maintainers = [
maintainers.cab404
];
}

2
nixos/release-small.nix
View File

@ -69,7 +69,7 @@ in rec {
imagemagick
jdk
linux
mysql
mariadb
nginx
nodejs
openssh

14
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -1199,6 +1199,16 @@ let
};
github = {
codespaces = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "github";
name = "codespaces";
version = "1.10.6";
sha256 = "04d6lx8s6rwc6ry6flyw59hg9c4814s5wvi8ycxlwq4pl8n0imd7";
};
meta = { license = lib.licenses.unfree; };
};
copilot = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "github";
@ -2638,8 +2648,8 @@ let
mktplcRef = {
name = "vim";
publisher = "vscodevim";
version = "1.23.2";
sha256 = "sha256-QC+5FJYjWsEaao1ifgMTJyg7vZ5JUbNNJiV+OuiIaM0=";
version = "1.24.1";
sha256 = "00gq6mqqwqipc6d7di2x9mmi1lya11vhkkww9563avchavczb9sv";
};
meta = {
license = lib.licenses.mit;

4
pkgs/applications/graphics/batik/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "batik";
version = "1.14";
version = "1.15";
src = fetchurl {
url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz";
sha256 = "sha256-D06qgb5wdS5AahnznDnAGISPCZY/CPqJdGQFRwUsRhg=";
sha256 = "sha256-NYo7+8DikUmDsioM1Q1YW1s3KwsQeTnwIKDr+RHxxyo=";
};
meta = with lib; {

12
pkgs/applications/misc/calibre/default.nix
View File

@ -27,11 +27,11 @@
mkDerivation rec {
pname = "calibre";
version = "5.42.0";
version = "5.44.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
hash = "sha256-pob9GZl3Wiky5aMGGvcNQdDrKh19bo+n5ihdS45X+Vg=";
hash = "sha256-b/qj6v02okNV5ZV/D4ONttttNFbPoXy00Tn9lOuviOw=";
};
# https://sources.debian.org/patches/calibre/${version}+dfsg-1
@ -40,12 +40,12 @@ mkDerivation rec {
(fetchpatch {
name = "0001-only-plugin-update.patch";
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch";
sha256 = "sha256:1h2hl4z9qm17crms4d1lq2cq44cnxbga1dv6qckhxvcg6pawxg3l";
sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA=";
})
(fetchpatch {
name = "0007-Hardening-Qt-code.patch";
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch";
sha256 = "sha256:18wps7fn0cpzb7gf78f15pmbaff4vlygc9g00hq7zynfa4pcgfdg";
name = "0006-Hardening-Qt-code.patch";
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch";
sha256 = "sha256-/X6iZZFxv4793h2yYI3UAz0mLNEmKpdVrmOnABFT0tE=";
})
]
++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;

4
pkgs/applications/misc/dasel/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
version = "1.26.1";
version = "1.27.0";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${version}";
sha256 = "sha256-7DQJiwszE+qGcyyOZd9Zzg9PPc79HTYk8knI7upduts=";
sha256 = "sha256-bVAW8DrLqZKm9/iLleFxIMVkxaqhgdKwQUSEPpYhwt8=";
};
vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA=";

11
pkgs/applications/misc/doctave/cargo-lock.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -295,7 +295,7 @@ dependencies = [
[[package]]
name = "doctave"
-version = "0.4.0"
+version = "0.4.2"
dependencies = [
"alphanumeric-sort",
"ascii",

30
pkgs/applications/misc/doctave/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib, rustPlatform, fetchFromGitHub, stdenv, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "doctave";
version = "0.4.2";
src = fetchFromGitHub {
owner = "doctave";
repo = pname;
rev = version;
sha256 = "1780pqvnlbxxhm7rynnysqr0vihdkwmc6rmgp43bmj1k18ar4qgj";
};
# Cargo.lock is outdated
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices
];
meta = with lib; {
description = "A batteries-included developer documentation site generator";
homepage = "https://github.com/doctave/doctave";
changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

4
pkgs/applications/misc/hugo/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hugo";
version = "0.104.0";
version = "0.104.1";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yvU3owVbYrG0D0zy6MTTwwKC+b2vE7/trMsuR9VX58E=";
sha256 = "sha256-cR+S84ROSAnK1FXLX+f3BXKcxp8W/noA9cg0XvEXbaU=";
};
vendorSha256 = "sha256-K7rQSs4PqFGV4gZ6UevS7S0w0OQykAkHntklKz5vPrU=";

22
pkgs/applications/misc/thokr/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "thokr";
version = "0.4.1";
src = fetchFromGitHub {
owner = "thatvegandev";
repo = pname;
rev = "v${version}";
sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir";
};
cargoSha256 = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw=";
meta = with lib; {
description = "A typing tui with visualized results and historical logging";
homepage = "https://github.com/thatvegandev/thokr";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

4
pkgs/applications/networking/cluster/k9s/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.26.5";
version = "0.26.6";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-IARb8MGFIg2X5rOipQyM2qL3fXa6xRS58cavR4ytH+k=";
sha256 = "sha256-cWk2K1+j5P14TO7YSTY9/1RT2HjG9BtfsFJy+cg9EDs=";
};
ldflags = [

16
pkgs/applications/office/paperless-ngx/default.nix
View File

@ -26,17 +26,12 @@ let
src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "django-q";
sha256 = "sha256-aoDuPig8Nf8fLzn7GjBn69aF2zH2l8gxascAu9lIG3U=";
rev = "71abc78fdaec029cf71e9849a3b0fa084a1678f7";
hash = "sha256-alu7tZwUn77xhUF9c/aGmwRwO//mR/FucXjvXUl/6ek=";
rev = "8b5289d8caf36f67fb99448e76ead20d5b498c1b";
};
# due to paperless-ngx modification of the pyproject.toml file
# the patch is not needed any more
patches = [];
});
# django-extensions 3.1.5 is required, but its tests are incompatible with Django 4
django-extensions = super.django-extensions.overridePythonAttrs (_: {
doCheck = false;
patches = [ ];
});
aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec {
@ -62,12 +57,12 @@ let
in
python.pkgs.pythonPackages.buildPythonApplication rec {
pname = "paperless-ngx";
version = "1.8.0";
version = "1.9.1";
# Fetch the release tarball instead of a git ref because it contains the prebuilt fontend
src = fetchurl {
url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz";
hash = "sha256-BLfhh04RvBJFRQiPXkMl8XlWqZOWKmjjl+6lZ326stU=";
hash = "sha256-KWq3zUES8klXexNO9krlqZKZEajOhkTHF13t/3rxrPc=";
};
format = "other";
@ -116,6 +111,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
inotifyrecursive
joblib
langdetect
pkgs.libmysqlclient
lxml
msgpack
numpy

16
pkgs/applications/office/pdfmixtool/default.nix
View File

@ -1,23 +1,25 @@
{ lib
, mkDerivation
, fetchFromGitLab
, fetchpatch
, cmake
, pkg-config
, qtbase
, qttools
, qpdf
, podofo
, imagemagick
}:
mkDerivation rec {
pname = "pdfmixtool";
version = "1.0.2";
version = "1.1";
src = fetchFromGitLab {
owner = "scarpetta";
repo = pname;
rev = "v${version}";
sha256 = "066ap1w05gj8n0kvilyhlr1fzwrmlczx3lax7mbw0rfid9qh3467";
hash = "sha256-S8hhWZ6nHyIWPwsfl+o9XnljLD3aE/vthCLuWEbm5nc=";
};
nativeBuildInputs = [
@ -26,12 +28,22 @@ mkDerivation rec {
];
buildInputs = [
imagemagick
qtbase
qttools
qpdf
podofo
];
patches = [
# fix incompatibility with qpdf11
(fetchpatch {
url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/81f7e96f6e68dfeba3cd4e00d8553dfdd2d7f2fa.diff";
hash = "sha256-uBchYjUIqL7dJR7U/TSxhSGu1qY742cFUIv0XKU6L2g=";
})
];
meta = with lib; {
description = "An application to split, merge, rotate and mix PDF files";
homepage = "https://gitlab.com/scarpetta/pdfmixtool";

4
pkgs/applications/science/misc/snakemake/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "7.14.1";
version = "7.14.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-o2pERzt6wU/EiXBc9kI2qn9PhXGyvNiEWbSRzI85R8c=";
hash = "sha256-4XduybmDmlux3zvjbN1ouaJ1PkNO8h6vHuxgZ3YLBrw=";
};
propagatedBuildInputs = with python3.pkgs; [

6
pkgs/applications/version-management/git-and-tools/ghr/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "ghr";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "tcnksm";
repo = "ghr";
rev = "v${version}";
sha256 = "sha256-947hTRfx3GM6qKDYvlKEmofqPdcmwx9V/zISkcSKALM=";
sha256 = "sha256-aD1HEdoAPFFpJL++fLZIk+pIs+qDNYbTGDMlcRjV6M4=";
};
vendorSha256 = "sha256-OpWp3v1nxHJpEh2jW8MYnbaq66wx9b3DlaKzeti5N3w=";
vendorSha256 = "sha256-pqwJPo3ZhsXU1RF4BKPOWQS71+9EitSSTE1+sKlc9+s=";
# Tests require a Github API token, and networking
doCheck = false;

6
pkgs/applications/virtualization/colima/default.nix
View File

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "colima";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "abiosoft";
repo = pname;
rev = "v${version}";
sha256 = "bSBaSS+rVkFqTSdyegdE/F0X5u7yvF/nHslAO3xgD6I=";
sha256 = "sha256-hoxEf62EPD/WFXW6qbPCvEwViwmme3pSBfjeKOLsGjc=";
# We need the git revision
leaveDotGit = true;
postFetch = ''
@ -28,7 +28,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles makeWrapper ];
vendorSha256 = "sha256-jDzDwK7qA9lKP8CfkKzfooPDrHuHI4OpiLXmX9vOpOg=";
vendorSha256 = "sha256-tsMQMWEkTE1NhevcqBETGWiboqL6QTepgnIo4B5Y4wQ=";
CGO_ENABLED = 1;

40
pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix vendored Normal file
View File

@ -0,0 +1,40 @@
{ lib, mkDerivation, fetchFromGitHub
, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
mkDerivation rec {
pname = "kzones";
version = "0.3";
src = fetchFromGitHub {
owner = "gerritdevriese";
repo = "kzones";
rev = "v${version}";
sha256 = "sha256-o7ItUHPayR0wnySssWvtVAaMRa9A1m778FY500hXHXQ=";
};
buildInputs = [
kcoreaddons kwindowsystem plasma-framework systemsettings
];
dontBuild = true;
# 1. --global still installs to $HOME/.local/share so we use --packageroot
# 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually
installPhase = ''
runHook preInstall
plasmapkg2 --type kwinscript --install ${src} --packageroot $out/share/kwin/scripts
install -Dm644 ${src}/metadata.desktop $out/share/kservices5/kwin-script-kzones.desktop
runHook postInstall
'';
meta = with lib; {
description = "KWin Script for snapping windows into zones";
maintainers = with maintainers; [ matthiasbeyer ];
license = licenses.gpl3Plus;
inherit (src.meta) homepage;
inherit (kwindowsystem.meta) platforms;
};
}

1
pkgs/desktops/plasma-5/default.nix
View File

@ -162,6 +162,7 @@ let
krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { };
krunner-ssh = callPackage ./3rdparty/addons/krunner-ssh.nix { };
krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { };
kzones = callPackage ./3rdparty/kwin/scripts/kzones.nix { };
lightly = callPackage ./3rdparty/lightly { };
parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
};

43
pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
View File

@ -1,57 +1,36 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, intltool
, glib
, mkXfceDerivation
, exo
, gtk3
, libXtst
, xorgproto
, libxfce4ui
, libxfce4util
, xfce4-panel
, libxfce4ui
, xfconf
, gtk3
, hicolor-icon-theme
, xfce
, xorgproto
}:
let
mkXfceDerivation rec {
category = "panel-plugins";
in stdenv.mkDerivation rec {
pname = "xfce4-cpugraph-plugin";
version = "1.2.6";
src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k=";
};
nativeBuildInputs = [
pkg-config
intltool
];
rev-prefix = "xfce4-cpugraph-plugin-";
odd-unstable = false;
sha256 = "sha256-Elm10ZGN93R+1XZ4vJJZZIJ6OcaHpsrH0nQRMMuFnLY=";
buildInputs = [
glib
exo
gtk3
libXtst
xorgproto
libxfce4util
libxfce4ui
libxfce4util
xfce4-panel
xfconf
gtk3
hicolor-icon-theme
xorgproto
];
passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
meta = with lib; {
homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin";
description = "CPU graph show for Xfce panel";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
}

4
pkgs/development/compilers/nextpnr/default.nix
View File

@ -14,14 +14,14 @@ let
in
stdenv.mkDerivation rec {
pname = "nextpnr";
version = "0.3";
version = "0.4";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "nextpnr";
rev = "${pname}-${version}";
hash = "sha256-q4h1TNAn66fJou8abNFowRbGXZTBfz5x+H5Q/psMvIw=";
hash = "sha256-gnNUFSV+/SzCuP43KyUUgVNdAzjOM7lOLNJT72L8lTY=";
name = "nextpnr";
})
(fetchFromGitHub {

4
pkgs/development/compilers/swi-prolog/default.nix
View File

@ -34,7 +34,7 @@
}:
let
version = "8.5.17";
version = "8.3.29";
packInstall = swiplPath: pack:
''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
'';
@ -47,7 +47,7 @@ stdenv.mkDerivation {
owner = "SWI-Prolog";
repo = "swipl-devel";
rev = "V${version}";
sha256 = "sha256-n1o6eG40DHnmNXuifQC6UFwGzuiL22V++0qRmq1RSzc=";
sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU=";
fetchSubmodules = true;
};

15
pkgs/development/embedded/fpga/trellis/default.nix
View File

@ -1,30 +1,27 @@
{ lib, stdenv, fetchFromGitHub, python3, boost, cmake }:
let
rev = "2f06397673bbca3da11928d538b8ab7d01c944c6";
rev = "488f4e71073062de314c55a037ede7cf03a3324c";
# git describe --tags
realVersion = "1.0-534-g${builtins.substring 0 7 rev}";
realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}";
in stdenv.mkDerivation rec {
pname = "trellis";
version = "2021-12-14";
version = "unstable-2022-09-14";
srcs = [
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis";
inherit rev;
hash = "sha256-m5CalAIbzY2bhOvpBbPBeLZeDp+itk1HlRsSmtiddaA=";
hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw=";
name = "trellis";
})
(fetchFromGitHub {
owner = "YosysHQ";
repo = "prjtrellis-db";
# note: the upstream submodule points to revision 0ee729d20eaf,
# but that's just the tip of the branch that was merged into master.
# fdf4bf275a is the merge commit itself
rev = "fdf4bf275a7402654bc643db537173e2fbc86103";
sha256 = "eDq2wU2pnfK9bOkEVZ07NQPv02Dc6iB+p5GTtVBiyQA=";
rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa";
hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0=";
name = "trellis-database";
})
];

6
pkgs/development/interpreters/lunatic/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "lunatic";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "lunatic-solutions";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MfN4NZIkzQji+bIfpgDdVyGXiD291ULGT2JslSevr/w=";
sha256 = "sha256-MQ10WwvUdqU4w9uA4H1+VRM29HXVtLMwfGvbM6VqS90=";
};
cargoSha256 = "sha256-Qpu6FKIrDZyEbcv/uRjInz6lmMeTSZvY/JGLJe+My+U=";
cargoSha256 = "sha256-tNYA3YruI7VENmLbd3rmZr7BkqHp1HNOfzPTkIiixqA=";
nativeBuildInputs = [ cmake ];

6
pkgs/development/interpreters/wasmtime/default.nix
View File

@ -2,17 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
sha256 = "sha256-e5YEHVALk6wJ76dl68mT+ncztU2FjpFqTp6YS9Gsz2c=";
sha256 = "sha256-dQ5RAeJYEfU/WcHf9Xz1jjetlEePB1oHDAbKpzqkda4=";
fetchSubmodules = true;
};
cargoSha256 = "sha256-q0eS5vPOh/VhC+oke2GeZX18GmrHwrsaMXcHK0jBZ7A=";
cargoSha256 = "sha256-0xEMlt1d6E+APf6SQ23E+mS/U4f0ziRpn2tTF9nSbx4=";
cargoBuildFlags = [
"--package wasmtime-cli"

2
pkgs/development/libraries/arrow-cpp/default.nix
View File

@ -39,7 +39,7 @@
, zstd
, enableShared ? !stdenv.hostPlatform.isStatic
, enableFlight ? true
, enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin)
, enableJemalloc ? !stdenv.isDarwin
# boost/process is broken in 1.69 on darwin, but fixed in 1.70 and
# non-existent in older versions
# see https://github.com/boostorg/process/issues/55

4
pkgs/development/libraries/irrlichtmt/default.nix
View File

@ -15,13 +15,13 @@
}:
stdenv.mkDerivation rec {
pname = "irrlichtmt";
version = "1.9.0mt7";
version = "1.9.0mt8";
src = fetchFromGitHub {
owner = "minetest";
repo = "irrlicht";
rev = version;
sha256 = "sha256-Eu7zW3mXl7GPRmLnKjt/dPoZ64HPYulI7MO1dJfj+10=";
sha256 = "sha256-bwpALhBk16KugYqKuN57M3t5Ba7rdyrYWn/iBoi8hpg=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
View File

@ -8,13 +8,13 @@
nv-codec-headers = nv-codec-headers-11;
}).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg";
version = "5.1.1-1";
version = "5.1.1-2";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-ffmpeg";
rev = "v${version}";
sha256 = "sha256-WxUADm5z6SH6Xegi2dhhien5IBY/Y/ZZaXr7MdOvpYA=";
sha256 = "sha256-aviluHVNGxbWkmJ6mnlFbtRKKb0FoKkNw0Bgl+tmqyA=";
};
configureFlags = old.configureFlags ++ [

4
pkgs/development/libraries/kdsoap/default.nix
View File

@ -7,11 +7,11 @@
mkDerivation rec {
pname = "kdsoap";
version = "2.0.0";
version = "2.1.1";
src = fetchurl {
url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz";
sha256 = "sha256-0YljEE+m99ArBEYxzdvnjxj3DgbGB69oDHrOBNbPBO4=";
sha256 = "sha256-rtV/ayAN33YvXSiY9+kijdBwCIHESRrv5ABvf6X1xic=";
};
outputs = [ "out" "dev" ];

3
pkgs/development/libraries/onnxruntime/default.nix
View File

@ -86,6 +86,9 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace cmake/external/abseil-cpp.cmake \
--replace "${abseil.url}" "${abseil}"
substituteInPlace cmake/libonnxruntime.pc.cmake.in \
--replace '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
'';
postInstall = ''

19
pkgs/development/libraries/qpdf/default.nix
View File

@ -1,29 +1,28 @@
{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, perl }:
{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, cmake, perl }:
stdenv.mkDerivation rec {
pname = "qpdf";
version = "10.6.3";
version = "11.1.0";
src = fetchFromGitHub {
owner = "qpdf";
repo = "qpdf";
rev = "release-qpdf-${version}";
hash = "sha256-SiZA8T7N1SWlbCFosSqFosLDV/3Q7+ywvgq1iB4umdg=";
rev = "v${version}";
hash = "sha256-T06BLtDZN6ulJ9Po3LN1RlI6q8ddAfo95RAhyfrn+qg=";
};
nativeBuildInputs = [ perl ];
nativeBuildInputs = [ cmake perl ];
buildInputs = [ zlib libjpeg ];
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-random=/dev/urandom";
preCheck = ''
preConfigure = ''
patchShebangs qtest/bin/qtest-driver
patchShebangs run-qtest
# qtest needs to know where the source code is
substituteInPlace CMakeLists.txt --replace "run-qtest" "run-qtest --top $src --code $src --bin $out"
'';
doCheck = true;
enableParallelBuilding = true;
meta = with lib; {
homepage = "http://qpdf.sourceforge.net/";

2
pkgs/development/node-packages/overrides.nix
View File

@ -361,7 +361,7 @@ final: prev: {
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
sha512 = "sha512-HuYqnTDgH8atjPGtYmY0Ql9XrrJnfW7daG1PtAJRW0E6gJxc50lY3vrIDn0yjMR3TvRlypjTcspQX8DT+xD4Sg==";
sha512 = "sha512-l/QKLmLcKJQFuc+X02LyICo0NWTUVaNNZ00jKJBqwDyhwMAhboD1FWwYV50rkH4Wls0RviAJSFzkC2ZrfawpfA==";
};
postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \

12
pkgs/development/python-modules/emcee/default.nix
View File

@ -4,17 +4,21 @@
, numpy
, pytestCheckHook
, setuptools-scm
, pythonOlder
}:
buildPythonPackage rec {
pname = "emcee";
version = "3.1.2";
version = "3.1.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dfm";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-MguhnLLo1zeNuMca8vWpxwysh9YJDD+IzvGQDbScK2M=";
hash = "sha256-HAuwWFNL63BlvHomQx+hWw4et7kRYd3zhH2FAj632Lg=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -31,7 +35,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "emcee" ];
pythonImportsCheck = [
"emcee"
];
meta = with lib; {
description = "Kick ass affine-invariant ensemble MCMC sampling";

4
pkgs/development/python-modules/fakeredis/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "1.9.1";
version = "1.9.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "dsoftwareinc";
repo = "fakeredis-py";
rev = "refs/tags/v${version}";
hash = "sha256-3jsTNwxUZzkNxutYqK8lI37Cexrii6QydikW/TkUqbk=";
hash = "sha256-tZ+t4s5V8Na2Lt/TlkdJi7vZxlxAaMbk3MvxUhdQOLs=";
};
nativeBuildInputs = [

8
pkgs/development/python-modules/pikepdf/default.nix
View File

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "5.4.2";
version = "6.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -39,7 +39,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-b4QUn+wfkk6Yx74ViBg6yaE1+bXtxidoyXYgBaJ9iiM=";
hash = "sha256-rwMSmARUrScG2nmiYBSkcq0NuUMhn0pHOPvgdKZbH7w=";
};
patches = [
@ -51,10 +51,8 @@ buildPythonPackage rec {
];
postPatch = ''
sed -i 's|\S*/opt/homebrew.*|pass|' setup.py
substituteInPlace setup.py \
--replace setuptools_scm_git_archive ""
--replace "shims_enabled = not cflags_defined" "shims_enabled = False"
'';
SETUPTOOLS_SCM_PRETEND_VERSION = version;

25
pkgs/development/python-modules/pikepdf/paths.patch
View File

@ -12,10 +12,10 @@ index 2a170c6..5ee3ba1 100644
check=True,
)
diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py
index be390a1..3818ec3 100644
index 28c596b..aff3565 100644
--- a/src/pikepdf/jbig2.py
+++ b/src/pikepdf/jbig2.py
@@ -31,7 +31,7 @@ def extract_jbig2(
@@ -28,7 +28,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
output_path = Path(tmpdir) / "outfile"
args = [
@ -24,21 +24,12 @@ index be390a1..3818ec3 100644
"--embedded",
"--format",
"png",
@@ -64,7 +64,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
output_path = Path(tmpdir) / "outfile"
args = [
- "jbig2dec",
+ "@jbig2dec@",
"--embedded",
"--format",
"png",
@@ -100,7 +100,7 @@ def extract_jbig2_bytes(
def _check_jbig2dec_available() -> None: # pragma: no cover
@@ -88,7 +88,7 @@ class JBIG2Decoder(JBIG2DecoderInterface):
def _version(self) -> Version:
try:
- proc = run(['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii')
+ proc = run(['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii')
proc = run(
- ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii'
+ ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii'
)
except (CalledProcessError, FileNotFoundError) as e:
raise DependencyError("jbig2dec - not installed or not found") from e
else:

10
pkgs/development/python-modules/xml2rfc/default.nix
View File

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "xml2rfc";
version = "3.14.2";
version = "3.15.0";
disabled = pythonOlder "3.6";
@ -34,19 +34,15 @@ buildPythonPackage rec {
owner = "ietf-tools";
repo = "xml2rfc";
rev = "refs/tags/v${version}";
sha256 = "sha256-7UKav9IOH3u/3ZPDWVTBSf+A1li65qK2qASJpNVezdI=";
sha256 = "sha256-sCpV4pmBIBFxFpDK7H9riQ+0174xCn6uVztGDAEeoII=";
};
postPatch = ''
substituteInPlace Makefile \
--replace "SHELL := /bin/bash" "SHELL := bash" \
--replace "test flaketest" "test" \
--replace "python setup.py --quiet install" ""
--replace "test flaketest" "test"
substituteInPlace setup.py \
--replace "'tox'," ""
substituteInPlace requirements.txt \
--replace "jinja2>=2.11,<3.0" "jinja2" \
--replace "markupsafe==2.0.1" "markupsafe"
'';
propagatedBuildInputs = [

28
pkgs/development/tools/argc/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "argc";
version = "0.11.0";
src = fetchFromGitHub {
owner = "sigoden";
repo = pname;
rev = "v${version}";
sha256 = "1gzsp08x54bsvzjm09cr1lgdr5mq1gzs36x2fjd710ixwcf9fcb6";
};
cargoSha256 = "sha256-LIQ/j4NMYwrwBQkEYlrqRobrfkPERwtWZqT8pwSoICA=";
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion completions/argc.{bash,zsh}
'';
meta = with lib; {
description = "A tool to handle sh/bash cli parameters";
homepage = "https://github.com/sigoden/argc";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ figsoda ];
};
}

6
pkgs/development/tools/build-managers/bob/default.nix
View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "bob";
version = "0.5.3";
version = "0.6.2";
src = fetchFromGitHub {
owner = "benchkram";
repo = pname;
rev = version;
hash = "sha256-JG1fysCqqd/MwpNhKJwLr4cTGq4/88f9OMMapb+r3bc=";
hash = "sha256-Bq/BL45EN4h7eV1glCkuVqUhZCrDS5b5mVg6JJxlTD4=";
};
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
vendorHash = "sha256-R+zXGR5isoo76oc4lsFf9uCM0Kyi8dQiKEg4BUxtv+k=";
vendorHash = "sha256-jakmXkDHjcA1BOIorrP2ZukcJhosbkJoC+Y/+wAPBCc=";
excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ];

6
pkgs/development/tools/database/prisma-engines/default.nix
View File

@ -13,19 +13,19 @@
# function correctly.
rustPlatform.buildRustPackage rec {
pname = "prisma-engines";
version = "4.2.1";
version = "4.4.0";
src = fetchFromGitHub {
owner = "prisma";
repo = "prisma-engines";
rev = version;
sha256 = "sha256-TlKjAfpygQq2c77d6ZoMIBtWC0bAiMiKygFkh5GrBBc=";
sha256 = "sha256-gk+psYNSC5Xy6R3aUF0E9TyJgJ78+EMvz/xnPgN3+RY=";
};
# Use system openssl.
OPENSSL_NO_VENDOR = 1;
cargoSha256 = "sha256-KkCq7h6qqh37LvA4wQYjLk/LPKCg5Wgl6tEhH55qh8M=";
cargoSha256 = "sha256-BiQMoY2hd5q05YZBrTrHlKDtWlOkyfWjjNB/8F2+lXg=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/tools/database/sqlfluff/default.nix
View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-IUHV08X6U5GHuKsFh6yYetKX+nRf7C6PIXb+b7AD9po=";
hash = "sha256-mwGDSppOcpvwPtMNzElZtwYigIHhw3GUnza4ZXCCEvc=";
};
propagatedBuildInputs = with python3.pkgs; [

4
pkgs/development/tools/oh-my-posh/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "11.0.1";
version = "11.1.1";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ovbhU23m4idWOSmdzPh5RH5/DxPjzsk1qqccIzGjNY4=";
sha256 = "sha256-6BTH4wiiiQEP8DMq+pYHizIgnJrj8bO3i/RIwvqAYbQ=";
};
vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E=";

8
pkgs/development/tools/rust/cargo-hack/default.nix
View File

@ -2,22 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hack";
version = "0.5.20";
version = "0.5.21";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-V6ENO9KzZXkBF19stySSTLXSWnZym6FXaWjAEHuluQs=";
sha256 = "sha256-E0YhpfFT1JQzXWK3cQfieZ8TVg+BRGwHL6cTwOrNVSQ=";
};
cargoSha256 = "sha256-5kIzTO02zurjoU6H+iDif9UV3KY0tPFvvZlg6sNRJwg=";
cargoSha256 = "sha256-AfILqelDRJuVVEoOT2FLKHq4QVEZXbwPSM0s4fpP00A=";
# some necessary files are absent in the crate version
doCheck = false;
meta = with lib; {
description = "Cargo subcommand to provide various options useful for testing and continuous integration";
changelog = "https://github.com/taiki-e/cargo-hack/blob/v${version}/CHANGELOG.md";
homepage = "https://github.com/taiki-e/cargo-hack";
changelog = "https://github.com/taiki-e/cargo-hack/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ figsoda ];
};

22
pkgs/development/tools/rust/dioxus-cli/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ fetchCrate, lib, rustPlatform, openssl, pkg-config }:
rustPlatform.buildRustPackage rec {
pname = "dioxus-cli";
version = "0.1.4";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-SnmDOMxc+39LX6kOzma2zA6T91UGCnvr7WWhX+wXnLo=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
cargoSha256 = "sha256-Mf/WtOO/vFuhg90DoPDwOZ6XKj423foHZ8vHugXakb0=";
meta = with lib; {
description = "CLI tool for developing, testing, and publishing Dioxus apps";
homepage = "https://dioxuslabs.com";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ xanderio ];
};
}

6
pkgs/development/tools/rust/rust-analyzer/default.nix
View File

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2022-09-19";
cargoSha256 = "sha256-GoGnhO1WaDpNrxyOj2xJPirwmsZ2IESDmA7orryupfo=";
version = "2022-09-26";
cargoSha256 = "sha256-Wq5fI/ohoTHEjx0wa8De2uh8cG5+92H+vAfDa25JilY=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-aG6JOn3BG/2U1zuusB4bwLnPMXNoAeDSL8MWUCDLvl8=";
sha256 = "sha256-aCHudrXd8DKocehX6aWzlbZv4bq2l7MFXhM/wc2NdmI=";
};
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];

14
pkgs/games/minetest/default.nix
View File

@ -118,18 +118,16 @@ let
description = "Infinite-world block sandbox game";
license = licenses.lgpl21Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ pyrolagus fpletz ];
# never built on Hydra
# https://hydra.nixos.org/job/nixpkgs/trunk/minetestclient_4.x86_64-darwin
# https://hydra.nixos.org/job/nixpkgs/trunk/minetestserver_4.x86_64-darwin
broken = (lib.versionOlder version "5.0.0") && stdenv.isDarwin;
maintainers = with maintainers; [ pyrolagus fpletz fgaz ];
# https://github.com/NixOS/nixpkgs/pull/186160#issuecomment-1212635918
broken = stdenv.isDarwin;
};
};
v5 = {
version = "5.6.0";
sha256 = "sha256-wcbYcVHs4L0etOwUBjKvzsmZtnpOxpFgLV8nx3UfJQI=";
dataSha256 = "sha256-TVaDHYstFEuT0nBExwLE1PtM1CZh71t9CRxC9rEYTd4=";
version = "5.6.1";
sha256 = "sha256-1mUmtM09jqJhD2RcLCAjaI+JkqP52QYH3KLkY5MZ860=";
dataSha256 = "sha256-Ye8MihrOqjSoy+vNr/CM/C/sNXdexe08dxrmoMxsG/A=";
};
mkClient = version: generic (version // { buildClient = true; buildServer = false; });

6
pkgs/games/unvanquished/default.nix
View File

@ -33,7 +33,7 @@
}:
let
version = "0.53.1";
version = "0.53.2";
binary-deps-version = "6";
src = fetchFromGitHub {
@ -41,7 +41,7 @@ let
repo = "Unvanquished";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-AWXuPXOhhPfdDrcyZF5o7uBnieSCGhwCzOYN8MjgTl8=";
sha256 = "sha256-VqMhA6GEYh/m+dzOgXS+5Jqo4x7RrQf4qIwstdTTU+E=";
};
unvanquished-binary-deps = stdenv.mkDerivation rec {
@ -119,7 +119,7 @@ let
pname = "unvanquished-assets";
inherit version src;
outputHash = "sha256-+mO4HQwFfy7SeGrN4R52KOr/uNQXkHMvYir3k0l5rDo=";
outputHash = "sha256-MPqyqcZGc5KlkftGCspWhISBJ/h+Os29g7ZK6yWz0cQ=";
outputHashMode = "recursive";
nativeBuildInputs = [ aria2 cacert ];

35
pkgs/servers/matrix-synapse/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, python3, openssl
{ lib, stdenv, python3, openssl, rustPlatform
, enableSystemd ? stdenv.isLinux, nixosTests
, enableRedis ? true
, callPackage
@ -11,13 +11,35 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.67.0";
version = "1.68.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY=";
hash = "sha256-jQcprvKEbLuLWth0aWeh5mi/v8z83GIrjCsm3JdJcUM=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-k8iAYRgFCuv6QYAUW5kSEwFSEXVNAEGpPya7biS1Vlo=";
};
postPatch = ''
# Remove setuptools_rust from runtime dependencies
# https://github.com/matrix-org/synapse/blob/v1.68.0/pyproject.toml#L177-L185
sed -i '/^setuptools_rust =/d' pyproject.toml
'';
nativeBuildInputs = [
poetry-core
rustPlatform.cargoSetupHook
setuptools-rust
] ++ (with rustPlatform.rust; [
cargo
rustc
]);
buildInputs = [ openssl ];
propagatedBuildInputs = [
@ -63,7 +85,14 @@ buildPythonApplication rec {
doCheck = !stdenv.isDarwin;
checkPhase = ''
runHook preCheck
# remove src module, so tests use the installed module instead
rm -rf ./synapse
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
runHook postCheck
'';
passthru.tests = { inherit (nixosTests) matrix-synapse; };

6
pkgs/servers/minio/default.nix
View File

@ -15,16 +15,16 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2022-09-22T18-57-27Z";
version = "2022-09-25T15-44-53Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-y8FgfUQG5vuBCqLmTtiIdpduJhfLZ7oSvOgPBYV+sQY=";
sha256 = "sha256-ygDE7oqNddC+7kIkGu3QuswQp1Mh441rHvwF2JIKOzE=";
};
vendorSha256 = "sha256-zXEGukIHfb9CX+GJFcpVwo2UFZSJoc8Iq6olDKqh/gM=";
vendorSha256 = "sha256-nl7lQ+PnfEgEnc/g2PIpsSQH18v/YF5yw+tlIYWNP1A=";
doCheck = false;

4
pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "check_ssl_cert";
version = "2.47.0";
version = "2.48.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "v${version}";
hash = "sha256-8Xzu9uyShhJ/gmEs60qJ9W+00NSTCpNe2nqa9aT19ng=";
hash = "sha256-uaDeg7Dph99NWN0pKHrffBYOOzN8/1fW2YBEE8vnYMs=";
};
nativeBuildInputs = [

6
pkgs/servers/web-apps/vikunja/api.nix
View File

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "vikunja-api";
version = "0.19.0";
version = "0.19.2";
src = fetchFromGitea {
domain = "kolaente.dev";
owner = "vikunja";
repo = "api";
rev = "v${version}";
sha256 = "sha256-1BxkQFiAqH+n8yzQn0+5cd/Z6oEBbGuK1pu1qt8CUbk=";
sha256 = "sha256-KI/RgtyjO+LdsoZ0JMo7xHeINpUAd5nDvd/WiWYEA6c=";
};
nativeBuildInputs =
@ -24,7 +24,7 @@ buildGoModule rec {
'';
in [ fakeGit mage ];
vendorSha256 = "fzk22B7KpXfGS+8GF6J3ydmFyvP7oelRuiF+IveYdg4=";
vendorSha256 = "sha256-ZEmZeIB+uL1/JWEfBd7gZuGNF95pdiJfu5+FY2+sL64=";
# checks need to be disabled because of needed internet for some checks
doCheck = false;

4
pkgs/servers/web-apps/vikunja/frontend.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "vikunja-frontend";
version = "0.19.0";
version = "0.19.1";
src = fetchurl {
url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip";
sha256 = "sha256-pdUNPfGgbSMyXcS2HKMekIiIzJ3GutHCs0gFVkHN9yc=";
sha256 = "sha256-Kf55M1m/NBQhgaul/4seDMdPFU8jhgOwTNAzdgVg2OQ=";
};
nativeBuildInputs = [ unzip ];

14
pkgs/servers/web-apps/wordpress/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, nixosTests }:
{ lib, stdenv, fetchurl, nixosTests, writeScript }:
stdenv.mkDerivation rec {
pname = "wordpress";
version = "6.0.1";
version = "6.0.2";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
sha256 = "sha256-9nhZaASqidfNySgIYpOEZOqyWurr/vqRrhdeFao+8FQ=";
sha256 = "sha256-UG5FYlJowBy71DJHgoDE1/lIIndp0qx1yFlDIeMV0Og=";
};
installPhase = ''
@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
inherit (nixosTests) wordpress;
};
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts jq
set -eu -o pipefail
version=$(curl --globoff "https://api.wordpress.org/core/version-check/1.7/" | jq -r '.offers[0].version')
update-source-version wordpress $version
'';
meta = with lib; {
homepage = "https://wordpress.org";
description = "WordPress is open source software you can use to create a beautiful website, blog, or app";

4
pkgs/tools/backup/gyb/default.nix
View File

@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "gyb";
version = "1.70";
version = "1.71";
format = "other";
src = fetchFromGitHub {
owner = "GAM-team";
repo = "got-your-back";
rev = "refs/tags/v${version}";
sha256 = "sha256-Hgdjm59RcgUb2oi0JWP7VxowVk4v9zwqnsmKAGvrxHM=";
sha256 = "sha256-JbKaEwWSFVBn7Ds7abhuUfTk3ax9sgJp1do4BRUh9Y8=";
};
propagatedBuildInputs = with python3Packages; [

39
pkgs/tools/misc/fw/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2
, openssl
, stdenv
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "fw";
version = "2.16.1";
src = fetchFromGitHub {
owner = "brocode";
repo = pname;
rev = "v${version}";
sha256 = "1nhkirjq2q9sxg4k2scy8vxlqa9ikvr5lid0f22vws07vif4kkfs";
};
cargoSha256 = "sha256-iD3SBSny0mYpmVEInYaylHn0AbtIqTOwJHdFeq3UBaM=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
Security
];
OPENSSL_NO_VENDOR = 1;
USER = "nixbld";
meta = with lib; {
description = "A workspace productivity booster";
homepage = "https://github.com/brocode/fw";
license = licenses.wtfpl;
maintainers = with maintainers; [ figsoda ];
};
}

4
pkgs/tools/misc/instaloader/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "instaloader";
version = "4.9.4";
version = "4.9.5";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "instaloader";
repo = "instaloader";
rev = "refs/tags/v${version}";
sha256 = "sha256-R26+ZvbUs4b5X1+wn6V7K7JqJsP31x7x5HVh+aPi8VU=";
sha256 = "sha256-3uO5EVK5mR3BwDF885onEraP3NYACTRwnGOsM009uig=";
};
propagatedBuildInputs = [

6
pkgs/tools/misc/macchina/default.nix
View File

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "macchina";
version = "6.1.5";
version = "6.1.6";
src = fetchFromGitHub {
owner = "Macchina-CLI";
repo = pname;
rev = "v${version}";
sha256 = "sha256-420Ng/LgmcYPH5q0boDaBjlWgLSeySXW/BTOp9+2XgA=";
sha256 = "sha256-0wPMx3IMYhB3XxSsTRqKIsNCGghnRcpwZloHjLxjlMo=";
};
cargoSha256 = "sha256-uRgHKj3EeT1Nq7j5koOovZJTVoVPVeBL8wLogJJoCfU=";
cargoSha256 = "sha256-QaqRIc3eKp7Wy5798wCCA4hk9Twa5Nr1mXTIxf+Hy/Q=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

4
pkgs/tools/networking/nebula/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nebula";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "slackhq";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JUFMcqu24YK1FjaNPkQLOtkyEhvqZPXZyFV+HBAKn5w=";
sha256 = "sha256-IsLSlQsrfw3obkz4jHL23BRQY2fviGbPEvs5j0zkdX0=";
};
vendorSha256 = "sha256-GvMiOEC3Y/pGG++Z+XCgLVADKymUR9shDxjx3xIz8u0=";

6
pkgs/tools/networking/xxh/default.nix
View File

@ -10,7 +10,7 @@
buildPythonApplication rec{
pname = "xxh";
version = "0.8.10";
version = "0.8.11";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,8 +18,8 @@ buildPythonApplication rec{
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-2RMzgIAhM//XReCFBGlTlXn9j4WQiM/k2pLxP2iPUy8=";
rev = "refs/tags/${version}";
hash = "sha256-xZVQamTEQpwxKZxOOhQyaDP4fX2dAI1CTNL94tHuGIw=";
};
propagatedBuildInputs = [

14
pkgs/tools/networking/zerotierone/default.nix
View File

@ -26,13 +26,6 @@ let
in stdenv.mkDerivation {
inherit pname version src;
cargoDeps = rustPlatform.fetchCargoTarball {
src = "${src}/zeroidc";
name = "${pname}-${version}";
sha256 = "sha256-8K4zAXo85MT4pfIsg7DZAO+snfwzdo2TozVw17KhX4Q=";
};
postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock";
preConfigure = ''
patchShebangs ./doc/build.sh
substituteInPlace ./doc/build.sh \
@ -41,12 +34,17 @@ in stdenv.mkDerivation {
substituteInPlace ./make-linux.mk \
--replace '-march=armv6zk' "" \
--replace '-mcpu=arm1176jzf-s' ""
# Upstream does not define the cargo settings necessary to use the vendorized rust-jwt version, so it has to be added manually.
# Can be removed once ZeroTierOne's zeroidc no longer uses a git url in Cargo.toml for jwt
echo '[source."https://github.com/glimberg/rust-jwt"]
git = "https://github.com/glimberg/rust-jwt"
replace-with = "vendored-sources"' >> ./zeroidc/.cargo/config.toml
'';
nativeBuildInputs = [
pkg-config
ronn
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
];

6
pkgs/tools/security/gitsign/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "gitsign";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ldVBaKBa9Rq15OXb0nAqY70RH5Ww9DRNmKZ5spuBOzc=";
sha256 = "sha256-jL39U7kmdy5lo/caetpFlFCLfby6ftMWDMPq6yt3nUk=";
};
vendorSha256 = "sha256-hE+P6dS/tC+y9Pf5IGy23a5j7VSDvedzcNTkLK4soiA=";
vendorSha256 = "sha256-9tmENlR3vVELmT7JWcz7RhtIji7go2V/Bsu9nMrvHfs=";
ldflags = [ "-s" "-w" "-buildid=" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ];

6
pkgs/tools/security/lethe/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "lethe";
version = "0.8.0";
version = "0.8.2";
src = fetchFromGitHub {
owner = "kostassoid";
repo = pname;
rev = "v${version}";
sha256 = "sha256-o57WtzTouIzB0yl6lEUwpav0rm+jwD5tyBqK/MRN+ME=";
sha256 = "sha256-y2D/80pnpYpTl+q9COTQkvtj9lzBlOWuMcnn5WFnX8E=";
};
cargoSha256 = "sha256-flj4p4qAMMy46/nY48lRNcyB8KzEUoYOfhDk7xR7qQU=";
cargoSha256 = "sha256-SFNNpbHZdDJvH95f+VWyVKnQp3OJwQmCOqHtLAhhkOk=";
buildInputs = lib.optional stdenv.isDarwin Security;

6
pkgs/tools/system/gdu/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gdu";
version = "5.18.1";
version = "5.19.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Bz7oiW8UEnin3Wd8nYrqk5WI7EbRHSCsoxpuWXzHK5c=";
sha256 = "sha256-876O7LdKqmg3oWNoboGId5jcdiGND1HyIMefy1uYu/g=";
};
vendorSha256 = "sha256-rppVLeX1VDOW+eUHSM77DgY2KjOrUHdyqGWRAYRIbUE=";
vendorSha256 = "sha256-UP6IdJLc93gRP4vwKKOJl3sNt4sOFeYXjvwk8QM+D48=";
nativeBuildInputs = [ installShellFiles ];

23
pkgs/tools/text/comrak/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "comrak";
version = "0.14.0";
src = fetchFromGitHub {
owner = "kivikakk";
repo = pname;
rev = version;
sha256 = "0a01s9lqhqjqpycszfkgmxk60bk4h2ja9ykdhp32aqvcdsjsj763";
};
cargoSha256 = "sha256-+OQ4np+JaHMm3n4uayqlAwx+DTi5k4NgKEOWA2lB/BQ=";
meta = with lib; {
description = "A CommonMark-compatible GitHub Flavored Markdown parser and formatter";
homepage = "https://github.com/kivikakk/comrak";
changelog = "https://github.com/kivikakk/comrak/blob/${version}/changelog.txt";
license = licenses.bsd2;
maintainers = with maintainers; [ figsoda ];
};
}

29
pkgs/tools/text/teip/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, rustPlatform, fetchCrate, installShellFiles, perl }:
rustPlatform.buildRustPackage rec {
pname = "teip";
version = "2.0.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-fME+tS8wcC6mk5FjuDJpFWWhIsiXV4kuybSqj9awFUM=";
};
cargoSha256 = "sha256-wrfS+OEYF60nOhtrnmk7HKqVuAJQFaiT0GM+3OoZ3Wk=";
nativeBuildInputs = [ installShellFiles ];
checkInputs = [ perl ];
postInstall = ''
installManPage man/teip.1
installShellCompletion --zsh completion/zsh/_teip
'';
meta = with lib; {
description = "A tool to bypass a partial range of standard input to any command";
homepage = "https://github.com/greymd/teip";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

4
pkgs/tools/virtualization/kubevirt/default.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "kubevirt";
version = "0.57.0";
version = "0.57.1";
src = fetchFromGitHub {
owner = "kubevirt";
repo = "kubevirt";
rev = "v${version}";
sha256 = "sha256-+35z953dgb6lJpC/8+VcrHLY6yXINoDxq6GxkEEVOgU=";
sha256 = "sha256-b832NNAoLYiHfvAm2eWGa8Odlppj8hLKl7jQA09s+4k=";
};
vendorSha256 = null;

18
pkgs/top-level/all-packages.nix
View File

@ -1508,6 +1508,10 @@ with pkgs;
fuse-emulator = callPackage ../applications/emulators/fuse-emulator {};
fw = callPackage ../tools/misc/fw {
inherit (darwin.apple_sdk.frameworks) Security;
};
gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };
@ -2865,6 +2869,8 @@ with pkgs;
aptdec = callPackage ../development/libraries/aptdec {};
argc = callPackage ../development/tools/argc { };
aria2 = callPackage ../tools/networking/aria2 {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -3509,6 +3515,8 @@ with pkgs;
compsize = callPackage ../os-specific/linux/compsize { };
comrak = callPackage ../tools/text/comrak { };
cot = with python3Packages; toPythonApplication cot;
coturn = callPackage ../servers/coturn {
@ -5768,6 +5776,10 @@ with pkgs;
dockbarx = callPackage ../applications/misc/dockbarx { };
doctave = callPackage ../applications/misc/doctave {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
dog = callPackage ../tools/system/dog { };
dogdns = callPackage ../tools/networking/dogdns {
@ -11569,6 +11581,8 @@ with pkgs;
teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { };
teip = callPackage ../tools/text/teip { };
telegraf = callPackage ../servers/monitoring/telegraf { };
teleport = callPackage ../servers/teleport {
@ -16439,6 +16453,8 @@ with pkgs;
dive = callPackage ../development/tools/dive { };
dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { };
doclifter = callPackage ../development/tools/misc/doclifter { };
docutils = with python3Packages; toPythonApplication docutils;
@ -31678,6 +31694,8 @@ with pkgs;
thinkingRock = callPackage ../applications/misc/thinking-rock { };
thokr = callPackage ../applications/misc/thokr { };
thonny = callPackage ../applications/editors/thonny { };
thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix {

2
pkgs/top-level/stage.nix
View File

@ -259,6 +259,8 @@ let
crossSystem = {
isStatic = true;
parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed;
} // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") {
gcc.abi = "elfv2";
};
});
};