From 8e1e16fdcb3ee87ba1308f0ba045c5a2d29c41b5 Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Thu, 4 Jan 2024 09:43:06 +0000 Subject: [PATCH 01/11] rustc: Fix building cross-compilers for no_std targets. When building a cross-compiler, the rustc derivation does some tricks to only build the standard library and reuse the host's compiler, leading to much faster build time. Unfortunately, the way the build system was invoked, it would always build the `std` crate, whether or not the target supports it. Some bare-metal targets only support building the `core` and `alloc` crates. By being more vague about the build command, using `library` instead of `library/std`, Rust's build system is able to figure out exactly which crates to build: https://github.com/rust-lang/rust/blob/1.74.1/src/bootstrap/compile.rs#L370-L412 Oddly enough, the install command still needs to use `library/std`, even if building just a subset: https://github.com/rust-lang/rust/blob/1.74.1/src/bootstrap/install.rs#L207 The following command was used to reproduce the original issue. Without this patch, it leads to a build failure when trying to compile one of std's dependencies. With the patch it completes succesfully and produces a working cross-compiler. nix build --impure --expr '(import ./. { crossSystem = { config = "riscv32-none-elf"; rustc.config = "riscv32imc-unknown-none-elf"; }; }).buildPackages.rustc' --- pkgs/development/compilers/rust/rustc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 7e365f52ef30..7fe33a4011e5 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -159,7 +159,7 @@ in stdenv.mkDerivation (finalAttrs: { ln -s ${rustc.unwrapped}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.libstd.stamp touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc.stamp - python ./x.py --keep-stage=0 --stage=1 build library/std + python ./x.py --keep-stage=0 --stage=1 build library runHook postBuild " else null; From 5f5522aab641f2c739898aa0b7b9b705d780f8bc Mon Sep 17 00:00:00 2001 From: arthsmn Date: Tue, 2 Jan 2024 20:28:40 -0300 Subject: [PATCH 02/11] scribus: 1.5.8 -> 1.6.0 --- pkgs/applications/office/scribus/default.nix | 62 +++++--------------- 1 file changed, 14 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 16e65d283645..54b97b3e9f04 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -3,7 +3,6 @@ , cmake , cups , fetchurl -, fetchpatch , fontconfig , freetype , harfbuzzFull @@ -12,17 +11,15 @@ , libjpeg , libtiff , libxml2 -, mkDerivation , pixman , pkg-config , podofo , poppler , poppler_data , python3 -, qtbase -, qtimageformats -, qttools , lib +, stdenv +, qt5 }: let @@ -33,46 +30,20 @@ let ] ); in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.5.8"; + version = "1.6.0"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; - hash = "sha256-R4Fuj89tBXiP8WqkSZ+X/yJDHHd6d4kUmwqItFHha3Q="; + url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; + hash = "sha256-lLl0kOzhcoaNxPBMeqLulQtBtfL/QoXfN9YV8ETQOOU="; }; - patches = [ - # For Poppler 22.02 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch"; - sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw="; - }) - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch"; - sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c="; - }) - # For Poppler 22.03 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch"; - sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds="; - }) - # For Poppler 22.04 - (fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; - sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; - }) - # For Poppler 22.09 - (fetchpatch { - url = "https://github.com/archlinux/svntogit-community/raw/ea402a588c65d11973b148cf203b3463213431cf/trunk/scribus-1.5.8-poppler-22.09.0.patch"; - sha256 = "IRQ6rSzH6ZWln6F13Ayk8k7ADj8l3lIJlGm/zjEURQM="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -92,23 +63,17 @@ mkDerivation rec { poppler poppler_data pythonEnv - qtbase - qtimageformats - qttools - ]; - - cmakeFlags = [ - # poppler uses std::optional - "-DWANT_CPP17=ON" + qt5.qtbase + qt5.qtimageformats + qt5.qttools ]; meta = with lib; { maintainers = with maintainers; [ - erictapen kiwi + arthsmn ]; - platforms = platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux"; + description = "Desktop Publishing (DTP) and Layout program"; homepage = "https://www.scribus.net"; # There are a lot of licenses... # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 @@ -118,5 +83,6 @@ mkDerivation rec { mit publicDomain ]; + broken = stdenv.isDarwin; }; -} +}) From de55f869de715b58b92cd593e43972053ef23519 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Mon, 25 Dec 2023 06:49:59 +0200 Subject: [PATCH 03/11] owncloud-client: 5.0.0 -> 5.2.1 --- pkgs/by-name/ow/owncloud-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix index 5edbd5d0f6b8..e30304fde30b 100644 --- a/pkgs/by-name/ow/owncloud-client/package.nix +++ b/pkgs/by-name/ow/owncloud-client/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "owncloud-client"; - version = "5.0.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "owncloud"; repo = "client"; rev = "refs/tags/v${version}"; - hash = "sha256-SSMNmWrCT1sGa38oY8P84QNedNkQPcIRWrV9B65B5X8="; + hash = "sha256-yErMHh0QbWVpJhNiXU1IIGpQ5CGARN/4cqELRMoxSac="; }; nativeBuildInputs = [ From 834794c97e336b8f23345140d0e5155b555debea Mon Sep 17 00:00:00 2001 From: MultisampledNight Date: Fri, 5 Jan 2024 01:56:15 +0100 Subject: [PATCH 04/11] neovide: 0.12.0 -> 0.12.1 --- pkgs/applications/editors/neovim/neovide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 6840ac60919c..0142fde1726f 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,16 +25,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-m3ZdzdmkW69j1sZ9h7M1m5fDNnJ7BM7nwYPx7QhsIso="; + sha256 = "sha256-lmhTTBlhyEepUNHrm2hq42G1kA7siAsJUcYjBfajaHA="; }; - cargoSha256 = "sha256-AAHMx4xxbC/JdmAPE2bub7qdF5sFNWjqXI1nuCUxsZA="; + cargoSha256 = "sha256-1R1JrNhcgC16anr5Gl1b9rHgfRLPJElef5D65joHxj0="; SKIA_SOURCE_DIR = let From 745a56a2e9c4955cdcbd69df980f342986e04ab3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 05:11:19 +0000 Subject: [PATCH 05/11] crow-translate: 2.11.0 -> 2.11.1 --- pkgs/applications/misc/crow-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 6c70d49fdd69..5209368a6b22 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.11.0"; + version = "2.11.1"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-e0zfbfRNzAiNvlWO84YbMApUXXzMcZG1MckTGMZm2ik="; + hash = "sha256-1rq1pF4tOaZNEaHflxlBuHta80EzD9m3O99geR1EPxE="; }; postPatch = '' From ddb6aac521ba3665ff565d0974af8296480489e5 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 30 Nov 2023 08:43:02 +0300 Subject: [PATCH 06/11] sddm: 0.20.0 -> 0.20.0-unstable-2023-12-29, add Qt6 support --- .../display-managers/sddm/default.nix | 39 ++++++------------- pkgs/top-level/qt6-packages.nix | 4 ++ 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 94550f69d941..8c7e1745bcd3 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,40 +1,24 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkg-config, qttools -, libxcb, libXau, pam, qtbase, qtdeclarative, qtquickcontrols2, systemd, xkeyboardconfig +{ stdenv, lib, fetchFromGitHub +, cmake, pkg-config, qttools +, libxcb, libXau, pam, qtbase, wrapQtAppsHook, qtdeclarative +, qtquickcontrols2 ? null, systemd, xkeyboardconfig }: -mkDerivation rec { +let + isQt6 = lib.versions.major qtbase.version == "6"; +in stdenv.mkDerivation { pname = "sddm"; - version = "0.20.0"; + version = "0.20.0-unstable-2023-12-29"; src = fetchFromGitHub { owner = "sddm"; repo = "sddm"; - rev = "v${version}"; - hash = "sha256-ctZln1yQov+p/outkQhcWZp46IKITC04e22RfePwEM4="; + rev = "501129294be1487f753482c29949fc1c19ef340e"; + hash = "sha256-mLm987Ah0X9s0tBK2a45iERwYoh5JzWb3TFlSoxi8CA="; }; patches = [ ./sddm-ignore-config-mtime.patch ./sddm-default-session.patch - - # FIXME: all of the following are Wayland related backports, drop in next release - # Don't use Qt virtual keyboard on Wayland - (fetchpatch { - url = "https://github.com/sddm/sddm/commit/07631f2ef00a52d883d0fd47ff7d1e1a6bc6358f.patch"; - hash = "sha256-HTSw3YeT4z9ldr4sLmsnrPQ+LA8/a6XxrF+KUFqXUlM="; - }) - - # Fix running sddm-greeter manually in Wayland sessions - (fetchpatch { - url = "https://github.com/sddm/sddm/commit/e27b70957505dc7b986ab2fa68219af546c63344.patch"; - hash = "sha256-6hzrFeS2epL9vzLOA29ZA/dD3Jd4rPMBHhNp+FBq1bA="; - }) - - # Prefer GreeterEnvironment over PAM environment - (fetchpatch { - url = "https://github.com/sddm/sddm/commit/9e7791d5fb375933d20f590daba9947195515b26.patch"; - hash = "sha256-JNsVTJNZV6T+SPqPkaFf3wg8NDqXGx8NZ4qQfZWOli4="; - }) ]; postPatch = '' @@ -42,7 +26,7 @@ mkDerivation rec { --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkg-config qttools ]; + nativeBuildInputs = [ wrapQtAppsHook cmake pkg-config qttools ]; buildInputs = [ libxcb @@ -55,6 +39,7 @@ mkDerivation rec { ]; cmakeFlags = [ + (lib.cmakeBool "BUILD_WITH_QT6" isQt6) "-DCONFIG_FILE=/etc/sddm.conf" "-DCONFIG_DIR=/etc/sddm.conf.d" diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 1b6e1ce4c1c7..b9f3fdd35eef 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -58,6 +58,10 @@ makeScopeWithSplicing' { suffix = "qt6"; }; + # Not a library, but we do want it to be built for every qt version there + # is, to allow users to choose the right build if needed. + sddm = callPackage ../applications/display-managers/sddm {}; + } // lib.optionalAttrs pkgs.config.allowAliases { # Convert to a throw on 01-01-2023. # Warnings show up in various cli tool outputs, throws do not. From 88cab94bd9491368f0605dc28135b55dac7e587d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Jan 2024 05:09:41 +0000 Subject: [PATCH 07/11] wallabag: 2.6.7 -> 2.6.8 --- pkgs/servers/web-apps/wallabag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 87bde25166c3..792292066f53 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -15,7 +15,7 @@ let pname = "wallabag"; - version = "2.6.7"; + version = "2.6.8"; in stdenv.mkDerivation { inherit pname version; @@ -23,7 +23,7 @@ stdenv.mkDerivation { # Release tarball includes vendored files src = fetchurl { url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz"; - hash = "sha256-prk/sF72v5qyBv1Lz/2nY6LPM+on5/gwAMM1u9+X8xA="; + hash = "sha256-pmQXafqpd5rTwBIYG9NnwIIPta6Ek7iYaPaHvz1s550="; }; patches = [ From da5b9fb2c7d383fa9a24e2ec8dccbd1ac4d842c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Jan 2024 04:49:00 +0000 Subject: [PATCH 08/11] revive: 1.3.4 -> 1.3.5 --- pkgs/development/tools/revive/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index b7b0181bd12e..bb6f498e5f8d 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TNmxS9LoOOWHGAFrBdCKmVEWCEoIpic84L66dIFQWJg="; + sha256 = "sha256-yHsEELeBG/dgV1uaYTOfvVVZQZ+AG1kKx86tn9GI+RA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-iCd4J37wJbTkKiWRD6I7qNr5grNhWZLx5ymcOOJlNKg="; + vendorHash = "sha256-hNLHVx3zuCheSfY6TSixfJj/76JQ9nOW+mBquIZCgSk="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.3.4.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.3.5.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) From aa8538161c87bacd00dab74749d2f69a1a5e982b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Jan 2024 05:06:15 +0000 Subject: [PATCH 09/11] sqldef: 0.16.13 -> 0.16.14 --- pkgs/development/tools/sqldef/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index bc1bcd0d463e..4698c4179d04 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.16.13"; + version = "0.16.14"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-c6ErXWnCoKaM7i7yf4tP3J3k0yhNypFJA+XGwazDDD0="; + hash = "sha256-AuUGv3spAxPi3EwgWlxAfgksh6W/rTCnsGr3Fch5YTs="; }; proxyVendor = true; - vendorHash = "sha256-oIP8XeaQITdirtBAP5JjcWYiA4En4y2Hwu7thZk//fY="; + vendorHash = "sha256-VM50tJxChGU1lGol4HUKB5Zp0c2F8D9+NhrW6XK7i+g="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 26c6b9f5394b2e64649ff18394d61ce5594874e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Jan 2024 04:57:50 +0000 Subject: [PATCH 10/11] rymdport: 3.5.1 -> 3.5.2 --- pkgs/applications/networking/rymdport/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index e95bd9bc03af..8f78701fb9e5 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-wsFZN2qDp0XScqBdwLYZdRsS30g+ex+sYjw2GkBwwI4="; + hash = "sha256-LTCr1OFh+1QQhXFNl9SoLPqEY0ERlLlWfSxRKjyyqPk="; }; - vendorHash = "sha256-SDNCVROfwCTfoQpUyChxtX3rTf0OPFOTzH5PeH4ahUI="; + vendorHash = "sha256-twXeLNWy/5wTaFb645mCeI5PzByEGj5aCWl6vO+qRLQ="; nativeBuildInputs = [ pkg-config From f10ff4a12ccbda56b8b2c74630f905ae87802097 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 08:38:16 +0000 Subject: [PATCH 11/11] ledger-live-desktop: 2.73.0 -> 2.73.1 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 50ae11f7496d..364e6cf58a50 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.73.0"; + version = "2.73.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-/eFzIIjHCAYskc68CGTyUKW04spX8YN69/3cPQ0Qtc0="; + hash = "sha256-aHA65NLX3tlg8nLnQOOG1TuvcJP57HbQWruiBMvDJ10="; }; appimageContents = appimageTools.extractType2 {