Unverified Commit bb5d4227 authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

wyrd: 1.4.6 -> 1.7.1 (#372752)

parents 28f0142c 7fcc82de

pkgs/by-name/re/remind/package.nix

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ tcl.mkTclDerivation rec { 
      --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \

      --replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \

      --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\""

    substituteInPlace configure \

      --replace-fail 'f=-ffat-lto-objects' ""

  '';



  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [

pkgs/tools/misc/wyrd/default.nix

+25 −15
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  fetchFromGitLab,

  makeWrapper,

  ocamlPackages,

  ncurses,

  remind,

}:



stdenv.mkDerivation rec {

  version = "1.4.6";

  pname = "wyrd";

  version = "1.7.1";



  src = fetchurl {

    url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz";

    sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj";

  src = fetchFromGitLab {

    owner = "wyrd-calendar";

    repo = "wyrd";

    tag = version;

    hash = "sha256-RwGzXJLoCWRGgHf1rayBgkZuRwA1TcYNfN/h1rhJC+8=";

  };



  preConfigure = ''

    substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC"

  '';



  strictDeps = true;



  nativeBuildInputs = [

    makeWrapper

    ocamlPackages.findlib

    ocamlPackages.ocaml

    ocamlPackages.camlp4

    ocamlPackages.odoc

  ];



  buildInputs = [

    ncurses

    ocamlPackages.curses

    ocamlPackages.yojson

    remind

  ];



  preferLocalBuild = true;

  makeFlags = [

    "PREFIX=${placeholder "out"}"

  ];



  postInstall = ''

    wrapProgram "$out/bin/wyrd" \

      --prefix PATH : "${lib.makeBinPath [ remind ]}"

  '';



  meta = with lib; {

    description = "Text-based front-end to Remind";
@@ -41,8 +51,8 @@ stdenv.mkDerivation rec { 
      flashy GUI dialogs. Rather, Wyrd is designed to make you more

      efficient at editing your reminder files directly.

    '';

    homepage = "http://pessimization.com/software/wyrd/";

    downloadPage = "http://pessimization.com/software/wyrd/";

    homepage = "https://gitlab.com/wyrd-calendar/wyrd";

    downloadPage = "https://gitlab.com/wyrd-calendar/wyrd";

    license = licenses.gpl2Only;

    maintainers = [ maintainers.prikhi ];

    platforms = platforms.unix;

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -5554,7 +5554,7 @@ with pkgs; 
  wring = nodePackages.wring;















  wyrd = callPackage ../tools/misc/wyrd {













    ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;













    ocamlPackages = ocaml-ng.ocamlPackages_4_14;















  };





























  xbursttools = callPackage ../tools/misc/xburst-tools {