Update dependencies
This commit is contained in:
parent
b3931d9046
commit
1f79257d92
3 changed files with 13 additions and 8 deletions
12
flake.lock
generated
12
flake.lock
generated
|
@ -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": {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
pkgs = import <nixpkgs> { };
|
||||
pkgs = import <nixpkgs> { 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)"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue