From 47f5e765155521956f5cd075765b57e471f372f2 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Thu, 8 Sep 2022 01:37:24 +0800 Subject: [PATCH 1/4] emacsPackages.yes-no: add jcs090218 as maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6b9da73b61e..90822b9b0c8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6033,6 +6033,12 @@ fingerprint = "A506 C38D 5CC8 47D0 DF01 134A DA8B 833B 5260 4E63"; }]; }; + jcs090218 = { + email = "jcs090218@gmail.com"; + github = "jcs090218"; + githubId = 8685505; + name = "Jen-Chieh Shen"; + }; jcumming = { email = "jack@mudshark.org"; github = "jcumming"; From c5f6fd74daacae5fb5c5a46d27b271633c0f1938 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Thu, 8 Sep 2022 02:02:15 +0800 Subject: [PATCH 2/4] emacsPackages.yes-no: init at 0 --- .../emacs/elisp-packages/manual-packages.nix | 2 ++ .../emacs/elisp-packages/yes-no/default.nix | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index ec3eeaf7fd3..b312c17d9aa 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -232,6 +232,8 @@ tree-sitter-langs = callPackage ./tree-sitter-langs { final = self; }; tsc = callPackage ./tsc { }; + yes-no = callPackage ./yes-no { }; + youtube-dl = callPackage ./youtube-dl { }; # From old emacsPackages (pre emacsPackagesNg) diff --git a/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix b/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix new file mode 100644 index 00000000000..d01bd7d2fad --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "yes-no"; + + src = fetchurl { + url = "https://github.com/emacsmirror/emacswiki.org/blob/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/yes-no.el"; + sha256 = "1k0nn619i82jiqm48k5nk6b8cv2rggh0i5075nhc85a2s9pwhx32"; + }; + + dontUnpack = true; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install $src $out/share/emacs/site-lisp/yes-no.el + ''; + + meta = with lib; { + description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis"; + homepage = "https://www.emacswiki.org/emacs/yes-no.el"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jcs090218 ]; + platforms = platforms.all; + }; +} From a2215e904b8997a4bade3f4924c7cd68883b04cd Mon Sep 17 00:00:00 2001 From: Jen-Chieh Date: Thu, 8 Sep 2022 14:01:15 +0800 Subject: [PATCH 3/4] emacsPackages.yes-no: Use trivialPackage instead of stdenv.mkDerivation --- .../editors/emacs/elisp-packages/yes-no/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix b/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix index d01bd7d2fad..01a50a61df4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ lib, fetchurl, trivialBuild }: -stdenv.mkDerivation { - name = "yes-no"; +trivialBuild { + pname = "yes-no"; + version = "0"; src = fetchurl { url = "https://github.com/emacsmirror/emacswiki.org/blob/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/yes-no.el"; From 99c2bdeb1a977951c9d50052e97edb45998472a1 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Fri, 9 Sep 2022 18:39:36 +0800 Subject: [PATCH 4/4] emacsPackages.yes-no: commit suggestions from AndersonTorres --- .../editors/emacs/elisp-packages/yes-no/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix b/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix index 01a50a61df4..2b51332c30d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix @@ -2,20 +2,13 @@ trivialBuild { pname = "yes-no"; - version = "0"; + version = "2017-10-01"; src = fetchurl { - url = "https://github.com/emacsmirror/emacswiki.org/blob/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/yes-no.el"; - sha256 = "1k0nn619i82jiqm48k5nk6b8cv2rggh0i5075nhc85a2s9pwhx32"; + url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/143bcaeb679a8fa8a548e92a5a9d5c2baff50d9c/yes-no.el"; + sha256 = "03w4wfx885y89ckyd5d95n2571nmmzrll6kr0yan3ip2aw28xq3i"; }; - dontUnpack = true; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install $src $out/share/emacs/site-lisp/yes-no.el - ''; - meta = with lib; { description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis"; homepage = "https://www.emacswiki.org/emacs/yes-no.el";