Merge master into staging

This commit is contained in:
Frederik Rietdijk 2018-07-31 13:19:20 +02:00
commit d56b54cb3c
53 changed files with 844 additions and 87 deletions

View file

@ -320,9 +320,6 @@ in
};
config = mkIf cfg.enable {
meta.doc = ./foundationdb.xml;
meta.maintainers = with lib.maintainers; [ thoughtpolice ];
environment.systemPackages = [ pkg ];
users.users = optionalAttrs (cfg.user == "foundationdb") (singleton
@ -413,4 +410,7 @@ in
'';
};
};
meta.doc = ./foundationdb.xml;
meta.maintainers = with lib.maintainers; [ thoughtpolice ];
}

View file

@ -2,7 +2,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-foundationdb">
xml:id="module-services-foundationdb">
<title>FoundationDB</title>

View file

@ -560,6 +560,7 @@ in {
mkdir -p ${cfg.statePath}/tmp/sockets
mkdir -p ${cfg.statePath}/shell
mkdir -p ${cfg.statePath}/db
mkdir -p ${cfg.statePath}/uploads
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
mkdir -p ${cfg.statePath}/config
@ -570,6 +571,7 @@ in {
mkdir -p ${cfg.statePath}/log
ln -sf ${cfg.statePath}/log /run/gitlab/log
ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
chown -R ${cfg.user}:${cfg.group} /run/gitlab
@ -584,7 +586,9 @@ in {
ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
''}
ln -sf ${cfg.statePath}/config /run/gitlab/config
rm ${cfg.statePath}/lib
if [ -e ${cfg.statePath}/lib ]; then
rm ${cfg.statePath}/lib
fi
ln -sf ${pkgs.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
@ -608,10 +612,11 @@ in {
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName}
touch "${cfg.statePath}/db-created"
fi
# enable required pg_trgm extension for gitlab
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
fi
# enable required pg_trgm extension for gitlab
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
# Always do the db migrations just to be sure the database is up-to-date
${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production

View file

@ -117,9 +117,9 @@ let
];
postBuild = ''
mkdir -p $out/nix-support
echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products
echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
echo "file ${kernelTarget} ${build.kernel}/${kernelTarget}" >> $out/nix-support/hydra-build-products
echo "file initrd ${build.netbootRamdisk}/initrd" >> $out/nix-support/hydra-build-products
echo "file ipxe ${build.netbootIpxeScript}/netboot.ipxe" >> $out/nix-support/hydra-build-products
'';
preferLocalBuild = true;
};

View file

@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "mopidy-gmusic";
version = "2.0.0";
version = "3.0.0";
src = fetchurl {
url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz";
sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j";
sha256 = "0a2s4xrrhnkv85rx4w5bj6ih9xm34jy0q71fdvbzmi827g9dw5sz";
};
propagatedBuildInputs = [

View file

@ -3,6 +3,7 @@
, meson
, ninja
, pkgconfig
, itstool
, libxml2
, desktop-file-utils
, wrapGAppsHook
@ -20,6 +21,7 @@
, libbs2b
, libsamplerate
, libsndfile
, libebur128
, boost
, fftwFloat
, calf
@ -40,13 +42,13 @@ let
];
in stdenv.mkDerivation rec {
name = "pulseeffects-${version}";
version = "4.1.7";
version = "4.2.3";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "13yj1958jsz76zxi3ag133i4337cicvm5b58l22g2xvbqa5vraq9";
sha256 = "0s3lc0xkr48wzk0b6akq4yw19n0iwfi9jyji8bpdgj5y7kjg5mqm";
};
nativeBuildInputs = [
@ -54,6 +56,7 @@ in stdenv.mkDerivation rec {
ninja
pkgconfig
libxml2
itstool
desktop-file-utils
wrapGAppsHook
];
@ -70,6 +73,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gst-plugins-bad
lilv lv2 serd sord sratom
libbs2b
libebur128
libsamplerate
libsndfile
boost

View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ghostwriter";
version = "1.7.0";
version = "1.7.2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
rev = "v${version}";
sha256 = "00nlk5gazlfnndanhhjj5hlvkkp9yfx5mj6jq0jz37mk8mn6rzln";
sha256 = "1zhzibn4g79i98mjfqspf3iac2biz3r18jf29g0izq5snn7xj0fc";
};
nativeBuildInputs = [ qmake pkgconfig ];

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, wrapGAppsHook
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
let
version = "3.28.1";
version = "3.30.1";
pname = "gnome-latex";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1z481izrx057wraphnr82kxnpmmi8nvl7jswyylzm22kfs0mw402";
sha256 = "0yvkp311ikmiypzj2q6ypvyw5migxiqp8lwhyl3qq6mk6p0x66w8";
};
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

View file

@ -0,0 +1,71 @@
{ stdenv, fetchurl, python3Packages
, file, intltool, gobjectIntrospection, libgudev
, udisks, glib, gnome3, gst_all_1, libnotify
, exiv2, exiftool, qt5, gdk_pixbuf
}:
python3Packages.buildPythonApplication rec {
pname = "rapid-photo-downloader";
version = "0.9.9";
src = fetchurl {
url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "193l55wdxwxmammyxwzp90sg0qw5r316443la3m9611sdpcmy8w3";
};
# Disable version check and fix install tests
postPatch = ''
substituteInPlace raphodo/constants.py \
--replace "disable_version_check = False" "disable_version_check = True"
substituteInPlace raphodo/rescan.py \
--replace "from preferences" "from raphodo.preferences"
substituteInPlace raphodo/copyfiles.py \
--replace "import problemnotification" "import raphodo.problemnotification"
'';
nativeBuildInputs = [ file intltool gobjectIntrospection ];
buildInputs = [
libgudev
udisks
glib
gnome3.gexiv2
gst_all_1.gstreamer
libnotify
exiv2
exiftool
qt5.qtimageformats
gdk_pixbuf
] ++ (with python3Packages; [
pyqt5
pygobject3
gphoto2
pyzmq
tornado
psutil
pyxdg
arrow
dateutil
easygui
colour
pymediainfo
sortedcontainers
rawkit
requests
colorlog
pyprind
]);
makeWrapperArgs = [
"--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
"--set PYTHONPATH \"$PYTHONPATH\""
];
meta = with stdenv.lib; {
description = "Photo and video importer for cameras, phones, and memory cards";
homepage = http://www.damonlynch.net/rapid/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ jfrankenau ];
};
}

View file

@ -0,0 +1,60 @@
{ stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:
let
version = "1.4.10";
# TODO: must build the extension instead of downloading it. But since it's
# literally an asset that is indifferent regardless of the platform, this
# might be just enough.
webext = fetchurl {
url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi";
sha256 = "0rgwzv1qahqy52q7zz4dklnwx7w4x3gj92ka8n0ypgf9fjjnmqas";
};
in buildGoPackage rec {
inherit version;
name = "browsh-${version}";
goPackagePath = "browsh";
src = fetchFromGitHub {
owner = "browsh-org";
repo = "browsh";
rev = "v${version}";
sha256 = "0lvb20zziknlbgy509ccpvlc21sqjc53xar26blmb6sdl6yqkj0w";
};
buildInputs = [ go-bindata ];
# embed the web extension in a go file and place it where it's supposed to
# be. See
# https://github.com/browsh-org/browsh/blob/9abc3aaa3f575ca6ec9a483408d9fdfcf76300fa/interfacer/contrib/xpi2bin.sh
preBuild = ''
xpiprefix="$(mktemp -d)"
cp "${webext}" "$xpiprefix/browsh.xpi"
go-bindata \
-prefix "$xpiprefix" \
-pkg browsh \
-o "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/webextension.go" \
"$xpiprefix/browsh.xpi"
sed \
-e 's:Asset("/browsh.xpi"):Asset("browsh.xpi"):g' \
-i "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/firefox.go"
'';
postBuild = ''
mv "$NIX_BUILD_TOP/go/bin/src" "$NIX_BUILD_TOP/go/bin/browsh"
'';
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "A fully-modern text-based browser, rendering to TTY and browsers";
homepage = https://www.brow.sh/;
maintainers = [ maintainers.kalbasit ];
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}

View file

@ -0,0 +1,272 @@
[
{
goPackagePath = "github.com/NYTimes/gziphandler";
fetch = {
type = "git";
url = "https://github.com/NYTimes/gziphandler";
rev = "5032c8878b9dd46cfe8c625c0d9b9f258a560ee8";
sha256 = "1avn8xb78xmmc61fjycpc81yrkfi42fna8zgzdqba6v7g8gq8a3x";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/hpcloud/tail";
fetch = {
type = "git";
url = "https://github.com/hpcloud/tail";
rev = "a1dbeea552b7c8df4b542c66073e393de198a800";
sha256 = "0nssmn8j0yavs8099gwb69qpd1k9yd2z28bii6i4y61v0grb6bc2";
};
}
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/gdamore/encoding";
fetch = {
type = "git";
url = "https://github.com/gdamore/encoding";
rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
};
}
{
goPackagePath = "github.com/gdamore/tcell";
fetch = {
type = "git";
url = "https://github.com/gdamore/tcell";
rev = "de7e78efa4a71b3f36c7154989c529dbdf9ae623";
sha256 = "1ly3gqkziw01cb7h64k0wc4myzfcsr9hl7xznxd8k2yqzqvmhljz";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
rev = "a6af135bd4e28680facf08a3d206b454abc877a4";
sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
};
}
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71";
sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7";
};
}
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
};
}
{
goPackagePath = "github.com/lucasb-eyer/go-colorful";
fetch = {
type = "git";
url = "https://github.com/lucasb-eyer/go-colorful";
rev = "c7842319cf3ac2eff253e8b3ebe15fcc56b6414a";
sha256 = "00v2x6qchhi6vv09w29kcyr9i0kq4n4daaj3vk1c4nfj2z7xx5hc";
};
}
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
rev = "c2353362d570a7bfa228149c62842019201cfb71";
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac";
sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
};
}
{
goPackagePath = "github.com/onsi/ginkgo";
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
rev = "3774a09d95489ccaa16032e0770d08ea77ba6184";
sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
};
}
{
goPackagePath = "github.com/onsi/gomega";
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
rev = "b6ea1ea48f981d0f615a154a45eabb9dd466556d";
sha256 = "14179j7pj1h2vx60i68x2m6650ldji4xhanhc702i8a8iy7b49ja";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/shibukawa/configdir";
fetch = {
type = "git";
url = "https://github.com/shibukawa/configdir";
rev = "e180dbdc8da04c4fa04272e875ce64949f38bd3e";
sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z";
};
}
{
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
rev = "787d034dfe70e44075ccc060d346146ef53270ad";
sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
};
}
{
goPackagePath = "github.com/spf13/cast";
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
rev = "8965335b8c7107321228e3e3702cab9832751bac";
sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
};
}
{
goPackagePath = "github.com/spf13/jwalterweatherman";
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
};
}
{
goPackagePath = "github.com/spf13/viper";
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793";
sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
};
}
{
goPackagePath = "github.com/ulule/limiter";
fetch = {
type = "git";
url = "https://github.com/ulule/limiter";
rev = "af07f8759cbc68c744a15ffbfdabf35f7aff5e3b";
sha256 = "1c68vz9r0442lkj206l6k03nssxx3ys8ddg7d2p2brdanfbprzrq";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "a0f8a16cb08c06df97cbdf9c47f4731ba548c33c";
sha256 = "1pnvrhi2minkn9mfa9p70b5jnixx8il5yqp08ad1w7kl34c21ma2";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e";
sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "0605a8320aceb4207a5fb3521281e17ec2075476";
sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
};
}
]

