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

Merge branch 'master' into cross-compiling-postgresql

Browse Source
This commit is contained in:
Ding Xiang Fei 2018-07-30 11:47:36 +08:00
commit 56aa3b488c
78 changed files with 748 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/networking/avahi-daemon.nix
View File

@ -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.
'';
};
};
};

19
nixos/modules/services/x11/desktop-managers/lxqt.nix
View File

@ -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;
};
}

4
pkgs/applications/audio/mopidy/iris.nix
View File

@ -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 = [

68
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -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 ];
};
}

86
pkgs/applications/editors/jetbrains/default.nix
View File

@ -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";

14
pkgs/applications/misc/alacritty/default.nix
View File

@ -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
'';

9
pkgs/applications/misc/exercism/default.nix
View File

@ -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;
};
}

201
pkgs/applications/misc/exercism/deps.nix generated Normal file
View File

@ -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";
};
}
]

8
pkgs/applications/misc/sequeler/default.nix
View File

@ -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 ];

17
pkgs/applications/misc/stog/default.nix
View File

@ -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 ];

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

@ -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 ];

37
pkgs/applications/science/math/sage/default.nix
View File

@ -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;

1
pkgs/build-support/setup-hooks/remove-pytest-cache.sh
View File

@ -1 +0,0 @@
postFixupHooks+=

22
pkgs/data/fonts/ibm-plex/default.nix
View File

@ -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 ];

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

@ -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 ];

18
pkgs/desktops/lxqt/base/liblxqt/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/base/libqtxdg/default.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/base/libsysstat/default.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/core/libfm-qt/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-about/default.nix
View File

@ -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 ];

17
pkgs/desktops/lxqt/core/lxqt-admin/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-config/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-panel/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-runner/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-session/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/core/lxqt-themes/default.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
View File

@ -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 ];

12
pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/core/qtermwidget/default.nix
View File

@ -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 ];

2
pkgs/desktops/lxqt/default.nix
View File

@ -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 { };

4
pkgs/desktops/lxqt/optional/compton-conf/default.nix
View File

@ -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 ];

11
pkgs/desktops/lxqt/optional/lximage-qt/default.nix
View File

@ -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 ];

4
pkgs/desktops/lxqt/optional/obconf-qt/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/optional/qps/default.nix
View File

@ -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;

10
pkgs/desktops/lxqt/optional/qterminal/default.nix
View File

@ -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 ];

8
pkgs/desktops/lxqt/optional/screengrab/default.nix
View File

@ -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 ];

39
pkgs/desktops/lxqt/update.sh Executable file
View File

@ -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|.*<a href=.*>(.+) (.+)</a><br>|\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

6
pkgs/development/compilers/dotnet/sdk/default.nix
View File

@ -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";

20
pkgs/development/compilers/openjdk/8.nix
View File

@ -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}";

6
pkgs/development/interpreters/php/default.nix
View File

@ -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";
};
}

21
pkgs/development/libraries/glpk/default.nix
View File

@ -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;
};
}

4
pkgs/development/libraries/libextractor/default.nix
View File

@ -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 =

4
pkgs/development/libraries/libguestfs/default.nix
View File

@ -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 ];

12
pkgs/development/ocaml-modules/asn1-combinators/default.nix
View File

@ -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";

26
pkgs/development/ocaml-modules/jingoo/default.nix
View File

@ -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;

10
pkgs/development/ocaml-modules/ptime/default.nix
View File

@ -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";

20
pkgs/development/python-modules/potr/default.nix Normal file
View File

@ -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 ];
};
}

