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

Merge pull request #305794 from wegank/ustream-ssl-bump

Browse Source 
ustream-ssl: unstable-2023-11-11 -> 0-unstable-2024-03-26
This commit is contained in:
Weijia Wang 2024-05-14 10:43:09 +02:00 committed by GitHub
commit 2b6ad513c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,10 @@ stdenv.mkDerivation {
done
'';
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
"-Wno-error=gnu-folding-constant"
]);
meta = with lib; {
description = "C utility functions for OpenWrt";
homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary";

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

@ -14,6 +14,10 @@ stdenv.mkDerivation {
buildInputs = [ libubox libjson ];
nativeBuildInputs = [ cmake ];
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
"-Wno-error=gnu-folding-constant"
]);
meta = with lib; {
description = "OpenWrt system message/RPC bus";
homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";

1
pkgs/development/libraries/uclient/default.nix
View File

@ -26,5 +26,6 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ mkg20001 ];
mainProgram = "uclient-fetch";
platforms = platforms.all;
broken = stdenv.isDarwin;
};
}

6
pkgs/development/libraries/ustream-ssl/default.nix
View File

@ -10,12 +10,12 @@
stdenv.mkDerivation {
pname = "ustream-ssl";
version = "unstable-2023-11-11";
version = "0-unstable-2024-03-26";
src = fetchgit {
url = "https://git.openwrt.org/project/ustream-ssl.git";
rev = "263b9a97cf7e1e2467319c23832b705fc01190b5";
hash = "sha256-RLHU6swNbS3DL3QbKnwU4BbD0EFGKCrHHp0hbnoSssw=";
rev = "7621339d7694abef5da5e5353ac440f2d39dcecb";
hash = "sha256-No0Pk8KbkT7W4Rav7W3rMKEJISbp7RRoRx7t6LPMxlk=";
};
preConfigure = ''

2
pkgs/tools/networking/uqmi/default.nix
View File

@ -22,6 +22,8 @@ stdenv.mkDerivation {
# Needed with GCC 12 but breaks on darwin (with clang) or older gcc
"-Wno-error=dangling-pointer"
"-Wno-error=maybe-uninitialized"
] ++ lib.optionals stdenv.cc.isClang [
"-Wno-error=sometimes-uninitialized"
]);
meta = with lib; {

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

@ -20428,7 +20428,10 @@ with pkgs;
ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; additional_buildInputs = [ openssl ]; };
ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; };
ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl {
ssl_implementation = mbedtls_2;
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
uri = callPackage ../development/libraries/uri { };