View file

@ -51,6 +51,6 @@ mkChromiumDerivation (base: rec {
license = licenses.bsd3;
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
timeout = 86400; # 24 hours
timeout = 172800; # 48 hours
};
})

View file

@ -7,7 +7,7 @@
, trezor-bridge, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, esteidfirefoxplugin
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
, udev
, kerberos
}:
@ -61,6 +61,7 @@ let
nativeMessagingHosts =
([ ]
++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
++ lib.optional (cfg.enableBukubrow or false) bukubrow
++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration

View file

@ -5,14 +5,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "6.2.2";
version = "6.2.3";
name = "seafile-client-${version}";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
rev = "v${version}";
sha256 = "19204fqi4x4q7hsc500y6gj0qdfzf4kjgfsr808w13qnh1lxhvr4";
sha256 = "1wdpz7vxhn9mcc7kxhrz9c5dwd492akirz351wfi4xxy5np6p6kp";
};
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "bcftools";
version = "1.8";
version = "1.9";
src = fetchurl {
url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2";
sha256 = "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa";
sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg";
};
buildInputs = [ htslib zlib bzip2 lzma curl perl python ];

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gp2c-${version}";
version = "0.0.10pl1";
version = "0.0.11";
src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav";
sha256 = "1z69xj2dpd8yyi8108rz26c50xpv0k2j8qnk0bzy1c5lw3pd1adm";
};
buildInputs = [ pari perl ];

