git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119297 from jshholland/remind-03.03.06
14773ceMichael Raskin
pkgs/tools/misc/remind/default.nix+15−9
@@ -1,6 +1,11 @@
1+{ lib
2+, stdenv
3+, fetchurl
4+, tk
5+, tcllib
1−{lib, stdenv, fetchurl, tk, tcllib, makeWrapper
6+, makeWrapper
2, tkremind ? true
7, tkremind ? true
3−} :
8+}:
4
9
5assert tkremind -> tk != null;
10assert tkremind -> tk != null;
6assert tkremind -> tcllib != null;
11assert tkremind -> tcllib != null;
@@ -14,13 +19,14 @@ let
14 tkremindPatch = optionalString tkremind ''
19 tkremindPatch = optionalString tkremind ''
15 substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
20 substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
16 '';
21 '';
22+in
17−in stdenv.mkDerivation rec {
23+stdenv.mkDerivation rec {
18 pname = "remind";
24 pname = "remind";
19− version = "03.03.05";
25+ version = "03.03.06";
20
26
21 src = fetchurl {
27 src = fetchurl {
22 url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
28 url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
23− sha256 = "sha256-Ye0X2Gvek/pyaNVxGKL773OWJvC4I6F5nEsRQgzWbsE=";
29+ sha256 = "sha256-lpoMAXDJxwODY0/aoo25GRBYWFhE4uf11pR5/ITZX1s=";
24 };
30 };
25
31
26 nativeBuildInputs = optional tkremind makeWrapper;
32 nativeBuildInputs = optional tkremind makeWrapper;
@@ -39,11 +45,11 @@ in stdenv.mkDerivation rec {
39 wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}"
45 wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}"
40 '';
46 '';
41
47
42− meta = {
48+ meta = with lib; {
43 homepage = "https://dianne.skoll.ca/projects/remind/";
49 homepage = "https://dianne.skoll.ca/projects/remind/";
44 description = "Sophisticated calendar and alarm program for the console";
50 description = "Sophisticated calendar and alarm program for the console";
45− license = lib.licenses.gpl2;
51+ license = licenses.gpl2Only;
46− maintainers = with lib.maintainers; [raskin kovirobi];
52+ maintainers = with maintainers; [ raskin kovirobi ];
47− platforms = with lib.platforms; unix;
53+ platforms = platforms.unix;
48 };
54 };
49}
55}