diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix
index 90aa04d2762e..1a98f005602a 100644
--- a/nixos/modules/services/development/hoogle.nix
+++ b/nixos/modules/services/development/hoogle.nix
@@ -43,6 +43,12 @@ in {
defaultText = "pkgs.haskellPackages";
};
+ home = mkOption {
+ type = types.str;
+ description = "Url for hoogle logo";
+ default = "https://hoogle.haskell.org";
+ };
+
};
config = mkIf cfg.enable {
@@ -53,7 +59,7 @@ in {
serviceConfig = {
Restart = "always";
- ExecStart = ''${hoogleEnv}/bin/hoogle server --local -p ${toString cfg.port}'';
+ ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home}'';
User = "nobody";
Group = "nogroup";
diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
index e06a80e443d9..d9dde3f6bb67 100644
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -195,6 +195,17 @@ in
};
helperd = {
+ enable = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Enable the BeeGFS helperd.
+ The helpered is need for logging purposes on the client.
+ Disabling helperd allows for runing the client
+ with allowUnfree = false.
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 2ec5a10b4818..488d9877b5e0 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -37,6 +37,7 @@ let
[reflector]
enable-reflector=${yesNo reflector}
+ ${extraConfig}
'';
in
@@ -176,6 +177,14 @@ in
'';
};
+ extraConfig = mkOption {
+ default = "";
+ type = types.lines;
+ description = ''
+ Extra config to append to avahi-daemon.conf.
+ '';
+ };
+
};
};
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 2596ec4ad85c..896f70c86ebb 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -41,6 +41,18 @@ in
name = "lxqt";
bgSupport = true;
start = ''
+ # Upstream installs default configuration files in
+ # $prefix/share/lxqt instead of $prefix/etc/xdg, (arguably)
+ # giving distributors freedom to ship custom default
+ # configuration files more easily. In order to let the session
+ # manager find them the share subdirectory is added to the
+ # XDG_CONFIG_DIRS environment variable.
+ #
+ # For an explanation see
+ # https://github.com/lxqt/lxqt/issues/1521#issuecomment-405097453
+ #
+ export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS''${XDG_CONFIG_DIRS:+:}${config.system.path}/share
+
exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt
'';
};
@@ -53,16 +65,11 @@ in
config.environment.lxqt.excludePackages);
# Link some extra directories in /run/current-system/software/share
- environment.pathsToLink = [
- "/share/desktop-directories"
- "/share/icons"
- "/share/lxqt"
- ];
+ environment.pathsToLink = [ "/share" ];
environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
services.upower.enable = config.powerManagement.enable;
};
-
}
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 3e75941c193e..951da797fe5c 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -546,7 +546,7 @@ in
};
services.journald.rateLimitInterval = mkOption {
- default = "10s";
+ default = "30s";
type = types.str;
description = ''
Configures the rate limiting interval that is applied to all
@@ -559,7 +559,7 @@ in
};
services.journald.rateLimitBurst = mkOption {
- default = 100;
+ default = 1000;
type = types.int;
description = ''
Configures the rate limiting burst limit (number of messages per
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index a2d35f382b98..40ae38fda5c2 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
- version = "3.21.3";
+ version = "3.23.0";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "0gp51zz5qr93w0h14m1blmjnlgmilyb15lw2m75varslw1ar7vlg";
+ sha256 = "1zhd82mzbzc9jx7xhglgq0giyy214ypq1rw5kmhp5zswv71hf2j0";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 8d3d9c9bfcfd..4bf81dcdd26a 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,34 +1,61 @@
-{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, libxklavier, libgcrypt, audit, coreutils
-, qt4 ? null
+{ stdenv, fetchFromGitHub, pam, pkgconfig, autoconf, automake, libtool, libxcb
+, glib, libXdmcp, itstool, intltool, libxklavier, libgcrypt, audit, busybox
+, polkit, accountsservice, gtk-doc, gnome3, gobjectIntrospection, vala
+, withQt4 ? false, qt4
, withQt5 ? false, qtbase
}:
with stdenv.lib;
-let
- ver_branch = "1.24";
- version = "1.24.0";
-in
stdenv.mkDerivation rec {
- name = "lightdm-${version}";
+ pname = "lightdm";
+ version = "1.26.0";
- src = fetchurl {
- url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
- sha256 = "18j33bm54i8k7ncxcs69zqi4105s62n58jrydqn3ikrb71s9nl6d";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "CanonicalLtd";
+ repo = pname;
+ rev = version;
+ sha256 = "1mhj6l025cnf2dzxnbzlk0qa9fm4gj2aw58qh5fl4ky87dp4wdyb";
};
- nativeBuildInputs = [ pkgconfig intltool ];
+ nativeBuildInputs = [
+ autoconf
+ automake
+ gnome3.yelp-tools
+ gnome3.yelp-xsl
+ gobjectIntrospection
+ gtk-doc
+ intltool
+ itstool
+ libtool
+ pkgconfig
+ vala
+ ];
+
buildInputs = [
- pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt
- qt4 audit
- ] ++ optional withQt5 qtbase;
+ accountsservice
+ audit
+ glib
+ libgcrypt
+ libxcb
+ libXdmcp
+ libxklavier
+ pam
+ polkit
+ ] ++ optional withQt4 qt4
+ ++ optional withQt5 qtbase;
+
+
+ preConfigure = "NOCONFIGURE=1 ./autogen.sh";
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/etc"
"--disable-tests"
- ] ++ optional (qt4 != null) "--enable-liblightdm-qt"
+ "--disable-static"
+ ] ++ optional withQt4 "--enable-liblightdm-qt"
++ optional withQt5 "--enable-liblightdm-qt5";
installFlags = [
@@ -37,14 +64,17 @@ stdenv.mkDerivation rec {
];
prePatch = ''
+ substituteInPlace autogen.sh \
+ --replace "which" "${busybox}/bin/which"
+
substituteInPlace src/shared-data-manager.c \
- --replace /bin/rm ${coreutils}/bin/rm
+ --replace /bin/rm ${busybox}/bin/rm
'';
meta = {
- homepage = https://launchpad.net/lightdm;
+ homepage = https://github.com/CanonicalLtd/lightdm;
platforms = platforms.linux;
license = licenses.gpl3;
- maintainers = with maintainers; [ ocharles wkennington ];
+ maintainers = with maintainers; [ ocharles wkennington worldofpeace ];
};
}
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 2d7ea931dd2a..d77f8f2e7a6a 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -29,36 +29,48 @@ let
(
cd $out/clion-${version}
# bundled cmake does not find libc
- rm -rf bin/cmake
- ln -s ${cmake} bin/cmake
+ rm -rf bin/cmake/linux
+ ln -s ${cmake} bin/cmake/linux
- lldbLibPath=$out/clion-${version}/bin/lldb/lib
+ lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
- bin/lldb/bin/lldb-server
+ bin/lldb/linux/bin/lldb-server
for i in LLDBFrontend lldb lldb-argdumper; do
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
- "bin/lldb/bin/$i"
+ "bin/lldb/linux/bin/$i"
done
patchelf \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
- bin/lldb/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so
+ bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so
patchelf \
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \
- bin/lldb/lib/liblldb.so
+ bin/lldb/linux/lib/liblldb.so
- patchelf --set-interpreter $interp bin/gdb/bin/gdb
- patchelf --set-interpreter $interp bin/gdb/bin/gdbserver
+ gdbLibPath=$out/clion-${version}/bin/gdb/linux/lib
+ patchelf \
+ --set-rpath "$gdbLibPath" \
+ bin/gdb/linux/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so
patchelf --set-interpreter $interp \
- --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$lldbLibPath" \
- bin/clang/clang-tidy
+ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$gdbLibPath" \
+ bin/gdb/linux/bin/gdb
+ patchelf --set-interpreter $interp \
+ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$gdbLibPath" \
+ bin/gdb/linux/bin/gdbserver
+
+ patchelf --set-interpreter $interp \
+ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \
+ bin/clang/linux/clangd
+ patchelf --set-interpreter $interp \
+ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \
+ bin/clang/linux/clang-tidy
wrapProgram $out/bin/clion \
--set CL_JDK "${jdk}"
@@ -237,12 +249,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2018.1.5"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "0hd58i531schyjlm99vff9bi5gjskdbsljd367k9zafjfh53z91l"; /* updated by script */
+ sha256 = "08kjlmldnd6rnk8m12klfp9vbkbvcsgaknpi55r248nzglnbx9gz"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -250,25 +262,25 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2018.1.4"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "1m0qckq645jw7cj40m5vfgr212b8hji539skavch2j5s5fbqy3ln"; /* updated by script */
+ sha256 = "1byf46vni8s6qf3wlsnscxipgndl6ic48nizwiaqasnhhszqssxs"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
- update-channel = "DataGrip 2018.1";
+ update-channel = "DataGrip 2018.2";
};
goland = buildGoland rec {
name = "goland-${version}";
- version = "2018.1.4"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "1ipib91443sb27snnqik8rm3bm9w6gb5niildbd538lhc9agc9xb"; /* updated by script */
+ sha256 = "0z7a06892c3hcq5zxvkfnyf0ablwq51710x1f12v6r297l4mfra0"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand Release";
@@ -276,12 +288,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2018.1.5"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "0bhajghwh5r5mdv3lbnq0xlr6669hid5kyzlsxnsfzc2z737zwc5"; /* updated by script */
+ sha256 = "0r5fsai77w74vhfs449yff56pi4vynl8w25amn23k6hddlqxph2s"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA Release";
@@ -289,12 +301,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2018.1.5"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
- sha256 = "046wyvk2f7vbh4zam1bbri4yxzb34q43rjpk6i6npxrb25jv6clx"; /* updated by script */
+ sha256 = "1xq97dcf7xcs8fsrjsqqrzxf2gnrll8bbqkzrpg85bqxap0hvb45"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA Release";
@@ -302,25 +314,25 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2018.1.6"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "0v07sfg7ywawk6wb52zhr3753hscpxw3m53ppgw4n50dcdwx0kdn"; /* updated by script */
+ sha256 = "15czwk15c1gnf7xrgm423xafsw55083dd6g15g69zs0l9psrss31"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
- update-channel = "PhpStorm 2018.1";
+ update-channel = "PhpStorm 2018.2";
};
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2018.1.4"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "0frzasqh3jx7wcip4dnwdl9ap2g1nkx7anapwd416cxv4jj3r5ch"; /* updated by script */
+ sha256 = "0a5dsr2piw0vgm9lvc2k18sdnvii55xdyi90z95hzg5syhsm1a94"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm Release";
@@ -328,12 +340,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2018.1.4"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1kv1d5y2ph36aq91sq08lbz8hvfp765xi7m0hdwkhqdi2wkrpnkc"; /* updated by script */
+ sha256 = "0azjrbxpwank09i7riflbkgrgm23f0q6hgisca6d14ldcbr933aj"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm Release";
@@ -341,38 +353,38 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2018.1.2"; /* updated by script */
+ version = "2018.1.3"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "1jsj0g4mv7fci3jgwx9skaz2m40g3ray2n17djaln08731rls5cc"; /* updated by script */
+ sha256 = "00wskr60mjipyp44wrpc3pn6awc92djn7rwhc08nrar3zv0j4mgg"; /* updated by script */
};
wmClass = "jetbrains-rider";
- update-channel = "Rider 2018.1.2";
+ update-channel = "Rider 2018.1.3";
};
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2018.1.3"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "033rjsx6zjrfbl89i513ms14iw53ip56h4bkilrij32hshb7c2c5"; /* updated by script */
+ sha256 = "0la83cqf3aknrc62ddpij0gg50rws5l2g4iasyrvfhn4wnmj6n4q"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
- update-channel = "RubyMine 2018.1";
+ update-channel = "RubyMine 2018.2";
};
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2018.1.5"; /* updated by script */
+ version = "2018.2"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "1mqms8gzmsaqvwzfk821vj1z1cxdgjw5nnwq63mag6rly04h60n6"; /* updated by script */
+ sha256 = "024schngx26ik8cvmkijfzzmpkajckl2dbyz31ajnmixpn07pwi6"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm Release";
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index aa2435c43de6..a7cc7229d5b1 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yEd-${version}";
- version = "3.17.2";
+ version = "3.18.1";
src = requireFile {
name = "${name}.zip";
url = "https://www.yworks.com/en/products/yfiles/yed/";
- sha256 = "0wpfvd3jqxgjk3xqkamvlg7rk0w0pmrv7srjfqns447ccc3i7qg2";
+ sha256 = "6aefd87cd925b4a4c86871a3772de243b4e520a86f82158189ae8c19a9a5ecf8";
};
nativeBuildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 8814e2d89c88..089db8e73cb5 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -4,11 +4,13 @@
rustPlatform,
cmake,
makeWrapper,
+ ncurses,
expat,
pkgconfig,
freetype,
fontconfig,
libX11,
+ gzip,
libXcursor,
libXxf86vm,
libXi,
@@ -66,11 +68,15 @@ in buildRustPackage rec {
cmake
makeWrapper
pkgconfig
+ ncurses
+ gzip
];
buildInputs = rpathLibs
++ lib.optionals stdenv.isDarwin darwinFrameworks;
+ outputs = [ "out" "terminfo" ];
+
postPatch = ''
substituteInPlace copypasta/src/x11.rs \
--replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
@@ -95,6 +101,14 @@ in buildRustPackage rec {
install -D alacritty-completions.bash "$out/etc/bash_completion.d/alacritty-completions.bash"
install -D alacritty-completions.fish "$out/share/fish/vendor_completions.d/alacritty.fish"
+ install -dm 755 "$out/share/man/man1"
+ gzip -c alacritty.man > "$out/share/man/man1/alacritty.1.gz"
+
+ install -dm 755 "$terminfo/share/terminfo/a/"
+ tic -x -o "$terminfo/share/terminfo" alacritty.info
+ mkdir -p $out/nix-support
+ echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+
runHook postInstall
'';
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index d23b789780b3..fd14bba282c4 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
name = "dbeaver-ce-${version}";
- version = "5.1.3";
+ version = "5.1.4";
desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "1znkr28pfpclq2gl2prllb3hwq9v9rj5xl7xarq0hsggzfg9n071";
+ sha256 = "14i7b3l89rkhqq4zgsdbvcs9pp60djv0rjbm86fpk2wi4zkrlzi5";
};
installPhase = ''
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 74aab5e7e130..4c5e9e5230a6 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "exercism-${version}";
- version = "2.4.1";
+ version = "3.0.6";
goPackagePath = "github.com/exercism/cli";
@@ -10,14 +10,15 @@ buildGoPackage rec {
owner = "exercism";
repo = "cli";
rev = "v${version}";
- sha256 = "1nab4459zi2gkh18k9vsm54bz39c2sb60v2xy0i72j1vd99axjjj";
+ sha256 = "0xr5bqzm0md1vllnr384k92k7w1nxzw9lhqgm23zkxx5a4vqzy56";
};
+ goDeps = ./deps.nix;
+
meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
description = "A Go based command line tool for exercism.io";
- homepage = http://exercism.io/cli;
license = licenses.mit;
maintainers = [ maintainers.rbasso ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/exercism/deps.nix b/pkgs/applications/misc/exercism/deps.nix
new file mode 100644
index 000000000000..ad93aa4e4373
--- /dev/null
+++ b/pkgs/applications/misc/exercism/deps.nix
@@ -0,0 +1,201 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+ {
+ goPackagePath = "github.com/blang/semver";
+ fetch = {
+ type = "git";
+ url = "https://github.com/blang/semver";
+ rev = "3c1074078d32d767e08ab2c8564867292da86926";
+ sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/hcl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
+ sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/go-update";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/go-update";
+ rev = "8152e7eb6ccf8679a64582a66b78519688d156ad";
+ sha256 = "07czhspakpi7al004rm669cmf4h5l0vnygsm11280nkfn2zxqdi3";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/magiconair/properties";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magiconair/properties";
+ rev = "c2353362d570a7bfa228149c62842019201cfb71";
+ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac";
+ sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-buffruneio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-buffruneio";
+ rev = "e2f66f8164ca709d4c21e815860afd2024e9b894";
+ sha256 = "16h7fybbai45p5gn2la6z37a8h1ws6r3pg3nwqiw6gbbgjqicrbv";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
+ sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/afero";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/afero";
+ rev = "787d034dfe70e44075ccc060d346146ef53270ad";
+ sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "8965335b8c7107321228e3e3702cab9832751bac";
+ sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1";
+ sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
+ sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
+ sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793";
+ sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
+ sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd";
+ sha256 = "0vx7mz18p480p7fh0w5jv6mfdbsswrlac1sz4i705q7q7ygz59lm";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e";
+ sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "0605a8320aceb4207a5fb3521281e17ec2075476";
+ sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+ };
+ }
+]
\ No newline at end of file
diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index 82b73f58e8df..be4a0388daa5 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub
-, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook
+, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook, desktop-file-utils
, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }:
let
- version = "0.5.5";
+ version = "0.5.9";
sqlGda = libgda.override {
mysqlSupport = true;
postgresSupport = true;
@@ -17,10 +17,10 @@ in stdenv.mkDerivation rec {
owner = "Alecaddd";
repo = "sequeler";
rev = "v${version}";
- sha256 = "0jv7nx9k1qw2i3cmg0vnahz4qfam03xypas975x40icqd3bhfgj3";
+ sha256 = "08dgir1prjfh7kxdxksabia5093gcjyy2yy7s57yizszplw2v07v";
};
- nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook ];
+ nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook desktop-file-utils ];
buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ];
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
index 8be792c673c0..d3cd81f7f13a 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/pkgs/applications/misc/stog/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocf, ptime,
- uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, camlp4, omd
+{ stdenv, fetchFromGitLab, ocaml, findlib, ocf, ptime,
+ uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, omd
}:
stdenv.mkDerivation rec {
name = "stog-${version}";
- version = "0.17.0";
- src = fetchFromGitHub {
+ version = "0.18.0";
+ src = fetchFromGitLab {
+ domain = "framagit.org";
owner = "zoggy";
repo = "stog";
- rev = "release-${version}";
- sha256 = "06fnl3im0rycn05w39adfmm7w4s8l3jrj43h8f8h3b56grh21x0d";
+ rev = version;
+ sha256 = "154gl3ljxqlw8wz1vmsyv8180igrl5bjq0wir7ybrnzq2cdflkv0";
};
- buildInputs = [ ocaml camlp4 uutf ];
+ buildInputs = [ ocaml uutf ];
propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ];
createFindlibDestdir = true;
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "XML documents and web site compiler";
- homepage = https://zoggy.github.io/stog/;
+ homepage = https://www.good-eris.net/stog;
license = licenses.lgpl3;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ regnat ];
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index 0fa0495cedac..cb3146d4c0dd 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
- version = "0.18.0";
+ version = "0.19.0";
name = "toot-${version}";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = "${version}";
- sha256 = "0snvxn7ifbkrdnml66pdna7vny3qa0s6gcjjz69s7scc0razwrh8";
+ sha256 = "1z0r6yqi522d5jbpd0w3prd33l067jb1jhfnxf6hkzhnx1wddjsa";
};
checkInputs = with python3Packages; [ pytest ];
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 901229f86cae..87c7bddab6fa 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -36,11 +36,11 @@ with python'.pkgs;
buildPythonApplication rec {
pname = "FlexGet";
- version = "2.14.5";
+ version = "2.14.9";
src = fetchPypi {
inherit pname version;
- sha256 = "05kczj10p8f9b1ll4ii5anbg6nk5dhb7lm9skbj6ix7v9hi48hz4";
+ sha256 = "1a8nxfr0rzwwd7b0nxr7zmw04ygbqvnzbi4w4nw2w8xiy46zid3q";
};
postPatch = ''
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 63b751b814ee..0bbf2cec0dcb 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -12,8 +12,6 @@ let
cysignals = super.cysignals.override { inherit pari; };
- cvxopt = super.cvxopt.override { inherit glpk; };
-
# python packages that appear unmaintained and were not accepted into the nixpkgs
# tree because of that. These packages are only dependencies of the more-or-less
# deprecated sagenb. However sagenb is still a default dependency and the doctests
@@ -26,7 +24,7 @@ let
pybrial = self.callPackage ./pybrial.nix {};
sagelib = self.callPackage ./sagelib.nix {
- inherit flint ecl pari glpk eclib ntl arb;
+ inherit flint ecl pari eclib ntl arb;
inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
linbox = nixpkgs.linbox.override { withSage = true; };
};
@@ -47,7 +45,7 @@ let
};
sage-env = self.callPackage ./sage-env.nix {
- inherit sage-src python rWrapper openblas-cblas-pc glpk ecl singular eclib pari palp flint pynac pythonEnv giac ntl;
+ inherit sage-src python rWrapper openblas-cblas-pc ecl singular eclib pari palp flint pynac pythonEnv giac ntl;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
@@ -176,37 +174,6 @@ let
sha256 = "19gbsm8jqq3hraanbmsvzkbh88iwlqbckzbnga3y76r7k42akn7m";
};
});
-
- # https://trac.sagemath.org/ticket/24824
- glpk = nixpkgs.glpk.overrideAttrs (attrs: rec {
- version = "4.63";
- name = "glpk-${version}";
- src = fetchurl {
- url = "mirror://gnu/glpk/${name}.tar.gz";
- sha256 = "1xp7nclmp8inp20968bvvfcwmz3mz03sbm0v3yjz8aqwlpqjfkci";
- };
- patches = (attrs.patches or []) ++ [
- # Alternatively patch sage with debians
- # https://sources.debian.org/data/main/s/sagemath/8.1-7/debian/patches/t-version-glpk-4.60-extra-hack-fixes.patch
- # The header of that debian patch contains a good description of the issue. The gist of it:
- # > If GLPK in Sage causes one error, and this is caught by Sage and recovered from, then
- # > later (because upstream GLPK does not clear the "error" flag) Sage will append
- # > all subsequent terminal output of GLPK into the error_message string but not
- # > actually forward it to the user's terminal. This breaks some doctests.
- (fetchpatch {
- name = "error_recovery.patch";
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "0z99z9gd31apb6x5n5n26411qzx0ma3s6dnznc4x61x86bhq31qf";
- })
-
- # Allow setting a exact verbosity level (OFF|ERR|ON|ALL|DBG)
- (fetchpatch {
- name = "exact_verbosity.patch";
- url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/glp_exact_verbosity.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
- sha256 = "15gm5i2alqla3m463i1qq6jx6c0ns6lip7njvbhp37pgxg4s9hx8";
- })
- ];
- });
in
python.pkgs.sage-wrapper // {
doc = python.pkgs.sagedoc;
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index be5b58c57334..cfb028004c70 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }:
+{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
let
- version = "0.1.2";
+ version = "0.2.0";
in
buildGoPackage {
name = "grv-${version}";
- buildInputs = [ ncurses readline curl libgit2_0_25 ];
+ buildInputs = [ ncurses readline curl libgit2_0_27 ];
nativeBuildInputs = [ pkgconfig ];
goPackagePath = "github.com/rgburke/grv";
@@ -14,7 +14,7 @@ buildGoPackage {
owner = "rgburke";
repo = "grv";
rev = "v${version}";
- sha256 = "1i8cr5xxdacpby60nqfyj8ijyc0h62029kbds2lq26rb8nn9qih2";
+ sha256 = "0hlqw6b51jglqzzjgazncckpgarp25ghshl0lxv1mff80jg8wd1a";
fetchSubmodules = true;
};
diff --git a/pkgs/build-support/setup-hooks/remove-pytest-cache.sh b/pkgs/build-support/setup-hooks/remove-pytest-cache.sh
deleted file mode 100644
index 7f3e08bfa67c..000000000000
--- a/pkgs/build-support/setup-hooks/remove-pytest-cache.sh
+++ /dev/null
@@ -1 +0,0 @@
-postFixupHooks+=
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index 573cb432085e..fec45bf7bf26 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -1,23 +1,19 @@
-{ lib, fetchFromGitHub }:
+{ lib, fetchzip }:
-let version = "0.5.3";
-in fetchFromGitHub rec {
+let
+ version = "1.0.2";
+in fetchzip rec {
name = "ibm-plex-${version}";
-
- owner = "IBM";
- repo = "type";
- rev = "v${version}";
- sha256 = "1im7sid3qsk4wnm0yhq9h7i50bz46jksqxv60svdfnsrwq0krd1h";
-
+ url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
postFetch = ''
- tar --strip-components=1 -xzvf $downloadedFile
- mkdir -p $out/share/fonts/opentype
- cp fonts/*/desktop/mac/*.otf $out/share/fonts/opentype/
+ mkdir -p $out/share/fonts
+ unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
+ sha256 = "1ixxm47lwsrc136z6cxkk5dm3svmvcvq0ya8q8ayvn68q5ijbh5m";
meta = with lib; {
description = "IBM Plex Typeface";
- homepage = https://ibm.github.io/type/;
+ homepage = https://www.ibm.com/plex/;
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.romildo ];
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 8a831a630d86..4b3f7f54ad1a 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "elementary-xfce-icon-theme-${version}";
- version = "0.11";
+ version = "0.12";
src = fetchFromGitHub {
owner = "shimmerproject";
repo = "elementary-xfce";
rev = "elementary-xfce-${version}";
- sha256 = "1hgbw9wwsgrbrs8lgdhba2m8m1cvqbcy27b87kjws6jsa00f5hx6";
+ sha256 = "036676443sj4lxm7z211b0br87zdnbrb9z41czfq65r1wwwdf3rq";
};
nativeBuildInputs = [ gtk3 hicolor-icon-theme ];
diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix
index bb5a9be6d848..0762dbad3f87 100644
--- a/pkgs/desktops/lxqt/base/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools,
- qtx11extras, qttools, qtsvg, libqtxdg, kwindowsystem, xorg }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras,
+ qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "liblxqt";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1852vfbkbpw49i8ad682jhqmnskmc9a90qwpalipgak7m64azg3j";
+ sha256 = "1lbvnx6gg15k7fy1bnv5sjji659f603glblcl8c9psh0m1cjdbll";
};
nativeBuildInputs = [
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
qtx11extras
qttools
qtsvg
+ polkit-qt
kwindowsystem
libqtxdg
xorg.libXScrnSaver
@@ -31,14 +32,15 @@ stdenv.mkDerivation rec {
"-DPULL_TRANSLATIONS=NO"
"-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg"
];
-
+
patchPhase = ''
sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt
+ sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
'';
-
+
meta = with stdenv.lib; {
description = "Core utility library for all LXQt components";
- homepage = https://github.com/lxde/liblxqt;
+ homepage = https://github.com/lxqt/liblxqt;
license = licenses.lgpl21Plus;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
index 7938e4fd9a17..0b23fb2d04f5 100644
--- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libqtxdg-${version}";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = "libqtxdg";
rev = version;
- sha256 = "03kdrx5sgrl93yband87n30i0k2mv6dknwdw2adz45j5z9rhd3z6";
+ sha256 = "0lkmwnqk314mlr811rdb96p6i7zg67slxdvd4cdkiwakgbzzaa4m";
};
nativeBuildInputs = [ cmake ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Qt implementation of freedesktop.org xdg specs";
- homepage = https://github.com/lxde/libqtxdg;
+ homepage = https://github.com/lxqt/libqtxdg;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix
index 409afe6d7729..2e6b79f9769a 100644
--- a/pkgs/desktops/lxqt/base/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.4.1";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = "libsysstat";
rev = version;
sha256 = "0ad5pcr5lq1hvrfijvddvz2fvsmh1phb54wb0f756av0kyiwq0gb";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library used to query system info and statistics";
- homepage = https://github.com/lxde/libsysstat;
+ homepage = https://github.com/lxqt/libsysstat;
license = licenses.lgpl21Plus;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
index c52533a344b2..46f904d0ec7f 100644
--- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.5.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = "lxqt-build-tools";
rev = version;
sha256 = "0dcwzrijmn4sgivmy2zwz3xa4y69pwhranyw0m90g0pp55di2psz";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Various packaging tools and scripts for LXQt applications";
- homepage = https://github.com/lxde/lxqt-build-tools;
+ homepage = https://github.com/lxqt/lxqt-build-tools;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
index f3a50814d638..4c187f1a07c5 100644
--- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
version = "0.13.1";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1g8j1lw74qvagqhqsx45b290fjwh3jfl3i0366m0w4la03v0rw5j";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Core library of PCManFM-Qt (Qt binding for libfm)";
- homepage = https://github.com/lxde/libfm-qt;
+ homepage = https://github.com/lxqt/libfm-qt;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
index 645d634a26fe..e109a4f0944c 100644
--- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-about";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "13knjxbnq0mh9jgkllarf6rjxkvj2c93l0srnlrqp3939gcpwxh3";
+ sha256 = "03f53rnn4rkd1xc2q9abnw37aq4sgvpbwhmcnckqyzc87lj6ici0";
};
nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Dialogue window providing information about LXQt and the system it's running on";
- homepage = https://github.com/lxde/lxqt-about;
+ homepage = https://github.com/lxqt/lxqt-about;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
index 54731b22686c..a92c352087e8 100644
--- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-admin";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0dg3gm5m19dc4jarh8xcn0mcnpgxzz7nhy5dzm8chddaa6pdm7vi";
+ sha256 = "1nsf8sbgmfanvcxw67drhz1wrizkcd0p87jwr1za5rcgd50bi2yy";
};
nativeBuildInputs = [
@@ -24,14 +24,19 @@ stdenv.mkDerivation rec {
kwindowsystem
liblxqt
libqtxdg
- polkit
+ polkit-qt
];
+ patchPhase = ''
+ sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \
+ -i lxqt-admin-user/CMakeLists.txt
+ '';
+
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; {
description = "LXQt system administration tool";
- homepage = https://github.com/lxde/lxqt-admin;
+ homepage = https://github.com/lxqt/lxqt-admin;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index ba4937a7227f..3a167996ddb2 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-config";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1ccxkdfhgf40jxiy0132yr9b28skvs9yr8j75w663hnqi6ccn377";
+ sha256 = "0r5vwkyz0c9b9py3wni4yzkmsvgs6psk9dp1fhfzvbjbknb21bfa";
};
nativeBuildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Tools to configure LXQt and the underlying operating system";
- homepage = https://github.com/lxde/lxqt-config;
+ homepage = https://github.com/lxqt/lxqt-config;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
index 9e74eee5ec17..1877236bcddc 100644
--- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-globalkeys";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "14icyik9x47wi3gfkmkyhag26a2ivyc42f4f8qwdgbr3dcg10b9a";
+ sha256 = "1fmi0n5chnrpbgf7zwzc3hi55r85hkxaq5jylbwaahmxhnb5hdid";
};
nativeBuildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Daemon used to register global keyboard shortcuts";
- homepage = https://github.com/lxde/lxqt-globalkeys;
+ homepage = https://github.com/lxqt/lxqt-globalkeys;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
index 8324cdc3dff0..9a79ec16df09 100644
--- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = "lxqt-l10n";
rev = version;
sha256 = "0q1hzj6sa4wc8sgqqqsqfldjpnvihacfq73agvc2li3q6qi5rr0k";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Translations of LXQt";
- homepage = https://github.com/lxde/lxqt-l10n;
+ homepage = https://github.com/lxqt/lxqt-l10n;
license = licenses.lgpl21Plus;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
index 061a8522a6fe..32a3c408258c 100644
--- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-notificationd";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0pmpdqgnb2dfxw5lirh89j8hnrwwcn2zc64byg4zi0xdvq6qms43";
+ sha256 = "0vjpl3ipc0hrz255snkp99h6xrlid490ml8jb588rdpfina66sp1";
};
nativeBuildInputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The LXQt notification daemon";
- homepage = https://github.com/lxde/lxqt-notificationd;
+ homepage = https://github.com/lxqt/lxqt-notificationd;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
index bcc00a0add50..56ea7ec72418 100644
--- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-openssh-askpass";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "16xcw4yll6i9vij16kdb10s4aq2s57x4yjlwv6d8r75y5gq9iiw6";
+ sha256 = "19djmqwk4kj3rxs4h7a471ydcz87j5z4yv8a6pgblvqdkkn0ylk9";
};
nativeBuildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GUI to query passwords on behalf of SSH agents";
- homepage = https://github.com/lxde/lxqt-openssh-askpass;
+ homepage = https://github.com/lxqt/lxqt-openssh-askpass;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index 9a8e6e7a5ca9..8cdbf9f9365a 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-panel";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "01xmnb17jpydyfvxwaa6kymzdasnyd94z62gjah8y4pzsmykcr4x";
+ sha256 = "056khr3smyrdi26zpclwv1qrmk0zxr9cnk65ad9c0xavzk6ya3xz";
};
nativeBuildInputs = [
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The LXQt desktop panel";
- homepage = https://github.com/lxde/lxqt-panel;
+ homepage = https://github.com/lxqt/lxqt-panel;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
index fca6a9ff1f61..dcf46d09b732 100644
--- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-policykit";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1hxz5bxxi118g255aqb3da767va0wd25y671lk2w9r1641j8zf2d";
+ sha256 = "1m9v4hl1hyd8rmlh6z2zy6287qfnavsm9khl526jf8f7bjgpifvd";
};
nativeBuildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The LXQt PolicyKit agent";
- homepage = https://github.com/lxde/lxqt-policykit;
+ homepage = https://github.com/lxqt/lxqt-policykit;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
index e5012abed6a4..3b56a489bee5 100644
--- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-powermanagement";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1fxklxmvjaykdpf0nj6cpgwx4yf52087g25k1zdak9n0l9n7hm8d";
+ sha256 = "04mx1nxqqqjg3wsql4ch4j1a4cbqfvpq0iwi6b9yhaf04n0dwrvn";
};
nativeBuildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Power management module for LXQt";
- homepage = https://github.com/lxde/lxqt-powermanagement;
+ homepage = https://github.com/lxqt/lxqt-powermanagement;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
index 7d3d464e0bb0..972d0a3cb379 100644
--- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "19y5dvbj7gwyh8glc6vi6hb5snvkd3jwvss6j0sn2sy2gp9g9ryb";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "LXQt Qt platform integration plugin";
- homepage = https://github.com/lxde/lxqt-qtplugin;
+ homepage = https://github.com/lxqt/lxqt-qtplugin;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
index 0c1f08b34d77..c0ce6321f6e9 100644
--- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
@@ -4,13 +4,13 @@ menu-cache, muparser, pcre }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-runner";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1354vdaskhch1n8v3kdy15nszgqb1092csr84nbhymzgrhrq1093";
+ sha256 = "0w6r9lby35p0lf5klasa5l2lscx6dmv16kzfhl4lc6w2qfwjb9vi";
};
nativeBuildInputs = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Tool used to launch programs quickly by typing their names";
- homepage = https://github.com/lxde/lxqt-runner;
+ homepage = https://github.com/lxqt/lxqt-runner;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
index d3733950ed00..e369880b2b4e 100644
--- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-session";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "03gi9svxqsfjhk5ifbaalq9i44ggx8afwms1hb312czqn82wrszb";
+ sha256 = "0ngcrkmfpahii4yibsh03b8v8af93hhqm42kk1nnhczc8dg49mhs";
};
nativeBuildInputs = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An alternative session manager ported from the original razor-session";
- homepage = https://github.com/lxde/lxqt-session;
+ homepage = https://github.com/lxqt/lxqt-session;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
index 8700a768abdf..4dddd7de09bc 100644
--- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-sudo";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "0ql436yb51qwbnj5gbzvqi4rqx4zkmja5rdjs6yavb1x8ggn1jv6";
+ sha256 = "1gpn3dhmzabx0jrqxq63549sah03kf6bmdc9d9kmg6hyr5xg3i1h";
};
nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GUI frontend for sudo/su";
- homepage = https://github.com/lxde/lxqt-sudo;
+ homepage = https://github.com/lxqt/lxqt-sudo;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
index 5f996c78643d..1d2301d4a3bf 100644
--- a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "026hbblxdbq48n9691b1z1xiak99khsk3wf09vn4iaj5zi7dwhw5";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Themes, graphics and icons for LXQt";
- homepage = https://github.com/lxde/lxqt-themes;
+ homepage = https://github.com/lxqt/lxqt-themes;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
index 5a284d9b89a7..efd5fde16661 100644
--- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.4.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1bxqpasfvaagbq8azl7536z2zk2725xg7jkvad5xh95zq1gb4hgk";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
- homepage = https://github.com/lxde/pavucontrol-qt;
+ homepage = https://github.com/lxqt/pavucontrol-qt;
license = licenses.gpl2;
platforms = with platforms; linux;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
index d51e27409649..99dace0e42e6 100644
--- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libfm, menu-cache, lxmenu-data }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qt5, libfm-qt, menu-cache, lxmenu-data }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0xnhdxx45fmbi5dqic3j2f7yq01s0xysimafj5zqs0a29zw3i4m0";
@@ -15,15 +15,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
- lxqt.lxqt-build-tools
+ lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
- lxqt.libfm-qt
- libfm
+ libfm-qt
+ libfm-qt
menu-cache
lxmenu-data
];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
- homepage = https://github.com/lxde/pcmanfm-qt;
+ homepage = https://github.com/lxqt/pcmanfm-qt;
license = licenses.gpl2;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
index 6bd6e2833f5e..93c93d2c6ba1 100644
--- a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
+++ b/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.7.1";
srcs = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A terminal emulator widget for Qt 5";
- homepage = https://github.com/lxde/qtermwidget;
+ homepage = https://github.com/lxqt/qtermwidget;
license = licenses.gpl2;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
index 56c42cb28532..eae53cefc58b 100644
--- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.9.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "05gbdjzgmcr3ljs9ba3qvh7a3v6yn6vakwfy8avld9gy5bdd76rg";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A terminal emulator widget for Qt 5";
- homepage = https://github.com/lxde/qtermwidget;
+ homepage = https://github.com/lxqt/qtermwidget;
license = licenses.gpl2;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 675368c9a69e..015807ec684e 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -4,7 +4,7 @@ let
packages = self: with self; {
# For compiling information, see:
- # - https://github.com/lxde/lxqt/wiki/Building-from-source
+ # - https://github.com/lxqt/lxqt/wiki/Building-from-source
### BASE
libqtxdg = callPackage ./base/libqtxdg { };
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
index 1c2ade5938e0..9c36b523207f 100644
--- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.4.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1r187fx1vivzq1gcwwawax36mnlmfig5j1ba4s4wfdi3q2wcq7mw";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GUI configuration tool for compton X composite manager";
- homepage = https://github.com/lxde/compton-conf;
+ homepage = https://github.com/lxqt/compton-conf;
license = licenses.lgpl21;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
index 8b185703ec73..7f80e56bc7d2 100644
--- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, libfm, libexif }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt-build-tools, libfm-qt, libexif }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.7.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1slmaic9cmj5lqa5kwc1qfbbycwh8840wnkg0nxc99ls0aazlpzi";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
- lxqt.lxqt-build-tools
+ lxqt-build-tools
];
buildInputs = [
@@ -23,10 +23,9 @@ stdenv.mkDerivation rec {
qt5.qttools
qt5.qtx11extras
qt5.qtsvg
- lxqt.libfm-qt
+ libfm-qt
xorg.libpthreadstubs
xorg.libXdmcp
- libfm
libexif
];
@@ -34,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The image viewer and screenshot tool for lxqt";
- homepage = https://github.com/lxde/lximage-qt;
+ homepage = https://github.com/lxqt/lximage-qt;
license = licenses.gpl2;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
index cd3b91f4cbdf..5ddb87ab55db 100644
--- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.13.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "0mixf35p7b563f77vnikk9b1wqhbdawp723sd30rfql76gkjwjcn";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The Qt port of obconf, the Openbox configuration tool";
- homepage = https://github.com/lxde/obconf-qt;
+ homepage = https://github.com/lxqt/obconf-qt;
license = licenses.gpl2;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/optional/qps/default.nix
index e27388fa1681..a8ee18daf3c1 100644
--- a/pkgs/desktops/lxqt/optional/qps/default.nix
+++ b/pkgs/desktops/lxqt/optional/qps/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qps";
- version = "1.10.17";
+ version = "1.10.18";
src = fetchFromGitHub {
- owner = "QtDesktop";
+ owner = "lxqt";
repo = pname;
rev = version;
- sha256 = "1d5r6w9wsxjdrzq2hllrj2n1d9azy6g05hg0w0s6pikrmn1yl0a3";
+ sha256 = "1cq5z4w2n119z2bq0njn508g5582jljdx2n38cv5b3cf35k91a49";
};
nativeBuildInputs = [ cmake ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The Qt process manager";
- homepage = https://github.com/QtDesktop/qps;
+ homepage = https://github.com/lxqt/qps;
license = licenses.gpl2;
maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix
index 9f8e4482e21f..3d5a25634d7c 100644
--- a/pkgs/desktops/lxqt/optional/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, qt5 }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.9.0";
src = fetchFromGitHub {
- owner = "lxde";
+ owner = "lxqt";
repo = pname;
rev = version;
sha256 = "1z9wlyj5i192jfq3dcxjf8wzx9x332f19c9ll7zv69cq21kyy9wn";
@@ -14,21 +14,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
- lxqt.lxqt-build-tools
+ lxqt-build-tools
];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
- lxqt.qtermwidget
+ qtermwidget
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
meta = with stdenv.lib; {
description = "A lightweight Qt-based terminal emulator";
- homepage = https://github.com/lxde/qterminal;
+ homepage = https://github.com/lxqt/qterminal;
license = licenses.gpl2;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix
index 3c4bebf39fd9..8890d3f47808 100644
--- a/pkgs/desktops/lxqt/optional/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "screengrab-${version}";
- version = "1.97";
+ version = "1.98";
src = fetchFromGitHub {
- owner = "QtDesktop";
+ owner = "lxqt";
repo = "screengrab";
rev = version;
- sha256 = "0qhdxnv1pz745qgvdv5x7kyfx9dz9rrq0wxyfimppzxcszv4pl2z";
+ sha256 = "1y3r29220z6y457cajpad3pjnr883smbvh0kai8hc5hh4k4kxs6v";
};
nativeBuildInputs = [ cmake pkgconfig ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Crossplatform tool for fast making screenshots";
- homepage = https://github.com/lxde/screengrab;
+ homepage = https://github.com/lxqt/screengrab;
license = licenses.gpl2;
platforms = with platforms; unix;
maintainers = with maintainers; [ romildo ];
diff --git a/pkgs/desktops/lxqt/update.sh b/pkgs/desktops/lxqt/update.sh
new file mode 100755
index 000000000000..bad78f7c1fff
--- /dev/null
+++ b/pkgs/desktops/lxqt/update.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p libarchive curl common-updater-scripts
+
+set -eu -o pipefail
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+root=../../..
+export NIXPKGS_ALLOW_UNFREE=1
+
+lxqt_version=0.13.0
+lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html
+
+version() {
+ (cd "$root" && nix-instantiate --eval --strict -A "$1.version" 2>/dev/null | tr -d '"')
+}
+
+update_lxqt() {
+ local pname
+ local pversion
+ curl -sS ${lxqtrepo} | sed -rne 's|.*(.+) (.+)
|\1 \2|p' |
+ while read pname pversion; do
+ local pversionold=$(version lxqt.$pname)
+ if [[ "$pversion" = "$pversionold" ]]; then
+ echo "nothing to do, $pname $pversion is current"
+ else
+ echo "$pname: $pversionold -> $pversion"
+ (cd "$root"
+ local pfile=$(EDITOR=echo nix edit -f. lxqt.$pname 2>/dev/null)
+ update-source-version lxqt.$pname "$pversion"
+ git add $pfile
+ git commit -m "$pname: $pversionold -> $pversion"
+ )
+ fi
+ echo
+ done
+ echo DONE
+}
+
+update_lxqt
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index f16be1b28225..50057f91e804 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -12,12 +12,12 @@ let
rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
in
stdenv.mkDerivation rec {
- version = "2.0.3";
+ version = "2.1.302";
name = "dotnet-sdk-${version}";
src = fetchurl {
- url = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.3-servicing-007037/dotnet-sdk-2.0.3-servicing-007037-linux-x64.tar.gz";
- sha256 = "0kqk1f0vfdfyb9mp7d4y83airkxyixmxb7lrx0h0hym2a9661ch8";
+ url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
+ sha256 = "1a8z9q69cd9a33j7fr7907abm5z4qiivw5k379cgsjmmvxwyvjia";
};
unpackPhase = "tar xvzf $src";
diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
deleted file mode 100644
index e503b7a92ce4..000000000000
--- a/pkgs/development/compilers/julia/0.5.nix
+++ /dev/null
@@ -1,186 +0,0 @@
-{ stdenv, fetchurl, fetchzip
-# build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, paxctl
-# libjulia dependencies
-, libunwind, readline, utf8proc, zlib
-, llvm
-# standard library dependencies
-, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
-# linear algebra
-, openblas, arpack, suitesparse
-# Darwin frameworks
-, CoreServices, ApplicationServices
-}:
-
-with stdenv.lib;
-
-# All dependencies must use the same OpenBLAS.
-let
- arpack_ = arpack;
- suitesparse_ = suitesparse;
-in
-let
- arpack = arpack_.override { inherit openblas; };
- suitesparse = suitesparse_.override { inherit openblas; };
-in
-
-let
- dsfmtVersion = "2.2.3";
- dsfmt = fetchurl {
- url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
- sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
- };
-
- libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8";
- libuv = fetchurl {
- url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
- sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49";
- };
-
- rmathVersion = "0.1";
- rmath-julia = fetchurl {
- url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
- sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
- };
-
- virtualenvVersion = "15.0.0";
- virtualenv = fetchurl {
- url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
- sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
- };
-in
-
-stdenv.mkDerivation rec {
- pname = "julia";
- version = "0.5.2";
- name = "${pname}-${version}";
-
- src = fetchzip {
- url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
- sha256 = "1616f53dj7xc0g2iys8qfbzal6dx55nswnws5g5r44dlbf4hcl0h";
- };
- prePatch = ''
- mkdir deps/srccache
- cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
- cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
- cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
- cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
- '';
-
- patches = [
- ./0001.1-use-system-utf8proc.patch
- ./0002-use-system-suitesparse.patch
- ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
-
- postPatch = ''
- patchShebangs . contrib
- for i in backtrace replutil cmdlineargs compile; do
- mv test/$i.jl{,.off}
- touch test/$i.jl
- done
- '';
-
- buildInputs = [
- arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
- pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
- zlib llvm
- ]
- ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
- ;
-
- nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
- ++ stdenv.lib.optional stdenv.needsPax paxctl;
-
- makeFlags =
- let
- arch = head (splitString "-" stdenv.system);
- march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
- or (throw "unsupported architecture: ${arch}");
- # Julia requires Pentium 4 (SSE2) or better
- cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
- or (throw "unsupported architecture: ${arch}");
- in [
- "ARCH=${arch}"
- "MARCH=${march}"
- "JULIA_CPU_TARGET=${cpuTarget}"
- "PREFIX=$(out)"
- "prefix=$(out)"
- "SHELL=${stdenv.shell}"
-
- "USE_SYSTEM_BLAS=1"
- "USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
- "LIBBLAS=-lopenblas"
- "LIBBLASNAME=libopenblas"
-
- "USE_SYSTEM_LAPACK=1"
- "LIBLAPACK=-lopenblas"
- "LIBLAPACKNAME=libopenblas"
-
- "USE_SYSTEM_SUITESPARSE=1"
- "SUITESPARSE_LIB=-lsuitesparse"
- "SUITESPARSE_INC=-I${suitesparse}/include"
-
- "USE_SYSTEM_ARPACK=1"
- "USE_SYSTEM_FFTW=1"
- "USE_SYSTEM_GMP=1"
- "USE_SYSTEM_LIBGIT2=1"
- "USE_SYSTEM_LIBUNWIND=1"
-
- "USE_SYSTEM_LLVM=1"
- "LLVM_VER=3.8.1"
-
- "USE_SYSTEM_MPFR=1"
- "USE_SYSTEM_OPENLIBM=1"
- "USE_SYSTEM_OPENSPECFUN=1"
- "USE_SYSTEM_PATCHELF=1"
- "USE_SYSTEM_PCRE=1"
- "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
- "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
- "USE_SYSTEM_READLINE=1"
- "USE_SYSTEM_UTF8PROC=1"
- "USE_SYSTEM_ZLIB=1"
- ];
-
- NIX_CFLAGS_COMPILE = [ "-fPIC" ];
-
- LD_LIBRARY_PATH = makeLibraryPath [
- arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
- openspecfun pcre2 suitesparse llvm
- ];
-
- dontStrip = true;
- dontPatchELF = true;
-
- enableParallelBuilding = true;
-
- doCheck = !stdenv.isDarwin;
- checkTarget = "testall";
- # Julia's tests require read/write access to $HOME
- preCheck = ''
- export HOME="$NIX_BUILD_TOP"
- '';
-
- preBuild = ''
- sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
- sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
- '';
-
- postInstall = ''
- for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
- wrapProgram "$prog" \
- --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \
- --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
- done
- '';
-
- meta = {
- description = "High-level performance-oriented dynamical language for technical computing";
- homepage = https://julialang.org/;
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ raskin ];
- platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
- broken = stdenv.isi686;
- };
-}
diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix
deleted file mode 100644
index fcf486b3b41a..000000000000
--- a/pkgs/development/compilers/julia/0.6.nix
+++ /dev/null
@@ -1,203 +0,0 @@
-{ stdenv, fetchurl, fetchzip
-# build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, paxctl
-# libjulia dependencies
-, libunwind, readline, utf8proc, zlib
-, llvm
-# standard library dependencies
-, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
-# linear algebra
-, openblas, arpack, suitesparse
-# Darwin frameworks
-, CoreServices, ApplicationServices
-}:
-
-with stdenv.lib;
-
-# All dependencies must use the same OpenBLAS.
-let
- arpack_ = arpack;
- suitesparse_ = suitesparse;
-in
-let
- arpack = arpack_.override { inherit openblas; };
- suitesparse = suitesparse_.override { inherit openblas; };
-in
-
-let
- dsfmtVersion = "2.2.3";
- dsfmt = fetchurl {
- url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
- sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
- };
-
- libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d";
- libuv = fetchurl {
- url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
- sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba";
- };
-
- rmathVersion = "0.1";
- rmath-julia = fetchurl {
- url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
- sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
- };
-
- virtualenvVersion = "15.0.0";
- virtualenv = fetchurl {
- url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
- sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
- };
-
- majorVersion = "0";
- minorVersion = "6";
- maintenanceVersion = "4";
- version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
-in
-
-stdenv.mkDerivation rec {
- pname = "julia";
- inherit version;
- name = "${pname}-${version}";
-
- src = fetchzip {
- url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
- sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl";
- };
- prePatch = ''
- mkdir deps/srccache
- cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
- cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
- cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
- cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
- '';
-
- patches = [
- ./0001.1-use-system-utf8proc.patch
- ./0002-use-system-suitesparse.patch
- ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
-
- postPatch = ''
- patchShebangs . contrib
- for i in backtrace replutil cmdlineargs compile; do
- mv test/$i.jl{,.off}
- touch test/$i.jl
- done
-
- sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl
- sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl
- '';
-
- buildInputs = [
- arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
- pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
- zlib llvm
- ]
- ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
- ;
-
- nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
- ++ stdenv.lib.optional stdenv.needsPax paxctl;
-
- makeFlags =
- let
- arch = head (splitString "-" stdenv.system);
- march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
- or (throw "unsupported architecture: ${arch}");
- # Julia requires Pentium 4 (SSE2) or better
- cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
- or (throw "unsupported architecture: ${arch}");
- in [
- "ARCH=${arch}"
- "MARCH=${march}"
- "JULIA_CPU_TARGET=${cpuTarget}"
- "PREFIX=$(out)"
- "prefix=$(out)"
- "SHELL=${stdenv.shell}"
-
- "USE_SYSTEM_BLAS=1"
- "USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
- "LIBBLAS=-lopenblas"
- "LIBBLASNAME=libopenblas"
-
- "USE_SYSTEM_LAPACK=1"
- "LIBLAPACK=-lopenblas"
- "LIBLAPACKNAME=libopenblas"
-
- "USE_SYSTEM_SUITESPARSE=1"
- "SUITESPARSE_LIB=-lsuitesparse"
- "SUITESPARSE_INC=-I${suitesparse}/include"
-
- "USE_SYSTEM_ARPACK=1"
- "USE_SYSTEM_FFTW=1"
- "USE_SYSTEM_GMP=1"
- "USE_SYSTEM_LIBGIT2=1"
- "USE_SYSTEM_LIBUNWIND=1"
-
- "USE_SYSTEM_LLVM=1"
- "LLVM_VER=3.9.1"
-
- "USE_SYSTEM_MPFR=1"
- "USE_SYSTEM_OPENLIBM=1"
- "USE_SYSTEM_OPENSPECFUN=1"
- "USE_SYSTEM_PATCHELF=1"
- "USE_SYSTEM_PCRE=1"
- "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
- "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
- "USE_SYSTEM_READLINE=1"
- "USE_SYSTEM_UTF8PROC=1"
- "USE_SYSTEM_ZLIB=1"
- ];
-
- NIX_CFLAGS_COMPILE = [ "-fPIC" ];
-
- LD_LIBRARY_PATH = makeLibraryPath [
- arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
- openspecfun pcre2 suitesparse llvm
- ];
-
- dontStrip = true;
- dontPatchELF = true;
-
- enableParallelBuilding = true;
-
- doCheck = !stdenv.isDarwin;
- checkTarget = "testall";
- # Julia's tests require read/write access to $HOME
- preCheck = ''
- export HOME="$NIX_BUILD_TOP"
- '';
-
- preBuild = ''
- sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
- sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
- '';
-
- postInstall = ''
- # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
- # as using a wrapper with LD_LIBRARY_PATH causes segmentation
- # faults when program returns an error:
- # $ julia -e 'throw(Error())'
- find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
- if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
- ln -sv $lib $out/lib/julia/$(basename $lib)
- fi
- done
- '';
-
- passthru = {
- inherit majorVersion minorVersion maintenanceVersion;
- site = "share/julia/site/v${majorVersion}.${minorVersion}";
- };
-
- meta = {
- description = "High-level performance-oriented dynamical language for technical computing";
- homepage = https://julialang.org/;
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ raskin ];
- platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
- broken = stdenv.isi686;
- };
-}
diff --git a/pkgs/development/compilers/julia/0001-use-system-utf8proc.patch b/pkgs/development/compilers/julia/0001-use-system-utf8proc.patch
deleted file mode 100644
index b93654a88965..000000000000
--- a/pkgs/development/compilers/julia/0001-use-system-utf8proc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 54a66b5728ec98f44a1768f064509be4fd3f2ef6 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sat, 10 Oct 2015 13:09:48 -0500
-Subject: [PATCH 1/3] use system utf8proc
-
----
- src/flisp/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/flisp/Makefile b/src/flisp/Makefile
-index bec8624..5437b5c 100644
---- a/src/flisp/Makefile
-+++ b/src/flisp/Makefile
-@@ -24,9 +24,9 @@ DOBJS = $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj)
- LLTDIR = ../support
- LLT_release = $(BUILDDIR)/$(LLTDIR)/libsupport.a
- LLT_debug = $(BUILDDIR)/$(LLTDIR)/libsupport-debug.a
--LIBFILES_release = $(LLT_release) $(LIBUV) $(LIBUTF8PROC)
--LIBFILES_debug = $(LLT_debug) $(LIBUV) $(LIBUTF8PROC)
--LIBS =
-+LIBFILES_release = $(LLT_release) $(LIBUV)
-+LIBFILES_debug = $(LLT_debug) $(LIBUV)
-+LIBS = $(LIBUTF8PROC)
- ifneq ($(OS),WINNT)
- LIBS += -lpthread
- endif
---
-2.5.2
-
diff --git a/pkgs/development/compilers/julia/0003-no-ldconfig.patch b/pkgs/development/compilers/julia/0003-no-ldconfig.patch
deleted file mode 100644
index 06d1a57ed627..000000000000
--- a/pkgs/development/compilers/julia/0003-no-ldconfig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8802fe583eda93a928739cb3bc3517e19d1a6fa1 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 11 Oct 2015 07:19:42 -0500
-Subject: [PATCH 3/3] no ldconfig
-
----
- src/ccall.cpp | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/ccall.cpp b/src/ccall.cpp
-index 22015ff..2821192 100644
---- a/src/ccall.cpp
-+++ b/src/ccall.cpp
-@@ -13,11 +13,7 @@ extern "C" DLLEXPORT void jl_read_sonames(void)
- {
- char *line=NULL;
- size_t sz=0;
--#if defined(__linux__)
-- FILE *ldc = popen("/sbin/ldconfig -p", "r");
--#else
-- FILE *ldc = popen("/sbin/ldconfig -r", "r");
--#endif
-+ FILE *ldc = popen("true", "r");
- if (ldc == NULL) return; // ignore errors in running ldconfig (other than whatever might have been printed to stderr)
-
- while (!feof(ldc)) {
---
-2.5.2
-
diff --git a/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch b/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch
deleted file mode 100644
index 1950cd7836a2..000000000000
--- a/pkgs/development/compilers/julia/0004-hardened-0.4.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0bdbe60325a22202f8e250a9578407648a0d29b9 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Wed, 1 Feb 2017 06:09:49 -0600
-Subject: [PATCH] Set pax flags on julia binaries to disable memory protection.
-
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 8d45a1baa..91ea33b21 100644
---- a/Makefile
-+++ b/Makefile
-@@ -61,6 +61,8 @@ julia-src-release julia-src-debug : julia-src-% : julia-deps
-
- julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
- @$(MAKE) $(QUIET_MAKE) -C ui julia-$*
-+ @echo "setting PaX flags on $(JULIA_EXECUTABLE_$*)"
-+ @paxctl -czexm $(JULIA_EXECUTABLE_$*)
-
- julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples
- @$(MAKE) $(QUIET_MAKE) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
---
-2.11.0
-
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index a504dc2ea463..84fdf8f9786d 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchzip
# build tools
, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
# libjulia dependencies
-, libunwind, llvm, readline, utf8proc, zlib
+, libunwind, readline, utf8proc, zlib
+, llvm
# standard library dependencies
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
# linear algebra
@@ -21,9 +22,6 @@ in
let
arpack = arpack_.override { inherit openblas; };
suitesparse = suitesparse_.override { inherit openblas; };
- llvmShared = if stdenv.isDarwin
- then llvm.override { enableSharedLibraries = true; }
- else llvm;
in
let
@@ -33,10 +31,10 @@ let
sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
};
- libuvVersion = "efb40768b7c7bd9f173a7868f74b92b1c5a61a0e";
+ libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d";
libuv = fetchurl {
url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
- sha256 = "1znkxyv1cy9pjap7afypipzsn04533ni3pqjd191fdgw2sv9cal7";
+ sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba";
};
rmathVersion = "0.1";
@@ -44,40 +42,59 @@ let
url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
};
+
+ virtualenvVersion = "15.0.0";
+ virtualenv = fetchurl {
+ url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
+ sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
+ };
+
+ majorVersion = "0";
+ minorVersion = "6";
+ maintenanceVersion = "4";
+ version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
in
stdenv.mkDerivation rec {
pname = "julia";
- version = "0.4.7";
+ inherit version;
name = "${pname}-${version}";
- src = fetchurl {
+ src = fetchzip {
url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
- sha256 = "09f531jhs8pyd1xng5c26x994w7q0sxxr28mr3qfw9wpkbmsc2pf";
+ sha256 = "09axkkj914al7lzvcvhb33hz5wp083lk18llsvrn622fqhmyqabl";
};
-
prePatch = ''
- cp "${dsfmt}" "./deps/dsfmt-${dsfmtVersion}.tar.gz"
- cp "${rmath-julia}" "./deps/Rmath-julia-${rmathVersion}.tar.gz"
- cp "${libuv}" "./deps/libuv-${libuvVersion}.tar.gz"
+ mkdir deps/srccache
+ cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
+ cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
+ cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
+ cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
'';
patches = [
- ./0001-use-system-utf8proc.patch
+ ./0001.1-use-system-utf8proc.patch
./0002-use-system-suitesparse.patch
- ./0003-no-ldconfig.patch
- ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened-0.4.7.patch;
+ ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
postPatch = ''
patchShebangs . contrib
+ for i in backtrace replutil cmdlineargs compile; do
+ mv test/$i.jl{,.off}
+ touch test/$i.jl
+ done
+
+ sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl
+ sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl
'';
buildInputs = [
- arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr
+ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
- zlib
- ] ++
- stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ;
+ zlib llvm
+ ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+ ;
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
++ stdenv.lib.optional stdenv.needsPax paxctl;
@@ -85,7 +102,7 @@ stdenv.mkDerivation rec {
makeFlags =
let
arch = head (splitString "-" stdenv.system);
- march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
+ march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
or (throw "unsupported architecture: ${arch}");
# Julia requires Pentium 4 (SSE2) or better
cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
@@ -116,7 +133,10 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_GMP=1"
"USE_SYSTEM_LIBGIT2=1"
"USE_SYSTEM_LIBUNWIND=1"
+
"USE_SYSTEM_LLVM=1"
+ "LLVM_VER=3.9.1"
+
"USE_SYSTEM_MPFR=1"
"USE_SYSTEM_OPENLIBM=1"
"USE_SYSTEM_OPENSPECFUN=1"
@@ -133,38 +153,50 @@ stdenv.mkDerivation rec {
LD_LIBRARY_PATH = makeLibraryPath [
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
- openspecfun pcre2 suitesparse
+ openspecfun pcre2 suitesparse llvm
];
- NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
-
dontStrip = true;
dontPatchELF = true;
enableParallelBuilding = true;
- doCheck = true;
+ doCheck = !stdenv.isDarwin;
checkTarget = "testall";
# Julia's tests require read/write access to $HOME
preCheck = ''
export HOME="$NIX_BUILD_TOP"
'';
+ preBuild = ''
+ sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
+ sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+ '';
+
postInstall = ''
- for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
- wrapProgram "$prog" \
- --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
- --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
+ # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
+ # as using a wrapper with LD_LIBRARY_PATH causes segmentation
+ # faults when program returns an error:
+ # $ julia -e 'throw(Error())'
+ find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
+ if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
+ ln -sv $lib $out/lib/julia/$(basename $lib)
+ fi
done
'';
+ passthru = {
+ inherit majorVersion minorVersion maintenanceVersion;
+ site = "share/julia/site/v${majorVersion}.${minorVersion}";
+ };
+
meta = {
description = "High-level performance-oriented dynamical language for technical computing";
homepage = https://julialang.org/;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
- #broken = stdenv.isi686;
- broken = true; # 2018-04-10
+ broken = stdenv.isi686;
};
}
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
deleted file mode 100644
index 4b9a369e8d25..000000000000
--- a/pkgs/development/compilers/julia/git.nix
+++ /dev/null
@@ -1,180 +0,0 @@
-{ stdenv, fetchgit, fetchurl
-# build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
-# libjulia dependencies
-, libunwind, readline, utf8proc, zlib
-, llvm
-# standard library dependencies
-, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
-# linear algebra
-, openblas, arpack, suitesparse
-# Darwin frameworks
-, CoreServices, ApplicationServices
-}:
-
-with stdenv.lib;
-
-# All dependencies must use the same OpenBLAS.
-let
- arpack_ = arpack;
- suitesparse_ = suitesparse;
-in
-let
- arpack = arpack_.override { inherit openblas; };
- suitesparse = suitesparse_.override { inherit openblas; };
-in
-
-let
- dsfmtVersion = "2.2.3";
- dsfmt = fetchurl {
- url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz";
- sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
- };
-
- libuvVersion = "8d5131b6c1595920dd30644cd1435b4f344b46c8";
- libuv = fetchurl {
- url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
- sha256 = "1886r04igcs0k24sbb61wn10f8ki35c39jsnc5djv3rg4hvn9l49";
- };
-
- rmathVersion = "0.1";
- rmath-julia = fetchurl {
- url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
- sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
- };
-
- virtualenvVersion = "15.0.0";
- virtualenv = fetchurl {
- url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
- sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
- };
-in
-
-stdenv.mkDerivation rec {
- pname = "julia";
- version = "0.6.0-dev-2016-11-25";
- name = "${pname}-${version}";
-
- src = fetchgit {
- url = "https://github.com/JuliaLang/${pname}";
- rev = "03c24644815ba5320d038bb60c08565375fea1d9";
- sha256 = "103mg9dz8yda2zxbd85jv8zhdzs29jj0dxrm2ppxpfhbbf6fxqav";
- };
-
- prePatch = ''
- mkdir deps/srccache
- cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz"
- cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz"
- cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz"
- cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
- '';
-
- patches = [
- ./0001.1-use-system-utf8proc.patch
- ./0002-use-system-suitesparse.patch
- ] ++ stdenv.lib.optional stdenv.needsPax ./0004-hardened.patch;
-
- postPatch = ''
- patchShebangs . contrib
- '';
-
- buildInputs = [
- arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
- pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
- zlib llvm
- ]
- ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
- ;
-
- nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]
- ++ stdenv.lib.optional stdenv.needsPax paxctl;
-
- makeFlags =
- let
- arch = head (splitString "-" stdenv.system);
- march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
- or (throw "unsupported architecture: ${arch}");
- # Julia requires Pentium 4 (SSE2) or better
- cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
- or (throw "unsupported architecture: ${arch}");
- in [
- "ARCH=${arch}"
- "MARCH=${march}"
- "JULIA_CPU_TARGET=${cpuTarget}"
- "PREFIX=$(out)"
- "prefix=$(out)"
- "SHELL=${stdenv.shell}"
-
- "USE_SYSTEM_BLAS=1"
- "USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
- "LIBBLAS=-lopenblas"
- "LIBBLASNAME=libopenblas"
-
- "USE_SYSTEM_LAPACK=1"
- "LIBLAPACK=-lopenblas"
- "LIBLAPACKNAME=libopenblas"
-
- "USE_SYSTEM_SUITESPARSE=1"
- "SUITESPARSE_LIB=-lsuitesparse"
- "SUITESPARSE_INC=-I${suitesparse}/include"
-
- "USE_SYSTEM_ARPACK=1"
- "USE_SYSTEM_FFTW=1"
- "USE_SYSTEM_GMP=1"
- "USE_SYSTEM_LIBGIT2=1"
- "USE_SYSTEM_LIBUNWIND=1"
- # 'replutil' test failure with LLVM 3.8.0, invalid libraries with 3.7.1
- "USE_SYSTEM_LLVM=1"
- "USE_SYSTEM_MPFR=1"
- "USE_SYSTEM_OPENLIBM=1"
- "USE_SYSTEM_OPENSPECFUN=1"
- "USE_SYSTEM_PATCHELF=1"
- "USE_SYSTEM_PCRE=1"
- "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
- "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
- "USE_SYSTEM_READLINE=1"
- "USE_SYSTEM_UTF8PROC=1"
- "USE_SYSTEM_ZLIB=1"
- ];
-
- NIX_CFLAGS_COMPILE = [ "-fPIC" ];
-
- LD_LIBRARY_PATH = makeLibraryPath [
- arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
- openspecfun pcre2 suitesparse llvm
- ];
-
- dontStrip = true;
- dontPatchELF = true;
-
- enableParallelBuilding = true;
-
- doCheck = true;
- checkTarget = "testall";
- # Julia's tests require read/write access to $HOME
- preCheck = ''
- export HOME="$NIX_BUILD_TOP"
- '';
-
- preBuild = ''
- sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
- sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
- '';
-
- postInstall = ''
- for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
- wrapProgram "$prog" \
- --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \
- --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
- done
- '';
-
- meta = {
- description = "High-level performance-oriented dynamical language for technical computing";
- homepage = https://julialang.org/;
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ raskin ];
- platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
- broken = true; # since 2017-04-08.
- };
-}
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 5b31bc18b8c2..948948ebc44e 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -21,42 +21,42 @@ let
else
throw "openjdk requires i686-linux or x86_64 linux";
- update = "172";
- build = "11";
+ update = "181";
+ build = "13";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
repover = "jdk8u${update}-b${build}";
paxflags = if stdenv.isi686 then "msp" else "m";
jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz";
- sha256 = "08mgfqbbgnx9n6prczwm4m8pgsakya45iai1gfslqnb0adh33jpi";
+ sha256 = "0rlbf3v55d45fl9gigawghd0vs0cr3k48zj48qlv3k9yxg1knq9a";
};
langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
- sha256 = "0dph17mpr5ni280z8rmiwlw0v46dnzyph6fq132xvxiw2i1203zg";
+ sha256 = "1sk5f45ndxj8ch9pqfwmis5hnb09an7nvz3n1wyd5la42jprmwaf";
};
hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
- sha256 = "181ixh75xjvlj0l3a58d9iqf50ivq77993yzfv0463dm44h6b8pp";
+ sha256 = "0pvx5hwmx61sbyi02pngfbky219raqqjw2xjms01nz18mzr77c84";
};
corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz";
- sha256 = "097azhdmr7ph1gvlzjgx6s2hyxmi2s5293d5hs23dl5i9f55b6x8";
+ sha256 = "1b0r3fjv9q85j74lgzr2vv4z5gl13bb46zvh36mfks6j74z7ki1z";
};
jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
- sha256 = "1lvk2brd9yclzd7cdk1kvnv4mbdxzjxd595pqhdaxdxxr5anhsvm";
+ sha256 = "1a5gm4w4f79wj0ciwcv8l8m4ha8hjs2r62bvj0vls2kwr5c8znn4";
};
jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
- sha256 = "0cl4b4c2qjyhlsa5khlxinilfaj6ai1mzji3y0263klc8q6bglwa";
+ sha256 = "1f92s3mpbqxzgh5pazqm8pn5swqkmdrkm7mnmga2kgshzlknh6pm";
};
jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
- sha256 = "00s6wm62v7gmkwy46js0lisijng40lnxscndczbgfvvz2q9zz4q1";
+ sha256 = "0fwdqr031yyyjrpsk9fwp4y1vlfmdr1rdzgk44gyypwjdap7a11d";
};
nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
- sha256 = "0ab0rrmmf145nh4mibvknjni4whvzmk6fsnl7ihcn8m0zi6zyfra";
+ sha256 = "0j5f98pa6746m1xq4842qq5d1ql5x8wvcrjmjk433slgma9hf8pj";
};
openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}";
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 9bf8577923c8..a77ee4256179 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -51,7 +51,7 @@ let
, ztsSupport ? config.php.zts or false
, calendarSupport ? config.php.calendar or true
, sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
- , tidySupport ? false
+ , tidySupport ? (config.php.tidy or false)
}:
let
@@ -236,7 +236,7 @@ in {
};
php72 = generic {
- version = "7.2.7";
- sha256 = "18ymjqy8vpmwlzzfrxvaz2nsn8n66rmg40pwiy6x2kdgjrd6g0fc";
+ version = "7.2.8";
+ sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
};
}
diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.27.nix
similarity index 90%
rename from pkgs/development/libraries/git2/0.25.nix
rename to pkgs/development/libraries/git2/0.27.nix
index 6bb1de2cf348..8d9ff3cfe43c 100644
--- a/pkgs/development/libraries/git2/0.25.nix
+++ b/pkgs/development/libraries/git2/0.27.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "0.25.1";
+ version = "0.27.3";
name = "libgit2-${version}";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
- sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj";
+ sha256 = "044dzwgl8zf1i1mk2g1z07hzxz46gma9sh63x09hswhw8j6zqx61";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 5b9296608d45..481ae32bdc61 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchurl
+, fetchpatch
# Excerpt from glpk's INSTALL file:
# This feature allows the exact simplex solver to use the GNU MP
# bignum library. If it is disabled, the exact simplex solver uses the
@@ -28,6 +29,24 @@ stdenv.mkDerivation rec {
"--with-gmp"
];
+ patches = [
+ # GLPK makes it possible to customize its message printing behaviour. Sage
+ # does that and needs to differentiate between printing regular messages and
+ # printing errors. Unfortunately there is no way to tell and glpk upstream
+ # rejected this patch. All it does is set the variable pointing to the error
+ # file back to NULL before glpk calls abort(). In sage's case, abort won't
+ # actually be called because the error handler jumps out of the function.
+ # This shouldn't affect everybody else, since glpk just calls abort()
+ # immediately afterwards anyways.
+ # See the sage trac ticket for more details:
+ # https://trac.sagemath.org/ticket/20710#comment:18
+ (fetchpatch {
+ name = "error_recovery.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+ sha256 = "0z99z9gd31apb6x5n5n26411qzx0ma3s6dnznc4x61x86bhq31qf";
+ })
+ ];
+
doCheck = true;
meta = {
@@ -43,7 +62,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/glpk/;
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ bjg ];
+ maintainers = with stdenv.lib.maintainers; [ bjg timokau ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
new file mode 100644
index 000000000000..a73122d8253e
--- /dev/null
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
+let
+ version = "3.28.1";
+ pname = "jsonrpc-glib";
+in
+stdenv.mkDerivation {
+ name = "${pname}-${version}";
+
+ outputs = [ "out" "dev" "devdoc" ];
+
+ nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+ buildInputs = [ glib json-glib ];
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0avff2ldjvwrb8rnzlgslagdjf6x7bmdx69rsq20k6f38icw4ang";
+ };
+
+ mesonFlags = [
+ "-Denable_gtk_doc=true"
+ ];
+
+ # Tests fail non-deterministically
+ # https://gitlab.gnome.org/GNOME/jsonrpc-glib/issues/2
+ doCheck = false;
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "A library to communicate using the JSON-RPC 2.0 specification";
+ homepage = https://gitlab.gnome.org/GNOME/jsonrpc-glib;
+ license = licenses.lgpl21Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 81caa3e91acc..88b15b58c43d 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
assert videoSupport -> ffmpeg != null && libmpeg2 != null;
stdenv.mkDerivation rec {
- name = "libextractor-1.6";
+ name = "libextractor-1.7";
src = fetchurl {
url = "mirror://gnu/libextractor/${name}.tar.gz";
- sha256 = "17gnpgspdhfgcr27j8sn9105vb4lw22yqdrhic62l79q5v5avm16";
+ sha256 = "13wf6vj7mkv6gw8h183cnk7m24ir0gyf198pyb2148ng4klgv9p0";
};
preConfigure =
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 555828bfaf6a..e9010852eb33 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -11,11 +11,11 @@ assert javaSupport -> jdk != null;
stdenv.mkDerivation rec {
name = "libguestfs-${version}";
- version = "1.38.2";
+ version = "1.38.3";
src = fetchurl {
url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
- sha256 = "16v2lpi9c0vnic2x0vpszmckh0x39bmf6x7y00vvzbwhszshxx3w";
+ sha256 = "130nc9v9f8k5kwz9hzqd43fjxg01hl7jh0jw1fhs4ah5hmg71v34";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix
new file mode 100644
index 000000000000..e177694e894e
--- /dev/null
+++ b/pkgs/development/libraries/msgpuck/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "msgpuck-${version}";
+ version = "2.0";
+
+ src = fetchFromGitHub {
+ owner = "rtsisyk";
+ repo = "msgpuck";
+ rev = "${version}";
+ sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ meta = with stdenv.lib; {
+ description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file'';
+ homepage = https://github.com/rtsisyk/msgpuck;
+ license = licenses.bsd2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ izorkin ];
+ };
+}
diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix
new file mode 100644
index 000000000000..6ce02d588a97
--- /dev/null
+++ b/pkgs/development/libraries/template-glib/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
+let
+ version = "3.28.0";
+ pname = "template-glib";
+in
+stdenv.mkDerivation {
+ name = "${pname}-${version}";
+
+ outputs = [ "out" "dev" "devdoc" ];
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "18bic41f9cx8h6n5bz80z4ridb8c1h1yscicln8zsn23zmp44x3c";
+ };
+
+ buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+ nativeBuildInputs = [ glib gobjectIntrospection ];
+
+ mesonFlags = [
+ "-Denable_gtk_doc=true"
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "A library for template expansion which supports calling into GObject Introspection from templates";
+ homepage = https://gitlab.gnome.org/GNOME/template-glib;
+ license = licenses.lgpl21Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 78102b9c673b..c6d99fa33e71 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild
, cstruct, zarith, ounit, result, topkg, ptime
}:
@@ -10,16 +10,14 @@ let param =
} else {
version = "0.1.3";
sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj";
- propagatedBuildInputs = [ ];
+ propagatedBuildInputs = [ ];
};
in
-buildOcaml rec {
- name = "asn1-combinators";
+stdenv.mkDerivation rec {
+ name = "ocaml${ocaml.version}-asn1-combinators-${version}";
inherit (param) version;
- minimumSupportedOcamlVersion = "4.01";
-
src = fetchFromGitHub {
owner = "mirleft";
repo = "ocaml-asn1-combinators";
@@ -27,7 +25,7 @@ buildOcaml rec {
inherit (param) sha256;
};
- buildInputs = [ ocaml findlib ounit topkg ];
+ buildInputs = [ ocaml findlib ocamlbuild ounit topkg ];
propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs;
buildPhase = "${topkg.run} build --tests true";
diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix
index 4f42f51c16e6..0ef3cf167341 100644
--- a/pkgs/development/ocaml-modules/jingoo/default.nix
+++ b/pkgs/development/ocaml-modules/jingoo/default.nix
@@ -1,18 +1,24 @@
-{stdenv, buildOcaml, fetchurl, batteries, pcre}:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ounit, pcre, uutf }:
-buildOcaml rec {
- name = "jingoo";
- version = "1.2.7";
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "jingoo is not available for OCaml ${ocaml.version}"
+else
- src = fetchurl {
- url = "https://github.com/tategakibunko/jingoo/archive/v${version}.tar.gz";
- sha256 = "8ffc5723d77b323a12761981d048c046af77db47543a4b1076573aa5f4003009";
+stdenv.mkDerivation rec {
+ name = "ocaml${ocaml.version}-jingoo-${version}";
+ version = "1.2.18";
+
+ src = fetchFromGitHub {
+ owner = "tategakibunko";
+ repo = "jingoo";
+ rev = "v${version}";
+ sha256 = "0gciiysrjy5r4yiisc41k4h0p530yawzqnr364xg8fdkk444fgkn";
};
- propagatedBuildInputs = [ batteries pcre ];
+ buildInputs = [ ocaml findlib ];
+ propagatedBuildInputs = [ pcre uutf ];
- preInstall = "mkdir -p $out/bin";
- installFlags = "BINDIR=$(out)/bin";
+ createFindlibDestdir = true;
meta = with stdenv.lib; {
homepage = https://github.com/tategakibunko/jingoo;
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
new file mode 100644
index 000000000000..10555771feef
--- /dev/null
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchurl, ocaml, findlib, tcl, tk }:
+
+let param = {
+ "4.04" = {
+ version = "8.06.2";
+ key = "1628";
+ sha256 = "1p97j9s33axkb4yyl0byhmhlyczqarb886ajpyggizy2br3a0bmk";
+ };
+ "4.05" = {
+ version = "8.06.3";
+ key = "1701";
+ sha256 = "1rka9jpg3kxqn7dmgfsa7pmsdwm16x7cn4sh15ijyyrad9phgdxn";
+ };
+ "4.06" = {
+ version = "8.06.4";
+ key = "1727";
+ sha256 = "0j3rz0zz4r993wa3ssnk5s416b1jhj58l6z2jk8238a86y7xqcii";
+ };
+ "4.07" = {
+ version = "8.06.5";
+ key = "1764";
+ sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj";
+ };
+}."${builtins.substring 0 4 ocaml.version}";
+in
+
+stdenv.mkDerivation rec {
+ inherit (param) version;
+ name = "ocaml${ocaml.version}-labltk-${version}";
+
+ src = fetchurl {
+ url = "https://forge.ocamlcore.org/frs/download.php/${param.key}/labltk-${param.version}.tar.gz";
+ inherit (param) sha256;
+ };
+
+ buildInputs = [ ocaml findlib tcl tk ];
+
+ configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ];
+ dontAddPrefix = true;
+
+ buildFlags = [ "all" "opt" ];
+
+ createFindlibDestdir = true;
+
+ postInstall = ''
+ mkdir -p $OCAMLFIND_DESTDIR/stublibs
+ mv $OCAMLFIND_DESTDIR/labltk/dlllabltk.so $OCAMLFIND_DESTDIR/stublibs/
+ '';
+
+ meta = {
+ description = "OCaml interface to Tcl/Tk, including OCaml library explorer OCamlBrowser";
+ homepage = "http://labltk.forge.ocamlcore.org/";
+ license = stdenv.lib.licenses.lgpl21;
+ inherit (ocaml.meta) platforms;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix
index 2e3a627a3d1c..b0067d44911f 100644
--- a/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/pkgs/development/ocaml-modules/ptime/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }:
-buildOcaml rec {
- version = "0.8.3";
- name = "ptime";
+stdenv.mkDerivation rec {
+ version = "0.8.4";
+ name = "ocaml${ocaml.version}-ptime-${version}";
src = fetchurl {
url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
- sha256 = "18jimskgnd9izg7kn6zk6sk35adgjm605dkv13plwslbb90kqr44";
+ sha256 = "0z2snhda8bg136xkw2msw6k2dz84vb49p8bgzrxfs8mawdlk0kkg";
};
unpackCmd = "tar -xf $curSrc";
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index d7e6abf3eb6c..6edad2d01619 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ stdenv, fetchPypi, buildPythonPackage, fetchpatch
, more-itertools, six
, pytest, pytestcov, portend
, backports_unittest-mock
@@ -13,9 +13,15 @@ buildPythonPackage rec {
sha256 = "8e3ac15e1efffc81425a693e99b3c09d7ea4bf947255d8d4c38e2cf76f3a4d25";
};
- propagatedBuildInputs = [ more-itertools six ];
+ patches = fetchpatch {
+ name = "cheroot-fix-setup-python3.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot";
+ sha256 = "1rlgz0qln536y00mfqlf0i9hz3f53id73wh47cg5q2vcsw1w2bpc";
+ };
- checkInputs = [ pytest pytestcov portend backports_unittest-mock backports_functools_lru_cache ];
+ propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ];
+
+ checkInputs = [ pytest pytestcov portend backports_unittest-mock ];
# Disable testmon, it needs pytest-testmon, which we do not currently have in nikpkgs,
# and is only used to skip some tests that are already known to work.
diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix
new file mode 100644
index 000000000000..ba5ede1ad771
--- /dev/null
+++ b/pkgs/development/python-modules/potr/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage, pycrypto }:
+
+buildPythonPackage rec {
+ pname = "python-potr";
+ version = "1.0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "f95b9a7feaf8e3a6aaa898609f8a2ada55518cf52fc09152775c4c59c99b8ea6";
+ };
+
+ propagatedBuildInputs = [ pycrypto ];
+
+ meta = with stdenv.lib; {
+ description = "A pure Python OTR implementation";
+ homepage = "http://python-otr.pentabarf.de/";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ globin ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index 2ad44c4e8066..558fe32b909d 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pytest-flake8";
- version = "1.0.1";
+ version = "1.0.2";
# although pytest is a runtime dependency, do not add it as
# propagatedBuildInputs in order to allow packages depend on another version
@@ -12,16 +12,13 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0s5fdivrmhjf6ybr6m2qb1h8hndv2jh2ir29qv36lhy9b7sc9kg5";
+ sha256 = "c740ad6aa19e3958947d2118f70bed218caf1d2097039fb7318573a2a72f89a1";
};
checkPhase = ''
- pytest . -k "not test_mtime_caching"
+ pytest .
'';
- # https://github.com/tholo/pytest-flake8/issues/49
- doCheck = false;
-
meta = {
description = "py.test plugin for efficiently checking PEP8 compliance";
homepage = https://github.com/tholo/pytest-flake8;
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index c7b6947b37d2..4e22110bf3d4 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -8,8 +8,8 @@ buildPythonPackage rec {
pname = "scikit-learn";
version = "0.19.2";
# UnboundLocalError: local variable 'message' referenced before assignment
- disabled = true;
-# disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
+ doCheck = false;
+ disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index d0d20362236b..9c2419b53589 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
license = "custom";
maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ];
- platforms = ["x86_64-linux"];
+ platforms = stdenv.lib.platforms.x86;
};
}
diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index e33d6b26b12b..8778084163e8 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -6,11 +6,11 @@ with python.pkgs;
buildPythonApplication rec {
pname = "aws-sam-cli";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4740bfa23f39880d807aa75a2143259f7f15eec34c5fa5dde8fc04d8563ef521";
+ sha256 = "2acf9517f467950adb4939746658091e60cf60ee80093ffd0d3d821cb8a1f9fc";
};
# Tests are not included in the PyPI package
@@ -21,13 +21,20 @@ buildPythonApplication rec {
boto3
click
cookiecutter
+ dateparser
docker
enum34
flask
+ python-dateutil
pyyaml
six
];
+ postPatch = ''
+ substituteInPlace ./requirements/base.txt \
+ --replace 'aws-sam-translator==1.6.0' 'aws-sam-translator>=1.6.0';
+ '';
+
meta = with lib; {
homepage = https://github.com/awslabs/aws-sam-cli;
description = "CLI tool for local development and testing of Serverless applications";
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 33dc7c80c17a..479bfe35e969 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
-{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
+{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "11.0.0";
+ version = "11.1.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
- url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
- sha256 = "1wi2wza991hhys60c8f3rhad8dqargnb6i7xwfsxrjd26dsbif2b";
+ url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
+ sha256 = "0l7j69isnp6wlix3ysjxcr9dgcx5a0j9z2k0bsl714ff339js6j5";
};
docker_arm = fetchurl {
- url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
- sha256 = "1y67zxxad2jy1rvfhdlp194fi0qgwrnlcs24zh5lzwvsnwvc13bg";
+ url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
+ sha256 = "16x9wbyd90jgyn7x45j9cyrdfz4hg8qav132schqrrdfrgjyrb4x";
};
in
buildGoPackage rec {
@@ -29,31 +29,16 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "06p8fggnxn2afy0k4wjh44d1qby9n2j0mq6cl206cckzh2gfsknp";
+ sha256 = "0b632jnqbj74nx27nlpiia6nq8668gf41lcb4s24gw9jnfmrwhym";
};
patches = [ ./fix-shell-path.patch ];
- buildInputs = [ go-bindata ];
-
- preBuild = ''
- (
- # go-bindata names the assets after the filename thus we create a symlink with the name we want
- cd go/src/${goPackagePath}
- ln -sf ${docker_x86_64} prebuilt-x86_64.tar.xz
- ln -sf ${docker_arm} prebuilt-arm.tar.xz
- go-bindata \
- -pkg docker \
- -nocompress \
- -nomemcopy \
- -o executors/docker/bindata.go \
- prebuilt-x86_64.tar.xz \
- prebuilt-arm.tar.xz
- )
- '';
-
postInstall = ''
- install -d $out/bin
+ touch $bin/bin/hello
+ install -d $bin/bin/helper-images
+ ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz
+ ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz
'';
meta = with lib; {
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
new file mode 100644
index 000000000000..d2db1f1a2a69
--- /dev/null
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -0,0 +1,24 @@
+{ buildGoPackage, fetchFromGitHub, lib }:
+
+buildGoPackage rec {
+ name = "golangci-lint-${version}";
+ version = "1.9.2";
+ goPackagePath = "github.com/golangci/golangci-lint";
+
+ subPackages = [ "cmd/golangci-lint" ];
+
+ src = fetchFromGitHub {
+ owner = "golangci";
+ repo = "golangci-lint";
+ rev = "v${version}";
+ sha256 = "0r05j6ayk5778fkd5r1sgcwq675ra0vq82lqs125g70291ryha08";
+ };
+
+ meta = with lib; {
+ description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
+ homepage = https://golangci.com/;
+ license = licenses.agpl3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.manveru ];
+ };
+}
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index 491d65d8882e..6ee8c4074b78 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
};
+ outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
+
buildInputs = [ oniguruma ];
patches = [
@@ -25,11 +27,19 @@ stdenv.mkDerivation rec {
];
patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released
+ configureFlags =
+ [
+ "--bindir=\${bin}/bin"
+ "--sbindir=\${bin}/bin"
+ "--datadir=\${doc}/share"
+ "--mandir=\${man}/share/man"
+ ]
# jq is linked to libjq:
- configureFlags = stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
+ ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
- installCheckPhase = "$out/bin/jq --help";
+ installCheckPhase = "$bin/bin/jq --help >/dev/null";
doInstallCheck = true;
+ doCheck = true;
meta = with stdenv.lib; {
description = ''A lightweight and flexible command-line JSON processor'';
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 7cbfc4385048..1d7f8025bb0e 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -2,7 +2,7 @@
let
# Manually set version - the setup script requires
# hg and git + keeping the .git directory around.
- version = "0.0.8";
+ version = "0.0.10";
versionFile = writeScript "version.ml" ''
cat > "./version.ml" < Local/Makefile
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 3d6a1aa9c6fa..3245666d8ec3 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name= "nextcloud-${version}";
- version = "13.0.4";
+ version = "13.0.5";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
- sha256 = "18d514145fcddc86f48d0a5fa4a0d4b07617135a1b23107137a6ea3ed519bd54";
+ sha256 = "1sl0kvn52m6p7rglwhgfb737y1897897hc5g2fcbg6i594ld6451";
};
installPhase = ''
diff --git a/pkgs/servers/xmpp/biboumi/catch.patch b/pkgs/servers/xmpp/biboumi/catch.patch
index 05cf534ecfef..bbd0a66909fe 100644
--- a/pkgs/servers/xmpp/biboumi/catch.patch
+++ b/pkgs/servers/xmpp/biboumi/catch.patch
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -273,27 +273,6 @@ foreach(file ${source_all})
+@@ -303,27 +303,6 @@
endforeach()
#
@@ -19,7 +19,7 @@
-ExternalProject_Get_Property(catch SOURCE_DIR)
-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp)
- target_include_directories(test_suite
-- PUBLIC "${SOURCE_DIR}/include/"
+- PUBLIC "${SOURCE_DIR}/single_include/"
- )
- add_dependencies(test_suite catch)
-endif()
diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix
index 7ef6242d2b25..b0d3dccf30f2 100644
--- a/pkgs/servers/xmpp/biboumi/default.nix
+++ b/pkgs/servers/xmpp/biboumi/default.nix
@@ -3,17 +3,17 @@
stdenv.mkDerivation rec {
name = "biboumi-${version}";
- version = "7.2";
+ version = "8.3";
src = fetchurl {
url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz";
- sha256 = "0gyr2lp2imrjm5hvijcq0s7k9fzkirfl70cprjy9r4yvq6mg1jvd";
+ sha256 = "0896f52nh8vd0idkdznv3gj6wqh1nqhjbwv0m560f0h62f01vm7k";
};
louiz_catch = fetchgit {
url = https://lab.louiz.org/louiz/Catch.git;
- rev = "35f510545d55a831372d3113747bf1314ff4f2ef";
- sha256 = "1l5b32sgr9zc2hlfr445hwwxv18sh3cn5q1xmvf588z6jyf88g2g";
+ rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1
+ sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl";
};
patches = [ ./catch.patch ];
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index a11a530bcdb1..6f9e338dabaa 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2018-04-25";
+ version = "2018-07-29";
name = "oh-my-zsh-${version}";
src = fetchgit {
url = "https://github.com/robbyrussell/oh-my-zsh";
- rev = "9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8";
- sha256 = "0pjw5m7wpmcfdhrj322icplw3hsbbdxjgfw12kr2zpzl95xqkkhs";
+ rev = "5fa7824ea59ec12a976f348a83399e66699456ea";
+ sha256 = "1ry46jxk7k4ndh4gic9v7c19gsqmcag8bng92pp7vw0fj0b0ij6k";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index 2da943540192..10cb1edb62a9 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, libsodium, lzma }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium
+, llvmPackages, clang_39, lzma }:
rustPlatform.buildRustPackage rec {
name = "rdedup-${version}";
- version = "2.0.0";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "dpc";
repo = "rdedup";
- rev = "v${version}";
- sha256 = "14r6x1wi5mwadarm0vp6qnr5mykv4g0kxz9msq76fhwghwb9k1d9";
+ rev = "e0f26f379a434f76d238c7a5fa6ddd8ae8b32f19";
+ sha256 = "1nhf8ap0w99aa1h0l599cx90lcvfvjaj67nw9flq9bmmzpn53kp9";
};
- buildInputs = [ pkgconfig libsodium lzma ];
+ cargoSha256 = "1x6wchlcxb1frww6y04gfx4idxv9h0g9qfxrhgb6g5qy3bqhqq3p";
- cargoSha256 = "0wyswc4b4hkiw20gz0w94vv1qgcb2zq0cdaj9zxvyr5l0abxip9w";
+ nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang_39 ];
+ buildInputs = [ openssl libsodium lzma ];
+
+ configurePhase = ''
+ export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
+ '';
meta = with stdenv.lib; {
description = "Data deduplication with compression and public key encryption";
diff --git a/pkgs/tools/misc/blsd/deps.nix b/pkgs/tools/misc/blsd/deps.nix
index 55e6daea5e21..d212f213a60e 100644
--- a/pkgs/tools/misc/blsd/deps.nix
+++ b/pkgs/tools/misc/blsd/deps.nix
@@ -1,11 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
-{
- goPackagePath = "github.com/libgit2/git2go";
- fetch = {
- type = "git";
- url = "https://github.com/libgit2/git2go";
- rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5";
- sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc";
- };
-}
+ {
+ goPackagePath = "github.com/libgit2/git2go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/libgit2/git2go";
+ rev = "14280de4da0f392935854a7cbdd67b2a5505c3a8";
+ sha256 = "17ppd7byzir8rhdk645dmggi700scb8f401yiwx8zy81q41dk1qi";
+ };
+ }
]
diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix
index 46324f912c52..d5352ec26dcd 100644
--- a/pkgs/tools/misc/lesspipe/default.nix
+++ b/pkgs/tools/misc/lesspipe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl }:
+{ stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses }:
stdenv.mkDerivation rec {
name = "lesspipe-${version}";
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
sha256 = "0vb7bpap8vy003ha10hc7hxl17y47sgdnrjpihgqxkn8k0bfqbbq";
};
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ file = "${file}/bin/file";
+ tput = "${ncurses}/bin/tput";
+ })
+ ];
+
meta = with stdenv.lib; {
description = "A preprocessor for less";
longDescription = ''
diff --git a/pkgs/tools/misc/lesspipe/fix-paths.patch b/pkgs/tools/misc/lesspipe/fix-paths.patch
new file mode 100644
index 000000000000..1bffcf53c827
--- /dev/null
+++ b/pkgs/tools/misc/lesspipe/fix-paths.patch
@@ -0,0 +1,22 @@
+--- a/lesspipe.sh.in
++++ b/lesspipe.sh.in
+@@ -48,8 +48,8 @@ if [[ "$LESS_ADVANCED_PREPROCESSOR" = '' ]]; then
+ fi
+
+ filecmd() {
+- file -L -s "$@"
+- file -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
++ @file@ -L -s "$@"
++ @file@ -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
+ }
+
+ sep=: # file name separator
+@@ -546,7 +546,7 @@ isfinal() {
+
+ # color requires -r or -R when calling less
+ typeset COLOR
+- if [[ $(tput colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
++ if [[ $(@tput@ colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
+ COLOR="--color=always"
+ fi
+
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 0a261671872d..f68c87df5ce5 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pspg-${version}";
- version = "1.1.1";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "okbob";
repo = "pspg";
rev = "${version}";
- sha256 = "19jiixanyghasd2awkxx7c224fz01d9v0c4qxn4msvkny39m3gz9";
+ sha256 = "172kphgy6rjs4np1azxldi6mcknjaksj7vfjs3ijldkzz87i7w95";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix
new file mode 100644
index 000000000000..fa8bbb91c5be
--- /dev/null
+++ b/pkgs/tools/networking/httperf/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, openssl }:
+
+stdenv.mkDerivation rec {
+ pname = "httperf";
+ name = "${pname}-${version}";
+ version = "0.9.1";
+
+ src = fetchFromGitHub {
+ repo = pname;
+ owner = pname;
+ rev = "3209c7f9b15069d4b79079e03bafba5b444569ff";
+ sha256 = "0p48z9bcpdjq3nsarl26f0xbxmqgw42k5qmfy8wv5bcrz6b3na42";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+ propagatedBuildInputs = [ openssl ];
+
+ configurePhase = ''
+ autoreconf -i
+ mkdir -pv build
+ cd build
+ ../configure
+ '';
+
+ installPhase = ''
+ mkdir -vp $out/bin
+ mv -v src/httperf $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The httperf HTTP load generator";
+ homepage = https://github.com/httperf/httperf;
+ maintainers = with maintainers; [ nand0p ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+
+}
diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix
index 981ecdb03550..641513eaf472 100644
--- a/pkgs/tools/networking/redsocks/default.nix
+++ b/pkgs/tools/networking/redsocks/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Transparent redirector of any TCP connection to proxy";
homepage = http://darkk.net.ru/redsocks/;
license = stdenv.lib.licenses.asl20;
- maintainers = [ ];
+ maintainers = [ stdenv.lib.maintainers.ekleog ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix
new file mode 100644
index 000000000000..a2cd0242839c
--- /dev/null
+++ b/pkgs/tools/package-management/nix-top/default.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, ruby
+, makeWrapper
+, getent # /etc/passwd
+, ncurses # tput
+, procps # ps
+, binutils-unwrapped # strings
+, coreutils
+, findutils
+}:
+
+# No gems used, so mkDerivation is fine.
+let
+ additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ];
+in
+stdenv.mkDerivation rec {
+ name = "nix-top-${version}";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "samueldr";
+ repo = "nix-top";
+ rev = "v${version}";
+ sha256 = "0560a9g8n4p764r3va1nn95iv4bg71g8h0wws1af2p5g553j4zps";
+ };
+
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ buildInputs = [
+ ruby
+ ];
+
+ installPhase = ''
+ mkdir -p $out/libexec/nix-top
+ install -D -m755 ./nix-top $out/bin/nix-top
+ wrapProgram $out/bin/nix-top \
+ --prefix PATH : "$out/libexec/nix-top:${additionalPath}"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ ln -s /bin/stty $out/libexec/nix-top
+ '';
+
+ meta = with lib; {
+ description = "Tracks what nix is building";
+ homepage = https://github.com/samueldr/nix-top;
+ license = licenses.mit;
+ maintainers = with maintainers; [ samueldr ];
+ platforms = platforms.linux ++ platforms.darwin;
+ inherit version;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1552cf790400..c1672fccb8b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -678,6 +678,8 @@ with pkgs;
glyr = callPackage ../tools/audio/glyr { };
+ httperf = callPackage ../tools/networking/httperf { };
+
imgpatchtools = callPackage ../development/mobile/imgpatchtools { };
lastpass-cli = callPackage ../tools/security/lastpass-cli { };
@@ -898,7 +900,7 @@ with pkgs;
blockdiag = pythonPackages.blockdiag;
blsd = callPackage ../tools/misc/blsd {
- libgit2 = libgit2_0_25;
+ libgit2 = libgit2_0_27;
};
bluez-tools = callPackage ../tools/bluetooth/bluez-tools { };
@@ -6799,37 +6801,13 @@ with pkgs;
jikes = callPackage ../development/compilers/jikes { };
- julia_04 = callPackage ../development/compilers/julia {
- gmp = gmp6;
- openblas = openblasCompat;
- inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
- llvm = llvm_37;
- };
-
- julia_05 = callPackage ../development/compilers/julia/0.5.nix {
- gmp = gmp6;
- libgit2 = libgit2_0_25;
- openblas = openblasCompat;
- inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
- llvm = llvm_38;
- };
-
- julia_06 = callPackage ../development/compilers/julia/0.6.nix {
+ julia = callPackage ../development/compilers/julia {
gmp = gmp6;
openblas = openblasCompat;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
llvm = llvm_39;
};
- julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix {
- gmp = gmp6;
- openblas = openblasCompat;
- inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
- llvm = llvm_39;
- });
-
- julia = julia_06;
-
jwasm = callPackage ../development/compilers/jwasm { };
kotlin = callPackage ../development/compilers/kotlin { };
@@ -8352,6 +8330,8 @@ with pkgs;
msgpack-tools = callPackage ../development/tools/msgpack-tools { };
+ msgpuck = callPackage ../development/libraries/msgpuck { };
+
msitools = callPackage ../development/tools/misc/msitools { };
multi-ghc-travis = haskell.lib.justStaticExecutables haskellPackages.multi-ghc-travis;
@@ -9350,7 +9330,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix {
+ libgit2_0_27 = callPackage ../development/libraries/git2/0.27.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -9851,6 +9831,8 @@ with pkgs;
emscripten = emscripten.override {python=python2;};
};
+ jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };
+
libjson = callPackage ../development/libraries/libjson { };
libb64 = callPackage ../development/libraries/libb64 { };
@@ -14226,6 +14208,8 @@ with pkgs;
golint = callPackage ../development/tools/golint { };
+ golangci-lint = callPackage ../development/tools/golangci-lint { };
+
godef = callPackage ../development/tools/godef { };
goimports = callPackage ../development/tools/goimports { };
@@ -15038,6 +15022,8 @@ with pkgs;
theano = callPackage ../data/fonts/theano { };
+ template-glib = callPackage ../development/libraries/template-glib { };
+
tempora_lgc = callPackage ../data/fonts/tempora-lgc { };
terminus_font = callPackage ../data/fonts/terminus-font { };
@@ -18299,10 +18285,7 @@ with pkgs;
insync = callPackage ../applications/networking/insync { };
- lightdm = libsForQt5.callPackage ../applications/display-managers/lightdm {
- qt4 = null;
- withQt5 = false;
- };
+ lightdm = libsForQt5.callPackage ../applications/display-managers/lightdm { };
lightdm_qt = lightdm.override { withQt5 = true; };
@@ -21389,6 +21372,8 @@ with pkgs;
nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
+ nix-top = callPackage ../tools/package-management/nix-top { };
+
nix-repl = callPackage ../tools/package-management/nix-repl { nix = nix1; };
nix-review = callPackage ../tools/package-management/nix-review { };
diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix
index f4e778aed127..77f620da7249 100644
--- a/pkgs/top-level/metrics.nix
+++ b/pkgs/top-level/metrics.nix
@@ -4,7 +4,7 @@ with pkgs;
runCommand "nixpkgs-metrics"
{ buildInputs = [ nix time ];
- # requiredSystemFeatures = [ "benchmark" ]; # TODO: a 1-job machine for this on Hydra?
+ requiredSystemFeatures = [ "benchmark" ];
}
''
export NIX_DB_DIR=$TMPDIR
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 8c265013f47a..9206f2498daa 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -370,6 +370,8 @@ let
gtkmathview = callPackage ../development/libraries/gtkmathview { };
};
+ labltk = callPackage ../development/ocaml-modules/labltk { };
+
lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; };
lambdaTerm =
if lib.versionOlder "4.02" ocaml.version
@@ -687,9 +689,7 @@ let
ssl = callPackage ../development/ocaml-modules/ssl { };
- stog = callPackage ../applications/misc/stog {
- ocaml_lwt = lwt2;
- };
+ stog = callPackage ../applications/misc/stog { };
stringext = callPackage ../development/ocaml-modules/stringext { };
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index a1761e68631e..0057353c3e0b 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -443,11 +443,11 @@ let
phpcs = pkgs.stdenv.mkDerivation rec {
name = "phpcs-${version}";
- version = "3.3.0";
+ version = "3.3.1";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
- sha256 = "1zl35vcq8dmspsj7ww338h30ah75dg91j6a1dy8avkzw5zljqi4h";
+ sha256 = "0kw1ffr688wbcip2hmr7yi7bpdf4kzwh22yvxw17lyddzq6vrqaw";
};
phases = [ "installPhase" ];
@@ -470,11 +470,11 @@ let
phpcbf = pkgs.stdenv.mkDerivation rec {
name = "phpcbf-${version}";
- version = "3.3.0";
+ version = "3.3.1";
src = pkgs.fetchurl {
url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
- sha256 = "1ah065gzmr11njp1if5bc4b19f4izilqwr06m84yb7af18qr77ls";
+ sha256 = "0q75h8y4rbysyzh3i5nzqqln2d8592p0sz6y11rr2hz0g9qw4gim";
};
phases = [ "installPhase" ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9239a2b82eb1..76af703b8f91 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16670,24 +16670,7 @@ EOF
};
};
- potr = buildPythonPackage rec {
- version = "1.0.1";
- name = "potr-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/python-potr/python-${name}.zip";
- sha256 = "1b3vjbv8hvynwj6amw3rg5zj8bagynbj0ipy09xwksf1mb0kz8m8";
- };
-
- propagatedBuildInputs = with self ; [ pycrypto ];
-
- meta = {
- description = "A pure Python OTR implementation";
- homepage = "http://python-otr.pentabarf.de/";
- license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ globin ];
- };
- };
+ potr = callPackage ../development/python-modules/potr {};
pluggy = callPackage ../development/python-modules/pluggy {};