View file

@ -4,7 +4,7 @@
let
# if you bump version, update pkgs.tortoisehg too or ping maintainer
version = "4.5.2";
version = "4.6.2";
name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication {
@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz";
sha256 = "14732hhw2ibvy5khqxjc8a983z3rib5vp9lqfbws80lm3kyryjm4";
sha256 = "1bv6wgcdx8glihjjfg22khhc52mclsn4kwfqvzbzlg0b42h4xl0w";
};
inherit python; # pass it so that the same version can be used in hg2git

View file

@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
version = "4.5.2";
version = "4.6.1";
src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
sha256 = "0q12zjpgafdch4ns31k4afy25g837xm7v2qwj62806l2dz4rm4h9";
sha256 = "1argpi5h0fv4ilahi52c98xgvsvz27lvqi41hzw1f81mhjgyhqik";
};
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];

View file

@ -4,17 +4,17 @@
stdenv.mkDerivation rec {
name = "makemkv-${ver}";
ver = "1.12.2";
ver = "1.12.3";
builder = ./builder.sh;
src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
sha256 = "0ylybq0776am5yy064b55q0jja1q1p9dscwmn7f1p3igzv15rypj";
sha256 = "0rggpzp7gp4y6gxnhl4saxpdwnaivwkildpwbjjh7zvmgka3749a";
};
src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
sha256 = "063rgb88zbh4zwysyhjn4awykcnc90qgsx6d8ggm27wy849306v1";
sha256 = "1w0l2rq9gyzli5ilw82v27d8v7fmchc1wdzcq06q1bsm9wmnbx1r";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -1,22 +1,29 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, glib, appstream-glib, gobjectIntrospection
{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook
, glib, amtk, appstream-glib, gobjectIntrospection
, webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "devhelp-${version}";
version = "3.28.1";
version = "3.30.0";
src = fetchurl {
url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "08a8xizjqz68k30zd37r7g516azhan9bbrjsvv10hjd5dg3f476s";
sha256 = "1rzilsn0v8dj86djankllc5f10d58f6rwg4w1fffh5zly10nlli5";
};
nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ];
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ];
buildInputs = [
glib gtk3 webkitgtk
glib gtk3 webkitgtk amtk
gnome3.defaultIconTheme gsettings-desktop-schemas
];
doCheck = true;
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = "devhelp";

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mate-control-center-${version}";
version = "1.20.3";
version = "1.21.0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
sha256 = "0wpi8b3zz10xd5i7ir7nd737a9vl4q17rc5nh8vfrqpyrcilqzkd";
sha256 = "0m40jr1midh5fzk3k97sydihlqfqjvzxlgmkx8w2j30a09h7230w";
};
nativeBuildInputs = [

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.24.2";
version = "0.24.4";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "0g32bccbbwad9894zv2wjimbp8bpcj4ldddfdm4p2n8vcw6vi5y3";
sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6";
};
buildInputs = [ llvm makeWrapper which ];

