JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-05-12 12:09:45 +00:00 committed by GitHub
commit 6705a41352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 438 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View File

@ -217,6 +217,12 @@ let
flycheck-rtags = fix-rtags super.flycheck-rtags;
pdf-tools = super.pdf-tools.overrideAttrs (old: {
# Temporary work around for:
# - https://github.com/vedang/pdf-tools/issues/102
# - https://github.com/vedang/pdf-tools/issues/103
# - https://github.com/vedang/pdf-tools/issues/109
CXXFLAGS = "-std=c++17";
nativeBuildInputs = [
pkgs.autoconf
pkgs.automake

12
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -2566,6 +2566,18 @@ final: prev:
meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";
};
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
version = "2022-05-07";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
rev = "b614a9d315512ec4ce9c1df41474e5ab8e12f7df";
sha256 = "0gb7q4fbv3754ck44h6dd93dcy8j4czhhna1d2kgq21614xs303k";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf.vim";
version = "2022-04-07";

4
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -293,6 +293,10 @@ self: super: {
'';
});
fzf-lua = super.fzf-lua.overrideAttrs (old: {
propagatedBuildInputs = [ fzf ];
});
fzf-vim = super.fzf-vim.overrideAttrs (old: {
dependencies = with self; [ fzfWrapper ];
});

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -214,6 +214,7 @@ https://github.com/BeneCollyridam/futhark-vim/,,
https://github.com/rktjmp/fwatch.nvim/,,
https://github.com/stsewd/fzf-checkout.vim/,,
https://github.com/gfanto/fzf-lsp.nvim/,,
https://github.com/ibhagwan/fzf-lua/,HEAD,
https://github.com/junegunn/fzf.vim/,,
https://github.com/NTBBloodbath/galaxyline.nvim/,,
https://github.com/jsfaint/gen_tags.vim/,,

2
pkgs/applications/networking/misc/zammad/default.nix
View File

@ -21,7 +21,7 @@
let
pname = "zammad";
version = "5.1.0";
version = "5.1.1";
src = applyPatches {

31
pkgs/applications/networking/misc/zammad/gemset.nix
View File

@ -664,10 +664,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04vxmjr200akcil9fqxc9ghbb9q0lyrh2q03xxncycd5vln910fi";
sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq";
type = "gem";
};
version = "6.2.0";
version = "6.2.1";
};
factory_bot_rails = {
dependencies = ["factory_bot" "railties"];
@ -1452,10 +1452,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd";
type = "gem";
};
version = "1.13.3";
version = "1.13.4";
};
nori = {
groups = ["default"];
@ -1700,10 +1700,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19mf9f5zx23cjjn0p77wz1igzpfr22mxhljgavffl8fwqq74v4ih";
sha256 = "01ldw5ba6xfn2k97n75n52qs4f0fy8xmn58c4247xf476nfvg035";
type = "gem";
};
version = "3.2.5";
version = "3.2.6";
};
power_assert = {
groups = ["default" "development" "test"];
@ -1786,10 +1786,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xvkz9xrd1cqnlm0qac1iwwxzndx3cc17zrjncpa4lzjfwbxhsnm";
sha256 = "0df9bknc2dllk8v9fhgidzbvbryaxa8fgifrk40cdz9csjsphbky";
type = "gem";
};
version = "4.3.11";
version = "4.3.12";
};
pundit = {
dependencies = ["activesupport"];
@ -1833,6 +1833,17 @@
};
version = "2.2.3";
};
rack-attack = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rc6simyql7ax5zzp667x6krl0xxxh3asc1av6gcn8j6cyl86wsx";
type = "gem";
};
version = "6.6.0";
};
rack-livereload = {
dependencies = ["rack"];
groups = ["development" "test"];
@ -2273,10 +2284,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "134zg0dzd7216lyczkhv01v27ikkmipjihcy2bzi0qv72p1i923i";
sha256 = "1wybcipkfawg4pragmayiig03xc084x3hbwywsh1dr9x9pa8f9hj";
type = "gem";
};
version = "1.1.5";
version = "1.1.6";
};
slack-notifier = {
groups = ["default"];

2
pkgs/applications/networking/misc/zammad/package.json
View File

@ -14,5 +14,5 @@
"stylelint-prettier": "^2.0.0"
},
"name": "Zammad",
"version": "5.1.0"
"version": "5.1.1"
}

5
pkgs/applications/networking/misc/zammad/source.json
View File

