Merge pull request #271248 from Aleksanaa/bip

bip: 0.8.9 -> 0.9.3

authored by Weijia Wang and committed by GitHub e827537e 92023f20

+22 -36
+21 -33
pkgs/applications/networking/irc/bip/default.nix
··· 1 - { lib, stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , pkg-config 5 + , autoconf 6 + , automake 7 + , bison 8 + , flex 9 + , openssl 10 + }: 2 11 3 - stdenv.mkDerivation rec { 12 + stdenv.mkDerivation { 4 13 pname = "bip"; 5 - version = "0.8.9"; 14 + version = "0.9.3"; 6 15 7 - # fetch sources from debian, because the creator's website provides 8 - # the files only via https but with an untrusted certificate. 9 16 src = fetchurl { 10 - url = "mirror://debian/pool/main/b/bip/bip_${version}.orig.tar.gz"; 11 - sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w"; 17 + # Note that the number behind download is not predictable 18 + url = "https://projects.duckcorp.org/attachments/download/146/bip-0.9.3.tar.gz"; 19 + hash = "sha256-K+6AC8mg0aLQsCgiDoFBM5w2XrR+V2tfWnI8ByeRmOI="; 12 20 }; 13 21 14 - nativeBuildInputs = [ autoconf automake ]; 15 - buildInputs = [ bison flex openssl ]; 22 + outputs = [ "out" "man" "doc" ]; 16 23 17 - # includes an important security patch 18 - patches = [ 19 - (fetchpatch { 20 - url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/bip-freenode.patch"; 21 - sha256 = "05qy7a62p16f5knrsdv2lkhc07al18qq32ciq3k4r0lq1wbahj2y"; 22 - }) 23 - (fetchpatch { 24 - url = "https://projects.duckcorp.org/projects/bip/repository/revisions/39414f8ff9df63c8bc2e4eee34f09f829a5bf8f5/diff/src/connection.c?format=diff"; 25 - sha256 = "1hvg58vci6invh0z19wf04jjvnm8w6f6v4c4nk1j5hc3ymxdp1rb"; 26 - }) 27 - (fetchpatch { 28 - url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/87192685f55856d2c28021963ab2c308e21faddc/diff?format=diff"; 29 - sha256 = "0rspzp7q1lq8v0cl0c35xxpgisfk264i648vslgsjax2s0g9svx0"; 30 - }) 31 - (fetchpatch { 32 - url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/814d54c676d5827f6ea37c1cd2d6e846d080c13c/diff?format=diff"; 33 - sha256 = "137l77kmm6p9p4c4kvw2zc4xkr10ayyc9z5rlpwn67574h47v55i"; 34 - }) 35 - (fetchpatch { 36 - url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/d2dcb0adb1aa8c2c4526aa6ad650483b0e02ab7d/diff?format=diff"; 37 - sha256 = "1pvywaljdkmy4870xs6gvsk4qwg69h47qr0yjywbcdsfycrgp8aq"; 38 - }) 39 - ]; 24 + nativeBuildInputs = [ pkg-config autoconf automake ]; 25 + buildInputs = [ bison flex openssl ]; 40 26 41 - env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier"; 27 + # FIXME: Openssl3 deprecated PEM_read_DHparams and DH_free 28 + # https://projects.duckcorp.org/issues/780 29 + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; 42 30 43 31 meta = { 44 32 description = "An IRC proxy (bouncer)";
+1 -3
pkgs/top-level/all-packages.nix
··· 32871 32871 32872 32872 istioctl = callPackage ../applications/networking/cluster/istioctl { }; 32873 32873 32874 - bip = callPackage ../applications/networking/irc/bip { 32875 - openssl = openssl_1_1; 32876 - }; 32874 + bip = callPackage ../applications/networking/irc/bip { }; 32877 32875 32878 32876 j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { }; 32879 32877