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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-05-07 19:30:14 +02:00
commit 87a5d8fede
256 changed files with 4578 additions and 2874 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -608,6 +608,11 @@
github = "bcdarwin"; github = "bcdarwin";
name = "Ben Darwin"; name = "Ben Darwin";
}; };
bdesham = {
email = "benjamin@esham.io";
github = "bdesham";
name = "Benjamin Esham";
};
bdimcheff = { bdimcheff = {
email = "brandon@dimcheff.com"; email = "brandon@dimcheff.com";
github = "bdimcheff"; github = "bdimcheff";

7
nixos/modules/misc/nixpkgs.nix
View File

@ -127,13 +127,14 @@ in
default = []; default = [];
example = literalExample example = literalExample
'' ''
[ (self: super: { [
(self: super: {
openssh = super.openssh.override { openssh = super.openssh.override {
hpnSupport = true; hpnSupport = true;
kerberos = self.libkrb5; kerberos = self.libkrb5;
}; };
}; })
) ] ]
''; '';
type = types.listOf overlayType; type = types.listOf overlayType;
description = '' description = ''

3
nixos/modules/module-list.nix
View File

@ -256,8 +256,7 @@
./services/databases/virtuoso.nix ./services/databases/virtuoso.nix
./services/desktops/accountsservice.nix ./services/desktops/accountsservice.nix
./services/desktops/bamf.nix ./services/desktops/bamf.nix
./services/desktops/deepin/dde-daemon.nix ./services/desktops/deepin/deepin.nix
./services/desktops/deepin/deepin-menu.nix
./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-renderer.nix
./services/desktops/dleyna-server.nix ./services/desktops/dleyna-server.nix
./services/desktops/pantheon/contractor.nix ./services/desktops/pantheon/contractor.nix

41
nixos/modules/services/desktops/deepin/dde-daemon.nix
View File

@ -1,41 +0,0 @@
# dde-daemon
{ config, pkgs, lib, ... }:
{
###### interface
options = {
services.deepin.dde-daemon = {
enable = lib.mkEnableOption
"A daemon for handling Deepin Desktop Environment session settings";
};
};
###### implementation
config = lib.mkIf config.services.deepin.dde-daemon.enable {
environment.systemPackages = [ pkgs.deepin.dde-daemon ];
services.dbus.packages = [ pkgs.deepin.dde-daemon ];
systemd.packages = [ pkgs.deepin.dde-daemon ];
users.groups.dde-daemon = { };
users.users.dde-daemon = {
description = "Deepin daemon user";
group = "dde-daemon";
isSystemUser = true;
};
};
}

29
nixos/modules/services/desktops/deepin/deepin-menu.nix
View File

@ -1,29 +0,0 @@
# deepin-menu
{ config, pkgs, lib, ... }:
{
###### interface
options = {
services.deepin.deepin-menu = {
enable = lib.mkEnableOption
"DBus service for unified menus in Deepin Desktop Environment";
};
};
###### implementation
config = lib.mkIf config.services.deepin.deepin-menu.enable {
services.dbus.packages = [ pkgs.deepin.deepin-menu ];
};
}

118
nixos/modules/services/desktops/deepin/deepin.nix Normal file
View File

@ -0,0 +1,118 @@
# deepin
{ config, pkgs, lib, ... }:
{
###### interface
options = {
services.deepin.core.enable = lib.mkEnableOption "
Basic dbus and systemd services, groups and users needed by the
Deepin Desktop Environment.
";
services.deepin.deepin-menu.enable = lib.mkEnableOption "
DBus service for unified menus in Deepin Desktop Environment.
";
services.deepin.deepin-turbo.enable = lib.mkEnableOption "
Turbo service for the Deepin Desktop Environment. It is a daemon
that helps to launch applications faster.
";
};
###### implementation
config = lib.mkMerge [
(lib.mkIf config.services.deepin.core.enable {
environment.systemPackages = [
pkgs.deepin.dde-api
pkgs.deepin.dde-calendar
pkgs.deepin.dde-daemon
pkgs.deepin.dde-dock
pkgs.deepin.dde-session-ui
pkgs.deepin.deepin-anything
pkgs.deepin.deepin-image-viewer
pkgs.deepin.deepin-screenshot
];
services.dbus.packages = [
pkgs.deepin.dde-api
pkgs.deepin.dde-calendar
pkgs.deepin.dde-daemon
pkgs.deepin.dde-dock
pkgs.deepin.dde-session-ui
pkgs.deepin.deepin-anything
pkgs.deepin.deepin-image-viewer
pkgs.deepin.deepin-screenshot
];
systemd.packages = [
pkgs.deepin.dde-api
pkgs.deepin.dde-daemon
pkgs.deepin.deepin-anything
];
boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything ];
boot.kernelModules = [ "vfs_monitor" ];
users.groups.deepin-sound-player = { };
users.users.deepin-sound-player = {
description = "Deepin sound player";
group = "deepin-sound-player";
isSystemUser = true;
};
users.groups.deepin-daemon = { };
users.users.deepin-daemon = {
description = "Deepin daemon user";
group = "deepin-daemon";
isSystemUser = true;
};
users.groups.deepin_anything_server = { };
users.users.deepin_anything_server = {
description = "Deepin Anything Server";
group = "deepin_anything_server";
isSystemUser = true;
};
security.pam.services.deepin-auth-keyboard.text = ''
# original at ${pkgs.deepin.dde-daemon}/etc/pam.d/deepin-auth-keyboard
auth [success=2 default=ignore] pam_lsass.so
auth [success=1 default=ignore] pam_unix.so nullok_secure try_first_pass
auth requisite pam_deny.so
auth required pam_permit.so
'';
environment.etc = {
"polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla".source = "${pkgs.deepin.dde-api}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla";
"polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla";
"polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla";
};
services.deepin.deepin-menu.enable = true;
services.deepin.deepin-turbo.enable = true;
})
(lib.mkIf config.services.deepin.deepin-menu.enable {
services.dbus.packages = [ pkgs.deepin.deepin-menu ];
})
(lib.mkIf config.services.deepin.deepin-turbo.enable {
environment.systemPackages = [ pkgs.deepin.deepin-turbo ];
systemd.packages = [ pkgs.deepin.deepin-turbo ];
})
];
}

6
nixos/modules/services/misc/jellyfin.nix
View File

@ -48,12 +48,6 @@ in
jellyfin = {}; jellyfin = {};
}; };
assertions = [
{
assertion = !config.services.emby.enable;
message = "Emby and Jellyfin are incompatible, you cannot enable both";
}
];
}; };
meta.maintainers = with lib.maintainers; [ minijackson ]; meta.maintainers = with lib.maintainers; [ minijackson ];

24
nixos/modules/services/misc/nix-daemon.nix
View File

@ -60,6 +60,7 @@ let
${optionalString (isNix20 && !cfg.distributedBuilds) '' ${optionalString (isNix20 && !cfg.distributedBuilds) ''
builders = builders =
''} ''}
system-features = ${toString cfg.systemFeatures}
$extraOptions $extraOptions
END END
'' + optionalString cfg.checkConfig ( '' + optionalString cfg.checkConfig (
@ -360,6 +361,14 @@ in
''; '';
}; };
systemFeatures = mkOption {
type = types.listOf types.str;
example = [ "kvm" "big-parallel" "gccarch-skylake" ];
description = ''
The supported features of a machine
'';
};
checkConfig = mkOption { checkConfig = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -478,6 +487,21 @@ in
/nix/var/nix/gcroots/tmp /nix/var/nix/gcroots/tmp
''; '';
nix.systemFeatures = mkDefault (
[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) (
# a x86_64 builder can run code for `platform.gcc.arch` and minor architectures:
[ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ {
"sandybridge" = [ "gccarch-westmere" ];
"ivybridge" = [ "gccarch-westmere" "gccarch-sandybridge" ];
"haswell" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ];
"broadwell" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ];
"skylake" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ];
"skylake-avx512" = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ];
}.${pkgs.hostPlatform.platform.gcc.arch} or []
)
);
}; };
} }

12
nixos/modules/system/boot/kexec.nix
View File

@ -13,8 +13,18 @@
path = [ pkgs.kexectools ]; path = [ pkgs.kexectools ];
script = script =
'' ''
# Don't load the current system profile if we already have a kernel loaded
if [[ 1 = "$(</sys/kernel/kexec_loaded)" ]] ; then
echo "kexec kernel has already been loaded, prepare-kexec skipped"
exit 0
fi
p=$(readlink -f /nix/var/nix/profiles/system) p=$(readlink -f /nix/var/nix/profiles/system)
if ! [ -d $p ]; then exit 1; fi if ! [[ -d $p ]]; then
echo "Could not find system profile for prepare-kexec"
exit 1
fi
echo "Loading NixOS system via kexec."
exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init" exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"
''; '';
}; };

14
pkgs/applications/altcoins/bitcoin.nix
View File

@ -1,21 +1,20 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck
, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, python3, qrencode, libevent , zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, python3, qrencode, libevent
, withGui }: , withGui }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.17.1"; version = "0.18.0";
src = fetchurl { src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
]; ];
sha256 = "0am4pnaf2cisv172jqx6jdpzx770agm8777163lkjbw3ryslymiy"; sha256 = "5e4e6890e07b620a93fdb24605dae2bb53e8435b2a93d37558e1db1913df405f";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ] nativeBuildInputs = [ pkgconfig autoreconfHook ];
++ optionals doCheck [ python3 ];
buildInputs = [ openssl db48 boost zlib zeromq buildInputs = [ openssl db48 boost zlib zeromq
miniupnpc protobuf libevent] miniupnpc protobuf libevent]
++ optionals stdenv.isLinux [ utillinux ] ++ optionals stdenv.isLinux [ utillinux ]
@ -31,11 +30,14 @@ stdenv.mkDerivation rec{
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
]; ];
checkInputs = [ rapidcheck python3 ];
doCheck = true; doCheck = true;
# QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
# See also https://github.com/NixOS/nixpkgs/issues/24256 # See also https://github.com/NixOS/nixpkgs/issues/24256
checkFlags = optionals withGui [ "QT_PLUGIN_PATH=${qtbase}/lib/qt-5.${versions.minor qtbase.version}/plugins" ]; checkFlags = optionals withGui [ "QT_PLUGIN_PATH=${qtbase}/lib/qt-5.${versions.minor qtbase.version}/plugins" ]
++ [ "LC_ALL=C.UTF-8" ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/audio/flacon/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flacon-${version}"; name = "flacon-${version}";
version = "5.2.0"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flacon"; owner = "flacon";
repo = "flacon"; repo = "flacon";
rev = "v${version}"; rev = "v${version}";
sha256 = "0vmbwpfjq66qv3zp7mss3hsxy6dxjybqfm7k2xyc0w181qclg1ya"; sha256 = "1j8gzk92kn10yb7rmvrnyq0ipda2swnkmsavqsk5ws0z600p3k93";
}; };
nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig makeWrapper ];

42
pkgs/applications/audio/speech-denoiser/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lv2, meson, ninja }:
let
speech-denoiser-src = fetchFromGitHub {
owner = "lucianodato";
repo = "speech-denoiser";
rev = "04cfba929630404f8d4f4ca5bac8d9b09a99152f";
sha256 = "189l6lz8sz5vr6bjyzgcsrvksl1w6crqsg0q65r94b5yjsmjnpr4";
};
rnnoise-nu = stdenv.mkDerivation rec {
pname = "rnnoise-nu";
version = "unstable-07-10-2019";
src = speech-denoiser-src;
sourceRoot = "source/rnnoise";
nativeBuildInputs = [ autoreconfHook ];
configureFlags = [ "--disable-examples" "--disable-doc" "--disable-shared" "--enable-static" ];
installTargets = [ "install-rnnoise-nu" ];
};
in
stdenv.mkDerivation rec {
pname = "speech-denoiser";
version = "unstable-07-10-2019";
src = speech-denoiser-src;
nativeBuildInputs = [ pkgconfig meson ninja ];
buildInputs = [ lv2 rnnoise-nu ];
postPatch = ''
substituteInPlace meson.build \
--replace "cc.find_library('rnnoise-nu',dirs: meson.current_source_dir() + '/rnnoise/.libs/',required : true)" "cc.find_library('rnnoise-nu', required : true)"
'';
meta = with stdenv.lib; {
description = "Speech denoise lv2 plugin based on RNNoise library";
homepage = https://github.com/lucianodato/speech-denoiser;
license = licenses.lgpl3;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
};
}

4
pkgs/applications/audio/zynaddsubfx/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zynaddsubfx-${version}"; name = "zynaddsubfx-${version}";
version = "3.0.4"; version = "3.0.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2";
sha256 = "18m4ax0x06y1hx4g2g3gf02v0bldkrrb5m7fsr5jlfp1kvjd2j1x"; sha256 = "0qwzg14h043rmyf9jqdylxhyfy4sl0vsr0gjql51wjhid0i34ivl";
}; };
buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];

4
pkgs/applications/graphics/drawpile/default.nix
View File

