From f77f33b2d869e5e38668288c466f6e2cfbef46fc Mon Sep 17 00:00:00 2001 From: toastal <561087+toastal@users.noreply.github.com> Date: Tue, 3 Aug 2021 13:11:52 +0000 Subject: [PATCH] fix vim plugin + update flake references (#182) * Nix dependencies updated * fix vim plugin build --- flake.lock | 24 ++++++++++++------------ flake.nix | 5 ++++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 386d9a9..cb69e09 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1606424373, - "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", "owner": "edolstra", "repo": "flake-compat", - "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { @@ -50,11 +50,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1621840840, - "narHash": "sha256-o6h6+d5ZwrFmOTe+ma9s1Z9kyHsCW1C84IA8RZ9/fIU=", + "lastModified": 1627857416, + "narHash": "sha256-AV0MsFVzbWI2MZbJ2j0kc8ooFLGSCZHuM9ipaWR9ds4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea7d4aa9b8225abd6147339f0d56675d6f1f0fd1", + "rev": "aaf9676fbb7fb4570216ca1e189a3dc769d62c45", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1621996674, - "narHash": "sha256-TbqYv4mnCXCpwGsMgpC94lbxtSKet8IkQxlUYXkfA/4=", + "lastModified": 1627957145, + "narHash": "sha256-cY5lS2S/RMsC1xFtkcmhLXlVP7ahZoxFeKedkXDvIzY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b5651a474dd332c6b8f772561eadd0b85ac224a0", + "rev": "ab6f3086de97980e4fdcb0560921852a407e0b79", "type": "github" }, "original": { @@ -109,11 +109,11 @@ }, "utils": { "locked": { - "lastModified": 1620759905, - "narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=", + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", "owner": "numtide", "repo": "flake-utils", - "rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c24723d..a28e9f2 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,8 @@ let name = "himalaya"; + version = "0.4.0"; + # Imports pkgs = import nixpkgs { inherit system; @@ -70,8 +72,9 @@ inherit (packages.${name}) version; name = "${name}-vim"; src = self; - configurePhase = "cd vim/"; buildInputs = [ packages.${name} ]; + dontConfigure = false; + configurePhase = "cd vim/"; postInstall = '' mkdir -p $out/bin ln -s ${packages.${name}}/bin/himalaya $out/bin/himalaya