View file

@ -972,6 +972,13 @@ self: super: {
sha256 = "0i889zs46wn09d7iqdy99201zaqxb175cfs8jz2zi3mv4ywx3a0l";
});
# https://github.com/simonmichael/hledger/issues/852
hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch {
url = "https://github.com/simonmichael/hledger/commit/007b9f8caaf699852511634752a7d7c86f6adc67.patch";
sha256 = "1lfp29mi1qyrcr9nfjigbyric0xb9n4ann5w6sr0g5sanr4maqs2";
stripLen = 1;
});
# Copy hledger man pages from data directory into the proper place. This code
# should be moved into the cabal2nix generator.
hledger = overrideCabal super.hledger (drv: {

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "clojure-${version}";
version = "1.9.0.381";
version = "1.9.0.391";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "18aqfjm6vbhlflxdnpcr9gib00zg2ys5hck4kfxr9rc4aylnn9pi";
sha256 = "1720nbp891mhdjp37z1ns7rg8yapk3a7h1a1rkzhx7abngpwwjcz";
};
buildInputs = [ makeWrapper ];

View file

@ -231,8 +231,8 @@ in {
};
php71 = generic {
version = "7.1.19";
sha256 = "1wvhsxzmb78pcr36ginz93iv7rcrxp3p01rb34zxa2h4wdxkxi0k";
version = "7.1.20";
sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
};
php72 = generic {

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl
, pkgconfig, gnome3, dbus, xvfb_run }:
let
version = "4.99.1";
version = "5.0.0";
pname = "amtk";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "00fhvw5y638z584s8cfdslh47ngfzcgx4f0b0456sw8p754j3f8d";
sha256 = "1zriix7bdwcg0868mfc7jy6zbwjwdmjwbh0ah6dbddrhiabrda8j";
};
nativeBuildInputs = [

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl, fetchpatch
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
@ -8,7 +8,7 @@
}:
let # beware: updates often break cups-filters build
version = "0.66.0";
version = "0.67.0";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "1rzar5f27xzkjih07yi8kxcinvk4ny4nhimyacpvqx7vmlqn829c";
sha256 = "1yb6agmcxf0ixqm65d4aknl0hgmswf94x0k59ic0qqav1wd4yjm3";
};
outputs = [ "out" "dev" ];
@ -33,11 +33,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkgconfig ];
patches = lib.optional stdenv.isDarwin (fetchpatch {
url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=267228bb071016621c80fc8514927905164aaeea";
sha256 = "0i2sbxz1mrsnj75qgqaadayjgs48ay2mhrbkij95djy6am44m54k";
});
# Not sure when and how to pass it. It seems an upstream bug anyway.
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
name = "ptex-${version}";
version = "2.1.33";
version = "2.3.0";
src = fetchFromGitHub {
owner = "wdas";
repo = "ptex";
rev = "v${version}";
sha256 = "15ijjq3w7hwgm4mqah0x4jzjy3v2nnmmv28lbqzmxzcxjgh4sjkn";
sha256 = "0nfz0y66bmi6xckn1whi4sfd8i3ibln212fgm4img2z98b6vccyg";
};
outputs = [ "bin" "dev" "out" "lib" ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "rdkafka-${version}";
version = "0.11.4";
version = "0.11.5";
src = fetchFromGitHub {
owner = "edenhill";
repo = "librdkafka";
rev = "v${version}";
sha256 = "11ps8sy4v8yvj4sha7d1q3rmhfw7l1rd52rnl01xam9862yasahs";
sha256 = "1b0zp7k0775g5pzvkmpmsha63wx8wcwcas6w6wb09y0gymxz0xss";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "talloc-2.1.13";
name = "talloc-2.1.14";
src = fetchurl {
url = "mirror://samba/talloc/${name}.tar.gz";
sha256 = "0iv09iv385x69gfzvassq6m3y0rd8ncylls95dm015xdy3drkww4";
sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl
, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
let
version = "4.1.1";
version = "4.2.0";
pname = "tepl";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13kflywpc6iyfpc9baaa54in5vzn4p7i3dh9pr2ival2nkxfnkp2";
sha256 = "1kcwcr72dv3xwi2ni579c9raa0cnbazfnmy6mgapzn6dir1d8fc8";
};
nativeBuildInputs = [

View file

@ -11,6 +11,13 @@ let
inherit sha256;
};
patches = [
# fix notmuch build, see https://notmuchmail.org/faq/#index12h2
# cannot fetchpatch this because base directory differs
# TODO: remove on next xapian update
./fix-notmuch-tagging.patch
];
outputs = [ "out" "man" "doc" ];
buildInputs = [ libuuid zlib ];
@ -36,5 +43,5 @@ let
in {
# xapian-ruby needs 1.2.22 as of 2017-05-06
xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
xapian_1_4 = generic "1.4.5" "0axhqrj202hbll9mcx1qdm8gsqj19216w3z02gyjbycxvr9gkdc5";
xapian_1_4 = generic "1.4.7" "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k";
}

View file

@ -0,0 +1,31 @@
From f9e6f45b1c8f66bca8a3387f371b20d434b23a7d Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 26 Jul 2018 17:26:52 +1200
Subject: [PATCH 1/1] Revert "Enable open_nearby_postlist for writable
databases"
The amended check isn't conservative enough as there may be postlist
changes in the inverter while the table is unmodified. This breaks
testcase T150-tagging.sh in notmuch's testsuite, reported by David
Bremner.
This reverts commit 5489fb2f838c0f0b0a593b4c17df282a93a1fe5a.
---
xapian-core/backends/glass/glass_postlist.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xapian-core/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc
index 80e578b85..a47f14a68 100644
--- a/backends/glass/glass_postlist.cc
+++ b/backends/glass/glass_postlist.cc
@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_,
(void)need_pos;
if (term_.empty())
RETURN(NULL);
- if (!this_db.get() || this_db->postlist_table.is_modified())
+ if (!this_db.get() || this_db->postlist_table.is_writable())
RETURN(NULL);
RETURN(new GlassPostList(this_db, term_, cursor->clone()));
}
--
2.11.0

View file

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "contextvars";
version = "2.2";
version = "2.3";
disabled = !isPy36;
src = fetchPypi {
inherit pname version;
sha256 = "046b385nfzkjh0wqmd268p2jkgn9fg6hz40npq7j1w3c8aqzhwvx";
sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93";
};
propagatedBuildInputs = [ immutables ];

View file

@ -0,0 +1,20 @@
{ stdenv, fetchPypi, buildPythonPackage }:
buildPythonPackage rec {
pname = "easygui";
version = "0.98.1";
src = fetchPypi {
inherit pname version;
sha256 = "1zmvmwgxyzvm83818skhn8b4wrci4kmnixaax8q3ia5cn7xrmj6v";
};
doCheck = false; # No tests available
meta = with stdenv.lib; {
description = "Very simple, very easy GUI programming in Python";
homepage = https://github.com/robertlugg/easygui;
license = licenses.bsd3;
maintainers = with maintainers; [ jfrankenau ];
};
}

View file

@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, msgpack }:
buildPythonPackage rec {
pname = "fluent-logger";
version = "0.9.3";
src = fetchPypi {
inherit pname version;
sha256 = "09vii0iclfq6vhz37xyybksq9m3538hkr7z40sz2dlpf2rkg98mg";
};
propagatedBuildInputs = [ msgpack ];
# Tests fail because absent in package
doCheck = false;
meta = with lib; {
description = "A structured logger for Fluentd (Python)";
homepage = https://github.com/fluent/fluent-logger-python;
license = licenses.asl20;
};
}