@ -59,11 +59,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "drawpile-${version}"; name = "drawpile-${version}";
version = "2.1.7"; version = "2.1.8";
src = fetchurl { src = fetchurl {
url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
sha256 = "1nk1rb1syrlkxq7qs101ifaf012mq42nmq1dbkssnx6niydi3bbd"; sha256 = "1gm58zb7nh9h6v0i5pr49sfi17piik5jj757nhl0wrd10nwkipn5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/graphics/rapid-photo-downloader/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, python3Packages { stdenv, fetchurl, python3Packages
, file, intltool, gobject-introspection, libgudev , file, intltool, gobject-introspection, libgudev
, udisks, gexiv2, gst_all_1, libnotify , udisks, gexiv2, gst_all_1, libnotify
, exiftool, gdk_pixbuf, libmediainfo , exiftool, gdk_pixbuf, libmediainfo, vmtouch
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs = [ makeWrapperArgs = [
"--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
"--set PYTHONPATH \"$PYTHONPATH\"" "--set PYTHONPATH \"$PYTHONPATH\""
"--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool ]}" "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool vmtouch ]}"
"--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}" "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}"
"--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\""
]; ];

6
pkgs/applications/graphics/wings/default.nix
View File

@ -1,10 +1,10 @@
{ fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: { fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wings-2.2.3"; name = "wings-2.2.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/wings/${name}.tar.bz2"; url = "mirror://sourceforge/wings/${name}.tar.bz2";
sha256 = "1b9xdmh0186xxs92i831vm9yq0il1hngi8bl9a1q7fs26wb8js1g"; sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3";
}; };
ERL_LIBS = "${cl}/lib/erlang/lib"; ERL_LIBS = "${cl}/lib/erlang/lib";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://www.wings3d.com/; homepage = http://www.wings3d.com/;
description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; description = "Subdivision modeler inspired by Nendo and Mirai from Izware";
license = "BSD"; license = stdenv.lib.licenses.tcltk;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };

6
pkgs/applications/misc/kupfer/default.nix
View File

@ -14,7 +14,7 @@
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
name = "kupfer-${version}"; pname = "kupfer";
version = "319"; version = "319";
src = fetchurl { src = fetchurl {
@ -30,6 +30,10 @@ buildPythonApplication rec {
buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
# without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk'
# see https://github.com/NixOS/nixpkgs/issues/56943 for details
strictDeps = false;
postInstall = let postInstall = let
pythonPath = (stdenv.lib.concatMapStringsSep ":" pythonPath = (stdenv.lib.concatMapStringsSep ":"
(m: "${m}/lib/${python.libPrefix}/site-packages") (m: "${m}/lib/${python.libPrefix}/site-packages")

4
pkgs/applications/misc/mediainfo/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "18.12"; version = "19.04";
name = "mediainfo-${version}"; name = "mediainfo-${version}";
src = fetchurl { src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d"; sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

2
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec {
meta = { meta = {
description = "An open source web browser from Google"; description = "An open source web browser from Google";
homepage = http://www.chromium.org/; homepage = http://www.chromium.org/;
maintainers = with maintainers; [ bendlas ]; maintainers = with maintainers; [ bendlas ivan ];
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
beta = { beta = {
sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy"; sha256 = "1b5hpf1j7ygvh15p11jswr8qf33b6k7l8nnsda93fya5bkc34mgd";
sha256bin64 = "1zzmk08y2rhirm297a91bvq5q30vvxll8fzfp7z5cpqb6az80y2h"; sha256bin64 = "1mwia5l9zz858186m9kj2daq38jw75fipyhh3ncvhkw5hqggx0cd";
version = "74.0.3729.108"; version = "75.0.3770.18";
}; };
dev = { dev = {
sha256 = "1wrg4r2q043i8i4vq9zn69yvnzjxzmxyn21k367909kci83hhi44"; sha256 = "1mmkj89pmbkgf6p7wb1q75j1rsrqcf7wncy3rl03rlhj64b231w7";
sha256bin64 = "1jv9wi4nddijjp9y0r77rxciqsd1rkd87ipvagyq5nzpxr6wdzsa"; sha256bin64 = "0mjcdg8las81lyrgyqymsb80k4wwzsib4sw3nyxd3cgrdxgc5vi9";
version = "75.0.3766.2"; version = "76.0.3783.0";
}; };
stable = { stable = {
sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy"; sha256 = "11m9mlzrqzmz7rhl0ff7lry2s4yjrdkfi36qfv48m1cg5y2cfy6i";
sha256bin64 = "0zs3khzszppmjf5s4rs6fbmhgc9y0abj4q4q8j3hn6nisddi9q9c"; sha256bin64 = "034w01k0c84bx33agc2pj8149ff8rfxnsw371ankx0nzhjbn74ln";
version = "74.0.3729.108"; version = "74.0.3729.131";
}; };
} }

794
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

794
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

794
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

8
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -17,10 +17,10 @@ rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "66.0.3"; ffversion = "66.0.4";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "31pfzgys4dv4fskaasz47fviksjj9xp60r875q0i7z1n6kx25fzkpsg18a98fkqm3g8qmljccy93w68ysywnh1zzrv8djsaza7l0mz8"; sha512 = "0mz2xrznma3hwb2b36hlv4qmnzbfcfhrxbxqhc8yyqxnc0fm4vxbbzh1pzvghp4182n98l1dignw95v11pfgi3gss7sz1zkiywz47sw";
}; };
patches = [ patches = [
@ -72,10 +72,10 @@ rec {
firefox-esr-60 = common rec { firefox-esr-60 = common rec {
pname = "firefox-esr"; pname = "firefox-esr";
ffversion = "60.6.1esr"; ffversion = "60.6.2esr";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "3nl3cisn1sw3y6dxnv0bm143dpp091h1s9j7g73qfx5s6sfxl832lan177ikm00ay7fsly251vi1xz17wwicch1himsmhjisnd3ws51"; sha512 = "2gk11kffwmyq3m8dsjc86f7zfagl15msb8byrb4db4w4ssn335wax2p8m221xi4qnzf20fl0p1b30g5z8ivrxx2n19yknnwalazcjzd";
}; };
patches = [ patches = [

6
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -34,12 +34,13 @@
, stdenv , stdenv
, systemd , systemd
, at-spi2-atk , at-spi2-atk
, at-spi2-core
}: }:
let let
mirror = https://get.geo.opera.com/pub/opera/desktop; mirror = https://get.geo.opera.com/pub/opera/desktop;
version = "56.0.3051.99"; version = "58.0.3135.127";
rpath = stdenv.lib.makeLibraryPath [ rpath = stdenv.lib.makeLibraryPath [
@ -86,6 +87,7 @@ let
libpulseaudio.out libpulseaudio.out
at-spi2-atk at-spi2-atk
at-spi2-core
]; ];
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -94,7 +96,7 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
sha256 = "1mf4lpb66w63kafjni5caq9k3lmsqd85161q29z5lr1s2cx9qqm8"; sha256 = "1nk4zfmb2dv464r1q6n9b66zg7a8h5xfwypzqd791rhmsfjrxn51";
}; };
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";

8
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -89,7 +89,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source # Upstream source
version = "8.0.8"; version = "8.0.9";
lang = "en-US"; lang = "en-US";
@ -99,7 +99,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
]; ];
sha256 = "14ckbhfiyv01cxnd98iihfz7xvrgcd5k4j7pn9ag4a6xb2l80sxi"; sha256 = "0w11rnxpdql81gk618bmyrzl7q9ndyr5zps3cr9l331yhswq0sbc";
}; };
"i686-linux" = fetchurl { "i686-linux" = fetchurl {
@ -107,7 +107,7 @@ let
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
]; ];
sha256 = "0g9sd104b6xnbl2j3gbq1ga6j2h0x3jccays0gpbd235bxpjs39a"; sha256 = "02w1i6vi80ks5ch1pm1r426b9ip53fvg9qv9543r2dns4qzaf7zv";
}; };
}; };
in in
@ -389,7 +389,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tor Browser Bundle built by torproject.org"; description = "Tor Browser Bundle built by torproject.org";
longDescription = tor-browser-bundle.meta.longDescription; longDescription = tor-browser-bundle.meta.longDescription;
homepage = https://www.torproject.org/; homepage = "https://www.torproject.org/";
platforms = attrNames srcs; platforms = attrNames srcs;
maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ]; maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
hydraPlatforms = []; hydraPlatforms = [];

2
pkgs/applications/networking/instant-messengers/rambox/pro.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
''; '';
postFixup = '' postFixup = ''
makeWrapper ${electron}/lib/electron/.electron-wrapped $out/bin/ramboxpro \ makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \
--add-flags "$out/opt/RamboxPro/resources/app.asar.unpacked --without-update" \ --add-flags "$out/opt/RamboxPro/resources/app.asar.unpacked --without-update" \
--prefix PATH : ${xdg_utils}/bin --prefix PATH : ${xdg_utils}/bin
''; '';

4
pkgs/applications/office/libreoffice/default-primary-src.nix
View File

@ -3,7 +3,7 @@
rec { rec {
major = "6"; major = "6";
minor = "2"; minor = "2";
patch = "2"; patch = "3";
tweak = "2"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ rec {
src = fetchurl { src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "0s8zwc2bp1zs7hvyhjz0hpb8w97jm0cdb179p56z7svvmald6fmq"; sha256 = "1bvdvhk1jw16wc0fd7vvvjyn7ydwy9i3xa3d8kn1bdmsn97vkpgi";
}; };
} }

8
pkgs/applications/office/libreoffice/default.nix
View File

@ -48,14 +48,14 @@ let
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "0i8pmgdm0i6klb06s3nwad9xz4whbvb5mjjqjqvl6fh0flk6zs1p"; sha256 = "0gnx596sr498n3frz1wgcnq9kqqaqksxfyjm145235pvrv2ymgvp";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "14hd6rnq9316p78zharqznps80mxxwz3n80zm15cpj3xg3dr57v1"; sha256 = "0chips6h2ymaqwvjlxzjn7jm64y6r4lcr7z7rppan436nqz95dn1";
}; };
}; };
@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead # For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h # of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma";
patches = [ patches = [
./xdg-open-brief.patch ./xdg-open-brief.patch
@ -258,7 +258,7 @@ in stdenv.mkDerivation rec {
mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
for a in sbase scalc sdraw smath swriter simpress soffice; do for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a ln -s $out/lib/libreoffice/program/$a $out/bin/$a
done done

16
pkgs/applications/office/libreoffice/libreoffice-srcs.nix
View File

@ -707,11 +707,11 @@
md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz";
} }
{ {
name = "poppler-0.73.0.tar.xz"; name = "poppler-0.74.0.tar.xz";
url = "http://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz"; url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz";
sha256 = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03"; sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f";
md5 = ""; md5 = "";
md5name = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03-poppler-0.73.0.tar.xz"; md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz";
} }
{ {
name = "postgresql-9.2.24.tar.bz2"; name = "postgresql-9.2.24.tar.bz2";
@ -721,11 +721,11 @@
md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
} }
{ {
name = "Python-3.5.6.tar.xz"; name = "Python-3.5.7.tar.xz";
url = "http://dev-www.libreoffice.org/src/Python-3.5.6.tar.xz"; url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz";
sha256 = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f"; sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc";
md5 = ""; md5 = "";
md5name = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f-Python-3.5.6.tar.xz"; md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz";
} }
{ {
name = "libqxp-0.0.2.tar.xz"; name = "libqxp-0.0.2.tar.xz";

4
pkgs/applications/office/libreoffice/still.nix
View File

@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead # For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h # of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma";
patches = [ patches = [
./xdg-open-brief.patch ./xdg-open-brief.patch
@ -183,7 +183,7 @@ in stdenv.mkDerivation rec {
mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
for a in sbase scalc sdraw smath swriter simpress soffice; do for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do
ln -s $out/lib/libreoffice/program/$a $out/bin/$a ln -s $out/lib/libreoffice/program/$a $out/bin/$a
done done

22
pkgs/applications/science/logic/cedille/default.nix
View File

@ -1,8 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, texinfo
, alex , alex
, happy , happy
, Agda , Agda
@ -19,11 +17,11 @@ stdenv.mkDerivation rec {
owner = "cedille"; owner = "cedille";
repo = "cedille"; repo = "cedille";
rev = "v${version}"; rev = "v${version}";
sha256 = "17j7an5bharc8q1pj06615zmflipjdd0clf67cnfdhsmqwzf6l9r"; sha256 = "16pc72wz6kclq9yv2r8hx85mkp0s125h12snrhcjxkbl41xx2ynb";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ texinfo alex happy ]; nativeBuildInputs = [ alex happy ];
buildInputs = [ Agda (ghcWithPackages (ps: [ps.ieee])) ]; buildInputs = [ Agda (ghcWithPackages (ps: [ps.ieee])) ];
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";
@ -31,26 +29,10 @@ stdenv.mkDerivation rec {
lib.optionalString (buildPlatform.libc == "glibc") lib.optionalString (buildPlatform.libc == "glibc")
"${buildPackages.glibcLocales}/lib/locale/locale-archive"; "${buildPackages.glibcLocales}/lib/locale/locale-archive";
patches = [
# texinfo direntry fix. See: https://github.com/cedille/cedille/pull/86
(fetchpatch {
url = "https://github.com/cedille/cedille/commit/c058f42179a635c7b6179772c30f0eba4ac53724.patch";
sha256 = "02qd86k5bdrygjzh2k0j0q5qk4nk2vwnsz7nvlssvysbvsmiba7x";
})
];
postPatch = '' postPatch = ''
patchShebangs create-libraries.sh patchShebangs create-libraries.sh
patchShebangs docs/src/compile-docs.sh
''; '';
# We regenerate the info file in order to fix the direntry
preBuild = ''
rm -f docs/info/cedille-info-main.info
'';
buildFlags = [ "all" "cedille-docs" ];
installPhase = '' installPhase = ''
install -Dm755 -t $out/bin/ cedille install -Dm755 -t $out/bin/ cedille
install -Dm755 -t $out/bin/ core/cedille-core install -Dm755 -t $out/bin/ core/cedille-core

23
pkgs/applications/science/machine-learning/fasttext/default.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv, fetchFromGitHub, cmake}:
stdenv.mkDerivation rec {
pname = "fasttext";
version = "0.2.0";
src = fetchFromGitHub {
owner = "facebookresearch";
repo = "fastText";
rev = version;
sha256 = "1fcrz648r2s80bf7vc0l371xillz5jk3ldaiv9jb7wnsyri831b4";
};
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
description = "Library for text classification and representation learning";
homepage = https://fasttext.cc/;
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.danieldk ];
};
}

11
pkgs/applications/science/math/nauty/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchurl , fetchurl
, optimize ? false # impure
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nauty-${version}"; name = "nauty-${version}";
@ -11,13 +10,15 @@ stdenv.mkDerivation rec {
sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y"; sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
configureFlags = lib.optionals (!optimize) [ configureFlags = {
# Prevent nauty from sniffing some cpu features. While those are very # Prevent nauty from sniffing some cpu features. While those are very
# widely available, it can lead to nasty bugs when they are not available: # widely available, it can lead to nasty bugs when they are not available:
# https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA
"--disable-popcnt" "default" = [ "--disable-clz" "--disable-popcnt" ];
"--disable-clz" "westmere" = [ "--disable-clz" ];
]; "sandybridge" = [ "--disable-clz" ];
"ivybridge" = [ "--disable-clz" ];
}.${stdenv.hostPlatform.platform.gcc.arch or "default"} or [];
buildInputs = []; buildInputs = [];
installPhase = '' installPhase = ''
mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}

32
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,32 +1,32 @@
{ {
"ce": { "ce": {
"version": "11.9.11", "version": "11.10.4",
"repo_hash": "08f824y6zla4076axdjwcn59hnybps2zvqjhrznfwnhwmak7zqr6", "repo_hash": "02rvf5ikahydswjldzg99k8han051ap7v8h9mcjgrr4xmj301hxm",
"deb_hash": "17cp3vr8pq0l7pgrcmwrmlsygk7ggdvjhh71vjcdlmngaffmv5hm", "deb_hash": "0sigpp5lhg4pl88gsgf7dq2k7mi2wgaz0vdsl25c97w1daw7a60c",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.11-ce.0_amd64.deb/download.deb", "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.10.4-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab-ce", "repo": "gitlab-ce",
"rev": "v11.9.11", "rev": "v11.10.4",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "1.27.2", "GITALY_SERVER_VERSION": "1.34.1",
"GITLAB_PAGES_VERSION": "1.5.0", "GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1", "GITLAB_SHELL_VERSION": "9.0.0",
"GITLAB_WORKHORSE_VERSION": "8.3.3" "GITLAB_WORKHORSE_VERSION": "8.5.2"
} }
}, },
"ee": { "ee": {
"version": "11.9.11", "version": "11.10.4",
"repo_hash": "0nsp3lxxh8gmkafa5a5jxi78n9w8v7gij4l4lka2d1wzfkhgzjph", "repo_hash": "06nf94k0ay9kmx060j387hydyf6crv0f1pjb691r3y6s713m6php",
"deb_hash": "1qr8zbwlj99gqxj0cziy5z9hnaxb5lilgf46k4przkd2lhg5s0c0", "deb_hash": "1g0mlyzm2ikpblmy529wg6az5biiqczpr3kyp2mk4yjkdvg59jjp",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.11-ee.0_amd64.deb/download.deb", "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.10.4-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab-ee", "repo": "gitlab-ee",
"rev": "v11.9.11-ee", "rev": "v11.10.4-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "1.27.2", "GITALY_SERVER_VERSION": "1.34.1",
"GITLAB_PAGES_VERSION": "1.5.0", "GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1", "GITLAB_SHELL_VERSION": "9.0.0",
"GITLAB_WORKHORSE_VERSION": "8.3.3" "GITLAB_WORKHORSE_VERSION": "8.5.2"
} }
} }
} }

10
pkgs/applications/version-management/gitlab/gitaly/Gemfile
View File

@ -5,14 +5,14 @@ gem 'bundler', '>= 1.16.5'
gem 'rugged', '~> 0.28' gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'github-linguist', '~> 6.1', require: 'linguist'
gem 'gitlab-markup', '~> 1.6.5' gem 'gitlab-markup', '~> 1.7.0'
gem 'gitaly-proto', '~> 1.13.0' gem 'gitaly-proto', '~> 1.22.0'
gem 'activesupport', '~> 5.0.2' gem 'activesupport', '~> 5.0.2'
gem 'rdoc', '~> 4.2' gem 'rdoc', '~> 4.2'
gem 'gitlab-gollum-lib', '~> 4.2', require: false gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
gem 'grpc', '~> 1.15.0' gem 'grpc', '~> 1.15.0'
gem 'sentry-raven', '~> 2.7.2', require: false gem 'sentry-raven', '~> 2.9.0', require: false
gem 'faraday', '~> 0.12' gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false gem 'rbtrace', require: false

