From a3408c8dba0d638844fd260dcd3615d0df17aa3f Mon Sep 17 00:00:00 2001 From: Miranda Marquez Date: Mon, 1 Jul 2024 21:44:08 -0800 Subject: [PATCH] update flake and fix lix formatting again --- flake.lock | 72 +++++++++++++++++++++++++++++++----------------------- flake.nix | 3 +-- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 8d79d8c..2483994 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1716699938, - "narHash": "sha256-AzTYm22tTDJy0tSqMDf95rmCxxoGTPClu0paGPeh5a0=", + "lastModified": 1718588737, + "narHash": "sha256-06acqoMEYtc+/w5gWiIIuUFfdtdOBKlp1qrC/InRiBY=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "842306255856d7f5677c113e699101eb253e2e3f", + "rev": "b0a2376f6c164a0af963d47386c064cc6fdcd5ea", "type": "github" }, "original": { @@ -37,11 +37,11 @@ "emacs-config": { "flake": false, "locked": { - "lastModified": 1717275804, - "narHash": "sha256-88kQ/EQ90uGIZCqXo6SWDN/eirWrcTcMpgBUscDsAE8=", + "lastModified": 1718499201, + "narHash": "sha256-XvN+25zS9JKIKPgvV/wEIPH+Kf4cx9PU2W75xs8guPw=", "ref": "main", - "rev": "3ea56aefe8e6713e63fa0d494bd05e1478fd9fd8", - "revCount": 532, + "rev": "818621bbb9945053e4ffcb03ddba90defd9922dc", + "revCount": 535, "type": "git", "url": "https://git.marq42.xyz/mir/emacs" }, @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1719827385, + "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "391ca6e950c2525b4f853cbe29922452c14eda82", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -161,25 +161,35 @@ "inputs": { "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], + "lix": "lix_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1717036776, - "narHash": "sha256-joKTxvywYlKspGGKOIXho6oRbggOPyayEqAyuZCavO0=", - "ref": "refs/heads/main", - "rev": "b4b38e6b5fe18da9464f291ae5fbf2ea9acb9ccb", - "revCount": 86, - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" + "lastModified": 1718778548, + "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=", + "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz" }, "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz" + } + }, + "lix_2": { + "flake": false, + "locked": { + "lastModified": 1718419213, + "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=", + "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz" } }, "nixpkgs": { @@ -200,11 +210,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1719690277, + "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "type": "github" }, "original": { @@ -216,11 +226,11 @@ }, "nur": { "locked": { - "lastModified": 1717532838, - "narHash": "sha256-EYWsxcHdS2YhG9BmZF2H8TSSHbOjYLAWsggA/SHuJc0=", + "lastModified": 1719892551, + "narHash": "sha256-E4q0X+z1zNgAJvQEcdbQ+xuQE2pr3QwCMGZE/aq3RDU=", "owner": "nix-community", "repo": "NUR", - "rev": "d7179450e2607764fd7f6d25894acec6d1ae44f9", + "rev": "46158ae602a77357f80f659277990e0ce3e6149f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 59c7a76..23de135 100644 --- a/flake.nix +++ b/flake.nix @@ -13,8 +13,7 @@ flake = false; }; lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module"; - inputs.lix.follows = "lix"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = github:nix-community/NUR;