From dbb20ed05d60b74cd7656164b5bf419cfb6104fd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 28 May 2021 04:20:00 +0000 Subject: ncspot: 0.7.1 -> 0.7.2 https://github.com/hrkfdn/ncspot/releases/tag/v0.7.2 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index d914b9963fc..416bdfb90d6 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "1qhdhybbgnn7ky9qdxwi07flwzjagp22qmlccbz1z3lhznm9a971"; + sha256 = "0ww7ipyvcdphbkzjpvdqs1s3bqk3rj3jdy1n3bnk76csw9vgn2zi"; }; - cargoSha256 = "1kv37ib0klykmjabm1qyz55frs7djkx225alj4rk4a92xq9m8i9v"; + cargoSha256 = "1mrjp5p3iryxzgg6ca9zjwm8n6w0ljs108ll0wkwgfih6rip7ba4"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; -- cgit 1.4.1 From dc3054b4ae7763758392c3fa4c21142905c7b4cd Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 4 Mar 2021 21:12:42 +0100 Subject: paperwork: 2.0.2 -> 2.0.3 and compile user manual --- .../office/paperwork/paperwork-gtk.nix | 44 ++++++++++++++++++---- pkgs/applications/office/paperwork/src.nix | 14 ++++++- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index e6196839191..8f1278d9926 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -13,10 +13,24 @@ , gettext , gobject-introspection , gdk-pixbuf +, texlive +, imagemagick +, perlPackages }: +let + documentation_deps = [ + (texlive.combine { + inherit (texlive) scheme-small wrapfig was; + }) + xvfb-run + imagemagick + perlPackages.Po4a + ]; +in + python3Packages.buildPythonApplication rec { - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; pname = "paperwork"; sourceRoot = "source/paperwork-gtk"; @@ -52,9 +66,16 @@ python3Packages.buildPythonApplication rec { for i in $site/data/paperwork_*.png; do ln -s $i $site/icon/out; done + + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share + # build the user manual + PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_documents} make data + for i in src/paperwork_gtk/model/help/out/*.pdf; do + install -Dt $site/model/help/out $i + done ''; - checkInputs = [ xvfb-run dbus.daemon ]; + checkInputs = [ dbus.daemon ]; nativeBuildInputs = [ wrapGAppsHook @@ -62,7 +83,7 @@ python3Packages.buildPythonApplication rec { (lib.getBin gettext) which gdk-pixbuf # for the setup hook - ]; + ] ++ documentation_deps; buildInputs = [ gnome.adwaita-icon-theme @@ -78,13 +99,20 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - # A few parts of chkdeps need to have a display and a dbus session, so we not - # only need to run a virtual X server + dbus but also have a large enough - # resolution, because the Cairo test tries to draw a 200x200 window. - preCheck = '' + checkPhase = '' + runHook preCheck + + # A few parts of chkdeps need to have a display and a dbus session, so we not + # only need to run a virtual X server + dbus but also have a large enough + # resolution, because the Cairo test tries to draw a 200x200 window. xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ $out/bin/paperwork-gtk chkdeps + + # content of make test, without the dep on make install + python -m unittest discover --verbose -s tests + + runHook postCheck ''; propagatedBuildInputs = with python3Packages; [ @@ -98,6 +126,8 @@ python3Packages.buildPythonApplication rec { setuptools ]; + disallowedRequisites = documentation_deps; + meta = { description = "A personal document manager for scanned documents"; homepage = "https://openpaper.work/"; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 45c05cc4962..72293ef3903 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,12 +1,22 @@ {fetchFromGitLab}: rec { - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly"; + sha256 = "02c2ysca75j59v87n1axqfncvs167kmdr40m0f05asdh2akwrbi9"; }; + sample_documents = fetchFromGitLab { + domain = "gitlab.gnome.org"; + repo = "paperwork-test-documents"; + group = "World"; + owner = "OpenPaperwork"; + # https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/blob/master/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh see TEST_DOCS_TAG + rev = "1.0"; + sha256 = "155nhw2jmlgfi6c3wm241vrr3yma6lw85k9lxn844z96kyi7wbpr"; + }; + } -- cgit 1.4.1 From d491dd73134f1adf7916665217093cf4a30ac314 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 02:41:42 +0000 Subject: coredns: 1.8.3 -> 1.8.4 --- pkgs/servers/dns/coredns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 188c3f77cb6..e0bfc3a6225 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-aE+kw854/wjFJqiRC/1gLzRpaVa6EPJPJaKqXtFM+Sw="; + sha256 = "sha256-mPZvREBwSyy7dhVl2mJt58T09a0CYaMfJn7GEvfuupI="; }; - vendorSha256 = "sha256-1+WgBsknyPcZhvQLffhlWBH1o0pYTFoOG5BviUJYxyA="; + vendorSha256 = "sha256-DTw7SVZGl7QdlSpqWx11bjeNUwfb4VlwsGxqPVz6vhI="; doCheck = false; -- cgit 1.4.1 From 4c471a73a05ecad80998a91697be89b7ab1db118 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 29 May 2021 13:36:07 +0000 Subject: fend: 0.1.14 -> 0.1.16 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 683556fec6c..ceaee9746af 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.14"; + version = "0.1.16"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zKjYUkkm15YRF0YFJKi2A6twvmHuEyxdWcNs37r2dJg="; + sha256 = "sha256-ITS2wE4vwp0W/nlTyX55cY5E95VIwR46JBzF0pD/xsE="; }; - cargoSha256 = "sha256-rCJn1dDSwKMmwF7m7n+Lf/7+sLd964r8EU7/VdeD9rI="; + cargoSha256 = "sha256-YqOc/B+ZP1i9xJLrOguQ6fwQr6SV0qvQ3fWwguY2S0I="; doInstallCheck = true; -- cgit 1.4.1 From f7589d53140cdc2076d9720bf62b8d87dbebefb9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 May 2021 16:29:24 +0200 Subject: python3Packages.watchdog: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/watchdog/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 9d96977088b..441630fe6f6 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -5,17 +5,18 @@ , argh , pathtools , pyyaml +, pytest-timeout , pytestCheckHook , CoreServices }: buildPythonPackage rec { pname = "watchdog"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KJREC06pWm70xdFS3u2+JwyuRgkmgnELcCigTWppgPY="; + sha256 = "sha256-AjfbTZAkhZvqJ9DvtZ/nXu8pCDP9mIuOrXqHmwMIwts="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; @@ -27,6 +28,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-timeout pytestCheckHook ]; -- cgit 1.4.1 From c73371e04b97493a34ac24ca09abc6a726d07697 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 29 May 2021 16:36:39 +0200 Subject: neovim: fix neovim.override (#124785) * neovim: temporary revert to unbreak user configs Newly introduced "plugins" parameter is disabled until we get a better testing infrastructure to minimize breaking changes. --- pkgs/applications/editors/neovim/utils.nix | 17 +++-------------- pkgs/test/vim/default.nix | 9 +++++++++ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index a7d8f00c664..ae814fa9b4e 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -54,15 +54,7 @@ let configurePatched = configure // { - packages.nix = { - start = lib.filter (f: f != null) - (map (x: if x.optional == false then x.plugin else null) - pluginsNormalized); - opt = lib.filter (f: f != null) - (map (x: if x.optional == true then x.plugin else null) - pluginsNormalized); - }; - customRC = pluginRc + customRC; + customRC = pluginRc + customRC + (configure.customRC or ""); }; # A function to get the configuration string (if any) from an element of 'plugins' @@ -173,11 +165,8 @@ let assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages."; wrapNeovimUnstable neovim (res // { - wrapperArgs = lib.escapeShellArgs ( - res.wrapperArgs ++ lib.optionals (configure != {}) [ - "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" - ]) + " " + extraMakeWrapperArgs - ; + wrapperArgs = lib.escapeShellArgs res.wrapperArgs + extraMakeWrapperArgs; + wrapRc = (configure != {}); }); in { diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index c75836aa9a8..c809940fc4c 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -36,6 +36,15 @@ in ################## nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix; + nvim_via_override = neovim.override { + configure = { + packages.foo.start = [ vimPlugins.ale ]; + customRC = '' + :help ale + ''; + }; + }; + ### vim tests ################## vim_with_vim2nix = vim_configurable.customize { -- cgit 1.4.1