commit 75a5239a58f2b25d3e978cd10ddf9628db08b40e
parent ae9425c8065cb79a333650a73669f2b3d8d8748e
Author: William Casarin <jb55@jb55.com>
Date: Mon, 9 Nov 2020 13:18:15 -0800
jb55pkgs: fetch-srht, fix ratio
Signed-off-by: William Casarin <jb55@jb55.com>
Diffstat:
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/jb55pkgs/default.nix b/jb55pkgs/default.nix
@@ -1,9 +1,13 @@
{ pkgs ? import <nixpkgs> {} }:
let callPackage = pkgs.callPackage;
callHsPackage = pkgs.haskellPackages.callPackage;
- fetch = rest: args: callPackage (pkgs.fetchFromGitHub ({
+ fetch = args: callPackage (pkgs.fetchFromGitHub ({
owner = "jb55";
- } // rest)) args;
+ } // args)) {};
+ fetch-srht = args: callPackage (pkgs.fetchgit ({
+ url = "https://git.sr.ht/~jb55/${args.repo}";
+ inherit (args) sha256 rev;
+ })) {};
in rec {
curlc = callPackage ./pkgs/curlc {};
csv-delim = callPackage ./pkgs/csv-delim { };
@@ -13,53 +17,58 @@ in rec {
mandown = callPackage ./pkgs/mandown { };
sharefile = callPackage ./pkgs/sharefile { };
samp = callPackage ./pkgs/samp { };
- ratio = callPackage ./pkgs/ratio { };
+
+ ratio = fetch-srht {
+ repo = "ratio";
+ rev = "4eb820fb362c554baa73e244dae29aa62ec2d9d5";
+ sha256 = "17mmmqvn0xfh1vk85bip87cqc3mb9vqgs07p19zrprm4yasyims2";
+ };
cmdtree = fetch {
repo = "cmdtree";
rev = "d74cc76349bcd42eda425041543883066e4a7217"; # use my config
sha256 = "0xsakwl6qbbq1ig2f21mg45ygwizdfadm52yj5dvgnlmgligpcfm";
- } {};
+ };
zoom-link-opener = fetch {
repo = "zoom-link-opener";
rev = "0.1.1";
sha256 = "013q814i7wcbl2ba5jpqkz00kpa1jaly53np30i4x01cfdfzywi3";
- } {};
+ };
zebra = fetch {
repo = "zebra";
rev = "0.1";
sha256 = "1l7rfjwnjc28zszbrzjqsgyp47hkl355is8zshfgv3wacb7n6424";
- } {};
+ };
viscal = fetch {
repo = "viscal";
rev = "0.0.1";
sha256 = "0kisxf6m1xvll8xj54rl3lr07aq3l0gizix5axp9hkawss0b55sa";
- } {};
+ };
datefmt = fetch {
repo = "datefmt";
rev = "0.1.1";
sha256 = "1xjfr1lbkiy277firlb8zkg1pmj7pmiijhxx1z4bg41970dr446x";
- } {};
+ };
btcs = fetch {
repo = "btcs";
rev = "0.1";
sha256 = "1ls4wr7ii6icr43z3n49pm1z11sdxv06g799ww8pvxv1ax7aysl6";
- } {};
+ };
snap = fetch {
repo = "sharefile-snap";
rev = "1.3";
sha256 = "0j8j2588z09v7zz1f9d11zw2n0wq70sxy9lvwrw4l5yz75n3cral";
- } {};
+ };
bcalc = fetch {
repo = "bcalc";
rev = "5a51083ec33883d3fec3c74cb0891b317f4d1f35";
sha256 = "1mdkpd8rc5y4a4j0mwv7mkfd58a43mpxkxhrjlkkmcf2nngvqi0j";
- } {};
+ };
}