From 1a8be4181d254b175346551813effb9f10c6079f Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Mon, 6 Dec 2021 13:38:25 +0100 Subject: [PATCH] We now bleeding edge :sunglasses: --- flake.lock | 167 +++++++++++++++++++++++++++++++---------------------- flake.nix | 3 +- 2 files changed, 101 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index cd5d551..4a1365a 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "emacs": { "locked": { - "lastModified": 1636881202, - "narHash": "sha256-XmXmV7ddohRKXcVzVDdw6LB0/53gu+rjQ+vScdakKGM=", + "lastModified": 1638668516, + "narHash": "sha256-u67dzO+HVWlimD6OSXSajvkU6/c7fGp4faC48uCln7k=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "23c8464f4527a2b19f6b4776378dd03b8289aa85", + "rev": "bd45e439c084c145d67272419eaf96b978f5c2ce", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -68,11 +68,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1636847964, - "narHash": "sha256-hH2lbDgOPwCtlWDwp0wVCcOK7x0mtLf4nrNWfvUWrA8=", + "lastModified": 1638571010, + "narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=", "owner": "nix-community", "repo": "home-manager", - "rev": "accfbdf215dbf39eac2fbae67b574dac0be83d51", + "rev": "781d25b315def05cd7ede3765226c54216f0b1fe", "type": "github" }, "original": { @@ -84,10 +84,7 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": [ - "ostylk", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1634544068, @@ -106,11 +103,11 @@ }, "impermanence": { "locked": { - "lastModified": 1635517258, - "narHash": "sha256-8iV8f9eZ/5cE0DmG7VmNSiCqpe00yL5HbOO7nZJm1Oo=", + "lastModified": 1636812815, + "narHash": "sha256-OG4/4cD2sGNM+ROaYhczwUJ3YCtzaIgX96rFjCs85JE=", "owner": "nix-community", "repo": "impermanence", - "rev": "ce77ed9bd069e57a7a688d360196e576ca63a842", + "rev": "00df1e57bb9c7551b45a11c70f5472d0cbfbfff7", "type": "github" }, "original": { @@ -121,11 +118,7 @@ }, "naersk": { "inputs": { - "nixpkgs": [ - "ostylk", - "rnix-lsp", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1629707199, @@ -143,28 +136,27 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1636385773, - "narHash": "sha256-2uzAbVH/WFWBvxRfapXrTH3QF/bDgzCnBJlfCVYs02E=", + "lastModified": 1635881984, + "narHash": "sha256-m6qai5HI+5/4uqSAiR1JceKQrimu/H3iOOn3BXWw3Rc=", "owner": "ostylk", "repo": "nixos-hardware", - "rev": "e660be563819c2be9410fbd20775283f3a2a8d76", + "rev": "b4238e8fb309c2d4ea1038423e9c47c5005aa0e6", "type": "github" }, "original": { "owner": "ostylk", - "ref": "surface-update", + "ref": "surface-test", "repo": "nixos-hardware", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1636922351, - "narHash": "sha256-x/jCHAVs4P9QGimbU/UcL7jr0OBvhr41z/L/agMTxwY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "837604f22c3bd4819f96da7929486d9941d572b8", - "type": "github" + "lastModified": 1638198142, + "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", + "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source", + "rev": "8a308775674e178495767df90c419425474582a1", + "type": "path" }, "original": { "id": "nixpkgs", @@ -172,22 +164,6 @@ } }, "nixpkgs-unstable": { - "locked": { - "lastModified": 1636267212, - "narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1636800699, "narHash": "sha256-SwbyVxXffu3G2ulJIbTf0iQfqhbGbdml4Dyv5j9BiAI=", @@ -203,6 +179,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1638698569, + "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1618628710, @@ -218,11 +210,53 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1636333654, - "narHash": "sha256-3wh9PtCzcaJQuZrgZ+ygKfhltkDNNqT6zOzGsRbjZEo=", + "lastModified": 1638198142, + "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", + "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source", + "rev": "8a308775674e178495767df90c419425474582a1", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1636855248, + "narHash": "sha256-ISyGm3p9uNvSqsgguK6+Pr0IDJ3pik14wTHZXfF3e/s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e74894146a42ba552ebafa19ab2d1df7ccbc1738", + "rev": "195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1638198142, + "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", + "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source", + "rev": "8a308775674e178495767df90c419425474582a1", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1638564543, + "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4", "type": "github" }, "original": { @@ -234,11 +268,11 @@ }, "nur": { "locked": { - "lastModified": 1636920392, - "narHash": "sha256-mre/JUUA4168Y4NV1nfULPsAbDhwR1uvYI6rf0qvMV0=", + "lastModified": 1638683309, + "narHash": "sha256-KH8l/3/Ptvw4t7fzMO9hb5RmrAK7KNiFM9hqBG1YgMs=", "owner": "nix-community", "repo": "nur", - "rev": "faf37248a0b31f65353394924ffaf58da3a8445c", + "rev": "64e93e9e68325ed12029732bac269ada92ff65f5", "type": "github" }, "original": { @@ -254,16 +288,16 @@ "home-manager": "home-manager_2", "impermanence": "impermanence", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "rnix-lsp": "rnix-lsp" }, "locked": { - "lastModified": 1636386099, - "narHash": "sha256-81kCDDzJfcYPl+hI/Oa2MVLrt603ipqXRvfXN4RNA3c=", + "lastModified": 1636987186, + "narHash": "sha256-uJ0Px5gvwtXF+HoGhMnN6Sel30XFcJUhhZfqXPFh6/A=", "ref": "master", - "rev": "285b4548c52b3c6454186242d6dd9362d80d1545", - "revCount": 141, + "rev": "44b8e77f43d9aadf31d8d696cf514784cc6a01eb", + "revCount": 143, "type": "git", "url": "https://dev.ostylk.de/NixDistro/Config" }, @@ -275,18 +309,15 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": [ - "ostylk", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_7", "utils": "utils" }, "locked": { - "lastModified": 1634449716, - "narHash": "sha256-JuRCU4KCIA3/pp8BjHqqF9dj1d2xtpkxKKAtSuOzTIY=", + "lastModified": 1636977689, + "narHash": "sha256-pQmAxKBoEhC851iRsowMErz9CYiJxGpARjhPeSapH1Y=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "a2d06d2d2910cbe35b4f323a54ef484f51d71e20", + "rev": "9462b0d20325a06f7e43b5a0469ec2c92e60f5fe", "type": "github" }, "original": { @@ -309,11 +340,11 @@ }, "stable": { "locked": { - "lastModified": 1636792033, - "narHash": "sha256-5RwKd3+OolhWAPUQG9SNoptr9eks8j2oukKgjAo5NQA=", + "lastModified": 1638564543, + "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "68d4f5970b69b0fd0a95c57c8d0ab4b2b68fb9aa", + "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8367c1c..a23c5d5 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,8 @@ inputs = { home-manager.url = "github:nix-community/home-manager/master"; flake-utils.url = "github:numtide/flake-utils"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + #nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/master"; stable.url = "github:nixos/nixpkgs/nixos-21.05"; emacs.url = "github:nix-community/emacs-overlay"; nur.url = "github:nix-community/nur";