From 0c2e1c9fde4c7e7dd57da3a57fdca99f4c57ecb2 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Tue, 13 Oct 2020 16:12:52 +0200
Subject: [PATCH] Update dependencies

---
 Cargo.lock                       | 24 +++++++++++++++++------
 Cargo.toml                       |  2 +-
 build-aux/flatpak-build.bash     |  6 +-----
 build-aux/generated-sources.json | 33 ++++++++++++++++++++++----------
 4 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f8b91ad..8ae4cb2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -34,9 +34,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d"
 dependencies = [
  "memchr",
 ]
@@ -267,7 +267,7 @@ version = "3.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b57a92e9749e10f25a171adcebfafe72991d45e7ec2dcb853e8f83d9dafaeb08"
 dependencies = [
- "nix",
+ "nix 0.18.0",
  "winapi",
 ]
 
@@ -948,6 +948,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nix"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85db2feff6bf70ebc3a4793191517d5f0331100a2f10f9bf93b5e5214f32b7b7"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "num"
 version = "0.2.1"
@@ -1113,7 +1125,7 @@ dependencies = [
  "libhandy",
  "log",
  "matches",
- "nix",
+ "nix 0.19.0",
  "once_cell",
  "pango",
  "pretty_env_logger",
@@ -1156,9 +1168,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
 
 [[package]]
 name = "pretty_env_logger"
diff --git a/Cargo.toml b/Cargo.toml
index d6b8cc5..4614fba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ dbus = "0.9"
 gettext-rs = { version = "0.5", features = ["gettext-system"] }
 humansize = "1.1"
 matches = "0.1"
-nix = "0.18"
+nix = "0.19"
 secret-service = "1.1"
 walkdir = "2.3"
 zxcvbn = "2.0"
diff --git a/build-aux/flatpak-build.bash b/build-aux/flatpak-build.bash
index 8d1e57d..f961b6f 100755
--- a/build-aux/flatpak-build.bash
+++ b/build-aux/flatpak-build.bash
@@ -1,14 +1,10 @@
 #!/bin/bash -x
 
 APP_ID=$(cat data/APPLICATION_ID)
-REPO_NAME=pika-backup-dev
 REPO_DIR=flatpak_repo
 
-flatpak remove $APP_ID -y
 flatpak-builder --install-deps-from=flathub \
   --user --verbose --force-clean -y --repo=$REPO_DIR flatpak_out build-aux/ci.manifest.yml
 flatpak build-bundle $REPO_DIR $APP_ID.flatpak $APP_ID
-flatpak --force remote-delete $REPO_NAME
-flatpak --user remote-add --no-gpg-verify $REPO_NAME $REPO_DIR
-flatpak --user install -y $REPO_NAME $APP_ID
+flatpak --user install -y $APP_ID.flatpak
 flatpak run $APP_ID
diff --git a/build-aux/generated-sources.json b/build-aux/generated-sources.json
index 4cbddee..6266945 100644
--- a/build-aux/generated-sources.json
+++ b/build-aux/generated-sources.json
@@ -40,15 +40,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.13.crate",
-        "sha256": "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86",
+        "url": "https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.14.crate",
+        "sha256": "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d",
         "dest": "cargo/vendor",
-        "dest-filename": "aho-corasick-0.7.13.crate"
+        "dest-filename": "aho-corasick-0.7.14.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/aho-corasick-0.7.13",
+        "url": "data:%7B%22package%22%3A%20%22b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/aho-corasick-0.7.14",
         "dest-filename": ".cargo-checksum.json"
     },
     {
@@ -1182,6 +1182,19 @@
         "dest": "cargo/vendor/nix-0.18.0",
         "dest-filename": ".cargo-checksum.json"
     },
+    {
+        "type": "file",
+        "url": "https://static.crates.io/crates/nix/nix-0.19.0.crate",
+        "sha256": "85db2feff6bf70ebc3a4793191517d5f0331100a2f10f9bf93b5e5214f32b7b7",
+        "dest": "cargo/vendor",
+        "dest-filename": "nix-0.19.0.crate"
+    },
+    {
+        "type": "file",
+        "url": "data:%7B%22package%22%3A%20%2285db2feff6bf70ebc3a4793191517d5f0331100a2f10f9bf93b5e5214f32b7b7%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/nix-0.19.0",
+        "dest-filename": ".cargo-checksum.json"
+    },
     {
         "type": "file",
         "url": "https://static.crates.io/crates/num/num-0.2.1.crate",
@@ -1405,15 +1418,15 @@
     },
     {
         "type": "file",
-        "url": "https://static.crates.io/crates/pkg-config/pkg-config-0.3.18.crate",
-        "sha256": "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33",
+        "url": "https://static.crates.io/crates/pkg-config/pkg-config-0.3.19.crate",
+        "sha256": "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c",
         "dest": "cargo/vendor",
-        "dest-filename": "pkg-config-0.3.18.crate"
+        "dest-filename": "pkg-config-0.3.19.crate"
     },
     {
         "type": "file",
-        "url": "data:%7B%22package%22%3A%20%22d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33%22%2C%20%22files%22%3A%20%7B%7D%7D",
-        "dest": "cargo/vendor/pkg-config-0.3.18",
+        "url": "data:%7B%22package%22%3A%20%223831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c%22%2C%20%22files%22%3A%20%7B%7D%7D",
+        "dest": "cargo/vendor/pkg-config-0.3.19",
         "dest-filename": ".cargo-checksum.json"
     },
     {
-- 
GitLab