From 5f4193f20e7242137fdf0cf5ccb3d2472981d96f Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Thu, 10 Jun 2021 10:13:45 +0200
Subject: [PATCH] Update dependencies

---
 flake.lock           | 18 +++++++++---------
 patches/126169.patch | 27 ---------------------------
 shells/javafx.nix    |  2 +-
 3 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 patches/126169.patch

diff --git a/flake.lock b/flake.lock
index ed683a3d..70a52791 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1623118385,
-        "narHash": "sha256-duL0r11oorjzjg+e2LFj6ALsqrFus1d10OyKpnsXUJI=",
+        "lastModified": 1623286816,
+        "narHash": "sha256-mFzNCeNyuT0XkqEEuePCLzOIopmlPjv7L0GT9Svkl9k=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "bf08680a89b02fa388975a61097458091ae393ab",
+        "rev": "efeb67809754347fc6d1cc817e774306b45a376f",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1623103231,
-        "narHash": "sha256-ns6p4FYqdMHmcaZZjNC1HhxApfxKlpAPbvbOzhiLbas=",
+        "lastModified": 1623251710,
+        "narHash": "sha256-eCMquRJXAzzFgNcTO4jQqp8D40N0jSA58+oqhyOrEbU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "aa36e2d6b481a54b95fbddbecb76076e0f38eb89",
+        "rev": "42847469b3f65a363dc52b66be09d0ac4edcc55c",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1622932239,
-        "narHash": "sha256-Pl0cq1avi8QSza3FN4TVyEVd+VuX4VvRvZFfIbN9pPA=",
+        "lastModified": 1623238380,
+        "narHash": "sha256-c13ZBZX1axBB9Z+3XJ59xmgaNcGpc4fF2lpLwUU1MDU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "790a4683b8e76834d2a18cafc4fc32bd3ccfa06a",
+        "rev": "3fcf9a6af852942cfb3319f7efc5cd11a9bae794",
         "type": "github"
       },
       "original": {
diff --git a/patches/126169.patch b/patches/126169.patch
deleted file mode 100644
index e2e5a987..00000000
--- a/patches/126169.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 45096ecfdc369b91c35fbcec16973533f626d1ca Mon Sep 17 00:00:00 2001
-From: Charlotte Van Petegem <charlotte@vanpetegem.me>
-Date: Tue, 8 Jun 2021 09:26:38 +0200
-Subject: [PATCH] eid-mw: 5.0.21 -> 5.0.23
-
----
- pkgs/tools/security/eid-mw/default.nix | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
-index e07ea1a3337998..2be480db93dc9e 100644
---- a/pkgs/tools/security/eid-mw/default.nix
-+++ b/pkgs/tools/security/eid-mw/default.nix
-@@ -21,11 +21,11 @@
- stdenv.mkDerivation rec {
-   pname = "eid-mw";
-   # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
--  version = "5.0.21";
-+  version = "5.0.23";
- 
-   src = fetchFromGitHub {
-     rev = "v${version}";
--    sha256 = "1sz7996q6gd6vbdxqgyx1jwjznpki1k9zbgaj1j1a51y6w0g0kdh";
-+    sha256 = "0annkm0hqhkpjmfa6ywvzgn1n9619baqdzdbhjfhzfi4hf7mml1d";
-     repo = "eid-mw";
-     owner = "Fedict";
-   };
diff --git a/shells/javafx.nix b/shells/javafx.nix
index 47f1e463..b4b0282f 100644
--- a/shells/javafx.nix
+++ b/shells/javafx.nix
@@ -1,6 +1,6 @@
 let
   pkgs = import <nixpkgs> { };
-  extraRpath = pkgs.stdenv.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg_3 ]);
+  extraRpath = pkgs.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg_3 ]);
   java = pkgs.writeShellScriptBin "java" ''
     old_path="$(patchelf --print-rpath ${pkgs.jdk11}/bin/java)"
     LD_LIBRARY_PATH="$old_path:${extraRpath}" ${pkgs.jdk11}/bin/java $@