From 5564cb9c6b19d68037dad229170f5fa0665ad80e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 14:11:53 +0000 Subject: [PATCH 01/13] wordpress: 5.7.2 -> 5.8 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 7dbf4054ef27..41eb08ae75bf 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.7.2"; + version = "5.8"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-640FIIFZRp0L48szn3tqFQo59QP69nnCVQKEM/UTEhk="; + sha256 = "sha256-0pgTq1U2Exj1GfKo+mYxEmoKj5GsMPYstgAsEIV36H8="; }; installPhase = '' From 5280cdee8d6c3ec3155150c703ccd50d038b2cdb Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Aug 2021 17:25:19 -0700 Subject: [PATCH 02/13] linuxPackages.zfs: fix m4 script when not using GCC --- pkgs/os-specific/linux/zfs/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 517e6036e780..d99b72c65b12 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -47,6 +47,11 @@ let postPatch = optionalString buildKernel '' patchShebangs scripts + + # https://github.com/openzfs/zfs/issues/10107 + substituteInPlace ./config/kernel.m4 \ + --replace "make modules" "make CC=$CC modules" + # The arrays must remain the same length, so we repeat a flag that is # already part of the command and therefore has no effect. substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \ From 7448cab54bba2b432d6e4115990a3fc6774f47db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Tue, 31 Aug 2021 15:48:27 +0200 Subject: [PATCH 03/13] python3Packages.spectral-cube: add missing dependencies Fixes #136294. --- pkgs/development/python-modules/spectral-cube/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 329b225b5769..5a022f467087 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -6,6 +6,8 @@ , joblib , astropy , radio_beam +, six +, dask , pytestCheckHook , pytest-astropy , astropy-helpers @@ -31,7 +33,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ astropy-helpers ]; - propagatedBuildInputs = [ astropy radio_beam joblib ]; + propagatedBuildInputs = [ astropy radio_beam joblib six dask ]; checkInputs = [ pytestCheckHook aplpy pytest-astropy ]; meta = { From 84774060184b49e883bf0e1da13a6ce89640ca57 Mon Sep 17 00:00:00 2001 From: Gregory Anders Date: Tue, 31 Aug 2021 11:28:57 -0600 Subject: [PATCH 04/13] neovim: allow extra Lua packages --- pkgs/applications/editors/neovim/default.nix | 2 ++ pkgs/applications/editors/neovim/tests.nix | 11 +++++++++++ pkgs/applications/editors/neovim/utils.nix | 11 +++++++++++ 3 files changed, 24 insertions(+) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index f36009afc69a..9e5901cb9416 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -50,6 +50,8 @@ in dontFixCmake = true; + inherit lua; + buildInputs = [ gperf libtermkey diff --git a/pkgs/applications/editors/neovim/tests.nix b/pkgs/applications/editors/neovim/tests.nix index f9d0d659b73c..ff6ac6e910a6 100644 --- a/pkgs/applications/editors/neovim/tests.nix +++ b/pkgs/applications/editors/neovim/tests.nix @@ -132,4 +132,15 @@ rec { extraName = "-pathogen"; configure.pathogen.pluginNames = [ "vim-nix" ]; }; + + nvimWithLuaPackages = wrapNeovim2 "with-lua-packages" (makeNeovimConfig { + extraLuaPackages = ps: [ps.mpack]; + customRC = '' + lua require("mpack") + ''; + }); + + nvim_with_lua_packages = runTest nvimWithLuaPackages '' + ${nvimWithLuaPackages}/bin/nvim -n -i NONE --noplugin -es + ''; }) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index c753d2cca2c1..837c9a79ffe8 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -28,6 +28,8 @@ let , extraPython3Packages ? (_: [ ]) , withNodeJs ? false , withRuby ? true + /* the function you would have passed to lua.withPackages */ + , extraLuaPackages ? (_: [ ]) # expects a list of plugin configuration # expects { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; } @@ -76,6 +78,8 @@ let ++ (extraPython3Packages ps) ++ (lib.concatMap (f: f ps) pluginPython3Packages)); + lua = neovim-unwrapped.lua; + luaEnv = lua.withPackages(ps: extraLuaPackages ps); # Mapping a boolean argument to a key that tells us whether to add or not to # add to nvim's 'embedded rc' this: @@ -110,6 +114,9 @@ let "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" ] ++ lib.optionals (binPath != "") [ "--suffix" "PATH" ":" binPath + ] ++ lib.optionals (luaEnv != null) [ + "--prefix" "LUA_PATH" ";" "${luaEnv}/share/lua/${lua.luaversion}/?.lua" + "--prefix" "LUA_CPATH" ";" "${luaEnv}/lib/lua/${lua.luaversion}/?.so" ]; @@ -123,6 +130,7 @@ let inherit neovimRcContent; inherit manifestRc; inherit python3Env; + inherit luaEnv; inherit withNodeJs; } // lib.optionalAttrs withRuby { inherit rubyEnv; @@ -143,6 +151,8 @@ let , extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ , withPython3 ? true, extraPython3Packages ? (_: []) + /* the function you would have passed to lua.withPackages */ + , extraLuaPackages ? (_: []) , withNodeJs ? false , withRuby ? true , vimAlias ? false @@ -159,6 +169,7 @@ let res = makeNeovimConfig { inherit withPython3; extraPython3Packages = compatFun extraPython3Packages; + inherit extraLuaPackages; inherit withNodeJs withRuby viAlias vimAlias; inherit configure; inherit extraName; From 080b1486041d214754cf25f4f1e94e05cba36184 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 1 Sep 2021 15:08:14 +0200 Subject: [PATCH 05/13] palemoon: 29.4.0.1 -> 29.4.0.2 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 70adae5d09a5..15da60ad3f82 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -52,14 +52,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.0.1"; + version = "29.4.0.2"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1qzsryhlxvh9xx9j7s4dmxv575z13wdx8iigj8r0pdmg5kx6rpkb"; + sha256 = "086f517xkk4smx57klyyvx4m3g6r5f1667w990zhpapbh997hfri"; fetchSubmodules = true; }; From 9e507a93148613753b87bf00b39d7bf218355170 Mon Sep 17 00:00:00 2001 From: p3psi <43925055+p3psi-boo@users.noreply.github.com> Date: Sun, 22 Aug 2021 03:54:23 +0800 Subject: [PATCH 06/13] clfswm: support custom package Fix example Remove example --- .../services/x11/window-managers/clfswm.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix index 171660c53ac3..5015852db69f 100644 --- a/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/nixos/modules/services/x11/window-managers/clfswm.nix @@ -8,17 +8,27 @@ in { options = { - services.xserver.windowManager.clfswm.enable = mkEnableOption "clfswm"; + services.xserver.windowManager.clfswm = { + enable = mkEnableOption "clfswm"; + package = mkOption { + type = types.package; + default = pkgs.lispPackages.clfswm; + defaultText = "pkgs.lispPackages.clfswm"; + description = '' + clfswm package to use. + ''; + }; + }; }; config = mkIf cfg.enable { services.xserver.windowManager.session = singleton { name = "clfswm"; start = '' - ${pkgs.lispPackages.clfswm}/bin/clfswm & + ${cfg.package}/bin/clfswm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.lispPackages.clfswm ]; + environment.systemPackages = [ cfg.package ]; }; } From 1ea4c8dc31aabdd20b77a3649573cc4cbab999f2 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Wed, 1 Sep 2021 13:35:02 +0000 Subject: [PATCH 07/13] exploitdb: 2021-08-28 -> 2021-09-01 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 3cff9a6d64c4..8f8f174a5e08 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-08-28"; + version = "2021-09-01"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-eLbRtsZYRCPh0FDecxjAt4P0mUZJaZKg6kg5/SSYP1A="; + sha256 = "sha256-uWKZTtBp1HF7WbQVoZMxNQ2osvw3+RARLAJTwxqRErA="; }; installPhase = '' From 1bf2bb240d3566bfeda1805a02a3c85eca27c557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 May 2021 20:52:52 +0200 Subject: [PATCH 08/13] pidgin: add passthru.makePluginPath --- .../networking/instant-messengers/pidgin/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index b5bdef03db73..0f1acc1c7cce 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -87,6 +87,10 @@ let unwrapped = stdenv.mkDerivation rec { done ''; + passthru = { + makePluginPath = lib.makeSearchPathOutput "lib" "lib/purple-${majorVersion}"; + }; + meta = with lib; { description = "Multi-protocol instant messaging client"; homepage = "http://pidgin.im"; From ba0b032ba86bee76620735b8ff187c846fabf832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 May 2021 19:06:48 +0200 Subject: [PATCH 09/13] chatty: init at 0.3.2 Co-authored-by: Jordi Masip --- .../instant-messengers/chatty/default.nix | 79 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/chatty/default.nix diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix new file mode 100644 index 000000000000..e24f5eaf8682 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchFromGitLab +, appstream-glib +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +, evolution-data-server +, feedbackd +, gtk3 +, json-glib +, libgcrypt +, libhandy +, libphonenumber +, olm +, pidgin +, protobuf +, sqlite +, plugins ? [ ] +}: + +stdenv.mkDerivation rec { + pname = "chatty"; + version = "0.3.2"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = "chatty"; + rev = "v${version}"; + sha256 = "sha256-/l8hysfBmXLbs2COIVjdr2JC1qX/c66DqOm2Gyqb9s8="; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + evolution-data-server + feedbackd + gtk3 + json-glib + libgcrypt + libhandy + libphonenumber + olm + pidgin + protobuf + sqlite + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PURPLE_PLUGIN_PATH : ${pidgin.makePluginPath plugins} + ${lib.concatMapStringsSep " " (p: p.wrapArgs or "") plugins} + ) + ''; + + meta = with lib; { + description = "XMPP and SMS messaging via libpurple and ModemManager"; + homepage = "https://source.puri.sm/Librem5/chatty"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda tomfitzhenry ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d67c5102d94e..b0858f8341ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23728,6 +23728,8 @@ with pkgs; inherit (python3Packages) python wrapPython pygments markdown; }; + chatty = callPackage ../applications/networking/instant-messengers/chatty { }; + chirp = callPackage ../applications/radio/chirp { }; browsh = callPackage ../applications/networking/browsers/browsh { }; From d37ed0e5ada27a5712508b81e4cf0b63759bcaae Mon Sep 17 00:00:00 2001 From: Gregory Anders Date: Wed, 1 Sep 2021 12:21:43 -0600 Subject: [PATCH 10/13] neovim: remove redundant -n in test The -es flag already implies -n (no swapfile). --- pkgs/applications/editors/neovim/tests.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/tests.nix b/pkgs/applications/editors/neovim/tests.nix index ff6ac6e910a6..5f4cda714a67 100644 --- a/pkgs/applications/editors/neovim/tests.nix +++ b/pkgs/applications/editors/neovim/tests.nix @@ -141,6 +141,6 @@ rec { }); nvim_with_lua_packages = runTest nvimWithLuaPackages '' - ${nvimWithLuaPackages}/bin/nvim -n -i NONE --noplugin -es + ${nvimWithLuaPackages}/bin/nvim -i NONE --noplugin -es ''; }) From 0588980396372a33c4a5ba83ef7432fbff50f3aa Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 13 Aug 2021 10:29:12 +0200 Subject: [PATCH 11/13] yarn-bash-completion: init at 0.17.0 --- pkgs/shells/bash/yarn-completion/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/shells/bash/yarn-completion/default.nix diff --git a/pkgs/shells/bash/yarn-completion/default.nix b/pkgs/shells/bash/yarn-completion/default.nix new file mode 100644 index 000000000000..fabfc0a1ce23 --- /dev/null +++ b/pkgs/shells/bash/yarn-completion/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "yarn-bash-completion"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "dsifford"; + repo = "yarn-completion"; + rev = "v${version}"; + sha256 = "0xflbrbwskjqv3knvc8jqygpvfxh5ak66q7w22d1ng8gwrfqzcng"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + + installShellCompletion --cmd yarn ./yarn-completion.bash + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/dsifford/yarn-completion/"; + description = "Bash completion for Yarn"; + license = licenses.mit; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d67c5102d94e..d6734ea7e7be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10611,6 +10611,8 @@ with pkgs; nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { }; + yarn-bash-completion = callPackage ../shells/bash/yarn-completion { }; + undistract-me = callPackage ../shells/bash/undistract-me { }; dash = callPackage ../shells/dash { }; From d4c75580c18c78bdf81810dc73aab76e10754190 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 1 Sep 2021 14:35:31 +0200 Subject: [PATCH 12/13] mosquitto: 2.0.11 -> 2.0.12 https://github.com/eclipse/mosquitto/blob/v2.0.12/ChangeLog.txt --- pkgs/servers/mqtt/mosquitto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 984d21155989..67200f5515a9 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "eclipse"; repo = pname; rev = "v${version}"; - sha256 = "1i0kkqhjxqahkhsl60s46zlywa87jakv7h4sr3fhi1v53vwpb9mg"; + sha256 = "0bn6vpk6gdxrnm3aw3j2g0ny6cx2arv8pmv4x8302pr6qcrz57s6"; }; patches = lib.optionals stdenv.isDarwin [ From 05a5144fa9032018b9aac3a5aaf9c368b8347a4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Aug 2021 23:14:43 +0000 Subject: [PATCH 13/13] build(deps): bump devmasx/merge-branch from 1.3.1 to 1.4.0 Bumps [devmasx/merge-branch](https://github.com/devmasx/merge-branch) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/devmasx/merge-branch/releases) - [Changelog](https://github.com/devmasx/merge-branch/blob/master/CHANGELOG.md) - [Commits](https://github.com/devmasx/merge-branch/compare/v1.3.1...1.4.0) --- updated-dependencies: - dependency-name: devmasx/merge-branch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/periodic-merge-24h.yml | 2 +- .github/workflows/periodic-merge-6h.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 341656d93925..81c5694f43d8 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v2 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} - uses: devmasx/merge-branch@v1.3.1 + uses: devmasx/merge-branch@1.4.0 with: type: now from_branch: ${{ matrix.pairs.from }} diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index 8ec4da1d8773..68fde857f888 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v2 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} - uses: devmasx/merge-branch@v1.3.1 + uses: devmasx/merge-branch@1.4.0 with: type: now from_branch: ${{ matrix.pairs.from }}