From cd1d55d6428501c923d761261c36abd231a8d4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 26 Nov 2022 11:37:59 +0100 Subject: [PATCH] :lock: update inputs --- flake.lock | 128 +++++++++++++++++++++++++---------- flake.nix | 2 +- modules/profiles/desktop.nix | 2 +- modules/programs/emacs.nix | 2 +- 4 files changed, 96 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index c98adf4..44334c4 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1667741320, - "narHash": "sha256-WB9w/UoFqp/WyRhe87dNqwbMAXa8lmsK/QCeTzRWmj8=", + "lastModified": 1669146650, + "narHash": "sha256-9FCZt15lrL/aeDaUBFh+U2A4PlTj0jUKbjUbGIFUBik=", "owner": "arkenfox", "repo": "user.js", - "rev": "8a65c5a7bad0ec764d968b0941ebdf01bdcd2408", + "rev": "6789dc7fefac5594d958a065463b4dc9d265c089", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1667823539, - "narHash": "sha256-AwDCZgUT004T+skxK62ZWAlP+60yomMaHb0/+hHH448=", + "lastModified": 1669439968, + "narHash": "sha256-VlQsxaHruFN29FOvRHUYecySRU9UzFqqpshfgoGxKes=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a864e84bd842d00d686e040f552e2fa7030351a0", + "rev": "838bd1e55d9168d2df9dc0331565f884c3be3250", "type": "github" }, "original": { @@ -74,6 +74,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -106,11 +122,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1667077288, - "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -137,11 +153,11 @@ "forgit-git": { "flake": false, "locked": { - "lastModified": 1665756353, - "narHash": "sha256-NKL4c4k9Nath8NQ3sWUTGUzp517jRX4v0qVaKMJSMrw=", + "lastModified": 1669300261, + "narHash": "sha256-ca7EM/F0Spsdr3MbjIVwbjLVXg6/qWGczBQHLCcpU5A=", "owner": "wfxr", "repo": "forgit", - "rev": "2872548075e63bc83a0b960e2813b16571998563", + "rev": "98321ef05a10fe1b536ae88e283339e769866e24", "type": "github" }, "original": { @@ -150,6 +166,27 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -158,11 +195,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1667708081, - "narHash": "sha256-FChEy05x4ed/pttjfTeKxjPCnHknMYrUtDyBiYbreT4=", + "lastModified": 1669328018, + "narHash": "sha256-aJRMobnNDEXKwoSZFS4hGjGU1WDNxkQ82BVKAEohOfY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ef0da321217c6c19b7a30509631c080a19321e5", + "rev": "62cb5bcf93896e4dd6b4507dac7ba2e2e3abc9d7", "type": "github" }, "original": { @@ -195,11 +232,11 @@ }, "master": { "locked": { - "lastModified": 1667830549, - "narHash": "sha256-4ndTwPd+lMMWN/3oJlEBxkVw+8wQs9hB5a2+CvyHHwI=", + "lastModified": 1669458704, + "narHash": "sha256-wpaBMBfjSDCnw4F7A1xBdqy2nW7dvjk3coISy+tTmX4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1ef74a785480396ba179200196cac8256a67cfce", + "rev": "3200a569242cdc75c191fc28b6adefe60315e921", "type": "github" }, "original": { @@ -210,11 +247,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667669848, - "narHash": "sha256-nD2dk2A+1zUlUT18ppDFVWwimi26+ultc2QRsulQwQ8=", + "lastModified": 1669387357, + "narHash": "sha256-z1azVj/5Em5kGhh9OgBOsjTEgMab7hXL/aRilH9tzyI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f3ebb2bd1a353a42e8f833895c26d8415c7b791", + "rev": "55b3f68bda6d4f4dc6092eed0508063f154fa4fd", "type": "github" }, "original": { @@ -224,18 +261,36 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1667292599, - "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=", + "lastModified": 1668984258, + "narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68", + "rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1668994630, + "narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af50806f7c6ab40df3e6b239099e8f8385f6c78b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "pre-commit-hooks": { @@ -265,15 +320,18 @@ }, "pre-commit-hooks_2": { "inputs": { + "flake-compat": "flake-compat", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2" + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1667760143, - "narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=", + "lastModified": 1669152228, + "narHash": "sha256-FEDReoTLWJHXcNso7aaAlAUU7uOqIR6Hc/C/nqlfooE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd", + "rev": "078b0dee35e2da01334af682ec347463b70a9986", "type": "github" }, "original": { @@ -300,16 +358,16 @@ }, "stable": { "locked": { - "lastModified": 1667653703, - "narHash": "sha256-Xow4vx52/g5zkhlgZnMEm/TEXsj+13jTPCc2jIhW1xU=", + "lastModified": 1669379897, + "narHash": "sha256-XM3xBfQD5tOtV4KAhQHyh53cJdqkLwotZa5JJIUjbQc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f09ad462c5a121d0239fde645aacb2221553a217", + "rev": "8690906c4d80db5d85f52313a8487bf2e7b8d4c5", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index bdb2968..63bc345 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ inputs = { master.url = "github:nixos/nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - stable.url = "github:nixos/nixpkgs/nixos-22.05"; + stable.url = "github:nixos/nixpkgs/nixos-22.11"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 3334689..4a01e2c 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -113,7 +113,7 @@ with lib; { # ripping abcde handbrake - stable.picard # HACK to fix broken picard 2.8.3 + picard # other anki diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index d9e884c..0059324 100644 --- a/modules/programs/emacs.nix +++ b/modules/programs/emacs.nix @@ -55,7 +55,7 @@ in ## :lang # latex & org (latex previews) - stable.texlive.combined.scheme-full # HACK to fix broken perl package + texlive.combined.scheme-full texlab # nix