From b13edbaac5e1abac640404e41028bf1b9830ac29 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 2 Dec 2020 00:51:29 +0700 Subject: [PATCH 01/37] oksh: init at 6.8.1 --- pkgs/shells/oksh/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/shells/oksh/default.nix diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix new file mode 100644 index 00000000000..7ec70e53bd2 --- /dev/null +++ b/pkgs/shells/oksh/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "oksh"; + version = "6.8.1"; + + src = fetchFromGitHub { + owner = "ibara"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0lny550qfanysc4pqs0mxxx8zyz6plv9ll8y05gz0xmq9vx5384r"; + }; + + meta = with stdenv.lib; { + description = "Portable OpenBSD ksh, based on the Public Domain Korn Shell (pdksh)"; + homepage = "https://github.com/ibara/oksh"; + license = licenses.publicDomain; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 681b79afb1b..f2b7a1ce8c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8634,6 +8634,8 @@ in oil = callPackage ../shells/oil { }; + oksh = callPackage ../shells/oksh { }; + pash = callPackage ../shells/pash { }; tcsh = callPackage ../shells/tcsh { }; From b8e392a8d99efd4fb1306f7dc049f8ffcb78fee5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 16 Dec 2020 15:49:54 +0000 Subject: [PATCH 02/37] python37Packages.eventlet: 0.29.1 -> 0.30.0 --- pkgs/development/python-modules/eventlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 5eb3efe6009..93b05885985 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.29.1"; + version = "0.30.0"; src = fetchPypi { inherit pname version; - sha256 = "9faff63631b01277c463ae91cd4ab3f25a2f0f5abe3219d43a386ef1daa6159a"; + sha256 = "19d6f3aa9525221ba60d0ec31b570508021af7ad5497fb77f77501fe9a7c34d3"; }; propagatedBuildInputs = [ dnspython greenlet monotonic six ] From a9544e450db626ea33f67a935f6e888e01c57945 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Dec 2020 14:08:26 +0000 Subject: [PATCH 03/37] python37Packages.eliot: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/eliot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 557be014f86..815167aefb5 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "eliot"; - version = "1.12.0"; + version = "1.13.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0wabv7hk63l12881f4zw02mmj06583qsx2im0yywdjlj8f56vqdn"; + sha256 = "5760194b308a7ab35514ae1b942d88e9f2359071556d82580383f09ca586fff7"; }; checkInputs = [ From 314992641f8cef6076d0a409c1d5e5b716807d36 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Dec 2020 01:09:21 +0000 Subject: [PATCH 04/37] python37Packages.cupy: 8.2.0 -> 8.3.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 91fd7ba11d4..2d2a2be4855 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "8.2.0"; + version = "8.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8e4bc8428fb14309d73194e19bc4b47e1d6a330678a200e36d9d4b932f1be2e8"; + sha256 = "db699fddfde7806445908cf6454c6f4985e7a9563b40405ddf97845d808c5f12"; }; checkInputs = [ From b5707ce9c0a265d95ebbc9a9b8ffd14b253a191e Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 28 Dec 2020 18:38:50 -0500 Subject: [PATCH 05/37] php.extensions.pdlib: init at 1.0.2 --- .../php-packages/pdlib/default.nix | 24 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/php-packages/pdlib/default.nix diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix new file mode 100644 index 00000000000..83051946701 --- /dev/null +++ b/pkgs/development/php-packages/pdlib/default.nix @@ -0,0 +1,24 @@ +{ buildPecl, lib, pkgs }: +let + pname = "pdlib"; + version = "1.0.2"; +in +buildPecl { + inherit pname version; + + src = pkgs.fetchFromGitHub { + owner = "goodspb"; + repo = "pdlib"; + rev = "v${version}"; + sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i"; + }; + + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ (pkgs.dlib.override { guiSupport = true; }) ]; + + meta = with lib; { + description = "A PHP extension for Dlib"; + license = with licenses; [ mit ]; + maintainers = lib.teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cc8ba346ae5..425aff4854c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -80,6 +80,8 @@ lib.makeScope pkgs.newScope (self: with self; { oci8 = callPackage ../development/php-packages/oci8 { }; + pdlib = callPackage ../development/php-packages/pdlib { }; + pcov = callPackage ../development/php-packages/pcov { }; pcs = buildPecl { From c4f306e6f6526a9ae3e7c8e19fcfd1f324287423 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jan 2021 13:53:55 +0100 Subject: [PATCH 06/37] php73: 7.3.25 -> 7.3.26 https://www.php.net/ChangeLog-7.php#7.3.26 --- pkgs/development/interpreters/php/7.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.3.nix b/pkgs/development/interpreters/php/7.3.nix index 30e26bf87a1..13b64e8cb6e 100644 --- a/pkgs/development/interpreters/php/7.3.nix +++ b/pkgs/development/interpreters/php/7.3.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.3.25"; - sha256 = "1yq2fwpg9jgcafcrq4ffqm52r0f80pi6zy7fj1yb1qwim96mlcb9"; + version = "7.3.26"; + sha256 = "0klxnf6nhsib9b2mdls1x2wbpi04gmgwxajbn593rzalh5y5l7ip"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; From 42ea217821521605c62e9b5b528ee914f88b189c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jan 2021 13:54:16 +0100 Subject: [PATCH 07/37] php74: 7.4.13 -> 7.4.14 https://www.php.net/ChangeLog-7.php#7.4.14 --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index b45da1fb86c..9ee0c9c9e7c 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.13"; - sha256 = "1nhzldjp8jfd1hivfyn5wydim5daibz0vkfxgys2xj8igs2kk8qm"; + version = "7.4.14"; + sha256 = "1xm1s2w9fsd8q7kjbpqw8s4bs7ggziwws23m0ykkmvmd0l3cm2b8"; }); in base.withExtensions ({ all, ... }: with all; ([ From 0821afd6018b04762ec3949a19d6ee5e513c7716 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 8 Jan 2021 01:23:06 +0100 Subject: [PATCH 08/37] php80: 8.0.0 -> 8.0.1 https://www.php.net/ChangeLog-8.php#8.0.1 --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index ded661e5585..5779c836dd4 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.0"; - sha256 = "02cx3gvxqvkllp54jfvs83kl8bmpcqyzp9jf1d0l9x5bgv1jv0sy"; + version = "8.0.1"; + sha256 = "1vmx9rhks8v2198f9d6cq62bway5mrfsz72garjdwcyi82ppckn4"; }); in base.withExtensions ({ all, ... }: with all; ([ From 0f04df98a2d92497274d33be85c60b247eba41bc Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 8 Jan 2021 01:28:25 +0100 Subject: [PATCH 09/37] php80Extensions.opcache: drop patch does not apply anymore and it compiles without it now --- .../php/fix-opcache-configure.patch | 81 ------------------- pkgs/top-level/php-packages.nix | 5 +- 2 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 pkgs/development/interpreters/php/fix-opcache-configure.patch diff --git a/pkgs/development/interpreters/php/fix-opcache-configure.patch b/pkgs/development/interpreters/php/fix-opcache-configure.patch deleted file mode 100644 index e67d2cc7bc7..00000000000 --- a/pkgs/development/interpreters/php/fix-opcache-configure.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 -index 726188597496..781e51d3e44c 100644 ---- a/Zend/Zend.m4 -+++ b/Zend/Zend.m4 -@@ -190,12 +190,6 @@ dnl LIBZEND_OTHER_CHECKS - dnl - AC_DEFUN([LIBZEND_OTHER_CHECKS],[ - --AC_ARG_ENABLE([zts], -- [AS_HELP_STRING([--enable-zts], -- [Enable thread safety])], -- [ZEND_ZTS=$enableval], -- [ZEND_ZTS=no]) -- - AC_MSG_CHECKING(whether to enable thread-safety) - AC_MSG_RESULT($ZEND_ZTS) - -diff --git a/configure.ac b/configure.ac -index 8d6e922fa9bf..e07a75d19ac7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -797,6 +797,19 @@ if test "$PHP_DEBUG_ASSERTIONS" = "yes"; then - ZEND_DEBUG=yes - fi - -+AC_ARG_ENABLE([zts], -+ [AS_HELP_STRING([--enable-zts], -+ [Enable thread safety])], -+ [ZEND_ZTS=$enableval], -+ [ZEND_ZTS=no]) -+ -+if test "$ZEND_ZTS" = "yes"; then -+ AC_DEFINE(ZTS, 1,[ ]) -+ PHP_THREAD_SAFETY=yes -+else -+ PHP_THREAD_SAFETY=no -+fi -+ - PHP_ARG_ENABLE([rtld-now], - [whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY], - [AS_HELP_STRING([--enable-rtld-now], -@@ -1136,13 +1149,6 @@ LIBZEND_BASIC_CHECKS - LIBZEND_DLSYM_CHECK - LIBZEND_OTHER_CHECKS - --if test "$ZEND_ZTS" = "yes"; then -- AC_DEFINE(ZTS,1,[ ]) -- PHP_THREAD_SAFETY=yes --else -- PHP_THREAD_SAFETY=no --fi -- - INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" - INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" - -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 054cd28c0247..93d72fb73d19 100644 ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then - esac - fi - -- if test "$enable_zts" = "yes"; then -+ if test "$PHP_THREAD_SAFETY" = "yes"; then - DASM_FLAGS="$DASM_FLAGS -D ZTS=1" - fi - -diff --git a/ext/session/config.m4 b/ext/session/config.m4 -index 7abc8813b72a..da31bbde86cc 100644 ---- a/ext/session/config.m4 -+++ b/ext/session/config.m4 -@@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then - AC_MSG_ERROR(cannot find mm library) - fi - -- if test "$enable_zts" = "yes"; then -+ if test "$PHP_THREAD_SAFETY" = "yes"; then - dnl The mm library is not thread-safe, and mod_mm.c refuses to compile. - AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts) - fi \ No newline at end of file diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cc8ba346ae5..2e1da841247 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -388,10 +388,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ valgrind.dev ]; - # HAVE_OPCACHE_FILE_CACHE is defined in config.h, which is - # included from ZendAccelerator.h, but ZendAccelerator.h is - # included after the ifdef... - patches = [] ++ lib.optional (lib.versionAtLeast php.version "8.0") [ ../development/interpreters/php/fix-opcache-configure.patch ] ++lib.optional (lib.versionOlder php.version "7.4") [ + patches = [] ++ lib.optional (lib.versionOlder php.version "7.4") [ (pkgs.writeText "zend_file_cache_config.patch" '' --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c From f0b9468613de92d82ae7ceca6688cec97fc3e556 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Jan 2021 04:20:00 +0000 Subject: [PATCH 10/37] lxd: 4.9 -> 4.10 https://discuss.linuxcontainers.org/t/lxd-4-10-has-been-released/9894 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 0a079c5107f..5462393517b 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.9"; + version = "4.10"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0sq3avgsrdzkbsil0xsri60xxi0bzf4l6w43w23lbhacrby1spj4"; + sha256 = "0s8lbvh2vsqphvspyjyxp5s589gf2wrjpka8v496lf6fv1nsi5s8"; }; postPatch = '' From 6f4f4ee7b87b286537ba090a7014214bf30997d9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Jan 2021 04:20:00 +0000 Subject: [PATCH 11/37] python3Packages.itemloaders: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/itemloaders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index 08c7e50e95e..107585f0416 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "itemloaders"; - version = "1.0.3"; + version = "1.0.4"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scrapy"; repo = pname; rev = "v${version}"; - sha256 = "1s8c2il7jyfixpb7h5zq0lf4s07pqwia4ycpf3slb8whcp0h8bfm"; + sha256 = "0j68xgx2z63sc1nc9clw6744036vfbijdsghvjv6pk674d5lgyam"; }; propagatedBuildInputs = [ w3lib parsel jmespath itemadapter ]; From d3e211ccd8cddb3d18dc2c10c184d12ada998890 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Jan 2021 09:18:33 +0100 Subject: [PATCH 12/37] python3Packages.PyChromecast: 7.7.1 -> 7.7.2 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 6e45eb2a626..83a9c95bf63 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "7.7.1"; + version = "7.7.2"; src = fetchPypi { inherit pname version; - sha256 = "09mdz1y1bfwkszxsawffwy1mr7lc1j2rma571qkb60sk76107zfn"; + sha256 = "1w7jayb0z529bh1ybb16pfm0m08qqi4px1q0qwlvcxlcrd2v3m5a"; }; disabled = !isPy3k; From a614fba930caea7715d0e6eea4d52e215d4e20df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 8 Jan 2021 09:38:03 +0100 Subject: [PATCH 13/37] python3Packages.PyChromecast: disable checks --- pkgs/development/python-modules/pychromecast/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 83a9c95bf63..fecf3f09ca7 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -13,6 +13,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests zeroconf protobuf casttube ]; + # no tests available + doCheck = false; pythonImportsCheck = [ "pychromecast" ]; meta = with lib; { From 9e59058f2fc5718a6b6d5082379add4517270475 Mon Sep 17 00:00:00 2001 From: Ivan Kovnatsky Date: Sat, 2 Jan 2021 11:45:09 +0200 Subject: [PATCH 14/37] vimPlugins.vim-git: init at 2020-07-13 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4f24e88ca9e..0b598b4df70 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5161,6 +5161,18 @@ let meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; + vim-git = buildVimPluginFrom2Nix { + pname = "vim-git"; + version = "2020-07-13"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-git"; + rev = "4be54a3e2e300a94f6f7dfa7a6ee9e81245c9886"; + sha256 = "1061l9igdywfbqgwpf2f25yby78phb512hjbyzvqz5l1p7dw1xyd"; + }; + meta.homepage = "https://github.com/tpope/vim-git/"; + }; + vim-gitbranch = buildVimPluginFrom2Nix { pname = "vim-gitbranch"; version = "2017-05-27"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 237f7faacf3..4c56bc3d86b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -558,6 +558,7 @@ tpope/vim-eunuch tpope/vim-fireplace tpope/vim-flagship tpope/vim-fugitive +tpope/vim-git tpope/vim-liquid tpope/vim-obsession tpope/vim-pathogen From f2f45115f99e764ef796c554f661be01d676024d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 Jan 2021 16:58:53 +0000 Subject: [PATCH 15/37] python37Packages.folium: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/folium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 800ece5261d..c0adaeaa558 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "540789abc21872469e52c59ac3962c61259a8df557feadd6514eb23eb0a64ca7"; + sha256 = "d45ace0a813ae65f202ce0356eb29c40a5e8fde071e4d6b5be0a89587ebaeab2"; }; disabled = pythonOlder "3.5"; From 41c50cc5052e80a7132880b28ff38c52b611c974 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 8 Jan 2021 13:48:00 -0300 Subject: [PATCH 16/37] nixos/opentabletdriver: add tests --- nixos/tests/all-tests.nix | 1 + nixos/tests/opentabletdriver.nix | 27 +++++++++++++++++++++ pkgs/tools/X11/opentabletdriver/default.nix | 5 ++++ 3 files changed, 33 insertions(+) create mode 100644 nixos/tests/opentabletdriver.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c491b559213..8d04f10157e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -281,6 +281,7 @@ in openssh = handleTest ./openssh.nix {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; + opentabletdriver = handleTest ./opentabletdriver.nix {}; image-contents = handleTest ./image-contents.nix {}; orangefs = handleTest ./orangefs.nix {}; os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; diff --git a/nixos/tests/opentabletdriver.nix b/nixos/tests/opentabletdriver.nix new file mode 100644 index 00000000000..2cadfae6b26 --- /dev/null +++ b/nixos/tests/opentabletdriver.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ( { pkgs, ... }: { + name = "opentabletdriver"; + meta = { + maintainers = with pkgs.stdenv.lib.maintainers; [ thiagokokada ]; + }; + + machine = { pkgs, ... }: + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + test-support.displayManager.auto.user = "alice"; + hardware.opentabletdriver.enable = true; + }; + + testScript = + '' + machine.start() + machine.wait_for_x() + machine.wait_for_unit("opentabletdriver.service", "alice") + + machine.succeed("cat /etc/udev/rules.d/30-opentabletdriver.rules") + # Will fail if service is not running + machine.succeed("otd detect") + ''; +}) diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 486cb50b7f3..dc527f47dd3 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -17,6 +17,7 @@ , copyDesktopItems , makeDesktopItem , makeWrapper +, nixosTests , wrapGAppsHook }: @@ -154,6 +155,10 @@ stdenv.mkDerivation rec { dontWrapGApps = true; dontStrip = true; + passthru.tests = { + otd-runs = nixosTests.opentabletdriver; + }; + meta = with lib; { description = "Open source, cross-platform, user-mode tablet driver"; homepage = "https://github.com/InfinityGhost/OpenTabletDriver"; From 4dadeb37309682aea2e88b3abb61e0762e7fbb02 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 8 Jan 2021 10:53:08 -0800 Subject: [PATCH 17/37] alacritty: 0.6.0 -> 0.7.0 https://github.com/alacritty/alacritty/releases/tag/v0.7.0 https://github.com/alacritty/alacritty/compare/v0.6.0...v0.7.0 --- pkgs/applications/terminal-emulators/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index cd372b79c26..2013e46eb5d 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "vQdNwNiUvoJWRT1foPRadirI2zWjnzU3sGnIxeHKlj8="; + sha256 = "nN/OFzuGjD6psByl7xswO0mYp13r7rF80ziMr3GGfDQ="; }; - cargoSha256 = "1PQSg6EmwVMZj2ALw6qsbtPMCtALVHx5TR05FjGD/QE="; + cargoSha256 = "VUFPzJOGV8N1Q0hUyIPuf6e+eGxezkrJDJkzxZip5y0="; nativeBuildInputs = [ cmake From a1b7e45eee79c1b85d627a27e531f9d01dafcad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Fri, 8 Jan 2021 21:50:39 +0100 Subject: [PATCH 18/37] vimPlugins.aniseed: init at 2021-01-08 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 19122a150d1..7b9724c2d52 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -87,6 +87,18 @@ let meta.homepage = "https://github.com/vim-scripts/align/"; }; + aniseed = buildVimPluginFrom2Nix { + pname = "aniseed"; + version = "2021-01-08"; + src = fetchFromGitHub { + owner = "Olical"; + repo = "aniseed"; + rev = "50adbc5ed5bb97b73b0b0c3241d9e62621ca59f9"; + sha256 = "1wy5jd86273q7sxa50kv88flqdgmg9z2m4b6phpw3xnl5d1sj9f7"; + }; + meta.homepage = "https://github.com/Olical/aniseed/"; + }; + ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; version = "2020-10-15"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b1d8b4c1b6a..d3d75dcb381 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -404,6 +404,7 @@ nvim-treesitter/playground ocaml/vim-ocaml octol/vim-cpp-enhanced-highlight ojroques/vim-oscyank@main +Olical/aniseed Olical/conjure OrangeT/vim-csharp osyo-manga/shabadou.vim From 452115781bf05ed3d2b425c050806cdafc06ff80 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 8 Jan 2021 23:52:36 +0300 Subject: [PATCH 19/37] =?UTF-8?q?libosmium:=202.15.6=20=E2=86=92=202.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libosmium/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 830465fb113..10e6d61d156 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.15.6"; + version = "2.16.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2"; + sha256 = "1na51g6xfm1bx0d0izbg99cwmqn0grp0g41znn93xnhs202qnb2h"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ protozero zlib bzip2 expat boost ]; + cmakeFlags = [ "-DINSTALL_GDALCPP:BOOL=ON" ]; + doCheck = true; meta = with stdenv.lib; { From 7266f5d422b1e6031d51264b4554c4c32ce93295 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 8 Jan 2021 23:53:40 +0300 Subject: [PATCH 20/37] =?UTF-8?q?pythonPackages.pyosmium:=203.0.1=20?= =?UTF-8?q?=E2=86=92=203.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/pyosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index ffcd3569e0a..577f00fd111 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.0.1"; + version = "3.1.0"; disabled = pythonOlder "3.4" || isPyPy; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128"; + sha256 = "0m11hdgiysdhyi5yn6nj8a8ycjzx5hpjy7n1c4j6q5caifj7rf7h"; }; nativeBuildInputs = [ cmake ]; From 00a23bd1b3a42eb20078d9cbee467174f6872645 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 8 Jan 2021 23:54:25 +0300 Subject: [PATCH 21/37] =?UTF-8?q?osmium-tool:=201.12.1=20=E2=86=92=201.13.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/osmium-tool/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 892038c252a..78878d79553 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -7,19 +7,20 @@ , bzip2 , expat , libosmium +, lz4 , protozero , zlib }: stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "13142hj8gfgj6w51a62hjzfmzic90xgrnnlnb70hpdqjy86bxv7j"; + sha256 = "0rn67g4xf01i7pkxrdh87jdj2rzkw5pfkx5wkg9245z5yxjxhqj2"; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { bzip2 expat libosmium + lz4 protozero zlib ]; @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library"; homepage = "https://osmcode.org/osmium-tool/"; - license = with licenses; [ gpl3 mit bsd3 ]; + license = with licenses; [ gpl3Plus mit bsd3 ]; maintainers = with maintainers; [ das-g ]; }; } From 0573b54e29854cd133d9ab71a0533dc9d22d6403 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 8 Jan 2021 18:53:33 -0300 Subject: [PATCH 22/37] nixos/opentabletdriver: add thiagokokada as maintainer --- nixos/modules/hardware/opentabletdriver.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/hardware/opentabletdriver.nix b/nixos/modules/hardware/opentabletdriver.nix index 0f34d903f68..295e23e6164 100644 --- a/nixos/modules/hardware/opentabletdriver.nix +++ b/nixos/modules/hardware/opentabletdriver.nix @@ -5,6 +5,8 @@ let cfg = config.hardware.opentabletdriver; in { + meta.maintainers = with lib.maintainers; [ thiagokokada ]; + options = { hardware.opentabletdriver = { enable = mkOption { From dff4009b3563298c046caf80908da5899df756e1 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 16 Dec 2020 23:18:13 +0800 Subject: [PATCH 23/37] libsurvive: add expipiplus1 to maintainers --- pkgs/development/libraries/libsurvive/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 7f326112b2f..11a5cdcf4e9 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; license = licenses.mit; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ expipiplus1 prusnak ]; platforms = platforms.linux; }; } From b08b22d85f17f7eae74f3b3637c479771056d78b Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 16 Dec 2020 13:30:41 +0800 Subject: [PATCH 24/37] xrgears: init at unstable-2020-04-15 --- .../applications/graphics/xrgears/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/graphics/xrgears/default.nix diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/applications/graphics/xrgears/default.nix new file mode 100644 index 00000000000..33aa3ae3575 --- /dev/null +++ b/pkgs/applications/graphics/xrgears/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitLab +, glm +, glslang +, meson +, ninja +, openxr-loader +, pkg-config +, vulkan-headers +, vulkan-loader +, xxd +}: + +stdenv.mkDerivation rec { + pname = "xrgears"; + version = "unstable-2020-04-15"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "monado"; + repo = "demos/xrgears"; + rev = "d0bee35fbf8f181e8313f1ead13d88c4fb85c154"; + sha256 = "1k0k8dkclyiav99kf0933kyd2ymz3hs1p0ap2wbciq9s62jgz29i"; + }; + + nativeBuildInputs = [ + glslang + meson + ninja + pkg-config + xxd + ]; + + buildInputs = [ + glm + openxr-loader + vulkan-headers + vulkan-loader + ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears"; + description = "An OpenXR example using Vulkan for rendering"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ expipiplus1 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 620a4bbba43..7861a1f9c99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25553,6 +25553,8 @@ in xrestop = callPackage ../tools/X11/xrestop { }; + xrgears = callPackage ../applications/graphics/xrgears { }; + xsd = callPackage ../development/libraries/xsd { }; xscope = callPackage ../applications/misc/xscope { }; From 42743be017ebf846435789f24877304de396d954 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 8 Jan 2021 22:55:45 +0100 Subject: [PATCH 25/37] monado: Add serviceSupport option This controls XRT_FEATURE_SERVICE. See https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled for more info. --- pkgs/applications/graphics/monado/default.nix | 37 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 61343b3b1b4..7502ab69c32 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -1,23 +1,29 @@ { stdenv , fetchFromGitLab , fetchpatch +, writeText , cmake +, doxygen +, glslang , pkg-config , python3 , SDL2 , dbus , eigen , ffmpeg -, glslang +, gst-plugins-base +, gstreamer , hidapi , libGL , libXau , libXdmcp , libXrandr , libffi +, libjpeg # , librealsense , libsurvive , libusb1 +, libuv , libuvc , libv4l , libxcb @@ -29,6 +35,11 @@ , wayland , wayland-protocols , zlib +# Set as 'false' to build monado without service support, i.e. allow VR +# applications linking against libopenxr_monado.so to use OpenXR standalone +# instead of via the monado-service program. For more information see: +# https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled +, serviceSupport ? true }: stdenv.mkDerivation rec { @@ -51,23 +62,36 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkg-config python3 ]; + nativeBuildInputs = [ + cmake + doxygen + glslang + pkg-config + python3 + ]; + + cmakeFlags = [ + "-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}" + ]; buildInputs = [ SDL2 dbus eigen ffmpeg - glslang + gst-plugins-base + gstreamer hidapi libGL libXau libXdmcp libXrandr + libjpeg libffi # librealsense.dev - see below libsurvive libusb1 + libuv libuvc libv4l libxcb @@ -91,11 +115,16 @@ stdenv.mkDerivation rec { # for some reason cmake is trying to use ${librealsense}/include # instead of ${librealsense.dev}/include as an include directory + # Help openxr-loader find this runtime + setupHook = writeText "setup-hook" '' + export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} + ''; + meta = with stdenv.lib; { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; license = licenses.boost; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ expipiplus1 prusnak ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7861a1f9c99..1225baa0c6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2492,7 +2492,9 @@ in monetdb = callPackage ../servers/sql/monetdb { }; - monado = callPackage ../applications/graphics/monado {}; + monado = callPackage ../applications/graphics/monado { + inherit (gst_all_1) gstreamer gst-plugins-base; + }; mons = callPackage ../tools/misc/mons {}; From 0383c9c32ddb70140ff1ed57db33f7eecb7dad8d Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 9 Jan 2021 00:06:25 -0500 Subject: [PATCH 26/37] python3Packages.aiostream: init at 0.4.1 --- .../python-modules/aiostream/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/aiostream/default.nix diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix new file mode 100644 index 00000000000..a48e2ae0240 --- /dev/null +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pytestcov +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "aiostream"; + version = "0.4.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "vxgmichel"; + repo = pname; + rev = "v${version}"; + sha256 = "1wwnjrzkd61k3arxzk7yhg7cc1099bcwr5kz5n91ai6ma5ln139s"; + }; + + checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; + + meta = with lib; { + description = "Generator-based operators for asynchronous iteration"; + homepage = "https://aiostream.readthedocs.io"; + license = licenses.gpl3Only; + maintainers = [ maintainers.rmcgibbo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f38e64a29a8..610e27331cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -265,6 +265,8 @@ in { aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + aiostream = callPackage ../development/python-modules/aiostream { }; + aiounifi = callPackage ../development/python-modules/aiounifi { }; aiounittest = callPackage ../development/python-modules/aiounittest { }; From ca9e2a3c3bc8313071cccb9726da5a956417fb75 Mon Sep 17 00:00:00 2001 From: Matej Urbas Date: Sat, 9 Jan 2021 10:04:13 +0000 Subject: [PATCH 27/37] pkgs.common-updater-scripts: update-source-version name singular --- pkgs/common-updater/scripts/update-source-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 181561242fc..90543a9cfc6 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -scriptName=update-source-versions # do not use the .wrapped name +scriptName=update-source-version # do not use the .wrapped name die() { echo "$scriptName: error: $1" >&2 From b78ec601578438f9b149904983ad07fe1df94234 Mon Sep 17 00:00:00 2001 From: Moritz Schaefer Date: Thu, 7 Jan 2021 14:24:52 +0100 Subject: [PATCH 28/37] sparkleshare: add missing 'bash' dependency Sparkleshare requires 'sh' to be in its PATH, or push-operations fail. Its PATH consists of a single entry, which is configured in the postInstall phase. The bash-derivative includes 'sh', and adding it to the dependencies resolves the issue. --- pkgs/applications/version-management/sparkleshare/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index 6f639ecd77f..a7d1f86652c 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -1,5 +1,6 @@ { appindicator-sharp, + bash, coreutils, fetchFromGitHub, git, @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { --set PATH ${symlinkJoin { name = "mono-path"; paths = [ + bash coreutils git git-lfs From b3351951b0fd31576f55fad860651a65d05e8828 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 2 Jan 2021 10:39:15 +0100 Subject: [PATCH 29/37] =?UTF-8?q?ocamlPackages.camlp5:=207.13=20=E2=86=92?= =?UTF-8?q?=207.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ocaml/camlp5/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 5fb76a52601..6d68a320a91 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchzip, ocaml }: +{ stdenv, fetchzip, ocaml, perl }: + +if stdenv.lib.versionOlder ocaml.version "4.02" +then throw "camlp5 is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation { - name = "camlp5-7.13"; + name = "camlp5-7.14"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel713.tar.gz"; - sha256 = "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp"; + url = "https://github.com/camlp5/camlp5/archive/rel714.tar.gz"; + sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; }; - buildInputs = [ ocaml ]; + buildInputs = [ ocaml perl ]; prefixKey = "-prefix "; - preConfigure = "configureFlagsArray=(--strict" + - " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; + preConfigure = '' + configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib) + patchShebangs ./config/find_stuffversion.pl + ''; buildFlags = [ "world.opt" ]; From a87576371f8c1fc3b6d3903d70d62eee5cf07967 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 9 Jan 2021 14:33:44 +0100 Subject: [PATCH 30/37] jc: 1.14.0 -> 1.14.1 Now running tests with pytestCheckHook because jc generates wrong unix timestamps in test_last_F_ubuntu_20_4 test_last_wF_centos_7_7 otherwise. --- pkgs/development/python-modules/jc/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index ba96f8ccfb9..0bccd38f152 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -5,22 +5,25 @@ , xmltodict , pygments , isPy27 +, pytestCheckHook }: buildPythonPackage rec { pname = "jc"; - version = "1.14.0"; + version = "1.14.1"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "0js3mqp6xxg45qsz8wnyyqf4m0wj1kz67bkmvirhdy7s01zhd5hq"; + sha256 = "1vzzz7dlg6apxhcl0qkfdpp2v9d0q6jyafpfmklkcbjs31zvwcsw"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; + checkInputs = [ pytestCheckHook ]; + meta = with stdenv.lib; { description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output"; homepage = "https://github.com/kellyjonbrazil/jc"; From a91459c92931ed30c08060961cdd809a7fc3da6e Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 Nov 2020 00:09:21 +0200 Subject: [PATCH 31/37] inxi: add pciutils (optional dependency) --- pkgs/tools/system/inxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 14b14fa9ffd..5efdc538174 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -3,7 +3,7 @@ , withRecommends ? false # Install (almost) all recommended tools (see --recommends) , withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode , file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools -, binutils, tree, upower +, binutils, tree, upower, pciutils , withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg }: @@ -12,7 +12,7 @@ let "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'"; recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod - lm_sensors smartmontools binutils tree upower + lm_sensors smartmontools binutils tree upower pciutils ]; recommendedDisplayInformationPrograms = lib.optionals withRecommendedDisplayInformationPrograms From 84840c81e3dde413450d199f8f6eb22d5d8c95e0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 9 Jan 2021 14:51:57 +0100 Subject: [PATCH 32/37] chromiumDev: 89.0.4356.6 -> 89.0.4381.6 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 660682e17a7..8baa7cc7b4f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "89.0.4356.6", - "sha256": "1jq0wbaaz07kz2190rq3vl2b5spx3qfda4al9ygkm8man817d2nr", - "sha256bin64": "0dgvp2my328s4ah0hmp1hg1c3x21gkrz9mjvbfs54r2pjb7y5sbl", + "version": "89.0.4381.6", + "sha256": "031w24qf5cn9y30pgh736g67p6c10kwpflhvxa24h0v99gqnah2i", + "sha256bin64": "1fssdxllq2ncpy8s7ykbq33456hfjlgj1m5147wbg2c5k36rj78s", "deps": { "gn": { - "version": "2020-11-05", + "version": "2020-12-22", "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" + "rev": "0d67e272bdb8145f87d238bc0b2cb8bf80ccec90", + "sha256": "07mrfl9hbjldbgidwwhr482a0s0ppqzwa5j7v5nbqxj18j55iril" } } }, From 016ebc0604168f9840b84bfcc339620d7a48ffab Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 9 Jan 2021 07:17:54 -0800 Subject: [PATCH 33/37] alacritty: 0.7.0 -> 0.7.1 https://github.com/alacritty/alacritty/releases/tag/v0.7.1 https://github.com/alacritty/alacritty/compare/v0.7.0...v0.7.1 --- pkgs/applications/terminal-emulators/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 2013e46eb5d..13a67c6236f 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "nN/OFzuGjD6psByl7xswO0mYp13r7rF80ziMr3GGfDQ="; + sha256 = "8alCFtr+3aJsqQ2Ra8u5/SRHfDvMq2kRvRCKo/zwMK0="; }; - cargoSha256 = "VUFPzJOGV8N1Q0hUyIPuf6e+eGxezkrJDJkzxZip5y0="; + cargoSha256 = "kqRlxieChnhWtYYf67gi+2bncIzO56xpnv2uLjcINVM="; nativeBuildInputs = [ cmake From 5112d49007b3de545fe7e558177a4a5cb1a348ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 9 Jan 2021 17:02:55 +0100 Subject: [PATCH 34/37] nix-update: 0.3.1 -> 0.3.2 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 4d9365677ab..3c420a55652 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-0icQi1HClLMVDOugKckF2J8tEDeMfmW5kgCItJ9n2eo="; + sha256 = "1ykxr0yah7zl06igm7wiji9zx3y0xpjc37hbfhn6gnir6ssa0kqp"; }; makeWrapperArgs = [ From aaf9cf6e43aa5e91d4c8ea28fad62814673e6419 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Fri, 8 Jan 2021 17:51:18 +0100 Subject: [PATCH 35/37] sauerbraten: 2020-12-04 -> 2020-12-27 Bumped version because 2020-12-04 is not available on mirrors. Tested server and client on NixOS x86_64 with sway/wayland. Played some rounds with old and new maps on public servers. --- pkgs/games/sauerbraten/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index e1f482cc7d4..277c195d442 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "sauerbraten"; - version = "2020-12-04"; + version = "2020-12-27"; src = fetchzip { url = "mirror://sourceforge/sauerbraten/sauerbraten_${builtins.replaceStrings [ "-" ] [ "_" ] version}_linux.tar.bz2"; - sha256 = "1hknwpnvsakz6s7l7j1r5aqmgrzp4wcbn8yg8nxmvsddbhxdj1kc"; + sha256 = "0llknzj23vx6f3y452by9c7wlhzclyq4bqi22qd52m3l916z2mn5"; }; nativeBuildInputs = [ From 288fb1f2ba2d7385c8574fe3ff5523612c5f8656 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 9 Jan 2021 17:51:41 +0100 Subject: [PATCH 36/37] gitRepo: 2.11 -> 2.11.1 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 56e4f30d927..e6f6e69fcaa 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.11"; + version = "2.11.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-eb35yNsE0F+xPA1j7Czag1aOZO4cr6OeRsBlCrQwCRk="; + sha256 = "sha256-6XsjxTYmjr/3smwwS7c+Mq1sqfgKAhWzHOY8TWlIKHU="; }; patches = [ ./import-ssl-module.patch ]; From 7d8351f4d736a1e42b82e32ef97acdfe8b41fb22 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 1 Jan 2021 19:46:25 +0100 Subject: [PATCH 37/37] libplacebo: 2.72.2 -> 3.104.0 --- pkgs/applications/video/mpv/default.nix | 10 +++++++++- pkgs/development/libraries/libplacebo/default.nix | 8 ++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 2b9605aa3c2..02135fe52ed 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchFromGitHub +{ config, stdenv, fetchFromGitHub, fetchpatch , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null @@ -104,6 +104,14 @@ in stdenv.mkDerivation rec { sha256 = "sha256-3l32qQBpvWVjbLp5CZtO039oDQeH7C/cNAKtJxrzlRk="; }; + patches = [ + # To make mpv build with libplacebo 3.104.0: + (fetchpatch { # vo_gpu: placebo: update for upstream API changes + url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch"; + sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx"; + }) + ]; + postPatch = '' patchShebangs ./TOOLS/ ''; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 7d120f604d8..4aa92921898 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -11,11 +11,13 @@ , glslang , lcms2 , epoxy +, libGL +, xorg }: stdenv.mkDerivation rec { pname = "libplacebo"; - version = "2.72.2"; + version = "3.104.0"; patches = [ ./glsl-import.patch @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "1ijqpx1pagc6qg63ynqrinvckwc8aaw1i0lx48gg5szwk8afib4i"; + sha256 = "0p5mx8ch7cp7b54yrkl4fs8bcvqma1h461gx6ps4kagn4dsx8asb"; }; nativeBuildInputs = [ @@ -43,6 +45,8 @@ stdenv.mkDerivation rec { glslang lcms2 epoxy + libGL + xorg.libX11 ]; mesonFlags = [