38
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View File

@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
abstract_type (0.0.7) abstract_type (0.0.7)
activesupport (5.0.7) activesupport (5.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -36,15 +36,15 @@ GEM
ffi (1.10.0) ffi (1.10.0)
gemojione (3.3.0) gemojione (3.3.0)
json json
gitaly-proto (1.13.0) gitaly-proto (1.22.0)
grpc (~> 1.0) grpc (~> 1.0)
github-linguist (6.2.0) github-linguist (6.4.1)
charlock_holmes (~> 0.7.6) charlock_holmes (~> 0.7.6)
escape_utils (~> 1.2.0) escape_utils (~> 1.2.0)
mime-types (>= 1.19) mime-types (>= 1.19)
rugged (>= 0.25.1) rugged (>= 0.25.1)
github-markup (1.7.0) github-markup (1.7.0)
gitlab-gollum-lib (4.2.7.5) gitlab-gollum-lib (4.2.7.7)
gemojione (~> 3.2) gemojione (~> 3.2)
github-markup (~> 1.6) github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0) gollum-grit_adapter (~> 1.0)
@ -52,7 +52,7 @@ GEM
rouge (~> 3.1) rouge (~> 3.1)
sanitize (~> 4.6.4) sanitize (~> 4.6.4)
stringex (~> 2.6) stringex (~> 2.6)
gitlab-gollum-rugged_adapter (0.4.4.1) gitlab-gollum-rugged_adapter (0.4.4.2)
mime-types (>= 1.15) mime-types (>= 1.15)
rugged (~> 0.25) rugged (~> 0.25)
gitlab-grit (2.8.2) gitlab-grit (2.8.2)
@ -60,20 +60,20 @@ GEM
diff-lcs (~> 1.1) diff-lcs (~> 1.1)
mime-types (>= 1.16) mime-types (>= 1.16)
posix-spawn (~> 0.3) posix-spawn (~> 0.3)
gitlab-markup (1.6.5) gitlab-markup (1.7.0)
gollum-grit_adapter (1.0.1) gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1) gitlab-grit (~> 2.7, >= 2.7.1)
google-protobuf (3.6.1) google-protobuf (3.7.1)
googleapis-common-protos-types (1.0.3) googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0) google-protobuf (~> 3.0)
grpc (1.15.0) grpc (1.15.0)
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0) googleapis-common-protos-types (~> 1.0.0)
hashdiff (0.3.8) hashdiff (0.3.8)
i18n (1.1.1) i18n (1.6.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
ice_nine (0.11.2) ice_nine (0.11.2)
json (2.1.0) json (2.2.0)
licensee (8.9.2) licensee (8.9.2)
rugged (~> 0.24) rugged (~> 0.24)
listen (0.5.3) listen (0.5.3)
@ -88,7 +88,7 @@ GEM
msgpack (1.2.6) msgpack (1.2.6)
multi_json (1.13.1) multi_json (1.13.1)
multipart-post (2.0.0) multipart-post (2.0.0)
nokogiri (1.10.1) nokogiri (1.10.2)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0) nokogumbo (1.5.0)
nokogiri nokogiri
@ -141,20 +141,20 @@ GEM
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1) unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0) ruby-progressbar (1.10.0)
rugged (0.28.0) rugged (0.28.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sanitize (4.6.6) sanitize (4.6.6)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
nokogumbo (~> 1.4) nokogumbo (~> 1.4)
sentry-raven (2.7.4) sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0) faraday (>= 0.7.6, < 1.0)
simplecov (0.9.2) simplecov (0.9.2)
docile (~> 1.1.0) docile (~> 1.1.0)
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.9.0) simplecov-html (~> 0.9.0)
simplecov-html (0.9.0) simplecov-html (0.9.0)
stringex (2.8.4) stringex (2.8.5)
thread_safe (0.3.6) thread_safe (0.3.6)
timecop (0.9.1) timecop (0.9.1)
tzinfo (1.2.5) tzinfo (1.2.5)
@ -182,11 +182,11 @@ DEPENDENCIES
bundler (>= 1.16.5) bundler (>= 1.16.5)
factory_bot factory_bot
faraday (~> 0.12) faraday (~> 0.12)
gitaly-proto (~> 1.13.0) gitaly-proto (~> 1.22.0)
github-linguist (~> 6.1) github-linguist (~> 6.1)
gitlab-gollum-lib (~> 4.2) gitlab-gollum-lib (~> 4.2.7.7)
gitlab-gollum-rugged_adapter (~> 0.4.4) gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-markup (~> 1.6.5) gitlab-markup (~> 1.7.0)
google-protobuf (~> 3.6) google-protobuf (~> 3.6)
grpc (~> 1.15.0) grpc (~> 1.15.0)
licensee (~> 8.9.0) licensee (~> 8.9.0)
@ -198,7 +198,7 @@ DEPENDENCIES
rspec-parameterized rspec-parameterized
rubocop (~> 0.50) rubocop (~> 0.50)
rugged (~> 0.28) rugged (~> 0.28)
sentry-raven (~> 2.7.2) sentry-raven (~> 2.9.0)
simplecov (~> 0.9.0) simplecov (~> 0.9.0)
timecop timecop
vcr (~> 4.0.0) vcr (~> 4.0.0)

8
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -7,14 +7,14 @@ let
gemdir = ./.; gemdir = ./.;
}; };
in buildGoPackage rec { in buildGoPackage rec {
version = "1.27.2"; version = "1.34.1";
name = "gitaly-${version}"; name = "gitaly-${version}";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "03v8c9ask1f2bk4z51scpm6zh815hcxi5crly5zn7932i2nfvva0"; sha256 = "1nj1vw3qzfg5azx70ssbjicwqjxd6ka2fkk4rj5bby53755ywl7b";
}; };
goPackagePath = "gitlab.com/gitlab-org/gitaly"; goPackagePath = "gitlab.com/gitlab-org/gitaly";
@ -27,12 +27,12 @@ in buildGoPackage rec {
postInstall = '' postInstall = ''
mkdir -p $ruby mkdir -p $ruby
cp -rv $src/ruby/{bin,lib,git-hooks,vendor} $ruby cp -rv $src/ruby/{bin,lib,git-hooks,gitlab-shell} $ruby
# gitlab-shell will try to read its config relative to the source # gitlab-shell will try to read its config relative to the source
# code by default which doesn't work in nixos because it's a # code by default which doesn't work in nixos because it's a
# read-only filesystem # read-only filesystem
substituteInPlace $ruby/vendor/gitlab-shell/lib/gitlab_config.rb --replace \ substituteInPlace $ruby/gitlab-shell/lib/gitlab_config.rb --replace \
"File.join(ROOT_PATH, 'config.yml')" \ "File.join(ROOT_PATH, 'config.yml')" \
"'/run/gitlab/shell-config.yml'" "'/run/gitlab/shell-config.yml'"
''; '';

84
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View File

@ -9,12 +9,14 @@
}; };
activesupport = { activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default" "development" "test"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1yx73l984y3ri5ndj37l1dfarcdvbhra7vhz9fcww4za24is95d5"; sha256 = "1bcbr490ryw6295p0ja7xigcw0ivkdys90x3qbsbs8c4n1zwcp7p";
type = "gem"; type = "gem";
}; };
version = "5.0.7"; version = "5.0.7.2";
}; };
adamantium = { adamantium = {
dependencies = ["ice_nine" "memoizable"]; dependencies = ["ice_nine" "memoizable"];
@ -178,21 +180,25 @@
}; };
gitaly-proto = { gitaly-proto = {
dependencies = ["grpc"]; dependencies = ["grpc"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; sha256 = "114q2qnd6196xvzmv3jia4n4j4wm3rizqbvxjd9156g0hc20q6yf";
type = "gem"; type = "gem";
}; };
version = "1.13.0"; version = "1.22.0";
}; };
github-linguist = { github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1fs0i5xxsl91hnfa17ipk8cwxrg84kjg9mzxvxkd4ykldfdp353y"; sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf";
type = "gem"; type = "gem";
}; };
version = "6.2.0"; version = "6.4.1";
}; };
github-markup = { github-markup = {
source = { source = {
@ -204,21 +210,25 @@
}; };
gitlab-gollum-lib = { gitlab-gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn"; sha256 = "13m26b32iznp0lbq984dijx7n4ckg99zckwp80gv1knq8n0bpfbf";
type = "gem"; type = "gem";
}; };
version = "4.2.7.5"; version = "4.2.7.7";
}; };
gitlab-gollum-rugged_adapter = { gitlab-gollum-rugged_adapter = {
dependencies = ["mime-types" "rugged"]; dependencies = ["mime-types" "rugged"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; sha256 = "1d32d3yfadzwrarv0biwbfbkz2bqcc0dc3q0imnk962jaay19gc4";
type = "gem"; type = "gem";
}; };
version = "0.4.4.1"; version = "0.4.4.2";
}; };
gitlab-grit = { gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
@ -230,12 +240,14 @@
version = "2.8.2"; version = "2.8.2";
}; };
gitlab-markup = { gitlab-markup = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy"; sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
type = "gem"; type = "gem";
}; };
version = "1.6.5"; version = "1.7.0";
}; };
gollum-grit_adapter = { gollum-grit_adapter = {
dependencies = ["gitlab-grit"]; dependencies = ["gitlab-grit"];
@ -247,21 +259,25 @@
version = "1.0.1"; version = "1.0.1";
}; };
google-protobuf = { google-protobuf = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "134d3ini9ymdwxpz445m28ss9x0m6vcpijcdkzvgk4n538wdmppf"; sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
type = "gem"; type = "gem";
}; };
version = "3.6.1"; version = "3.7.1";
}; };
googleapis-common-protos-types = { googleapis-common-protos-types = {
dependencies = ["google-protobuf"]; dependencies = ["google-protobuf"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
type = "gem"; type = "gem";
}; };
version = "1.0.3"; version = "1.0.4";
}; };
grpc = { grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"]; dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@ -282,12 +298,14 @@
}; };
i18n = { i18n = {
dependencies = ["concurrent-ruby"]; dependencies = ["concurrent-ruby"];
groups = ["default" "development" "test"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem"; type = "gem";
}; };
version = "1.1.1"; version = "1.6.0";
}; };
ice_nine = { ice_nine = {
source = { source = {
@ -298,12 +316,14 @@
version = "0.11.2"; version = "0.11.2";
}; };
json = { json = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
type = "gem"; type = "gem";
}; };
version = "2.1.0"; version = "2.2.0";
}; };
licensee = { licensee = {
dependencies = ["rugged"]; dependencies = ["rugged"];
@ -398,12 +418,14 @@
}; };
nokogiri = { nokogiri = {
dependencies = ["mini_portile2"]; dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2";
type = "gem"; type = "gem";
}; };
version = "1.10.1"; version = "1.10.2";
}; };
nokogumbo = { nokogumbo = {
dependencies = ["nokogiri"]; dependencies = ["nokogiri"];
@ -593,12 +615,14 @@
version = "1.10.0"; version = "1.10.0";
}; };
rugged = { rugged = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
type = "gem"; type = "gem";
}; };
version = "0.28.0"; version = "0.28.1";
}; };
safe_yaml = { safe_yaml = {
source = { source = {
@ -619,12 +643,14 @@
}; };
sentry-raven = { sentry-raven = {
dependencies = ["faraday"]; dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
type = "gem"; type = "gem";
}; };
version = "2.7.4"; version = "2.9.0";
}; };
simplecov = { simplecov = {
dependencies = ["docile" "multi_json" "simplecov-html"]; dependencies = ["docile" "multi_json" "simplecov-html"];
@ -644,12 +670,14 @@
version = "0.9.0"; version = "0.9.0";
}; };
stringex = { stringex = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1"; sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys";
type = "gem"; type = "gem";
}; };
version = "2.8.4"; version = "2.8.5";
}; };
thread_safe = { thread_safe = {
source = { source = {

4
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }: { stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "8.7.1"; version = "9.0.0";
name = "gitlab-shell-${version}"; name = "gitlab-shell-${version}";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-shell"; repo = "gitlab-shell";
rev = "v${version}"; rev = "v${version}";
sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia"; sha256 = "0437pigcgd5qi9ars8br1l058h2mijyv02axlr8wdb1vjsss857g";
}; };
buildInputs = [ ruby bundler go ]; buildInputs = [ ruby bundler go ];

4
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gitlab-workhorse-${version}"; name = "gitlab-workhorse-${version}";
version = "8.3.3"; version = "8.5.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-workhorse"; repo = "gitlab-workhorse";
rev = "v${version}"; rev = "v${version}";
sha256 = "08v5ga9qbrs1xciw4cjhsjpqcp6cxzymc2y39la2a4lgb2cgyi10"; sha256 = "0c1wpp81wr4x00pmc2z41xh4vy7yk97fkcg0cdy7gbz2hc5cm296";
}; };
buildInputs = [ git go ]; buildInputs = [ git go ];

21
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
View File

@ -42,11 +42,11 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4' gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3' gem 'omniauth-authentiq', '~> 0.3.3'
gem 'rack-oauth2', '~> 1.2.1' gem 'rack-oauth2', '~> 1.9.3'
gem 'jwt', '~> 2.1.0' gem 'jwt', '~> 2.1.0'
# Spam and anti-bot protection # Spam and anti-bot protection
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0' gem 'akismet', '~> 2.0'
# Two-factor authentication # Two-factor authentication
@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.7'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.8' gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.2.0' gem 'deckar01-task_list', '2.2.0'
gem 'gitlab-markup', '~> 1.6.5' gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.17' gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2' gem 'RedCloth', '~> 4.3.2'
@ -128,7 +128,7 @@ gem 'asciidoctor', '~> 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8' gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1' gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 2.7.0' gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.1' gem 'nokogiri', '~> 1.10.1'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
@ -139,10 +139,7 @@ gem 'icalendar'
gem 'diffy', '~> 3.1.0' gem 'diffy', '~> 3.1.0'
# Application server # Application server
# The 2.0.6 version of rack requires monkeypatch to be present in gem 'rack', '~> 2.0.7'
# `config.ru`. This can be removed once a new update for Rack
# is available that contains https://github.com/rack/rack/pull/1201.
gem 'rack', '2.0.6'
group :unicorn do group :unicorn do
gem 'unicorn', '~> 5.4.1' gem 'unicorn', '~> 5.4.1'
@ -158,7 +155,7 @@ end
gem 'state_machines-activerecord', '~> 0.5.1' gem 'state_machines-activerecord', '~> 0.5.1'
# Issue tags # Issue tags
gem 'acts-as-taggable-on', '~> 5.0' gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs # Background jobs
gem 'sidekiq', '~> 5.2.1' gem 'sidekiq', '~> 5.2.1'
@ -170,7 +167,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
gem 'fugit', '~> 1.1' gem 'fugit', '~> 1.1'
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.13.3' gem 'httparty', '~> 0.16.4'
# Colored output to console # Colored output to console
gem 'rainbow', '~> 3.0' gem 'rainbow', '~> 3.0'
@ -268,9 +265,7 @@ gem 'addressable', '~> 2.5.2'
gem 'font-awesome-rails', '~> 4.7' gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3' gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2' gem 'gon', '~> 6.2'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'request_store', '~> 1.3' gem 'request_store', '~> 1.3'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1' gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
@ -424,7 +419,7 @@ group :ed25519 do
end end
# Gitaly GRPC client # Gitaly GRPC client
gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly'
gem 'grpc', '~> 1.15.0' gem 'grpc', '~> 1.15.0'

63
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
View File

