diff options
-rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/default.nix | 24 | ||||
-rw-r--r-- | pkgs/applications/misc/nerd-font-patcher/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/virtualization/ovmfvartool/default.nix | 33 | ||||
-rw-r--r-- | pkgs/development/python-modules/ovmfvartool/default.nix | 27 | ||||
-rw-r--r-- | pkgs/development/python-modules/scikit-hep-testdata/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/jackett/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
11 files changed, 90 insertions, 45 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c429c50b9853..68d2be868fc6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6043,6 +6043,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"; 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..2b51332c30d4 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchurl, trivialBuild }: + +trivialBuild { + pname = "yes-no"; + version = "2017-10-01"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/143bcaeb679a8fa8a548e92a5a9d5c2baff50d9c/yes-no.el"; + sha256 = "03w4wfx885y89ckyd5d95n2571nmmzrll6kr0yan3ip2aw28xq3i"; + }; + + 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; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5643cad16cbe..073379555c57 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2609,6 +2609,30 @@ 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; + }; + }; + + 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"; 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; { 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/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 = [ 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31295508de0b..5afd650a7d36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23453,8 +23453,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 ccbdc5fc8e69..3ad990fd322c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6484,6 +6484,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 { }; |