Commit 08677f6e authored by K900's avatar K900
Browse files

calamares: 3.4.0 -> 3.4.2

Drop merged patch.
parent 2a29261c
Loading
Loading
Loading
Loading
+0 −33
Original line number Diff line number Diff line
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
+5 −8
Original line number Diff line number Diff line
@@ -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;
+3 −3

File changed.

Contains only whitespace changes.