@ -1,7 +1,8 @@
{
"owner": "zammad",
"repo": "zammad",
"rev": "eefae45c2ad6e6a96b8df631d2f50f290ecbd27d",
"sha256": "EjowvM//+UsAfEH9/0jgLkiD7EWH34M1NQ9U2DotBqc=",
"rev": "d71bd90ef964426230664cdfbaa2572325bfed4f",
"sha256": "yzDTkjnRBl71REtSKRblkanJWhj7gp/+exhWjxGCFWw=",
"fetchSubmodules": true
}

16
pkgs/applications/science/electronics/vhd2vl/default.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, bison
, flex
, verilog
@ -19,12 +18,8 @@ stdenv.mkDerivation rec {
};
patches = lib.optionals (!stdenv.isAarch64) [
# fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15
# for some strange reason, this is not needed for aarch64
(fetchpatch {
url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch";
sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf";
})
# fix build with verilog 11.0
./test.patch
];
nativeBuildInputs = [
@ -37,6 +32,13 @@ stdenv.mkDerivation rec {
verilog
];
# the "translate" target both (a) builds the software and (b) runs
# the tests (without validating the results)
buildTargets = [ "translate" ];
# the "diff" target examines the test results
checkTarget = "diff";
installPhase = ''
runHook preInstall
install -D -m755 src/vhd2vl $out/bin/vdh2vl

35
pkgs/applications/science/electronics/vhd2vl/test.patch Normal file
View File

@ -0,0 +1,35 @@
--- a/translated_examples/fifo.v 1970-01-01 00:00:01.000000000 +0000
+++ a/temp/verilog/fifo.v 2022-05-11 03:44:43.173604945 +0000
@@ -107,7 +107,7 @@
//--- Read address counter --------------
//---------------------------------------
assign add_RD_CE = (iempty == 1'b1) ? 1'b0 : (RD == 1'b0) ? 1'b0 : 1'b1;
- assign n_add_RD = (add_RD) + 4'h1;
+ assign n_add_RD = add_RD + 4'h1;
always @(posedge clk_RD, posedge rst) begin
if((rst == 1'b1)) begin
add_RD <= {5{1'b0}};
diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/test.v temp/verilog/test.v
--- a/translated_examples/test.v 1970-01-01 00:00:01.000000000 +0000
+++ a/temp/verilog/test.v 2022-05-11 03:44:43.189604945 +0000
@@ -125,7 +125,7 @@
endcase
end
- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]});
+ assign code1[1:0] = a[6:5] ^ {a[4],b[6]};
// Asynch process
always @(we, addr, config1, bip) begin
if(we == 1'b1) begin
diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/withselect.v temp/verilog/withselect.v
--- a/translated_examples/withselect.v 1970-01-01 00:00:01.000000000 +0000
+++ a/temp/verilog/withselect.v 2022-05-11 03:44:43.193604945 +0000
@@ -33,7 +33,7 @@
endcase
end
- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]});
+ assign code1[1:0] = a[6:5] ^ {a[4],b[6]};
assign foo = {(((1 + 1))-((0))+1){1'b0}};
assign egg = {78{1'b0}};
assign baz = {(((bus_width * 4))-((bus_width * 3 - 1))+1){1'b1}};

9
pkgs/applications/science/logic/monosat/default.nix
View File

@ -65,7 +65,7 @@ let
};
};
python = { buildPythonPackage, cython }: buildPythonPackage {
python = { buildPythonPackage, cython, pytestCheckHook }: buildPythonPackage {
inherit pname version src patches;
propagatedBuildInputs = [ core cython ];
@ -85,5 +85,12 @@ let
substituteInPlace setup.py \
--replace 'library_dir = "../../../../"' 'library_dir = "${core}/lib/"'
'';
checkInputs = [ pytestCheckHook ];
disabledTests = [
"test_assertAtMostOne"
"test_assertEqual"
];
};
in core

21
pkgs/applications/version-management/rapidsvn/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }:
{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python3, fetchpatch }:
stdenv.mkDerivation rec {
pname = "rapidsvn";
@ -9,13 +9,28 @@ stdenv.mkDerivation rec {
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
};
buildInputs = [ wxGTK subversion apr aprutil python2 ];
buildInputs = [ wxGTK subversion apr aprutil python3 ];
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
configureFlags = [ "--with-svn-include=${subversion.dev}/include"
"--with-svn-lib=${subversion.out}/lib" ];
patches = [
./fix-build.patch
# Python 3 compatibility patches
(fetchpatch {
url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/2e26fd5d6a413d6c3a055c17ac4840b95d1537e9.patch";
hash = "sha256-8acABzscgZh1bfAt35KHfU+nfaiO7P1b+lh34Bj0REI=";
})
(fetchpatch {
url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/92927af764f92b3731333ed3dba637f98611167a.patch";
hash = "sha256-4PdShGcfFwxjdI3ygbnKFAa8l9dGERq/xSl54WisgKM=";
})
(fetchpatch {
url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/3e375f11d94cb8faddb8b7417354a9fb51f304ec.patch";
hash = "sha256-BUpCMEH7jctOLtJktDUE52bxexfLemLItZ0IgdAnq9g=";
})
];
meta = {
@ -23,5 +38,7 @@ stdenv.mkDerivation rec {
homepage = "http://rapidsvn.tigris.org/";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.viric ];
platforms = lib.platforms.unix;
broken = stdenv.isDarwin;
};
}

7
pkgs/applications/virtualization/podman/default.nix
View File

@ -17,13 +17,13 @@
buildGoModule rec {
pname = "podman";
version = "4.0.3";
version = "4.1.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
sha256 = "sha256-o/CIs+3LnbaUUpOQI1hijrxH7f1qBnrQw56TJ18jKQw=";
sha256 = "sha256-3MR4ZhkhMLAK3KHu7JEV9z1/wlyCkxfx1i267TGxwt8=";
};
vendorSha256 = null;
@ -97,5 +97,8 @@ buildGoModule rec {
changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md";
license = licenses.asl20;
maintainers = with maintainers; [ marsam ] ++ teams.podman.members;
# requires >= 10.13 SDK https://github.com/NixOS/nixpkgs/issues/101229
# Undefined symbols for architecture x86_64: "_utimensat"
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

4
pkgs/applications/virtualization/runc/default.nix
View File

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "runc";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
sha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY=";
sha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8=";
};
vendorSha256 = null;

40
pkgs/data/documentation/nginx-doc/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib, stdenv, libxml2, libxslt, fetchhg }:
# Upstream maintains documentation (sources of https://nginx.org) in separate
# mercurial repository, which do not correspond to particular git commit, but at
# least has "introduced in version X.Y" comments.
#
# In other words, documentation does not necessary matches capabilities of
# $out/bin/nginx, but we have no better options.
stdenv.mkDerivation {
pname = "nginx-doc-unstable";
version = "2022-05-05";
src = fetchhg {
url = "https://hg.nginx.org/nginx.org";
rev = "a3aee2697d4e";
sha256 = "029n4mnmjw94h01qalmjgf1c2h3h7wm798xv5knk3padxiy4m28b";
};
patches = [ ./exclude-google-analytics.patch ];
nativeBuildInputs = [ libxslt libxml2 ];
# Generated documentation is not local-friendly, since it assumes that link to directory
# is the same as link to index.html in that directory, which is not how browsers behave
# with local filesystem.
#
# TODO: patch all relative links that do not end with .html.
# /en subdirectory must exist, relative links expect it.
installPhase = ''
mkdir -p $out/share/doc/nginx
mv libxslt/en $out/share/doc/nginx
'';
meta = with lib; {
description = "A reverse proxy and lightweight webserver (documentation)";
homepage = "https://nginx.org/";
license = licenses.bsd2;
platforms = platforms.all;
priority = 6;
maintainers = with maintainers; [ kaction ];
};
}

29
pkgs/data/documentation/nginx-doc/exclude-google-analytics.patch Normal file
View File

@ -0,0 +1,29 @@
Kill google analytics from local documentation.
diff -r bb0a2fbdc886 xslt/ga.xslt
--- a/xslt/ga.xslt Mon Apr 06 11:17:11 2020 +0100
+++ b/xslt/ga.xslt Thu Apr 09 10:29:02 2020 -0400
@@ -6,23 +6,6 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:template name="ga">
-
- <script>
- (function(w, d, s, l, i) {
- w[l] = w[l] || [];
- w[l].push({
- 'gtm.start': new Date().getTime(),
- event: 'gtm.js'
- });
- var f = d.getElementsByTagName(s)[0],
- j = d.createElement(s),
- dl = l != 'dataLayer' ? '&amp;l=' + l : '';
- j.async = true;
- j.src = '//www.googletagmanager.com/gtm.js?id=' + i + dl;
- f.parentNode.insertBefore(j, f);
- })(window, document, 'script', 'dataLayer', 'GTM-TPSP33');
- </script>
-
</xsl:template>
</xsl:stylesheet>

26
pkgs/development/libraries/flatbuffers/1.12.nix
View File

@ -1,26 +0,0 @@
{ callPackage, fetchpatch, lib, stdenv }:
callPackage ./generic.nix {
version = "1.12.0";
sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g";
patches = [
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch";
sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s";
excludes = [ "src/idl_gen_cpp.cpp" ];
})
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch";
sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4";
})
];
preConfigure = lib.optionalString stdenv.buildPlatform.isDarwin ''
rm BUILD
'';
}

16
pkgs/development/libraries/flatbuffers/2.0.nix
View File

@ -1,16 +0,0 @@
{ callPackage, fetchpatch }:
callPackage ./generic.nix {
version = "2.0.0";
sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8";
patches = [
# Pull patch pending upstream inclustion for gcc-12 support:
# https://github.com/google/flatbuffers/pull/6946
(fetchpatch {
name = "gcc-12.patch";
url = "https://github.com/google/flatbuffers/commit/17d9f0c4cf47a9575b4f43a2ac33eb35ba7f9e3e.patch";
sha256 = "0sksk47hi7camja9ppnjr88jfdgj0nxqxy8976qs1nx73zkgbpf9";
})
];
}

19
pkgs/development/libraries/flatbuffers/generic.nix → pkgs/development/libraries/flatbuffers/default.nix
View File

@ -1,25 +1,30 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, version
, sha256
, patches ? [ ]
, preConfigure ? null
}:
stdenv.mkDerivation rec {
pname = "flatbuffers";
inherit version;
version = "2.0.0";
src = fetchFromGitHub {
owner = "google";
repo = "flatbuffers";
rev = "v${version}";
inherit sha256;
sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8";
};
inherit patches preConfigure;
patches = [
# Pull patch pending upstream inclustion for gcc-12 support:
# https://github.com/google/flatbuffers/pull/6946
(fetchpatch {
name = "gcc-12.patch";
url = "https://github.com/google/flatbuffers/commit/17d9f0c4cf47a9575b4f43a2ac33eb35ba7f9e3e.patch";
sha256 = "0sksk47hi7camja9ppnjr88jfdgj0nxqxy8976qs1nx73zkgbpf9";
})
];
nativeBuildInputs = [ cmake ];

10
pkgs/development/python-modules/atomman/default.nix
View File

@ -13,6 +13,7 @@
, pymatgen
, pytest
, pythonOlder
, pythonAtLeast
, requests
, scipy
, toolz
@ -24,7 +25,7 @@ buildPythonPackage rec {
pname = "atomman";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
src = fetchFromGitHub {
owner = "usnistgov";
@ -57,8 +58,11 @@ buildPythonPackage rec {
checkPhase = ''
# pytestCheckHook doesn't work
pytest tests -k "not test_rootdir and not test_version \
and not test_atomic_mass and not imageflags" \
--ignore tests/plot/test_interpolate.py
and not test_atomic_mass and not imageflags \
and not test_build_unit and not test_set_and_get_in_units \
and not test_set_literal and not test_scalar_model " \
--ignore tests/plot/test_interpolate.py \
--ignore tests/tools/test_vect_angle.py
'';
pythonImportsCheck = [

6
pkgs/development/python-modules/dash/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dash";
version = "2.3.1";
version = "2.4.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,8 +23,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "plotly";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gsP/WbALUkO3AB0uuX/ByhzaeIDSUUE1Cb8Cnh4GEh0=";
rev = "refs/tags/v${version}";
sha256 = "sha256-7B1LEcEgUGJ/gDCDD4oURqli8I5YTJo9jl7l4E1aLVQ=";
};
propagatedBuildInputs = [

50
pkgs/development/python-modules/dparse2/default.nix Normal file
View File

@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, toml
, pyyaml
, packaging
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "dparse2";
version = "0.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "nexB";
repo = pname;
rev = version;
hash = "sha256-1tbNW7Gy7gvMnETdAM2ahHiwbhG9qvdYZggia1+7eGo=";
};
propagatedBuildInputs = [
toml
pyyaml
packaging
];
checkInputs = [
pytestCheckHook
];
disabledTestPaths = [
# Requries pipenv
"tests/test_parse.py"
];
pythonImportsCheck = [
"dparse2"
];
meta = with lib; {
description = "Module to parse Python dependency files";
homepage = "https://github.com/nexB/dparse2";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/python-modules/eiswarnung/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "eiswarnung";
version = "1.0.0";
version = "1.1.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "klaasnicolaas";
repo = "python-eiswarnung";
rev = "v${version}";
hash = "sha256-Cw/xRypErasdrOZJ/0dWLl4eYH01vBI9mYm98teIdRc=";
rev = "refs/tags/v${version}";
hash = "sha256-fyxqVSZcbo/rrItad5ZTwmp4N8s0HGBdxvx3LBax/hc=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/ftputil/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "ftputil";
version = "5.0.3";
version = "5.0.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-m4buZ8GYDOHYmxN1K8SLlJP+4GNJy0doKFlOduCPhIg=";
hash = "sha256-aInbhkndINm21ApsXw+EzPNAp9rB4L/A8AJAkPwq+zM=";
};
checkInputs = [

4
pkgs/development/python-modules/google-cloud-pubsub/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.12.0";
version = "2.12.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-5RoIpyVm/y2+6pN4mJPWHbVUwxH6yWI/vIuCVNJU2aw=";
hash = "sha256-mTphUjL61NwaE7vKDgeCv+0WeA15FNQzvnY/6fHZ/QU=";
};
propagatedBuildInputs = [

44
pkgs/development/python-modules/name-that-hash/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, click
, rich
}:
buildPythonPackage rec {
pname = "name-that-hash";
version = "1.10";
format = "pyproject";
src = fetchFromGitHub {
owner = "HashPals";
repo = pname;
rev = version;
hash = "sha256-3sddUPoC3NfKQzmNgqPf/uHaYN9VZBqsmV712uz1Phg=";
};
# TODO remove on next update which bumps rich
postPatch = ''
substituteInPlace pyproject.toml --replace 'rich = ">=9.9,<11.0"' 'rich = ">=9.9"'
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
click
rich
];
pythonImportsCheck = [ "name_that_hash" ];
meta = with lib; {
longDescription = "Don't know what type of hash it is? Name That Hash will name that hash type! Identify MD5, SHA256 and 300+ other hashes.";
description = "Module and CLI for the identification of hashes";
homepage = "https://github.com/HashPals/Name-That-Hash";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ eyjhb ];
};
}

4
pkgs/development/python-modules/puremagic/default.nix
View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "puremagic";
version = "1.12";
version = "1.13";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-jAuuwImSExc2KjD6yi6WeMkdXpfOAE3Gp8HGaeBUeDg=";
sha256 = "sha256-yaHw/pOqWLUtYoM3l/JB0JToLXdi04n0BSccRdbCVDw=";
};
# test data not included on pypi

60
pkgs/development/python-modules/python-rabbitair/default.nix Normal file
View File

@ -0,0 +1,60 @@
{ lib
, buildPythonPackage
, cryptography
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, typing-extensions
, zeroconf
}:
buildPythonPackage rec {
pname = "python-rabbitair";
version = "0.0.8";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "rabbit-air";
repo = pname;
rev = "v${version}";
hash = "sha256-CGr7NvnGRNTiKq5BpB/zmfgyd/2ggTbO0nj+Q+MavTs=";
};
propagatedBuildInputs = [
cryptography
zeroconf
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"rabbitair"
];
disabledTests = [
# Tests require network access
"test_info"
"test_no_response"
"test_protocol_error"
"test_sequential_requests"
"test_set_state"
"test_state_a2"
"test_state_a3"
"test_zeroconf"
];
meta = with lib; {
description = "Module for the control of Rabbit Air air purifiers";
homepage = "https://github.com/rabbit-air/python-rabbitair";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/python-modules/rflink/default.nix
View File

@ -8,6 +8,7 @@
, pyserial-asyncio
, setuptools
, pytestCheckHook
, pythonAtLeast
}:
buildPythonPackage rec {
@ -34,6 +35,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
# https://github.com/aequitas/python-rflink/issues/65
"tests/test_proxy.py"
];
postPatch = ''
substituteInPlace setup.py \
--replace "version=version_from_git()" "version='${version}'"

4
pkgs/development/python-modules/sentry-sdk/default.nix
View File

@ -42,7 +42,7 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "1.5.11";
version = "1.5.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -51,7 +51,7 @@ buildPythonPackage rec {
owner = "getsentry";
repo = "sentry-python";
rev = version;
hash = "sha256-2WN18hzOn/gomNvQNbm9R8CcxN6G1XxoodBHqsG6es0=";
hash = "sha256-8M0FWfvaGp74Fb+qJlhyiJPUVHN2ZdEleZf27d+bftE=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.1132";
version = "2.0.1136";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-jy6a421lOfNGhxEuCOw+0JRD9RH7XJFP0dxhN0taKmk=";
hash = "sha256-J9ZY0Sy8XWSQ4l1uTeZq3PATVyHXs2tmX/VOUzZKak4=";
};
nativeBuildInputs = with py.pkgs; [

7
pkgs/development/tools/kdash/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, pkg-config
@ -6,6 +7,7 @@
, python3
, openssl
, xorg
, AppKit
}:
rustPlatform.buildRustPackage rec {
@ -21,7 +23,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ perl python3 pkg-config ];
buildInputs = [ openssl xorg.xcbutil ];
buildInputs = [ openssl xorg.xcbutil ]
++ lib.optional stdenv.isDarwin AppKit;
cargoSha256 = "0nb554y8r7gvw7ls6gnrg98xxbws0mc6zdsc6ss3p2x9z8xwx204";

