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

Merge branch 'master' into staging

Browse Source 
* master:
  libretro.mame: fix parallel building
  gnome3: add jtojnar as maintainer
  libskk: fix build
  gencfsm: fix build
  wkhtmltopdf: fix build
  gutenprint: fix build
  ghc-8.2.2: drop obsolete gold linker patch
  git-annex: update hash for new version 6.20171124
  hackage-packages.nix: automatic Haskell package set update
  hackage2nix: disable failing builds
  hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hack
  brotli: 0.6.0 -> 1.0.1
  brotliUnstable: delete
  libbrotli: delete
  libbrotli: 1.0 -> 1.0.1.2017-10-30
  nginxModules.brotli: 2015-11-18 -> 2016-12-02
This commit is contained in:
Orivej Desh 2017-11-29 11:18:49 +00:00
commit 3cb0103818
15 changed files with 1477 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/default.nix
View File

@ -14,7 +14,7 @@ let
callPackage = pkgs.newScope self;
version = "3.26";
maintainers = with pkgs.lib.maintainers; [ lethalman ];
maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ];
corePackages = with gnome3; [
pkgs.desktop_file_utils pkgs.ibus

2
pkgs/development/compilers/ghc/8.2.2.nix
View File

@ -32,8 +32,6 @@ in stdenv.mkDerivation (rec {
postPatch = "patchShebangs .";
patches = [ ./ghc-gold-linker.patch ];
preConfigure = commonPreConfigure;
buildInputs = commonBuildInputs;

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -95,7 +95,7 @@ self: super: {
name = "git-annex-${drv.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + drv.version;
sha256 = "14449sllp81d23mnjwn1m658kzry5qvww2ykxkbkdcrlz6kl6dy0";
sha256 = "1bnnrwamw3d37fz7cwykxhi1ryy22dq8r6ld59gsbgcv23drqzax";
};
})).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;

22
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2541,6 +2541,7 @@ extra-packages:
- happy <1.19.6 # newer versions break Agda
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- haskell-src-exts == 1.18.* # required by hoogle-5.0.4
- language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192.
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
- network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below
@ -2788,6 +2789,7 @@ dont-distribute-packages:
adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ]
adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ]
adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ]
ADPfusionForest: [ i686-linux, x86_64-linux, x86_64-darwin ]
Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ]
AERN-Basics: [ i686-linux, x86_64-linux, x86_64-darwin ]
AERN-Net: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3227,6 +3229,7 @@ dont-distribute-packages:
boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ]
borel: [ i686-linux, x86_64-linux, x86_64-darwin ]
bot: [ i686-linux, x86_64-linux, x86_64-darwin ]
bowntz: [ i686-linux, x86_64-linux, x86_64-darwin ]
braid: [ i686-linux, x86_64-linux, x86_64-darwin ]
brainheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4031,6 +4034,7 @@ dont-distribute-packages:
dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ]
dtd: [ i686-linux, x86_64-linux, x86_64-darwin ]
dtw: [ i686-linux, x86_64-linux, x86_64-darwin ]
dual: [ i686-linux, x86_64-linux, x86_64-darwin ]
dublincore-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
duckling: [ i686-linux, x86_64-linux, x86_64-darwin ]
dumb-cas: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4347,6 +4351,7 @@ dont-distribute-packages:
forecast-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ]
forest-fire: [ i686-linux, x86_64-linux, x86_64-darwin ]
Forestry: [ i686-linux, x86_64-linux, x86_64-darwin ]
forger: [ i686-linux, x86_64-linux, x86_64-darwin ]
forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
ForkableT: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4916,7 +4921,9 @@ dont-distribute-packages:
haskell-tools-ast-fromghc: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-builtin-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-experimental-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5016,6 +5023,8 @@ dont-distribute-packages:
hblock: [ i686-linux, x86_64-linux, x86_64-darwin ]
HCard: [ i686-linux, x86_64-linux, x86_64-darwin ]
hcc: [ i686-linux, x86_64-linux, x86_64-darwin ]
hcg-minus-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ]
hcg-minus: [ i686-linux, x86_64-linux, x86_64-darwin ]
hcheat: [ i686-linux, x86_64-linux, x86_64-darwin ]
hchesslib: [ i686-linux, x86_64-linux, x86_64-darwin ]
HCL: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5036,6 +5045,7 @@ dont-distribute-packages:
hdbi-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ]
hdbi-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
hdbi: [ i686-linux, x86_64-linux, x86_64-darwin ]
hdf: [ i686-linux, x86_64-linux, x86_64-darwin ]
hDFA: [ i686-linux, x86_64-linux, x86_64-darwin ]
hdigest: [ i686-linux, x86_64-linux, x86_64-darwin ]
hdirect: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5215,6 +5225,7 @@ dont-distribute-packages:
HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ]
HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ]
hls: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ]
hly: [ i686-linux, x86_64-linux, x86_64-darwin ]
HMap: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5240,6 +5251,8 @@ dont-distribute-packages:
hMollom: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmp3: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmt-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmt: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ]
hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ]
hnix: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5292,6 +5305,7 @@ dont-distribute-packages:
hoq: [ i686-linux, x86_64-linux, x86_64-darwin ]
horizon: [ i686-linux, x86_64-linux, x86_64-darwin ]
horname: [ i686-linux, x86_64-linux, x86_64-darwin ]
hosc-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
hothasktags: [ i686-linux, x86_64-linux, x86_64-darwin ]
hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5322,6 +5336,7 @@ dont-distribute-packages:
hprotoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ]
hps-kmeans: [ i686-linux, x86_64-linux, x86_64-darwin ]
hps: [ i686-linux, x86_64-linux, x86_64-darwin ]
hPushover: [ i686-linux, x86_64-linux, x86_64-darwin ]
hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ]
hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5376,16 +5391,20 @@ dont-distribute-packages:
hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-db: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-dot: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-lang: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-lisp: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-plot: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-process: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-rw: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ]
hscaffold: [ i686-linux, x86_64-linux, x86_64-darwin ]
hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ]
hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5796,6 +5815,7 @@ dont-distribute-packages:
JunkDB-driver-gdbm: [ i686-linux, x86_64-linux, x86_64-darwin ]
JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ]
JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
JuPyTer-notebook: [ i686-linux, x86_64-linux, x86_64-darwin ]
jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ]
JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7438,6 +7458,7 @@ dont-distribute-packages:
satchmo-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ]
SBench: [ i686-linux, x86_64-linux, x86_64-darwin ]
sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ]
sc3-rdu: [ i686-linux, x86_64-linux, x86_64-darwin ]
scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ]
SCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7914,6 +7935,7 @@ dont-distribute-packages:
supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ]
superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ]
superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ]
supero: [ i686-linux, x86_64-linux, x86_64-darwin ]
supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ]
supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ]

