From 549ff413cecd2fe6f880881aa5153c19ebc19f5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Feb 2021 12:03:46 +0100 Subject: [PATCH 01/19] python3Packages.adb-shell: 0.3.0 -> 0.3.1 --- pkgs/development/python-modules/adb-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 9cd3fe362334..ab386505b9fd 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.3.0"; + version = "0.3.1"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "0qnlhcd58zxh39cd5xzdx8yc5hc0pf8kix4rbn4avsapwb0l75n2"; + sha256 = "sha256-b+9ySme44TdIlVnF8AHBBGd8pkoeYG99wmDK/nyAreo="; }; propagatedBuildInputs = [ aiofiles cryptography libusb1 pyasn1 rsa ]; From 0e931bc5e79c27a427b76595e0c5fe3b72aecccf Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 18 Feb 2021 08:56:17 +0000 Subject: [PATCH 02/19] montserrat: 1.0 -> 7.210 --- pkgs/data/fonts/montserrat/default.nix | 37 +++++++++++++------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index de8ea80b0175..41135122f054 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -1,29 +1,28 @@ -# Originally packaged for ArchLinux. -# -# https://aur.archlinux.org/packages/ttf-montserrat/ - -{ lib, fetchzip }: +{ lib, fetchFromGitHub }: let - version = "1.0"; -in fetchzip { - name = "montserrat-${version}"; - - url = "https://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; + pname = "montserrat"; + version = "7.210"; +in fetchFromGitHub { + name = "${pname}-${version}"; + owner = "JulietaUla"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-C6T0Iz1rFC+EsKFJRil2jGTMQ4X7wR80E3eORL5qi0U="; postFetch = '' - tar -xzf $downloadedFile --strip-components=1 - mkdir -p $out/share/fonts/montserrat - cp *.ttf $out/share/fonts/montserrat + tar xf $downloadedFile --strip 1 + install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf + install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf + install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff + install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w"; - meta = with lib; { description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)"; - homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ scolobb ]; + homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ scolobb jk ]; }; } From 7f6ca56bd7645d0dea731087b0009d4dbd792c9d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 18 Feb 2021 18:35:21 +0000 Subject: [PATCH 03/19] wasabiwallet: 1.1.12.3 -> 1.1.12.4 --- pkgs/applications/blockchains/wasabiwallet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index d85e7dcfebfd..e24531c373a0 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.12.3"; + version = "1.1.12.4"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "1x4gqmiwdp5bjq7c5hjch3srsvf73d92lswnp355l7l7cxh2hcsx"; + sha256 = "sha256-1yg0C1lJrLxQEs2GA+XEBUx/JAyc+aW0UWjLhSEy0RI="; }; dontBuild = true; From 873476ed9caaaa7d62fa1344aabfd94c2a6d9f0b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 10:55:45 +0100 Subject: [PATCH 04/19] python3Packages.adb-shell: switch to pytestCheckHook --- .../python-modules/adb-shell/default.nix | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index ab386505b9fd..5377785ff25a 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -1,5 +1,16 @@ -{ aiofiles, buildPythonPackage, cryptography, fetchFromGitHub, isPy3k, lib -, libusb1, mock, pyasn1, python, pycryptodome, rsa }: +{ lib +, aiofiles +, buildPythonPackage +, cryptography +, fetchFromGitHub +, isPy3k +, libusb1 +, mock +, pyasn1 +, pycryptodome +, pytestCheckHook +, rsa +}: buildPythonPackage rec { pname = "adb-shell"; @@ -15,16 +26,24 @@ buildPythonPackage rec { sha256 = "sha256-b+9ySme44TdIlVnF8AHBBGd8pkoeYG99wmDK/nyAreo="; }; - propagatedBuildInputs = [ aiofiles cryptography libusb1 pyasn1 rsa ]; + propagatedBuildInputs = [ + aiofiles + cryptography + libusb1 + pyasn1 + rsa + ]; - checkInputs = [ mock pycryptodome ]; - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests -t . - ''; + checkInputs = [ + mock + pycryptodome + pytestCheckHook + ]; + + pythonImportsCheck = [ "adb_shell" ]; meta = with lib; { - description = - "A Python implementation of ADB with shell and FileSync functionality."; + description = "Python implementation of ADB with shell and FileSync functionality"; homepage = "https://github.com/JeffLIrion/adb_shell"; license = licenses.asl20; maintainers = with maintainers; [ jamiemagee ]; From 952b650b473e6ef29b3e794dd15084579b2f60fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 11:22:09 +0100 Subject: [PATCH 05/19] python3Packages.tellduslive: init at 0.10.11 --- .../python-modules/tellduslive/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/tellduslive/default.nix diff --git a/pkgs/development/python-modules/tellduslive/default.nix b/pkgs/development/python-modules/tellduslive/default.nix new file mode 100644 index 000000000000..5a6a84af8392 --- /dev/null +++ b/pkgs/development/python-modules/tellduslive/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, docopt +, fetchFromGitHub +, requests +, requests_oauthlib +}: + +buildPythonPackage rec { + pname = "tellduslive"; + version = "0.10.11"; + + src = fetchFromGitHub { + owner = "molobrakos"; + repo = pname; + rev = "v${version}"; + sha256 = "0aqhj6fq2z2qb4jyk23ygjicf5nlj8lkya7blkyqb7jra5k1gyg0"; + }; + + propagatedBuildInputs = [ + docopt + requests + requests_oauthlib + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tellduslive" ]; + + meta = with lib; { + description = "Python module to communicate with Telldus Live"; + homepage = "https://github.com/molobrakos/tellduslive"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdff2fce1522..ed2a4d7a3a50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7742,6 +7742,8 @@ in { tensorly = callPackage ../development/python-modules/tensorly { }; + tellduslive = callPackage ../development/python-modules/tellduslive { }; + termcolor = callPackage ../development/python-modules/termcolor { }; terminado = callPackage ../development/python-modules/terminado { }; From 571e50d9d4225f48bb6d87c0e19062c443cbcab0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Feb 2021 11:22:33 +0100 Subject: [PATCH 06/19] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ce7fbfb60648..595a0a05a43d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -825,7 +825,7 @@ "ted5000" = ps: with ps; [ xmltodict ]; "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; - "tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive + "tellduslive" = ps: with ps; [ tellduslive ]; "tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb From cf70751ffcba0ee3e5859a0dda659058d13e4aed Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 18 Feb 2021 21:36:23 -0300 Subject: [PATCH 07/19] 1password-gui: rename --- .../security => applications/misc}/1password-gui/default.nix | 0 .../security => applications/misc}/1password-gui/update.sh | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/security => applications/misc}/1password-gui/default.nix (100%) rename pkgs/{tools/security => applications/misc}/1password-gui/update.sh (100%) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix similarity index 100% rename from pkgs/tools/security/1password-gui/default.nix rename to pkgs/applications/misc/1password-gui/default.nix diff --git a/pkgs/tools/security/1password-gui/update.sh b/pkgs/applications/misc/1password-gui/update.sh similarity index 100% rename from pkgs/tools/security/1password-gui/update.sh rename to pkgs/applications/misc/1password-gui/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 610aa013e4ae..2f7aad4ac445 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -619,7 +619,7 @@ in _1password = callPackage ../applications/misc/1password { }; - _1password-gui = callPackage ../tools/security/1password-gui { }; + _1password-gui = callPackage ../applications/misc/1password-gui { }; _6tunnel = callPackage ../tools/networking/6tunnel { }; From 111256a480e970fee48cdfaccbad6e0b52bc638a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 19 Feb 2021 09:52:34 -0300 Subject: [PATCH 08/19] dap: init at 3.10 --- .../applications/science/math/dap/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/science/math/dap/default.nix diff --git a/pkgs/applications/science/math/dap/default.nix b/pkgs/applications/science/math/dap/default.nix new file mode 100644 index 000000000000..ed3290f6c27d --- /dev/null +++ b/pkgs/applications/science/math/dap/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "dap"; + version = "3.10"; + + src = fetchurl { + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "Bk5sty/438jLb1PpurMQ5OqMbr6JqUuuQjcg2bejh2Y="; + }; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://www.gnu.org/software/dap"; + description = "A small statistics and graphics package based on C"; + longDescription = '' + Dap is a small statistics and graphics package based on C. Version 3.0 and + later of Dap can read SBS programs (based on the utterly famous, industry + standard statistics system with similar initials - you know the one I + mean)! The user wishing to perform basic statistical analyses is now freed + from learning and using C syntax for straightforward tasks, while + retaining access to the C-style graphics and statistics features provided + by the original implementation. Dap provides core methods of data + management, analysis, and graphics that are commonly used in statistical + consulting practice (univariate statistics, correlations and regression, + ANOVA, categorical data analysis, logistic regression, and nonparametric + analyses). + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f7aad4ac445..10e5b7e5e984 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28372,6 +28372,8 @@ in cudaSupport = config.cudaSupport or false; }; + dap = callPackage ../applications/science/math/dap { }; + ecm = callPackage ../applications/science/math/ecm { }; eukleides = callPackage ../applications/science/math/eukleides { From d9736c984cb35c7a755e523b5df28d7b210a5485 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 19 Feb 2021 08:34:34 -0500 Subject: [PATCH 09/19] perlPackages.FunctionParameters: init at 2.001003 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f0ca4bdbaeca..8f4dffd6a3a3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8449,6 +8449,20 @@ let doCheck = false; }; + FunctionParameters = buildPerlPackage { + pname = "Function-Parameters"; + version = "2.001003"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAUKE/Function-Parameters-2.001003.tar.gz"; + sha256 = "eaa22c6b43c02499ec7db0758c2dd218a3b2ab47a714b2bdf8010b5ee113c242"; + }; + buildInputs = [ DirSelf TestFatal ]; + meta = { + description = "Define functions and methods with parameter lists (\"subroutine signatures\")"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Furl = buildPerlModule { pname = "Furl"; version = "3.13"; From 2058e64c9ce047f42540a21ad22d7be1b48b56cc Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 19 Feb 2021 08:37:57 -0500 Subject: [PATCH 10/19] perlPackages.TieHashMethod: init at 0.02 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8f4dffd6a3a3..8201b703d513 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22085,6 +22085,19 @@ let doCheck = false; /* test fails on some machines */ }; + TieHashMethod = buildPerlPackage { + pname = "Tie-Hash-Method"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/Y/YV/YVES/Tie-Hash-Method-0.02.tar.gz"; + sha256 = "d513fbb51413f7ca1e64a1bdce6194df7ec6076dea55066d67b950191eec32a9"; + }; + meta = { + description = "Tied hash with specific methods overriden by callbacks"; + license = with lib.licenses; [ artistic1 ]; + }; + }; + TieRefHash = buildPerlPackage { pname = "Tie-RefHash"; version = "1.40"; From 4f07645f6f84865ee0ce2fa6eea0b03b4d614534 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 19 Feb 2021 09:07:12 -0500 Subject: [PATCH 11/19] perlPackages.TestPostgreSQL: init at 1.27 --- pkgs/top-level/perl-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8201b703d513..3fd80687afda 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14001,6 +14001,25 @@ let }; }; + TestPostgreSQL = buildPerlModule { + pname = "Test-PostgreSQL"; + version = "1.27"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TJ/TJC/Test-PostgreSQL-1.27.tar.gz"; + sha256 = "b1bd231693100cc40905fb0ba3173173201621de9c8301f21c5b593b0a46f907"; + }; + buildInputs = [ ModuleBuildTiny TestSharedFork pkgs.postgresql ]; + propagatedBuildInputs = [ DBDPg DBI FileWhich FunctionParameters Moo TieHashMethod TryTiny TypeTiny ]; + + makeMakerFlags = "POSTGRES_HOME=${pkgs.postgresql}"; + + meta = { + homepage = https://github.com/TJC/Test-postgresql; + description = "PostgreSQL runner for tests"; + license = with lib.licenses; [ artistic2 ]; + }; + }; + TestUseAllModules = buildPerlPackage { pname = "Test-UseAllModules"; version = "0.17"; From ca4db1bc793e1534de7c6eb8fac3b2da53b3f27b Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Mon, 28 Dec 2020 01:12:44 -0300 Subject: [PATCH 12/19] emacs: add currently compiling package dirs to load-path Co-authored-by: Tad Fisher --- .../editors/emacs-modes/elpa-packages.nix | 4 +-- pkgs/build-support/emacs/elpa.nix | 4 +-- .../emacs/{setup-hook.sh => emacs-funcs.sh} | 10 -------- pkgs/build-support/emacs/generic.nix | 25 ++++++++++++++++--- pkgs/build-support/emacs/melpa.nix | 4 +-- pkgs/top-level/emacs-packages.nix | 2 +- 6 files changed, 29 insertions(+), 20 deletions(-) rename pkgs/build-support/emacs/{setup-hook.sh => emacs-funcs.sh} (75%) diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 8b9ad33fce78..98c265894eae 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -20,7 +20,7 @@ instantenous and formats commits for you. */ -{ lib, stdenv, texinfo }: +{ lib, stdenv, texinfo, writeText }: self: let @@ -31,7 +31,7 @@ self: let }; elpaBuild = import ../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo; + inherit lib stdenv texinfo writeText; inherit (self) emacs; }; diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 214aed9c3f9c..41a0670d0c84 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, emacs, texinfo }: +{ lib, stdenv, emacs, texinfo, writeText }: with lib; @@ -19,7 +19,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ phases = "installPhase fixupPhase distPhase"; diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/emacs-funcs.sh similarity index 75% rename from pkgs/build-support/emacs/setup-hook.sh rename to pkgs/build-support/emacs/emacs-funcs.sh index f6f2331b8e02..e1e6a3b62208 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/emacs-funcs.sh @@ -32,13 +32,3 @@ addEmacsVars () { fi done } - -if [[ ! -v emacsHookDone ]]; then - emacsHookDone=1 - - # If this is for a wrapper derivation, emacs and the dependencies are all - # run-time dependencies. If this is for precompiling packages into bytecode, - # emacs is a compile-time dependency of the package. - addEnvHooks "$hostOffset" addEmacsVars - addEnvHooks "$targetOffset" addEmacsVars -fi diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index d84fa24923df..1456d9e423d8 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo, ... }: +{ lib, stdenv, emacs, texinfo, writeText, ... }: with lib; @@ -49,7 +49,19 @@ stdenv.mkDerivation ({ propagatedBuildInputs = packageRequires; propagatedUserEnvPkgs = packageRequires; - setupHook = ./setup-hook.sh; + setupHook = writeText "setup-hook.sh" '' + source ${./emacs-funcs.sh} + + if [[ ! -v emacsHookDone ]]; then + emacsHookDone=1 + + # If this is for a wrapper derivation, emacs and the dependencies are all + # run-time dependencies. If this is for precompiling packages into bytecode, + # emacs is a compile-time dependency of the package. + addEnvHooks "$hostOffset" addEmacsVars + addEnvHooks "$targetOffset" addEmacsVars + fi + ''; doCheck = false; @@ -63,9 +75,16 @@ stdenv.mkDerivation ({ addEmacsNativeLoadPath = true; postInstall = '' + # Besides adding the output directory to the native load path, make sure + # the current package's elisp files are in the load path, otherwise + # (require 'file-b) from file-a.el in the same package will fail. + mkdir -p $out/share/emacs/native-lisp + source ${./emacs-funcs.sh} + addEmacsVars "$out" + find $out/share/emacs -type f -name '*.el' -print0 \ | xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c \ - "emacs --batch --eval=\"(add-to-list 'comp-eln-load-path \\\"$out/share/emacs/native-lisp/\\\")\" -f batch-native-compile {} || true" + "emacs --batch -f batch-native-compile {} || true" ''; } diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index d6fe3085837e..824611b20c8a 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchFromGitHub, emacs, texinfo }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }: with lib; @@ -28,7 +28,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ ename = if ename == null diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d0bb7c56d99c..329fb5725829 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -45,7 +45,7 @@ let mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix { - inherit lib stdenv texinfo; + inherit lib stdenv texinfo writeText; }; # Contains both melpa stable & unstable From 4f88373ed5497c0d61679984401aba923ec10d58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Feb 2021 08:10:59 -0800 Subject: [PATCH 13/19] gerrit: 3.3.1 -> 3.3.2 (#113671) --- pkgs/applications/version-management/gerrit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 2c5ddca5090f..d23f28470499 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "0swj3lmxwh4a0gnkirqrh7znzizsizy3cnlinhhsi319qns2szb1"; + sha256 = "sha256-tqlJANxJl2r0ZxPb7d8KU9cRMQUFPUIm/zMp4zREGL0="; }; buildCommand = '' From cad32a90a193c09bfa431eda9119bf0ecf8e659f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Feb 2021 08:23:22 -0800 Subject: [PATCH 14/19] xdg-desktop-portal: 1.8.0 -> 1.8.1 (#113632) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fontconfig dependency was dropped. Co-authored-by: Daniël de Kok --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index cab358528311..2b425300b31e 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -7,7 +7,6 @@ , libxml2 , glib , pipewire -, fontconfig , flatpak , gsettings-desktop-schemas , acl @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.8.0"; + version = "1.8.1"; outputs = [ "out" "installedTests" ]; @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1f1f79hy259lm017zaq4rpvys8zkmjspqily4a3lbnm77zk3y079"; + sha256 = "sha256-tuRKCBj9ELC7yFPs/Sut/EdO+L8nwW3S8NWU+XedAF8="; }; patches = [ @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib pipewire - fontconfig flatpak acl dbus From 336fc0a77a9dc92fe6261db6b3729283c704dc43 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 3 Oct 2020 17:29:33 +0300 Subject: [PATCH 15/19] emacsPackages: add buildWithGit helper --- .../editors/emacs-modes/melpa-packages.nix | 223 ++++-------------- 1 file changed, 42 insertions(+), 181 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 62979b4226dd..7124f848545a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -47,6 +47,11 @@ let }); }) else null; + buildWithGit = pkg: pkg.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; + }); + fix-rtags = pkg: if pkg != null then dontConfigure (externalSrc pkg external.rtags) else null; @@ -120,26 +125,15 @@ let packageRequires = with self; [ evil ]; }); - evil-magit = super.evil-magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + evil-magit = buildWithGit super.evil-magit; - eopengrok = super.eopengrok.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + eopengrok = buildWithGit super.eopengrok; ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; - forge = super.forge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + forge = buildWithGit super.forge; flycheck-rtags = fix-rtags super.flycheck-rtags; @@ -211,113 +205,41 @@ let ''; }); - magit = super.magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit = buildWithGit super.magit; - magit-find-file = super.magit-find-file.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-find-file = buildWithGit super.magit-find-file; - magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-gh-pulls = buildWithGit super.magit-gh-pulls; - magit-imerge = super.magit-imerge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-imerge = buildWithGit super.magit-imerge; - magit-lfs = super.magit-lfs.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-lfs = buildWithGit super.magit-lfs; - magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-org-todos = buildWithGit super.magit-org-todos; - magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-tbdiff = buildWithGit super.magit-tbdiff; - magit-topgit = super.magit-topgit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-topgit = buildWithGit super.magit-topgit; - magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-vcsh = buildWithGit super.magit-vcsh; - magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-gerrit = buildWithGit super.magit-gerrit; - magit-annex = super.magit-annex.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-annex = buildWithGit super.magit-annex; - magit-todos = super.magit-todos.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-todos = buildWithGit super.magit-todos; - magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-filenotify = buildWithGit super.magit-filenotify; - magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-gitflow = buildWithGit super.magit-gitflow; - magithub = super.magithub.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magithub = buildWithGit super.magithub; - magit-svn = super.magit-svn.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-svn = buildWithGit super.magit-svn; - kubernetes = super.kubernetes.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + kubernetes = buildWithGit super.kubernetes; - kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + kubernetes-evil = buildWithGit super.kubernetes-evil; # upstream issue: missing file header mhc = super.mhc.override { @@ -462,105 +384,44 @@ let propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; }); - egg = super.egg.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + egg = buildWithGit super.egg; # missing dependencies evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: { packageRequires = with self; [ evil highlight ]; }); - kapacitor = super.kapacitor.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + kapacitor = buildWithGit super.kapacitor; - gerrit = super.gerrit.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + gerrit = buildWithGit super.gerrit; - gerrit-download = super.gerrit-download.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + gerrit-download = buildWithGit super.gerrit-download; - github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + github-pullrequest = buildWithGit super.github-pullrequest; helm-rtags = fix-rtags super.helm-rtags; - jist = super.jist.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + jist = buildWithGit super.jist; - mandoku = super.mandoku.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + mandoku = buildWithGit super.mandoku; - mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + mandoku-tls = buildWithGit super.mandoku-tls; - magit-p4 = super.magit-p4.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-p4 = buildWithGit super.magit-p4; - magit-rbr = super.magit-rbr.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-rbr = buildWithGit super.magit-rbr; - magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-diff-flycheck = buildWithGit super.magit-diff-flycheck; - magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-reviewboard = buildWithGit super.magit-reviewboard; - magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-patch-changelog = buildWithGit super.magit-patch-changelog; - magit-circleci = super.magit-circleci.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + magit-circleci = buildWithGit super.magit-circleci; - orgit = - (super.orgit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - })); + orgit = buildWithGit super.orgit; - orgit-forge = super.orgit-forge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; - }); + orgit-forge = buildWithGit super.orgit-forge; # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { From 1f9b5eaa5e8adafef48d87d6f81e044189283455 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 3 Oct 2020 17:34:28 +0300 Subject: [PATCH 16/19] emacsPackages: group all buildWithGit packages together --- .../editors/emacs-modes/melpa-packages.nix | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 7124f848545a..200f471ac9fe 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -125,16 +125,10 @@ let packageRequires = with self; [ evil ]; }); - evil-magit = buildWithGit super.evil-magit; - - eopengrok = buildWithGit super.eopengrok; - ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; - forge = buildWithGit super.forge; - flycheck-rtags = fix-rtags super.flycheck-rtags; pdf-tools = super.pdf-tools.overrideAttrs (old: { @@ -205,6 +199,12 @@ let ''; }); + evil-magit = buildWithGit super.evil-magit; + + eopengrok = buildWithGit super.eopengrok; + + forge = buildWithGit super.forge; + magit = buildWithGit super.magit; magit-find-file = buildWithGit super.magit-find-file; @@ -241,6 +241,38 @@ let kubernetes-evil = buildWithGit super.kubernetes-evil; + egg = buildWithGit super.egg; + + kapacitor = buildWithGit super.kapacitor; + + gerrit = buildWithGit super.gerrit; + + gerrit-download = buildWithGit super.gerrit-download; + + github-pullrequest = buildWithGit super.github-pullrequest; + + jist = buildWithGit super.jist; + + mandoku = buildWithGit super.mandoku; + + mandoku-tls = buildWithGit super.mandoku-tls; + + magit-p4 = buildWithGit super.magit-p4; + + magit-rbr = buildWithGit super.magit-rbr; + + magit-diff-flycheck = buildWithGit super.magit-diff-flycheck; + + magit-reviewboard = buildWithGit super.magit-reviewboard; + + magit-patch-changelog = buildWithGit super.magit-patch-changelog; + + magit-circleci = buildWithGit super.magit-circleci; + + orgit = buildWithGit super.orgit; + + orgit-forge = buildWithGit super.orgit-forge; + # upstream issue: missing file header mhc = super.mhc.override { inherit (self.melpaPackages) calfw; @@ -384,45 +416,13 @@ let propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; }); - egg = buildWithGit super.egg; - # missing dependencies evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: { packageRequires = with self; [ evil highlight ]; }); - kapacitor = buildWithGit super.kapacitor; - - gerrit = buildWithGit super.gerrit; - - gerrit-download = buildWithGit super.gerrit-download; - - github-pullrequest = buildWithGit super.github-pullrequest; - helm-rtags = fix-rtags super.helm-rtags; - jist = buildWithGit super.jist; - - mandoku = buildWithGit super.mandoku; - - mandoku-tls = buildWithGit super.mandoku-tls; - - magit-p4 = buildWithGit super.magit-p4; - - magit-rbr = buildWithGit super.magit-rbr; - - magit-diff-flycheck = buildWithGit super.magit-diff-flycheck; - - magit-reviewboard = buildWithGit super.magit-reviewboard; - - magit-patch-changelog = buildWithGit super.magit-patch-changelog; - - magit-circleci = buildWithGit super.magit-circleci; - - orgit = buildWithGit super.orgit; - - orgit-forge = buildWithGit super.orgit-forge; - # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { HOME = "/tmp"; From 8534707a7dac44a1e2def27f4d2b14fef47442c8 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 3 Oct 2020 17:35:43 +0300 Subject: [PATCH 17/19] emacsPackages.magit-delta: add git as a build-time dependency --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 200f471ac9fe..305d60aa305a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -269,6 +269,8 @@ let magit-circleci = buildWithGit super.magit-circleci; + magit-delta = buildWithGit super.magit-delta; + orgit = buildWithGit super.orgit; orgit-forge = buildWithGit super.orgit-forge; From c90d8b8242d726c1b5e4cdc4008aa4fe99995b6f Mon Sep 17 00:00:00 2001 From: superwhiskers Date: Fri, 19 Feb 2021 11:51:52 -0600 Subject: [PATCH 18/19] carp: 0.3.0 -> 0.5.0 (#113376) --- pkgs/development/compilers/carp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index b0a14534b082..d83e70a703aa 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -3,20 +3,20 @@ haskellPackages.mkDerivation rec { pname = "carp"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "carp-lang"; repo = "Carp"; rev = "v${version}"; - sha256 = "07yk3gy4l6h3k7sh8al7lgwk75a13zxwfp7siqpb5gnnqr1z3brc"; + sha256 = "sha256-nTSMY8bq0b/JvE/XQGDC4St2sqdni12E5WQU5FXnuCg="; }; - buildDepends = [ makeWrapper ]; + buildTools = [ makeWrapper ]; executableHaskellDepends = with haskellPackages; [ - HUnit blaze-markup blaze-html split cmdargs ansi-terminal cmark - edit-distance + HUnit blaze-markup blaze-html split ansi-terminal cmark + edit-distance hashable open-browser optparse-applicative ]; isExecutable = true; From b8e6168ce71fd0f2a093cfbb87e761e935cf4d24 Mon Sep 17 00:00:00 2001 From: Matt Snider Date: Fri, 19 Feb 2021 19:10:38 +0100 Subject: [PATCH 19/19] ankisyncd: 2.1.0 -> 2.2.0 (#111755) See #107526 --- pkgs/servers/ankisyncd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/ankisyncd/default.nix b/pkgs/servers/ankisyncd/default.nix index e10986701237..598483575cdc 100644 --- a/pkgs/servers/ankisyncd/default.nix +++ b/pkgs/servers/ankisyncd/default.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "ankisyncd"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { - owner = "tsudoko"; + owner = "ankicommunity"; repo = "anki-sync-server"; rev = version; - sha256 = "6a140afa94fdb1725fed716918875e3d2ad0092cb955136e381c9d826cc4927c"; + sha256 = "196xhd6vzp1ncr3ahz0bv0gp1ap2s37j8v48dwmvaywzayakqdab"; }; format = "other"; @@ -60,8 +60,8 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Self-hosted Anki sync server"; maintainers = with maintainers; [ matt-snider ]; - homepage = "https://github.com/tsudoko/anki-sync-server"; - license = licenses.agpl3; + homepage = "https://github.com/ankicommunity/anki-sync-server"; + license = licenses.agpl3Only; platforms = platforms.linux; }; }