cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-12-13 12:02:10 +00:00 committed by GitHub
commit 01264ca49d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 81 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/cluster/kyverno/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kyverno"; pname = "kyverno";
version = "1.8.3"; version = "1.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyverno"; owner = "kyverno";
repo = "kyverno"; repo = "kyverno";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AsUgjGoDoT/GN+Z2tXd0KjVFcVI1KF3nVRsLDWkY9HM="; sha256 = "sha256-VAKT1gw8wkfde/rQVvRzq4HH0mKcLczR5EHtxy3zULg=";
}; };
ldflags = [ ldflags = [

4
pkgs/applications/version-management/git-and-tools/git-team/default.nix
View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "git-team"; pname = "git-team";
version = "1.8.0"; version = "1.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hekmekk"; owner = "hekmekk";
repo = "git-team"; repo = "git-team";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-LZR30zqwit/xydQbpGm1LXd/tno/sTCaftgjVkVS6ZY="; hash = "sha256-+j5d1tImVHaTx63uzLdh2YNCFa1ErAVv4OMwxOutBQ4=";
}; };
vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A="; vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A=";

2
pkgs/desktops/gnome/games/five-or-more/default.nix
View file

@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
description = "Remove colored balls from the board by forming lines"; description = "Remove colored balls from the board by forming lines";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/four-in-a-row/default.nix
View file

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "Make lines of the same color to win"; description = "Make lines of the same color to win";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/gnome-chess/default.nix
View file

@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
description = "Play the classic two-player boardgame of chess"; description = "Play the classic two-player boardgame of chess";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/gnome-klotski/default.nix
View file

@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
description = "Slide blocks to solve the puzzle"; description = "Slide blocks to solve the puzzle";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/gnome-mahjongg/default.nix
View file

@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
description = "Disassemble a pile of tiles by removing matching pairs"; description = "Disassemble a pile of tiles by removing matching pairs";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/gnome-mines/default.nix
View file

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "Clear hidden mines from a minefield"; description = "Clear hidden mines from a minefield";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/gnome-robots/default.nix
View file

@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
description = "Avoid the robots and make them crash into each other"; description = "Avoid the robots and make them crash into each other";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/gnome-sudoku/default.nix
View file

@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
description = "Test your logic skills in this number grid puzzle"; description = "Test your logic skills in this number grid puzzle";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/gnome-taquin/default.nix
View file

