diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index ebaca441c338..f0bc32f9be39 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-AsUgjGoDoT/GN+Z2tXd0KjVFcVI1KF3nVRsLDWkY9HM="; + sha256 = "sha256-VAKT1gw8wkfde/rQVvRzq4HH0mKcLczR5EHtxy3zULg="; }; ldflags = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-team/default.nix b/pkgs/applications/version-management/git-and-tools/git-team/default.nix index 4857384148d8..afce41e15d19 100644 --- a/pkgs/applications/version-management/git-and-tools/git-team/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-team/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "git-team"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "hekmekk"; repo = "git-team"; rev = "v${version}"; - hash = "sha256-LZR30zqwit/xydQbpGm1LXd/tno/sTCaftgjVkVS6ZY="; + hash = "sha256-+j5d1tImVHaTx63uzLdh2YNCFa1ErAVv4OMwxOutBQ4="; }; vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A="; diff --git a/pkgs/desktops/gnome/games/five-or-more/default.nix b/pkgs/desktops/gnome/games/five-or-more/default.nix index ce532d1d5cd4..2b264442eab1 100644 --- a/pkgs/desktops/gnome/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { description = "Remove colored balls from the board by forming lines"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/four-in-a-row/default.nix b/pkgs/desktops/gnome/games/four-in-a-row/default.nix index 2c6899ee1aa9..a85da0499215 100644 --- a/pkgs/desktops/gnome/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Make lines of the same color to win"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index 112c9cf89554..a4f01aadc206 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { description = "Play the classic two-player boardgame of chess"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix index e21cceb08509..bdfa9f8ed8f7 100644 --- a/pkgs/desktops/gnome/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "Slide blocks to solve the puzzle"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index 698741ba8366..e2d7d0729c6c 100644 --- a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Disassemble a pile of tiles by removing matching pairs"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix index d60a58a83c95..dd214f38071f 100644 --- a/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Clear hidden mines from a minefield"; maintainers = teams.gnome.members; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-robots/default.nix b/pkgs/desktops/gnome/games/gnome-robots/default.nix index c9f7cbfc213b..e8b5d48efca1 100644 --- a/pkgs/desktops/gnome/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome/games/gnome-robots/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Avoid the robots and make them crash into each other"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 388253f131bf..90ef25fcca51 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { description = "Test your logic skills in this number grid puzzle"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/pkgs/desktops/gnome/games/gnome-taquin/default.nix index c3e78ff20144..e982f83f3ff7 100644 --- a/pkgs/desktops/gnome/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { description = "Move tiles so that they reach their places"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 6578bf7c0589..46e512ad316a 100644 --- a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { description = "Complete the puzzle by matching numbered tiles"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/iagno/default.nix b/pkgs/desktops/gnome/games/iagno/default.nix index d7e3930eae1e..eb27430be4e9 100644 --- a/pkgs/desktops/gnome/games/iagno/default.nix +++ b/pkgs/desktops/gnome/games/iagno/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { description = "Computer version of the game Reversi, more popularly called Othello"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/games/lightsoff/default.nix b/pkgs/desktops/gnome/games/lightsoff/default.nix index 94b71f0e8568..fa9eb5d20812 100644 --- a/pkgs/desktops/gnome/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index f4c7ba91befe..b57e9d4f60c0 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "4.1.11"; + version = "4.1.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-JaHIq1tUMxEaxigT1Z3EpJK4P2Yapki0A53WNrHo4tQ="; + hash = "sha256-DHjB8hT9rP1yyeo9I5D8JGIXq+17RYX+e6H7BBuWTw4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 7d44be146366..a5c7cccffb3e 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,5 +1,6 @@ { lib -, fetchPypi +, fetchFromGitHub +, fetchpatch , buildPythonPackage , pycodestyle , glibcLocales @@ -11,11 +12,21 @@ buildPythonPackage rec { pname = "autopep8"; version = "2.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ixZZx/AD5pMZn1LK/9wGWFuwcWkAu8anRC/ZMdZYwHc="; + src = fetchFromGitHub { + owner = "hhatto"; + repo = "autopep8"; + rev = "v${version}"; + sha256 = "sha256-77ZVprACHUP8BmylTtvHvJMjb70E1YFKKdQDigAZG6s="; }; + patches = [ + (fetchpatch { + name = "fix-pycodestyle-2.10.0.patch"; + url = "https://github.com/hhatto/autopep8/pull/659.patch"; + hash = "sha256-ulvQqJ3lUm8/9QZwH+whzrxbz8c11/ntc8zH2zfmXiE="; + }) + ]; + propagatedBuildInputs = [ pycodestyle tomli ]; checkInputs = [ @@ -23,11 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # missing tox.ini file from pypi package - "test_e101_skip_innocuous" - ]; - LC_ALL = "en_US.UTF-8"; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 5df0aa976f1f..9142d3d62792 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -5,23 +5,29 @@ , pytest-cov , pytest-doctestplus , pytestCheckHook +, pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "pytest-filter-subpackage"; - version = "0.1.1"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1s4s2kd31yc65rfvl4xhy8xx806xhy59kc7668h6b6wq88xgrn5p"; + hash = "sha256-H66jZxeAPlJFiNbBCdJtINOzRCLo1qloEnWJd9ygF4I="; }; nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ pytest-doctestplus @@ -33,11 +39,15 @@ buildPythonPackage rec { ]; # missing some files - disabledTests = [ "with_rst" ]; + disabledTests = [ + "with_rst" + ]; meta = with lib; { description = "Meta-package containing dependencies for testing"; - homepage = "https://astropy.org"; + homepage = "https://github.com/astropy/pytest-filter-subpackage"; + changelog = "https://github.com/astropy/pytest-filter-subpackage/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index e7f80f7bc9a2..05bfd5655b28 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -1,17 +1,18 @@ { lib , fetchFromGitHub , buildGoModule +, installShellFiles }: buildGoModule rec { pname = "cirrus-cli"; - version = "0.92.0"; + version = "0.92.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q6hpsyZZep8IERYh7/oVcCQdgc/s6HufiuE4oNPBaZc="; + sha256 = "sha256-ehJyC5NXB53i7ZpWTKySnMwWiqgbgBbnxIVWhyrXC0A="; }; vendorSha256 = "sha256-Llq6siZn34sHsZFneT+MLXf2W9cXqi4DZwrH1R5laOY="; @@ -21,6 +22,14 @@ buildGoModule rec { "-X github.com/cirruslabs/cirrus-cli/internal/version.Commit=v${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd cirrus \ + --bash <($out/bin/cirrus completion bash) \ + --zsh <($out/bin/cirrus completion zsh) \ + --fish <($out/bin/cirrus completion fish) + ''; + # tests fail on read-only filesystem doCheck = false; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index e917a5a76da6..296675664547 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -2,7 +2,7 @@ , substituteAll , fetchurl , ocaml -, dune_2 +, dune_3 , buildDunePackage , yojson , csexp @@ -15,16 +15,17 @@ }: let - merlinVersion = "4.6"; + merlinVersion = "4.7"; hashes = { - "4.6-412" = "sha256-isiurLeWminJQQR4oHpJPCzVk6cEmtQdX4+n3Pdka5c="; - "4.6-413" = "sha256-8903H4TE6F/v2Kw1XpcpdXEiLIdb9llYgt42zSR9kO4="; - "4.6-414" = "sha256-AuvXCjx32JQBY9vkxAd0pEjtFF6oTgrT1f9TJEEDk84="; + "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; + "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; + "4.7-414" = "sha256-bIZ4kwmnit/ujM2//jZA59rweo7Y0QfDb+BpoTxswHs="; + "4.7-500" = "sha256-elYb/0vVvohi9yYFe/54brb6Qh6fyiN1kYPRq5fP1zE="; }; - ocamlVersionShorthand = lib.concatStrings - (lib.take 2 (lib.splitVersion ocaml.version)); + ocamlVersionShorthand = lib.substring 0 3 + (lib.concatStrings (lib.splitVersion ocaml.version)); version = "${merlinVersion}-${ocamlVersionShorthand}"; in @@ -36,6 +37,7 @@ else buildDunePackage { pname = "merlin"; inherit version; + duneVersion = "3"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; @@ -46,7 +48,7 @@ buildDunePackage { (substituteAll { src = ./fix-paths.patch; dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; - dune = "${dune_2}/bin/dune"; + dune = "${dune_3}/bin/dune"; }) ]; @@ -59,14 +61,14 @@ buildDunePackage { buildInputs = [ dot-merlin-reader yojson - (if lib.versionAtLeast version "4.6-414" + (if lib.versionAtLeast version "4.7-414" then merlin-lib else csexp) menhirSdk menhirLib ]; - doCheck = true; + doCheck = false; checkPhase = '' runHook preCheck patchShebangs tests/merlin-wrapper diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index e3fef3f4cc40..90c0aee0ff3f 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -7,7 +7,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.06"; - buildInputs = if lib.versionAtLeast version "4.6-414" + buildInputs = if lib.versionAtLeast version "4.7-414" then [ merlin-lib ] else [ yojson csexp ]; diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index 244a826cb165..81a10b9ea2af 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://qqwing.com"; description = "Sudoku generating and solving software"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 29a296dcef68..7e255c01d35d 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "f736ef284358923e312f8e1e3c6ce7c97b20965b09eb65705e9f7e3d5e9a9d79"; + sha256 = "299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 4cc6369b7eb5..8859b8c7e11e 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eWYx45k18HDcXkgfKl9G4Q1h/BcCy+NDVhh5ndoW+Fk="; + sha256 = "sha256-Z+FZ5AtxgO+tCB9HHZhyttXt8LXbCi/6tG8WkNRuhgk="; }; - vendorSha256 = "sha256-+wPcCF5AZ1HzNH1egCiK4eUQ0UmPPJzKB45lk7SOuCI="; + vendorSha256 = "sha256-AQX4O25PR0icR0Llz66t+2AdJm58RDimhOO5NBMRu7s="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index 8fb8a19dabee..5b154c8c9ace 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x8tgdrb4WtjCaa28A4+fL/lUgMYaN71bEyQ1iDayNHM="; + sha256 = "sha256-jvQCXSdEw8xQ8m2xBLDu7pw9K51lAH3nzCr2N0/+Kuw="; }; - vendorSha256 = "sha256-FJEB7rii6DcWyGqrmPEKOZTy27tG+CkZ2xUY+cpKakE="; + vendorSha256 = "sha256-rosoPXNb3NYI5mM0gt3Fpg2XZtSLt90jxcBqALx7Lno="; doCheck = false;