View file

@ -0,0 +1,26 @@
{ stdenv, fetchPypi, buildPythonPackage
, pkgconfig
, libgphoto2 }:
buildPythonPackage rec {
pname = "gphoto2";
version = "1.8.2";
src = fetchPypi {
inherit pname version;
sha256 = "1806bdjc18qh0wyayxymgjnqqqlxs2iwvgk594anxw9y69hrxqni";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libgphoto2 ];
doCheck = false; # No tests available
meta = with stdenv.lib; {
description = "Python interface to libgphoto2";
homepage = https://github.com/jim-easterbrook/python-gphoto2;
license = licenses.gpl3;
maintainers = with maintainers; [ jfrankenau ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, libusb1 }:
{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1 }:
buildPythonPackage rec {
pname = "libusb1";
@ -17,6 +17,10 @@ buildPythonPackage rec {
buildInputs = [ libusb1 ];
checkPhase = ''
${python.interpreter} -m usb1.testUSB1
'';
meta = with stdenv.lib; {
homepage = https://github.com/vpelletier/python-libusb1;
description = "Python ctype-based wrapper around libusb1";

View file

@ -0,0 +1,42 @@
{ stdenv, fetchPypi, buildPythonPackage
, libmediainfo
, setuptools_scm
, pytest, glibcLocales }:
buildPythonPackage rec {
pname = "pymediainfo";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1d0mxxycacimy46b08q44xyxkyji7rrs7viwc3wkpckhqs54q24x";
};
postPatch = ''
substituteInPlace pymediainfo/__init__.py \
--replace 'CDLL(library_file)' \
'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \
--replace 'CDLL("libmediainfo.0.dylib")' \
'CDLL("${libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}")' \
--replace 'CDLL("libmediainfo.dylib")' \
'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \
--replace 'CDLL("libmediainfo.so.0")' \
'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0")'
'';
nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ glibcLocales pytest ];
checkPhase = ''
export LC_ALL=en_US.UTF-8
py.test -k 'not test_parse_url' tests
'';
meta = with stdenv.lib; {
description = "Python wrapper for the mediainfo library";
homepage = https://github.com/sbraz/pymediainfo;
license = licenses.mit;
maintainers = with maintainers; [ jfrankenau ];
};
}

View file

@ -0,0 +1,28 @@
{ stdenv, fetchPypi, buildPythonPackage
, psutil
, pytest }:
buildPythonPackage rec {
pname = "PyPrind";
version = "2.11.2";
src = fetchPypi {
inherit pname version;
sha256 = "0xg6m5hr33h9bdlrr42kc58jm2m87a9zsagy7n2m4n407d2snv64";
};
buildInputs = [ psutil ];
checkInputs = [ pytest ];
checkPhase = ''
py.test tests
'';
meta = with stdenv.lib; {
description = "Python Progress Bar and Percent Indicator Utility";
homepage = https://github.com/rasbt/pyprind;
license = licenses.bsd3;
maintainers = with maintainers; [ jfrankenau ];
};
}

View file

@ -0,0 +1,28 @@
{ stdenv, fetchPypi, buildPythonPackage
, libraw
, pytest, mock }:
buildPythonPackage rec {
pname = "rawkit";
version = "0.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "0vrhrpr70i61y5q5ysk341x1539ff1q1k82g59zq69lv16s0f76s";
};
buildInputs = [ libraw ];
checkInputs = [ pytest mock ];
checkPhase = ''
py.test tests
'';
meta = with stdenv.lib; {
description = "CTypes based LibRaw bindings for Python";
homepage = https://rawkit.readthedocs.org/;
license = licenses.mit;
maintainers = with maintainers; [ jfrankenau ];
};
}

View file

@ -23,12 +23,17 @@ in buildPythonPackage rec {
buildInputs = [ ft pillow ];
postPatch = ''
rm tests/test_graphics_barcode.py
# Remove all the test files that require access to the internet to pass.
rm tests/test_lib_utils.py
rm tests/test_platypus_general.py
# Remove the tests that require Vera fonts installed
rm tests/test_graphics_render.py
'';
checkPhase = ''
LC_ALL="en_US.UTF-8" ${python.interpreter} tests/runAll.py
cd tests
LC_ALL="en_US.UTF-8" ${python.interpreter} runAll.py
'';
# See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
@ -38,4 +43,4 @@ in buildPythonPackage rec {
description = "An Open Source Python library for generating PDFs and graphics";
homepage = http://www.reportlab.com/;
};
}
}

View file

@ -0,0 +1,60 @@
{ stdenv, lib, fetchFromGitHub, which, openssl, readline }:
stdenv.mkDerivation rec {
name = "eresi-${version}";
version = "0.83-a3-phoenix";
src = fetchFromGitHub {
owner = "thorkill";
repo = "eresi";
rev = version;
sha256 = "0a5a7mh2zw9lcdrl8n1mqccrc0xcgj7743l7l4kslkh722fxv625";
};
postPatch = ''
# Two occurences of fprintf() with only two arguments, which should really
# be fputs().
#
# Upstream pull request: https://github.com/thorkill/eresi/pull/162
#
sed -i -e 's/fprintf(\(stderr\), *\([a-z0-9]\+\))/fputs(\2, \1)/g' \
libe2dbg/common/common.c libe2dbg/user/threads.c
# We need to patch out a few ifs here, because it tries to create a series
# of configuration files in ~/.something. However, our builds are sandboxed
# and also don't contain a valid home, so let's NOP it out :-)
#
# The second fix we need to make is that we need to pretend being Gentoo
# because otherwise the build process tries to link against libtermcap,
# which I think is solely for historic reasons (nowadays Terminfo should
# have largely superseded it).
sed -i -e '/^if \[ ! -e/c if false; then' \
-e 's/^GENTOO=.*/GENTOO=1/' configure
'';
configureFlags = [
(if stdenv.is64bit then "--enable-32-64" else "--enable-32")
"--enable-readline"
];
# The configure script is not generated by autoconf but is hand-rolled, so it
# has --enable-static but no --disabled-static and also doesn't support the
# equals sign in --prefix.
prefixKey = "--prefix ";
dontDisableStatic = true;
nativeBuildInputs = [ which ];
buildInputs = [ openssl readline ];
enableParallelBuilding = true;
installTargets = lib.singleton "install"
++ lib.optional stdenv.is64bit "install64";
meta = {
description = "The ERESI Reverse Engineering Software Interface";
license = lib.licenses.gpl2;
homepage = http://www.eresi-project.org/;
maintainers = [ lib.maintainers.aszlig ];
platforms = lib.platforms.linux;
};
}

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
version = "1.1.6";
version = "1.2.0";
src = fetchurl {
urls = [
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
"https://cocl.us/sbt-${version}.tgz"
];
sha256 = "1hb8gcf3shcp4a65pnlqdlp8j5as7prqvw3d0b5bnfjfi0qbaigm";
sha256 = "1rrn0v4bhgar3mrgs931ifggb8kfg23fv5cgvskrdd7iyvg0z9wc";
};
patchPhase = ''

View file

@ -34,12 +34,15 @@ stdenv.mkDerivation rec {
"--datadir=\${doc}/share"
"--mandir=\${man}/share/man"
]
# jq is linked to libjq:
# jq is linked to libjq:
++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
installCheckPhase = "$bin/bin/jq --help >/dev/null";
doInstallCheck = true;
doCheck = true;
installCheckTarget = "check";
postInstallCheck = ''
$bin/bin/jq --help >/dev/null
'';
meta = with stdenv.lib; {
description = ''A lightweight and flexible command-line JSON processor'';

View file

@ -20,13 +20,13 @@ let
};
in stdenv.mkDerivation rec {
name = "dolphin-emu-${version}";
version = "2018-07-02";
version = "2018-07-22";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
rev = "87c5d00e2085090e51c1d44e4fd271437123c722";
sha256 = "04f0my5k1vrj3pcg07m6wy4in4cs95db8367bp7zkraparmj1mjk";
rev = "7c2d2548a88abf9a5fa0bff52e00c57d093a9e19";
sha256 = "0x9h8s6fa04vcdwaqgrd5jpbgadgpkj3m4g2w1mp97libvr7hpy4";
};
enableParallelBuilding = true;

View file

@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
stdenv.mkDerivation rec {
version = "6.2.2";
version = "6.2.3";
name = "seafile-shared-${version}";
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile";
rev = "v${version}";
sha256 = "05swp7sjp7pzgp8hjjr2prg0wq213l04iyqdfwwasdczdx6j6g59";
sha256 = "019q5xsrhl6x8ngy0mzjdakm7m63gxyw8v7a223zwpw0i86l8hms";
};
nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];