6
pkgs/os-specific/linux/firmware/linux-firmware/default.nix
View File

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "linux-firmware";
version = "20220310";
version = "20220509";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = "refs/tags/${version}";
sha256 = "sha256-U5XZHzriZaPlgiAcrZnAA7K8PKnIGy58Pi6JziVFTR8=";
sha256 = "sha256-pNuKA4XigrHU9qC5Ch6HLs3/tcv0zIkAzow9VOIVKdQ=";
};
installFlags = [ "DESTDIR=$(out)" ];
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-CAYJssH36aKhzvl0q60HyxgDXeAluspfnLLmawmWIQw=";
outputHash = "sha256-pXzWAu7ch4dHXvKzfrK826vtNqovCqL7pd+TIVbWnJQ=";
meta = with lib; {
description = "Binary firmware collection packaged by kernel.org";

19
pkgs/servers/http/nginx/generic.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
, nginx-doc
, nixosTests
, substituteAll, gd, geoip, perl
@ -23,6 +24,7 @@
, preConfigure ? ""
, postInstall ? null
, meta ? null
, nginx-doc ? outer.nginx-doc
, passthru ? { tests = {}; }
}:
@ -44,6 +46,8 @@ stdenv.mkDerivation {
inherit version;
inherit nginxVersion;
outputs = ["out" "doc"];
src = if src != null then src else fetchurl {
url = "https://nginx.org/download/nginx-${version}.tar.gz";
inherit sha256;
@ -114,8 +118,12 @@ stdenv.mkDerivation {
configurePlatforms = [];
preConfigure = preConfigure
+ concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
# Disable _multioutConfig hook which adds --bindir=$out/bin into configureFlags,
# which breaks build, since nginx does not actually use autoconf.
preConfigure = ''
setOutputFlags=
'' + preConfigure
+ concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
patches = map fixPatch ([
(substituteAll {
@ -145,6 +153,11 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
preInstall = ''
mkdir -p $doc
cp -r ${nginx-doc}/* $doc
'';
postInstall = if postInstall != null then postInstall else ''
mv $out/sbin $out/bin
'';

4
pkgs/servers/mail/dovecot/default.nix
View File

@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "dovecot";
version = "2.3.18";
version = "2.3.19";
nativeBuildInputs = [ perl pkg-config ];
buildInputs =
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
hash = "sha256-Buc/ZoxsCTxFve7rfCA5irjcSTFyNPS1eBrF4sxdbDM=";
hash = "sha256:0ys3zq9b1rgj1cz6a0i9l421y6h2j3b5zak2ia5j9dj1sj9zcwq1";
};
enableParallelBuilding = true;

4
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
View File

@ -3,11 +3,11 @@ let
dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
in stdenv.mkDerivation rec {
pname = "dovecot-pigeonhole";
version = "0.5.18";
version = "0.5.19";
src = fetchurl {
url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
hash = "sha256-ptgo+Nby3sulEFND7OXHplJFvZTkaorkQyptl1QxCKU=";
hash = "sha256:033kkhby9k9yrmgvlfmyzp8fccsw5bhq1dyvxj94sg3grkpj7f8h";
};
buildInputs = [ dovecot openssl ];

11
pkgs/shells/zsh/zsh-fzf-tab/darwin.patch
View File

@ -1,11 +0,0 @@
diff --git a/modules/Src/aloxaf/fzftab.c b/modules/Src/aloxaf/fzftab.c
index 60b6330..91975d8 100644
--- a/modules/Src/aloxaf/fzftab.c
+++ b/modules/Src/aloxaf/fzftab.c
@@ -1,6 +1,5 @@
#include "fzftab.mdh"
#include "fzftab.pro"
-#include <malloc.h>
#include <stdarg.h>
#include <stdlib.h>
#include <sys/stat.h>

2
pkgs/shells/zsh/zsh-fzf-tab/default.nix
View File

@ -16,8 +16,6 @@ in stdenv.mkDerivation rec {
strictDeps = true;
buildInputs = [ ncurses ];
patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
postConfigure = ''
pushd modules
./configure --disable-gdbm --without-tcsetpgrp

4
pkgs/tools/networking/getmail6/default.nix
View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "getmail6";
version = "6.18.8";
version = "6.18.9";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-MIK5++3SaGm1BMpU8G4X7n/SCBw+N39U44cyX65tPcQ=";
hash = "sha256-qzlURYdE7nv+/wxK3B6WddmhW6xiLS7em3X5O5+CBbI=";
};
# needs a Docker setup

2
pkgs/top-level/aliases.nix
View File

@ -403,6 +403,8 @@ mapAliases ({
flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07
flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07
flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # Added 2021-06-31
flatbuffers_1_12 = throw "FlatBuffers version 1.12 has been removed, because upstream no longer maintains it"; # Added 2022-05-12
flatbuffers_2_0 = flatbuffers; # Added 2022-05-12
flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # Added 2021-01-25
flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15
flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15

12
pkgs/top-level/all-packages.nix
View File

@ -7397,7 +7397,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit;
};
kdash = callPackage ../development/tools/kdash { };
kdash = callPackage ../development/tools/kdash {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { };
@ -8664,6 +8666,8 @@ with pkgs;
notable = callPackage ../applications/misc/notable { };
nth = with python3Packages; toPythonApplication name-that-hash;
ntlmrecon = callPackage ../tools/security/ntlmrecon { };
numberstation = callPackage ../applications/misc/numberstation { };
@ -20137,9 +20141,7 @@ with pkgs;
protozero = callPackage ../development/libraries/protozero { };
flatbuffers = flatbuffers_2_0;
flatbuffers_2_0 = callPackage ../development/libraries/flatbuffers/2.0.nix { };
flatbuffers_1_12 = callPackage ../development/libraries/flatbuffers/1.12.nix { };
flatbuffers = callPackage ../development/libraries/flatbuffers { };
nanopb = callPackage ../development/libraries/nanopb { };
@ -21998,6 +22000,8 @@ with pkgs;
nginx = nginxStable;
nginx-doc = callPackage ../data/documentation/nginx-doc { };
nginxQuic = callPackage ../servers/http/nginx/quic.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;

8
pkgs/top-level/python-packages.nix
View File

@ -2514,6 +2514,8 @@ in {
dparse = callPackage ../development/python-modules/dparse { };
dparse2 = callPackage ../development/python-modules/dparse2 { };
dpath = callPackage ../development/python-modules/dpath { };
dpkt = callPackage ../development/python-modules/dpkt { };
@ -5368,7 +5370,7 @@ in {
monosat = pkgs.monosat.python {
inherit buildPythonPackage;
inherit (self) cython;
inherit (self) cython pytestCheckHook;
};
monotonic = callPackage ../development/python-modules/monotonic { };
@ -5527,6 +5529,8 @@ in {
names = callPackage ../development/python-modules/names { };
name-that-hash = callPackage ../development/python-modules/name-that-hash { };
nampa = callPackage ../development/python-modules/nampa { };
nanoleaf = callPackage ../development/python-modules/nanoleaf { };
@ -8478,6 +8482,8 @@ in {
python-rapidjson = callPackage ../development/python-modules/python-rapidjson { };
python-rabbitair = callPackage ../development/python-modules/python-rabbitair { };
python-redis-lock = callPackage ../development/python-modules/python-redis-lock { };
python-registry = callPackage ../development/python-modules/python-registry { };