From 47f5e765155521956f5cd075765b57e471f372f2 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Thu, 8 Sep 2022 01:37:24 +0800 Subject: [PATCH 01/10] 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 6b9da73b61e0..90822b9b0c88 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 02/10] 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 ec3eeaf7fd39..b312c17d9aac 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 000000000000..d01bd7d2fada --- /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 03/10] 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 d01bd7d2fada..01a50a61df47 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 04/10] 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 01a50a61df47..2b51332c30d4 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"; From f287660cdcde537e64fac5bba64586c98337164c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Sep 2022 17:53:06 +0200 Subject: [PATCH 05/10] nerd-font-patcher: 2.1.0 -> 2.2.2 --- pkgs/applications/misc/nerd-font-patcher/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix index 9912c3231c7e..e865479f8da0 100644 --- a/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "nerd-font-patcher"; - version = "2.1.0"; + version = "2.2.2"; # This uses a sparse checkout because the repo is >2GB without it src = fetchFromGitHub { @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { font-patcher /src/glyphs ''; - sha256 = "sha256-06dn6M2wCFO/uBHDR7VZHNHIybT4h/VGD9nHc4G0EKA="; + sha256 = "sha256-boZUd1PM8puc9BTgOwCJpkfk6VMdXLsIyp+fQmW/ZqI="; }; propagatedBuildInputs = with python3Packages; [ fontforge ]; @@ -22,15 +22,15 @@ python3Packages.buildPythonApplication rec { postPatch = '' sed -i font-patcher \ - -e 's,__dir__ + "/src,"'$out'/share/${pname},' + -e 's,__dir__ + "/src,"'$out'/share/nerd-font-patcher,' ''; dontBuild = true; installPhase = '' - mkdir -p $out/bin $out/share/${pname} - install -Dm755 font-patcher $out/bin/${pname} - cp -ra src/glyphs $out/share/${pname} + mkdir -p $out/bin $out/share/nerd-font-patcher + install -Dm755 font-patcher $out/bin/nerd-font-patcher + cp -ra src/glyphs $out/share/nerd-font-patcher ''; meta = with lib; { From 448c978c5eba56822acaae7f63d73b35fba1097f Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sun, 4 Sep 2022 17:42:37 -0700 Subject: [PATCH 06/10] ovmfvartool: use as a python package --- .../virtualization/ovmfvartool/default.nix | 33 ------------------- .../python-modules/ovmfvartool/default.nix | 27 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/python-packages.nix | 2 ++ 4 files changed, 29 insertions(+), 35 deletions(-) delete mode 100644 pkgs/applications/virtualization/ovmfvartool/default.nix create mode 100644 pkgs/development/python-modules/ovmfvartool/default.nix diff --git a/pkgs/applications/virtualization/ovmfvartool/default.nix b/pkgs/applications/virtualization/ovmfvartool/default.nix deleted file mode 100644 index 1367087e0832..000000000000 --- a/pkgs/applications/virtualization/ovmfvartool/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenvNoCC, fetchFromGitHub, python3 }: - -stdenvNoCC.mkDerivation rec { - pname = "ovmfvartool"; - version = "unstable-2021-06-16"; - - src = fetchFromGitHub { - owner = "hlandau"; - repo = pname; - rev = "c4c0c24dce1d201f95dfd69fd7fd9d51ea301377"; - hash = "sha256-3OvYAB41apPn1c2YTKBIEITmHSUMQ0oEijY5DhZWWGo="; - }; - - postPatch = let - pythonPkg = python3.withPackages (p: with p; [ pyyaml ]); - in '' - # needed in build but /usr/bin/env is not available in sandbox - substituteInPlace ovmfvartool \ - --replace "/usr/bin/env python3" "${pythonPkg.interpreter}" - ''; - - installPhase = '' - mkdir -p $out/bin - install -m 755 ovmfvartool $out/bin/ - ''; - - meta = with lib; { - description = "Parse and generate OVMF_VARS.fd from Yaml"; - homepage = "https://github.com/hlandau/ovmfvartool"; - license = licenses.gpl3; - maintainers = with maintainers; [ baloo raitobezarius ]; - }; -} diff --git a/pkgs/development/python-modules/ovmfvartool/default.nix b/pkgs/development/python-modules/ovmfvartool/default.nix new file mode 100644 index 000000000000..12f65fe86cf3 --- /dev/null +++ b/pkgs/development/python-modules/ovmfvartool/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pyyaml }: + +buildPythonPackage rec { + pname = "ovmfvartool"; + version = "unstable-2022-09-04"; + + src = fetchFromGitHub { + owner = "hlandau"; + repo = pname; + rev = "45e6b1e53967ee6590faae454c076febce096931"; + hash = "sha256-XbvcE/MXNj5S5N7A7jxdwgEE5yMuB82Xg+PYBsFRIm0="; + }; + + propagatedBuildInputs = [ pyyaml ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "ovmfvartool" ]; + + meta = with lib; { + description = "Parse and generate OVMF_VARS.fd from Yaml"; + homepage = "https://github.com/hlandau/ovmfvartool"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ baloo raitobezarius ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff267fbc334..1656db9fb569 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23280,8 +23280,6 @@ with pkgs; tpmSupport = true; }; - ovmfvartool = callPackage ../applications/virtualization/ovmfvartool { }; - ops = callPackage ../applications/virtualization/ops { }; seabios = callPackage ../applications/virtualization/seabios { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec711739e657..f75a5c534cb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6452,6 +6452,8 @@ in { ovh = callPackage ../development/python-modules/ovh { }; + ovmfvartool = callPackage ../development/python-modules/ovmfvartool { }; + ovoenergy = callPackage ../development/python-modules/ovoenergy { }; owslib = callPackage ../development/python-modules/owslib { }; From 2cd22a953fc8852d47b3a09dee6fa75e2b167ad5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 21:44:37 +0000 Subject: [PATCH 07/10] jackett: 0.20.1850 -> 0.20.1853 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 3b907917a7d9..c864a1f77697 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.1850"; + version = "0.20.1853"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "lELuwSC0TKsnU5zsUsA0ihBxsJv/IiAs9tf+Yi5aL8E="; + sha256 = "JsqUgp5o5mYByX6ALTbzMrfjDz035vNGBOjQZCseXKY="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From a1cea52e3fb17be729e2489cd032ef420a84e669 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 9 Sep 2022 19:17:59 -0400 Subject: [PATCH 08/10] vscode-extensions.vscjava.vscode-java-debug: init at 0.44.0 --- .../editors/vscode/extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5643cad16cbe..1234083b02d8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2609,6 +2609,18 @@ let ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { }; + vscjava.vscode-java-debug = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-java-debug"; + publisher = "vscjava"; + version = "0.44.0"; + sha256 = "sha256-8/H7rihSKAvXp8QxK949txgMKwt6aYVN4EQdwhphIiQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; From 04ebd727f21645b7671cdfcf03c608d779285b3f Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 9 Sep 2022 19:18:24 -0400 Subject: [PATCH 09/10] vscode-extensions.vscjava.vscode-java-test: init at 0.37.1 --- .../editors/vscode/extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1234083b02d8..073379555c57 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2621,6 +2621,18 @@ let }; }; + vscjava.vscode-java-test = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-java-test"; + publisher = "vscjava"; + version = "0.37.1"; + sha256 = "sha256-QpDMG+0RbiRY9YQYXQhA6ESBoIjBeUxq+bEZ1Y71oSM="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; From 1325bb78f782d74f8d92927683c9a6b32ab292d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 22:15:17 +0000 Subject: [PATCH 10/10] python310Packages.scikit-hep-testdata: 0.4.15 -> 0.4.20 --- .../python-modules/scikit-hep-testdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 7b9707278d5c..fe87242b9c91 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.15"; + version = "0.4.20"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-cEEtuLmGg/bDRYTUQXQiplzES28+xh8iQge6xZUTWIA="; + sha256 = "sha256-xUXHacUIOr309HCHpzFw0g4i0bgiYcvYTCwBBbVVlR0="; }; nativeBuildInputs = [