Unverified Commit 2b6ad513 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

ustream-ssl: unstable-2023-11-11 -> 0-unstable-2024-03-26
parents 7a6764ed 0400fc25

pkgs/development/libraries/libubox/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/development/libraries/ubus/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/development/libraries/uclient/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -26,5 +26,6 @@ stdenv.mkDerivation { 
    maintainers = with maintainers; [ mkg20001 ];

    mainProgram = "uclient-fetch";

    platforms = platforms.all;

    broken = stdenv.isDarwin;

  };

}

pkgs/development/libraries/ustream-ssl/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/tools/networking/uqmi/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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; {