summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix4
-rw-r--r--pkgs/applications/version-management/gitea/default.nix4
-rw-r--r--pkgs/development/embedded/platformio/core.nix40
-rw-r--r--pkgs/development/embedded/platformio/default.nix4
-rw-r--r--pkgs/development/embedded/platformio/use-local-spdx-license-list.patch2
-rw-r--r--pkgs/development/interpreters/falcon/default.nix4
-rw-r--r--pkgs/development/libraries/pe-parse/default.nix12
-rw-r--r--pkgs/development/python-modules/pyglet/default.nix4
-rw-r--r--pkgs/development/python-modules/python-glanceclient/default.nix12
-rw-r--r--pkgs/servers/http/nginx/generic.nix2
-rw-r--r--pkgs/tools/networking/curl/default.nix4
-rw-r--r--pkgs/tools/security/chipsec/default.nix2
-rw-r--r--pkgs/tools/security/gopass/default.nix8
-rw-r--r--pkgs/tools/text/html-tidy/default.nix15
-rw-r--r--pkgs/top-level/all-packages.nix4
15 files changed, 67 insertions, 54 deletions
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
index 0b692104a4fa..42e5d63240a9 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "deltachat-cursed";
- version = "0.3.1";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "adbenitez";
repo = "deltachat-cursed";
rev = "v${version}";
- hash = "sha256-IZrTPnj6eX1qgEPnEiD9qmVkwn1SMK38gVKAJFgZNfw=";
+ hash = "sha256-li6HsatiRJPVKKBBHyWhq2b8HhvDrOUiVT2tSupjuag=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 6ad600e07ccb..fbf0138ce5aa 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.16.7";
+ version = "1.16.8";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "sha256-UVmbFtHC4W3WF+DptdHMMUoe8UE5TVgoM9QRuczSrEg=";
+ sha256 = "sha256-W/AbRfnEQfnTjXJ8wTKEFOTld4rFsBvJiXnYK8Ugoj0=";
};
unpackPhase = ''
diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix
index c40f2f45f312..f44ba4e95b8e 100644
--- a/pkgs/development/embedded/platformio/core.nix
+++ b/pkgs/development/embedded/platformio/core.nix
@@ -9,32 +9,13 @@
let
python = python3.override {
packageOverrides = self: super: {
- semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec {
- version = "2.9.0";
- src = fetchPypi {
- pname = "semantic_version";
- version = version;
- sha256 = "1chjd8019wnwb5mnd4x4jw9f8nhzg0xnapsdznk0fpiyamrlixdb";
- };
- });
-
starlette = super.starlette.overridePythonAttrs (oldAttrs: rec {
- version = "0.18.0";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "encode";
repo = "starlette";
rev = version;
- sha256 = "1dpj33cggjjvpd3qdf6hv04z5ckcn9f5dfn98p5a8hx262kgsr9p";
- };
- });
-
- uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
- version = "0.17.0";
- src = fetchFromGitHub {
- owner = "encode";
- repo = "uvicorn";
- rev = version;
- sha256 = "142x8skb1yfys6gndfaay2r240j56dkr006p49pw4y9i0v85kynp";
+ sha256 = "sha256-bSgPjKqM262PSufz1LHwrdM+uU8xO55Mifv66HRN02Y=";
};
});
};
@@ -75,6 +56,8 @@ with python.pkgs; buildPythonApplication rec {
];
pytestFlagsArray = (map (e: "--deselect tests/${e}") [
+ "commands/pkg/test_exec.py::test_pkg_specified"
+ "commands/pkg/test_exec.py::test_unrecognized_options"
"commands/test_ci.py::test_ci_boards"
"commands/test_ci.py::test_ci_build_dir"
"commands/test_ci.py::test_ci_keep_build_dir"
@@ -84,6 +67,7 @@ with python.pkgs; buildPythonApplication rec {
"commands/test_init.py::test_init_duplicated_boards"
"commands/test_init.py::test_init_enable_auto_uploading"
"commands/test_init.py::test_init_ide_atom"
+ "commands/test_init.py::test_init_ide_clion"
"commands/test_init.py::test_init_ide_eclipse"
"commands/test_init.py::test_init_ide_vscode"
"commands/test_init.py::test_init_incorrect_board"
@@ -112,9 +96,6 @@ with python.pkgs; buildPythonApplication rec {
"commands/test_lib_complex.py::test_lib_show"
"commands/test_lib_complex.py::test_lib_stats"
"commands/test_lib_complex.py::test_search"
- "commands/test_test.py::test_local_env"
- "commands/test_test.py::test_multiple_env_build"
- "commands/test_test.py::test_setup_teardown_are_compilable"
"package/test_manager.py::test_download"
"package/test_manager.py::test_install_force"
"package/test_manager.py::test_install_from_registry"
@@ -132,12 +113,21 @@ with python.pkgs; buildPythonApplication rec {
"test_misc.py::test_platformio_cli"
"test_pkgmanifest.py::test_packages"
]) ++ (map (e: "--ignore=tests/${e}") [
+ "commands/pkg/test_install.py"
+ "commands/pkg/test_list.py"
+ "commands/pkg/test_outdated.py"
+ "commands/pkg/test_search.py"
+ "commands/pkg/test_show.py"
+ "commands/pkg/test_uninstall.py"
+ "commands/pkg/test_update.py"
"commands/test_boards.py"
"commands/test_check.py"
"commands/test_platform.py"
+ "commands/test_run.py"
+ "commands/test_test.py"
"commands/test_update.py"
- "test_maintenance.py"
"test_ino2cpp.py"
+ "test_maintenance.py"
]) ++ [
"tests"
];
diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix
index 31b7b8d49518..000c23898ff4 100644
--- a/pkgs/development/embedded/platformio/default.nix
+++ b/pkgs/development/embedded/platformio/default.nix
@@ -4,14 +4,14 @@
let
callPackage = newScope self;
- version = "5.2.5";
+ version = "6.0.1";
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
src = fetchFromGitHub {
owner = "platformio";
repo = "platformio-core";
rev = "v${version}";
- sha256 = "1x1jqprwzpb09ca953rqbh2jvizh7bz8yj30krphb6007bnjilwy";
+ sha256 = "sha256-noLdQctAaMNmfuxI3iybHFx3Q9aTr3gZaUZ+/uO+fnA=";
};
self = {
diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
index 342fb120a0f7..65fcbd39d6a1 100644
--- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
+++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
@@ -6,7 +6,7 @@ index 416dccfd..896c3649 100644
@staticmethod
@memoized(expire="1h")
def load_spdx_licenses():
-- version = "3.16"
+- version = "3.17"
- spdx_data_url = (
- "https://raw.githubusercontent.com/spdx/license-list-data/"
- "v%s/json/licenses.json" % version
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix
index 0d2aa0b64203..40c05113ecff 100644
--- a/pkgs/development/interpreters/falcon/default.nix
+++ b/pkgs/development/interpreters/falcon/default.nix
@@ -1,6 +1,6 @@
-{ lib, gccStdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
-gccStdenv.mkDerivation {
+stdenv.mkDerivation {
pname = "falcon";
version = "unstable-2018-10-23";
diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix
index c8689d15e24b..d9ccb4447b2f 100644
--- a/pkgs/development/libraries/pe-parse/default.nix
+++ b/pkgs/development/libraries/pe-parse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake }:
+{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch }:
stdenv.mkDerivation rec {
pname = "pe-parse";
@@ -11,10 +11,14 @@ stdenv.mkDerivation rec {
hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k=";
};
- nativeBuildInputs = [ cmake ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/trailofbits/pe-parse/commit/eecdb3d36eb44e306398a2e66e85490f9bdcc74c.patch";
+ hash = "sha256-pd6D/JMctiQqJxnJU9Nm/GDVf4/CaIGeXx1UfdcCupo=";
+ })
+ ];
- # See https://github.com/trailofbits/pe-parse/issues/169
- NIX_CFLAGS_COMPILE = "-Wno-sign-conversion";
+ nativeBuildInputs = [ cmake ];
doInstallCheck = true;
installCheckPhase = ''
diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index 029061b80108..6048991cbff2 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -18,13 +18,13 @@
}:
buildPythonPackage rec {
- version = "1.5.24";
+ version = "1.5.26";
pname = "pyglet";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-W0pNXlrVSUbjFJLqxn9ykuUaZXckRkGidxgPkKAZKo4=";
+ sha256 = "sha256-7oxeC1uH34QYjiDlUpguuo2gCUS0xVYPHP3VyXFNGbA=";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix
index 3d290ae5eda5..f534d4968af1 100644
--- a/pkgs/development/python-modules/python-glanceclient/default.nix
+++ b/pkgs/development/python-modules/python-glanceclient/default.nix
@@ -11,6 +11,7 @@
, oslo-i18n
, wrapt
, pyopenssl
+, pythonOlder
, stestr
, testscenarios
, ddt
@@ -19,11 +20,14 @@
buildPythonApplication rec {
pname = "python-glanceclient";
- version = "3.6.0";
+ version = "4.0.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-gi1IYtWJL2pltoKTRy5gsHTRwHlp0GHoBMbh1UP5g9o=";
+ hash = "sha256-a3tFLmSKuaKbBQy32EkU7sPIEQtN5gaDqoGT03gka+w=";
};
postPatch = ''
@@ -54,7 +58,9 @@ buildPythonApplication rec {
stestr run
'';
- pythonImportsCheck = [ "glanceclient" ];
+ pythonImportsCheck = [
+ "glanceclient"
+ ];
meta = with lib; {
description = "Python bindings for the OpenStack Images API";
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index e189a7d2fdff..79ca0d2eb5d8 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -165,7 +165,7 @@ stdenv.mkDerivation {
passthru = {
modules = modules;
tests = {
- inherit (nixosTests) nginx nginx-auth nginx-etag nginx-pubhtml nginx-sandbox nginx-sso;
+ inherit (nixosTests) nginx nginx-auth nginx-etag nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso;
variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
acme-integration = nixosTests.acme;
} // passthru.tests;
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 66d2dfcdb9ae..879f8e2e38f1 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, perl
+{ lib, stdenv, fetchurl, pkg-config, perl, nixosTests
, brotliSupport ? false, brotli ? null
, c-aresSupport ? false, c-ares ? null
, gnutlsSupport ? false, gnutls ? null
@@ -177,6 +177,8 @@ stdenv.mkDerivation rec {
'';
passthru = {
+ # Additional checking with support http3 protocol.
+ tests.nginx-http3 = nixosTests.nginx-http3;
inherit opensslSupport openssl;
tests = {
inherit curlpp coeurl;
diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index 64d8885eedd4..5b4957139d75 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -68,6 +68,6 @@ python3.pkgs.buildPythonApplication rec {
license = licenses.gpl2Only;
homepage = "https://github.com/chipsec/chipsec";
maintainers = with maintainers; [ johnazoidberg ];
- platforms = if withDriver then [ "x86_64-linux" ] else platforms.all;
+ platforms = [ "x86_64-linux" ] ++ lib.optional (!withDriver) "x86_64-darwin";
};
}
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 4e3926d7f064..f283a911a62c 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
- version = "1.14.1";
+ version = "1.14.2";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-vdMOD6Zrl718jcntjEzOG+4Rr0aqhm0YidA0x3Gseqg=";
+ sha256 = "sha256-JhLFax0UR/AVl/736pdsAyyQF/555YmLWLnZrsLDjlA=";
};
- vendorSha256 = "sha256-mdPAZrcdlq7R7DRIfuxf4PCpEJoJjzo/+TDKAVglk7A=";
+ vendorSha256 = "sha256-ESIlmY3SzmfWLqLxf62dOhAsHPOKc2YYSOhzpJCjvCQ=";
subPackages = [ "." ];
@@ -57,7 +57,7 @@ buildGoModule rec {
description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go";
homepage = "https://www.gopass.pw/";
license = licenses.mit;
- maintainers = with maintainers; [ rvolosatovs ];
+ maintainers = with maintainers; [ rvolosatovs sikmir ];
changelog = "https://github.com/gopasspw/gopass/raw/v${version}/CHANGELOG.md";
longDescription = ''
diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index 9694295ed1fa..d80b8e8c899c 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libxslt }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libxslt, html-tidy }:
stdenv.mkDerivation rec {
pname = "html-tidy";
@@ -11,9 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ZMz0NySxzX2XHiqB8f5asvwjIG6kdIcq8Gb3EbAxBaU=";
};
- nativeBuildInputs = [ cmake libxslt/*manpage*/ ];
+ # https://github.com/htacg/tidy-html5/pull/1036
+ patches = (fetchpatch {
+ url = "https://github.com/htacg/tidy-html5/commit/e9aa038bd06bd8197a0dc049380bc2945ff55b29.diff";
+ sha256 = "sha256-Q2GjinNBWLL+HXUtslzDJ7CJSTflckbjweiSMCnIVwg=";
+ });
- cmakeFlags = [];
+ nativeBuildInputs = [ cmake libxslt/*manpage*/ ]
+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) html-tidy;
+
+ cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "-DHOST_TIDY=tidy"
+ ];
# ATM bin/tidy is statically linked, as upstream provides no other option yet.
# https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ebb7608596b..e50917ea399a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13080,7 +13080,9 @@ with pkgs;
hop = callPackage ../development/compilers/hop { };
- falcon = callPackage ../development/interpreters/falcon { };
+ falcon = callPackage ../development/interpreters/falcon {
+ stdenv = gcc10Stdenv;
+ };
fsharp = callPackage ../development/compilers/fsharp { };
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 18:32:43 +0000