Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 34b3a314ca28
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 762a88d78ba5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 22, 2019

  1. recode: 3.7-gitrev -> 3.7.4, new home (#68045) 

    * recode: pname-ify

* recode: 3.7-* -> 3.7.2, new home

gnu homepage still exists (for now),
but links to the github repo we switch to :).

* recode: use pre-generated tarball to avoid gen, fix

* recode: 3.7.2 -> 3.7.4

https://github.com/rrthomas/recode/blob/v3.7.4/NEWS
(3.7.3 notes as well)
    @dtzWill @FRidh
    dtzWill authored and FRidh committed Oct 22, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    GPG key ID: 25D2038DEB08021D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    762a88d View commit details
Showing with 11 additions and 23 deletions.
  1. +11 −23 pkgs/tools/text/recode/default.nix
34 changes: 11 additions & 23 deletions pkgs/tools/text/recode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,22 @@
{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook
, texinfo, libiconv, libintl }:
{ stdenv, fetchurl, python, perl, intltool, flex, texinfo, libiconv, libintl }:

stdenv.mkDerivation {
name = "recode-3.7-2fd838565";
stdenv.mkDerivation rec {
pname = "recode";
version = "3.7.4";

src = fetchFromGitHub {
owner = "pinard";
repo = "Recode";
rev = "2fd8385658e5a08700e3b916053f6680ff85fdbd";
sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03";
# Use official tarball, avoid need to bootstrap/generate build system
src = fetchurl {
url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0j9rjkgx4r8nah90d2vbi92k33gfmgaqlj72z1ni0vsiccpcgfc8";
};

nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv ];
nativeBuildInputs = [ python python.pkgs.cython perl intltool flex texinfo libiconv ];
buildInputs = [ libintl ];

preAutoreconf = ''
# fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455
substituteInPlace Makefile.am --replace "ACLOCAL = ./aclocal.sh @ACLOCAL@" ""
sed -i '/^AM_C_PROTOTYPES/d' configure.ac
substituteInPlace src/Makefile.am --replace "ansi2knr" ""
'';

doCheck = false; # fails 10 out of 16 tests

preCheck = ''
checkFlagsArray=(CPPFLAGS="-I../lib" LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs")
'';
doCheck = true;

meta = {
homepage = https://www.gnu.org/software/recode/;
homepage = https://github.com/rrthomas/recode;
description = "Converts files between various character sets and usages";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl2Plus;