From 646c9c5acd90bb7f0bdcaee169e85610de9be8d4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 31 Mar 2022 03:52:52 +0200 Subject: [PATCH 1/2] debootstrap: fetch from gitlab --- pkgs/tools/misc/debootstrap/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index ea9f888b0444..4efa6f69924d 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, util-linux +{ lib, stdenv, fetchFromGitLab, dpkg, gawk, perl, wget, coreutils, util-linux , gnugrep, gnupg1, gnutar, gnused, gzip, makeWrapper }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? @@ -18,11 +18,12 @@ in stdenv.mkDerivation rec { pname = "debootstrap"; version = "1.0.126"; - src = fetchurl { - # git clone git://git.debian.org/d-i/debootstrap.git - # I'd like to use the source. However it's lacking the lanny script ? (still true?) - url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; - sha256 = "sha256-vEjhxQDDO+1QvQDSAfM408ktbA3LHyAsO8AO8B+Wxhg="; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "installer-team"; + repo = pname; + rev = version; + sha256 = "0hfx6k86kby4xf0xqskpllq00g159j4khh66hfi6dhcdb91dgyd7"; }; nativeBuildInputs = [ makeWrapper ]; From 0535074d17cecd8ebed9a1c50cdbdaf2b2194c9d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 30 Mar 2022 23:40:23 -0500 Subject: [PATCH 2/2] nuXmv: fix darwin build --- .../applications/science/logic/nuXmv/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/applications/science/logic/nuXmv/default.nix index 021c612d1069..710cfdad39a8 100644 --- a/pkgs/applications/science/logic/nuXmv/default.nix +++ b/pkgs/applications/science/logic/nuXmv/default.nix @@ -1,25 +1,33 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, gmp, makeWrapper }: stdenv.mkDerivation rec { pname = "nuXmv"; version = "2.0.0"; src = fetchurl { - url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-linux64.tar.gz"; - sha256 = "0nndrw994clf8lnlcfzdf1mf00vif3fvd4xsiwcjpbyk12091zqr"; + url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-${if stdenv.isDarwin then "macosx64" else "linux64"}.tar.gz"; + sha256 = if stdenv.isDarwin + then "sha256-48I+FhJUUam1nMCMMM47CwGO82BYsNz0eHDHXBfqO2E=" + else "sha256-Gf+QgAjTrysZj7qTtt1wcQPganDtO0YtRY4ykhLPzVo="; }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ gmp ]; installPhase= '' runHook preInstall install -Dm755 -t $out/bin ./bin/nuXmv runHook postInstall ''; + postFixup = lib.optionalString stdenv.isDarwin '' + wrapProgram $out/bin/nuXmv --prefix DYLD_LIBRARY_PATH : ${gmp}/lib + ''; + meta = with lib; { description = "Symbolic model checker for analysis of finite and infinite state systems"; homepage = "https://nuxmv.fbk.eu/pmwiki.php"; license = licenses.unfree; maintainers = with maintainers; [ siraben ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }