From 499921d643d2962c580e76e0aa48753fe980898b Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 9 Sep 2022 15:02:39 -0700 Subject: [PATCH 01/16] emacs: avoid installing gsettings-desktop-schemas on Darwin --- pkgs/applications/editors/emacs/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 34853b890417..5e455b6bcd9f 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -136,7 +136,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optional (withX && withGTK3) gtk3-x11 - ++ lib.optional withGTK3 gsettings-desktop-schemas + ++ lib.optional (!stdenv.isDarwin && withGTK3) gsettings-desktop-schemas ++ lib.optional withPgtk gtk3 ++ lib.optional (withX && withMotif) motif ++ lib.optional withSQLite3 sqlite From 04eb0eba96af2383a5eced4ca03cead88e82e0b4 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Wed, 7 Sep 2022 16:59:18 +0530 Subject: [PATCH 02/16] juicefs: init at 1.0.0 remove installShellCompletion try fixing build on Darwin mark broken on Darwin --- pkgs/tools/filesystems/juicefs/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/filesystems/juicefs/default.nix diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix new file mode 100644 index 000000000000..39268c3ed98e --- /dev/null +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "juicefs"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "juicedata"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-urhm2dnWIbzt1mSFDsmqJe61E6D6FWRUG6CJPy/ExOI="; + }; + + vendorSha256 = "sha256-LvF/6YA/OVO2cyBM1c3YYhEjT26SVXcsepn+vglRKmE="; + + ldflags = [ "-s" "-w" ]; + + doCheck = false; # requires network access + + # we dont need the libjfs binary + postFixup = '' + rm $out/bin/libjfs + ''; + + meta = with lib; { + description = "A distributed POSIX file system built on top of Redis and S3"; + homepage = "https://www.juicefs.com/"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915e23056427..60443ebc766c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7811,6 +7811,8 @@ with pkgs; jmespath = callPackage ../development/tools/jmespath { }; + juicefs = callPackage ../tools/filesystems/juicefs { }; + jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; jnettop = callPackage ../tools/networking/jnettop { }; From 22a7681dd7d5b7df15ff9e7cf65e0245d37c2fbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 07:39:15 +0000 Subject: [PATCH 03/16] pomerium: 0.19.0 -> 0.19.1 --- pkgs/servers/http/pomerium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 42af2054caf2..91770f4c6880 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -14,15 +14,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - sha256 = "sha256:0s5ji1iywymzxlv89y3ivl5vngkifhbpidpwxdrh969l3c5r4klf"; + sha256 = "sha256-+YcYrhUQMiLUcBnYhTHxf+NrmQIdYpeO/blMgU33w6o="; }; - vendorSha256 = "sha256:1p78nb7bryvs7p5iq6ihylflyjia60x4hd9c62ffwz37dwqlbi33"; + vendorSha256 = "sha256-Y8RFMW9nfO6cMCw1SDowKkpPHfUwGhzLPXr7vM6y6Nw="; ui = mkYarnPackage { inherit version; From a5242b0a7c5441f2028f5307f174d53f140ee875 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 09:55:20 +0000 Subject: [PATCH 04/16] solo2-cli: 0.2.0 -> 0.2.1 --- pkgs/tools/security/solo2-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index 18a9e256ddbe..ad3df92873a8 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "solo2-cli"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "solokeys"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CRufj4SAkM0Qdffq45dp41TUqnnWep4zCB0XrEjdoG8="; + sha256 = "sha256-+n+tc3BDHr93yc2TzvI1Xqpcl8fM+bF/KZdv0rWfIZ8="; }; - cargoSha256 = "sha256-Q6/Vi5TB0H3OQ4np/DYIpTOsTPTSDjHonFI24LJ5gWE="; + cargoSha256 = "sha256-2bBo5HXLYQj+R47exPyMbx/RIrykDHjRkLRNMjVAzEI="; nativeBuildInputs = [ installShellFiles pkg-config ]; From 32f848003acbd3d901d40dab08daf187c88da27e Mon Sep 17 00:00:00 2001 From: ciferkey Date: Tue, 13 Sep 2022 22:50:03 -0400 Subject: [PATCH 05/16] maintainers: add ciferkey --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80b7e04371bc..69072e914f47 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2443,6 +2443,12 @@ githubId = 42220376; name = "Charlotte Van Petegem"; }; + ciferkey = { + name = "Matthew Brunelle"; + email = "ciferkey@gmail.com"; + github = "ciferkey"; + githubId = 101422; + }; cigrainger = { name = "Christopher Grainger"; email = "chris@amplified.ai"; From 79a0dd5f4885795cf202cd5f18fd9874e3da1f9a Mon Sep 17 00:00:00 2001 From: ciferkey Date: Tue, 13 Sep 2022 22:59:41 -0400 Subject: [PATCH 06/16] adw-gtk3: init at 3.7 --- pkgs/data/themes/adw-gtk3/default.nix | 45 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/data/themes/adw-gtk3/default.nix diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix new file mode 100644 index 000000000000..f88c11388c79 --- /dev/null +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -0,0 +1,45 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, sassc +}: + +stdenvNoCC.mkDerivation rec { + pname = "adw-gtk3"; + version = "3.7"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hHmNRPUJOXa//aKgAYhGBVX6usRsObWbzcfOa1uwbqM="; + }; + + nativeBuildInputs = [ + meson + ninja + sassc + ]; + + postPatch = '' + chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "The theme from libadwaita ported to GTK-3"; + homepage = "https://github.com/lassekongo83/adw-gtk3"; + license = licenses.lgpl21Only; + platforms = platforms.linux; + maintainers = with maintainers; [ ciferkey ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3528a280d508..1534b7bea010 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25297,6 +25297,8 @@ with pkgs; adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { }; + adw-gtk3 = callPackage ../data/themes/adw-gtk3 { }; + agave = callPackage ../data/fonts/agave { }; aileron = callPackage ../data/fonts/aileron { }; From 08e5e2185ddafb11b3ff75fdf9e87b7aa31581bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Sep 2022 05:49:41 +0000 Subject: [PATCH 07/16] python310Packages.pytest-mypy-plugins: 1.9.3 -> 1.10.0 --- .../python-modules/pytest-mypy-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 806c12c0e4ff..b07ad237db2e 100644 --- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "1.9.3"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "typeddjango"; repo = pname; - rev = version; - sha256 = "sha256-4hG3atahb+dH2dRGAxguJW3vvEf0TUGUJ3G5ymrf3Vg="; + rev = "refs/tags/${version}"; + sha256 = "sha256-QvUh/vIvzCfEYNC0Y388qavGvbTg0yuT4j0SttUpUWs="; }; buildInputs = [ From 65cefcd5880ce4073954f2485017334436680fe4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 14 Sep 2022 14:19:03 +0800 Subject: [PATCH 08/16] matrix-synapse: 1.66.0 -> 1.67.0 --- nixos/tests/matrix/synapse.nix | 2 +- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/matrix/synapse.nix b/nixos/tests/matrix/synapse.nix index 756a8d5de49a..698d67c793e3 100644 --- a/nixos/tests/matrix/synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -209,7 +209,7 @@ in { "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" ) serverpostgres.require_unit_state("postgresql.service") - serverpostgres.succeed("register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} ") + serverpostgres.succeed("register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} https://localhost:8448/") serverpostgres.succeed("obtain-token-and-register-email") serversqlite.wait_for_unit("matrix-synapse.service") serversqlite.wait_until_succeeds( diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d28bba446a13..699c2e083b28 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.66.0"; + version = "1.67.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jrjNl3NlJ9sWNNM/VYrASPnVZ/U9fn1N1P6Yqd+MQ08="; + sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY="; }; buildInputs = [ openssl ]; From f6774f1c71a7a1c57d9007eaa1d2e96666aaaceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 14 Sep 2022 08:48:39 +0200 Subject: [PATCH 09/16] profanity: 0.12.1 -> 0.13.0 --- .../networking/instant-messengers/profanity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 8ffe6f05f5df..1905fd1b4f36 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "profanity"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - hash = "sha256-yUiiww8yhymdqR6CITRnItxZhfpZiEbu1WyD8bDW+vc="; + hash = "sha256-cTkNtj1mN5EuCyniFibKNzY2fxe3NKpRXt8acO/p6WY="; }; patches = [ From ef816fb05a7db310b7170137979c5aabf1061b3c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 14 Sep 2022 16:12:55 +0200 Subject: [PATCH 10/16] emacsPackages.bqn-mode: 2022-01-07 -> 2022-09-14 --- .../editors/emacs/elisp-packages/bqn-mode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix index 80e1b7d115df..6430e56ef730 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix @@ -5,13 +5,13 @@ trivialBuild { pname = "bqn-mode"; - version = "0.pre+date=2022-01-07"; + version = "0.pre+date=2022-09-14"; src = fetchFromGitHub { owner = "museoa"; repo = "bqn-mode"; - rev = "86ef8b4d32d272b2765cd4a6e6e0b70a4f3e99a2"; - hash = "sha256-6ygV/iNzzpZ77w+Dh/snHAzUxrbfaU9TxuNOtJK6pNQ="; + rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013"; + hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a"; }; meta = with lib; { From 20981ca545873afb201c3bc169493006d180debe Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Wed, 14 Sep 2022 17:51:00 -0400 Subject: [PATCH 11/16] sonic-pi: 4.1.0 -> 4.2.0 --- pkgs/applications/audio/sonic-pi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 3e7f2ddd4ad9..41e71cec2ff8 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-kEZNVTAWkiqxyPJHSL4Gismpwxd+PnXiH8CgQCV3+PQ="; + hash = "sha256-VRuNhS53okKsCHgKEsJgkpIe9yXFY6d2ghd0nsUQLLM="; }; mixFodDeps = beamPackages.fetchMixDeps { From 49bddbbc62976b302d99b3c73c7e1a64b9880678 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 14 Sep 2022 21:40:58 -0400 Subject: [PATCH 12/16] cargo-tally: 1.0.12 -> 1.0.13 --- pkgs/development/tools/rust/cargo-tally/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index d6868a74ccc3..996d48f23338 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.12"; + version = "1.0.13"; src = fetchCrate { inherit pname version; - sha256 = "sha256-v9nAiV3t/l6B+a7hzq4IYOetrNM5f22+nEIQncLs5tU="; + sha256 = "sha256-9w3/zQqcHtZ91WDolAru9aNG9pV8HuXvujvp3NlOcgU="; }; - cargoSha256 = "sha256-/PypVUT6n2pdsWIN+5EGHmj/UlfguvlbufBlHvuROg8="; + cargoSha256 = "sha256-CGP3KMJFDIl+MLzI9aQ2OM4tUuOQEtG4nET14zt7PD0="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration From bddda66d298879bb2d547405e14fbff76c277410 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 00:50:40 +0000 Subject: [PATCH 13/16] vala-lint: unstable-2022-05-20 -> unstable-2022-09-14 --- pkgs/development/tools/vala-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 8485904a66ca..26828ee7bb4c 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2022-05-20"; + version = "unstable-2022-09-14"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "b5c22b3bce25837565a894ba1a91bc856b60c251"; - sha256 = "sha256-DzK4CihXUOY3xnVnuCgfFmhN+Q3gUD/v77vA7hS9qWE="; + rev = "37660284fd1317a445ecddbaf1acdd6fa6bbbcad"; + sha256 = "sha256-Tbjw7BXeRuuF7VTo7FLYBR9+6mRp4AO2WhtE0GI3eYc="; }; nativeBuildInputs = [ From 302b1d05db31ae2eaf7d5456fd260df8b9e7ab97 Mon Sep 17 00:00:00 2001 From: Izumi Raine <63145238+IzumiRaine@users.noreply.github.com> Date: Wed, 14 Sep 2022 17:42:54 +0200 Subject: [PATCH 14/16] gptfdisk: 1.0.8 -> 1.0.9 --- pkgs/tools/system/gptfdisk/default.nix | 10 +- pkgs/tools/system/gptfdisk/ncurses-6.3.patch | 96 -------------------- 2 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 pkgs/tools/system/gptfdisk/ncurses-6.3.patch diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 3cb8f758eb2a..b470b9cea709 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -2,21 +2,15 @@ stdenv.mkDerivation rec { pname = "gptfdisk"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; - sha256 = "sha256-ldGYVvAE2rxLjDQrJhLo0KnuvdUgBClxiDafFS6dxt8="; + sha256 = "sha256-2v6tJpP6646Ll4MrI0B/btWzIZvBeE9ILdhVd04tUMI="; }; - patches = [ - # fix build failure against ncurses-6.3 (pending upstream inclusion): - # https://sourceforge.net/p/gptfdisk/mailman/message/37392412/ - ./ncurses-6.3.patch - ]; - postPatch = '' patchShebangs gdisk_test.sh '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/system/gptfdisk/ncurses-6.3.patch b/pkgs/tools/system/gptfdisk/ncurses-6.3.patch deleted file mode 100644 index 4b8ec91aa04e..000000000000 --- a/pkgs/tools/system/gptfdisk/ncurses-6.3.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 9d5032d1487a8fe6ef7229d413418a27e32a28e5 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Mon, 1 Nov 2021 07:51:10 +0000 -Subject: [PATCH:gptfdisk] gptcurses.cc: always use "%s"-style format for printf()-style - functions - -`ncuses-6.3` added printf-style function attributes and now makes -it easier to catch cases when user input is used in palce of format -string when built with CFLAGS=-Werror=format-security: - - gptcurses.cc:274:10: error: - format not a string literal and no format arguments [-Werror=format-security] - 274 | printw(theLine.c_str()); - | ~~~~~~^~~~~~~~~~~~~~~~~ - -Let's wrap all the missing places with "%s" format. ---- - gptcurses.cc | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - ---- a/gptcurses.cc -+++ b/gptcurses.cc -@@ -239,22 +239,22 @@ Space* GPTDataCurses::ShowSpace(int spaceNum, int lineNum) { - ClearLine(lineNum); - if (space->partNum == -1) { // space is empty - move(lineNum, 12); -- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); -+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); - move(lineNum, 24); - printw("free space"); - } else { // space holds a partition - move(lineNum, 3); - printw("%d", space->partNum + 1); - move(lineNum, 12); -- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); -+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); - move(lineNum, 24); -- printw(space->origPart->GetTypeName().c_str()); -+ printw("%s", space->origPart->GetTypeName().c_str()); - move(lineNum, 50); - #ifdef USE_UTF16 - space->origPart->GetDescription().extract(0, 39, temp, 39); -- printw(temp); -+ printw("%s", temp); - #else -- printw(space->origPart->GetDescription().c_str()); -+ printw("%s", space->origPart->GetDescription().c_str()); - #endif - } // if/else - } // if -@@ -271,10 +271,10 @@ int GPTDataCurses::DisplayParts(int selected) { - - move(lineNum++, 0); - theLine = "Part. # Size Partition Type Partition Name"; -- printw(theLine.c_str()); -+ printw("%s", theLine.c_str()); - move(lineNum++, 0); - theLine = "----------------------------------------------------------------"; -- printw(theLine.c_str()); -+ printw("%s", theLine.c_str()); - numToShow = LINES - RESERVED_TOP - RESERVED_BOTTOM; - pageNum = selected / numToShow; - for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) { -@@ -636,7 +636,7 @@ void GPTDataCurses::DisplayOptions(char selectedKey) { - } // if/else - } // for - move(LINES - 1, (COLS - optionDesc.length()) / 2); -- printw(optionDesc.c_str()); -+ printw("%s", optionDesc.c_str()); - currentKey = selectedKey; - } // if - } // GPTDataCurses::DisplayOptions() -@@ -748,11 +748,11 @@ void GPTDataCurses::DrawMenu(void) { - - clear(); - move(0, (COLS - title.length()) / 2); -- printw(title.c_str()); -+ printw("%s", title.c_str()); - move(2, (COLS - drive.length()) / 2); -- printw(drive.c_str()); -+ printw("%s", drive.c_str()); - move(3, (COLS - size.str().length()) / 2); -- printw(size.str().c_str()); -+ printw("%s", size.str().c_str()); - DisplayParts(currentSpaceNum); - } // DrawMenu - -@@ -802,7 +802,7 @@ void PromptToContinue(void) { - void Report(string theText) { - clear(); - move(0, 0); -- printw(theText.c_str()); -+ printw("%s", theText.c_str()); - move(LINES - 2, (COLS - 29) / 2); - printw("Press any key to continue...."); - cbreak(); From 288a708031cbe396847c89ee4213596242a12520 Mon Sep 17 00:00:00 2001 From: Izumi Raine <63145238+IzumiRaine@users.noreply.github.com> Date: Wed, 14 Sep 2022 17:48:47 +0200 Subject: [PATCH 15/16] gptfdisk 1.0.9: add patch to fix UUID generation --- pkgs/tools/system/gptfdisk/default.nix | 7 +++++++ pkgs/tools/system/gptfdisk/uuid.patch | 11 +++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/tools/system/gptfdisk/uuid.patch diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index b470b9cea709..871d309d5304 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-2v6tJpP6646Ll4MrI0B/btWzIZvBeE9ILdhVd04tUMI="; }; + patches = [ + # fix UUID generation (from upstream but not yet released): + # https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/ + # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1853985.html + ./uuid.patch + ]; + postPatch = '' patchShebangs gdisk_test.sh '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/system/gptfdisk/uuid.patch b/pkgs/tools/system/gptfdisk/uuid.patch new file mode 100644 index 000000000000..110c3d106b43 --- /dev/null +++ b/pkgs/tools/system/gptfdisk/uuid.patch @@ -0,0 +1,11 @@ +--- a/guid.cc ++++ b/guid.cc +@@ -141,7 +141,7 @@ void GUIDData::Zero(void) { + void GUIDData::Randomize(void) { + int i, uuidGenerated = 0; + +-#ifdef _UUID_UUID_H ++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) + uuid_generate(uuidData); + ReverseBytes(&uuidData[0], 4); + ReverseBytes(&uuidData[4], 2); From 5e05ec33520b6531e32db1b1e007ed0ab6362d74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Sep 2022 04:55:40 +0200 Subject: [PATCH 16/16] python3Packages.img2pdf: apply patch to fix tests --- pkgs/development/python-modules/img2pdf/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 791edcb2fb20..c749071bab9b 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi +, fetchpatch , pikepdf , pillow , stdenv @@ -26,6 +27,14 @@ buildPythonPackage rec { sha256 = "8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c"; }; + patches = [ + (fetchpatch { + # https://gitlab.mister-muffin.de/josch/img2pdf/issues/148 + url = "https://gitlab.mister-muffin.de/josch/img2pdf/commit/57d7e07e6badb252c12015388b58fcb5285d3158.patch"; + hash = "sha256-H/g55spe/oVJRxO2Vh+F+ZgR6aLoRUrNeu5WnuU7k/k="; + }) + ]; + propagatedBuildInputs = [ pikepdf pillow