View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "0.74.0";
version = "0.74.2";
components = {
"abode" = ps: with ps; [ ];
"ads" = ps: with ps; [ ];

View file

@ -74,7 +74,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "0.74.0";
hassVersion = "0.74.2";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -89,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
sha256 = "05njkzh4hwz3vbxq2j98znnk8yzs9zkzcd4d99qwcw2hn9kdc385";
sha256 = "02wdvkcl4zjw009a5ylblk5blpf5rhlvch8vsg4cx07sj9xgjzmw";
};
propagatedBuildInputs = [

View file

@ -0,0 +1,37 @@
{ stdenv, rustPlatform, fetchFromGitHub, sqlite }:
rustPlatform.buildRustPackage rec {
name = "bukubrow-${version}";
version = "2.4.0";
src = fetchFromGitHub {
owner = "SamHH";
repo = "bukubrow";
rev = version;
sha256 = "1wrwav7am73bmgbpwh1pi0b8k7vhydqvw91hmmhnvbjhrhbns7s5";
};
sourceRoot = "source/binary";
cargoSha256 = "19d1pgk8nm5jsfd696bqayi5s8ivv9gi6jdb00d10ddjxz234gs7";
buildInputs = [ sqlite ];
postInstall = ''
mkdir -p $out/etc $out/lib/mozilla/native-messaging-hosts
host_file="$out/bin/bukubrow"
sed -e "s!%%replace%%!$host_file!" browser-hosts/firefox.json > "$out/etc/firefox-host.json"
sed -e "s!%%replace%%!$host_file!" browser-hosts/chrome.json > "$out/etc/chrome-host.json"
ln -s $out/etc/firefox-host.json $out/lib/mozilla/native-messaging-hosts/com.samhh.bukubrow.json
'';
meta = with stdenv.lib; {
description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager";
homepage = https://github.com/SamHH/bukubrow;
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ infinisil ];
};
}