@ -43,8 +43,8 @@ GEM
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
acts-as-taggable-on (5.0.0) acts-as-taggable-on (6.0.0)
activerecord (>= 4.2.8) activerecord (~> 5.0)
adamantium (0.2.0) adamantium (0.2.0)
ice_nine (~> 0.11.0) ice_nine (~> 0.11.0)
memoizable (~> 0.4.0) memoizable (~> 0.4.0)
@ -65,7 +65,7 @@ GEM
atomic (1.1.99) atomic (1.1.99)
attr_encrypted (3.1.0) attr_encrypted (3.1.0)
encryptor (~> 3.0.0) encryptor (~> 3.0.0)
attr_required (1.0.0) attr_required (1.0.1)
awesome_print (1.8.0) awesome_print (1.8.0)
axiom-types (0.1.1) axiom-types (0.1.1)
descendants_tracker (~> 0.0.4) descendants_tracker (~> 0.0.4)
@ -87,7 +87,9 @@ GEM
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootsnap (1.4.1) bootsnap (1.4.1)
msgpack (~> 1.0) msgpack (~> 1.0)
bootstrap_form (2.7.0) bootstrap_form (4.2.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
brakeman (4.2.1) brakeman (4.2.1)
browser (2.5.3) browser (2.5.3)
builder (3.2.3) builder (3.2.3)
@ -260,7 +262,7 @@ GEM
foreman (0.84.0) foreman (0.84.0)
thor (~> 0.19.1) thor (~> 0.19.1)
formatador (0.2.5) formatador (0.2.5)
fugit (1.1.7) fugit (1.1.9)
et-orbi (~> 1.1, >= 1.1.7) et-orbi (~> 1.1, >= 1.1.7)
raabro (~> 1.1) raabro (~> 1.1)
fuubar (2.2.0) fuubar (2.2.0)
@ -279,12 +281,12 @@ GEM
gettext_i18n_rails (>= 0.7.1) gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0) po_to_json (>= 1.0.0)
rails (>= 3.2.0) rails (>= 3.2.0)
gitaly-proto (1.13.0) gitaly-proto (1.19.0)
grpc (~> 1.0) grpc (~> 1.0)
github-markup (1.7.0) github-markup (1.7.0)
gitlab-default_value_for (3.1.1) gitlab-default_value_for (3.1.1)
activerecord (>= 3.2.0, < 6.0) activerecord (>= 3.2.0, < 6.0)
gitlab-markup (1.6.5) gitlab-markup (1.7.0)
gitlab-sidekiq-fetcher (0.4.0) gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (2.5.1) gitlab-styles (2.5.1)
@ -382,8 +384,8 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
http-form_data (2.1.1) http-form_data (2.1.1)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httparty (0.13.7) httparty (0.16.4)
json (~> 1.8) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.6.0) i18n (1.6.0)
@ -401,7 +403,6 @@ GEM
activesupport activesupport
multipart-post multipart-post
oauth (~> 0.5, >= 0.5.0) oauth (~> 0.5, >= 0.5.0)
jquery-atwho-rails (1.3.2)
js_regex (3.1.1) js_regex (3.1.1)
character_set (~> 1.1) character_set (~> 1.1)
regexp_parser (~> 1.1) regexp_parser (~> 1.1)
@ -587,7 +588,7 @@ GEM
atomic (>= 1.0.0) atomic (>= 1.0.0)
peek peek
redis redis
pg (1.1.3) pg (1.1.4)
po_to_json (1.0.1) po_to_json (1.0.1)
json (>= 1.6.0) json (>= 1.6.0)
powerpack (0.1.1) powerpack (0.1.1)
@ -619,18 +620,18 @@ GEM
puma (>= 2.7, < 4) puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6) raabro (1.1.6)
rack (2.0.6) rack (2.0.7)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-attack (4.4.1) rack-attack (4.4.1)
rack rack
rack-cors (1.0.2) rack-cors (1.0.2)
rack-oauth2 (1.2.3) rack-oauth2 (1.9.3)
activesupport (>= 2.3) activesupport
attr_required (>= 0.0.5) attr_required
httpclient (>= 2.4) httpclient
multi_json (>= 1.3.6) json-jwt (>= 1.9.0)
rack (>= 1.1) rack
rack-protection (2.0.5) rack-protection (2.0.5)
rack rack
rack-proxy (0.6.0) rack-proxy (0.6.0)
@ -683,7 +684,7 @@ GEM
optimist (>= 3.0.0) optimist (>= 3.0.0)
rdoc (6.0.4) rdoc (6.0.4)
re2 (1.1.1) re2 (1.1.1)
recaptcha (3.0.0) recaptcha (4.13.1)
json json
recursive-open-struct (1.1.0) recursive-open-struct (1.1.0)
redis (3.3.5) redis (3.3.5)
@ -788,7 +789,7 @@ GEM
rubyntlm (0.6.2) rubyntlm (0.6.2)
rubypants (0.2.0) rubypants (0.2.0)
rubyzip (1.2.2) rubyzip (1.2.2)
rugged (0.28.0) rugged (0.28.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sanitize (4.6.6) sanitize (4.6.6)
crass (~> 1.0.2) crass (~> 1.0.2)
@ -814,12 +815,10 @@ GEM
seed-fu (2.3.7) seed-fu (2.3.7)
activerecord (>= 3.1) activerecord (>= 3.1)
activesupport (>= 3.1) activesupport (>= 3.1)
select2-rails (3.5.9.3)
thor (~> 0.14)
selenium-webdriver (3.12.0) selenium-webdriver (3.12.0)
childprocess (~> 0.5) childprocess (~> 0.5)
rubyzip (~> 1.2) rubyzip (~> 1.2)
sentry-raven (2.7.4) sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0) faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9) settingslogic (2.0.9)
sexp_processor (4.11.0) sexp_processor (4.11.0)
@ -954,7 +953,7 @@ DEPENDENCIES
RedCloth (~> 4.3.2) RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0) ace-rails-ap (~> 4.1.0)
activerecord_sane_schema_dumper (= 1.0) activerecord_sane_schema_dumper (= 1.0)
acts-as-taggable-on (~> 5.0) acts-as-taggable-on (~> 6.0)
addressable (~> 2.5.2) addressable (~> 2.5.2)
akismet (~> 2.0) akismet (~> 2.0)
asana (~> 0.8.1) asana (~> 0.8.1)
@ -970,7 +969,7 @@ DEPENDENCIES
better_errors (~> 2.5.0) better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0) binding_of_caller (~> 0.8.0)
bootsnap (~> 1.4) bootsnap (~> 1.4)
bootstrap_form (~> 2.7.0) bootstrap_form (~> 4.2.0)
brakeman (~> 4.2) brakeman (~> 4.2)
browser (~> 2.5) browser (~> 2.5)
bullet (~> 5.5.0) bullet (~> 5.5.0)
@ -1021,10 +1020,10 @@ DEPENDENCIES
gettext (~> 3.2.2) gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 1.13.0) gitaly-proto (~> 1.19.0)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1) gitlab-default_value_for (~> 3.1.1)
gitlab-markup (~> 1.6.5) gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4) gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
@ -1047,12 +1046,11 @@ DEPENDENCIES
hipchat (~> 1.5.0) hipchat (~> 1.5.0)
html-pipeline (~> 2.8) html-pipeline (~> 2.8)
html2text html2text
httparty (~> 0.13.3) httparty (~> 0.16.4)
icalendar icalendar
influxdb (~> 0.2) influxdb (~> 0.2)
jaeger-client (~> 0.10.0) jaeger-client (~> 0.10.0)
jira-ruby (~> 1.4) jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2)
js_regex (~> 3.1) js_regex (~> 3.1)
json-schema (~> 2.8.0) json-schema (~> 2.8.0)
jwt (~> 2.1.0) jwt (~> 2.1.0)
@ -1106,10 +1104,10 @@ DEPENDENCIES
pry-rails (~> 0.3.4) pry-rails (~> 0.3.4)
puma (~> 3.12) puma (~> 3.12)
puma_worker_killer puma_worker_killer
rack (= 2.0.6) rack (~> 2.0.7)
rack-attack (~> 4.4.1) rack-attack (~> 4.4.1)
rack-cors (~> 1.0.0) rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1) rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0) rack-proxy (~> 0.6.0)
rails (= 5.0.7.2) rails (= 5.0.7.2)
rails-controller-testing rails-controller-testing
@ -1121,7 +1119,7 @@ DEPENDENCIES
rbtrace (~> 0.4) rbtrace (~> 0.4)
rdoc (~> 6.0) rdoc (~> 6.0)
re2 (~> 1.1.1) re2 (~> 1.1.1)
recaptcha (~> 3.0) recaptcha (~> 4.11)
redis (~> 3.2) redis (~> 3.2)
redis-namespace (~> 1.6.0) redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2) redis-rails (~> 5.0.2)
@ -1148,7 +1146,6 @@ DEPENDENCIES
sass-rails (~> 5.0.6) sass-rails (~> 5.0.6)
scss_lint (~> 0.56.0) scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7) seed-fu (~> 2.3.7)
select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.12) selenium-webdriver (~> 3.12)
sentry-raven (~> 2.7) sentry-raven (~> 2.7)
settingslogic (~> 2.0.9) settingslogic (~> 2.0.9)

100
pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
View File

