Skip to content

Commit

Permalink
Merge master into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
FRidh committed Jul 31, 2018
2 parents 73959b6 + 94cbb8e commit d56b54c
Show file tree
Hide file tree
Showing 53 changed files with 844 additions and 87 deletions.
6 changes: 3 additions & 3 deletions nixos/modules/services/databases/foundationdb.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -413,4 +410,7 @@ in
'';
};
};

meta.doc = ./foundationdb.xml;
meta.maintainers = with lib.maintainers; [ thoughtpolice ];
}
2 changes: 1 addition & 1 deletion nixos/modules/services/databases/foundationdb.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
11 changes: 8 additions & 3 deletions nixos/modules/services/misc/gitlab.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions nixos/release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mopidy/gmusic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
8 changes: 6 additions & 2 deletions pkgs/applications/audio/pulseeffects/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
, meson
, ninja
, pkgconfig
, itstool
, libxml2
, desktop-file-utils
, wrapGAppsHook
Expand All @@ -20,6 +21,7 @@
, libbs2b
, libsamplerate
, libsndfile
, libebur128
, boost
, fftwFloat
, calf
Expand All @@ -40,20 +42,21 @@ 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 = [
meson
ninja
pkgconfig
libxml2
itstool
desktop-file-utils
wrapGAppsHook
];
Expand All @@ -70,6 +73,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gst-plugins-bad
lilv lv2 serd sord sratom
libbs2b
libebur128
libsamplerate
libsndfile
boost
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/editors/ghostwriter/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/editors/gnome-latex/default.nix
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
71 changes: 71 additions & 0 deletions pkgs/applications/graphics/rapid-photo-downloader/default.nix
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
60 changes: 60 additions & 0 deletions pkgs/applications/networking/browsers/browsh/default.nix
Original file line number Diff line number Diff line change
@@ -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;
};
}
Loading

0 comments on commit d56b54c

Please sign in to comment.