View file

@ -2,13 +2,13 @@
buildPythonApplication rec {
name = "proselint-${version}";
version = "0.8.0";
version = "0.9.0";
doCheck = false; # fails to pass because it tries to run in home directory
src = fetchurl {
url = "mirror://pypi/p/proselint/${name}.tar.gz";
sha256 = "1g8vx04gmv0agmggz1ml5vydfppqvl8dzjvqm6vqw5rzafa89m08";
sha256 = "1fibk24fx00bfn0z4iikcv519cz2nkcil9k187sf3adb2ldzg4ab";
};
propagatedBuildInputs = [ click future six ];

View file

@ -967,6 +967,8 @@ with pkgs;
buildah = callPackage ../development/tools/buildah { };
bukubrow = callPackage ../tools/networking/bukubrow { };
burpsuite = callPackage ../tools/networking/burpsuite {};
c3d = callPackage ../applications/graphics/c3d {
@ -8108,6 +8110,8 @@ with pkgs;
epm = callPackage ../development/tools/misc/epm { };
eresi = callPackage ../development/tools/analysis/eresi { };
eweb = callPackage ../development/tools/literate-programming/eweb { };
eztrace = callPackage ../development/tools/profiling/EZTrace { };
@ -15468,6 +15472,8 @@ with pkgs;
inherit (pythonPackages) pyserial pygtk;
};
browsh = callPackage ../applications/networking/browsers/browsh { };
chromium = callPackage ../applications/networking/browsers/chromium {
channel = "stable";
pulseSupport = config.pulseaudio or true;
@ -18042,6 +18048,8 @@ with pkgs;
rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; };
rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };
rapidsvn = callPackage ../applications/version-management/rapidsvn { };
ratmen = callPackage ../tools/X11/ratmen {};

