From 2060a251fe29bc7d3015872880ad48dce6313706 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 11 Jul 2021 12:00:00 +0000 Subject: [PATCH 01/20] duplicity: 0.8.17 -> 0.8.20 --- pkgs/tools/backup/duplicity/default.nix | 33 +++++++++++--- .../backup/duplicity/gnutar-in-test.patch | 10 +++-- .../linux-disable-timezone-test.patch | 14 ++++-- .../use-installed-scripts-in-test.patch | 44 ++++++++++++------- 4 files changed, 72 insertions(+), 29 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 24e1a2954ed..74b80a51524 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,5 +1,6 @@ { lib, stdenv -, fetchurl +, fetchFromGitLab +, fetchpatch , pythonPackages , librsync , ncftp @@ -17,11 +18,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.17"; + version = "0.8.20"; - src = fetchurl { - url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "114rwkf9b3h4fcagrx013sb7krc4hafbwl9gawjph2wd9pkv2wx2"; + src = fetchFromGitLab { + owner = "duplicity"; + repo = "duplicity"; + rev = "rel.${version}"; + sha256 = "13ghra0myq6h6yx8qli55bh8dg91nf1hpd8l7d7xamgrw6b188sm"; }; patches = [ @@ -31,6 +34,13 @@ pythonPackages.buildPythonApplication rec { # Our Python infrastructure runs test in installCheckPhase so we need # to make the testing code stop assuming it is run from the source directory. ./use-installed-scripts-in-test.patch + + # https://gitlab.com/duplicity/duplicity/-/merge_requests/64 + # remove on next release + (fetchpatch { + url = "https://gitlab.com/duplicity/duplicity/-/commit/5c229a9b42f67257c747fbc0022c698fec405bbc.patch"; + sha256 = "05v931rnawfv11cyxj8gykmal8rj5vq2ksdysyr2mb4sl81mi7v0"; + }) ] ++ lib.optionals stdenv.isLinux [ # Broken on Linux in Nix' build environment ./linux-disable-timezone-test.patch @@ -38,6 +48,15 @@ pythonPackages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; + preConfigure = '' + # fix version displayed by duplicity --version + # see SourceCopy in setup.py + ls + for i in bin/*.1 duplicity/__init__.py; do + substituteInPlace "$i" --replace '$version' "${version}" + done + ''; + nativeBuildInputs = [ makeWrapper gettext @@ -50,7 +69,6 @@ pythonPackages.buildPythonApplication rec { pythonPath = with pythonPackages; [ b2sdk - boto boto3 cffi cryptography @@ -102,6 +120,9 @@ pythonPackages.buildPythonApplication rec { # Don't run developer-only checks (pep8, etc.). export RUN_CODE_TESTS=0 + + # check version string + duplicity --version | grep ${version} '' + lib.optionalString stdenv.isDarwin '' # Work around the following error when running tests: # > Max open files of 256 is too low, should be >= 1024. diff --git a/pkgs/tools/backup/duplicity/gnutar-in-test.patch b/pkgs/tools/backup/duplicity/gnutar-in-test.patch index 694fc881950..ee95b68e2ab 100644 --- a/pkgs/tools/backup/duplicity/gnutar-in-test.patch +++ b/pkgs/tools/backup/duplicity/gnutar-in-test.patch @@ -1,9 +1,11 @@ +diff --git a/testing/functional/test_restart.py b/testing/functional/test_restart.py +index 6d972c82..e8435fd5 100644 --- a/testing/functional/test_restart.py +++ b/testing/functional/test_restart.py -@@ -323,14 +323,7 @@ class RestartTestWithoutEncryption(RestartTest): +@@ -350,14 +350,7 @@ class RestartTestWithoutEncryption(RestartTest): https://launchpad.net/bugs/929067 """ - + - if platform.system().startswith(u'Linux'): - tarcmd = u"tar" - elif platform.system().startswith(u'Darwin'): @@ -13,6 +15,6 @@ - else: - raise Exception(u"Platform %s not supported by tar/gtar." % platform.platform()) + tarcmd = u"tar" - + # Intial normal backup - self.backup("full", "testfiles/blocktartest") + self.backup(u"full", u"{0}/testfiles/blocktartest".format(_runtest_dir)) diff --git a/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch b/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch index b5e6df18a15..e322625cdbf 100644 --- a/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch +++ b/pkgs/tools/backup/duplicity/linux-disable-timezone-test.patch @@ -1,10 +1,16 @@ +commit f0142706c377b7c133753db57b5c4c90baa2de30 +Author: Guillaume Girol +Date: Sun Jul 11 17:48:15 2021 +0200 + +diff --git a/testing/unit/test_statistics.py b/testing/unit/test_statistics.py +index 4be5000c..80545853 100644 --- a/testing/unit/test_statistics.py +++ b/testing/unit/test_statistics.py -@@ -59,6 +59,7 @@ class StatsObjTest(UnitTestCase): +@@ -63,6 +63,7 @@ class StatsObjTest(UnitTestCase): s1 = StatsDeltaProcess() - assert s1.get_stat('SourceFiles') == 0 - + assert s1.get_stat(u'SourceFiles') == 0 + + @unittest.skip("Broken on Linux in Nix' build environment") def test_get_stats_string(self): - """Test conversion of stat object into string""" + u"""Test conversion of stat object into string""" s = StatsObj() diff --git a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch index c02527cf394..a5ddc4381bd 100644 --- a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch +++ b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch @@ -1,48 +1,62 @@ +commit ccd4dd92cd37acce1da20966ad9e4e0c7bcf1709 +Author: Guillaume Girol +Date: Sun Jul 11 12:00:00 2021 +0000 + + use installed duplicity when running tests + +diff --git a/setup.py b/setup.py +index fa474f20..604a242a 100755 --- a/setup.py +++ b/setup.py -@@ -92,10 +92,6 @@ class TestCommand(test): +@@ -205,10 +205,6 @@ class TestCommand(test): except Exception: pass - + - os.environ[u'PATH'] = u"%s:%s" % ( - os.path.abspath(build_scripts_cmd.build_dir), - os.environ.get(u'PATH')) - test.run(self) - - def run_tests(self): + + +diff --git a/testing/functional/__init__.py b/testing/functional/__init__.py +index 4221576d..3cf44945 100644 --- a/testing/functional/__init__.py +++ b/testing/functional/__init__.py -@@ -107,7 +107,7 @@ class FunctionalTestCase(DuplicityTestCase): - if basepython is not None: - cmd_list.extend([basepython]) +@@ -111,7 +111,7 @@ class FunctionalTestCase(DuplicityTestCase): + run_coverage = os.environ.get(u'RUN_COVERAGE', None) + if run_coverage is not None: cmd_list.extend([u"-m", u"coverage", u"run", u"--source=duplicity", u"-p"]) -- cmd_list.extend([u"../bin/duplicity"]) +- cmd_list.extend([u"{0}/bin/duplicity".format(_top_dir)]) + cmd_list.extend([u"duplicity"]) cmd_list.extend(options) cmd_list.extend([u"-v0"]) cmd_list.extend([u"--no-print-statistics"]) +diff --git a/testing/functional/test_log.py b/testing/functional/test_log.py +index 9dfc86a6..b9cb55db 100644 --- a/testing/functional/test_log.py +++ b/testing/functional/test_log.py -@@ -47,9 +47,9 @@ class LogTest(FunctionalTestCase): +@@ -49,9 +49,9 @@ class LogTest(FunctionalTestCase): # Run actual duplicity command (will fail, because no arguments passed) basepython = os.environ.get(u'TOXPYTHON', None) if basepython is not None: -- os.system(u"{} ../bin/duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile)) -+ os.system(u"{} duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile)) +- os.system(u"{0} {1}/bin/duplicity --log-file={2} >/dev/null 2>&1".format(basepython, _top_dir, self.logfile)) ++ os.system(u"{0} duplicity --log-file={1} >/dev/null 2>&1".format(basepython, self.logfile)) else: -- os.system(u"../bin/duplicity --log-file={} >/dev/null 2>&1".format(self.logfile)) -+ os.system(u"duplicity --log-file={} >/dev/null 2>&1".format(self.logfile)) +- os.system(u"{0}/bin/duplicity --log-file={1} >/dev/null 2>&1".format(_top_dir, self.logfile)) ++ os.system(u"duplicity --log-file={0} >/dev/null 2>&1".format(self.logfile)) # The format of the file should be: # """ERROR 2 +diff --git a/testing/functional/test_rdiffdir.py b/testing/functional/test_rdiffdir.py +index 0cbfdb33..47acd029 100644 --- a/testing/functional/test_rdiffdir.py +++ b/testing/functional/test_rdiffdir.py -@@ -42,7 +42,7 @@ class RdiffdirTest(FunctionalTestCase): +@@ -44,7 +44,7 @@ class RdiffdirTest(FunctionalTestCase): basepython = os.environ.get(u'TOXPYTHON', None) if basepython is not None: cmd_list.extend([basepython]) -- cmd_list.extend([u"../bin/rdiffdir"]) +- cmd_list.extend([u"{0}/bin/rdiffdir".format(_top_dir)]) + cmd_list.extend([u"rdiffdir"]) cmd_list.extend(argstring.split()) cmdline = u" ".join([u'"%s"' % x for x in cmd_list]) From f620722174e7b55ed5aa4ba6bcc000dba5e78d9e Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 14 Jul 2021 12:00:00 +0000 Subject: [PATCH 02/20] vimPlugins.nvim-treesitter: document plugins --- doc/languages-frameworks/vim.section.md | 29 ++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index e170591605c..26a01a89aa5 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -120,7 +120,7 @@ After that you can install your special grafted `myVim` or `myNeovim` packages. If one of your favourite plugins isn't packaged, you can package it yourself: -``` +```nix { config, pkgs, ... }: let @@ -154,6 +154,33 @@ in } ``` +### Specificities for some plugins +#### Tree sitter + +By default `nvim-treesitter` encourages you to download, compile and install +the required tree-sitter grammars at run time with `:TSInstall`. This works +poorly on NixOS. Instead, to install the `nvim-treesitter` plugins with a set +of precompiled grammars, you can use `nvim-treesitter.withPlugins` function: + +```nix +(pkgs.neovim.override { + configure = { + packages.myPlugins = with pkgs.vimPlugins; { + start = [ + (nvim-treesitter.withPlugins ( + plugins: with plugins; [ + tree-sitter-nix + tree-sitter-python + ] + )) + ]; + }; + }; +}) +``` + +To enable all grammars packaged in nixpkgs, use `(pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))`. + ## Managing plugins with vim-plug {#managing-plugins-with-vim-plug} To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim From 942d45f74e994725c27d085a30c25d6615780bdc Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 18 Jul 2021 21:34:45 -0700 Subject: [PATCH 03/20] klipper: unstable-2021-01-31 -> unstable-2021-07-15 --- pkgs/servers/klipper/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 63ad531bbef..f120454ac84 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -5,14 +5,14 @@ , unstableGitUpdater }: stdenv.mkDerivation rec { - name = "klipper"; - version = "unstable-2021-01-31"; + pname = "klipper"; + version = "unstable-2021-07-15"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "ef4d9c3abd30ae8a485020fd9ff2fb4529a143b3"; - sha256 = "sha256-puAkSGL0DD0JUWejPdzr7zKIW2UP2soBBtgm2msUKzA="; + rev = "dafb74e3aba707db364ed773bb2135084ac0fffa"; + sha256 = "sha256-wF5I8Mo89ohhysBRDMtkCDbCW9SKWrdYdbifmxCPJBc="; }; # We have no LTO on i686 since commit 22284b0 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Klipper 3D printer firmware"; homepage = "https://github.com/KevinOConnor/klipper"; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault zhaofengli ]; platforms = platforms.linux; license = licenses.gpl3Only; }; From 94536fd6e33afaedab5ddfc36831cfc1c5b87508 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 18 Jul 2021 21:34:45 -0700 Subject: [PATCH 04/20] nixos/klipper: Allow specifying arbitrary user/group This paves the way for alternative integrations such as Moonraker. --- nixos/modules/services/misc/klipper.nix | 45 +++++++++++++++++++++---- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 2f04c011a65..df5b527a069 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -17,6 +17,26 @@ in description = "Allows Octoprint to control Klipper."; }; + user = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + User account under which Klipper runs. + + If null is specified (default), a temporary user will be created by systemd. + ''; + }; + + group = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Group account under which Klipper runs. + + If null is specified (default), a temporary user will be created by systemd. + ''; + }; + settings = mkOption { type = format.type; default = { }; @@ -30,13 +50,24 @@ in ##### implementation config = mkIf cfg.enable { - assertions = [{ - assertion = cfg.octoprintIntegration -> config.services.octoprint.enable; - message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it."; - }]; + assertions = [ + { + assertion = cfg.octoprintIntegration -> config.services.octoprint.enable; + message = "Option klipper.octoprintIntegration requires Octoprint to be enabled on this system. Please enable services.octoprint to use it."; + } + { + assertion = cfg.user != null -> cfg.group != null; + message = "Option klipper.group is not set when a user is specified."; + } + ]; environment.etc."klipper.cfg".source = format.generate "klipper.cfg" cfg.settings; + services.klipper = mkIf cfg.octoprintIntegration { + user = config.services.octoprint.user; + group = config.services.octoprint.group; + }; + systemd.services.klipper = { description = "Klipper 3D Printer Firmware"; wantedBy = [ "multi-user.target" ]; @@ -47,9 +78,9 @@ in RuntimeDirectory = "klipper"; SupplementaryGroups = [ "dialout" ]; WorkingDirectory = "${package}/lib"; - } // (if cfg.octoprintIntegration then { - Group = config.services.octoprint.group; - User = config.services.octoprint.user; + } // (if cfg.user != null then { + Group = cfg.group; + User = cfg.user; } else { DynamicUser = true; User = "klipper"; From 11313bc65d5c7d15089caf7cef8ecfd037353639 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 18 Jul 2021 21:34:45 -0700 Subject: [PATCH 05/20] nixos/klipper: Allow overriding the Klipper package --- nixos/modules/services/misc/klipper.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index df5b527a069..41f77da3548 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -2,7 +2,6 @@ with lib; let cfg = config.services.klipper; - package = pkgs.klipper; format = pkgs.formats.ini { mkKeyValue = generators.mkKeyValueDefault {} ":"; }; in { @@ -11,6 +10,12 @@ in services.klipper = { enable = mkEnableOption "Klipper, the 3D printer firmware"; + package = mkOption { + type = types.package; + default = pkgs.klipper; + description = "The Klipper package."; + }; + octoprintIntegration = mkOption { type = types.bool; default = false; @@ -74,10 +79,10 @@ in after = [ "network.target" ]; serviceConfig = { - ExecStart = "${package}/lib/klipper/klippy.py --input-tty=/run/klipper/tty /etc/klipper.cfg"; + ExecStart = "${cfg.package}/lib/klipper/klippy.py --input-tty=/run/klipper/tty /etc/klipper.cfg"; RuntimeDirectory = "klipper"; SupplementaryGroups = [ "dialout" ]; - WorkingDirectory = "${package}/lib"; + WorkingDirectory = "${cfg.package}/lib"; } // (if cfg.user != null then { Group = cfg.group; User = cfg.user; From 0c8307882586e3072be83d88302b4363dffef755 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 18 Jul 2021 21:34:45 -0700 Subject: [PATCH 06/20] nixos/klipper: Allow configuring --input-tty and --api-server This also makes it easy for other modules to get the correct path to the virtual printer. --- nixos/modules/services/misc/klipper.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 41f77da3548..4930648ba8e 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -16,6 +16,19 @@ in description = "The Klipper package."; }; + inputTTY = mkOption { + type = types.path; + default = "/run/klipper/tty"; + description = "Path of the virtual printer symlink to create."; + }; + + apiSocket = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/klipper/api"; + description = "Path of the API socket to create."; + }; + octoprintIntegration = mkOption { type = types.bool; default = false; @@ -73,13 +86,16 @@ in group = config.services.octoprint.group; }; - systemd.services.klipper = { + systemd.services.klipper = let + klippyArgs = "--input-tty=${cfg.inputTTY}" + + optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}"; + in { description = "Klipper 3D Printer Firmware"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/lib/klipper/klippy.py --input-tty=/run/klipper/tty /etc/klipper.cfg"; + ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} /etc/klipper.cfg"; RuntimeDirectory = "klipper"; SupplementaryGroups = [ "dialout" ]; WorkingDirectory = "${cfg.package}/lib"; From 0377ed903aed15ad2e3a59ea0eb2994027714268 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Mon, 19 Jul 2021 16:39:43 +0200 Subject: [PATCH 07/20] pythonPackages.tomli: init at 1.0.4 --- .../python-modules/tomli/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/tomli/default.nix diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix new file mode 100644 index 00000000000..4204be03b94 --- /dev/null +++ b/pkgs/development/python-modules/tomli/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +, python-dateutil +}: + +buildPythonPackage rec { + pname = "tomli"; + version = "1.0.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hukkin"; + repo = pname; + rev = version; + sha256 = "sha256-ld0PsYnxVH3RbLG/NpvLDj9UhAe+QgwCQVXgGgqh8kE="; + }; + + nativeBuildInputs = [ flit-core ]; + + checkInputs = [ + pytestCheckHook + python-dateutil + ]; + + pythonImportsCheck = [ "tomli" ]; + + meta = with lib; { + description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0"; + homepage = "https://github.com/hukkin/tomli"; + license = licenses.mit; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77256c8cc5e..7a21ad59ce4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8689,6 +8689,8 @@ in { toml = callPackage ../development/python-modules/toml { }; + tomli = callPackage ../development/python-modules/tomli { }; + tomlkit = callPackage ../development/python-modules/tomlkit { }; toolz = callPackage ../development/python-modules/toolz { }; From b48df55ff722bdac9578a55fb9134d6ee830b8ac Mon Sep 17 00:00:00 2001 From: CheariX Date: Mon, 19 Jul 2021 23:55:05 +0200 Subject: [PATCH 08/20] joplin-desktop: 1.8.5 -> 2.1.9 (#130611) --- pkgs/applications/misc/joplin-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 2d9a2ca5904..527c2f3bab1 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.8.5"; + version = "2.1.9"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "11csbr72i5kac2bk7wpa877lay2z1n58s0yildkfnjy552ihdxny"; - x86_64-darwin = "1n0ni3ixml99ag83bcn5wg6f0kldjhwkkddd9km37ykr8vxxl952"; + x86_64-linux = "1s7zydi90yzafii42m3aaf3niqlmdy2m494j2b3yrz2j26njj4q9"; + x86_64-darwin = "1pvl08yhcrnrvdybfmkigaidhfrrg42bb6rzv96zyq9w4k0l0lm8"; }.${system} or throwSystem; }; From 4331afb9461ed13de9c8ddbfd5dc0eaa799cb8a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 21:36:25 +0000 Subject: [PATCH 09/20] azure-cli: 2.26.0 -> 2.26.1 --- pkgs/tools/admin/azure-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index cb43f525680..b93ab0e867b 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.26.0"; + version = "2.26.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-O5EL51RRxrp6D82p0Qbo59y/GAkBDhIkIdTxnagKgkY="; + sha256 = "sha256-AwchP0o3I2T37dLPNw51wldwYUmcRuWptyzrhOocEaQ="; }; # put packages that needs to be overriden in the py package scope From 83994d9ffeb507ff3ded74c92ac3aad7e7923b17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 03:43:57 +0000 Subject: [PATCH 10/20] dogecoin: 1.14.2 -> 1.14.3 --- pkgs/applications/blockchains/dogecoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index 88439d6bdbf..9985113b08a 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.14.2"; + version = "1.14.3"; src = fetchFromGitHub { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy"; + sha256 = "sha256-kozUnIislQDtgjeesYHKu4sB1j9juqaWvyax+Lb/0pc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From cbe99c7facdbb7b82a8f69cc174f2e6db1baa47b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 5 Aug 2020 07:19:18 +0200 Subject: [PATCH 11/20] nixos/agetty: allow overriding the login program --- nixos/modules/services/ttys/getty.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 8345dfabeb7..7cf2ff87da2 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -6,7 +6,7 @@ let cfg = config.services.getty; baseArgs = [ - "--login-program" "${pkgs.shadow}/bin/login" + "--login-program" "${cfg.loginProgram}" ] ++ optionals (cfg.autologinUser != null) [ "--autologin" cfg.autologinUser ] ++ optionals (cfg.loginOptions != null) [ @@ -39,6 +39,14 @@ in ''; }; + loginProgram = mkOption { + type = types.path; + default = "${pkgs.shadow}/bin/login"; + description = '' + Path to the login binary executed by agetty. + ''; + }; + loginOptions = mkOption { type = types.nullOr types.str; default = null; From 9d1e94fdc36bccc958039261d8ccfeb2787c3e87 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 21:50:13 +0000 Subject: [PATCH 12/20] bazelisk: 1.10.0 -> 1.10.1 --- pkgs/development/tools/bazelisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 22636b588b7..d2de1bcc063 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G2cHKhgsv1fj7eKbADER3R2uXp9DnKevboE7vnO5pDE="; + sha256 = "sha256-MpAYJSDAbyh4aGW+hRrny5+bXZ96cNcUhqJkgY8bdD8="; }; vendorSha256 = "sha256-5qpeAD4VFsR8iJlRiNTncOdq39lq3MU6gSLu3G/BcPU="; From 2b5524948627c1c5057ea9f1617f1691ced8a449 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 19:45:21 +0000 Subject: [PATCH 13/20] apache-airflow: 2.1.1rc1 -> 2.1.2 --- pkgs/development/python-modules/apache-airflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index cc990617157..dea5776fb61 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ }: let - version = "2.1.1rc1"; + version = "2.1.2"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "1vzzmcfgqni9rkf7ggh8mswnm3ffwaishcz1ysrwx0a96ilhm9q2"; + sha256 = "sha256-Q0l2c1tuxcoE65zgdxnv/j1TIoQzaNoEFCYHvqN+Bzk="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. From e282678367c9915ff8325c944cac28328afdc564 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 19 Jul 2021 08:30:51 +0200 Subject: [PATCH 14/20] pythonPackages.uncertainties: 3.1.5 -> 3.1.6 --- pkgs/development/python-modules/uncertainties/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index b43927c063e..c132f50dbea 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.1.5"; + version = "3.1.6"; src = fetchPypi { inherit pname version; - sha256 = "00z9xl40czmqk0vmxjvmjvwb41r893l4dad7nj1nh6blw3kw28li"; + sha256 = "0b9y0v73ih142bygi66dxqx17j2x4dfvl7xnhmafj9yjmymbakbw"; }; propagatedBuildInputs = [ future ]; From 0066d898c91758f514599ab97ce8478336579448 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 19 Jul 2021 21:41:55 +0200 Subject: [PATCH 15/20] openrct2: 0.3.3 -> 0.3.4 Next to the version bump, some options were reordered to satisfy nixpkgs-hammering. --- pkgs/games/openrct2/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index e210efade03..9e79a9005dc 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,13 +5,13 @@ }: let - version = "0.3.3"; + version = "0.3.4"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "01nanpbz5ycdhkyd46fjfvj18sw729l4vk7xg12600f9rjngjk76"; + sha256 = "051dm7bw3l8qnppk5b7xvavl29xfadqn8aa18q49qdy5mjy6qgk4"; }; objects-src = fetchFromGitHub { @@ -29,8 +29,8 @@ let }; in stdenv.mkDerivation { - inherit version; pname = "openrct2"; + inherit version; src = openrct2-src; @@ -58,22 +58,22 @@ stdenv.mkDerivation { zlib ]; - postUnpack = '' - cp -r ${objects-src} $sourceRoot/data/object - cp -r ${title-sequences-src} $sourceRoot/data/sequence - ''; - cmakeFlags = [ "-DDOWNLOAD_OBJECTS=OFF" "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; + postUnpack = '' + cp -r ${objects-src} $sourceRoot/data/object + cp -r ${title-sequences-src} $sourceRoot/data/sequence + ''; + preFixup = "ln -s $out/share/openrct2 $out/bin/data"; meta = with lib; { - description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; + description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; homepage = "https://openrct2.io/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ oxzi ]; }; From 6554384a70688c2382328ff64fc521e1728630b2 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Mon, 19 Jul 2021 12:00:00 +0000 Subject: [PATCH 16/20] boolector: 3.2.1 -> 3.2.2 --- .../science/logic/boolector/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 6916379bdea..7d90dca46f5 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,26 +1,18 @@ -{ stdenv, fetchFromGitHub, fetchpatch, lib, python3 +{ stdenv, fetchFromGitHub, lib, python3 , cmake, lingeling, btor2tools, gtest, gmp }: stdenv.mkDerivation rec { pname = "boolector"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "boolector"; repo = "boolector"; - rev = "refs/tags/${version}"; - sha256 = "0jkmaw678njqgkflzj9g374yk1mci8yqvsxkrqzlifn6bwhwb7ci"; + rev = version; + sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z"; }; - # excludes development artifacts from install, will be included in next release - patches = [ - (fetchpatch { - url = "https://github.com/Boolector/boolector/commit/4d240436e34e65096671099766344dd9126145b1.patch"; - sha256 = "1girsbvlhkkl1hldl2gsjynwc3m92jskn798qhx0ydg6whrfgcgw"; - }) - ]; - postPatch = '' sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1 ''; From f796ccd00abc1f42c7a3750aa63bd1dd98e3b61c Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 19 Jul 2021 18:51:58 +0000 Subject: [PATCH 17/20] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 138 ++++++++++++++-------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e6dd49198c9..c280f7e9714 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -101,12 +101,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-05-31"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "4ca3d418eebc0da452b7defc18970c83f7de5070"; - sha256 = "0ax3hfwppbkm7haxvsllac6r4zk2ys9rrj7sj4p3ayl1w8v3n8nq"; + rev = "c15c4e49d6ecb7ad7252902bb1b4310ba161617a"; + sha256 = "13pnlx4rqjc51vrq9d8kyjjxb2apw3y6j2xh68ii746klinjpjy5"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-18"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "384925e0cfa87a27387357cab144fbf392e21f61"; - sha256 = "01bg8h7276nidrgdgz6asvksi3m0g6jf8aw9bp0d4ng6s0gdfps2"; + rev = "7ae9ada3866e05a25be1899dfb68fa2dc17f5466"; + sha256 = "0plydss60in6zsgjrgrsvxgkz59bmn89ngm015prqp1w8izlwc82"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -786,12 +786,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-06-13"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "b55e4906a10db0f6917058aec6616075c4d06994"; - sha256 = "0agmfahppcaxxn3kwfg9wx9ncdz51qixqh52xw6rddhpda5h7gfm"; + rev = "c651b5af9e30b9d88290ca30b0374b064e1a278d"; + sha256 = "1qycvbkr6axl5vcwwf5m6svag511p97h2xzcbh68arqa1kqx208l"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -822,12 +822,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-06-30"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "7df02d1bf18324d81cbc32b98c05f5aa936afc17"; - sha256 = "1vf2386xagiyh23kflcnckw5niy4xygns4pi3apq7kza05ca6861"; + rev = "9c1aa175762884812b9f3c3436ef6e26639b9589"; + sha256 = "1xhbnad098a6h3vf05rkha7qpj4nb4jaxjcnll91wzvf4lngq4p0"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1316,12 +1316,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-07-04"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "1936824f5986c986befad5995e7bf87ba124d109"; - sha256 = "16h82yn7g9jq2chdb4wjjvz6akb0r06wjjvqpj9xkp82rx55m4ix"; + rev = "63d7052686732a910b7355761193fdb55a521cd3"; + sha256 = "13r743m9x2mbi0qvfgv8vqfjgxnrmvic09ps484m39bxsbdywzvv"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1388,12 +1388,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-07-12"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "0aad4037902271c8c85d00d02e77f79ec2141267"; - sha256 = "0knxkcf8ndj6ggcj8jsfgcmm98pmshl1n05qrixkhgh4ilrisqr4"; + rev = "8785d0c2737b6354c847a2ac2cd327a16e2087f2"; + sha256 = "0nhf9vnsba7gm1yxnbj8lqd9d1ihdgpqrlyihlc815ayqzzs3h9b"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1859,12 +1859,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-16"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f29e8a461e05881c69953b41784a1aeb4b70a422"; - sha256 = "1nda02nd9v17yv6fawidg8c3haijysb9zc04sjy0v708h2nw8qhj"; + rev = "66638c929c61f950246f3d292b6157a9596241de"; + sha256 = "1wqspsx83sy2qmmg0idi7j66swm23hnhxx630j114vh6a70vai00"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2195,12 +2195,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; - version = "2021-07-03"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "17a83ea765831cb0cc64f768b8c3f43479b90bbe"; - sha256 = "155da638i4ff1wsy5600jgrqicykb27lxq9liag174nga6xazbn6"; + rev = "0257caac96b28ec9efd80a00c13d31c469357f5b"; + sha256 = "0r5c99xzsizqpk4h35lp3ip8lqang2vvg01vrv0bad3wqnjqq1d7"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2676,12 +2676,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-07-17"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "29e685953d362c723c55417eea2b795b5bcc2ef5"; - sha256 = "183511fy34sazpkaxcpr250id4zyxhs5mqws49b516sh0d875fjj"; + rev = "78af1399d0e7a85152d4f75b9ce0c20286735d6e"; + sha256 = "156wdb57vabz0syx84zlnn5v6wy7g02flq4r5caz9xwccdszwz33"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3492,12 +3492,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-07-14"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "e599e15f9400e6b587e3160d2dff83764cb4ab7d"; - sha256 = "08mn2z6q94x8fwic9r0vhzw0y93sm9ww6z458bd9hsxibfjsklgc"; + rev = "b0bbe8d9089cbb045fd15d217ac5a5ec0f4f5066"; + sha256 = "173nkjfkqklg8zk4vs69c0avrw0v6hngj0szxj7xs3yh2wfnhqnh"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3708,12 +3708,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-17"; + version = "2021-07-18"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "1729b502fa00df2fdcbfa118b404b8b8a8a2d6a3"; - sha256 = "1r4ajaxvf9kpfq42b81c08ixfqakiq8fibn89qar7sd4a7634dsg"; + rev = "38e0003d0c40d506e9e46ff55978b78220a76b71"; + sha256 = "0r3zicx8gkj5jd0kxs1i5inxpi9jmg3nwb0km4xcj55fb3x2vbky"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3804,12 +3804,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-18"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9144ea1107ed5aaf250bffafc1f0f32fb97cce47"; - sha256 = "05apxyy0xg6llskigirglb4a73ay8cdaw2rckl2g3d6j8ry9dkc4"; + rev = "17cf76de8a16c1e459fbe916491f258371837a8d"; + sha256 = "1fzm655q6xw3qqpvzx36wj5v9js1jiwb8295cccdc65irg8r6zfw"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3864,12 +3864,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-16"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "4887eb7526004e069bd8898041a714c7eaad72e7"; - sha256 = "1abdjkiyyzgaw3lskjfb0lcilkp8qqlaqj8kyfmzf4w4mz9ijh4d"; + rev = "038cda43f4b7e8819c230de2bbe943972ed2f37c"; + sha256 = "0kdzfi5dm1lm1bzagf60c8dd1a3zz0x4qp28nns6nhiv7kljj3zy"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4694,12 +4694,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-07-12"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "ef631befe2bea01c23f4f0d9685025ac15d51ace"; - sha256 = "1hk1f1mbk37gcqhrwvn352q83qsf5nrgyrgghvkj8m91jgf4m31y"; + rev = "9d8c57c2b0bf57082093bf1b162ac492206d35dd"; + sha256 = "0ymgbcy8v7ang4ghlkr52wq86ydr4pma1vwvp78y5yhi4xmn82mn"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4827,12 +4827,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-06-01"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "93711180123b9ba6958bfc682d305ef0a1056fa5"; - sha256 = "1i3hhihlvh5mkn1vl9f1baiz712h8lwp1hfi5arsb36picsmgbfd"; + rev = "b2780ad5078c24519ba1e6ae3a1b3bd2218870cc"; + sha256 = "1r0v4l9rvb3w42fnj1fmcfvy04gyp0lv3mis7jl716r8kvbaqwpj"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -4923,12 +4923,12 @@ final: prev: syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-07-01"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "c89741ef310fd0a380ffb80b80e10f197afd6224"; - sha256 = "0n691w9mcq0ks7wvj9mpmwhqnkcd11lhzf4fz6pkki8g5i7zhqrh"; + rev = "7414f30365a342e1d89072d474a35913643b6eec"; + sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -5117,24 +5117,24 @@ final: prev: telescope-z-nvim = buildVimPluginFrom2Nix { pname = "telescope-z-nvim"; - version = "2021-07-17"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-z.nvim"; - rev = "27694fa19bc00cc24b436d671951f516a4a966a1"; - sha256 = "0g12nfmv2hllw0ylsy362mp1gyaf4ldyiza3jg74c66xwi2jj8i9"; + rev = "f5776dbd0c687af0862b2e4ee83c62c5f4a7271d"; + sha256 = "08lcszv53d9mqhgdwkdygbnk5w0pyh0q6djxzqhnjb6qphibf3m6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-18"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "8c3f2b630be0241fe10709e61ee9dab473518f32"; - sha256 = "1yd1kkdp8baxrhkfsg0j0dpkprxvwi0r4xljjcdln7rpr2r0lm82"; + rev = "46e03a935f1d080a9bd856d5a8acfcc093cd1461"; + sha256 = "14ra8p9alnmvzry3iw3ghyk7nx44dh0qm82lvg6wfg5bhw1hpnnj"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6006,12 +6006,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-16"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "ee390feaa3bc40de2afa32910ab09de287181146"; - sha256 = "0q2bnmi6yz7i7lx8i59gzk39fqzjc3y325qjhhyyahwb2xsazzcz"; + rev = "3aa42d211ebae7471e8f9926aaeef5a1df475f2f"; + sha256 = "0f1adjn9x5jv541yzgqf67v9613xvkxzgc5bmkgqrfxn2l5j3vjn"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7351,12 +7351,12 @@ final: prev: vim-jinja = buildVimPluginFrom2Nix { pname = "vim-jinja"; - version = "2016-11-16"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "lepture"; repo = "vim-jinja"; - rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6"; - sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q"; + rev = "2f0eeefe583ea477cb7605f972d57d7d5e55e13f"; + sha256 = "0r8508h9s2bikmv3wvw4iaq3j8i5n564k7s06aqx9j79i16asn22"; }; meta.homepage = "https://github.com/lepture/vim-jinja/"; }; @@ -7713,12 +7713,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-07-05"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "05f4962c64c5dcd720b8cf5f7af777de33f2fa43"; - sha256 = "10nfiban4ihsix2zf4qp38mcdmlz3zb6n01n5wkgz9yga28y9jxm"; + rev = "61802ad25f303dc37f575cbed9b902605353db49"; + sha256 = "15c8y5rfsnmx4dm01advvax8flkibkg60lbs8x0xgyzfcqjzhl14"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9490,12 +9490,12 @@ final: prev: vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-06-10"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "1dbf84a3095eff9bd0d1e49824dddac56c378ed9"; - sha256 = "16qwp8kk3c2lzfnmzkzi71ilrcssga17kjiphskph5kl35igr16v"; + rev = "e1be98dc050b8c5196e324cb4236e8c4b44483e6"; + sha256 = "12gr0v2r91q75v1wfrskp330zlyibshngs11if9nlxpnhgz8f6dn"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -9695,12 +9695,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-15"; + version = "2021-07-18"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "13fac7d1d820ee4d72196841800705f149af9868"; - sha256 = "0k9325pdh5fscj8nhqwj36vdz6lvcgf14r7mmimc7g6i7bxxfpmb"; + rev = "830659752b8914f6b4567a00448901246e4d1841"; + sha256 = "1zdi1kblk03gwifpg1nanq4ppn9xw6af92l3li86ziw89bv3bad9"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From 58fc777b226140f3a5312c9ed663c2c52e90302d Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 19 Jul 2021 18:52:24 +0000 Subject: [PATCH 18/20] vimPlugins.taboo-vim: init at 2019-08-27 --- 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 c280f7e9714..75220507747 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4958,6 +4958,18 @@ final: prev: meta.homepage = "https://github.com/codota/tabnine-vim/"; }; + taboo-vim = buildVimPluginFrom2Nix { + pname = "taboo-vim"; + version = "2019-08-27"; + src = fetchFromGitHub { + owner = "gcmt"; + repo = "taboo.vim"; + rev = "caf948187694d3f1374913d36f947b3f9fa1c22f"; + sha256 = "06pizdnb3gr4pf5hrm3yfzkz99y9bi2vwqm85xknzgdvl1lisj99"; + }; + meta.homepage = "https://github.com/gcmt/taboo.vim/"; + }; + tabpagebuffer-vim = buildVimPluginFrom2Nix { pname = "tabpagebuffer-vim"; version = "2014-09-30"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1521ca5557f..39e2a2bd47a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -161,6 +161,7 @@ fruit-in/vim-nong-theme fsharp/vim-fsharp fszymanski/deoplete-emoji garbas/vim-snipmate +gcmt/taboo.vim gcmt/wildfire.vim gennaro-tedesco/nvim-peekup gentoo/gentoo-syntax From b7320b325d9e847861617208f2da9a00a63b5525 Mon Sep 17 00:00:00 2001 From: Evils Date: Sun, 18 Jul 2021 19:16:06 +0200 Subject: [PATCH 19/20] python3.pkgs.rtoml: 0.6.1 -> 0.7 --- pkgs/development/python-modules/rtoml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index f50ad558176..e5043ca941a 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -9,20 +9,20 @@ buildPythonPackage rec { pname = "rtoml"; - version = "0.6.1"; + version = "0.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "07bf30if1wmbqjp5n4ib43n6frx8ybyxc9fndxncq7aylkrhd7hy"; + sha256 = "sha256-h4vY63pDkrMHt2X244FssLxHsphsfjNd6gnVFUeZZTY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1q082sdac5vm4l3b45rfjp4vppp9y9qhagdjqqfdz8gdhm1k8yyy"; + sha256 = "05fwcs6w023ihw3gyihzbnfwjaqy40d6h0z2yas4kqkkvz9x4f8j"; }; nativeBuildInputs = with rustPlatform; [ From 51f6c77e0c0d295f166e8839c833c8df28e95ae7 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Mon, 19 Jul 2021 14:29:02 -0400 Subject: [PATCH 20/20] bottom: 0.6.2 -> 0.6.3 --- pkgs/tools/system/bottom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 036410f350c..1401f2a78a9 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-QCi6Oi5xk88ev2B4rlXwgR55qKZSUbIY/96t/jhJQ0Q="; + sha256 = "sha256-hXEaQL4jTd/MfEUVKUTs7oTRAffau1YA/IUUtD+V9KI="; }; prePatch = '' @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-RJ7xIp9EBiBLSMAchr7XYhrTITNJy+Yfok//vZr3Z38="; + cargoSha256 = "sha256-aeR6fcIWkY4AWZy8tVotUAVRVSiO/0S0DU/A9/ATrF4="; doCheck = false;