@ -114,12 +114,14 @@
}; };
acts-as-taggable-on = { acts-as-taggable-on = {
dependencies = ["activerecord"]; dependencies = ["activerecord"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
type = "gem"; type = "gem";
}; };
version = "5.0.0"; version = "6.0.0";
}; };
adamantium = { adamantium = {
dependencies = ["ice_nine" "memoizable"]; dependencies = ["ice_nine" "memoizable"];
@ -215,12 +217,14 @@
version = "3.1.0"; version = "3.1.0";
}; };
attr_required = { attr_required = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc"; sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
type = "gem"; type = "gem";
}; };
version = "1.0.0"; version = "1.0.1";
}; };
awesome_print = { awesome_print = {
source = { source = {
@ -331,12 +335,15 @@
version = "1.4.1"; version = "1.4.1";
}; };
bootstrap_form = { bootstrap_form = {
dependencies = ["actionpack" "activemodel"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw"; sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m";
type = "gem"; type = "gem";
}; };
version = "2.7.0"; version = "4.2.0";
}; };
brakeman = { brakeman = {
source = { source = {
@ -1054,12 +1061,14 @@
}; };
fugit = { fugit = {
dependencies = ["et-orbi" "raabro"]; dependencies = ["et-orbi" "raabro"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; sha256 = "1m9fijppafxrb74v4jgbgni82bykyzpfnrlksfa7bw6sbm7ks4bd";
type = "gem"; type = "gem";
}; };
version = "1.1.7"; version = "1.1.9";
}; };
fuubar = { fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"]; dependencies = ["rspec-core" "ruby-progressbar"];
@ -1116,12 +1125,14 @@
}; };
gitaly-proto = { gitaly-proto = {
dependencies = ["grpc"]; dependencies = ["grpc"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; sha256 = "173769xdvqqmbiz3qlybdlg023vz2kxxmzwxql1wqczf0j57vmv1";
type = "gem"; type = "gem";
}; };
version = "1.13.0"; version = "1.19.0";
}; };
github-markup = { github-markup = {
source = { source = {
@ -1141,12 +1152,14 @@
version = "3.1.1"; version = "3.1.1";
}; };
gitlab-markup = { gitlab-markup = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy"; sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
type = "gem"; type = "gem";
}; };
version = "1.6.5"; version = "1.7.0";
}; };
gitlab-sidekiq-fetcher = { gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"]; dependencies = ["sidekiq"];
@ -1444,13 +1457,15 @@
version = "0.6.0"; version = "0.6.0";
}; };
httparty = { httparty = {
dependencies = ["json" "multi_xml"]; dependencies = ["mime-types" "multi_xml"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2"; sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32";
type = "gem"; type = "gem";
}; };
version = "0.13.7"; version = "0.16.4";
}; };
httpclient = { httpclient = {
source = { source = {
@ -1522,14 +1537,6 @@
}; };
version = "1.4.1"; version = "1.4.1";
}; };
jquery-atwho-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
type = "gem";
};
version = "1.3.2";
};
js_regex = { js_regex = {
dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
source = { source = {
@ -2236,12 +2243,14 @@
version = "1.2.0"; version = "1.2.0";
}; };
pg = { pg = {
groups = ["development" "postgres" "test"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
type = "gem"; type = "gem";
}; };
version = "1.1.3"; version = "1.1.4";
}; };
po_to_json = { po_to_json = {
dependencies = ["json"]; dependencies = ["json"];
@ -2372,12 +2381,14 @@
version = "1.1.6"; version = "1.1.6";
}; };
rack = { rack = {
groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
type = "gem"; type = "gem";
}; };
version = "2.0.6"; version = "2.0.7";
}; };
rack-accept = { rack-accept = {
dependencies = ["rack"]; dependencies = ["rack"];
@ -2406,13 +2417,15 @@
version = "1.0.2"; version = "1.0.2";
}; };
rack-oauth2 = { rack-oauth2 = {
dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"]; dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf"; sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
type = "gem"; type = "gem";
}; };
version = "1.2.3"; version = "1.9.3";
}; };
rack-protection = { rack-protection = {
dependencies = ["rack"]; dependencies = ["rack"];
@ -2585,12 +2598,14 @@
}; };
recaptcha = { recaptcha = {
dependencies = ["json"]; dependencies = ["json"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n"; sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
type = "gem"; type = "gem";
}; };
version = "3.0.0"; version = "4.13.1";
}; };
recursive-open-struct = { recursive-open-struct = {
source = { source = {
@ -2972,12 +2987,14 @@
version = "1.2.2"; version = "1.2.2";
}; };
rugged = { rugged = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
type = "gem"; type = "gem";
}; };
version = "0.28.0"; version = "0.28.1";
}; };
safe_yaml = { safe_yaml = {
source = { source = {
@ -3050,15 +3067,6 @@
}; };
version = "2.3.7"; version = "2.3.7";
}; };
select2-rails = {
dependencies = ["thor"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
type = "gem";
};
version = "3.5.9.3";
};
selenium-webdriver = { selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"]; dependencies = ["childprocess" "rubyzip"];
source = { source = {
@ -3070,12 +3078,14 @@
}; };
sentry-raven = { sentry-raven = {
dependencies = ["faraday"]; dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
type = "gem"; type = "gem";
}; };
version = "2.7.4"; version = "2.9.0";
}; };
settingslogic = { settingslogic = {
source = { source = {

24
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
View File

@ -42,14 +42,14 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4' gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3' gem 'omniauth-authentiq', '~> 0.3.3'
gem 'rack-oauth2', '~> 1.2.1' gem 'rack-oauth2', '~> 1.9.3'
gem 'jwt', '~> 2.1.0' gem 'jwt', '~> 2.1.0'
# Kerberos authentication. EE-only # Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos gem 'gssapi', group: :kerberos
# Spam and anti-bot protection # Spam and anti-bot protection
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0' gem 'akismet', '~> 2.0'
# Two-factor authentication # Two-factor authentication
@ -126,7 +126,7 @@ gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.8' gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.2.0' gem 'deckar01-task_list', '2.2.0'
gem 'gitlab-markup', '~> 1.6.5' gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.17' gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2' gem 'RedCloth', '~> 4.3.2'
@ -138,7 +138,7 @@ gem 'asciidoctor', '~> 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8' gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1' gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 2.7.0' gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.1' gem 'nokogiri', '~> 1.10.1'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
@ -149,10 +149,7 @@ gem 'icalendar'
gem 'diffy', '~> 3.1.0' gem 'diffy', '~> 3.1.0'
# Application server # Application server
# The 2.0.6 version of rack requires monkeypatch to be present in gem 'rack', '~> 2.0.7'
# `config.ru`. This can be removed once a new update for Rack
# is available that contains https://github.com/rack/rack/pull/1201.
gem 'rack', '2.0.6'
group :unicorn do group :unicorn do
gem 'unicorn', '~> 5.4.1' gem 'unicorn', '~> 5.4.1'
@ -168,7 +165,7 @@ end
gem 'state_machines-activerecord', '~> 0.5.1' gem 'state_machines-activerecord', '~> 0.5.1'
# Issue tags # Issue tags
gem 'acts-as-taggable-on', '~> 5.0' gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs # Background jobs
gem 'sidekiq', '~> 5.2.1' gem 'sidekiq', '~> 5.2.1'
@ -180,7 +177,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
gem 'fugit', '~> 1.1' gem 'fugit', '~> 1.1'
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.13.3' gem 'httparty', '~> 0.16.4'
# Colored output to console # Colored output to console
gem 'rainbow', '~> 3.0' gem 'rainbow', '~> 3.0'
@ -278,9 +275,7 @@ gem 'addressable', '~> 2.5.2'
gem 'font-awesome-rails', '~> 4.7' gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3' gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2' gem 'gon', '~> 6.2'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'request_store', '~> 1.3' gem 'request_store', '~> 1.3'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1' gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
@ -308,6 +303,9 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0' gem 'peek-redis', '~> 1.2.0'
# Snowplow events tracking
gem 'snowplow-tracker', '~> 0.6.1'
# Metrics # Metrics
group :metrics do group :metrics do
gem 'method_source', '~> 0.8', require: false gem 'method_source', '~> 0.8', require: false
@ -439,7 +437,7 @@ group :ed25519 do
end end
# Gitaly GRPC client # Gitaly GRPC client
gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly'
gem 'grpc', '~> 1.15.0' gem 'grpc', '~> 1.15.0'

67
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
View File

@ -43,8 +43,8 @@ GEM
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
acts-as-taggable-on (5.0.0) acts-as-taggable-on (6.0.0)
activerecord (>= 4.2.8) activerecord (~> 5.0)
adamantium (0.2.0) adamantium (0.2.0)
ice_nine (~> 0.11.0) ice_nine (~> 0.11.0)
memoizable (~> 0.4.0) memoizable (~> 0.4.0)
@ -65,7 +65,7 @@ GEM
atomic (1.1.99) atomic (1.1.99)
attr_encrypted (3.1.0) attr_encrypted (3.1.0)
encryptor (~> 3.0.0) encryptor (~> 3.0.0)
attr_required (1.0.0) attr_required (1.0.1)
awesome_print (1.8.0) awesome_print (1.8.0)
aws-sdk (2.9.32) aws-sdk (2.9.32)
aws-sdk-resources (= 2.9.32) aws-sdk-resources (= 2.9.32)
@ -95,7 +95,9 @@ GEM
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootsnap (1.4.1) bootsnap (1.4.1)
msgpack (~> 1.0) msgpack (~> 1.0)
bootstrap_form (2.7.0) bootstrap_form (4.2.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
brakeman (4.2.1) brakeman (4.2.1)
browser (2.5.3) browser (2.5.3)
builder (3.2.3) builder (3.2.3)
@ -142,6 +144,7 @@ GEM
concurrent-ruby-ext (1.1.3) concurrent-ruby-ext (1.1.3)
concurrent-ruby (= 1.1.3) concurrent-ruby (= 1.1.3)
connection_pool (2.2.2) connection_pool (2.2.2)
contracts (0.11.0)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
crass (1.0.4) crass (1.0.4)
@ -284,7 +287,7 @@ GEM
foreman (0.84.0) foreman (0.84.0)
thor (~> 0.19.1) thor (~> 0.19.1)
formatador (0.2.5) formatador (0.2.5)
fugit (1.1.7) fugit (1.1.9)
et-orbi (~> 1.1, >= 1.1.7) et-orbi (~> 1.1, >= 1.1.7)
raabro (~> 1.1) raabro (~> 1.1)
fuubar (2.2.0) fuubar (2.2.0)
@ -303,13 +306,13 @@ GEM
gettext_i18n_rails (>= 0.7.1) gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0) po_to_json (>= 1.0.0)
rails (>= 3.2.0) rails (>= 3.2.0)
gitaly-proto (1.13.0) gitaly-proto (1.19.0)
grpc (~> 1.0) grpc (~> 1.0)
github-markup (1.7.0) github-markup (1.7.0)
gitlab-default_value_for (3.1.1) gitlab-default_value_for (3.1.1)
activerecord (>= 3.2.0, < 6.0) activerecord (>= 3.2.0, < 6.0)
gitlab-license (1.0.0) gitlab-license (1.0.0)
gitlab-markup (1.6.5) gitlab-markup (1.7.0)
gitlab-sidekiq-fetcher (0.4.0) gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (2.5.1) gitlab-styles (2.5.1)
@ -409,8 +412,8 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
http-form_data (2.1.1) http-form_data (2.1.1)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httparty (0.13.7) httparty (0.16.4)
json (~> 1.8) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.6.0) i18n (1.6.0)
@ -429,7 +432,6 @@ GEM
multipart-post multipart-post
oauth (~> 0.5, >= 0.5.0) oauth (~> 0.5, >= 0.5.0)
jmespath (1.3.1) jmespath (1.3.1)
jquery-atwho-rails (1.3.2)
js_regex (3.1.1) js_regex (3.1.1)
character_set (~> 1.1) character_set (~> 1.1)
regexp_parser (~> 1.1) regexp_parser (~> 1.1)
@ -617,7 +619,7 @@ GEM
atomic (>= 1.0.0) atomic (>= 1.0.0)
peek peek
redis redis
pg (1.1.3) pg (1.1.4)
po_to_json (1.0.1) po_to_json (1.0.1)
json (>= 1.6.0) json (>= 1.6.0)
powerpack (0.1.1) powerpack (0.1.1)
@ -649,18 +651,18 @@ GEM
puma (>= 2.7, < 4) puma (>= 2.7, < 4)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
raabro (1.1.6) raabro (1.1.6)
rack (2.0.6) rack (2.0.7)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-attack (4.4.1) rack-attack (4.4.1)
rack rack
rack-cors (1.0.2) rack-cors (1.0.2)
rack-oauth2 (1.2.3) rack-oauth2 (1.9.3)
activesupport (>= 2.3) activesupport
attr_required (>= 0.0.5) attr_required
httpclient (>= 2.4) httpclient
multi_json (>= 1.3.6) json-jwt (>= 1.9.0)
rack (>= 1.1) rack
rack-protection (2.0.5) rack-protection (2.0.5)
rack rack
rack-proxy (0.6.0) rack-proxy (0.6.0)
@ -713,7 +715,7 @@ GEM
optimist (>= 3.0.0) optimist (>= 3.0.0)
rdoc (6.0.4) rdoc (6.0.4)
re2 (1.1.1) re2 (1.1.1)
recaptcha (3.0.0) recaptcha (4.13.1)
json json
recursive-open-struct (1.1.0) recursive-open-struct (1.1.0)
redis (3.3.5) redis (3.3.5)
@ -818,7 +820,7 @@ GEM
rubyntlm (0.6.2) rubyntlm (0.6.2)
rubypants (0.2.0) rubypants (0.2.0)
rubyzip (1.2.2) rubyzip (1.2.2)
rugged (0.28.0) rugged (0.28.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sanitize (4.6.6) sanitize (4.6.6)
crass (~> 1.0.2) crass (~> 1.0.2)
@ -844,12 +846,10 @@ GEM
seed-fu (2.3.7) seed-fu (2.3.7)
activerecord (>= 3.1) activerecord (>= 3.1)
activesupport (>= 3.1) activesupport (>= 3.1)
select2-rails (3.5.9.3)
thor (~> 0.14)
selenium-webdriver (3.12.0) selenium-webdriver (3.12.0)
childprocess (~> 0.5) childprocess (~> 0.5)
rubyzip (~> 1.2) rubyzip (~> 1.2)
sentry-raven (2.7.4) sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0) faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9) settingslogic (2.0.9)
sexp_processor (4.11.0) sexp_processor (4.11.0)
@ -877,6 +877,8 @@ GEM
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.0) simplecov-html (0.10.0)
slack-notifier (1.5.1) slack-notifier (1.5.1)
snowplow-tracker (0.6.1)
contracts (~> 0.7, <= 0.11)
spring (2.0.2) spring (2.0.2)
activesupport (>= 4.2) activesupport (>= 4.2)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
@ -984,7 +986,7 @@ DEPENDENCIES
RedCloth (~> 4.3.2) RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0) ace-rails-ap (~> 4.1.0)
activerecord_sane_schema_dumper (= 1.0) activerecord_sane_schema_dumper (= 1.0)
acts-as-taggable-on (~> 5.0) acts-as-taggable-on (~> 6.0)
addressable (~> 2.5.2) addressable (~> 2.5.2)
akismet (~> 2.0) akismet (~> 2.0)
asana (~> 0.8.1) asana (~> 0.8.1)
@ -1001,7 +1003,7 @@ DEPENDENCIES
better_errors (~> 2.5.0) better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0) binding_of_caller (~> 0.8.0)
bootsnap (~> 1.4) bootsnap (~> 1.4)
bootstrap_form (~> 2.7.0) bootstrap_form (~> 4.2.0)
brakeman (~> 4.2) brakeman (~> 4.2)
browser (~> 2.5) browser (~> 2.5)
bullet (~> 5.5.0) bullet (~> 5.5.0)
@ -1056,11 +1058,11 @@ DEPENDENCIES
gettext (~> 3.2.2) gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 1.13.0) gitaly-proto (~> 1.19.0)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1) gitlab-default_value_for (~> 3.1.1)
gitlab-license (~> 1.0) gitlab-license (~> 1.0)
gitlab-markup (~> 1.6.5) gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4) gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
@ -1084,12 +1086,11 @@ DEPENDENCIES
hipchat (~> 1.5.0) hipchat (~> 1.5.0)
html-pipeline (~> 2.8) html-pipeline (~> 2.8)
html2text html2text
httparty (~> 0.13.3) httparty (~> 0.16.4)
icalendar icalendar
influxdb (~> 0.2) influxdb (~> 0.2)
jaeger-client (~> 0.10.0) jaeger-client (~> 0.10.0)
jira-ruby (~> 1.4) jira-ruby (~> 1.4)
jquery-atwho-rails (~> 1.3.2)
js_regex (~> 3.1) js_regex (~> 3.1)
json-schema (~> 2.8.0) json-schema (~> 2.8.0)
jwt (~> 2.1.0) jwt (~> 2.1.0)
@ -1145,10 +1146,10 @@ DEPENDENCIES
pry-rails (~> 0.3.4) pry-rails (~> 0.3.4)
puma (~> 3.12) puma (~> 3.12)
puma_worker_killer puma_worker_killer
rack (= 2.0.6) rack (~> 2.0.7)
rack-attack (~> 4.4.1) rack-attack (~> 4.4.1)
rack-cors (~> 1.0.0) rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1) rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0) rack-proxy (~> 0.6.0)
rails (= 5.0.7.2) rails (= 5.0.7.2)
rails-controller-testing rails-controller-testing
@ -1160,7 +1161,7 @@ DEPENDENCIES
rbtrace (~> 0.4) rbtrace (~> 0.4)
rdoc (~> 6.0) rdoc (~> 6.0)
re2 (~> 1.1.1) re2 (~> 1.1.1)
recaptcha (~> 3.0) recaptcha (~> 4.11)
redis (~> 3.2) redis (~> 3.2)
redis-namespace (~> 1.6.0) redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2) redis-rails (~> 5.0.2)
@ -1187,7 +1188,6 @@ DEPENDENCIES
sass-rails (~> 5.0.6) sass-rails (~> 5.0.6)
scss_lint (~> 0.56.0) scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7) seed-fu (~> 2.3.7)
select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.12) selenium-webdriver (~> 3.12)
sentry-raven (~> 2.7) sentry-raven (~> 2.7)
settingslogic (~> 2.0.9) settingslogic (~> 2.0.9)
@ -1198,6 +1198,7 @@ DEPENDENCIES
simple_po_parser (~> 1.1.2) simple_po_parser (~> 1.1.2)
simplecov (~> 0.14.0) simplecov (~> 0.14.0)
slack-notifier (~> 1.5.1) slack-notifier (~> 1.5.1)
snowplow-tracker (~> 0.6.1)
spring (~> 2.0.0) spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4) spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0) sprockets (~> 3.7.0)

121
pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
View File