View file

@ -2211,6 +2211,8 @@ in {
easydict = callPackage ../development/python-modules/easydict { };
easygui = callPackage ../development/python-modules/easygui { };
EasyProcess = callPackage ../development/python-modules/easyprocess { };
easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };
@ -2546,6 +2548,8 @@ in {
};
};
fluent-logger = callPackage ../development/python-modules/fluent-logger {};
python-forecastio = callPackage ../development/python-modules/python-forecastio { };
fpdf = callPackage ../development/python-modules/fpdf { };
@ -3947,6 +3951,8 @@ in {
pylama = callPackage ../development/python-modules/pylama { };
pymediainfo = callPackage ../development/python-modules/pymediainfo { };
pyphen = callPackage ../development/python-modules/pyphen {};
pypoppler = buildPythonPackage rec {
@ -4011,6 +4017,8 @@ in {
};
};
pyprind = callPackage ../development/python-modules/pyprind { };
python-axolotl = callPackage ../development/python-modules/python-axolotl { };
python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
@ -4198,6 +4206,8 @@ in {
raven = callPackage ../development/python-modules/raven { };
rawkit = callPackage ../development/python-modules/rawkit { };
rethinkdb = buildPythonPackage rec {
name = "rethinkdb-${version}";
version = "2.3.0.post6";
@ -6159,6 +6169,10 @@ in {
gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; });
gphoto2 = callPackage ../development/python-modules/gphoto2 {
inherit (pkgs) pkgconfig;
};
grammalecte = callPackage ../development/python-modules/grammalecte { };
greenlet = callPackage ../development/python-modules/greenlet { };