diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 693ea016e0a..fe28f94c069 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -288,7 +288,7 @@ self: super: {
ps: with ps; [
pyflakes
pytest
- python-language-server
+ black
]
))
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 81631a4293f..8b760f0c1fe 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -972,6 +972,12 @@
githubId = 1118815;
name = "Vikram Narayanan";
};
+ armeenm = {
+ email = "mahdianarmeen@gmail.com";
+ github = "armeenm";
+ githubId = 29145250;
+ name = "Armeen Mahdian";
+ };
armijnhemel = {
email = "armijn@tjaldur.nl";
github = "armijnhemel";
@@ -13976,6 +13982,13 @@
githubId = 6191421;
name = "Edward d'Albon";
};
+ zebreus = {
+ matrix = "@lennart:cicen.net";
+ email = "lennarteichhorn+nixpkgs@gmail.com";
+ github = "Zebreus";
+ githubId = 1557253;
+ name = "Lennart Eichhorn";
+ };
zef = {
email = "zef@zef.me";
name = "Zef Hemel";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 6da24e3a8a8..fcda25bf0f9 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -455,6 +455,12 @@
services.nifi.
+
+
+ kanidm,
+ an identity management server written in Rust.
+
+
diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix
index 6022227f6ea..e255e5d2218 100644
--- a/nixos/modules/services/home-automation/home-assistant.nix
+++ b/nixos/modules/services/home-automation/home-assistant.nix
@@ -360,7 +360,14 @@ in {
};
config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
+ assertions = [
+ {
+ assertion = cfg.openFirewall -> !isNull cfg.config;
+ message = "openFirewall can only be used with a declarative config";
+ }
+ ];
+
+ networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.config.http.server_port ];
systemd.services.home-assistant = {
description = "Home Assistant";
diff --git a/nixos/modules/services/misc/heisenbridge.nix b/nixos/modules/services/misc/heisenbridge.nix
index 7ce8a23d9af..deefb061d8b 100644
--- a/nixos/modules/services/misc/heisenbridge.nix
+++ b/nixos/modules/services/misc/heisenbridge.nix
@@ -204,7 +204,7 @@ in
NoNewPrivileges = true;
LockPersonality = true;
RestrictRealtime = true;
- SystemCallFilter = ["@system-service" "~@priviledged" "@chown"];
+ SystemCallFilter = ["@system-service" "~@privileged" "@chown"];
SystemCallArchitectures = "native";
RestrictAddressFamilies = "AF_INET AF_INET6";
};
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 78ae8e9d20b..8b57cae3c40 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -4,7 +4,10 @@ with lib;
let
- inherit (pkgs) plymouth nixos-icons;
+ inherit (pkgs) nixos-icons;
+ plymouth = pkgs.plymouth.override {
+ systemd = config.boot.initrd.systemd.package;
+ };
cfg = config.boot.plymouth;
opt = options.boot.plymouth;
@@ -143,7 +146,88 @@ in
systemd.services.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ];
systemd.paths.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ];
- boot.initrd.extraUtilsCommands = ''
+ boot.initrd.systemd = {
+ extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell
+ storePaths = [
+ "${lib.getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent"
+ "${plymouth}/bin/plymouthd"
+ "${plymouth}/sbin/plymouthd"
+ ];
+ packages = [ plymouth ]; # systemd units
+ contents = {
+ # Files
+ "/etc/plymouth/plymouthd.conf".source = configFile;
+ "/etc/plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults";
+ "/etc/plymouth/logo.png".source = cfg.logo;
+ # Directories
+ "/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" {} ''
+ # Check if the actual requested theme is here
+ if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then
+ echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages"
+ exit 1
+ fi
+
+ moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)"
+
+ mkdir -p $out/renderers
+ # module might come from a theme
+ cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out
+ cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/renderers
+ '';
+ "/etc/plymouth/themes".source = pkgs.runCommand "plymouth-initrd-themes" {} ''
+ # Check if the actual requested theme is here
+ if [[ ! -d ${themesEnv}/share/plymouth/themes/${cfg.theme} ]]; then
+ echo "The requested theme: ${cfg.theme} is not provided by any of the packages in boot.plymouth.themePackages"
+ exit 1
+ fi
+
+ mkdir $out
+ cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme} $out
+ # Copy more themes if the theme depends on others
+ for theme in $(grep -hRo '/etc/plymouth/themes/.*$' ${themesEnv} | xargs -n1 basename); do
+ if [[ -d "${themesEnv}/theme" ]]; then
+ cp -r "${themesEnv}/theme" $out
+ fi
+ done
+ '';
+
+ # Fonts
+ "/etc/plymouth/fonts".source = pkgs.runCommand "plymouth-initrd-fonts" {} ''
+ mkdir -p $out
+ cp ${cfg.font} $out
+ '';
+ "/etc/fonts/fonts.conf".text = ''
+
+
+
+ /etc/plymouth/fonts
+
+ '';
+ };
+ # Properly enable units. These are the units that arch copies
+ services = {
+ plymouth-halt.wantedBy = [ "halt.target" ];
+ plymouth-kexec.wantedBy = [ "kexec.target" ];
+ plymouth-poweroff.wantedBy = [ "poweroff.target" ];
+ plymouth-quit-wait.wantedBy = [ "multi-user.target" ];
+ plymouth-quit.wantedBy = [ "multi-user.target" ];
+ plymouth-read-write.wantedBy = [ "sysinit.target" ];
+ plymouth-reboot.wantedBy = [ "reboot.target" ];
+ plymouth-start.wantedBy = [ "initrd-switch-root.target" "sysinit.target" ];
+ plymouth-switch-root-initramfs.wantedBy = [ "halt.target" "kexec.target" "plymouth-switch-root-initramfs.service" "poweroff.target" "reboot.target" ];
+ plymouth-switch-root.wantedBy = [ "initrd-switch-root.target" ];
+ };
+ };
+
+ # Insert required udev rules. We take stage 2 systemd because the udev
+ # rules are only generated when building with logind.
+ boot.initrd.services.udev.packages = [ (pkgs.runCommand "initrd-plymouth-udev-rules" {} ''
+ mkdir -p $out/etc/udev/rules.d
+ cp ${config.systemd.package.out}/lib/udev/rules.d/{70-uaccess,71-seat}.rules $out/etc/udev/rules.d
+ sed -i '/loginctl/d' $out/etc/udev/rules.d/71-seat.rules
+ '') ];
+
+ boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
copy_bin_and_libs ${plymouth}/bin/plymouth
copy_bin_and_libs ${plymouth}/bin/plymouthd
@@ -198,18 +282,18 @@ in
EOF
'';
- boot.initrd.extraUtilsCommandsTest = ''
+ boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.enable) ''
$out/bin/plymouthd --help >/dev/null
$out/bin/plymouth --help >/dev/null
'';
- boot.initrd.extraUdevRulesCommands = ''
+ boot.initrd.extraUdevRulesCommands = mkIf (!config.boot.initrd.enable) ''
cp ${config.systemd.package}/lib/udev/rules.d/{70-uaccess,71-seat}.rules $out
sed -i '/loginctl/d' $out/71-seat.rules
'';
# We use `mkAfter` to ensure that LUKS password prompt would be shown earlier than the splash screen.
- boot.initrd.preLVMCommands = mkAfter ''
+ boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.enable) (mkAfter ''
mkdir -p /etc/plymouth
mkdir -p /run/plymouth
ln -s ${configFile} /etc/plymouth/plymouthd.conf
@@ -221,16 +305,16 @@ in
plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session
plymouth show-splash
- '';
+ '');
- boot.initrd.postMountCommands = ''
+ boot.initrd.postMountCommands = mkIf (!config.boot.initrd.enable) ''
plymouth update-root-fs --new-root-dir="$targetRoot"
'';
# `mkBefore` to ensure that any custom prompts would be visible.
- boot.initrd.preFailCommands = mkBefore ''
+ boot.initrd.preFailCommands = mkIf (!config.boot.initrd.enable) (mkBefore ''
plymouth quit --wait
- '';
+ '');
};
diff --git a/nixos/modules/system/boot/systemd/nspawn.nix b/nixos/modules/system/boot/systemd/nspawn.nix
index bf9995d03cc..da03c60db52 100644
--- a/nixos/modules/system/boot/systemd/nspawn.nix
+++ b/nixos/modules/system/boot/systemd/nspawn.nix
@@ -16,7 +16,7 @@ let
"LimitNOFILE" "LimitAS" "LimitNPROC" "LimitMEMLOCK" "LimitLOCKS"
"LimitSIGPENDING" "LimitMSGQUEUE" "LimitNICE" "LimitRTPRIO" "LimitRTTIME"
"OOMScoreAdjust" "CPUAffinity" "Hostname" "ResolvConf" "Timezone"
- "LinkJournal"
+ "LinkJournal" "Ephemeral" "AmbientCapability"
])
(assertValueOneOf "Boot" boolValues)
(assertValueOneOf "ProcessTwo" boolValues)
@@ -26,11 +26,13 @@ let
checkFiles = checkUnitConfig "Files" [
(assertOnlyFields [
"ReadOnly" "Volatile" "Bind" "BindReadOnly" "TemporaryFileSystem"
- "Overlay" "OverlayReadOnly" "PrivateUsersChown"
+ "Overlay" "OverlayReadOnly" "PrivateUsersChown" "BindUser"
+ "Inaccessible" "PrivateUserOwnership"
])
(assertValueOneOf "ReadOnly" boolValues)
(assertValueOneOf "Volatile" (boolValues ++ [ "state" ]))
(assertValueOneOf "PrivateUsersChown" boolValues)
+ (assertValueOneOf "PrivateUserOwnership" [ "off" "chown" "map" "auto" ])
];
checkNetwork = checkUnitConfig "Network" [
diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
index ccbfe76719e..d6e8de3efad 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
@@ -13,13 +13,13 @@
trivialBuild {
pname = "ement";
- version = "unstable-2022-04-22";
+ version = "unstable-2022-05-05";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "ement.el";
- rev = "70da19e4c9210d362b1d6d9c17ab2c034a03250d";
- sha256 = "sha256-Pxul0WrtyH2XZzF0fOOitLc3x/kc+Qc11RDH0n+Hm04=";
+ rev = "84739451afa8355360966dfa788d469d9dc4a8e3";
+ sha256 = "sha256-XdegBKZfoKbFaMM/l8249VD9KKC5/4gQIK6ggPcoOaE=";
};
packageRequires = [
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index d29d1d65346..75bfe5cff93 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -80,6 +80,13 @@ stdenv.mkDerivation rec {
url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch";
sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg=";
})
+
+ # Fix build with poppler 22.04
+ # https://gitlab.com/inkscape/inkscape/-/merge_requests/4266
+ (fetchpatch {
+ url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch";
+ sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE=";
+ })
];
postPatch = ''
diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix
index 9f3c1c82b5e..6f55e5dd17c 100644
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
- version = "1.22.4";
+ version = "1.22.5";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
- sha256 = "sha256-Mms7Vibq1Rlb2XbxiV4o1UsjDRJcwG5ZZdPOWHjnW2A=";
+ sha256 = "sha256-EuHg8JrI6ZoyTXqD3v4cfk4/NovAj4fF2NY1V2ZF64c=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 0ce8d8c373d..fc2c2ad618d 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,17 +1,16 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, wxGTK30-gtk3
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30-gtk3
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "21.09";
+ version = "22.03";
pname = "mediainfo-gui";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "0mqcqm8y2whnbdi2ry7jd755gfl5ccdqhwjh67hsyr7c0ajxk3vv";
+ sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ libzen libmediainfo wxGTK30-gtk3 desktop-file-utils libSM
- imagemagick ];
+ buildInputs = [ libmediainfo wxGTK30-gtk3 desktop-file-utils libSM imagemagick ];
sourceRoot = "./MediaInfo/Project/GNU/GUI/";
diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix
index a93436362ad..c05778d6aae 100644
--- a/pkgs/applications/misc/swaynotificationcenter/default.nix
+++ b/pkgs/applications/misc/swaynotificationcenter/default.nix
@@ -4,6 +4,7 @@
, meson
, ninja
, pkg-config
+, scdoc
, vala
, gtk3
, glib
@@ -20,16 +21,16 @@
stdenv.mkDerivation rec {
pname = "SwayNotificationCenter";
- version = "0.3";
+ version = "0.5";
src = fetchFromGitHub {
owner = "ErikReider";
repo = "SwayNotificationCenter";
rev = "v${version}";
- hash = "sha256-gXo/V2FHkHZBRmaimqJCzi0BqS4tP9IniIlubBmK5u0=";
+ hash = "sha256-Jjbr6GJ0MHlO+T/simPNYQnB5b7Cr85j4GRjRGa5B6s=";
};
- nativeBuildInputs = [ gobject-introspection meson ninja pkg-config vala wrapGAppsHook ];
+ nativeBuildInputs = [ gobject-introspection meson ninja pkg-config scdoc vala wrapGAppsHook ];
buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 json-glib libhandy librsvg ];
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index f2c8e6075d9..3ea247f4b08 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -10,6 +10,7 @@
, gtk3
, gsettings-desktop-schemas
, p7zip
+, autoPatchelfHook
, libXxf86vm
, unzip
}:
@@ -41,14 +42,17 @@ let
};
postPatch = ''
- patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so
- patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so
- patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so
- patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so
+ addAutoPatchelfSearchPath ${jre8}/lib/openjdk/jre/lib/
+ autoPatchelf lib
+
+ # Nix cannot see the runtime references to the paths we just patched in
+ # once they've been compressed into the .jar. Scan for and remember them
+ # as plain text so they don't get overlooked.
+ find . -name '*.so' | xargs strings | { grep '/nix/store' || :; } >> ./.jar-paths
'';
- nativeBuildInputs = [ makeWrapper unzip ];
- buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ];
+ nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ];
+ buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas libXxf86vm ];
buildPhase = ''
runHook preBuild
@@ -80,6 +84,13 @@ let
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"
+
+ # remember the store paths found inside the .jar libraries. note that
+ # which file they are in does not matter in particular, just that some
+ # file somewhere lists them in plain-text
+ mkdir -p $out/nix-support
+ cp .jar-paths $out/nix-support/depends
+
runHook postInstall
'';
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 43cd7183c51..2bcfd839e28 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "20220415";
+ version = "20220429";
pname = "neomutt";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = version;
- sha256 = "sha256-iVKDgVN7YFPEMP+OISS7jRG9Whs2QG60yH1r2kw3MUQ=";
+ sha256 = "sha256-LBY7WtmEMg/PcMS/Tc5XEYunIWjoI4IQfUJURKgy1YA=";
};
buildInputs = [
diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix
index 72b4c772048..86403883631 100644
--- a/pkgs/applications/networking/n8n/default.nix
+++ b/pkgs/applications/networking/n8n/default.nix
@@ -1,9 +1,8 @@
-{ pkgs, nodejs-14_x, stdenv, lib }:
+{ pkgs, nodejs-16_x, stdenv, lib }:
let
nodePackages = import ./node-composition.nix {
inherit pkgs;
- nodejs = nodejs-14_x;
inherit (stdenv.hostPlatform) system;
};
in
@@ -12,6 +11,13 @@ nodePackages.n8n.override {
node-pre-gyp
];
+ dontNpmInstall = true;
+
+ postInstall = ''
+ mkdir -p $out/bin
+ ln -s $out/lib/node_modules/n8n/bin/n8n $out/bin/n8n
+ '';
+
passthru.updateScript = ./generate-dependencies.sh;
meta = with lib; {
diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/applications/networking/n8n/generate-dependencies.sh
index f7412bc5e5e..7c1b90a0403 100755
--- a/pkgs/applications/networking/n8n/generate-dependencies.sh
+++ b/pkgs/applications/networking/n8n/generate-dependencies.sh
@@ -13,7 +13,7 @@
cd "$(dirname $(readlink -f $0))"
node2nix \
- --14 \
+ --nodejs-16 \
--strip-optional-dependencies \
--node-env node-env.nix \
--input package.json \
diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix
index 53bdef1f986..ca76a98f5a6 100644
--- a/pkgs/applications/networking/n8n/node-composition.nix
+++ b/pkgs/applications/networking/n8n/node-composition.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.11.1. Do not edit!
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix
index 5f055785791..2590dd267a4 100644
--- a/pkgs/applications/networking/n8n/node-env.nix
+++ b/pkgs/applications/networking/n8n/node-env.nix
@@ -98,7 +98,7 @@ let
''
+ (lib.concatMapStrings (dependency:
''
- if [ ! -e "${dependency.name}" ]; then
+ if [ ! -e "${dependency.packageName}" ]; then
${composePackage dependency}
fi
''
@@ -257,8 +257,8 @@ let
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(![1, 2].includes(packageLock.lockfileVersion)) {
- process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
- process.exit(1);
+ process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
+ process.exit(1);
}
if(packageLock.dependencies !== undefined) {
@@ -390,7 +390,7 @@ let
buildNodePackage =
{ name
, packageName
- , version
+ , version ? null
, dependencies ? []
, buildInputs ? []
, production ? true
@@ -409,7 +409,7 @@ let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
in
stdenv.mkDerivation ({
- name = "${name}-${version}";
+ name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
@@ -441,6 +441,14 @@ let
if [ -d "$out/lib/node_modules/.bin" ]
then
ln -s $out/lib/node_modules/.bin $out/bin
+
+ # Patch the shebang lines of all the executables
+ ls $out/bin/* | while read i
+ do
+ file="$(readlink -f "$i")"
+ chmod u+rwx "$file"
+ patchShebangs "$file"
+ done
fi
# Create symlinks to the deployed manual page folders, if applicable
@@ -471,7 +479,7 @@ let
buildNodeDependencies =
{ name
, packageName
- , version
+ , version ? null
, src
, dependencies ? []
, buildInputs ? []
@@ -489,7 +497,7 @@ let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
in
stdenv.mkDerivation ({
- name = "node-dependencies-${name}-${version}";
+ name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
@@ -519,6 +527,7 @@ let
if [ -f ${src}/package-lock.json ]
then
cp ${src}/package-lock.json .
+ chmod 644 package-lock.json
fi
''}
@@ -541,7 +550,7 @@ let
buildNodeShell =
{ name
, packageName
- , version
+ , version ? null
, src
, dependencies ? []
, buildInputs ? []
@@ -557,9 +566,10 @@ let
let
nodeDependencies = buildNodeDependencies args;
+ extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
in
- stdenv.mkDerivation {
- name = "node-shell-${name}-${version}";
+ stdenv.mkDerivation ({
+ name = "node-shell-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildCommand = ''
@@ -578,7 +588,7 @@ let
export NODE_PATH=${nodeDependencies}/lib/node_modules
export PATH="${nodeDependencies}/bin:$PATH"
'';
- };
+ } // extraArgs);
in
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index c0a2b9a5fd9..0b6f39726a7 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -1,16 +1,16 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.11.1. Do not edit!
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
- "@azure/abort-controller-1.0.5" = {
+ "@azure/abort-controller-1.1.0" = {
name = "_at_azure_slash_abort-controller";
packageName = "@azure/abort-controller";
- version = "1.0.5";
+ version = "1.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.5.tgz";
- sha512 = "G5sjKExiVsbFQo+4YY5MBPOSsh3EUv6XmqjgJaF/VCjckWLGGKPUPGfbCSn6Xal6gzGoPQMOQ+wCCGNCX9NAPg==";
+ url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz";
+ sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==";
};
};
"@azure/core-asynciterator-polyfill-1.0.2" = {
@@ -31,13 +31,13 @@ let
sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==";
};
};
- "@azure/core-http-2.2.4" = {
+ "@azure/core-http-2.2.5" = {
name = "_at_azure_slash_core-http";
packageName = "@azure/core-http";
- version = "2.2.4";
+ version = "2.2.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.4.tgz";
- sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A==";
+ url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.5.tgz";
+ sha512 = "kctMqSQ6zfnlFpuYzfUKadeTyOQYbIQ+3Rj7dzVC3Dk1dOnHroTwR9hLYKX8/n85iJpkyaksaXpuh5L7GJRYuQ==";
};
};
"@azure/core-lro-2.2.4" = {
@@ -976,13 +976,13 @@ let
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
};
};
- "aws-sdk-2.1125.0" = {
+ "aws-sdk-2.1129.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1125.0";
+ version = "2.1129.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1125.0.tgz";
- sha512 = "2syNkKDqDcDmB/chc61a5xx+KYzaarLs1/KshE0b1Opp2oSq2FARyUBbk59HgwKaDUB61uPF33ZG9sHiIVx2hQ==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1129.0.tgz";
+ sha512 = "gQZaByfW7zKCg1n/kA+xDdLhI/SauaokRTq+lztK1cCCdFkR5CShcKeK/qUgVxjy43mwB7CkeTh1WUr2NMb0jg==";
};
};
"aws-sign2-0.7.0" = {
@@ -1858,13 +1858,13 @@ let
sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
};
};
- "core-js-3.22.3" = {
+ "core-js-3.22.4" = {
name = "core-js";
packageName = "core-js";
- version = "3.22.3";
+ version = "3.22.4";
src = fetchurl {
- url = "https://registry.npmjs.org/core-js/-/core-js-3.22.3.tgz";
- sha512 = "1t+2a/d2lppW1gkLXx3pKPVGbBdxXAkqztvWb1EJ8oF8O2gIGiytzflNiFEehYwVK/t2ryUsGBoOFFvNx95mbg==";
+ url = "https://registry.npmjs.org/core-js/-/core-js-3.22.4.tgz";
+ sha512 = "1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w==";
};
};
"core-util-is-1.0.2" = {
@@ -2641,13 +2641,13 @@ let
sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
};
};
- "follow-redirects-1.14.9" = {
+ "follow-redirects-1.15.0" = {
name = "follow-redirects";
packageName = "follow-redirects";
- version = "1.14.9";
+ version = "1.15.0";
src = fetchurl {
- url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz";
- sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==";
+ url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz";
+ sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==";
};
};
"for-each-0.3.3" = {
@@ -4522,13 +4522,13 @@ let
sha512 = "qIcmHAtVJotgiYo3vVMLwC9qaU5ih5ti4+aPu2I1onD6WEu8GMNF38AzIAceYl6U8EhvDB+DOsF/SjYHfl26iw==";
};
};
- "n8n-editor-ui-0.142.0" = {
+ "n8n-editor-ui-0.142.1" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
- version = "0.142.0";
+ version = "0.142.1";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.0.tgz";
- sha512 = "aDXm64Y+tcLicd0z9pIxhSfqCb/JjsMIAOJ7DB35HKg7riOE7TGBHkWQ6F61XEjusJLl6ZGr15V+9EoCTu+02g==";
+ url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.1.tgz";
+ sha512 = "Me8fk76HeWUmTPnksH4kzG0bKOp1yLFjAC4F+EcEllIIf+x75kjN+gSH4uwgvspzGCVO88ZnppWoGQwvHQpXQw==";
};
};
"n8n-nodes-base-0.173.0" = {
@@ -4567,13 +4567,13 @@ let
sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==";
};
};
- "nanoid-3.3.3" = {
+ "nanoid-3.3.4" = {
name = "nanoid";
packageName = "nanoid";
- version = "3.3.3";
+ version = "3.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz";
- sha512 = "p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==";
+ url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz";
+ sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==";
};
};
"native-duplexpair-1.0.0" = {
@@ -4693,13 +4693,13 @@ let
sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==";
};
};
- "nodemailer-6.7.4" = {
+ "nodemailer-6.7.5" = {
name = "nodemailer";
packageName = "nodemailer";
- version = "6.7.4";
+ version = "6.7.5";
src = fetchurl {
- url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.4.tgz";
- sha512 = "TBSS3qS8WG45ycUwEvEA/3UM1o3sLz9jUl4TPUKPz4ImWWM6UgRCb5pLO+HOouDKEj57yNLOrzQlO8+9IjWZoA==";
+ url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.5.tgz";
+ sha512 = "6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg==";
};
};
"nopt-5.0.0" = {
@@ -6367,13 +6367,13 @@ let
sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==";
};
};
- "sqlite3-5.0.6" = {
+ "sqlite3-5.0.7" = {
name = "sqlite3";
packageName = "sqlite3";
- version = "5.0.6";
+ version = "5.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.6.tgz";
- sha512 = "uT1dC6N3ReF+jchY01zvl1wVFFJ5xO86wSnCpK39uA/zmAHBDm6TiAq1v876QKv8JgiijxQ7/fb5C2LPm7ZAJA==";
+ url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.7.tgz";
+ sha512 = "9PUfvpol1/5SI3WZawFINwpRz6qhUeJJtFNG6rr0CvDWMXN75PJPv+3b0aVEOOx5rAZIPcXW2zVasH8foqw7Gg==";
};
};
"sqlstring-2.3.3" = {
@@ -6493,22 +6493,22 @@ let
sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==";
};
};
- "string.prototype.trimend-1.0.4" = {
+ "string.prototype.trimend-1.0.5" = {
name = "string.prototype.trimend";
packageName = "string.prototype.trimend";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz";
- sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==";
+ url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz";
+ sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==";
};
};
- "string.prototype.trimstart-1.0.4" = {
+ "string.prototype.trimstart-1.0.5" = {
name = "string.prototype.trimstart";
packageName = "string.prototype.trimstart";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz";
- sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==";
+ url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz";
+ sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==";
};
};
"string_decoder-0.10.31" = {
@@ -7534,13 +7534,13 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
- version = "0.175.0";
+ version = "0.175.1";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n/-/n8n-0.175.0.tgz";
- sha512 = "FKIroWsEZNZ/HUdM6iQ8QY6WxYs4uQufodBoKpbcu6JJKF/ufYO4U8lpIM0nV2YCMaB+JAVvswim0SUDB6KF3A==";
+ url = "https://registry.npmjs.org/n8n/-/n8n-0.175.1.tgz";
+ sha512 = "rInwNB6wxOs79EvC2HFALyDhdDPJwLVT+z1LivxLRD9dZOrtlMD9wdDfESpHYS5ikND4T5JW32HaxGF9nnzlJA==";
};
dependencies = [
- (sources."@azure/abort-controller-1.0.5" // {
+ (sources."@azure/abort-controller-1.1.0" // {
dependencies = [
sources."tslib-2.4.0"
];
@@ -7551,7 +7551,7 @@ in
sources."tslib-2.4.0"
];
})
- (sources."@azure/core-http-2.2.4" // {
+ (sources."@azure/core-http-2.2.5" // {
dependencies = [
sources."tough-cookie-4.0.0"
sources."tslib-2.4.0"
@@ -7725,7 +7725,7 @@ in
];
})
sources."avsc-5.7.4"
- (sources."aws-sdk-2.1125.0" // {
+ (sources."aws-sdk-2.1129.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@@ -7902,7 +7902,7 @@ in
sources."cookie-0.4.1"
sources."cookie-parser-1.4.6"
sources."cookie-signature-1.0.6"
- sources."core-js-3.22.3"
+ sources."core-js-3.22.4"
sources."core-util-is-1.0.2"
sources."crc-32-1.2.2"
sources."cron-1.7.2"
@@ -8012,7 +8012,7 @@ in
})
sources."flatted-3.2.5"
sources."fn.name-1.1.0"
- sources."follow-redirects-1.14.9"
+ sources."follow-redirects-1.15.0"
sources."for-each-0.3.3"
sources."forever-agent-0.6.1"
sources."form-data-4.0.0"
@@ -8282,7 +8282,7 @@ in
sources."mz-2.7.0"
sources."n8n-core-0.116.0"
sources."n8n-design-system-0.19.0"
- sources."n8n-editor-ui-0.142.0"
+ sources."n8n-editor-ui-0.142.1"
(sources."n8n-nodes-base-0.173.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
@@ -8296,7 +8296,7 @@ in
];
})
sources."nanoclone-0.2.1"
- sources."nanoid-3.3.3"
+ sources."nanoid-3.3.4"
sources."native-duplexpair-1.0.0"
(sources."nearley-2.20.1" // {
dependencies = [
@@ -8317,7 +8317,7 @@ in
sources."node-html-parser-5.3.3"
sources."node-ssh-12.0.4"
sources."nodeify-1.0.1"
- sources."nodemailer-6.7.4"
+ sources."nodemailer-6.7.5"
sources."nopt-5.0.0"
sources."normalize-path-3.0.0"
sources."normalize-wheel-1.0.1"
@@ -8577,7 +8577,7 @@ in
];
})
sources."sprintf-js-1.1.2"
- sources."sqlite3-5.0.6"
+ sources."sqlite3-5.0.7"
sources."sqlstring-2.3.3"
sources."sse-channel-3.1.1"
sources."ssf-0.11.2"
@@ -8591,8 +8591,8 @@ in
sources."stream-shift-1.0.1"
sources."string-similarity-4.0.4"
sources."string-width-4.2.3"
- sources."string.prototype.trimend-1.0.4"
- sources."string.prototype.trimstart-1.0.4"
+ sources."string.prototype.trimend-1.0.5"
+ sources."string.prototype.trimstart-1.0.5"
sources."string_decoder-0.10.31"
sources."strip-ansi-6.0.1"
sources."strtok3-6.3.0"
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 5ebde5e10de..a67c9c2a70a 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -90,6 +90,9 @@ in (mkDrv rec {
url = "https://github.com/archlinux/svntogit-packages/raw/f82958b9538f86e41b51f1ba7134968d2f3788d1/trunk/poppler-22.03.0.patch";
sha256 = "5h4qJmx6Q3Q3dHUlSi8JXBziN2mAswGVWk5aDTLTwls=";
})
+
+ # Fix build with poppler 22.04
+ ./poppler-22-04-0.patch
];
### QT/KDE
diff --git a/pkgs/applications/office/libreoffice/poppler-22-04-0.patch b/pkgs/applications/office/libreoffice/poppler-22-04-0.patch
new file mode 100644
index 00000000000..c907bf1680b
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/poppler-22-04-0.patch
@@ -0,0 +1,100 @@
+Patch from OpenSUSE
+https://build.opensuse.org/package/view_file/LibreOffice:Factory/libreoffice/poppler-22-04-0.patch?expand=1&rev=45e176f964509ebe3560d0dbf1ec8be9
+Index: libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+===================================================================
+--- libreoffice-7.3.3.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -474,12 +474,21 @@ int PDFOutDev::parseFont( long long nNew
+ {
+ // TODO(P3): Unfortunately, need to read stream twice, since
+ // we must write byte count to stdout before
++#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
++ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef());
++ if ( pBuf )
++ {
++ aNewFont.isEmbedded = true;
++ nSize = pBuf->size();
++ }
++#else
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
+ if( pBuf )
+ {
+ aNewFont.isEmbedded = true;
+ gfree(pBuf);
+ }
++#endif
+ }
+
+ m_aFontMap[ nNewId ] = aNewFont;
+@@ -492,21 +501,35 @@ void PDFOutDev::writeFontFile( GfxFont*
+ return;
+
+ int nSize = 0;
++#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
++ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef());
++ if ( !pBuf )
++ return;
++ nSize = pBuf->size();
++#else
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
+ if( !pBuf )
+ return;
++#endif
+
+ // ---sync point--- see SYNC STREAMS above
+ fflush(stdout);
+
++#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
++ if( fwrite(pBuf->data(), sizeof(unsigned char), nSize, g_binary_out) != static_cast(nSize) )
++ {
++#else
+ if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast(nSize) )
+ {
+ gfree(pBuf);
++#endif
+ exit(1); // error
+ }
+ // ---sync point--- see SYNC STREAMS above
+ fflush(g_binary_out);
++#if !POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
+ gfree(pBuf);
++#endif
+ }
+
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+@@ -759,7 +782,11 @@ void PDFOutDev::updateFont(GfxState *sta
+ {
+ assert(state);
+
++#if POPPLER_CHECK_VERSION(22, 04, 0)
++ std::shared_ptr gfxFont = state->getFont();
++#else
+ GfxFont *gfxFont = state->getFont();
++#endif
+ if( !gfxFont )
+ return;
+
+@@ -776,7 +803,11 @@ void PDFOutDev::updateFont(GfxState *sta
+ m_aFontMap.find( fontID );
+ if( it == m_aFontMap.end() )
+ {
++#if POPPLER_CHECK_VERSION(22, 04, 0)
++ nEmbedSize = parseFont( fontID, gfxFont.get(), state );
++#else
+ nEmbedSize = parseFont( fontID, gfxFont, state );
++#endif
+ it = m_aFontMap.find( fontID );
+ }
+
+@@ -806,7 +837,11 @@ void PDFOutDev::updateFont(GfxState *sta
+
+ if (nEmbedSize)
+ {
++#if POPPLER_CHECK_VERSION(22, 04, 0)
++ writeFontFile(gfxFont.get());
++#else
+ writeFontFile(gfxFont);
++#endif
+ }
+ }
+
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index 754c9ba03d4..d3f706bbf05 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -84,6 +84,11 @@ mkDerivation rec {
url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
})
+ # For Poppler 22.04
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
+ sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 13876430822..05d7d0388f0 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "verilator";
- version = "4.220";
+ version = "4.222";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Y0j6j8kPCONlegFoWl46LXtfoiLhzMsHCVv+kLe7UyE=";
+ sha256 = "sha256-AvjcStbiXDdhJnaSJJ5Mp6zscvaxhb+A2J+0gpm2rFI=";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 462744641e3..f8f58cdcaba 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -36,6 +36,13 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch";
sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ=";
})
+
+ # Fix view not rendering with adwaita-icon-theme 42 due to removed icons.
+ # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch";
+ sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index eea1e3baeec..e122871f8f5 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -346,6 +346,9 @@ crate_: lib.makeOverridable
outputs = if buildTests then [ "out" ] else [ "out" "lib" ];
outputDev = if buildTests then [ "out" ] else [ "lib" ];
+ meta = {
+ mainProgram = crateName;
+ };
} // extraDerivationAttrs
)
)
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index c7b7599c319..77129d34307 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index fc9e97c7f68..d4369a90735 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,427 +4,427 @@
{
bluedevil = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/bluedevil-5.24.4.tar.xz";
- sha256 = "1mph04r6l9bxml1brwifbnk6lkjxkzxx75b3g3myzijjv6f8wxw3";
- name = "bluedevil-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/bluedevil-5.24.5.tar.xz";
+ sha256 = "1yhynfpgm2cwvimh63hihg5dm0hzjp20364bvjyyh108830rjsf9";
+ name = "bluedevil-5.24.5.tar.xz";
};
};
breeze = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/breeze-5.24.4.tar.xz";
- sha256 = "01cqji6figwb95drcq9vrqlkv7xmpn2csbi2mvixbcdawqhywsg3";
- name = "breeze-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/breeze-5.24.5.tar.xz";
+ sha256 = "18zhm9my0vhwiq95v3p48z8s5m4a5c7kw8n144ykqlm51nssc9c5";
+ name = "breeze-5.24.5.tar.xz";
};
};
breeze-grub = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/breeze-grub-5.24.4.tar.xz";
- sha256 = "1p154g2x1g00iam2gkv7pml1r0b91b21s8fgrfrqg5pj45ysp5bc";
- name = "breeze-grub-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/breeze-grub-5.24.5.tar.xz";
+ sha256 = "02lcv23l3zr0g6nggmrxz4pgq852fir9yramhaxmcg634pxiacni";
+ name = "breeze-grub-5.24.5.tar.xz";
};
};
breeze-gtk = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/breeze-gtk-5.24.4.tar.xz";
- sha256 = "0s51azc2xmh7agbqlm9rn39c5qh6rfwyc2dq4sfv6vspm1883zmj";
- name = "breeze-gtk-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/breeze-gtk-5.24.5.tar.xz";
+ sha256 = "0c25z69lyjczm05jraqk2f09sipkhpsz5zirwzqdq3apip06qw93";
+ name = "breeze-gtk-5.24.5.tar.xz";
};
};
breeze-plymouth = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/breeze-plymouth-5.24.4.tar.xz";
- sha256 = "038pglghl40nyq6lzydijy3wnr5agvfzddjxrf6lc9m6qapqd37v";
- name = "breeze-plymouth-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/breeze-plymouth-5.24.5.tar.xz";
+ sha256 = "044sbffr4sqvgkfbraa4rvlsih7zz9b300hipp33mwhpzyjjcpdc";
+ name = "breeze-plymouth-5.24.5.tar.xz";
};
};
discover = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/discover-5.24.4.tar.xz";
- sha256 = "0smhys51chvjh2ij4mk03cfnq09n8cq22iag1ld9j2125l5iwa99";
- name = "discover-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/discover-5.24.5.tar.xz";
+ sha256 = "18a8z9ifyyjmmc620dsh491vb1q3q9bxd8gfjf5k87mgwmg1wmwk";
+ name = "discover-5.24.5.tar.xz";
};
};
drkonqi = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/drkonqi-5.24.4.tar.xz";
- sha256 = "1yn7yj8nwnxm1s0si2353wl17jv7c7l5dc7833ndl56phv2999x0";
- name = "drkonqi-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/drkonqi-5.24.5.tar.xz";
+ sha256 = "1ps1p8pvp51rswynbv337qr3qj2z7r7kd9qpxgcrha9pql01h5gy";
+ name = "drkonqi-5.24.5.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kactivitymanagerd-5.24.4.tar.xz";
- sha256 = "0aamfgc4bdrysq7ps134pf5v4bgiwrsxffi0nb6d8zazswgkfa41";
- name = "kactivitymanagerd-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kactivitymanagerd-5.24.5.tar.xz";
+ sha256 = "0j6d50cjry4j3vzxb6hd4w95y2h3l0yfhyrhl693njr64aq7d4pa";
+ name = "kactivitymanagerd-5.24.5.tar.xz";
};
};
kde-cli-tools = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kde-cli-tools-5.24.4.tar.xz";
- sha256 = "1w2rhz32xaqhmq5lyvfmjrbssqf9f35k5fk02f05fz79yk9wir7z";
- name = "kde-cli-tools-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kde-cli-tools-5.24.5.tar.xz";
+ sha256 = "0afksrxd6mq9rcvh3g8y05kl0la4wmn1yksif8p1bcxpd4sdvw77";
+ name = "kde-cli-tools-5.24.5.tar.xz";
};
};
kde-gtk-config = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kde-gtk-config-5.24.4.tar.xz";
- sha256 = "02spbx2rniiyvzj4qb6lgzj0f83k4vq53fk4i1m45438z7aslymi";
- name = "kde-gtk-config-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kde-gtk-config-5.24.5.tar.xz";
+ sha256 = "0sg8kqlkklvjhj69z5wzhvi0hddxa192j4vc4wc9hmfl1wirr8cq";
+ name = "kde-gtk-config-5.24.5.tar.xz";
};
};
kdecoration = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kdecoration-5.24.4.tar.xz";
- sha256 = "05ccyb314mxf0d4ivj71l9lh13s3fqr7f4d2rmg6qshsql39569c";
- name = "kdecoration-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kdecoration-5.24.5.tar.xz";
+ sha256 = "1hjjl6k09zi8n9nblbcm69c3br6d4dhzaw55xyygglaz6kb8fc17";
+ name = "kdecoration-5.24.5.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kdeplasma-addons-5.24.4.tar.xz";
- sha256 = "03b8d3kdzwpyqrqkmpswryksrhav3mwcnbyzdc3g2kpk2qnx68fp";
- name = "kdeplasma-addons-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kdeplasma-addons-5.24.5.tar.xz";
+ sha256 = "03p8wmsb5nl7j6kwl6j8nwlf6v7snh933jyglgp2vnclqp1jpd9x";
+ name = "kdeplasma-addons-5.24.5.tar.xz";
};
};
kgamma5 = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kgamma5-5.24.4.tar.xz";
- sha256 = "0z1zrw5id455idjbaqracs1vcwgs93an7w27ggfqs6i8nabrivbk";
- name = "kgamma5-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kgamma5-5.24.5.tar.xz";
+ sha256 = "1i7i3dc5qfb3v9hz9w9hszr8jbbdbfq0b59a4bh1p6xakxx8k1l0";
+ name = "kgamma5-5.24.5.tar.xz";
};
};
khotkeys = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/khotkeys-5.24.4.tar.xz";
- sha256 = "033dgz8wbsw2nj133hnmygz1izmcpxdn80jbjbm66nhbbyq7bb2s";
- name = "khotkeys-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/khotkeys-5.24.5.tar.xz";
+ sha256 = "06m7yrs75arwdfrkpkn9b5kiz2xlrsxlpsjr18j1pjhxras0f8vs";
+ name = "khotkeys-5.24.5.tar.xz";
};
};
kinfocenter = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kinfocenter-5.24.4.tar.xz";
- sha256 = "0f5q6ajyd794p1z9j3il8sajlqkdcnf06xq4612qxdp49nb88nyw";
- name = "kinfocenter-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kinfocenter-5.24.5.tar.xz";
+ sha256 = "0c2bq7m8c9r17s8qalp4cdz1qimzwnvh9wrba4rqcmxwbv043ln1";
+ name = "kinfocenter-5.24.5.tar.xz";
};
};
kmenuedit = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kmenuedit-5.24.4.tar.xz";
- sha256 = "0ril8jxqkaavc4bkpksnyxn3bww7b81gnp9bnb17acrr2nd7wyhl";
- name = "kmenuedit-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kmenuedit-5.24.5.tar.xz";
+ sha256 = "02il6bhayjni0jsx1d1cnmxv5yc7r0d02s2v6cs87fbdrnl7d9vq";
+ name = "kmenuedit-5.24.5.tar.xz";
};
};
kscreen = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kscreen-5.24.4.tar.xz";
- sha256 = "0shvhymdfxw1gz49y1s79zik9kkg5qh0mqdj6dx0s6r3w6vysj1h";
- name = "kscreen-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kscreen-5.24.5.tar.xz";
+ sha256 = "1g5mlc78giq8zrpyq6d2jhqgyj6yh2nhbqv6wjm9cdbq4nnm3hyr";
+ name = "kscreen-5.24.5.tar.xz";
};
};
kscreenlocker = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kscreenlocker-5.24.4.tar.xz";
- sha256 = "1xzc80awsapsg65kk21ssp7y0jb374k1w2bb7gvzj8j40rrn48pv";
- name = "kscreenlocker-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kscreenlocker-5.24.5.tar.xz";
+ sha256 = "13prkdwxd200ps4cy6rf2n4g9ll6fp1f93dk1njr9ilzbj2a2w1j";
+ name = "kscreenlocker-5.24.5.tar.xz";
};
};
ksshaskpass = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/ksshaskpass-5.24.4.tar.xz";
- sha256 = "1pa41w793dbi3rv6mm1a4xp46n80qwdpdlwhi6z4x76hjvqx9i9l";
- name = "ksshaskpass-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/ksshaskpass-5.24.5.tar.xz";
+ sha256 = "1jw3hfnlplqsss1h49p5f3722qc22ln22sahs5ypsxszmqihpqiz";
+ name = "ksshaskpass-5.24.5.tar.xz";
};
};
ksystemstats = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/ksystemstats-5.24.4.tar.xz";
- sha256 = "1pa7xrw5ij32bm66pn72zkzz8y70fq71n4kigm9ixc1s2glkbiwd";
- name = "ksystemstats-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/ksystemstats-5.24.5.tar.xz";
+ sha256 = "1xsrlwm1hhagwjyjm240bfmri24z88v95m9pz95dpbcllkwdib0b";
+ name = "ksystemstats-5.24.5.tar.xz";
};
};
kwallet-pam = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kwallet-pam-5.24.4.tar.xz";
- sha256 = "0s6z7ds42a7kba25jd7pzylw7d2mc27xgymmdrpkg2afqanf3m4r";
- name = "kwallet-pam-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kwallet-pam-5.24.5.tar.xz";
+ sha256 = "1smclklxcfbxxxi3lgw2p6wmvj50fg40323j1b8p5z731ywdk3i3";
+ name = "kwallet-pam-5.24.5.tar.xz";
};
};
kwayland-integration = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kwayland-integration-5.24.4.tar.xz";
- sha256 = "1cnfb81yv6m37m2kyk523skqbk5in1kpbpxq60ivjri91sm4pryj";
- name = "kwayland-integration-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kwayland-integration-5.24.5.tar.xz";
+ sha256 = "1v12631xdjdp2wkjvyls8g0sv18amy7g4mddrh45pybhpc3rcsl0";
+ name = "kwayland-integration-5.24.5.tar.xz";
};
};
kwayland-server = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kwayland-server-5.24.4.tar.xz";
- sha256 = "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi";
- name = "kwayland-server-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kwayland-server-5.24.5.tar.xz";
+ sha256 = "0ydj6p489psqblqd88lk04q62qn1spa1m0zdjq8d32a4g4lvxnid";
+ name = "kwayland-server-5.24.5.tar.xz";
};
};
kwin = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kwin-5.24.4.tar.xz";
- sha256 = "1qwcd6iw6yvpchiwmvq5nwsr465jmrmscf286mjrc65im4hj6572";
- name = "kwin-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kwin-5.24.5.tar.xz";
+ sha256 = "10mgbs1mbhjzbwx07q77wdzhj11yc156j75fbvy8mszb9hjiappk";
+ name = "kwin-5.24.5.tar.xz";
};
};
kwrited = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/kwrited-5.24.4.tar.xz";
- sha256 = "0j86ih4g762a94cyzilcbigh7iv04a80bqrlxm02fbqhffv01mv2";
- name = "kwrited-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/kwrited-5.24.5.tar.xz";
+ sha256 = "0gfjvj8wnfgb3s2daz7xpg9flc8xv6hk12z6ckbchq71w4gs6132";
+ name = "kwrited-5.24.5.tar.xz";
};
};
layer-shell-qt = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/layer-shell-qt-5.24.4.tar.xz";
- sha256 = "03qyf6pvk36ig6ilimq02q19frdlsmrkbng2iz3d59k15zdrz5x0";
- name = "layer-shell-qt-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/layer-shell-qt-5.24.5.tar.xz";
+ sha256 = "0ydjfxrkmpi052gfhkccsp9m5az3z6qiggb5wx6cjz39q06614gm";
+ name = "layer-shell-qt-5.24.5.tar.xz";
};
};
libkscreen = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/libkscreen-5.24.4.tar.xz";
- sha256 = "1xv7vml5lxj1lnansisfbfym35h265ggwsyjplz76aibj5nyqv81";
- name = "libkscreen-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/libkscreen-5.24.5.tar.xz";
+ sha256 = "1jbgq1ddl0q5y8cx4m7k5q38gl0kxv929wxr3hn3vr906fpiiwbz";
+ name = "libkscreen-5.24.5.tar.xz";
};
};
libksysguard = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/libksysguard-5.24.4.tar.xz";
- sha256 = "00i4l2kc02wymmiqh7wam8dp4h9hvn8nsxfv258waq7pnxzjmnkn";
- name = "libksysguard-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/libksysguard-5.24.5.tar.xz";
+ sha256 = "1v21xckvwx6xkiqihv3pc2ps5mmc4ahp5vadxm3lrh0pdqxb6v5h";
+ name = "libksysguard-5.24.5.tar.xz";
};
};
milou = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/milou-5.24.4.tar.xz";
- sha256 = "0z7kmygvjzj30llwg8gpibjja2gzc09nh9pxrpy78pa1jxnas29i";
- name = "milou-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/milou-5.24.5.tar.xz";
+ sha256 = "1rh5zy1x427cv07zmikmh0rmviz7vcvnz2pyravyfzaxay5lwnf1";
+ name = "milou-5.24.5.tar.xz";
};
};
oxygen = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/oxygen-5.24.4.tar.xz";
- sha256 = "1d3sz2qc1cz9x6g04r0scvw9fmrazfn5v3iav4cn7wdkz8x06kc0";
- name = "oxygen-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/oxygen-5.24.5.tar.xz";
+ sha256 = "1gh06wwm6gdjpsbjlxnrrlgsfd5w7lb0pddcml9l2w0dvlgfyn1v";
+ name = "oxygen-5.24.5.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-browser-integration-5.24.4.tar.xz";
- sha256 = "1havd775d4x2y36nkba2k6vdf839dspk10mxccnk2wkhdxmzfyk7";
- name = "plasma-browser-integration-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-browser-integration-5.24.5.tar.xz";
+ sha256 = "1xybyn6vsahr5j0g57bsfxmz78w35ibzavcax1inrdlnb7sblrqv";
+ name = "plasma-browser-integration-5.24.5.tar.xz";
};
};
plasma-desktop = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-desktop-5.24.4.tar.xz";
- sha256 = "09fhqz2sp4caabr1li1shjd8l052vp4d10ci7pwsqj8f61331qmh";
- name = "plasma-desktop-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-desktop-5.24.5.tar.xz";
+ sha256 = "0iic01iwg4bkp8sfp4mbm5lvbj98wjcyi0k79jfr1sx78dn7jn5g";
+ name = "plasma-desktop-5.24.5.tar.xz";
};
};
plasma-disks = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-disks-5.24.4.tar.xz";
- sha256 = "1mi5fp3305kjw41zhbccxyg666gcmmrvckipjhnnnfwd3gl372ng";
- name = "plasma-disks-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-disks-5.24.5.tar.xz";
+ sha256 = "1x3lm5cnwa51i8kcmp7pq29fpa9za3ypsmmldf2jbisawjnrb50k";
+ name = "plasma-disks-5.24.5.tar.xz";
};
};
plasma-firewall = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-firewall-5.24.4.tar.xz";
- sha256 = "0f9g5m2ddbp2axfxqc4d92fzg6r4z1l56i6nsry6nlz6cqky3fm2";
- name = "plasma-firewall-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-firewall-5.24.5.tar.xz";
+ sha256 = "0mk9plb1rwng77qy55c7y7ga4fkafan89bf4vqsc4i9nfn49d944";
+ name = "plasma-firewall-5.24.5.tar.xz";
};
};
plasma-integration = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-integration-5.24.4.tar.xz";
- sha256 = "1d2d7cmhdhmdzs91vpc2p3fg413daqhqilp8d2qbpsks5hyrkm3k";
- name = "plasma-integration-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-integration-5.24.5.tar.xz";
+ sha256 = "0ynzx99jn4fqzbrv9mav0sw06rzf7mm1rv17g17vsxijwbhr0i6d";
+ name = "plasma-integration-5.24.5.tar.xz";
};
};
plasma-mobile = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-mobile-5.24.4.tar.xz";
- sha256 = "1hgcnb4flw224j57fxkhaiwapymq6ccjwqj8s6jgqzc3ax0py0vr";
- name = "plasma-mobile-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-mobile-5.24.5.tar.xz";
+ sha256 = "0400rwx4pbz4kfy06f2vxchlf9vr6dx71wsi6vir3vdmvl43yazd";
+ name = "plasma-mobile-5.24.5.tar.xz";
};
};
plasma-nano = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-nano-5.24.4.tar.xz";
- sha256 = "1fdq4r5zlkf3qb0a47zv3apgnqs4gqqfj8pdlcmzkyn9xykzs9vw";
- name = "plasma-nano-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-nano-5.24.5.tar.xz";
+ sha256 = "0zxvqzg1p6ci6581bh4nhsq2p6pq66pmvs93zlj89ml4am176213";
+ name = "plasma-nano-5.24.5.tar.xz";
};
};
plasma-nm = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-nm-5.24.4.tar.xz";
- sha256 = "0bzc48vdrnd6n9qcm8ms7wrjm2yl7h9dik32arwdxx56vb7jhv08";
- name = "plasma-nm-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-nm-5.24.5.tar.xz";
+ sha256 = "0adl5wfrz16hc7j64830cx1ga0bh9zd8bff95a30zdiggp7jc45f";
+ name = "plasma-nm-5.24.5.tar.xz";
};
};
plasma-pa = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-pa-5.24.4.tar.xz";
- sha256 = "09fkaq2zzicgr214zi2wf7cirffm7mwh55bivvafblp1wlavkrgz";
- name = "plasma-pa-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-pa-5.24.5.tar.xz";
+ sha256 = "1lgq2lydl65bh01043ji7kkignrb5lfcvbhy0g4g7lw778whv3q6";
+ name = "plasma-pa-5.24.5.tar.xz";
};
};
plasma-sdk = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-sdk-5.24.4.tar.xz";
- sha256 = "1zkggp9a1yz5mwwvndizwlan6wlb2fy8n940ljnhldccl91mgwzc";
- name = "plasma-sdk-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-sdk-5.24.5.tar.xz";
+ sha256 = "0d35sckjvi77b3475pfh1ixdsdx0m7b0hbsx5rbjgj4b05cdpm0w";
+ name = "plasma-sdk-5.24.5.tar.xz";
};
};
plasma-systemmonitor = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-systemmonitor-5.24.4.tar.xz";
- sha256 = "0jcsmmg0asf2npl3f1nbzazz3i8m9b34q55088k8jjakwwxqbwhz";
- name = "plasma-systemmonitor-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-systemmonitor-5.24.5.tar.xz";
+ sha256 = "1vx0w5kmnp3chhydas7ijy8h1xf6dggd1ryhbr3k9qz2qihxfsqm";
+ name = "plasma-systemmonitor-5.24.5.tar.xz";
};
};
plasma-tests = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-tests-5.24.4.tar.xz";
- sha256 = "1ms298h9wghj9gpi7laf1dsd7s3yiycy44k4s5v4id8vfarnbs27";
- name = "plasma-tests-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-tests-5.24.5.tar.xz";
+ sha256 = "1aqmmix0ds9vg4cjj8dagaya10ainhcciixamdylz1p7vgzpsrkx";
+ name = "plasma-tests-5.24.5.tar.xz";
};
};
plasma-thunderbolt = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-thunderbolt-5.24.4.tar.xz";
- sha256 = "1cqabdsg8v8b00ppbabrg2gih16lf79lr5i8mqvjnc73npacvzhy";
- name = "plasma-thunderbolt-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-thunderbolt-5.24.5.tar.xz";
+ sha256 = "1q0r9l2b06qkbyxa25lvqdwz0rgcjvp48gwkw0xhhaf6fyaai1cl";
+ name = "plasma-thunderbolt-5.24.5.tar.xz";
};
};
plasma-vault = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-vault-5.24.4.tar.xz";
- sha256 = "0rj9z2c52mya2fjm4bimqz5z3lj2qg764zri6bqwrgwgsjwc4s81";
- name = "plasma-vault-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-vault-5.24.5.tar.xz";
+ sha256 = "16cyzyfzwqwqsg7hhg576acvxvbd12b7mznvicrrqnyf4wvw68l1";
+ name = "plasma-vault-5.24.5.tar.xz";
};
};
plasma-workspace = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-5.24.4.tar.xz";
- sha256 = "0w7cnawnpcg5zk9bycjcnc8yfz21whrhd9h2z7hizgfnj2q403jv";
- name = "plasma-workspace-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-workspace-5.24.5.tar.xz";
+ sha256 = "1xk4424az7sgb0kyysr1s2x756vj4km50xxzkn1s1kxyw28jd4dr";
+ name = "plasma-workspace-5.24.5.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-wallpapers-5.24.4.tar.xz";
- sha256 = "0hpg7nn5wsn56my48jk225x1qb70sgf3hf8q5swwqc1xc6xzcg14";
- name = "plasma-workspace-wallpapers-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plasma-workspace-wallpapers-5.24.5.tar.xz";
+ sha256 = "0aabmd4zswmzdy958y1yq0yp1v9i8kzl959d6r4pwi0lmhr6g6qi";
+ name = "plasma-workspace-wallpapers-5.24.5.tar.xz";
};
};
plymouth-kcm = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/plymouth-kcm-5.24.4.tar.xz";
- sha256 = "0s5h25vyk5yzipwj91rb62xzgi6aafpwikh7ibpmmh2wn71x3amr";
- name = "plymouth-kcm-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/plymouth-kcm-5.24.5.tar.xz";
+ sha256 = "04m4129hxgq4g9v8gvi8q0hzhqzd866j3j1ffxs5vfd27r155wcr";
+ name = "plymouth-kcm-5.24.5.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.24.4";
+ version = "1-5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/polkit-kde-agent-1-5.24.4.tar.xz";
- sha256 = "1bc5ss6v4d7kwk1chhvpis5srs8lfypims46wgxjncyhjg2lcllm";
- name = "polkit-kde-agent-1-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/polkit-kde-agent-1-5.24.5.tar.xz";
+ sha256 = "0w78c59nm71xnd5prm035z94r5bzlqr0fyri43a8vrfyyb21r9l9";
+ name = "polkit-kde-agent-1-5.24.5.tar.xz";
};
};
powerdevil = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/powerdevil-5.24.4.tar.xz";
- sha256 = "0sjlx5fhfdld1i352adi2bhyd29ja9lbmzhfxgnvmpfl6q7c0w7g";
- name = "powerdevil-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/powerdevil-5.24.5.tar.xz";
+ sha256 = "1wr3rk318j93rnyh24icl4yxdj40zasymlddc71ram80fswa2k4n";
+ name = "powerdevil-5.24.5.tar.xz";
};
};
qqc2-breeze-style = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/qqc2-breeze-style-5.24.4.tar.xz";
- sha256 = "1d0cgsxvnm0zza7n5hz47n28yrr35hp0vniggifncm0ag8sn0kmd";
- name = "qqc2-breeze-style-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/qqc2-breeze-style-5.24.5.tar.xz";
+ sha256 = "1m0xnx46zkv1dlwkgns1ibgsl934jbcfz35jlm4p8l6n1y2jcjyg";
+ name = "qqc2-breeze-style-5.24.5.tar.xz";
};
};
sddm-kcm = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/sddm-kcm-5.24.4.tar.xz";
- sha256 = "0pfqp5das7pxpmh111i2dlfqm6xzzd99bcb32bbmd9v6w2wlgwxy";
- name = "sddm-kcm-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/sddm-kcm-5.24.5.tar.xz";
+ sha256 = "15z5hfpczi73vqjfj9z2ai2r4187fyrvfnikcfb18g2bdh1n54ng";
+ name = "sddm-kcm-5.24.5.tar.xz";
};
};
systemsettings = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/systemsettings-5.24.4.tar.xz";
- sha256 = "0cqm7s89jvzqz1fw32284ppnm3dc69yvc8bqqgw5jdbbjnc1z4k9";
- name = "systemsettings-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/systemsettings-5.24.5.tar.xz";
+ sha256 = "1rg9zx7fhrg91nlarv0cz384agbik47sccj7hhshnxnq1czvawjv";
+ name = "systemsettings-5.24.5.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.24.4";
+ version = "5.24.5";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.24.4/xdg-desktop-portal-kde-5.24.4.tar.xz";
- sha256 = "07nwb6ff8rnlk2play9gar52d8d44b8y412hnx9a9d4b50b4js0i";
- name = "xdg-desktop-portal-kde-5.24.4.tar.xz";
+ url = "${mirror}/stable/plasma/5.24.5/xdg-desktop-portal-kde-5.24.5.tar.xz";
+ sha256 = "1zn6wln8pccj1x3labms7xippn6xgv4aamwpmzk2rvwss9jwz75m";
+ name = "xdg-desktop-portal-kde-5.24.5.tar.xz";
};
};
}
diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix
index 2153a30cb16..f073eca91d5 100644
--- a/pkgs/development/compilers/hip/default.nix
+++ b/pkgs/development/compilers/hip/default.nix
@@ -31,13 +31,13 @@
let
hip = stdenv.mkDerivation rec {
pname = "hip";
- version = "5.0.2";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "HIP";
rev = "rocm-${version}";
- hash = "sha256-w023vBLJaiFbRdvz9UfZLPasRjk3VqM9zwctCIJ5hGU=";
+ hash = "sha256-/kIZrbzq1u1pIs1jlmRYZNUGteqVQTI4TlXsHsVIUKE=";
};
# - fix bash paths
@@ -102,13 +102,13 @@ let
in
stdenv.mkDerivation rec {
pname = "hip";
- version = "5.0.2";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "hipamd";
rev = "rocm-${version}";
- hash = "sha256-hhTwKG0wDpbIBI8S61AhdNldX+STO8C66xi2EzmJSBs=";
+ hash = "sha256-TuCMRJb6G/bhD8hG6Ot7MIkgBoShjVboeXrlGh9eYpQ=";
};
nativeBuildInputs = [ cmake python3 makeWrapper perl ];
diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix
index 176affd047c..75318351de7 100644
--- a/pkgs/development/compilers/intel-graphics-compiler/default.nix
+++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix
@@ -9,6 +9,8 @@
, lld_11
, opencl-clang
, python3
+, spirv-tools
+, spirv-headers
, spirv-llvm-translator
, buildWithPatches ? true
@@ -18,8 +20,8 @@ let
vc_intrinsics_src = fetchFromGitHub {
owner = "intel";
repo = "vc-intrinsics";
- rev = "e5ad7e02aa4aa21a3cd7b3e5d1f3ec9b95f58872";
- sha256 = "Vg1mngwpIQ3Tik0GgRXPG22lE4sLEAEFch492G2aIXs=";
+ rev = "v0.3.0";
+ sha256 = "sha256-1Rm4TCERTOcPGWJF+yNoKeB9x3jfqnh7Vlv+0Xpmjbk=";
};
llvmPkgs = llvmPackages_11 // {
inherit spirv-llvm-translator;
@@ -31,18 +33,18 @@ in
stdenv.mkDerivation rec {
pname = "intel-graphics-compiler";
- version = "1.0.8744";
+ version = "1.0.11061";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-graphics-compiler";
rev = "igc-${version}";
- sha256 = "G5+dYD8uZDPkRyn1sgXsRngdq4NJndiCJCYTRXyUgTA=";
+ sha256 = "sha256-qS/+GTqHtp3T6ggPKrCDsrTb7XvVOUaNbMzGU51jTu4=";
};
nativeBuildInputs = [ clang cmake bison flex python3 ];
- buildInputs = [ clang opencl-clang spirv-llvm-translator llvm lld_11 ];
+ buildInputs = [ spirv-headers spirv-tools clang opencl-clang spirv-llvm-translator llvm lld_11 ];
strictDeps = true;
@@ -52,6 +54,21 @@ stdenv.mkDerivation rec {
# https://github.com/intel/intel-graphics-compiler/issues/98
doCheck = false;
+ patchPhase = ''
+ substituteInPlace ./external/SPIRV-Tools/CMakeLists.txt \
+ --replace '$'''{SPIRV-Tools_DIR}../../..' \
+ '${spirv-tools}' \
+ --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \
+ 'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \
+ --replace 'set_target_properties(SPIRV-Tools' \
+ 'set_target_properties(SPIRV-Tools-shared' \
+ --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \
+ 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared'
+ substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \
+ --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \
+ --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib"
+ '';
+
# Handholding the braindead build script
# cmake requires an absolute path
prebuilds = runCommandLocal "igc-cclang-prebuilds" { } ''
@@ -64,7 +81,9 @@ stdenv.mkDerivation rec {
'';
cmakeFlags = [
+ "-Wno-dev"
"-DVC_INTRINSICS_SRC=${vc_intrinsics_src}"
+ "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds"
"-DINSTALL_SPIRVDLL=0"
"-DCCLANG_BUILD_PREBUILDS=ON"
"-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}"
diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix
index 18fd44612f1..e700e1a08b2 100644
--- a/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }:
let
- version = "5.0.2";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "llvm-project";
rev = "rocm-${version}";
- hash = "sha256-wPzwbeQUFE6RAytrz5lBa6UUPoVL0UeMyY3qa4M6W6M=";
+ hash = "sha256-5SGIWiyfHvfwIUc4bhdWrlhBfK5ssA7tm5r3zKdr3kg=";
};
in rec {
clang = wrapCCWith rec {
@@ -52,12 +52,10 @@ in rec {
};
lld = callPackage ./lld.nix {
- inherit llvm version;
- src = "${src}/lld";
+ inherit llvm src version;
};
llvm = callPackage ./llvm {
- inherit version;
- src = "${src}/llvm";
+ inherit src version;
};
}
diff --git a/pkgs/development/compilers/llvm/rocm/lld.nix b/pkgs/development/compilers/llvm/rocm/lld.nix
index 2e3e1ca13d4..272e430c1fc 100644
--- a/pkgs/development/compilers/llvm/rocm/lld.nix
+++ b/pkgs/development/compilers/llvm/rocm/lld.nix
@@ -3,6 +3,7 @@
, cmake
, libxml2
, llvm
+, ninja
, version
, src
@@ -11,15 +12,17 @@
stdenv.mkDerivation rec {
inherit version src;
+ sourceRoot = "${src.name}/lld";
+
pname = "lld";
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ninja ];
buildInputs = [ libxml2 llvm ];
outputs = [ "out" "dev" ];
- cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${llvm.src}" ];
+ cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${src}/llvm" ];
postInstall = ''
moveToOutput include "$dev"
diff --git a/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/pkgs/development/compilers/llvm/rocm/llvm/default.nix
index 722ca1a762a..80a387b3650 100644
--- a/pkgs/development/compilers/llvm/rocm/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/llvm/default.nix
@@ -28,6 +28,8 @@ in stdenv.mkDerivation rec {
pname = "rocm-llvm";
+ sourceRoot = "${src.name}/llvm";
+
outputs = [ "out" "python" ]
++ lib.optional enableSharedLibraries "lib";
diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix
index 77606d8a511..c55ef1f97cc 100644
--- a/pkgs/development/compilers/open-watcom/v2.nix
+++ b/pkgs/development/compilers/open-watcom/v2.nix
@@ -12,14 +12,14 @@
stdenv.mkDerivation rec {
pname = "open-watcom-v2";
- version = "unstable-2022-04-29";
+ version = "unstable-2022-05-03";
name = "${pname}-unwrapped-${version}";
src = fetchFromGitHub {
owner = "open-watcom";
repo = "open-watcom-v2";
- rev = "520d9d7025b46b926123257b029b3dbce9a96065";
- sha256 = "aACkkTzOH8F82GPyySjtb7CGozR8OjgzqZVRiNTiS10=";
+ rev = "a927247a40e69261e7d8891b6f002c91450e01f2";
+ sha256 = "/CuPNCEoSjxwYL07b07XqnaAeFZGS8NjXBuj+gFCsOA=";
};
postPatch = ''
diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix
index 0dff7f0e1b0..abcc93c62d5 100644
--- a/pkgs/development/compilers/spirv-llvm-translator/default.nix
+++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix
@@ -4,29 +4,42 @@
, pkg-config
, lit
, llvm_11
+, spirv-headers
+, spirv-tools
}:
stdenv.mkDerivation rec {
pname = "SPIRV-LLVM-Translator";
- version = "unstable-2021-06-13";
+ version = "unstable-2022-05-04";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-LLVM-Translator";
- rev = "c67e6f26a7285aa753598ef792593ac4a545adf9";
- sha256 = "sha256-1s3lVNTQDl+pUvbzSMsp3cOUSm6I4DzqJxnLMeeE3F4=";
+ rev = "99420daab98998a7e36858befac9c5ed109d4920";
+ sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
};
nativeBuildInputs = [ pkg-config cmake llvm_11.dev ];
- buildInputs = [ llvm_11 ];
+ buildInputs = [ spirv-headers spirv-tools llvm_11 ];
checkInputs = [ lit ];
+ makeFlags = [ "llvm-spirv" ];
+
cmakeFlags = [
"-DLLVM_INCLUDE_TESTS=ON"
+ "-DLLVM_DIR=${llvm_11.dev}"
+ "-DBUILD_SHARED_LIBS=YES"
+ "-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
];
+ prePatch = ''
+ substituteInPlace ./test/CMakeLists.txt \
+ --replace 'SPIRV-Tools' 'SPIRV-Tools-shared'
+ '';
+
+
# FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
doCheck = false;
diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/development/libraries/libffi/3.3.nix
new file mode 100644
index 00000000000..a1e2ff8c588
--- /dev/null
+++ b/pkgs/development/libraries/libffi/3.3.nix
@@ -0,0 +1,64 @@
+{ lib, stdenv, fetchurl, fetchpatch
+, autoreconfHook
+
+, doCheck ? true # test suite depends on dejagnu which cannot be used during bootstrapping
+, dejagnu
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libffi";
+ version = "3.3";
+
+ src = fetchurl {
+ url = "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz";
+ hash = "sha256-cvunkicD3fp6Ao1ROsFahcjVTI1n9V+lpIAohdxlIFY=";
+ };
+
+ patches = [];
+
+ outputs = [ "out" "dev" "man" "info" ];
+
+ configureFlags = [
+ "--with-gcc-arch=generic" # no detection of -march= or -mtune=
+ "--enable-pax_emutramp"
+
+ # Causes issues in downstream packages which misuse ffi_closure_alloc
+ # Reenable once these issues are fixed and merged:
+ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155
+ # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283
+ "--disable-exec-static-tramp"
+ ];
+
+ preCheck = ''
+ # The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE.
+ NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
+ '';
+
+ dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
+
+ inherit doCheck;
+
+ checkInputs = [ dejagnu ];
+
+ meta = with lib; {
+ description = "A foreign function call interface library";
+ longDescription = ''
+ The libffi library provides a portable, high level programming
+ interface to various calling conventions. This allows a
+ programmer to call any function specified by a call interface
+ description at run-time.
+
+ FFI stands for Foreign Function Interface. A foreign function
+ interface is the popular name for the interface that allows code
+ written in one language to call code written in another
+ language. The libffi library really only provides the lowest,
+ machine dependent layer of a fully featured foreign function
+ interface. A layer must exist above libffi that handles type
+ conversions for values passed between the two languages.
+ '';
+ homepage = "http://sourceware.org/libffi/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ armeenm ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix
index dc12e643cb7..10f3ceaac26 100644
--- a/pkgs/development/libraries/libgit2/default.nix
+++ b/pkgs/development/libraries/libgit2/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, cmake
, pkg-config
, python3
@@ -16,23 +15,16 @@
stdenv.mkDerivation rec {
pname = "libgit2";
- version = "1.4.0";
+ version = "1.4.3";
# also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
- sha256 = "sha256-21t7fD/5O+HIHUDEv8MqloDmAIm9sSpJYqreCD3Co2k=";
+ sha256 = "sha256-WnRzH5uMVEStA5ns4GNgMD5YoLQoats9aPLfnz9RoQs=";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/libgit2/libgit2/commit/8bc9eda779b2e2602fc74944aba5d39198e0642f.patch";
- sha256 = "sha256-r2i4+WsrxIpSwH0g/AikBdAajBncXb1zz0uOQB0h1Jk=";
- })
- ];
-
cmakeFlags = [
"-DTHREADSAFE=ON"
"-DUSE_HTTP_PARSER=system"
@@ -48,11 +40,11 @@ stdenv.mkDerivation rec {
doCheck = false; # hangs. or very expensive?
- meta = {
+ meta = with lib; {
description = "Linkable library implementation of Git that you can use in your application";
homepage = "https://libgit2.org/";
- license = lib.licenses.gpl2Plus;
- platforms = lib.platforms.all;
- maintainers = with lib.maintainers; [ ];
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 2a74c79afaf..3a0ced3d980 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,23 +1,16 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib, fetchpatch }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }:
stdenv.mkDerivation rec {
- version = "21.09";
+ version = "22.03";
pname = "libmediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
- sha256 = "09pinxqw3z3hxrafn67clw1cb1z9aqfy6gkiavginfm0yr299gk9";
+ sha256 = "sha256-/FC6u2KOnPumVSiNrgbVw0Kw1+aUGjLWT7uxEySMgLk=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ libzen zlib ];
-
- patches = [
- # fixes pkgsMusl.libmediainfo build
- (fetchpatch {
- url = "https://git.alpinelinux.org/aports/plain/community/libmediainfo/fix-include-signal.patch?id=b8d666a3d33575c184308e1176f4de9e519af577";
- sha256 = "sha256-b3HoIwy/hKSh8jUakwVJpnPmYw5KUwZXgLW7IPMY4/c=";
- })
- ];
+ buildInputs = [ zlib ];
+ propagatedBuildInputs = [ libzen ];
postPatch = "cd Project/GNU/Library";
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index e0ee94faf0d..82f5614458f 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -32,13 +32,12 @@ let
"-DLWS_WITH_PLUGINS=ON"
"-DLWS_WITH_IPV6=ON"
"-DLWS_WITH_SOCKS5=ON"
+ "-DDISABLE_WERROR=ON"
# Required since v4.2.0
"-DLWS_BUILD_HASH=no_hash"
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON";
- NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
-
postInstall = ''
rm -r ${placeholder "out"}/share/libwebsockets-test-server
'';
@@ -63,21 +62,6 @@ let
};
in {
- libwebsockets_3_1 = generic {
- sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl";
- version = "3.1.0";
- };
-
- libwebsockets_3_2 = generic {
- version = "3.2.2";
- sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna";
- };
-
- libwebsockets_4_2 = generic {
- version = "4.2.1";
- sha256 = "sha256-C+WGfNF4tAgbp/7aRraBgjNOe4I5ihm+8CGelXzfxbU=";
- };
-
libwebsockets_4_3 = generic {
version = "4.3.1";
sha256 = "sha256-lB3JHh058cQc5rycLnHk3JAOgtku0nRCixN5U6lPKq8=";
diff --git a/pkgs/development/libraries/lmdb/bin-ext.patch b/pkgs/development/libraries/lmdb/bin-ext.patch
new file mode 100644
index 00000000000..2d5af99772c
--- /dev/null
+++ b/pkgs/development/libraries/lmdb/bin-ext.patch
@@ -0,0 +1,21 @@
+diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
+index 612484e..2e6b562 100644
+--- a/libraries/liblmdb/Makefile
++++ b/libraries/liblmdb/Makefile
+@@ -27,6 +27,7 @@ CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS)
+ LDLIBS =
+ SOLIBS =
+ SOEXT = .so
++BINEXT =
+ prefix = /usr/local
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+@@ -49,7 +50,7 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
+ mkdir -p $(DESTDIR)$(libdir)
+ mkdir -p $(DESTDIR)$(includedir)
+ mkdir -p $(DESTDIR)$(mandir)/man1
+- for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
++ for f in $(IPROGS); do cp $$f$(BINEXT) $(DESTDIR)$(bindir); done
+ for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
+ for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
+ for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 0a3515db262..a8b5da5b56d 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab }:
+{ lib, stdenv, fetchFromGitLab, windows }:
stdenv.mkDerivation rec {
pname = "lmdb";
@@ -14,17 +14,20 @@ stdenv.mkDerivation rec {
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
- patches = [ ./hardcoded-compiler.patch ];
+ patches = [ ./hardcoded-compiler.patch ./bin-ext.patch ];
patchFlags = [ "-p3" ];
outputs = [ "bin" "out" "dev" ];
+ buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads;
+
makeFlags = [
"prefix=$(out)"
"CC=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"
]
- ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so";
+ ++ lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"
+ ++ lib.optionals stdenv.hostPlatform.isWindows [ "SOEXT=.dll" "BINEXT=.exe" ];
doCheck = true;
checkTarget = "test";
diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix
index ef55541ed77..96be84ee2a7 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/pkgs/development/libraries/lucene++/default.nix
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ boost gtest zlib ];
- doCheck = true;
-
postPatch = ''
- substituteInPlace src/test/CMakeLists.txt \
- --replace "add_subdirectory(gtest)" ""
+ substituteInPlace src/test/CMakeLists.txt \
+ --replace "add_subdirectory(gtest)" ""
'';
+ doCheck = true;
+
checkPhase = ''
runHook preCheck
LD_LIBRARY_PATH=$PWD/src/contrib:$PWD/src/core \
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mv $out/include/pkgconfig $out/lib/
+ cp $src/src/contrib/include/*h $out/include/lucene++/
'';
meta = {
diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix
index 243dfa44d5b..f4897331c93 100644
--- a/pkgs/development/libraries/opencl-clang/default.nix
+++ b/pkgs/development/libraries/opencl-clang/default.nix
@@ -67,15 +67,15 @@ let
in
stdenv.mkDerivation rec {
pname = "opencl-clang";
- version = "unstable-2021-06-22";
+ version = "unstable-2022-03-16";
inherit passthru;
src = fetchFromGitHub {
owner = "intel";
repo = "opencl-clang";
- rev = "fd68f64b33e67d58f6c36b9e25c31c1178a1962a";
- sha256 = "sha256-q1YPBb/LY67iEuQx1fMUQD/I7OsNfobW3yNfJxLXx3E=";
+ rev = "bbdd1587f577397a105c900be114b56755d1f7dc";
+ sha256 = "sha256-qEZoQ6h4XAvSnJ7/gLXBb1qrzeYa6Jp6nij9VFo8MwQ=";
};
patches = [
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 5547e492a65..3e22483eb07 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -35,13 +35,13 @@ let
in
stdenv.mkDerivation rec {
pname = "poppler-${suffix}";
- version = "22.03.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
+ version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
- sha256 = "sha256-cox4upTXWlX2tjVdT72qb0mTTZYWvljl5nmpz9CYDh4=";
+ sha256 = "sha256-gT+0uQ572mPfUyBcVIYCuucoiHpg9ASKrk29mxkn3v8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/development/libraries/presage/default.nix
index df15e73f73c..5f03a425dcc 100644
--- a/pkgs/development/libraries/presage/default.nix
+++ b/pkgs/development/libraries/presage/default.nix
@@ -30,6 +30,12 @@ stdenv.mkDerivation rec {
sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj";
})
./fixed-cppunit-detection.patch
+ # fix gcc11 build
+ (fetchpatch {
+ name = "presage-0.9.1-gcc11.patch";
+ url = "https://build.opensuse.org/public/source/openSUSE:Factory/presage/presage-0.9.1-gcc11.patch?rev=3f8b4b19c99276296d6ea595cc6c431f";
+ sha256 = "sha256-pLrIFXvJHRvv4x9gBIfal4Y68lByDE3XE2NZNiAXe9k=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix
index fb847b83fe9..8afb0d04418 100644
--- a/pkgs/development/libraries/rocclr/default.nix
+++ b/pkgs/development/libraries/rocclr/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
+, fetchpatch
, writeScript
, rocm-comgr
}:
@@ -15,6 +16,16 @@ stdenv.mkDerivation rec {
hash = "sha256-SFWEGKffhuiTE7ICbkElVV5cldXu4Xbwvjb6LiNmijA=";
};
+ patches = [
+ # Enable support for gfx8 again
+ # See the upstream issue: https://github.com/RadeonOpenCompute/ROCm/issues/1659
+ # And the arch patch: https://github.com/rocm-arch/rocm-arch/pull/742
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/John-Gee/rocm-arch/d6812d308fee3caf2b6bb01b4d19fe03a6a0e3bd/rocm-opencl-runtime/enable-gfx800.patch";
+ hash = "sha256-59jFDIIsTTZcNns9RyMVWPRUggn/bSlAGrky4quu8B4=";
+ })
+ ];
+
prePatch = ''
substituteInPlace device/comgrctx.cpp \
--replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so"
diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index 9c19638d3f4..26bf783f448 100644
--- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "rocm-opencl-runtime";
- version = "5.0.2";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-OpenCL-Runtime";
rev = "rocm-${version}";
- hash = "sha256-ovYwElZGRKySH1mWFIISxuNNxCjaqoe9oCvqYZGdfq0=";
+ hash = "sha256-O7q3uTjspO/rZ2+8+g7pRfBXsCRaEr4DZxEqABHbOeY=";
};
nativeBuildInputs = [ cmake rocm-cmake ];
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DAMD_OPENCL_PATH=${src}"
"-DROCCLR_PATH=${rocclr}"
+ "-DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm/opencl"
];
dontStrip = true;
diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix
index d16966d2130..9eb9218adda 100644
--- a/pkgs/development/libraries/rocm-runtime/default.nix
+++ b/pkgs/development/libraries/rocm-runtime/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "rocm-runtime";
- version = "5.1.0";
+ version = "5.1.1";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCR-Runtime";
rev = "rocm-${version}";
- hash = "sha256-MGm7YmnoFNk7VsxsbsUgSD9Y5r1OBm6Ycg3wXNme8EI=";
+ hash = "sha256-IP5ylfUXOFkw9+Frfh+tNaZ83ozAbOK9kO2AzFVzzWk=";
};
sourceRoot = "source/src";
diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 2b3b1e4ce8c..9698b445eb8 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Manipulate JSON-like data with NumPy-like idioms";
- homepage = "https://github.com/scikit-hep/awkward-1.0";
+ homepage = "https://github.com/scikit-hep/awkward";
license = licenses.bsd3;
maintainers = with maintainers; [ veprbl ];
};
diff --git a/pkgs/development/python-modules/bond-api/default.nix b/pkgs/development/python-modules/bond-api/default.nix
index a685c01fbc0..555caa6033c 100644
--- a/pkgs/development/python-modules/bond-api/default.nix
+++ b/pkgs/development/python-modules/bond-api/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "bond-api";
- version = "0.1.16";
+ version = "0.1.17";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "prystupa";
repo = "bond-api";
rev = "v${version}";
- sha256 = "1nqf090b14nd7an2n776mb37yskddfnihmas2fy56pxclwvwqr9n";
+ hash = "sha256-fuVYyDy3fG+XobFe2GCzMWRWPk8VDPLU4RHJzcF5MLg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix
index 9cedf7c4d28..f6459c13e70 100644
--- a/pkgs/development/python-modules/intbitset/default.nix
+++ b/pkgs/development/python-modules/intbitset/default.nix
@@ -2,6 +2,7 @@
, fetchPypi
, buildPythonPackage
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
@@ -9,9 +10,11 @@ buildPythonPackage rec {
version = "3.0.1";
format = "setuptools";
+ disabled = pythonOlder "3.7";
+
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM=";
+ hash = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM=";
};
checkInputs = [
@@ -25,7 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "C-based extension implementing fast integer bit sets";
homepage = "https://github.com/inveniosoftware/intbitset";
- license = licenses.lgpl3Only;
+ license = licenses.lgpl3Plus;
maintainers = teams.determinatesystems.members;
};
}
diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index b33ec2759b5..8894fbaf21f 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -1,43 +1,35 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
, fetchPypi
-, python
-, nose
-, pytest
-, mock
-, ipython
, ipykernel
+, ipython
, jupyterlab-widgets
+, lib
+, nbformat
+, pytestCheckHook
, traitlets
-, notebook
, widgetsnbextension
}:
buildPythonPackage rec {
pname = "ipywidgets";
version = "7.7.0";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-q0pVloVaiLg3YZIcdocH1l5YRwaBObwXKd3+g0cDVCo=";
+ hash = "sha256-q0pVloVaiLg3YZIcdocH1l5YRwaBObwXKd3+g0cDVCo=";
};
- # Tests are not distributed
- # doCheck = false;
-
- buildInputs = [ nose pytest mock ];
propagatedBuildInputs = [
ipython
ipykernel
jupyterlab-widgets
traitlets
- notebook
+ nbformat
widgetsnbextension
];
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
+ checkInputs = [ pytestCheckHook ];
meta = {
description = "IPython HTML widgets for Jupyter";
diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
index 6f85a797c37..9fbb336c386 100644
--- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix
+++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "nettigo-air-monitor";
- version = "1.2.2";
+ version = "1.2.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = pname;
rev = version;
- sha256 = "sha256-gHgFEDUji43vTBZp5FLK90H+D44sfH2AuCc7Gu2T1pg=";
+ sha256 = "sha256-aCDw3JwX8LVrJp3jYvuYQ3ycRHjSnWU0n1LdTjV08VA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index c5680c5c8a3..421d53b5a88 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -14,14 +14,23 @@
buildPythonPackage rec {
pname = "paramiko";
- version = "2.10.3";
+ version = "2.10.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-3bGXeFOu+CgEs11yoOWXskT6MmxATDUL0AxbAdv+5xo=";
+ sha256 = "sha256-PS5lC2gSzm0WCr/3AdbvRDTsl5NLE+lc8a09pw/7XFg=";
};
+ patches = [
+ # Fix usage of dsa keys
+ # https://github.com/paramiko/paramiko/pull/1606/
+ (fetchpatch {
+ url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch";
+ sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA=";
+ })
+ ];
+
propagatedBuildInputs = [
bcrypt
cryptography
@@ -51,15 +60,6 @@ buildPythonPackage rec {
"paramiko"
];
- patches = [
- # Fix usage of dsa keys
- # https://github.com/paramiko/paramiko/pull/1606/
- (fetchpatch {
- url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch";
- sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA=";
- })
- ];
-
__darwinAllowLocalNetworking = true;
meta = with lib; {
@@ -72,6 +72,6 @@ buildPythonPackage rec {
between python scripts. All major ciphers and hash methods are
supported. SFTP client and server mode are both supported too.
'';
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ SuperSandro2000 ];
};
}
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 18d4fec6c16..396583b9ee4 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -13,27 +13,25 @@
, pytest-asyncio
, pytestCheckHook
, python-dateutil
+, pythonOlder
, pytz
, semver
}:
buildPythonPackage rec {
pname = "plugwise";
- version = "0.17.8";
+ version = "0.18.0";
format = "setuptools";
+ disabled = pythonOlder "3.7";
+
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
- sha256 = "sha256-ZNlkdubB6E5ak+EaXsEBGa1xpm5ms4Rp3DG/M4/+WOg=";
+ sha256 = "sha256-kpEs5LvUz61Wm2IUI6sNXx2R+vtuHq1Y6aaj+zLrr+Q=";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace "aiohttp==3.8.0" "aiohttp>=3.8.0"
- '';
-
propagatedBuildInputs = [
aiohttp
async-timeout
@@ -54,16 +52,14 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "plugwise" ];
+ pythonImportsCheck = [
+ "plugwise"
+ ];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "Python module for Plugwise Smiles, Stretch and USB stick";
- longDescription = ''
- XKNX is an asynchronous Python library for reading and writing KNX/IP
- packets. It provides support for KNX/IP routing and tunneling devices.
- '';
homepage = "https://github.com/plugwise/python-plugwise";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix
index 56e5636622b..336e637edef 100644
--- a/pkgs/development/python-modules/pyahocorasick/default.nix
+++ b/pkgs/development/python-modules/pyahocorasick/default.nix
@@ -3,31 +3,34 @@
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pyahocorasick";
- version = "1.4.1";
+ version = "1.4.4";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "WojciechMula";
repo = pname;
rev = version;
- sha256 = "13x3718if28l50474xrz1b9709kvnvdg3nzm6y8bh7mc9a4zyss5";
+ hash = "sha256-X6ifwOwf7GAaNUxInKhR3NX6hKhvFMkvfbK6XpH8CBo=";
};
- patches = [
- # Use proper temporary directory on Hydra
- (fetchpatch {
- url = "https://github.com/WojciechMula/pyahocorasick/commit/b6549e06f3cced7ffdf4d1b587cd7de12041f495.patch";
- sha256 = "sha256-v3J/0aIPOnBhLlJ18r/l7O0MckqLOCtcmqIS9ZegaSI=";
- })
+ checkInputs = [
+ pytestCheckHook
];
- checkInputs = [ pytestCheckHook ];
+ pytestFlagsArray = [
+ "unittests.py"
+ ];
- pytestFlagsArray = [ "unittests.py" ];
- pythonImportsCheck = [ "ahocorasick" ];
+ pythonImportsCheck = [
+ "ahocorasick"
+ ];
meta = with lib; {
description = "Python module implementing Aho-Corasick algorithm";
diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix
index d85a1733224..41e3c95a041 100644
--- a/pkgs/development/python-modules/pyinfra/default.nix
+++ b/pkgs/development/python-modules/pyinfra/default.nix
@@ -1,30 +1,33 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, pythonOlder
-, gevent
, click
, colorama
, configparser
, distro
+, fetchFromGitHub
+, gevent
, jinja2
, paramiko
+, pytestCheckHook
, python-dateutil
+, pythonOlder
, pywinrm
+, pyyaml
, setuptools
-, six
}:
buildPythonPackage rec {
pname = "pyinfra";
- version = "2.0.2";
+ version = "2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-AW2pOyLqyugTSM7PE4oR9ZwD1liNpdD636QA3ElafG0=";
+ src = fetchFromGitHub {
+ owner = "Fizzadar";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-frjPxSATvXgeACT4kThoiPu04Ez8bs8FIPdf5PVuiSg=";
};
propagatedBuildInputs = [
@@ -37,16 +40,23 @@ buildPythonPackage rec {
paramiko
python-dateutil
pywinrm
+ pyyaml
setuptools
- six
];
- doCheck = false;
+ checkInputs = [
+ pytestCheckHook
+ ];
pythonImportsCheck = [
"pyinfra"
];
+ disabledTests = [
+ # Test requires SSH binary
+ "test_load_ssh_config"
+ ];
+
meta = with lib; {
description = "Python-based infrastructure automation";
longDescription = ''
diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix
index a4725c4781c..c8551270797 100644
--- a/pkgs/development/python-modules/pylsp-mypy/default.nix
+++ b/pkgs/development/python-modules/pylsp-mypy/default.nix
@@ -22,6 +22,7 @@ buildPythonPackage rec {
disabledTests = [
"test_multiple_workspaces"
+ "test_option_overrides_dmypy"
];
checkInputs = [ pytestCheckHook mock ];
diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index da929638757..9ddbc92125f 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "python-engineio";
- version = "4.3.1";
+ version = "4.3.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "miguelgrinberg";
repo = "python-engineio";
rev = "v${version}";
- sha256 = "sha256-8595zivZmff0agFiQd5Qyd/T3BDxYcsb4RjA5AWXVNM=";
+ sha256 = "sha256-RXIFfd4eeRLaDPe6+8jhIN2TI1yz/uDfnvWT95euaIo=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix
index dbd51166a22..ee66ea262c6 100644
--- a/pkgs/development/python-modules/python-lsp-black/default.nix
+++ b/pkgs/development/python-modules/python-lsp-black/default.nix
@@ -1,27 +1,28 @@
{ lib
-, black
+, pythonOlder
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
+, black
, python-lsp-server
-, pythonOlder
+, toml
}:
buildPythonPackage rec {
pname = "python-lsp-black";
- version = "1.1.0";
+ version = "1.2.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python-lsp";
repo = "python-lsp-black";
rev = "v${version}";
- sha256 = "sha256-WIQf1oz3b1PLIcXfQsu4hQ58nfp7l3J7zkcWNT6RbUY=";
+ sha256 = "sha256-qNA6Bj1VI0YEtRuvcMQZGWakQNNrJ2PqhozrLmQHPAg=";
};
checkInputs = [ pytestCheckHook ];
- propagatedBuildInputs = [ black python-lsp-server ];
+ propagatedBuildInputs = [ black python-lsp-server toml ];
meta = with lib; {
homepage = "https://github.com/python-lsp/python-lsp-black";
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 31352435165..aeb2d756779 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -20,6 +20,7 @@
, pythonOlder
, rope
, setuptools
+, setuptools-scm
, stdenv
, ujson
, yapf
@@ -36,7 +37,8 @@
buildPythonPackage rec {
pname = "python-lsp-server";
- version = "1.3.3";
+ version = "1.4.1";
+ format = "pyproject";
disabled = pythonOlder "3.7";
@@ -44,13 +46,18 @@ buildPythonPackage rec {
owner = "python-lsp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-F8f9NAjPWkm01D/KwFH0oA6nQ3EF4ZVCCckZTL4A35Y=";
+ sha256 = "sha256-rEfjxHw2NIVIa8RepxLPiXkRFhcGWLzm6w43n60zkFE=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
- --replace "--cov pylsp --cov test" ""
+ --replace "--cov pylsp --cov test" "" \
+ --replace "mccabe>=0.6.0,<0.7.0" "mccabe"
+ '';
+
+ preBuild = ''
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${version}
'';
propagatedBuildInputs = [
@@ -58,6 +65,7 @@ buildPythonPackage rec {
pluggy
python-lsp-jsonrpc
setuptools
+ setuptools-scm
ujson
] ++ lib.optional withAutopep8 autopep8
++ lib.optional withFlake8 flake8
@@ -79,10 +87,7 @@ buildPythonPackage rec {
# pyqt5 is broken on aarch64-darwin
++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ];
- disabledTests = [
- # pytlint output changed
- "test_lint_free_pylint"
- ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"
+ disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"
# pyqt5 is broken on aarch64-darwin
++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "test_pyqt_completion";
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index e41942317f9..2e35def2710 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "python-socketio";
- version = "5.5.2";
+ version = "5.6.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "miguelgrinberg";
repo = "python-socketio";
rev = "v${version}";
- sha256 = "sha256-ZTjh9gtnJwFG2qWH6FBrvLHKsEuTjkcKL6j6Mdos6zo=";
+ sha256 = "sha256-zsTSz2RHtr4LqqPCkvHcaAw7RvfkHTNDm83OS+SgMUU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix
index 45404c107fb..f1421e8c980 100644
--- a/pkgs/development/python-modules/pyvesync/default.nix
+++ b/pkgs/development/python-modules/pyvesync/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pyvesync";
- version = "2.0.2";
+ version = "2.0.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-SsSzwuJvDbQ1AzF+q5bjOnFaR6M2UFixtlmk6sgjKOg=";
+ sha256 = "sha256-/hPDCqTeqEzxfqv8B5wdDzmzzNuXYqOVHX32N/J6nmU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/qnapstats/default.nix b/pkgs/development/python-modules/qnapstats/default.nix
new file mode 100644
index 00000000000..2eeb4e81d28
--- /dev/null
+++ b/pkgs/development/python-modules/qnapstats/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, xmltodict
+, responses
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "qnapstats";
+ version = "0.4.0";
+
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ owner = "colinodell";
+ repo = "python-qnapstats";
+ rev = version;
+ hash = "sha256-Tzi2QG1Xw12fLVfV49SPJKdz5VdJ4hQMuCHH8gxcOBE=";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ xmltodict
+ ];
+
+ checkInputs = [
+ responses
+ ];
+
+ checkPhase = ''
+ runHook preCheck
+
+ ${python.interpreter} tests/test-models.py
+
+ runHook postCheck
+ '';
+
+ pythonImportsCheck = [ "qnapstats" ];
+
+ meta = {
+ description = "Python API for obtaining QNAP NAS system stats";
+ homepage = "https://github.com/colinodell/python-qnapstats";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/qstylizer/default.nix b/pkgs/development/python-modules/qstylizer/default.nix
new file mode 100644
index 00000000000..768e5f7d007
--- /dev/null
+++ b/pkgs/development/python-modules/qstylizer/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, inflection
+, pbr
+, tinycss2
+, pytestCheckHook
+, pytest-mock
+}:
+
+buildPythonPackage rec {
+ pname = "qstylizer";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "blambright";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-iEMxBpS9gOPubd9O8zpVmR5B7+UZJFkPuOtikO1a9v0=";
+ };
+
+ nativeBuildInputs = [
+ pbr
+ ];
+
+ propagatedBuildInputs = [
+ inflection
+ tinycss2
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-mock
+ ];
+
+ preBuild = ''
+ export PBR_VERSION=${version}
+ '';
+
+ meta = with lib; {
+ description = "Qt stylesheet generation utility for PyQt/PySide ";
+ homepage = "https://github.com/blambright/qstylizer";
+ license = licenses.mit;
+ maintainers = with maintainers; [ drewrisinger ];
+ };
+}
diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix
index a5fdf3d547e..2c12019e9ac 100644
--- a/pkgs/development/python-modules/scancode-toolkit/default.nix
+++ b/pkgs/development/python-modules/scancode-toolkit/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0=";
+ hash = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0=";
};
dontConfigure = true;
@@ -134,7 +134,8 @@ buildPythonPackage rec {
--replace "pdfminer.six >= 20200101" "pdfminer.six" \
--replace "pluggy >= 0.12.0, < 1.0" "pluggy" \
--replace "pygmars >= 0.7.0" "pygmars" \
- --replace "license_expression >= 21.6.14" "license_expression"
+ --replace "license_expression >= 21.6.14" "license_expression" \
+ --replace "intbitset >= 2.3.0, < 3.0" "intbitset"
'';
# Importing scancode needs a writeable home, and preCheck happens in between
diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix
index d24c8263e9a..298a2a8915d 100644
--- a/pkgs/development/python-modules/setupmeta/default.nix
+++ b/pkgs/development/python-modules/setupmeta/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "setupmeta";
- version = "3.3.0";
+ version = "3.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "codrsquad";
repo = pname;
rev = "v${version}";
- sha256 = "21hABRiY8CTKkpFjePgBAtjs4/G5eFS3aPNMCBC41CY=";
+ sha256 = "sha256-3QUI3AjouuGa9sWXH97GSvpimVsws3q5Xgq6lls/wBU=";
};
preBuild = ''
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index 95d54e40447..2d4328ba3e1 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -18,6 +18,10 @@ buildPythonPackage rec {
pyzmq
];
+ postPatch = ''
+ substituteInPlace setup.py --replace "ipython>=7.31.1,<8" "ipython"
+ '';
+
# No tests
doCheck = false;
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index c117cb4990f..eaca9e6c7f4 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -1,16 +1,54 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree,
- jedi, pycodestyle, psutil, rope, numpy, scipy, matplotlib, pylint,
- keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl,
- cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle,
- watchdog, python-language-server, pyqtwebengine, atomicwrites, pyxdg,
- diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8, textdistance
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, makeDesktopItem
+, atomicwrites
+, chardet
+, cloudpickle
+, cookiecutter
+, diff-match-patch
+, flake8
+, intervaltree
+, jedi
+, jellyfish
+, keyring
+, matplotlib
+, mccabe
+, nbconvert
+, numpy
+, numpydoc
+, psutil
+, pygments
+, pylint
+, pyls-spyder
+, pyopengl
+, pyqtwebengine
+, python-lsp-black
+, python-lsp-server
+, pyxdg
+, pyzmq
+, pycodestyle
+, qdarkstyle
+, qstylizer
+, qtawesome
+, qtconsole
+, qtpy
+, rope
+, Rtree
+, scipy
+, spyder-kernels
+, textdistance
+, three-merge
+, watchdog
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "spyder";
version = "5.3.0";
- disabled = isPy27;
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -20,11 +58,44 @@ buildPythonPackage rec {
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
propagatedBuildInputs = [
- intervaltree jedi pycodestyle psutil rope numpy scipy matplotlib pylint keyring
- numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
- pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server
- atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder
- flake8 textdistance
+ atomicwrites
+ chardet
+ cloudpickle
+ cookiecutter
+ diff-match-patch
+ flake8
+ intervaltree
+ jedi
+ jellyfish
+ keyring
+ matplotlib
+ mccabe
+ nbconvert
+ numpy
+ numpydoc
+ psutil
+ pygments
+ pylint
+ pyls-spyder
+ pyopengl
+ pyqtwebengine
+ python-lsp-black
+ python-lsp-server
+ pyxdg
+ pyzmq
+ pycodestyle
+ qdarkstyle
+ qstylizer
+ qtawesome
+ qtconsole
+ qtpy
+ rope
+ Rtree
+ scipy
+ spyder-kernels
+ textdistance
+ three-merge
+ watchdog
];
# There is no test for spyder
@@ -44,13 +115,8 @@ buildPythonPackage rec {
# remove dependency on pyqtwebengine
# this is still part of the pyqt 5.11 version we have in nixpkgs
sed -i /pyqtwebengine/d setup.py
- # The major version bump in watchdog is due to changes in supported
- # platforms, not API break.
- # https://github.com/gorakhargosh/watchdog/issues/761#issuecomment-777001518
substituteInPlace setup.py \
- --replace "pyqt5<5.13" "pyqt5" \
- --replace "parso==0.7.0" "parso" \
- --replace "watchdog>=0.10.3,<2.0.0" "watchdog>=0.10.3,<3.0.0"
+ --replace "ipython>=7.31.1,<8.0.0" "ipython"
'';
postInstall = ''
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index ef1e1d1198f..615b4e64aa4 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -12,7 +12,7 @@
, jsonref
, jsonschema
, matplotlib
-, nbconvert
+, nbclient
, nbformat
, pandas
, pathtools
@@ -88,9 +88,7 @@ buildPythonPackage rec {
jsonref
jsonschema
matplotlib
- # Oddly enough, nbclient does not provide the `nbclient` module. Rather it's
- # available in nbconvert. See https://github.com/NixOS/nixpkgs/issues/171493#issuecomment-1116960488.
- nbconvert
+ nbclient
nbformat
pandas
pydantic
diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index b169877f5c1..d7b519b04c3 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -3,36 +3,35 @@
, lib
, autoPatchelfHook
, wrapQtAppsHook
-, libbsd
-, python27
, gmpxx
-, ncurses5
, gnustep
-, libffi
+, libbsd
+, libffi_3_3
+, ncurses6
}:
+
stdenv.mkDerivation rec {
pname = "hopper";
- version = "4.5.29";
- rev = "v${lib.versions.major version}";
+ version = "5.5.3";
+ rev = "v4";
src = fetchurl {
- url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
- sha256 = "1v1pff5fiv41khvrnlpdks2vddjnvziyn14qqj6v26snyhwi86zh";
+ url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux-demo.pkg.tar.xz";
+ hash = "sha256-xq9ZVg1leHm/tq6LYyQLa8p5dDwBd64Jt92uMoE0z58=";
};
sourceRoot = ".";
nativeBuildInputs = [
- wrapQtAppsHook
autoPatchelfHook
+ wrapQtAppsHook
];
buildInputs = [
- libbsd
- python27
- gmpxx
- ncurses5
gnustep.libobjc
+ libbsd
+ libffi_3_3
+ ncurses6
];
installPhase = ''
@@ -54,9 +53,6 @@ stdenv.mkDerivation rec {
$sourceRoot/opt/hopper-${rev}/lib/libpthread_workqueue.so* \
$out/lib
- # we already ship libffi.so.7
- ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib/libffi.so.6
-
cp -r $sourceRoot/usr/share $out
runHook postInstall
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix
index aae87fb976d..abd77dd1f4a 100644
--- a/pkgs/development/tools/continuous-integration/github-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix
@@ -46,13 +46,13 @@ let
in
stdenv.mkDerivation rec {
pname = "github-runner";
- version = "2.290.1";
+ version = "2.291.1";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
- hash = "sha256-YUV66yiUdS2/ORZS7a7coqyzoXM/tnK0egEeXWLPNl0=";
+ hash = "sha256-0Eijq2vXY+Y2g3bhEhIGnFxTCLXpw7k3iXpgj3x8nL4=";
};
nativeBuildInputs = [
diff --git a/pkgs/games/crossfire/crossfire-arch.nix b/pkgs/games/crossfire/crossfire-arch.nix
index ff9e0f9dea6..c09f474e70c 100644
--- a/pkgs/games/crossfire/crossfire-arch.nix
+++ b/pkgs/games/crossfire/crossfire-arch.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "crossfire-arch";
- version = "r${toString rev}";
+ version = rev;
src = fetchsvn {
url = "http://svn.code.sf.net/p/crossfire/code/arch/trunk/";
- sha256 = sha256;
- rev = rev;
+ inherit sha256;
+ rev = "r${rev}";
};
installPhase = ''
diff --git a/pkgs/games/crossfire/crossfire-client.nix b/pkgs/games/crossfire/crossfire-client.nix
index 799ae4ab6ee..0d335b4f529 100644
--- a/pkgs/games/crossfire/crossfire-client.nix
+++ b/pkgs/games/crossfire/crossfire-client.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "crossfire-client";
- version = "r${toString rev}";
+ version = rev;
src = fetchsvn {
url = "http://svn.code.sf.net/p/crossfire/code/client/trunk/";
- sha256 = sha256;
- rev = rev;
+ inherit sha256;
+ rev = "r${rev}";
};
nativeBuildInputs = [ cmake pkg-config perl vala ];
diff --git a/pkgs/games/crossfire/crossfire-maps.nix b/pkgs/games/crossfire/crossfire-maps.nix
index 0521b038d36..cb514a90d16 100644
--- a/pkgs/games/crossfire/crossfire-maps.nix
+++ b/pkgs/games/crossfire/crossfire-maps.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "crossfire-maps";
- version = "r${toString rev}";
+ version = rev;
src = fetchsvn {
url = "http://svn.code.sf.net/p/crossfire/code/maps/trunk/";
- sha256 = sha256;
- rev = rev;
+ inherit sha256;
+ rev = "r${rev}";
};
installPhase = ''
diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/games/crossfire/crossfire-server.nix
index 9259e8e52fa..f99e08a5a46 100644
--- a/pkgs/games/crossfire/crossfire-server.nix
+++ b/pkgs/games/crossfire/crossfire-server.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "crossfire-server";
- version = "r${toString rev}";
+ version = rev;
src = fetchsvn {
url = "http://svn.code.sf.net/p/crossfire/code/server/trunk/";
- sha256 = sha256;
- rev = rev;
+ inherit sha256;
+ rev = "r${rev}";
};
nativeBuildInputs = [ autoconf automake libtool flex perl check pkg-config python3 ];
diff --git a/pkgs/games/crossfire/default.nix b/pkgs/games/crossfire/default.nix
index bc74c00bcce..7d0716df3d9 100644
--- a/pkgs/games/crossfire/default.nix
+++ b/pkgs/games/crossfire/default.nix
@@ -3,26 +3,26 @@
rec {
crossfire-client = callPackage ./crossfire-client.nix {
version = "1.75.0";
- rev = 21760;
+ rev = "21760";
sha256 = "0b42sak8hj60nywfswkps777asy9p8r9wsn7pmj2nqbd29ng1p9d";
};
crossfire-server = callPackage ./crossfire-server.nix {
version = "latest";
- rev = 22111;
+ rev = "22111";
sha256 = "04fjif6zv642n2zlw27cgzkak2kknwrxqzg42bvzl7q901bsr9l7";
maps = crossfire-maps; arch = crossfire-arch;
};
crossfire-arch = callPackage ./crossfire-arch.nix {
version = "latest";
- rev = 22111;
+ rev = "22111";
sha256 = "0l4rp3idvbhknpxxs0w4i4nqfg01wblzm4v4j375xwxxbf00j0ms";
};
crossfire-maps = callPackage ./crossfire-maps.nix {
version = "latest";
- rev = 22111;
+ rev = "22111";
sha256 = "1dwfc84acjvbjgjakkb8z8pdlksbsn90j0z8z8rq37lqx0kx1sap";
};
}
diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
index 1d1d5667fe9..5c3154bf39d 100644
--- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix
+++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "intel-compute-runtime";
- version = "21.42.21270";
+ version = "22.17.23034";
src = fetchFromGitHub {
owner = "intel";
repo = "compute-runtime";
rev = version;
- sha256 = "N9MsDcsL8kBWxfZjhukcxZiSJnXxqMgWF0etOhf2/AE=";
+ sha256 = "sha256-ae6kPiVQe3+hcqXVu2ncCaVQAoMKoDHifrkKpt6uWX8=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 3ffb7594cd0..9391d38d7fc 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2091,7 +2091,8 @@
georss-qld-bushfire-alert-client
];
"qnap" = ps: with ps; [
- ]; # missing inputs: qnapstats
+ qnapstats
+ ];
"qnap_qsw" = ps: with ps; [
aioqsw
];
diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix
index c0f94b1bca7..496bf02bb03 100644
--- a/pkgs/servers/web-apps/wiki-js/default.nix
+++ b/pkgs/servers/web-apps/wiki-js/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiki-js";
- version = "2.5.277";
+ version = "2.5.279";
src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
- sha256 = "sha256-YLw0DR4dbPfNY56lNybEQFXFEVPZ99sQkwDl6gtz40E=";
+ sha256 = "sha256-4QYNKvAEeRSJS9lO30bI/SnM9rLmuvRMR/LsGT77wvY=";
};
sourceRoot = ".";
diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix
index af2f1ee352a..359427d32a0 100644
--- a/pkgs/tools/admin/google-cloud-sdk/data.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/data.nix
@@ -1,32 +1,32 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
- version = "381.0.0";
+ version = "384.0.1";
googleCloudSdkPkgs = {
x86_64-linux =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-linux-x86_64.tar.gz";
- sha256 = "1m5npilxagnl8zdx2i5vgcgalbcsnd4zvi0f2y5ic3dlfgibmlxb";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-x86_64.tar.gz";
+ sha256 = "1pa6dzizn7sjahghiwz98n906ssbq4aa9kg1f3akdsmmabh95pd7";
};
x86_64-darwin =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-darwin-x86_64.tar.gz";
- sha256 = "0vdbm2pl2wbyrdlf5dxs0djs6dn7kv17qvl8jxca8ylz2k296a0x";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-darwin-x86_64.tar.gz";
+ sha256 = "0pis92ldxxzvsamkck54d5d86ss13wipji29x082750c54gwm6w3";
};
aarch64-linux =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-linux-arm.tar.gz";
- sha256 = "03mkhp7kvakv8bzpj9yk9anj8y5k7iina876f7dcsbm9fiwl4g9w";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-arm.tar.gz";
+ sha256 = "1ssxb126hjyylgjbybl7ksiqnwf2hz6y0x1s5rjicaqpw5yv0sqy";
};
aarch64-darwin =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-darwin-arm.tar.gz";
- sha256 = "1dsfn7rdmg1m7d9cfirl6xsdwzbzh6v62xp6nd9b17s05d4sh0kl";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-darwin-arm.tar.gz";
+ sha256 = "1qxhl7c1ii44drls2mpmm03n2j7274dxcsf5inrhyjgs94yl5h7b";
};
i686-linux =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-linux-x86.tar.gz";
- sha256 = "0y95lvky62f7pfz4g3476ci239p5c8q9p9l2xh59x38xaa69gnvb";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-384.0.1-linux-x86.tar.gz";
+ sha256 = "1gghl16bdc9vgd2p834vd2i6av81q15czi7arpnmgg9n5dl3i2c8";
};
};
}
diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh
index b26950087a1..6402e3f32df 100755
--- a/pkgs/tools/admin/google-cloud-sdk/update.sh
+++ b/pkgs/tools/admin/google-cloud-sdk/update.sh
@@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou
# Version of Google Cloud SDK from
# https://cloud.google.com/sdk/docs/release-notes
-VERSION="381.0.0"
+VERSION="384.0.1"
function genMainSrc() {
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/tools/audio/headset-charge-indicator/default.nix
new file mode 100644
index 00000000000..2e4f6318519
--- /dev/null
+++ b/pkgs/tools/audio/headset-charge-indicator/default.nix
@@ -0,0 +1,63 @@
+{ lib, stdenv, fetchFromGitHub, headsetcontrol, wrapGAppsHook, python3, gtk3
+, gobject-introspection, libayatana-appindicator-gtk3 }:
+
+stdenv.mkDerivation rec {
+ # The last versioned release is 1.0.0.0 from 2020, since then there were updates but no versioned release.
+ # This is not marked unstable because upstream encourages installation from source.
+ pname = "headset-charge-indicator";
+ version = "2021-08-15";
+
+ src = fetchFromGitHub {
+ owner = "centic9";
+ repo = "headset-charge-indicator";
+ rev = "6e20f81a4d6118c7385b831044c468af83103193";
+ sha256 = "sha256-eaAbqeFY+B3CcKJywC3vaRsWZNQENTbALc7L7uW0W6U=";
+ };
+
+ nativeBuildInputs = [ wrapGAppsHook ];
+
+ buildInputs = [
+ (python3.withPackages (ps: with ps; [ pygobject3 ]))
+ headsetcontrol
+ gtk3
+ gobject-introspection
+ libayatana-appindicator-gtk3
+ ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp $src/headset-charge-indicator.py $out/bin/headset-charge-indicator.py
+ chmod +x $out/bin/headset-charge-indicator.py
+
+ substituteInPlace \
+ $out/bin/headset-charge-indicator.py \
+ --replace "default='headsetcontrol'" "default='${headsetcontrol}/bin/headsetcontrol'"
+
+ cat << EOF > ${pname}.desktop
+ [Desktop Entry]
+ Name=Wireless headset app-indicator
+ Categories=Application;System
+ Exec=$out/bin/headset-charge-indicator.py
+ Terminal=false
+ Type=Application
+ X-GNOME-AutoRestart=true
+ X-GNOME-Autostart-enabled=true
+ EOF
+
+ mkdir -p $out/share/applications
+ mkdir -p $out/etc/xdg/autostart
+ cp ${pname}.desktop $out/share/applications/${pname}.desktop
+ cp ${pname}.desktop $out/etc/xdg/autostart/${pname}.desktop
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/centic9/headset-charge-indicator";
+ description =
+ "A app-indicator for GNOME desktops for controlling some features of various wireless headsets";
+ longDescription =
+ "A simple app-indicator for GNOME desktops to display the battery charge of some wireless headsets which also allows to control some functions like LEDs, sidetone and others.";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ zebreus ];
+ license = licenses.bsd2;
+ };
+}
diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix
index 43824e16904..4ca4cd9a034 100644
--- a/pkgs/tools/graphics/grim/default.nix
+++ b/pkgs/tools/graphics/grim/default.nix
@@ -1,11 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
+{ lib, stdenv, fetchFromSourcehut, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
stdenv.mkDerivation rec {
pname = "grim";
version = "1.4.0";
- src = fetchFromGitHub {
- owner = "emersion";
+ src = fetchFromSourcehut {
+ owner = "~emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lwJn1Lysv1qLauqmrduUlzdoKUrUM5uBjv+dWSsrM6w=";
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 8afb103e9d4..e23471fc96d 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -7,12 +7,12 @@
mkDerivation rec {
pname = "calamares";
- version = "3.2.56";
+ version = "3.2.57";
# release including submodule
src = fetchurl {
url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "e1402d7693659b85c5e553481a7252d91350c3f33ffea413488d7712d3281e03";
+ sha256 = "ef7f564ec2cd8baaf94a44982ce1db88c1192696617f21538d0b8472a63b4c2b";
};
patches = lib.optionals nixos-extensions [
@@ -28,9 +28,6 @@ mkDerivation rec {
./nonroot.patch
# Adds unfree qml to packagechooserq
./unfreeq.patch
- # Adds config to change name of packagechooserq
- # Upstreamed in PR: https://github.com/calamares/calamares/pull/1932
- ./packagechooserq.patch
# Modifies finished module to add some NixOS resources
# Modifies packagechooser module to change the UI
./uimod.patch
diff --git a/pkgs/tools/misc/calamares/packagechooserq.patch b/pkgs/tools/misc/calamares/packagechooserq.patch
deleted file mode 100644
index 90a7b22de8b..00000000000
--- a/pkgs/tools/misc/calamares/packagechooserq.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp
-index 491fe5c25..667621597 100644
---- a/src/modules/packagechooser/Config.cpp
-+++ b/src/modules/packagechooser/Config.cpp
-@@ -237,6 +237,12 @@ Config::setPackageChoice( const QString& packageChoice )
- emit packageChoiceChanged( m_packageChoice.value_or( QString() ) );
- }
-
-+QString
-+Config::prettyName() const
-+{
-+ return m_stepName ? m_stepName->get() : tr( "Packages" );
-+}
-+
- QString
- Config::prettyStatus() const
- {
-@@ -343,4 +349,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
- cWarning() << "Single-selection QML module must use 'Legacy' method.";
- }
- }
-+
-+ bool labels_ok = false;
-+ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );
-+ if ( labels_ok )
-+ {
-+ if ( labels.contains( "step" ) )
-+ {
-+ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );
-+ }
-+ }
- }
-diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h
-index b04b1c30b..d1b783a8d 100644
---- a/src/modules/packagechooser/Config.h
-+++ b/src/modules/packagechooser/Config.h
-@@ -98,6 +98,7 @@ public:
- QString packageChoice() const { return m_packageChoice.value_or( QString() ); }
- void setPackageChoice( const QString& packageChoice );
-
-+ QString prettyName() const;
- QString prettyStatus() const;
-
- signals:
-@@ -120,6 +121,7 @@ private:
- * Reading the property will return an empty QString.
- */
- std::optional< QString > m_packageChoice;
-+ CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar
- };
-
-
-diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
-index 9057004de..8eacf82ec 100644
---- a/src/modules/packagechooser/PackageChooserViewStep.cpp
-+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
-@@ -29,7 +29,6 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent )
- : Calamares::ViewStep( parent )
- , m_config( new Config( this ) )
- , m_widget( nullptr )
-- , m_stepName( nullptr )
- {
- emit nextStatusChanged( false );
- }
-@@ -41,14 +40,12 @@ PackageChooserViewStep::~PackageChooserViewStep()
- {
- m_widget->deleteLater();
- }
-- delete m_stepName;
- }
-
--
- QString
- PackageChooserViewStep::prettyName() const
- {
-- return m_stepName ? m_stepName->get() : tr( "Packages" );
-+ return m_config->prettyName();
- }
-
-
-@@ -139,16 +136,6 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
- m_config->setDefaultId( moduleInstanceKey() );
- m_config->setConfigurationMap( configurationMap );
-
-- bool labels_ok = false;
-- auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );
-- if ( labels_ok )
-- {
-- if ( labels.contains( "step" ) )
-- {
-- m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );
-- }
-- }
--
- if ( m_widget )
- {
- hookupModel();
-diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h
-index 7561f2bd7..76b35aed8 100644
---- a/src/modules/packagechooser/PackageChooserViewStep.h
-+++ b/src/modules/packagechooser/PackageChooserViewStep.h
-@@ -50,7 +50,6 @@ private:
-
- Config* m_config;
- PackageChooserPage* m_widget;
-- CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar
- };
-
- CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory )
-diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
-index 543c9771d..7c4d5fda7 100644
---- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
-+++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
-@@ -29,7 +29,7 @@ PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent )
- QString
- PackageChooserQmlViewStep::prettyName() const
- {
-- return tr( "Packages" );
-+ return m_config->prettyName();
- }
-
- QString
-@@ -83,4 +83,13 @@ PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configuration
- m_config->setDefaultId( moduleInstanceKey() );
- m_config->setConfigurationMap( configurationMap );
- Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last
-+ /*bool labels_ok = false;
-+ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );
-+ if ( labels_ok )
-+ {
-+ if ( labels.contains( "step" ) )
-+ {
-+ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );
-+ }
-+ }*/
- }
diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/tools/misc/melody/default.nix
index a02994f33a0..f483b699266 100644
--- a/pkgs/tools/misc/melody/default.nix
+++ b/pkgs/tools/misc/melody/default.nix
@@ -2,15 +2,15 @@
rustPlatform.buildRustPackage rec {
pname = "melody";
- version = "0.13.10";
+ version = "0.18.0";
src = fetchCrate {
pname = "melody_cli";
inherit version;
- sha256 = "05slrh5dqbpsvimdr0rlhj04kf1qzwij3zlardvbmvhvfccf4188";
+ sha256 = "1shd5m9sj9ybjzq26ipggfbc22lyzkdzq2kirgfvdk16m5r3jy2v";
};
- cargoSha256 = "0qh1byysbc6pl3cvx2vdpl8crx5id59hhrwqzk5g7091spm8wf79";
+ cargoSha256 = "0wz696zz7gm36dy3lxxwsiriqxk0nisdwybvknn9a38rvzd6jjbm";
meta = with lib; {
description = "Language that compiles to regular expressions";
diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/tools/misc/usbimager/default.nix
new file mode 100644
index 00000000000..1aac4c5c802
--- /dev/null
+++ b/pkgs/tools/misc/usbimager/default.nix
@@ -0,0 +1,47 @@
+{ lib, stdenv, fetchFromGitLab, pkg-config
+, withLibui ? true, gtk3
+, withUdisks ? stdenv.isLinux, udisks, glib
+, libX11 }:
+
+stdenv.mkDerivation rec {
+ pname = "usbimager";
+ version = "1.0.8";
+
+ src = fetchFromGitLab {
+ owner = "bztsrc";
+ repo = pname;
+ rev = version;
+ sha256 = "1j0g1anmdwc3pap3m4kfzqjfkn7q0vpmqniii2kcz7svs5h3ybga";
+ };
+
+ sourceRoot = "source/src/";
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = lib.optionals withUdisks [ udisks glib ]
+ ++ lib.optional (!withLibui) libX11
+ ++ lib.optional withLibui gtk3;
+ # libui is bundled with the source of usbimager as a compiled static libary
+
+ postPatch = ''
+ sed -i \
+ -e 's|install -m 2755 -g disk|install |g' \
+ -e 's|-I/usr/include/gio-unix-2.0|-I${glib.dev}/include/gio-unix-2.0|g' \
+ -e 's|install -m 2755 -g $(GRP)|install |g' Makefile
+ '';
+
+ dontConfigure = true;
+
+ makeFlags = [ "PREFIX=$(out)" ]
+ ++ lib.optional withLibui "USE_LIBUI=yes"
+ ++ lib.optional withUdisks "USE_UDISKS2=yes";
+
+ meta = with lib; {
+ description = "A very minimal GUI app that can write compressed disk images to USB drives";
+ homepage = "https://gitlab.com/bztsrc/usbimager";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vdot0x23 ];
+ # windows and darwin could work, but untested
+ # feel free add them if you have a machine to test
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09e3d243e59..2af2f8d6c8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1153,6 +1153,8 @@ with pkgs;
headsetcontrol = callPackage ../tools/audio/headsetcontrol { };
+ headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { };
+
httm = callPackage ../tools/filesystems/httm { };
ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };
@@ -4709,6 +4711,8 @@ with pkgs;
usbview = callPackage ../tools/misc/usbview { };
+ usbimager = callPackage ../tools/misc/usbimager { };
+
uwuify = callPackage ../tools/misc/uwuify { };
anthy = callPackage ../tools/inputmethods/anthy { };
@@ -8053,9 +8057,6 @@ with pkgs;
librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { };
inherit (callPackages ../development/libraries/libwebsockets { })
- libwebsockets_3_1
- libwebsockets_3_2
- libwebsockets_4_2
libwebsockets_4_3;
libwebsockets = libwebsockets_4_3;
@@ -18601,6 +18602,7 @@ with pkgs;
libffcall = callPackage ../development/libraries/libffcall { };
libffi = callPackage ../development/libraries/libffi { };
+ libffi_3_3 = callPackage ../development/libraries/libffi/3.3.nix { };
libffiBoot = libffi.override {
doCheck = false;
};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5dae41a8fa4..e33bf27c13f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8763,6 +8763,8 @@ in {
qnap-qsw = callPackage ../development/python-modules/qnap-qsw{ };
+ qnapstats = callPackage ../development/python-modules/qnapstats { };
+
qrcode = callPackage ../development/python-modules/qrcode { };
qreactor = callPackage ../development/python-modules/qreactor { };
@@ -8775,6 +8777,8 @@ in {
qscintilla = self.qscintilla-qt5;
+ qstylizer = callPackage ../development/python-modules/qstylizer { };
+
qt5reactor = callPackage ../development/python-modules/qt5reactor { };
qtawesome = callPackage ../development/python-modules/qtawesome { };