From 993f4209b585221d1f5a2c487af571233fa11949 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Tue, 21 Jan 2020 19:32:41 -0600 Subject: [PATCH] update kak-tree and sources --- nix/sources.json | 6 +++--- pkgs/kak-tree/default.nix | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index d9d67cd..565b661 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -301,10 +301,10 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs-channels", - "rev": "8da81465c19fca393a3b17004c743e4d82a98e4f", - "sha256": "1f3s27nrssfk413pszjhbs70wpap43bbjx2pf4zq5x2c1kd72l6y", + "rev": "d6430f3f77e64ae677fe59bbf41da1f9d85cad4b", + "sha256": "0vh5w507sab9gmhypaqlh53cpfh6kbxdx1k8r40bwvm8j165wjfp", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/8da81465c19fca393a3b17004c743e4d82a98e4f.tar.gz", + "url": "https://github.com/NixOS/nixpkgs-channels/archive/d6430f3f77e64ae677fe59bbf41da1f9d85cad4b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nvim-yarp": { diff --git a/pkgs/kak-tree/default.nix b/pkgs/kak-tree/default.nix index 658b74e..2fad56b 100644 --- a/pkgs/kak-tree/default.nix +++ b/pkgs/kak-tree/default.nix @@ -5,8 +5,8 @@ let in with nixpkgs; rec { src = pkgs.fetchgit { url = "https://github.com/ul/kak-tree.git"; - rev = "b5ea0f4fad961c8b3f6279a3af608f96b8eb3e35"; - sha256 = "02pgaynkrss679j15ckvka9kn74k0ldwixzdgygsjhzzlcxi0gji"; + rev = "2fa4b122a06c6b8b802329a66e2a59ddf00e8372"; + sha256 = "17n0g9dljz700f1qd5qa4ps78mbzl24ai2zv549knv57ig09g5k5"; fetchSubmodules = true; }; @@ -14,8 +14,11 @@ in with nixpkgs; rec { name = "kak-tree"; src = src; - cargoSha256 = "1hqnxjn898kpi850m3qz361hkkhjkhr5j4gk828isqlwl8q75dpr"; - cargoBuildFlags = - [ ''--features "bash css haskell html javascript json python ruby"'' ]; + # note: when updating, this needs to be set to all 1's so that Nix will + # re-fetch the dependencies from crates.io + cargoSha256 = "0n3j2d15m039cl3fn5ibk4kyk1hnawhwbkinph50ry4pzhix3ikb"; + cargoBuildFlags = [ + ''--features "bash css elm haskell html javascript json python ruby"'' + ]; }; }