public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-11-14 13:31:39 +01:00
parent f799388550 c747894638
commit c6e31d0767
212 changed files with 6404 additions and 2952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/text/recode/default.nix
View File

@@ -1,16 +1,16 @@
{ stdenv, fetchurl, python, perl, intltool, flex, texinfo, libiconv, libintl }:
{ stdenv, fetchurl, python3, perl, intltool, flex, texinfo, libiconv, libintl }:
stdenv.mkDerivation rec {
pname = "recode";
version = "3.7.4";
version = "3.7.6";
# 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";
sha256 = "0m59sd1ca0zw1aydpc3m8sw03nc885knmccqryg7byzmqs585ia6";
};
nativeBuildInputs = [ python python.pkgs.cython perl intltool flex texinfo libiconv ];
nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ];
buildInputs = [ libintl ];
doCheck = true;

4
pkgs/tools/text/source-highlight/default.nix
View File

@@ -2,14 +2,14 @@
let
name = "source-highlight";
version = "3.1.8";
version = "3.1.9";
in
stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchurl {
url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz";
sha256 = "18xdalxg7yzrxc1njzgw7aryq2jdm7zq2yqz41sc7k6il5z6lcq1";
sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs";
};
buildInputs = [ boost ];