1747
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

37
pkgs/development/libraries/libbrotli/default.nix
View File

@ -1,37 +0,0 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }:
stdenv.mkDerivation rec {
name = "libbrotli-${version}";
version = "1.0";
src = fetchFromGitHub {
owner = "bagder";
repo = "libbrotli";
rev = name;
sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y";
};
nativeBuildInputs = [ autoconf automake libtool ];
preConfigure = ''
cp -r ${brotliUnstable.src}/* brotli/
chmod -R +700 brotli
mkdir m4
autoreconf --install --force --symlink
'';
meta = with stdenv.lib; {
description = "Meta project to build libraries from the brotli source code";
longDescription = ''
Wrapper scripts and code around the brotli code base.
Builds libraries out of the brotli decode and encode sources. Uses autotools.
'brotlidec' is the library for decoding, decompression
'brotlienc' is the library for encoding, compression
'';
homepage = https://github.com/bagder/libbrotli;
license = licenses.mit;
platforms = platforms.all;
maintainers = [];
};
}

2
pkgs/development/libraries/libskk/default.nix
View File

@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
ln -s ${skk-dicts}/share/SKK-JISYO.L $dictDir/
'';
enableParallelBuilding = true;
meta = {
description = "A library to deal with Japanese kana-to-kanji conversion method";
longDescription = ''

6
pkgs/misc/drivers/gutenprint/default.nix
View File

@ -1,6 +1,6 @@
# this package was called gimp-print in the past
{ stdenv, lib, fetchurl, pkgconfig
, ijs, makeWrapper
{ stdenv, lib, fetchurl, makeWrapper, pkgconfig
, ijs, zlib
, gimp2Support ? false, gimp
, cupsSupport ? true, cups, libusb, perl
}:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs =
[ ijs ]
[ ijs zlib ]
++ lib.optionals gimp2Support [ gimp.gtk gimp ]
++ lib.optionals cupsSupport [ cups libusb perl ];

8
pkgs/misc/emulators/retroarch/cores.nix
View File

@ -204,7 +204,7 @@ in
description = "Enhanced Genesis Plus libretro port";
};
mame = mkLibRetroCore {
mame = (mkLibRetroCore {
core = "mame";
src = fetchRetro {
repo = "mame";
@ -214,6 +214,12 @@ in
description = "Port of MAME to libretro";
extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ];
}).override {
postPatch = ''
# Prevent the failure during the parallel building of:
# make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o
mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src
'';
};
mgba = mkLibRetroCore rec {

6
pkgs/servers/http/nginx/modules.nix
View File

@ -5,10 +5,10 @@
src = fetchFromGitHub {
owner = "google";
repo = "ngx_brotli";
rev = "788615eab7c5e0a984278113c55248305620df14";
sha256 = "02514bbjdhm9m38vljdh626d3c1783jxsxawv5c6bzblwmb8xgvf";
rev = "bfd2885b2da4d763fed18f49216bb935223cd34b";
sha256 = "04yx1n0wi3l2x37jd1ynl9951qxkn8xp42yv0mfp1qz9svips81n";
fetchSubmodules = true;
};
inputs = [ pkgs.libbrotli ];
};
rtmp = {

6
pkgs/tools/compression/brotli/default.nix
View File

@ -4,19 +4,19 @@
stdenv.mkDerivation rec {
name = "brotli-${version}";
version = "0.6.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "google";
repo = "brotli";
rev = "v" + version;
sha256 = "1wapq5hzflbmrcqgz92iv79rm893bskh03kvqgnn33dzbz3slavs";
sha256 = "1rqgp8xi1k4sjy9sngg1vw0v8q2mm46dhyya4d35n3k6yk7pk0qv";
};
buildInputs = [ cmake ];
# This breaks on Darwin because our cmake hook tries to make a build folder
# and the wonderful bazel BUILD file is already there (yay case-insensitivty?)
# and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
prePatch = "rm BUILD";
meta = with stdenv.lib; {

46
pkgs/tools/compression/brotli/unstable.nix
View File

@ -1,46 +0,0 @@
{ stdenv, fetchFromGitHub }:
# ?TODO: there's also python lib in there
stdenv.mkDerivation rec {
name = "brotli-20160112";
version = "bed93862";
src = fetchFromGitHub {
owner = "google";
repo = "brotli";
rev = "bed93862608d4d232ebe6d229f04e48399775e8b";
sha256 = "0g94kqh984qkbqbj4fpkkyji9wnbrb9cs32r9d6niw1sqfnfkd6f";
};
preConfigure = "cd tools";
# Debian installs "brotli" instead of "bro" but let's keep upstream choice for now.
installPhase = ''
mkdir -p "$out/bin"
mv ./bro "$out/bin/"
'';
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "A generic-purpose lossless compression algorithm and tool";
longDescription =
'' Brotli is a generic-purpose lossless compression algorithm that
compresses data using a combination of a modern variant of the LZ77
algorithm, Huffman coding and 2nd order context modeling, with a
compression ratio comparable to the best currently available
general-purpose compression methods. It is similar in speed with
deflate but offers more dense compression.
The specification of the Brotli Compressed Data Format is defined
in the following internet draft:
http://www.ietf.org/id/draft-alakuijala-brotli
'';
license = licenses.mit;
maintainers = [];
platforms = platforms.all;
};
}

1
pkgs/tools/graphics/wkhtmltopdf/default.nix
View File

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo.
sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23";
};
postConfigure = ""; # The patch "parallel-build.patch" does not apply.
configureFlags =
''
-dbus-linked

2
pkgs/tools/security/gencfsm/default.nix
View File

@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
preFixup = ''gappsWrapperArgs+=(--prefix PATH : ${encfs}/bin)'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.libertyzero.com/GEncfsM/;
downloadPage = https://launchpad.net/gencfsm/;

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

@ -1100,7 +1100,9 @@ with pkgs;
geekbench = callPackage ../tools/misc/geekbench { };
gencfsm = callPackage ../tools/security/gencfsm { };
gencfsm = callPackage ../tools/security/gencfsm {
vala = vala_0_34;
};
genromfs = callPackage ../tools/filesystems/genromfs { };
@ -1494,7 +1496,10 @@ with pkgs;
libpinyin = callPackage ../development/libraries/libpinyin { };
libskk = callPackage ../development/libraries/libskk { gnome_common = gnome3.gnome_common; };
libskk = callPackage ../development/libraries/libskk {
gnome_common = gnome3.gnome_common;
vala = vala_0_34;
};
m17n_db = callPackage ../tools/inputmethods/m17n-db { };
@ -1548,10 +1553,6 @@ with pkgs;
brotli = callPackage ../tools/compression/brotli { };
brotliUnstable = callPackage ../tools/compression/brotli/unstable.nix { };
libbrotli = callPackage ../development/libraries/libbrotli { };
biosdevname = callPackage ../tools/networking/biosdevname { };
c14 = callPackage ../applications/networking/c14 { };