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-08-09 14:00:27 +02:00
parent a12aeebedb 246c223e87
commit 9bd78cb048
595 changed files with 11986 additions and 5955 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/documentation/man-pages/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "man-pages-${version}";
version = "5.01";
version = "5.02";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "09xn8d8xxwgms6h1bvjlgn3mxz51vxf3ra0ry9f5dqi29qry3z3x";
sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
pkgs/data/documentation/zeal/default.nix
+2 -2
View File
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig
, qtbase, qtimageformats, qtwebkit, qtx11extras
, qtbase, qtimageformats, qtwebkit, qtx11extras, mkDerivation
, libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }:
stdenv.mkDerivation rec {
mkDerivation rec {
name = "zeal-${version}";
version = "0.6.1";
pkgs/data/fonts/terminus-font/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "terminus-font";
version = "4.47";
version = "4.48";
name = "${pname}-${version}"; # set here for use in URL below
src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz";
sha256 = "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg";
sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l";
};
nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];
pkgs/data/misc/hackage/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/bee48f46f4c9e9c1195bf81efb61fa5fb0aec0dc.tar.gz";
sha256 = "0wxj0iakqy1cyncga8s1qlb8c06vj3ilh5z8lpann7xr8yh6sm4b";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/4db96602103463d72e59ce214d0da8af35405f07.tar.gz";
sha256 = "14r7m3555ngfafk2wgdj4lnv7zzajcc4j4fiws4k3kr3xwbrwrxr";
}
pkgs/data/misc/osinfo-db/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20190611";
version = "20190726";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "00gkdkycicl4rlr8by61sfsgpjsiswr8b148fl2arinr4vz3n46h";
sha256 = "0kcdq8g324a368bqvki718ms5kdcc3dzfmpgzyxwl0mkxbmhmirr";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];