From b1ce7ce98fd89ec81e7411220f743c793a5fce21 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 27 Apr 2023 13:17:48 +0200 Subject: [PATCH] flake update use normal helix --- flake.lock | 222 ++++++++++++++++++++++++++++++++++++++--------------- flake.nix | 2 +- 2 files changed, 160 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index 44090d5..19b9968 100644 --- a/flake.lock +++ b/flake.lock @@ -36,28 +36,8 @@ "url": "https://git.dodsorf.as/Dandellion/NUR.git" } }, - "devshell": { - "flake": false, - "locked": { - "lastModified": 1667210711, - "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", - "owner": "numtide", - "repo": "devshell", - "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dream2nix": { "inputs": { - "alejandra": [ - "helix", - "nci" - ], "all-cabal-json": [ "helix", "nci" @@ -65,10 +45,15 @@ "crane": "crane", "devshell": [ "helix", - "nci", - "devshell" + "nci" + ], + "drv-parts": "drv-parts", + "flake-compat": "flake-compat", + "flake-parts": [ + "helix", + "nci", + "parts" ], - "flake-parts": "flake-parts", "flake-utils-pre-commit": [ "helix", "nci" @@ -94,6 +79,7 @@ "nci", "nixpkgs" ], + "nixpkgsV1": "nixpkgsV1", "poetry2nix": [ "helix", "nci" @@ -101,14 +87,18 @@ "pre-commit-hooks": [ "helix", "nci" + ], + "pruned-racket-catalog": [ + "helix", + "nci" ] }, "locked": { - "lastModified": 1671323629, - "narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=", + "lastModified": 1680258209, + "narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", "owner": "nix-community", "repo": "dream2nix", - "rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e", + "rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", "type": "github" }, "original": { @@ -117,21 +107,54 @@ "type": "github" } }, - "flake-parts": { + "drv-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "flake-compat": [ + "helix", + "nci", + "dream2nix", + "flake-compat" + ], + "flake-parts": [ + "helix", + "nci", + "dream2nix", + "flake-parts" + ], + "nixpkgs": [ + "helix", + "nci", + "dream2nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1668450977, - "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", + "lastModified": 1680172861, + "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "owner": "davhau", + "repo": "drv-parts", + "rev": "ced8a52f62b0a94244713df2225c05c85b416110", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", + "owner": "davhau", + "repo": "drv-parts", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, @@ -171,14 +194,15 @@ "nixpkgs": [ "unstable" ], + "parts": "parts_2", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1673624525, - "narHash": "sha256-lcNKkBEct4jVGqvkeIkc6lj9O8YjttEt0voUGLXGo14=", + "lastModified": 1682573887, + "narHash": "sha256-zXGH312vHB9rUdS8GxmggYOqJRDu2toCzlE8kfin1VE=", "owner": "helix-editor", "repo": "helix", - "rev": "b6331394a3f341ad21f8fad3e6e0b93becda9ce5", + "rev": "222be0f1e769177241eb2d8d8dfb0de42e450820", "type": "github" }, "original": { @@ -195,11 +219,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1672244468, - "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", + "lastModified": 1681092193, + "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "owner": "nix-community", "repo": "home-manager", - "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", + "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "type": "github" }, "original": { @@ -209,25 +233,42 @@ "type": "github" } }, + "mk-naked-shell": { + "flake": false, + "locked": { + "lastModified": 1676572903, + "narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=", + "owner": "yusdacra", + "repo": "mk-naked-shell", + "rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "mk-naked-shell", + "type": "github" + } + }, "nci": { "inputs": { - "devshell": "devshell", "dream2nix": "dream2nix", + "mk-naked-shell": "mk-naked-shell", "nixpkgs": [ "helix", "nixpkgs" ], + "parts": "parts", "rust-overlay": [ "helix", "rust-overlay" ] }, "locked": { - "lastModified": 1671430291, - "narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=", + "lastModified": 1680329418, + "narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c", + "rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", "type": "github" }, "original": { @@ -244,11 +285,11 @@ ] }, "locked": { - "lastModified": 1672992692, - "narHash": "sha256-/eLQLSNIa22ARTZbk+x8i0iE8khe1eiHWkuxgTVXZ7g=", + "lastModified": 1676383589, + "narHash": "sha256-KCkWZXCjH+C4Kn7fUGSrEl5btk+sERHhZueSsvVbPWc=", "owner": "guibou", "repo": "nixGL", - "rev": "643e730efb981ffaf8478f441ec9b9aeea1c89f5", + "rev": "c917918ab9ebeee27b0dd657263d3f57ba6bb8ad", "type": "github" }, "original": { @@ -259,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673704454, - "narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=", + "lastModified": 1682493015, + "narHash": "sha256-KiMOAe8u83QDF40Z25kWMkZbqr9U+mvjvEJy5Qvw0nw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6", + "rev": "60c0f762658916a4a5b5a36b3e06486f8301daf4", "type": "github" }, "original": { @@ -276,11 +317,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1665349835, - "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "lastModified": 1678375444, + "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", "type": "github" }, "original": { @@ -291,13 +332,28 @@ "type": "github" } }, + "nixpkgsV1": { + "locked": { + "lastModified": 1678500271, + "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.11", + "type": "indirect" + } + }, "nur": { "locked": { - "lastModified": 1673834776, - "narHash": "sha256-IZRrfTWEW3lfIA5hkd96VzJ7sNk3I/WsAzYrLWcMS0Q=", + "lastModified": 1682589778, + "narHash": "sha256-COXe3mSw30C+AzEdbEnG5r6Rnc8CLkvpBlU7DBvn69g=", "owner": "nix-community", "repo": "NUR", - "rev": "661bfe579c879782223971324dc7799266a2e35e", + "rev": "6a41a40008705fbfbbbaf4f74ab15bf8d73d8d15", "type": "github" }, "original": { @@ -306,6 +362,46 @@ "type": "github" } }, + "parts": { + "inputs": { + "nixpkgs-lib": [ + "helix", + "nci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1679737941, + "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1679737941, + "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "root": { "inputs": { "dan": "dan", @@ -326,11 +422,11 @@ ] }, "locked": { - "lastModified": 1671416426, - "narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=", + "lastModified": 1680315536, + "narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d", + "rev": "5c8c151bdd639074a0051325c16df1a64ee23497", "type": "github" }, "original": { @@ -341,11 +437,11 @@ }, "unstable": { "locked": { - "lastModified": 1673606088, - "narHash": "sha256-wdYD41UwNwPhTdMaG0AIe7fE1bAdyHe6bB4HLUqUvck=", + "lastModified": 1682535835, + "narHash": "sha256-DrCcsZId29H+mr7yviOfCZeJOnJ51MIWLX3qSwwSpLI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "37b97ae3dd714de9a17923d004a2c5b5543dfa6d", + "rev": "d12fa94d29856187b1c80db4edf4588df986d217", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0802c11..25fce5b 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,7 @@ inherit (prev) system config; }; dan = dan.packages.${prev.system}; - helix = inputs.helix.packages.${prev.system}.helix; + # helix = inputs.helix.packages.${prev.system}.helix; }) nur.overlay nixgl.overlay