37
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@ -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; {

14
pkgs/development/tools/jq/default.nix
View File

@ -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'';

8
pkgs/development/tools/pyre/default.nix
View File

@ -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" <<EOF
let build_info () =
@ -18,7 +18,7 @@ in stdenv.mkDerivation {
owner = "facebook";
repo = "pyre-check";
rev = "v${version}";
sha256 = "0c4km27xnzsqcqvjqxmqak37x473z6azlbldy7f05ghkms7mchrw";
sha256 = "17fk2izq434jsr8dfz828754356qdwa6zv0lbzm6z1kgq4jg7brv";
};
nativeBuildInputs = [ makeWrapper ];
@ -33,6 +33,7 @@ in stdenv.mkDerivation {
ppx_deriving_yojson
ocamlbuild
ppxlib
# python36Packages.python36Full # TODO
];
buildPhase = ''
@ -52,13 +53,14 @@ in stdenv.mkDerivation {
checkPhase = ''
make test
# ./scripts/run-python-tests.sh # TODO: once typeshed and python bits are added
'';
# Note that we're not installing the typeshed yet.
# Improvement for a future version.
installPhase = ''
mkdir -p $out/bin
cp _build/all/main.native $out/bin/pyre
cp _build/all/main.native $out/bin/pyre.bin
'';
meta = with stdenv.lib; {

17
pkgs/development/web/postman/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "postman-${version}";
version = "5.5.3";
version = "6.1.4";
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha1 = "BC0C6117BEC6D1638FD18A0E2A580617669A9297";
sha256 = "2f93a860f87d842c0e0433b55cd7c46e04d1d20c0adcae8680332585dffd86eb";
name = "${name}.tar.gz";
};
@ -16,15 +16,10 @@ stdenv.mkDerivation rec {
buildPhase = ":"; # nothing to build
icon = fetchurl {
url = "https://www.getpostman.com/img/v2/media-kit/Logo/PNG/pm-logo-horiz.png";
sha256 = "271b88317bd787f4a30ab374148e73314d60fb1b220ef791611774a061c49f30";
};
desktopItem = makeDesktopItem {
name = "postman";
exec = "postman";
icon = "${icon}";
icon = "postman";
comment = "API Development Environment";
desktopName = "Postman";
genericName = "Postman";
@ -33,13 +28,17 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/share/postman
cp -R * $out/share/postman
cp -R app/* $out/share/postman
mkdir -p $out/bin
ln -s $out/share/postman/Postman $out/bin/postman
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
iconDir=$out/share/icons/hicolor/128x128/apps
mkdir -p $iconDir
ln -s $out/share/postman/resources/app/assets/icon.png $iconDir/postman.png
'';
preFixup = let

6
pkgs/misc/cups/drivers/estudio/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cups-toshiba-estudio-${version}";
version = "7.51";
version = "7.89";
src = fetchurl {
url = http://business.toshiba.com/downloads/KB/f1Ulds/14079/TOSHIBA_ColorMFP_CUPS.tar;
sha256 = "3741bb79723495da5cb5a3971ae8c6042b6c71a6264af8f25aecf721f1f0752f";
url = http://business.toshiba.com/downloads/KB/f1Ulds/15178/TOSHIBA_ColorMFP_CUPS.tar;
sha256 = "0qz4r7q55i0adf4fv3aqnfqgi2pz3jb1jixkqm9x6nk4vanyjf4r";
};
buildInputs = [ perl ];

14
pkgs/misc/emulators/wine/sources.nix
View File

@ -31,24 +31,24 @@ in rec {
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "4.7.1";
version = "4.7.3";
url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
sha256 = "1ai9qsrgiwd371pyqr3mjaddaczly5d1z68r4lxl3hrkz2vmv39c";
sha256 = "0fkd22v2vm3ml76x1ngg42byvmry24xb92vpl4j84zhw6wbq0jnj";
};
};
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "3.11";
version = "3.13";
url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
sha256 = "0zlhkz6aybkr9jg8za9x56fp92q10df0abadn9bsa8ryparr5d15";
sha256 = "1m5v854r5wgw68b97j6wim1a8692x5sih25c0xp1yb13a94dg187";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-compholio/wine-staging/releases
inherit (unstable) version;
sha256 = "0si6mvva4li6cix2p43dgpdg297642l0vipaam0ng4rmgpr92jrf";
sha256 = "0996gsiqawp24dq8qpff2cpqm8w9d0pxf537bgdbhjncn88xjwhr";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
@ -56,8 +56,8 @@ in rec {
winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
version = "20180513";
sha256 = "0ijjqvx2110mfcfyj3rvw53phqbay91vsp5ncv40szx0d259jbw4";
version = "20180603";
sha256 = "02valprlb64cc40ivd8sxgxy2hsgqn22s49a47inl6pknj5nmvar";
owner = "Winetricks";
repo = "winetricks";
rev = version;

6
pkgs/misc/themes/plano/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "plano-theme-${version}";
version = "3.28-1";
version = "3.28-2";
src = fetchFromGitHub {
owner = "lassekongo83";
repo = "plano-theme";
rev = "v${version}";
sha256 = "1862nx7c8786vfa0qdg4aqa13whsk3j5n93v9m91wpccv19n0ryn";
sha256 = "1xd8xpd8pxxsx6nqrxv2scm9fy6vig8qyxdydgkzhpscrjg9iq9f";
};
buildInputs = [ gdk_pixbuf gtk_engines ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -dm 755 $out/share/themes/Plano
cp -a * $out/share/themes/Plano/
rm $out/share/themes/Plano/{LICENSE,README.md}
rm $out/share/themes/Plano/LICENSE
'';
meta = {

2
pkgs/os-specific/linux/checkpolicy/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a"
];
meta = libsepol.meta // {
meta = removeAttrs libsepol.meta ["outputsToInstall"] // {
description = "SELinux policy compiler";
};
}

6
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -1,13 +1,13 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec {
version = "4.18-rc6";
modDirVersion = "4.18.0-rc6";
version = "4.18-rc7";
modDirVersion = "4.18.0-rc7";
extraMeta.branch = "4.18";
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "18xz3pk8z87lk85s6q69ia1n4z03hif7yscnl6j8z85fjycwvf6b";
sha256 = "005kk7rxawkka60y31a5aiqrq3w6i1k27b5n2lcq63agjcxh54rq";
};
# Should the testing kernels ever be built on Hydra?

2
pkgs/os-specific/linux/libselinux/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
installTargets = [ "install" ] ++ optional enablePython "install-pywrap";
meta = libsepol.meta // {
meta = removeAttrs libsepol.meta ["outputsToInstall"] // {
description = "SELinux core library";
};
}

2
pkgs/os-specific/linux/libsemanage/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];
meta = libsepol.meta // {
meta = removeAttrs libsepol.meta ["outputsToInstall"] // {
description = "Policy management tools for SELinux";
license = stdenv.lib.licenses.lgpl21;
};

23
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "0.73.2";
version = "0.74.0";
components = {
"abode" = ps: with ps; [ ];
"ads" = ps: with ps; [ ];
@ -16,6 +16,7 @@
"alarm_control_panel.demo" = ps: with ps; [ ];
"alarm_control_panel.egardia" = ps: with ps; [ ];
"alarm_control_panel.envisalink" = ps: with ps; [ ];
"alarm_control_panel.homematicip_cloud" = ps: with ps; [ ];
"alarm_control_panel.ialarm" = ps: with ps; [ ];
"alarm_control_panel.ifttt" = ps: with ps; [ ];
"alarm_control_panel.manual" = ps: with ps; [ ];
@ -45,7 +46,7 @@
"asterisk_mbox" = ps: with ps; [ ];
"august" = ps: with ps; [ ];
"auth" = ps: with ps; [ aiohttp-cors ];
"auth.client" = ps: with ps; [ ];
"auth.indieauth" = ps: with ps; [ ];
"automation" = ps: with ps; [ ];
"automation.event" = ps: with ps; [ ];
"automation.homeassistant" = ps: with ps; [ ];
@ -181,6 +182,7 @@
"camera.netatmo" = ps: with ps; [ ];
"camera.onvif" = ps: with ps; [ ha-ffmpeg ];
"camera.proxy" = ps: with ps; [ pillow ];
"camera.push" = ps: with ps; [ ];
"camera.ring" = ps: with ps; [ ha-ffmpeg ];
"camera.rpi_camera" = ps: with ps; [ ];
"camera.skybell" = ps: with ps; [ ];
@ -237,9 +239,12 @@
"cloud.const" = ps: with ps; [ ];
"cloud.http_api" = ps: with ps; [ ];
"cloud.iot" = ps: with ps; [ ];
"cloudflare" = ps: with ps; [ ];
"coinbase" = ps: with ps; [ ];
"comfoconnect" = ps: with ps; [ ];
"config" = ps: with ps; [ aiohttp-cors ];
"config.auth" = ps: with ps; [ ];
"config.auth_provider_homeassistant" = ps: with ps; [ ];
"config.automation" = ps: with ps; [ ];
"config.config_entries" = ps: with ps; [ voluptuous-serialize ];
"config.core" = ps: with ps; [ ];
@ -384,7 +389,7 @@
"frontend" = ps: with ps; [ aiohttp-cors ];
"gc100" = ps: with ps; [ ];
"goalfeed" = ps: with ps; [ ];
"google" = ps: with ps; [ google_api_python_client oauth2client ];
"google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
"google_assistant" = ps: with ps; [ aiohttp-cors ];
"google_assistant.auth" = ps: with ps; [ ];
"google_assistant.const" = ps: with ps; [ ];
@ -408,6 +413,11 @@
"homekit_controller" = ps: with ps; [ ];
"homematic" = ps: with ps; [ pyhomematic ];
"homematicip_cloud" = ps: with ps; [ ];
"homematicip_cloud.config_flow" = ps: with ps; [ ];
"homematicip_cloud.const" = ps: with ps; [ ];
"homematicip_cloud.device" = ps: with ps; [ ];
"homematicip_cloud.errors" = ps: with ps; [ ];
"homematicip_cloud.hap" = ps: with ps; [ ];
"http" = ps: with ps; [ aiohttp-cors ];
"http.auth" = ps: with ps; [ ];
"http.ban" = ps: with ps; [ ];
@ -515,6 +525,7 @@
"light.tikteck" = ps: with ps; [ ];
"light.tplink" = ps: with ps; [ ];
"light.tradfri" = ps: with ps; [ ];
"light.tuya" = ps: with ps; [ ];
"light.velbus" = ps: with ps; [ ];
"light.vera" = ps: with ps; [ ];
"light.wemo" = ps: with ps; [ ];
@ -711,6 +722,9 @@
"nuheat" = ps: with ps; [ ];
"nuimo_controller" = ps: with ps; [ ];
"octoprint" = ps: with ps; [ ];
"onboarding" = ps: with ps; [ aiohttp-cors ];
"onboarding.const" = ps: with ps; [ ];
"onboarding.views" = ps: with ps; [ ];
"panel_custom" = ps: with ps; [ aiohttp-cors ];
"panel_iframe" = ps: with ps; [ aiohttp-cors ];
"persistent_notification" = ps: with ps; [ ];
@ -812,6 +826,7 @@
"sensor.dsmr" = ps: with ps; [ ];
"sensor.dte_energy_bridge" = ps: with ps; [ ];
"sensor.dublin_bus_transport" = ps: with ps; [ ];
"sensor.duke_energy" = ps: with ps; [ ];
"sensor.dwd_weather_warnings" = ps: with ps; [ ];
"sensor.dweet" = ps: with ps; [ ];
"sensor.dyson" = ps: with ps; [ ];
@ -1123,6 +1138,7 @@
"switch.toon" = ps: with ps; [ ];
"switch.tplink" = ps: with ps; [ ];
"switch.transmission" = ps: with ps; [ transmissionrpc ];
"switch.tuya" = ps: with ps; [ ];
"switch.upcloud" = ps: with ps; [ ];
"switch.velbus" = ps: with ps; [ ];
"switch.vera" = ps: with ps; [ ];
@ -1165,6 +1181,7 @@
"tts.picotts" = ps: with ps; [ ];
"tts.voicerss" = ps: with ps; [ ];
"tts.yandextts" = ps: with ps; [ ];
"tuya" = ps: with ps; [ ];
"twilio" = ps: with ps; [ aiohttp-cors twilio ];
"upcloud" = ps: with ps; [ ];
"updater" = ps: with ps; [ distro ];

10
pkgs/servers/home-assistant/default.nix
View File

@ -1,6 +1,12 @@
{ lib, fetchFromGitHub, python3
# Look up dependencies of specified components in component-packages.nix
, extraComponents ? []
# Additional packages to add to propagatedBuildInputs
, extraPackages ? ps: []
# Skip pip install of required packages on startup
, skipPip ? true }:
let
@ -68,7 +74,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "0.73.2";
hassVersion = "0.74.0";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -83,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "home-assistant";
rev = version;
sha256 = "1hfxwm49hgikdh827jnlzgfz9h51rjz1gm841f5iz1vwz301l6sk";
sha256 = "05njkzh4hwz3vbxq2j98znnk8yzs9zkzcd4d99qwcw2hn9kdc385";
};
propagatedBuildInputs = [

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "home-assistant-frontend";
version = "20180708.0";
version = "20180720.0";
src = fetchPypi {
inherit pname version;
sha256 = "e1b068a21b26ffdc50aad2baef65b94a2f43a4df7b0d5970374d4300e93745f8";
sha256 = "4a9d570cfc1d6b0e4b914897197d6772d48aa38b10202a648e79c5fb2a6a0293";
};
propagatedBuildInputs = [ user-agents ];

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@ -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" ];

4
pkgs/tools/misc/pspg/default.nix
View File

@ -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 ];

38
pkgs/tools/networking/httperf/default.nix Normal file
View File

@ -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;
};
}

7
pkgs/top-level/all-packages.nix
View File

@ -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 { };
@ -18278,10 +18280,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; };

4
pkgs/top-level/ocaml-packages.nix
View File

@ -689,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 { };

8
pkgs/top-level/php-packages.nix
View File

@ -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" ];

19
pkgs/top-level/python-packages.nix
View File

@ -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 {};