@ -70,6 +70,6 @@ stdenv.mkDerivation rec {
description = "Move tiles so that they reach their places"; description = "Move tiles so that they reach their places";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/gnome-tetravex/default.nix
View file

@ -71,6 +71,6 @@ stdenv.mkDerivation rec {
description = "Complete the puzzle by matching numbered tiles"; description = "Complete the puzzle by matching numbered tiles";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/iagno/default.nix
View file

@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
description = "Computer version of the game Reversi, more popularly called Othello"; description = "Computer version of the game Reversi, more popularly called Othello";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/desktops/gnome/games/lightsoff/default.nix
View file

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

4
pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "appthreat-vulnerability-db"; pname = "appthreat-vulnerability-db";
version = "4.1.11"; version = "4.1.12";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "AppThreat"; owner = "AppThreat";
repo = "vulnerability-db"; repo = "vulnerability-db";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-JaHIq1tUMxEaxigT1Z3EpJK4P2Yapki0A53WNrHo4tQ="; hash = "sha256-DHjB8hT9rP1yyeo9I5D8JGIXq+17RYX+e6H7BBuWTw4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

24
pkgs/development/python-modules/autopep8/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, fetchPypi , fetchFromGitHub
, fetchpatch
, buildPythonPackage , buildPythonPackage
, pycodestyle , pycodestyle
, glibcLocales , glibcLocales
@ -11,11 +12,21 @@ buildPythonPackage rec {
pname = "autopep8"; pname = "autopep8";
version = "2.0.0"; version = "2.0.0";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "hhatto";
sha256 = "sha256-ixZZx/AD5pMZn1LK/9wGWFuwcWkAu8anRC/ZMdZYwHc="; 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 ]; propagatedBuildInputs = [ pycodestyle tomli ];
checkInputs = [ checkInputs = [
@ -23,11 +34,6 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
disabledTests = [
# missing tox.ini file from pypi package
"test_e101_skip_innocuous"
];
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
meta = with lib; { meta = with lib; {

20
pkgs/development/python-modules/pytest-filter-subpackage/default.nix
View file

@ -5,23 +5,29 @@
, pytest-cov , pytest-cov
, pytest-doctestplus , pytest-doctestplus
, pytestCheckHook , pytestCheckHook
, pythonOlder
, setuptools-scm , setuptools-scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytest-filter-subpackage"; pname = "pytest-filter-subpackage";
version = "0.1.1"; version = "0.1.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1s4s2kd31yc65rfvl4xhy8xx806xhy59kc7668h6b6wq88xgrn5p"; hash = "sha256-H66jZxeAPlJFiNbBCdJtINOzRCLo1qloEnWJd9ygF4I=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
setuptools-scm setuptools-scm
]; ];
buildInputs = [ pytest ]; buildInputs = [
pytest
];
propagatedBuildInputs = [ propagatedBuildInputs = [
pytest-doctestplus pytest-doctestplus
@ -33,11 +39,15 @@ buildPythonPackage rec {
]; ];
# missing some files # missing some files
disabledTests = [ "with_rst" ]; disabledTests = [
"with_rst"
];
meta = with lib; { meta = with lib; {
description = "Meta-package containing dependencies for testing"; 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; license = licenses.bsd3;
maintainers = with maintainers; [ ];
}; };
} }

13
pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
View file

@ -1,17 +1,18 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, buildGoModule , buildGoModule
, installShellFiles
}: }:
buildGoModule rec { buildGoModule rec {
pname = "cirrus-cli"; pname = "cirrus-cli";
version = "0.92.0"; version = "0.92.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cirruslabs"; owner = "cirruslabs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-q6hpsyZZep8IERYh7/oVcCQdgc/s6HufiuE4oNPBaZc="; sha256 = "sha256-ehJyC5NXB53i7ZpWTKySnMwWiqgbgBbnxIVWhyrXC0A=";
}; };
vendorSha256 = "sha256-Llq6siZn34sHsZFneT+MLXf2W9cXqi4DZwrH1R5laOY="; vendorSha256 = "sha256-Llq6siZn34sHsZFneT+MLXf2W9cXqi4DZwrH1R5laOY=";
@ -21,6 +22,14 @@ buildGoModule rec {
"-X github.com/cirruslabs/cirrus-cli/internal/version.Commit=v${version}" "-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 # tests fail on read-only filesystem
doCheck = false; doCheck = false;

22
pkgs/development/tools/ocaml/merlin/4.x.nix
View file

@ -2,7 +2,7 @@
, substituteAll , substituteAll
, fetchurl , fetchurl
, ocaml , ocaml
, dune_2 , dune_3
, buildDunePackage , buildDunePackage
, yojson , yojson
, csexp , csexp
@ -15,16 +15,17 @@
}: }:
let let
merlinVersion = "4.6"; merlinVersion = "4.7";
hashes = { hashes = {
"4.6-412" = "sha256-isiurLeWminJQQR4oHpJPCzVk6cEmtQdX4+n3Pdka5c="; "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y=";
"4.6-413" = "sha256-8903H4TE6F/v2Kw1XpcpdXEiLIdb9llYgt42zSR9kO4="; "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU=";
"4.6-414" = "sha256-AuvXCjx32JQBY9vkxAd0pEjtFF6oTgrT1f9TJEEDk84="; "4.7-414" = "sha256-bIZ4kwmnit/ujM2//jZA59rweo7Y0QfDb+BpoTxswHs=";
"4.7-500" = "sha256-elYb/0vVvohi9yYFe/54brb6Qh6fyiN1kYPRq5fP1zE=";
}; };
ocamlVersionShorthand = lib.concatStrings ocamlVersionShorthand = lib.substring 0 3
(lib.take 2 (lib.splitVersion ocaml.version)); (lib.concatStrings (lib.splitVersion ocaml.version));
version = "${merlinVersion}-${ocamlVersionShorthand}"; version = "${merlinVersion}-${ocamlVersionShorthand}";
in in
@ -36,6 +37,7 @@ else
buildDunePackage { buildDunePackage {
pname = "merlin"; pname = "merlin";
inherit version; inherit version;
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz";
@ -46,7 +48,7 @@ buildDunePackage {
(substituteAll { (substituteAll {
src = ./fix-paths.patch; src = ./fix-paths.patch;
dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; 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 = [ buildInputs = [
dot-merlin-reader dot-merlin-reader
yojson yojson
(if lib.versionAtLeast version "4.6-414" (if lib.versionAtLeast version "4.7-414"
then merlin-lib then merlin-lib
else csexp) else csexp)
menhirSdk menhirSdk
menhirLib menhirLib
]; ];
doCheck = true; doCheck = false;
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
patchShebangs tests/merlin-wrapper patchShebangs tests/merlin-wrapper

2
pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
View file

@ -7,7 +7,7 @@ buildDunePackage rec {
minimalOCamlVersion = "4.06"; minimalOCamlVersion = "4.06";
buildInputs = if lib.versionAtLeast version "4.6-414" buildInputs = if lib.versionAtLeast version "4.7-414"
then [ merlin-lib ] then [ merlin-lib ]
else [ yojson csexp ]; else [ yojson csexp ];

2
pkgs/games/qqwing/default.nix
View file

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = "https://qqwing.com"; homepage = "https://qqwing.com";
description = "Sudoku generating and solving software"; description = "Sudoku generating and solving software";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };
} }

4
pkgs/servers/dns/knot-dns/default.nix
View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "knot-dns"; pname = "knot-dns";
version = "3.2.3"; version = "3.2.4";
src = fetchurl { src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "f736ef284358923e312f8e1e3c6ce7c97b20965b09eb65705e9f7e3d5e9a9d79"; sha256 = "299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13";
}; };
outputs = [ "bin" "out" "dev" ]; outputs = [ "bin" "out" "dev" ];

6
pkgs/servers/pocketbase/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "pocketbase"; pname = "pocketbase";
version = "0.9.0"; version = "0.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pocketbase"; owner = "pocketbase";
repo = pname; repo = pname;
rev = "v${version}"; 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 # This is the released subpackage from upstream repo
subPackages = [ "examples/base" ]; subPackages = [ "examples/base" ];

6
pkgs/tools/misc/mutagen-compose/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "mutagen-compose"; pname = "mutagen-compose";
version = "0.16.2"; version = "0.16.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mutagen-io"; owner = "mutagen-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-x8tgdrb4WtjCaa28A4+fL/lUgMYaN71bEyQ1iDayNHM="; sha256 = "sha256-jvQCXSdEw8xQ8m2xBLDu7pw9K51lAH3nzCr2N0/+Kuw=";
}; };
vendorSha256 = "sha256-FJEB7rii6DcWyGqrmPEKOZTy27tG+CkZ2xUY+cpKakE="; vendorSha256 = "sha256-rosoPXNb3NYI5mM0gt3Fpg2XZtSLt90jxcBqALx7Lno=";
doCheck = false; doCheck = false;