@ -114,12 +114,14 @@
}; };
acts-as-taggable-on = { acts-as-taggable-on = {
dependencies = ["activerecord"]; dependencies = ["activerecord"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
type = "gem"; type = "gem";
}; };
version = "5.0.0"; version = "6.0.0";
}; };
adamantium = { adamantium = {
dependencies = ["ice_nine" "memoizable"]; dependencies = ["ice_nine" "memoizable"];
@ -215,12 +217,14 @@
version = "3.1.0"; version = "3.1.0";
}; };
attr_required = { attr_required = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc"; sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
type = "gem"; type = "gem";
}; };
version = "1.0.0"; version = "1.0.1";
}; };
awesome_print = { awesome_print = {
source = { source = {
@ -366,12 +370,15 @@
version = "1.4.1"; version = "1.4.1";
}; };
bootstrap_form = { bootstrap_form = {
dependencies = ["actionpack" "activemodel"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw"; sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m";
type = "gem"; type = "gem";
}; };
version = "2.7.0"; version = "4.2.0";
}; };
brakeman = { brakeman = {
source = { source = {
@ -576,6 +583,16 @@
}; };
version = "2.2.2"; version = "2.2.2";
}; };
contracts = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz";
type = "gem";
};
version = "0.11.0";
};
crack = { crack = {
dependencies = ["safe_yaml"]; dependencies = ["safe_yaml"];
source = { source = {
@ -1142,12 +1159,14 @@
}; };
fugit = { fugit = {
dependencies = ["et-orbi" "raabro"]; dependencies = ["et-orbi" "raabro"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; sha256 = "1m9fijppafxrb74v4jgbgni82bykyzpfnrlksfa7bw6sbm7ks4bd";
type = "gem"; type = "gem";
}; };
version = "1.1.7"; version = "1.1.9";
}; };
fuubar = { fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"]; dependencies = ["rspec-core" "ruby-progressbar"];
@ -1204,12 +1223,14 @@
}; };
gitaly-proto = { gitaly-proto = {
dependencies = ["grpc"]; dependencies = ["grpc"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; sha256 = "173769xdvqqmbiz3qlybdlg023vz2kxxmzwxql1wqczf0j57vmv1";
type = "gem"; type = "gem";
}; };
version = "1.13.0"; version = "1.19.0";
}; };
github-markup = { github-markup = {
source = { source = {
@ -1237,12 +1258,14 @@
version = "1.0.0"; version = "1.0.0";
}; };
gitlab-markup = { gitlab-markup = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "12lzzhbmid4m23pk7d963n3njli2hw7g200arszh75j57bjgs4fy"; sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d";
type = "gem"; type = "gem";
}; };
version = "1.6.5"; version = "1.7.0";
}; };
gitlab-sidekiq-fetcher = { gitlab-sidekiq-fetcher = {
dependencies = ["sidekiq"]; dependencies = ["sidekiq"];
@ -1549,13 +1572,15 @@
version = "0.6.0"; version = "0.6.0";
}; };
httparty = { httparty = {
dependencies = ["json" "multi_xml"]; dependencies = ["mime-types" "multi_xml"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2"; sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32";
type = "gem"; type = "gem";
}; };
version = "0.13.7"; version = "0.16.4";
}; };
httpclient = { httpclient = {
source = { source = {
@ -1635,14 +1660,6 @@
}; };
version = "1.3.1"; version = "1.3.1";
}; };
jquery-atwho-rails = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
type = "gem";
};
version = "1.3.2";
};
js_regex = { js_regex = {
dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
source = { source = {
@ -2365,12 +2382,14 @@
version = "1.2.0"; version = "1.2.0";
}; };
pg = { pg = {
groups = ["development" "postgres" "test"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
type = "gem"; type = "gem";
}; };
version = "1.1.3"; version = "1.1.4";
}; };
po_to_json = { po_to_json = {
dependencies = ["json"]; dependencies = ["json"];
@ -2501,12 +2520,14 @@
version = "1.1.6"; version = "1.1.6";
}; };
rack = { rack = {
groups = ["default" "development" "kerberos" "mysql" "postgres" "test"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
type = "gem"; type = "gem";
}; };
version = "2.0.6"; version = "2.0.7";
}; };
rack-accept = { rack-accept = {
dependencies = ["rack"]; dependencies = ["rack"];
@ -2535,13 +2556,15 @@
version = "1.0.2"; version = "1.0.2";
}; };
rack-oauth2 = { rack-oauth2 = {
dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"]; dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf"; sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
type = "gem"; type = "gem";
}; };
version = "1.2.3"; version = "1.9.3";
}; };
rack-protection = { rack-protection = {
dependencies = ["rack"]; dependencies = ["rack"];
@ -2714,12 +2737,14 @@
}; };
recaptcha = { recaptcha = {
dependencies = ["json"]; dependencies = ["json"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n"; sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
type = "gem"; type = "gem";
}; };
version = "3.0.0"; version = "4.13.1";
}; };
recursive-open-struct = { recursive-open-struct = {
source = { source = {
@ -3101,12 +3126,14 @@
version = "1.2.2"; version = "1.2.2";
}; };
rugged = { rugged = {
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
type = "gem"; type = "gem";
}; };
version = "0.28.0"; version = "0.28.1";
}; };
safe_yaml = { safe_yaml = {
source = { source = {
@ -3179,15 +3206,6 @@
}; };
version = "2.3.7"; version = "2.3.7";
}; };
select2-rails = {
dependencies = ["thor"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
type = "gem";
};
version = "3.5.9.3";
};
selenium-webdriver = { selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"]; dependencies = ["childprocess" "rubyzip"];
source = { source = {
@ -3199,12 +3217,14 @@
}; };
sentry-raven = { sentry-raven = {
dependencies = ["faraday"]; dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
type = "gem"; type = "gem";
}; };
version = "2.7.4"; version = "2.9.0";
}; };
settingslogic = { settingslogic = {
source = { source = {
@ -3300,6 +3320,17 @@
}; };
version = "1.5.1"; version = "1.5.1";
}; };
snowplow-tracker = {
dependencies = ["contracts"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w";
type = "gem";
};
version = "0.6.1";
};
spring = { spring = {
dependencies = ["activesupport"]; dependencies = ["activesupport"];
source = { source = {

12
pkgs/applications/version-management/gitlab/update.py
View File

@ -9,6 +9,7 @@ import logging
import subprocess import subprocess
import json import json
import pathlib import pathlib
from distutils.version import LooseVersion
from typing import Iterable from typing import Iterable
import requests import requests
@ -18,6 +19,7 @@ logger = logging.getLogger(__name__)
class GitLabRepo: class GitLabRepo:
version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?")
def __init__(self, owner: str, repo: str): def __init__(self, owner: str, repo: str):
self.owner = owner self.owner = owner
self.repo = repo self.repo = repo
@ -31,8 +33,13 @@ class GitLabRepo:
r = requests.get(self.url + "/tags?format=atom", stream=True) r = requests.get(self.url + "/tags?format=atom", stream=True)
tree = ElementTree.fromstring(r.content) tree = ElementTree.fromstring(r.content)
return sorted((e.text for e in tree.findall( versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')]
'{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')), reverse=True) # filter out versions not matching version_regex
versions = filter(self.version_regex.match, versions)
# sort, but ignore v and -ee for sorting comparisons
versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True)
return versions
def get_git_hash(self, rev: str): def get_git_hash(self, rev: str):
out = subprocess.check_output(['nix-prefetch-git', self.url, rev]) out = subprocess.check_output(['nix-prefetch-git', self.url, rev])
@ -202,7 +209,6 @@ def update_gitaly():
click.echo(f"Please update gitaly/default.nix to version {gitaly_server_version} and hash {gitaly_hash}") click.echo(f"Please update gitaly/default.nix to version {gitaly_server_version} and hash {gitaly_hash}")
@cli.command('update-gitlab-shell') @cli.command('update-gitlab-shell')
def update_gitlab_shell(): def update_gitlab_shell():
"""Update gitlab-shell""" """Update gitlab-shell"""

3
pkgs/applications/video/mpv/default.nix
View File

@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ffmpeg_4 freetype libass libpthreadstubs ffmpeg_4 freetype libass libpthreadstubs
luaEnv libuchardet mujs nv-codec-headers luaEnv libuchardet mujs
] ++ optional alsaSupport alsaLib ] ++ optional alsaSupport alsaLib
++ optional archiveSupport libarchive ++ optional archiveSupport libarchive
++ optional bluraySupport libbluray ++ optional bluraySupport libbluray
@ -166,6 +166,7 @@ in stdenv.mkDerivation rec {
++ optional xvSupport libXv ++ optional xvSupport libXv
++ optional youtubeSupport youtube-dl ++ optional youtubeSupport youtube-dl
++ optional stdenv.isDarwin libiconv ++ optional stdenv.isDarwin libiconv
++ optional stdenv.isLinux nv-codec-headers
++ optionals cddaSupport [ libcdio libcdio-paranoia ] ++ optionals cddaSupport [ libcdio libcdio-paranoia ]
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]

4
pkgs/applications/virtualization/runc/default.nix
View File

@ -5,13 +5,13 @@ with lib;
buildGoPackage rec { buildGoPackage rec {
name = "runc-${version}"; name = "runc-${version}";
version = "1.0.0-rc7"; version = "1.0.0-rc8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencontainers"; owner = "opencontainers";
repo = "runc"; repo = "runc";
rev = "v${version}"; rev = "v${version}";
sha256 = "1baryjpka8wmzc6c66bir12i390ix3641a06j33shpsb683ws3fj"; sha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf";
}; };
goPackagePath = "github.com/opencontainers/runc"; goPackagePath = "github.com/opencontainers/runc";

5
pkgs/applications/window-managers/awesome/default.nix
View File

@ -48,7 +48,10 @@ with luaPackages; stdenv.mkDerivation rec {
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;"; LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";
postInstall = '' postInstall = ''
wrapProgram $out/bin/awesome \ # Don't use wrapProgram or or the wrapper will duplicate the --search
# arguments every restart
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
--add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \

12
pkgs/applications/window-managers/i3/status-rust.nix
View File

@ -1,17 +1,17 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }: { stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
name = "i3status-rust-${version}"; pname = "i3status-rust";
version = "0.9.0.2019-03-21"; version = "0.9.0.2019-04-27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "greshake"; owner = "greshake";
repo = "i3status-rust"; repo = pname;
rev = "18300e6b9259053b80c37aef56c958fe5f50062b"; rev = "d04d08cbd4d13c64b1e3b7a8d21c46acee3bc281";
sha256 = "1g1ra0i7jlkdslmfycdyb2wh2s4gfawd0k2pjqx3ayml9kgq33yh"; sha256 = "0x23qv7kwsqy1yx25fn1z56fx8w865qarr5xdx8s22x42ym4zyha";
}; };
cargoSha256 = "06izzv86nkn1izapldysyryz9zvjxvq23c742z284bnxjfq5my6i"; cargoSha256 = "0vl2zn9n7ijmjxi2lyglnghvaw4qi2bah5i6km15schlsm8c641g";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

3
pkgs/applications/window-managers/xmonad/wrapper.nix
View File

@ -8,8 +8,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin $out/share install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
ln -s ${xmonadEnv}/share/man $out/share/man
makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \ makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \
--set NIX_GHC "${xmonadEnv}/bin/ghc" \ --set NIX_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_XMESSAGE "${xmessage}/bin/xmessage" --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"

2
pkgs/common-updater/scripts/update-source-version
View File

@ -161,7 +161,7 @@ if [ -z "$newHash" ]; then
die "Couldn't figure out new hash of '$attr.src'!" die "Couldn't figure out new hash of '$attr.src'!"
fi fi
if [ -z "${ignoreSameHash}"] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then if [ -z "${ignoreSameHash}" ] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then
mv "$nixFile.bak" "$nixFile" mv "$nixFile.bak" "$nixFile"
die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!"
fi fi

4
pkgs/data/icons/papirus-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "papirus-icon-theme-${version}"; name = "papirus-icon-theme-${version}";
version = "20190331"; version = "20190501";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam"; owner = "PapirusDevelopmentTeam";
repo = "papirus-icon-theme"; repo = "papirus-icon-theme";
rev = version; rev = version;
sha256 = "0kprnax26qwnxjcd0rrgdbj00835byaamkabjxi2z8lh0k47ap85"; sha256 = "1sdzbvlzzg42vqahjqcsj6v87y1xhchw7bgiv8jgwd2n4l3gg2zy";
}; };
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];

8
pkgs/misc/themes/sierra/default.nix → pkgs/data/themes/sierra/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: { stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sierra-gtk-theme-${version}"; pname = "sierra-gtk-theme";
version = "2018-10-12"; version = "2019-05-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = "sierra-gtk-theme"; repo = pname;
rev = version; rev = version;
sha256 = "0l8mhdy7x8nh5aqsvkk0maqg1cnfds7824g439f6cmifdiyksbgg"; sha256 = "0rm9lcwp89ljxqrya9bi882qcs339pc1l945cr1xq2rganqyk9cq";
}; };
nativeBuildInputs = [ libxml2 ]; nativeBuildInputs = [ libxml2 ];

30
pkgs/desktops/deepin/dde-api/default.nix
View File

