nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-08 21:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-01-10 12:01:46 +00:00 committed by GitHub
commit d6f51c0350
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libe57format/default.nix
View File

@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-4vVhKrCxnWO106DSAk+xxo4uk6zC89m9VQAPaDJ8Ed4="; sha256 = "sha256-4vVhKrCxnWO106DSAk+xxo4uk6zC89m9VQAPaDJ8Ed4=";
}) })
]; ];
CXXFLAGS = [
# GCC 13: error: 'int16_t' has not been declared in 'std'
"-include cstdint"
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake

4
pkgs/development/libraries/proj/7.nix
View File

@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DUSE_EXTERNAL_GTEST=ON" "-DUSE_EXTERNAL_GTEST=ON"
]; ];
CXXFLAGS = [
# GCC 13: error: 'int64_t' in namespace 'std' does not name a type
"-include cstdint"
];
doCheck = true; doCheck = true;

4
pkgs/development/libraries/proj/default.nix
View File

@ -45,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: rec {
"-DNLOHMANN_JSON_ORIGIN=external" "-DNLOHMANN_JSON_ORIGIN=external"
"-DEXE_SQLITE3=${buildPackages.sqlite}/bin/sqlite3" "-DEXE_SQLITE3=${buildPackages.sqlite}/bin/sqlite3"
]; ];
CXXFLAGS = [
# GCC 13: error: 'int64_t' in namespace 'std' does not name a type
"-include cstdint"
];
preCheck = preCheck =
let let

21
pkgs/development/python-modules/python3-saml/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, freezegun , freezegun
, isodate , isodate
, lxml , lxml
@ -23,26 +22,6 @@ buildPythonPackage rec {
hash = "sha256-KyDGmqhg/c29FaXPKK8rWKSBP6BOCpKKpOujCavXUcc="; hash = "sha256-KyDGmqhg/c29FaXPKK8rWKSBP6BOCpKKpOujCavXUcc=";
}; };
patches = [
# skip tests with expired test data
# upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373
(fetchpatch {
name = "test-expired.patch";
url = "https://github.com/SAML-Toolkits/python3-saml/commit/bd65578e5a21494c89320094c61c1c77250bea33.diff";
hash = "sha256-9Trew6R5JDjtc0NRGoklqMVDEI4IEqFOdK3ezyBU6gI=";
})
(fetchpatch {
name = "test-expired.patch";
url = "https://github.com/SAML-Toolkits/python3-saml/commit/ea3a6d4ee6ea0c5cfb0f698d8c0ed25638150f47.patch";
hash = "sha256-Q9+GM+mCEZK0QVp7ulH2hORVig2411OvkC4+o36DeXg=";
})
(fetchpatch {
name = "test-expired.patch";
url = "https://github.com/SAML-Toolkits/python3-saml/commit/feb0d1d954ee4d0ad1ad1d7d536bf9e83fa9431b.patch";
hash = "sha256-NURGI4FUnFlWRZfkioU9IYmZ+Zk9FKfZchjdn7N9abU=";
})
];
propagatedBuildInputs = [ propagatedBuildInputs = [
isodate isodate
lxml lxml