From 84115573e33efe82ae42643e1d3a4ecd618be501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 23 Jun 2022 12:28:29 +0200
Subject: pkgs/ferdium: update to 6.0.0-nightly.74

---
 flake.lock               | 24 ++++++------------------
 flake.nix                |  5 ++++-
 pkgs/ferdium/default.nix |  4 ++--
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 15290f0..ca5caad 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,20 +57,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1653738054,
-        "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1654875595,
         "narHash": "sha256-Vairke3ryPSFpgQdaYicPPhPWMGhtzm6V+1uF2Tefbk=",
@@ -84,7 +70,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1637875414,
         "narHash": "sha256-Ica++SXFuLyxX9Q7YxhfZulUif6/gwM8AEQYlUxqSgE=",
@@ -102,7 +88,9 @@
     "nixturris": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1654937122,
@@ -146,7 +134,7 @@
     "shellrc": {
       "inputs": {
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1655719624,
@@ -164,7 +152,7 @@
     },
     "sterm": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1654787204,
diff --git a/flake.nix b/flake.nix
index a887fe3..1a5851a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,11 @@
 
   inputs = {
     shellrc.url = "git+https://git.cynerd.cz/shellrc";
-    nixturris.url = "git+https://git.cynerd.cz/nixturris";
     personal-secret.url = "git+ssh://git@cynerd.cz/nixos-personal-secret";
+    nixturris = {
+      url = "git+https://git.cynerd.cz/nixturris";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     sterm.url = "github:wentasah/sterm";
   };
diff --git a/pkgs/ferdium/default.nix b/pkgs/ferdium/default.nix
index 0a2d4fd..7088cb1 100644
--- a/pkgs/ferdium/default.nix
+++ b/pkgs/ferdium/default.nix
@@ -17,10 +17,10 @@ in
 mkFranzDerivation' rec {
   pname = "ferdium";
   name = "Ferdium";
-  version = "6.0.0-nightly.63";
+  version = "6.0.0-nightly.74";
   src = fetchurl {
     url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/ferdium_${version}_amd64.deb";
-    sha256 = "05cwqki6gv9iaic6j9isajx09pm7pip65l33fyjjjh5g54pk4swn";
+    sha256 = "11viyqw41rzqs7bn7lagsjk7knb9xl5w6hpp5lbw7x1wqqyw9hv3";
   };
   extraBuildInputs = [ xorg.libxshmfence ];
   meta = with lib; {
-- 
cgit v1.2.3