From 1f79257d92b90c75e7936fcfe9f6f25e3c4820cf Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 10 Jun 2021 21:34:37 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 12 ++++++------ modules/nix.nix | 7 ++++++- shells/javafx.nix | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 70a52791..d581552e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs-overlay": { "locked": { - "lastModified": 1623286816, - "narHash": "sha256-mFzNCeNyuT0XkqEEuePCLzOIopmlPjv7L0GT9Svkl9k=", + "lastModified": 1623346302, + "narHash": "sha256-q7xcIJfXs3ISHHAn0JWyhzmvLxtUPmble03S5lfy7yI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "efeb67809754347fc6d1cc817e774306b45a376f", + "rev": "de312c1974ae88097db7355f128f3f8b6847c7b8", "type": "github" }, "original": { @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1623251710, - "narHash": "sha256-eCMquRJXAzzFgNcTO4jQqp8D40N0jSA58+oqhyOrEbU=", + "lastModified": 1623343236, + "narHash": "sha256-Cl/0/WW3AWjkO7gphw9FqUr4P7T98KKyFCX3Vxv22Sk=", "owner": "nix-community", "repo": "home-manager", - "rev": "42847469b3f65a363dc52b66be09d0ac4edcc55c", + "rev": "666eee4f72979b0ebbd2e065a3846d7a8a16895c", "type": "github" }, "original": { diff --git a/modules/nix.nix b/modules/nix.nix index f35a79ad..f368b58b 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -82,7 +82,12 @@ in }; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.chvp.nix.unfreePackages; - nixpkgs.overlays = [ (self: super: { nix = super.nixUnstable; }) ]; + nixpkgs.overlays = [ + (self: super: { + nix = super.nixUnstable; + nix-direnv = super.nix-direnv.override { enableFlakes = true; }; + }) + ]; home-manager.users.charlotte = { ... }: lib.recursiveUpdate diff --git a/shells/javafx.nix b/shells/javafx.nix index b4b0282f..56bf2e0d 100644 --- a/shells/javafx.nix +++ b/shells/javafx.nix @@ -1,5 +1,5 @@ let - pkgs = import { }; + pkgs = import { config.permittedInsecurePackages = [ "ffmpeg-3.4.8" ]; }; extraRpath = pkgs.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg_3 ]); java = pkgs.writeShellScriptBin "java" '' old_path="$(patchelf --print-rpath ${pkgs.jdk11}/bin/java)"