citadel

commit bc3ccbd77bdf58060ddf6989d3900db575d89db6
parent 85e1c907a555e3df9179231d83ba1a1348c935fd
Author: William Casarin <jb55@jb55.com>
Date:   Fri,  3 Sep 2021 17:02:33 -0700

lib fixes

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
jb55pkgs/default.nix
 | 
20
++++++++++----------
M
jb55pkgs/pkgs/extname/default.nix
 | 
6
+++---
M
jb55pkgs/pkgs/mandown/default.nix
 | 
3
++-
M
jb55pkgs/pkgs/sharefile/default.nix
 | 
3
++-

4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/jb55pkgs/default.nix b/jb55pkgs/default.nix
@@ -29,10 +29,10 @@ in rec {
   x11-rename = callPackage ./pkgs/x11-rename { };
   hoogle-zen = callPackage ./pkgs/hoogle-zen { };
 
-  ratio = fetch-srht {
+  ratio = fetch-jb55 {
     repo = "ratio";
-    rev  = "4eb820fb362c554baa73e244dae29aa62ec2d9d5";
-    sha256 = "17mmmqvn0xfh1vk85bip87cqc3mb9vqgs07p19zrprm4yasyims2";
+    rev  = "4ae6e67712946aba70df992cdeafcc03301c6c76";
+    sha256 = "10qx30s0c6gcinfgdlb3c8rxkv4j25m29jsl923k44bbh3jpdnak";
   };
 
   git-email-contacts = fetch-jb55 {
@@ -49,8 +49,8 @@ in rec {
 
   imap-notify = fetch-jb55 {
     repo = "imap-notify";
-    rev  = "0.1.1"; # use my config
-    sha256 = "0q3cxwgx7w91k77sb9iilfbvnn4fka9d47k02jrwhf3g6jk1jij1";
+    rev  = "11d8f9b544531a27cbe0fc49ab5c1d4b26d3fba4";
+    sha256 = "1nnc50plrg9m1dbw8a1hla0d1f86s0bmpy8majq8vicdhf6qxbja";
   };
 
   nixpkgs-ml-tools = fetch-jb55 {
@@ -85,8 +85,8 @@ in rec {
 
   btcs = fetch {
     repo = "btcs";
-    rev  = "0.1";
-    sha256 = "1ls4wr7ii6icr43z3n49pm1z11sdxv06g799ww8pvxv1ax7aysl6";
+    rev  = "bbc7b0d96b5b1dc3114ea56b365ee4586cd86d3b";
+    sha256 = "05mfs6d4r1b9mnzgn74wgjvj04rrmc93hgqqzf53xbrlb0a5s4wg";
   };
 
   snap = fetch {
@@ -95,9 +95,9 @@ in rec {
     sha256 = "0j8j2588z09v7zz1f9d11zw2n0wq70sxy9lvwrw4l5yz75n3cral";
   };
 
-  bcalc = fetch {
+  bcalc = fetch-jb55 {
     repo   = "bcalc";
-    rev    = "5a51083ec33883d3fec3c74cb0891b317f4d1f35";
-    sha256 = "1mdkpd8rc5y4a4j0mwv7mkfd58a43mpxkxhrjlkkmcf2nngvqi0j";
+    rev    = "b96c9f5379841c5049dc1b0aca05750f5f0dcdb8";
+    sha256 = "1lq7jqlyk4crd6f2z1ms0vqy6mq58q819nwn68adjdv309l4dqvf";
   };
 }
diff --git a/jb55pkgs/pkgs/extname/default.nix b/jb55pkgs/pkgs/extname/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, lib, fetchFromGitHub }:
 stdenv.mkDerivation rec {
-  name = "extname-${version}";
+  pname = "extname";
   version = "1.1.1";
 
   src = fetchFromGitHub {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=$(out)";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utility to get file extensions from its arguments";
     homepage = "https://github.com/jb55/extname";
     maintainers = with maintainers; [ jb55 ];
diff --git a/jb55pkgs/pkgs/mandown/default.nix b/jb55pkgs/pkgs/mandown/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , makeWrapper
+, lib
 , pandoc
 , fetchFromGitHub
 , man
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pandoc man makeWrapper ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Render markdown as a manpage";
     homepage = "https://github.com/jb55/mandown";
     maintainers = with maintainers; [ jb55 ];
diff --git a/jb55pkgs/pkgs/sharefile/default.nix b/jb55pkgs/pkgs/sharefile/default.nix
@@ -3,13 +3,14 @@
 , makeWrapper
 , perl
 , rsync
+, lib
 , coreutils
 , openssh
 , fetchFromGitHub
 }:
 let
   inputs = [ perl perlPackages.URI rsync openssh coreutils ];
-  buildPaths = sep: fmt: "${stdenv.lib.concatStringsSep sep (map fmt inputs)}";
+  buildPaths = sep: fmt: "${lib.concatStringsSep sep (map fmt inputs)}";
 in stdenv.mkDerivation rec {
   name = "sharefile-${version}";
   version = "1.2";