Update dependencies

This commit is contained in:
Charlotte Van Petegem 2021-06-10 10:13:45 +02:00
parent 4555e8ffd2
commit 5f4193f20e
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 10 additions and 37 deletions

18
flake.lock generated
View file

@ -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": {

View file

@ -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";
};

View file

@ -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 $@