chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2021-06-10 21:34:37 +02:00
parent b3931d9046
commit 1f79257d92
No known key found for this signature in database
GPG key ID: 019E764B7184435A
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1623286816, "lastModified": 1623346302,
"narHash": "sha256-mFzNCeNyuT0XkqEEuePCLzOIopmlPjv7L0GT9Svkl9k=", "narHash": "sha256-q7xcIJfXs3ISHHAn0JWyhzmvLxtUPmble03S5lfy7yI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "efeb67809754347fc6d1cc817e774306b45a376f", "rev": "de312c1974ae88097db7355f128f3f8b6847c7b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1623251710, "lastModified": 1623343236,
"narHash": "sha256-eCMquRJXAzzFgNcTO4jQqp8D40N0jSA58+oqhyOrEbU=", "narHash": "sha256-Cl/0/WW3AWjkO7gphw9FqUr4P7T98KKyFCX3Vxv22Sk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "42847469b3f65a363dc52b66be09d0ac4edcc55c", "rev": "666eee4f72979b0ebbd2e065a3846d7a8a16895c",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
modules/nix.nix
View file

@ -82,7 +82,12 @@ in
}; };
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.chvp.nix.unfreePackages; 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 = { ... }: home-manager.users.charlotte = { ... }:
lib.recursiveUpdate lib.recursiveUpdate

2
shells/javafx.nix
View file

@ -1,5 +1,5 @@
let let
pkgs = import <nixpkgs> { }; pkgs = import <nixpkgs> { config.permittedInsecurePackages = [ "ffmpeg-3.4.8" ]; };
extraRpath = pkgs.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg_3 ]); extraRpath = pkgs.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg_3 ]);
java = pkgs.writeShellScriptBin "java" '' java = pkgs.writeShellScriptBin "java" ''
old_path="$(patchelf --print-rpath ${pkgs.jdk11}/bin/java)" old_path="$(patchelf --print-rpath ${pkgs.jdk11}/bin/java)"