@ -26,7 +26,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-api"; pname = "dde-api";
version = "3.18.1"; version = "3.18.3";
goPackagePath = "pkg.deepin.io/dde/api"; goPackagePath = "pkg.deepin.io/dde/api";
@ -34,7 +34,7 @@ buildGoPackage rec {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0y8v18f6l3ycysdn4qi7c93z805q7alji8wix4j4qh9x9r35d728"; sha256 = "0sbzjpjy2d7j22v5sw3mf472lcnsy81n2rgly87k79r5gk9x89ar";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;
@ -68,15 +68,10 @@ buildGoPackage rec {
rfkill # run rfkill # run
xcur2png # run xcur2png # run
#locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?) #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?)
]; ];
postPatch = '' postPatch = ''
searchHardCodedPaths # debugging searchHardCodedPaths # debugging
sed -i -e "s|/var|$out/var|" Makefile
# TODO: confirm where to install grub themes
sed -i -e "s|/boot/grub|$out/boot/grub|" Makefile
fixPath $out /usr/lib/deepin-api \ fixPath $out /usr/lib/deepin-api \
lunar-calendar/main.go \ lunar-calendar/main.go \
@ -90,6 +85,19 @@ buildGoPackage rec {
misc/systemd/system/deepin-shutdown-sound.service \ misc/systemd/system/deepin-shutdown-sound.service \
theme_thumb/gtk/gtk.go \ theme_thumb/gtk/gtk.go \
thumbnails/gtk/gtk.go thumbnails/gtk/gtk.go
fixPath $out /boot/grub Makefile # TODO: confirm where to install grub themes
fixPath $out /var Makefile
# This package wants to install polkit local authority files into
# /var/lib. Nix does not allow a package to install files into /var/lib
# because it is outside of the Nix store and should contain applications
# state information (persistent data modified by programs as they
# run). Polkit looks for them in both /etc/polkit-1 and
# /var/lib/polkit-1 (with /etc having priority over /var/lib). An
# work around is to install them to $out/etc and simlnk them to
# /etc in the deepin module.
sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile
''; '';
buildPhase = '' buildPhase = ''
@ -103,6 +111,10 @@ buildGoPackage rec {
remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/* remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/*
''; '';
postFixup = ''
searchHardCodedPaths $out # debugging
'';
passthru.updateScript = deepin.updateScript { inherit name; }; passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

16
pkgs/desktops/deepin/dde-api/deps.nix generated
View File

@ -41,8 +41,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/fogleman/gg"; url = "https://github.com/fogleman/gg";
rev = "0403632d5b905943a1c2a5b2763aaecd568467ec"; rev = "72436a171bf31757dc87fb8fa9f7485307350307";
sha256 = "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n"; sha256 = "116ysxj7nv9zw5ff75p2mriwf6fx4qzdik9za8cy0l0vih78qvjq";
}; };
} }
{ {
@ -59,8 +59,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/linuxdeepin/go-x11-client"; url = "https://github.com/linuxdeepin/go-x11-client";
rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a";
sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs";
}; };
} }
{ {
@ -77,8 +77,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/image"; url = "https://go.googlesource.com/image";
rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; rev = "6d32002ffd7577f23673706728e1c510698cecb1";
sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; sha256 = "03jzn07kfgdzzm4785xngcksv9ix6q1lf12b8j91flc0v7swsd1b";
}; };
} }
{ {
@ -86,8 +86,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/net"; url = "https://go.googlesource.com/net";
rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; rev = "f4e77d36d62c17c2336347bb2670ddbd02d092b7";
sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; sha256 = "0avjnglqqg9ya0cbhp23m4namykii219kxjywxn4cd7pfcc5arha";
}; };
} }
{ {

22
pkgs/desktops/deepin/dde-daemon/default.nix
View File

@ -9,7 +9,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-daemon"; pname = "dde-daemon";
version = "3.24.1"; version = "3.27.1";
goPackagePath = "pkg.deepin.io/dde/daemon"; goPackagePath = "pkg.deepin.io/dde/daemon";
@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y"; sha256 = "1rbv7fals2bwhalw1hh3swmrdzclqbhny782shnrwqv53235xda3";
}; };
patches = [ patches = [
@ -66,7 +66,7 @@ buildGoPackage rec {
]; ];
postPatch = '' postPatch = ''
searchHardCodedPaths searchHardCodedPaths # debugging
patchShebangs network/nm_generator/gen_nm_consts.py patchShebangs network/nm_generator/gen_nm_consts.py
fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go
@ -78,15 +78,25 @@ buildGoPackage rec {
fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go
sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile
sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} +
searchHardCodedPaths # This package wants to install polkit local authority files into
# /var/lib. Nix does not allow a package to install files into /var/lib
# because it is outside of the Nix store and should contain applications
# state information (persistent data modified by programs as they
# run). Polkit looks for them in both /etc/polkit-1 and
# /var/lib/polkit-1 (with /etc having priority over /var/lib). An
# work around is to install them to $out/etc and simlnk them to
# /etc in the deepin module.
sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile
''; '';
buildPhase = '' buildPhase = ''
export PAM_MODULE_DIR="$out/lib/security"
# compilation of the nm module is failing # compilation of the nm module is failing
#make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code
make -C go/src/${goPackagePath} make -C go/src/${goPackagePath}
@ -103,6 +113,8 @@ buildGoPackage rec {
for binary in $out/lib/deepin-daemon/*; do for binary in $out/lib/deepin-daemon/*; do
wrapProgram $binary "''${gappsWrapperArgs[@]}" wrapProgram $binary "''${gappsWrapperArgs[@]}"
done done
searchHardCodedPaths $out # debugging
''; '';
passthru.updateScript = deepin.updateScript { inherit name; }; passthru.updateScript = deepin.updateScript { inherit name; };

34
pkgs/desktops/deepin/dde-daemon/deps.nix generated
View File

@ -36,13 +36,22 @@
sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6";
}; };
} }
{
goPackagePath = "github.com/gosexy/gettext";
fetch = {
type = "git";
url = "https://github.com/gosexy/gettext";
rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b";
sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi";
};
}
{ {
goPackagePath = "github.com/linuxdeepin/go-x11-client"; goPackagePath = "github.com/linuxdeepin/go-x11-client";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/linuxdeepin/go-x11-client"; url = "https://github.com/linuxdeepin/go-x11-client";
rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a";
sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs";
}; };
} }
{ {
@ -68,8 +77,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/image"; url = "https://go.googlesource.com/image";
rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; rev = "6d32002ffd7577f23673706728e1c510698cecb1";
sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; sha256 = "03jzn07kfgdzzm4785xngcksv9ix6q1lf12b8j91flc0v7swsd1b";
}; };
} }
{ {
@ -77,8 +86,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/net"; url = "https://go.googlesource.com/net";
rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; rev = "f4e77d36d62c17c2336347bb2670ddbd02d092b7";
sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; sha256 = "0avjnglqqg9ya0cbhp23m4namykii219kxjywxn4cd7pfcc5arha";
}; };
} }
{ {
@ -86,8 +95,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://go.googlesource.com/text"; url = "https://go.googlesource.com/text";
rev = "e3703dcdd614d2d7488fff034c75c551ea25da95"; rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475";
sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv"; sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
}; };
} }
{ {
@ -99,13 +108,4 @@
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
}; };
} }
{
goPackagePath = "pkg.deepin.io/lib";
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-lib.git";
rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83";
sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc";
};
}
] ]

4
pkgs/desktops/deepin/dde-network-utils/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-network-utils"; pname = "dde-network-utils";
version = "0.1.2"; version = "0.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1m6njld06yphppyyhygz8mv4gvq2zw0676pbls9m3fs7b3dl56sv"; sha256 = "0nj9lf455lf2hyqv6xwhm4vrr825ldbl83azzrrzqs6p781x65i1";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/dde-polkit-agent/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-polkit-agent"; pname = "dde-polkit-agent";
version = "0.2.4"; version = "0.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1x7mv63g8412w1bq7fijsdzi8832qjb6gnr1nykcv7imzlycq9m6"; sha256 = "1ih78sxhnn6hbx9mzhalx95dk18f217mjbvymf8dky2vkmw8vnmx";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/dde-session-ui/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dde-session-ui"; pname = "dde-session-ui";
version = "4.9.0"; version = "4.9.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1bh7wbkzikcnka94nzqzl87cs2m6bslrv9r2hdsvqqr3aaad5za3"; sha256 = "1wk5mjv1g9my80cxpcycqkm2gjc5r5rrcpxmsl06w4g2c19k50x1";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

64
pkgs/desktops/deepin/deepin-anything/default.nix Normal file
View File

@ -0,0 +1,64 @@
{ stdenv, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux,
dtkcore, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-anything";
version = "0.0.7";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1qggqjjqz2y51pag0v5qniv6763mgrmzjmr7248xx2paw3a923vk";
};
outputs = [ "out" "modsrc" ];
nativeBuildInputs = [
pkgconfig
deepin.setupHook
];
buildInputs = [
dtkcore
qtbase
udisks2-qt5
utillinux
];
enableParallelBuilding = true;
makeFlags = [
"DEB_HOST_MULTIARCH="
"PREFIX=${placeholder ''out''}"
];
postPatch = ''
searchHardCodedPaths # for debugging
fixPath $modsrc /usr/src Makefile
fixPath $out /usr Makefile
fixPath $out /usr server/tool/tool.pro
fixPath $out /etc server/tool/tool.pro
fixPath $out /usr/bin \
server/tool/deepin-anything-tool.service \
server/tool/com.deepin.anything.service \
server/monitor/deepin-anything-monitor.service
sed -e 's,/lib/systemd,$$PREFIX/lib/systemd,' -i server/monitor/src/src.pro server/tool/tool.pro
'';
postFixup = ''
searchHardCodedPaths $out # for debugging
searchHardCodedPaths $modsrc # for debugging
'';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {
description = "Deepin file search tool";
homepage = https://github.com/linuxdeepin/deepin-anything;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

4
pkgs/desktops/deepin/deepin-desktop-base/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-desktop-base"; pname = "deepin-desktop-base";
version = "2019.03.29"; version = "2019.04.24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1d016h95nsn5yay9f4c13hixfxj0q01hpxwj2x84i6qpx63dxdwq"; sha256 = "0mdfjkyjrccxlsg05mf80qcw8v5srlp80rvjkpnnbhfscq1fnpgn";
}; };
nativeBuildInputs = [ deepin.setupHook ]; nativeBuildInputs = [ deepin.setupHook ];

4
pkgs/desktops/deepin/deepin-icon-theme/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-icon-theme"; pname = "deepin-icon-theme";
version = "15.12.68"; version = "15.12.69";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "12jgz81s5qggmnkfg9m5f799r10p43qmh4zqxl1kjvlrqgvsc9rf"; sha256 = "1y6r2as3acqkq8z1d44c82jfplihscmqc9fgpq1j0anznwcdj73k";
}; };
nativeBuildInputs = [ gtk3 xcursorgen ]; nativeBuildInputs = [ gtk3 xcursorgen ];

4
pkgs/desktops/deepin/deepin-image-viewer/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-image-viewer"; pname = "deepin-image-viewer";
version = "1.3.10"; version = "1.3.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0paanw9sd67ic9yrbzqhrwi4bf4lpvsk16jynx99n76j3jgyijkk"; sha256 = "1ql3li63qiw92jx5jzmx3k115vdn3cjfysja3afjhmfngq1xibmj";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-menu/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-menu"; pname = "deepin-menu";
version = "3.4.1"; version = "3.4.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0aga4d4qwd7av6aa4cynhk0sidns7m7y6x0rq1swnkpr9ksr80gi"; sha256 = "1gxf3slqx1s15bjrds29sas7ah6kp8c4pjvzwipncyx6qfgczj2a";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-movie-reborn/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-movie-reborn"; pname = "deepin-movie-reborn";
version = "3.2.21"; version = "3.2.22.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "09a4sirbdxnrwj9ww2v7b1s9ylsincqzpqm2zisny9zxy22fm8s9"; sha256 = "1qh079j4c2n33z0ykv87af9vfkmdxxrv6dy54wdqdpr7vrhn89gb";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

41
pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch Normal file
View File

@ -0,0 +1,41 @@
From 8eeb4febcae517080d6638f8953e02335df79f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 20 Apr 2019 00:28:47 -0300
Subject: [PATCH] Get plugins dir from environment variable
---
src/compositor/meta-plugin-manager.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c
index ac5716db..d000100b 100644
--- a/src/compositor/meta-plugin-manager.c
+++ b/src/compositor/meta-plugin-manager.c
@@ -56,14 +56,22 @@ meta_plugin_manager_set_plugin_type (GType gtype)
void
meta_plugin_manager_load (const gchar *plugin_name)
{
- const gchar *dpath = MUTTER_PLUGIN_DIR "/";
+ const gchar *env_var;
+ const gchar *dpath;
gchar *path;
MetaModule *module;
+ env_var = g_getenv ("DEEPIN_MUTTER_PLUGINS_DIR");
+ g_debug ("$DEEPIN_MUTTER_PLUGINS_DIR: %s\n", env_var);
+
+ dpath = env_var == NULL || strlen (env_var) == 0 ? MUTTER_PLUGIN_DIR : env_var;
+ g_debug ("dpath: %s\n", dpath);
+
if (g_path_is_absolute (plugin_name))
path = g_strdup (plugin_name);
else
- path = g_strconcat (dpath, plugin_name, ".so", NULL);
+ path = g_strconcat (dpath, "/", plugin_name, ".so", NULL);
+ g_debug ("path: %s\n", path);
module = g_object_new (META_TYPE_MODULE, "path", path, NULL);
if (!module || !g_type_module_use (G_TYPE_MODULE (module)))
--
2.21.0

11
pkgs/desktops/deepin/deepin-mutter/default.nix
View File

@ -44,8 +44,13 @@ stdenv.mkDerivation rec {
xorg.libxkbfile xorg.libxkbfile
]; ];
patches = [
./deepin-mutter.plugins-dir.patch
];
postPatch = '' postPatch = ''
searchHardCodedPaths searchHardCodedPaths # debugging
sed -i -e "s,Exec=deepin-mutter,Exec=$out/bin/deepin-mutter," data/mutter.desktop.in
''; '';
configureFlags = [ configureFlags = [
@ -57,6 +62,10 @@ stdenv.mkDerivation rec {
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
''; '';
postFixup = ''
searchHardCodedPaths $out # debugging
'';
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; }; passthru.updateScript = deepin.updateScript { inherit name; };

4
pkgs/desktops/deepin/deepin-screenshot/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-screenshot"; pname = "deepin-screenshot";
version = "4.1.8"; version = "4.1.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1zhjchflgws2q74b9fgdjy2wzifjhimnrrq1sxlv395793xv8lrr"; sha256 = "00zmmnvm5wv9fkc9fbqs23jsqs1mnr68afl4irj6y287ic0pj61i";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-terminal/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-terminal"; pname = "deepin-terminal";
version = "3.2.1.2"; version = "3.2.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = "deepin-terminal"; repo = "deepin-terminal";
rev = version; rev = version;
sha256 = "0dj386csbiw0yqz9nj6ij0s4d0ak9lpq2bmsfs17bjkgdp0ayp90"; sha256 = "08bhdd9q4aqy5yjbpqy918j63c3b2rrdqdkxh3fk258n1fm72gmw";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-turbo/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-turbo"; pname = "deepin-turbo";
version = "0.0.2"; version = "0.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "13vbj18pclv7c25pb1y5x6dd7wmcgisa40mb13qyixnzpq2ssjg5"; sha256 = "15l0pgszmbirlaxj04ishj43kyvigsl1yaf58kxlbdb3lkmcp5f3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/deepin-wm/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "deepin-wm"; pname = "deepin-wm";
version = "1.9.37"; version = "1.9.38";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1xd2x0kyav2cxnk0bybl7lrmak1r2468slxz5a6anrdriw9l10gi"; sha256 = "1qhdnv4x78f0gkr94q0j8x029fk9ji4m9jdipgrdm83pnahib80g";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

1
pkgs/desktops/deepin/default.nix
View File

@ -15,6 +15,7 @@ let
dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-polkit-agent = callPackage ./dde-polkit-agent { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { }; dde-session-ui = callPackage ./dde-session-ui { };
deepin-anything = callPackage ./deepin-anything { };
deepin-desktop-base = callPackage ./deepin-desktop-base { }; deepin-desktop-base = callPackage ./deepin-desktop-base { };
deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { }; deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { };

14
pkgs/desktops/deepin/dtkcore/default.nix
View File

@ -3,19 +3,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dtkcore"; pname = "dtkcore";
version = "2.0.10"; version = "2.0.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0dwpq6c38gaa95mgjnwj3vjz57n0cz6jfk950xi6s9ww2f4g6kq7"; sha256 = "1akfzkdhgsndm6rlr7snhpznxj0w351v6rr8vvnr6ka2dw75xsl4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
qmake qmake
pythonPackages.wrapPython pythonPackages.wrapPython
deepin.setupHook
]; ];
buildInputs = [ buildInputs = [
@ -23,21 +24,18 @@ stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
# Only define QT_HOST_DATA if it is empty searchHardCodedPaths # debugging
sed '/QT_HOST_DATA=/a }' -i src/dtk_module.prf
sed '/QT_HOST_DATA=/i isEmpty(QT_HOST_DATA) {' -i src/dtk_module.prf
# Fix shebang # Fix shebang
sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env," sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env,"
''; '';
preConfigure = '' qmakeFlags = [ "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" ];
qmakeFlags="$qmakeFlags QT_HOST_DATA=$out"
'';
postFixup = '' postFixup = ''
chmod +x $out/lib/dtk2/*.py chmod +x $out/lib/dtk2/*.py
wrapPythonProgramsIn "$out/lib/dtk2" "$out $pythonPath" wrapPythonProgramsIn "$out/lib/dtk2" "$out $pythonPath"
searchHardCodedPaths $out # debugging
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/desktops/deepin/dtkwidget/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dtkwidget"; pname = "dtkwidget";
version = "2.0.10"; version = "2.0.12.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "11a7yirfkcj3rq7va9av4m1pr22mq1yx1j9k18xrqv36n0rlbrr6"; sha256 = "0z71il09gj1frkxfw3av97szh17spr6ss1k07l0prk1s1wm7yyfr";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/dtkwm/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dtkwm"; pname = "dtkwm";
version = "2.0.9"; version = "2.0.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0vkx6vlz83pgawhdwqkwpq3dy8whxmjdzfpgrvm2m6jmspfk9bab"; sha256 = "10l89i84vsh5knq9wg2php7vfg5rj5c9hrrl9rjlcidn1rz8yx6f";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/go-dbus-factory/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "go-dbus-factory"; pname = "go-dbus-factory";
version = "0.4.0"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1i1ymi2qpcbf4d6rnfzrbq5n2vwnn8dvbq9xlw7jls3jpr3d5r00"; sha256 = "080bcwbq00d91iazgl59cp5ra2x6xkhnc41ipvglvrkibq9zi1a4";
}; };
makeFlags = [ "PREFIX=${placeholder ''out''}" ]; makeFlags = [ "PREFIX=${placeholder ''out''}" ];

4
pkgs/desktops/deepin/go-gir-generator/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "go-gir-generator"; pname = "go-gir-generator";
version = "2.0.0"; version = "2.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0d93qzp3dlia5d1yxw0rwca76qk3jyamj9xzmk13vzig8zw0jx16"; sha256 = "0jdhfnwrpp77893zxljr453w23kahqsdpd8a8i5jp6pyvkdm816j";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/go-lib/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "go-lib"; pname = "go-lib";
version = "1.10.0"; version = "1.10.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "090l33y79gdj2xy1bhk2ksl6hvmsfhmx0bhygm4y4d0iqckf2x2m"; sha256 = "05z7ayl23cm8mbn4vkn3isy5kgwxljc26ifmzrhmnqm5yibd6lsf";
}; };
buildInputs = [ buildInputs = [

5
pkgs/desktops/deepin/qcef/default.nix
View File

@ -42,14 +42,14 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "qcef"; pname = "qcef";
version = "1.1.4.6"; version = "1.1.6";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "06909sd0gf7n4hw6p4j96apjym219zabflgpwjafm7v00bgnwxxs"; sha256 = "1x0vb4nkfa1lq0nh6iqpxfvsqmb6qfn305pbc92bsqpgiqd7jvb1";
name = pname; name = pname;
}) })
(fetchFromGitHub { (fetchFromGitHub {
@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/linuxdeepin/qcef; homepage = https://github.com/linuxdeepin/qcef;
license = licenses.lgpl3; license = licenses.lgpl3;
platforms = platforms.linux; platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available
maintainers = with maintainers; [ romildo ]; maintainers = with maintainers; [ romildo ];
}; };
} }

4
pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "qt5dxcb-plugin"; pname = "qt5dxcb-plugin";
version = "1.1.25"; version = "1.1.27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1nadmj1hdpw4n3kpk3dlx22bmxdli66abhjl73hwrbvszmmcm9vp"; sha256 = "1hs7r17qsqn3hgfjd0scagpj1dqys7i1507vxadfac4h1ahyxaz7";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/deepin/qt5integration/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "qt5integration"; pname = "qt5integration";
version = "0.3.8"; version = "0.3.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxdeepin"; owner = "linuxdeepin";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "12d6iv2x0q2n73rscma30q31nh7h26gmhlf665gkgl2j825hlx5n"; sha256 = "1p3bnjy449vy5mpxassjv6sr2dp887gsss000szk5s0p1agmydxq";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

27
pkgs/desktops/deepin/setup-hook.sh
View File

@ -1,17 +1,28 @@
# Helper functions for deepin packaging # Helper functions for deepin packaging
searchHardCodedPaths() { searchHardCodedPaths() {
# looks for ocurrences of hard coded paths in given (current) # Usage:
# directory and command invocations for the purpose of debugging a #
# derivation # searchHardCodedPaths [-a] [<path>]
#
# Looks for ocurrences of FHS hard coded paths and command
# invocations in the given path (default: current directory) for
# the purpose of debugging a derivation. The option -a enables
# processing binary files as if they were text.
local dir=$1 local binary
if [ "$1" = "-a" ]; then
binary="-a"
shift
fi
echo ----------- looking for command invocations local path=$1
grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true
echo ----------- looking for hard coded paths echo ----------- looking for command invocations in $path
grep --color=always -a -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $path || true
echo ----------- looking for hard coded paths in $path
grep --color=always $binary -r -E '/(usr|bin|sbin|etc|var|opt)\>' $path || true
echo ----------- done echo ----------- done
} }

4
pkgs/desktops/enlightenment/efl.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "efl-${version}"; name = "efl-${version}";
version = "1.22.1"; version = "1.22.2";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
sha256 = "04mfjvaxi36b7r6kn4n0nq2gj97cbldk9iqnr5pf8jnm8plyblr0"; sha256 = "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n";
}; };
nativeBuildInputs = [ pkgconfig gtk3 ]; nativeBuildInputs = [ pkgconfig gtk3 ];

4
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "files"; pname = "files";
version = "4.1.7"; version = "4.1.8";
name = "elementary-${pname}-${version}"; name = "elementary-${pname}-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1fz7zawqkb9fa2vy36hg1wz1sxzgm307hp5kckb7icarqfrx0gih"; sha256 = "1frslwbqnv3mwv5dpb1sbhxnwl87cps2ambkkhnn9wwckjpm7p8f";
}; };
passthru = { passthru = {

5
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
View File

@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit tzdata mousetweaks; inherit tzdata mousetweaks;
}) })
./global-backlight-helper.patch
"${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch" "${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch"
"${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
"${patchPath}/correct_logout_action.patch" "${patchPath}/correct_logout_action.patch"
@ -98,6 +99,10 @@ stdenv.mkDerivation rec {
# This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8
# TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release)
rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop
# So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper
mkdir -p $out/bin/elementary-settings-daemon
ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper
''; '';
nativeBuildInputs = [ nativeBuildInputs = [

26
pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
index d7d10fd2..5619d6ad 100644
--- a/plugins/power/gsd-backlight.c
+++ b/plugins/power/gsd-backlight.c
@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task)
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE,
&error,
"pkexec",
- LIBEXECDIR "/gsd-backlight-helper",
+ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper",
g_udev_device_get_sysfs_path (backlight->udev_device),
data->value_str, NULL);
} else {
diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
index f16300f8..79d6bd17 100644
--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in
@@ -25,7 +25,7 @@
<allow_inactive>no</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper</annotate>
</action>
</policyconfig>

4
pkgs/development/compilers/binaryen/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
let let
defaultVersion = "45"; defaultVersion = "83";
# Map from git revs to SHA256 hashes # Map from git revs to SHA256 hashes
sha256s = { sha256s = {
"version_45" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc"; "version_83" = "0vggd9n6anfxsdk4kiyylysi4cfm2rp39f66sq9zkg0h7vw5x5sm";
"1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
}; };
in in

2
pkgs/development/compilers/julia/shared.nix
View File

@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
makeFlags = makeFlags =
let let
arch = head (splitString "-" stdenv.system); arch = head (splitString "-" stdenv.system);
march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" march = { "x86_64" = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; "i686" = "pentium4"; }."${arch}"
or (throw "unsupported architecture: ${arch}"); or (throw "unsupported architecture: ${arch}");
# Julia requires Pentium 4 (SSE2) or better # Julia requires Pentium 4 (SSE2) or better
cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"

71
pkgs/development/compilers/swift/default.nix
View File

@ -34,7 +34,7 @@
}: }:
let let
v_base = "4.2.3"; v_base = "5.0.1";
version = "${v_base}-RELEASE"; version = "${v_base}-RELEASE";
version_friendly = "${v_base}"; version_friendly = "${v_base}";
@ -52,48 +52,48 @@ let
# For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
clang = fetch { clang = fetch {
repo = "swift-clang"; repo = "swift-clang";
sha256 = "0l6w4xzpl3w2nax9a0b885nfzhfj38p2g99158nb5bzfd4s0man7"; sha256 = "1ap26425zhn2sdw3m9snyrqhi4phv2fgblyv9wp8xppjlnjkax9k";
}; };
llvm = fetch { llvm = fetch {
repo = "swift-llvm"; repo = "swift-llvm";
sha256 = "1664zwxbq0a1cmxr9n5a0vw6vdk6ygr7rpglpdsfc7ki857vpsyv"; sha256 = "1bnscqsiljiclij60f44h2fyx5c84pzry0lz1jbwknphwmqd6f84";
}; };
compilerrt = fetch { compilerrt = fetch {
repo = "swift-compiler-rt"; repo = "swift-compiler-rt";
sha256 = "19s6qxn4i0kxpf39xjp2i7zg427iinbmaxqkbb1p91g616y367sf"; sha256 = "0bba54xa7z0wj6k7a24q74gc4yajc6s64g1m894i3yd6swdk7f6r";
}; };
cmark = fetch { cmark = fetch {
repo = "swift-cmark"; repo = "swift-cmark";
sha256 = "1nmxp0fj749sgar682c5nsj7zxxigqwg973baxj2r656a7ybh325"; sha256 = "079smm79hbwr06bvghd2sb86b8gpkprnzlyj9kh95jy38xhlhdnj";
}; };
lldb = fetch { lldb = fetch {
repo = "swift-lldb"; repo = "swift-lldb";
sha256 = "00kz0xhj1p6ckyandj2gs1yfl29kxv84x9pfph00r8crbkd2jz7b"; sha256 = "01yrhc1ggv89qii03fdjdvb2aq9v4hd1wk83n8ygrwwc75p44qmi";
}; };
llbuild = fetch { llbuild = fetch {
repo = "swift-llbuild"; repo = "swift-llbuild";
sha256 = "1mkkhydshhxr28igbldzr0hhqvb6ql43cpf3ba5vglfkbcz6wh6q"; sha256 = "0ipwryzpqxpk3rzkxilfahlkz06k39j91q2lv7fprf0slqknrdms";
}; };
pm = fetch { pm = fetch {
repo = "swift-package-manager"; repo = "swift-package-manager";
sha256 = "1aqvmgq9g5zs4k2qnkvw3h3mar66d690hqq6g2dmrapsyb321j9l"; sha256 = "1mnywlm7i2mbp16q0rskskvnbx1ap8lchwr8q3gx0xs3b2fs6chh";
}; };
xctest = fetch { xctest = fetch {
repo = "swift-corelibs-xctest"; repo = "swift-corelibs-xctest";
sha256 = "1n4w7bfgy73vjzbvbphlwayy0dw73bbrayrpkqq8lbidg0x9lam8"; sha256 = "1vpljkxhfk3yd07ry0xsv3qwbn62pwd2mdn9cw22jhbhvqinc13z";
}; };
foundation = fetch { foundation = fetch {
repo = "swift-corelibs-foundation"; repo = "swift-corelibs-foundation";
sha256 = "11kwc5pcq4ibxkyglmqs7h7gka3xkzl9j856x1rq2xdvq756wq2s"; sha256 = "11w0iapccrk13hjbrwylq8g71znrncnc3mrm345gvnjfgz08ffaq";
}; };
libdispatch = fetch { libdispatch = fetch {
repo = "swift-corelibs-libdispatch"; repo = "swift-corelibs-libdispatch";
sha256 = "09c15mn9s5lf2akzfhik70zk91h97nnm8pq1ppfqry2nn3vmib2i"; sha256 = "1mgzsq3nfzbkssfkswzvvjgsbv2fx36i1r83d4nzw3di8spxmg32";
fetchSubmodules = true; fetchSubmodules = true;
}; };
swift = fetch { swift = fetch {
repo = "swift"; repo = "swift";
sha256 = "09wksqad0w6pk3xdxc278w4mj300h48rvbvx0m4an7npkj6i7n9q"; sha256 = "02bv47pd0k0xy4k7q6c3flwxwkm2palnzvpr4w3nmvqk0flrbsq6";
}; };
}; };
@ -120,6 +120,9 @@ let
builder = '' builder = ''
# gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found
NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE" NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE"
# During the Swift build, a full local LLVM build is performed and the resulting clang is invoked.
# This compiler is not using the Nix wrappers, so it needs some help to find things.
export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE"
$SWIFT_SOURCE_ROOT/swift/utils/build-script \ $SWIFT_SOURCE_ROOT/swift/utils/build-script \
--preset=buildbot_linux \ --preset=buildbot_linux \
@ -132,23 +135,25 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "swift-${version_friendly}"; name = "swift-${version_friendly}";
buildInputs = devInputs ++ [ nativeBuildInputs = [
autoconf autoconf
automake automake
bash bash
clang
cmake cmake
coreutils coreutils
findutils
gnumake
libtool libtool
makeWrapper
ninja ninja
perl perl
pkgconfig pkgconfig
python python
rsync rsync
which which
findutils ];
makeWrapper buildInputs = devInputs ++ [
gnumake clang
]; ];
# TODO: Revisit what's propagated and how # TODO: Revisit what's propagated and how
@ -212,13 +217,12 @@ stdenv.mkDerivation rec {
substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \ substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \
--replace '/usr/include' "${stdenv.cc.libc.dev}/include" --replace '/usr/include' "${stdenv.cc.libc.dev}/include"
substituteInPlace swift-corelibs-libdispatch/src/CMakeLists.txt \
--replace '/usr/include' "${stdenv.cc.libc.dev}/include"
substituteInPlace swift/utils/build-script-impl \ substituteInPlace swift/utils/build-script-impl \
--replace '/usr/include/c++' "${clang.cc.gcc}/include/c++" --replace '/usr/include/c++' "${clang.cc.gcc}/include/c++"
patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch} patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch}
patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch}
patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch}
patch -p1 -d swift -i ${./patches/0003-build-presets-linux-don-t-build-extra-libs.patch}
patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch}
sed -i swift/utils/build-presets.ini \ sed -i swift/utils/build-presets.ini \
@ -227,10 +231,12 @@ stdenv.mkDerivation rec {
-e 's/^validation-test$/# \0/' \ -e 's/^validation-test$/# \0/' \
-e 's/^long-test$/# \0/' \ -e 's/^long-test$/# \0/' \
-e 's/^stress-test$/# \0/' \ -e 's/^stress-test$/# \0/' \
-e 's/^test-optimized$/# \0/' -e 's/^test-optimized$/# \0/' \
\
-e 's/^swift-install-components=autolink.*$/\0;editor-integration/'
# https://bugs.swift.org/browse/SR-5779 # https://bugs.swift.org/browse/SR-10559
sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake patch -p1 -d swift-corelibs-libdispatch -i ${./patches/libdispatch-fortify-fix.patch}
substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \ substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \
--replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "'
@ -241,8 +247,6 @@ stdenv.mkDerivation rec {
sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
PREFIX=''${out/#\/} PREFIX=''${out/#\/}
substituteInPlace swift-corelibs-foundation/build.py \
--replace usr/lib "$PREFIX/lib"
substituteInPlace swift-corelibs-xctest/build_script.py \ substituteInPlace swift-corelibs-xctest/build_script.py \
--replace usr "$PREFIX" --replace usr "$PREFIX"
substituteInPlace swiftpm/Utilities/bootstrap \ substituteInPlace swiftpm/Utilities/bootstrap \
@ -250,9 +254,19 @@ stdenv.mkDerivation rec {
--replace usr/lib "$PREFIX/lib" --replace usr/lib "$PREFIX/lib"
''; '';
buildPhase = builder;
doCheck = false; doCheck = false;
buildPhase = builder; checkInputs = [ file ];
# TODO: investigate the non-working tests
checkPhase = ''
checkTarget=check-swift-all
ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}'
ninjaCheckPhase
'';
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
@ -262,13 +276,10 @@ stdenv.mkDerivation rec {
tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX
find $out -type d -empty -delete find $out -type d -empty -delete
# TODO: Use wrappers to get these on the PATH for swift tools, instead
ln -s ${clang}/bin/* $out/bin/
ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar
wrapProgram $out/bin/swift \ wrapProgram $out/bin/swift \
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix LIBRARY_PATH : $icu/lib
''; '';
# Hack to avoid TMPDIR in RPATHs. # Hack to avoid TMPDIR in RPATHs.

4
pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
View File

@ -11,8 +11,8 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 7ee57ad2df..e6b0af3581 100644 index 7ee57ad2df..e6b0af3581 100644
--- a/utils/build-presets.ini --- a/utils/build-presets.ini
+++ b/utils/build-presets.ini +++ b/utils/build-presets.ini
@@ -717,7 +717,7 @@ swiftpm @@ -721,7 +721,7 @@ swiftpm
xctest
dash-dash dash-dash
-build-ninja -build-ninja

14
pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
View File

@ -9,17 +9,17 @@ Subject: [PATCH 2/4] build-presets: (linux) allow custom install prefix
diff --git a/utils/build-presets.ini b/utils/build-presets.ini diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index e6b0af3581..1095cbaab7 100644 index e6b0af3581..1095cbaab7 100644
--- a/utils/build-presets.ini --- a/utils/build-presets.ini 2019-04-11 14:51:40.060259462 +0200
+++ b/utils/build-presets.ini +++ b/utils/build-presets.ini 2019-04-11 15:16:17.471137969 +0200
@@ -723,7 +723,7 @@ install-lldb @@ -728,7 +728,7 @@
install-llbuild
install-swiftpm install-swiftpm
install-xctest install-xctest
install-libicu
-install-prefix=/usr -install-prefix=/usr
+install-prefix=%(install_prefix)s +install-prefix=%(install_prefix)s
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
build-swift-static-stdlib llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
build-swift-static-sdk-overlay install-libcxx
-- --
2.12.2 2.12.2

23
pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch Normal file
View File

@ -0,0 +1,23 @@
--- a/utils/build-presets.ini 2019-04-11 15:19:57.845178834 +0200
+++ b/utils/build-presets.ini 2019-04-11 15:27:42.041297057 +0200
@@ -716,8 +716,6 @@
llbuild
swiftpm
xctest
-libicu
-libcxx
dash-dash
@@ -727,11 +725,9 @@
install-llbuild
install-swiftpm
install-xctest
-install-libicu
install-prefix=%(install_prefix)s
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
-install-libcxx
build-swift-static-stdlib
build-swift-static-sdk-overlay
build-swift-stdlib-unittest-extra

2
pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
View File

@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 1739e91dc2..0608fed9c1 100644 index 1739e91dc2..0608fed9c1 100644
--- a/utils/build-presets.ini --- a/utils/build-presets.ini
+++ b/utils/build-presets.ini +++ b/utils/build-presets.ini
@@ -740,6 +740,8 @@ install-destdir=%(install_destdir)s @@ -743,6 +743,8 @@ install-destdir=%(install_destdir)s
# Path to the .tar.gz package we would create. # Path to the .tar.gz package we would create.
installable-package=%(installable_package)s installable-package=%(installable_package)s

8
pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
View File

@ -1,13 +1,13 @@
The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories. The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories.
--- swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 17:51:51.581766303 +0200 --- swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.493801403 +0200
+++ swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 18:40:04.118956708 +0200 +++ swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.577800593 +0200
@@ -65,7 +65,7 @@ @@ -68,7 +68,7 @@
endif() endif()
set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}") set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
- set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}") - set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}")
+ set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}") + set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/") if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/" AND NOT "${sdk}" STREQUAL "ANDROID")
set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}") set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}")

13
pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch Normal file
View File

@ -0,0 +1,13 @@
Nix compiles with _FORTIFY_SOURCE enabled. Fix error due to -Werror and an unused return value warning.
--- swift-corelibs-libdispatch/src/internal.h 2019-04-26 09:33:38.287289099 +0200
+++ swift-corelibs-libdispatch/src/internal.h 2019-04-26 15:31:10.485334128 +0200
@@ -1053,7 +1053,7 @@
#else
#define _dispatch_client_assert_fail(fmt, ...) do { \
char *_msg = NULL; \
- asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
+ (void)asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
##__VA_ARGS__); \
_dispatch_assert_crash(_msg); \
free(_msg); \

2
pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
View File

@ -2,7 +2,7 @@ Only use the Nix include dirs when no sysroot is configured.
--- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200 --- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200
+++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200 +++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200
@@ -565,7 +565,7 @@ @@ -641,7 +641,7 @@
// Check for configure-time C include directories. // Check for configure-time C include directories.
StringRef CIncludeDirs(C_INCLUDE_DIRS); StringRef CIncludeDirs(C_INCLUDE_DIRS);

Some files were not shown because too many files have changed in this diff Show More