diff --git a/pkgs/by-name/ca/calamares-nixos/package.nix b/pkgs/by-name/ca/calamares-nixos/package.nix index b09ace46e8ff..f00c1ea6d743 100644 --- a/pkgs/by-name/ca/calamares-nixos/package.nix +++ b/pkgs/by-name/ca/calamares-nixos/package.nix @@ -4,8 +4,8 @@ }: calamares.override { extraWrapperArgs = [ - "--prefix XDG_DATA_DIRS : ${calamares-nixos-extensions}/share" - "--prefix XDG_CONFIG_DIRS : ${calamares-nixos-extensions}/etc" - "--add-flag --xdg-config" + "--prefix XDG_DATA_DIRS : ${calamares-nixos-extensions}/share" + "--prefix XDG_CONFIG_DIRS : ${calamares-nixos-extensions}/etc" + "--add-flag --xdg-config" ]; } diff --git a/pkgs/by-name/ca/calamares/let-qml-write-to-global-storage.patch b/pkgs/by-name/ca/calamares/let-qml-write-to-global-storage.patch deleted file mode 100644 index 9afbe4ef87ff..000000000000 --- a/pkgs/by-name/ca/calamares/let-qml-write-to-global-storage.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/libcalamares/GlobalStorage.h b/src/libcalamares/GlobalStorage.h -index 37ea332d2..b9e629350 100644 ---- a/src/libcalamares/GlobalStorage.h -+++ b/src/libcalamares/GlobalStorage.h -@@ -56,13 +56,6 @@ public: - */ - explicit GlobalStorage( QObject* parent = nullptr ); - -- /** @brief Insert a key and value into the store -- * -- * The @p value is added to the store with key @p key. If @p key -- * already exists in the store, its existing value is overwritten. -- * The changed() signal is emitted regardless. -- */ -- void insert( const QString& key, const QVariant& value ); - /** @brief Removes a key and its value - * - * The @p key is removed from the store. If the @p key does not -@@ -123,6 +116,14 @@ public: - QVariantMap data() const { return m; } - - public Q_SLOTS: -+ /** @brief Insert a key and value into the store -+ * -+ * The @p value is added to the store with key @p key. If @p key -+ * already exists in the store, its existing value is overwritten. -+ * The changed() signal is emitted regardless. -+ */ -+ void insert( const QString& key, const QVariant& value ); -+ - /** @brief Does the store contain the given key? - * - * This can distinguish an explicitly-inserted QVariant() from diff --git a/pkgs/by-name/ca/calamares/package.nix b/pkgs/by-name/ca/calamares/package.nix index 262f05c4d4a7..2db37990634d 100644 --- a/pkgs/by-name/ca/calamares/package.nix +++ b/pkgs/by-name/ca/calamares/package.nix @@ -23,7 +23,7 @@ os-prober, xkeyboard_config, - extraWrapperArgs ? [], + extraWrapperArgs ? [ ], # passthru.tests calamares-nixos, @@ -38,13 +38,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "calamares"; - version = "3.4.0"; + version = "3.4.2"; src = fetchFromCodeberg { owner = "Calamares"; repo = "calamares"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qk+GnonuEWK3hXjmwxf9awgxr6dGunShJgwmkT78qKM="; + hash = "sha256-/foh3NKXTaNmP+x18t+GeAz7qv4e/TyspSEln8mMH4I="; }; patches = [ @@ -55,10 +55,6 @@ stdenv.mkDerivation (finalAttrs: { # Don't create users - they're already created by the installer # FIXME: upstream this? ./dont-create-users.patch - - # Allow QML to write to GlobalStorage - # FIXME: upstream this - ./let-qml-write-to-global-storage.patch ]; nativeBuildInputs = [ @@ -110,7 +106,8 @@ stdenv.mkDerivation (finalAttrs: { xdg-open-nixos ] }" - ] ++ extraWrapperArgs; + ] + ++ extraWrapperArgs; passthru.tests = { inherit calamares-nixos;