From 54770c4e6411df201c9c5f36c26decf4d43485c5 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Mon, 24 Jul 2023 22:41:43 +0200 Subject: update inputs --- common/common.nix | 4 ++++ common/desktop.nix | 1 - flake.lock | 36 ++++++++++++++++++------------------ 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/common/common.nix b/common/common.nix index c0bcce7..12c9107 100644 --- a/common/common.nix +++ b/common/common.nix @@ -9,6 +9,10 @@ nix.nixPath = lib.mkForce [ "nixpkgs=${inputs.nixpkgs}" "unstable=${inputs.nixpkgs-unstable}"]; + nix.extraOptions = '' + experimental-features = nix-command flakes + ''; + services.journald.extraConfig = "MaxRetentionSec=48h"; diff --git a/common/desktop.nix b/common/desktop.nix index c2ef871..3bd8108 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -6,7 +6,6 @@ ]; nix.extraOptions = '' - experimental-features = nix-command flakes plugin-files = ${pkgs.nix-doc}/lib/libnix_doc_plugin.so ''; diff --git a/flake.lock b/flake.lock index abe1afb..2e99d6d 100644 --- a/flake.lock +++ b/flake.lock @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687829761, - "narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=", + "lastModified": 1690148897, + "narHash": "sha256-l/j/AX1d2K79EWslwgWR2+htkzCbtjKZsS5NbWXnhz4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206", + "rev": "ac1acba43b2f9db073943ff5ed883ce7e8a40a2c", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixpkgs-oldstable": { "locked": { - "lastModified": 1688117947, - "narHash": "sha256-eSVbMmqsGwPlJy8jqzxwZ+cJzu8TpI2KSSKm8xVw+XQ=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2039c98a8afec8ff3273a3ac34b9e3864174ed94", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1687977148, - "narHash": "sha256-gUcXiU2GgjYIc65GOIemdBJZ+lkQxuyIh7OkR9j0gCo=", + "lastModified": 1690083312, + "narHash": "sha256-I3egwgNXavad1eIjWu1kYyi0u73di/sMmlnQIuzQASk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60a783e00517fce85c42c8c53fe0ed05ded5b2a4", + "rev": "af8cd5ded7735ca1df1a1174864daab75feeb64a", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1688092301, - "narHash": "sha256-NTgT955DzXWVjHsuBn1t2K0x4hUghY7uE1jG2nGL5R4=", + "lastModified": 1690165277, + "narHash": "sha256-P3X8iSAu12z+UFxquuntZnR8sXjKwgYHf0wTzgO8I7M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4c31223801dd0f28ac15d60f2e5ddbd4d51ce17a", + "rev": "317c523c09218f27f1da1ec0d06bbd2cbc0c1939", "type": "github" }, "original": { @@ -361,11 +361,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1688064897, - "narHash": "sha256-Q3CZc6ZfC4KpjGWVPsrofFgxor+UjqhbFBSi7YmHVvI=", + "lastModified": 1689976554, + "narHash": "sha256-uWJq3sIhkqfzPmfB2RWd5XFVooGFfSuJH9ER/r302xQ=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "0c1801b48995ec6909e040abedaa56a64f0db430", + "rev": "c63f6e7b053c18325194ff0e274dba44e8d2271e", "type": "gitlab" }, "original": { @@ -385,11 +385,11 @@ ] }, "locked": { - "lastModified": 1687398569, - "narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=", + "lastModified": 1690199016, + "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2ff6973350682f8d16371f8c071a304b8067f192", + "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500", "type": "github" }, "original": { -- cgit v1.2.3