From 5bcec70433a8ef270f27d98cd23b9b35ad8a86b3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 29 Jun 2022 18:49:49 +0300 Subject: [PATCH 1/8] fmt_8: 8.0.1 -> 8.1.1 nixpkgs-wayland waybar needs this and nixpkgs waybar will need this https://github.com/Alexays/Waybar/commit/36aa22189bb0c4cf5f916d89298a39ed730018b8 --- pkgs/development/libraries/fmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 3fee016175bc..efc403f2f214 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -49,7 +49,7 @@ in }; fmt_8 = generic { - version = "8.0.1"; - sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; + version = "8.1.1"; + sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; }; } From 9f86e929b081ae4dfaf4ef9a6919a1943b1bda55 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 19 Jul 2022 20:21:20 +0300 Subject: [PATCH 2/8] openroad: 2.0 -> unstable-2022-07-19 --- .../science/electronics/openroad/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index 1b1eb39cffa0..636caec6902a 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -8,7 +8,7 @@ , git , python3 , swig4 -, boost172 +, boost17x , cimg , eigen , lcov @@ -27,14 +27,14 @@ mkDerivation rec { pname = "openroad"; - version = "2.0"; + version = "unstable-2022-07-19"; src = fetchFromGitHub { owner = "The-OpenROAD-Project"; repo = "OpenROAD"; - rev = "v${version}"; + rev = "2610b3953ef62651825d89fb96917cf5d20af0f1"; fetchSubmodules = true; - sha256 = "1p677xh16wskfj06jnplhpc3glibhdaqxmk0j09832chqlryzwyx"; + sha256 = "sha256-BP0JSnxl1XyqHzDY4eITaGHevqd+rbjWZy/LAfDfELs="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ mkDerivation rec { ]; buildInputs = [ - boost172 + boost17x cimg eigen lcov @@ -70,7 +70,11 @@ mkDerivation rec { ''; # Enable output images from the placer. - cmakeFlags = [ "-DUSE_CIMG_LIB=ON" ]; + cmakeFlags = [ + "-DUSE_SYSTEM_BOOST=ON" + "-DUSE_CIMG_LIB=ON" + "-DOPENROAD_VERSION=${src.rev}" + ]; # Resynthesis needs access to the Yosys binaries. qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ yosys ]}" ]; @@ -84,6 +88,12 @@ mkDerivation rec { test/regression ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/openroad -version + $out/bin/sta -version + ''; + meta = with lib; { description = "OpenROAD's unified application implementing an RTL-to-GDS flow"; homepage = "https://theopenroadproject.org"; From e5424debbe79f8f17fc8496377e031d7d058a32c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Jul 2022 00:50:21 +0000 Subject: [PATCH 3/8] atkmm: 2.28.2 -> 2.28.3 --- pkgs/development/libraries/atkmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 7e3cecf12a92..d26611f45073 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atkmm"; - version = "2.28.2"; + version = "2.28.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oLtJdlzszCk6ssZzW6EAQxgH04T/oUwuvTDgeZP9L6Q="; + sha256 = "sha256-fCCItIapCb6NorGDBOVsX5CITRNDyNpzZ+pc0yWLmWk="; }; outputs = [ "out" "dev" ]; From 1975e320a69314e02d68246595159e38ed1640ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Jul 2022 01:39:36 +0000 Subject: [PATCH 4/8] atkmm_2_36: 2.36.1 -> 2.36.2 --- pkgs/development/libraries/atkmm/2.36.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/atkmm/2.36.nix b/pkgs/development/libraries/atkmm/2.36.nix index 6b22c34e0c2f..f03421619733 100644 --- a/pkgs/development/libraries/atkmm/2.36.nix +++ b/pkgs/development/libraries/atkmm/2.36.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atkmm"; - version = "2.36.1"; + version = "2.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-4RMkv+0bbjMKAtslzswUXcoD+w3/R/BxDIXjF2h9pFg="; + sha256 = "sha256-b2LdmfdGmF5XNgWTdXfM/JRDaPYGpxykY0LXDhza4Hk="; }; outputs = [ "out" "dev" ]; From 5fd3be651158fa10c1bd9f8108cf3a32516dfd17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Thu, 21 Jul 2022 22:47:33 -0400 Subject: [PATCH 5/8] visidata: 2.8 -> 2.9.1 --- pkgs/applications/misc/visidata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index e73c6e7b5dc3..2b688b8425bb 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -25,13 +25,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.8"; + version = "2.9.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1lcx444yrzmcvix977cgaf18lfrf9yrn2r14ln7knx8ghc15vkqb"; + hash = "sha256-PKj+imTSAGMpF1tkN0WmE3l/4FmWkm/ktIDzF2ku48s="; }; propagatedBuildInputs = [ From 308b5776a28e456750c423c697991ecf98d944d3 Mon Sep 17 00:00:00 2001 From: Nathan Parsons Date: Fri, 22 Jul 2022 21:16:37 +0100 Subject: [PATCH 6/8] cnijfilter2: 6.10 -> 6.40 (#180681) * cnijfilter2: 6.10 -> 6.40 * Fix compilation error related to duplicate definitions of GET_PROTOCOL - Resolves the compilation issue reported at https://github.com/NixOS/nixpkgs/pull/180681#issuecomment-1192304711 - An identical issue was previously reported in Gentoo: https://bugs.gentoo.org/723186 - This patch is taken from the solution of Alfredo Tupone (https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24688d64544b43f2c14be54531ad8764419dde09) Co-authored-by: Nathan Parsons --- .../misc/cups/drivers/cnijfilter2/default.nix | 23 +++++++++++++++---- .../cnijfilter2/patches/get_protocol.patch | 14 +++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 40a1414cfab3..8390d5e0ba84 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation { pname = "cnijfilter2"; - version = "6.10"; + version = "6.40"; src = fetchzip { - url = "https://gdlp01.c-wss.com/gds/1/0100010921/01/cnijfilter2-source-6.10-1.tar.gz"; - sha256 = "0w121issdjxdv5i9ksa5m23if6pz1r9ql8p894f1pqn16w0kw1ix"; + url = "https://gdlp01.c-wss.com/gds/1/0100011381/01/cnijfilter2-source-6.40-1.tar.gz"; + sha256 = "3RoG83jLOsdTEmvUkkxb7wa8oBrJA4v1mGtxTGwSowU="; }; nativeBuildInputs = [ automake autoconf ]; @@ -16,6 +16,10 @@ stdenv.mkDerivation { cups glib libxml2 libusb1 libtool ]; + patches = [ + ./patches/get_protocol.patch + ]; + # lgmon3's --enable-libdir flag is used soley for specifying in which # directory the cnnnet.ini cache file should reside. # NixOS uses /var/cache/cups, and given the name, it seems like a reasonable @@ -25,7 +29,7 @@ stdenv.mkDerivation { # $out/lib/cups/filter/libcnbpcnclapicom2.so buildPhase = '' mkdir -p $out/lib - cp com/libs_bin64/* $out/lib + cp com/libs_bin_x86_64/* $out/lib mkdir -p $out/lib/cups/filter ln -s $out/lib/libcnbpcnclapicom2.so $out/lib/cups/filter @@ -51,6 +55,12 @@ stdenv.mkDerivation { make ) + ( + cd cmdtocanonij3 + ./autogen.sh --prefix=$out + make + ) + ( cd cnijbe2 substituteInPlace src/Makefile.am \ @@ -90,6 +100,11 @@ stdenv.mkDerivation { make install ) + ( + cd cmdtocanonij3 + make install + ) + ( cd cnijbe2 make install diff --git a/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch b/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch new file mode 100644 index 000000000000..18cb1ce1d014 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch @@ -0,0 +1,14 @@ +# Resolves the compilation issue reported at https://github.com/NixOS/nixpkgs/pull/180681#issuecomment-1192304711 +# An identical issue was previously reported in Gentoo: https://bugs.gentoo.org/723186 +# This patch is taken from the solution of Alfredo Tupone (https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24688d64544b43f2c14be54531ad8764419dde09) +--- a/lgmon3/src/cnijlgmon3.c 2022-07-22 12:44:32.194641628 +0100 ++++ b/lgmon3/src/cnijlgmon3.c 2022-07-22 12:43:53.954817724 +0100 +@@ -55,7 +55,7 @@ + int (*GET_STATUS)(char *, int, int *, int * , char *); + int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *); + int (*GET_STATUS2_MAINTENANCE)(char *, int, char *, int *, int * , char *, char *); +-int (*GET_PROTOCOL)(char *, size_t); ++static int (*GET_PROTOCOL)(char *, size_t); + + + int main(int argc, char *argv[]) From 92bb481cd710e367cf3b7efa8fe54dc112f9dd83 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 22 Jul 2022 23:43:40 +0200 Subject: [PATCH 7/8] chromiumDev: 105.0.5176.3 -> 105.0.5191.2 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index fbc70f0328c9..fec22570751d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "105.0.5176.3", - "sha256": "11zdihvy1n7d3vfl88477ppbfjd3mmkdsj4pfmfqm4mpw7zgi7fy", - "sha256bin64": "08rhg2am01dbb15djh7200wsg0wb48na09i706035wnnf0d8z313", + "version": "105.0.5191.2", + "sha256": "1vfgazay1h125qjiy9fnymmdskw06l8lhvllkbbpvz08zf9jfmaj", + "sha256bin64": "06l9ypr945dic3kj5m12dr9x098lfh208blp8gax6rxvdj8br4wh", "deps": { "gn": { "version": "2022-07-11", From f861ecf285e3e5dac7346dee50c79b445129159a Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 21 Jul 2022 16:17:52 +0200 Subject: [PATCH 8/8] fzf: 0.30.0 -> 0.31.0 https://github.com/junegunn/fzf/releases/tag/0.31.0 --- pkgs/tools/misc/fzf/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 5195af2774f1..c5131b8a11e5 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-7E6fj/Sjew+zz+iMFkiSJjVn2rymKRvZtEJZH65INxk="; + sha256 = "sha256-HKwf/ogNx+jCNSVHI8rt6WYRbuyT18V4nnMyZ6TmwVQ="; }; - vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0="; + vendorSha256 = "sha256-3ry93xV3KKtFoFGt2yxzMd4jx3QG2+8TBrEEywj7HPQ="; outputs = [ "out" "man" ]; @@ -34,8 +34,6 @@ buildGoModule rec { # Has a sneaky dependency on perl # Include first args to make sure we're patching the right thing - substituteInPlace shell/key-bindings.zsh \ - --replace " perl -ne " " ${perl}/bin/perl -ne " substituteInPlace shell/key-bindings.bash \ --replace " perl -n " " ${perl}/bin/perl -n " '';