From 5bcec70433a8ef270f27d98cd23b9b35ad8a86b3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 29 Jun 2022 18:49:49 +0300 Subject: [PATCH 1/2] 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/2] 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";