dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #122251 from 7c6f434c/monotone-update

Browse Source 
monotone: 1.1 -> 1.1-unstable-2021-05-01 to move from insecure botan 1
This commit is contained in:
Michael Raskin 2021-05-09 10:03:37 +00:00 committed by GitHub
commit 0bb11cb37b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/applications/version-management/monotone/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, boost, zlib, botan, libidn { lib, stdenv, fetchurl, fetchFromGitHub, boost, zlib, botan2, libidn
, lua, pcre, sqlite, perl, pkg-config, expect , lua, pcre, sqlite, perl, pkg-config, expect, less
, bzip2, gmp, openssl , bzip2, gmp, openssl
, autoreconfHook, texinfo
}: }:
let let
version = "1.1"; version = "1.1-unstable-2021-05-01";
perlVersion = lib.getVersion perl; perlVersion = lib.getVersion perl;
in in
@ -14,22 +15,41 @@ stdenv.mkDerivation rec {
pname = "monotone"; pname = "monotone";
inherit version; inherit version;
src = fetchurl { # src = fetchurl {
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; # url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r"; # sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r";
# };
# My mirror of upstream Monotone repository
# Could fetchmtn, but circular dependency; snapshot requested
# https://lists.nongnu.org/archive/html/monotone-devel/2021-05/msg00000.html
src = fetchFromGitHub {
owner = "7c6f434c";
repo = "monotone-mirror";
rev = "b30b0e1c16def043d2dad57d1467d5bfdecdb070";
hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd";
}; };
patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ];
nativeBuildInputs = [ pkg-config ]; postPatch = ''
buildInputs = [ boost zlib botan libidn lua pcre sqlite expect sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc
openssl gmp bzip2 ]; '';
nativeBuildInputs = [ pkg-config autoreconfHook texinfo ];
buildInputs = [ boost zlib botan2 libidn lua pcre sqlite expect
openssl gmp bzip2 perl ];
postInstall = '' postInstall = ''
mkdir -p $out/share/${pname}-${version} mkdir -p $out/share/${pname}-${version}
cp -rv contrib/ $out/share/${pname}-${version}/contrib cp -rv contrib/ $out/share/${pname}-${version}/contrib
mkdir -p $out/${perl.libPrefix}/${perlVersion} mkdir -p $out/${perl.libPrefix}/${perlVersion}
cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion} cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion}
patchShebangs "$out/share/monotone"
patchShebangs "$out/share/${pname}-${version}"
find "$out"/share/{doc/monotone,${pname}-${version}}/contrib/ -type f | xargs sed -e 's@! */usr/bin/@!/usr/bin/env @; s@! */bin/bash@!/usr/bin/env bash@' -i
''; '';
#doCheck = true; # some tests fail (and they take VERY long) #doCheck = true; # some tests fail (and they take VERY long)
@ -38,6 +58,6 @@ stdenv.mkDerivation rec {
description = "A free distributed version control system"; description = "A free distributed version control system";
maintainers = [ maintainers.raskin ]; maintainers = [ maintainers.raskin ];
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.gpl2; license = licenses.gpl2Plus;
}; };
} }

1
pkgs/top-level/all-packages.nix
View File

@ -24744,7 +24744,6 @@ in
monotone = callPackage ../applications/version-management/monotone { monotone = callPackage ../applications/version-management/monotone {
lua = lua5; lua = lua5;
botan = botan.override (x: { openssl = null; });
}; };
monotoneViz = callPackage ../applications/version-management/monotone-viz { monotoneViz = callPackage ../applications/version-management/monotone-viz {