Merge branch 'master' into staging-next

Hydra: ?compare=1474536
This commit is contained in:
Vladimír Čunát 2018-08-20 09:15:11 +02:00
commit 153a19df05
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
187 changed files with 3389 additions and 1528 deletions

View File

@ -15,13 +15,17 @@ stdenv.mkDerivation {
buildPhase = "ant";
}
</programlisting>
Note that <varname>jdk</varname> is an alias for the OpenJDK.
</para>
Note that <varname>jdk</varname> is an alias for the OpenJDK (self-built
where available, or pre-built via Zulu).
Platforms with OpenJDK not (yet) in Nixpkgs (<literal>Aarch32</literal>,
<literal>Aarch64</literal>) point to the (unfree)
<literal>oraclejdk</literal>.
</para>
<para>
JAR files that are intended to be used by other packages should be installed
in <filename>$out/share/java</filename>. The OpenJDK has a stdenv setup hook
that adds any JARs in the <filename>share/java</filename> directories of the
in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook
that add any JARs in the <filename>share/java</filename> directories of the
build inputs to the <envar>CLASSPATH</envar> environment variable. For
instance, if the package <literal>libfoo</literal> installs a JAR named
<filename>foo.jar</filename> in its <filename>share/java</filename>
@ -57,7 +61,18 @@ installPhase =
<literal>${jre}/bin/java</literal> instead of
<literal>${jdk}/bin/java</literal>, you prevent your package from depending
on the JDK at runtime.
</para>
</para>
<para>
Note all JDKs passthru <literal>home</literal>, so if your application
requires environment variables like <envar>JAVA_HOME</envar> being set, that
can be done in a generic fashion with the <literal>--set</literal> argument
of <literal>makeWrapper</literal>:
<programlisting>
--set JAVA_HOME ${jdk.home}
</programlisting>
</para>
<para>
It is possible to use a different Java compiler than <command>javac</command>

View File

@ -654,6 +654,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "wxWindows Library Licence, Version 3.1";
};
xfig = {
fullName = "xfig";
url = "http://mcj.sourceforge.net/authors.html#xfig";
};
zlib = spdx {
spdxId = "Zlib";
fullName = "zlib License";

View File

@ -1590,6 +1590,11 @@
github = "havvy";
name = "Ryan Scheel";
};
hax404 = {
email = "hax404foogit@hax404.de";
github = "hax404";
name = "Georg Haas";
};
hbunke = {
email = "bunke.hendrik@gmail.com";
github = "hbunke";
@ -1935,6 +1940,11 @@
github = "jonafato";
name = "Jon Banafato";
};
jonathanreeve = {
email = "jon.reeve@gmail.com";
github = "JonathanReeve";
name = "Jonathan Reeve";
};
joncojonathan = {
email = "joncojonathan@gmail.com";
github = "joncojonathan";

View File

@ -6,16 +6,30 @@ let
cfg = config.services.thermald;
in {
###### interface
options = {
services.thermald = {
options = {
services.thermald = {
enable = mkOption {
default = false;
description = ''
Whether to enable thermald, the temperature management daemon.
'';
};
};
};
'';
};
debug = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable debug logging.
'';
};
configFile = mkOption {
type = types.nullOr types.path;
default = null;
description = "the thermald manual configuration file.";
};
};
};
###### implementation
config = mkIf cfg.enable {
@ -24,7 +38,15 @@ in {
systemd.services.thermald = {
description = "Thermal Daemon Service";
wantedBy = [ "multi-user.target" ];
script = "exec ${pkgs.thermald}/sbin/thermald --no-daemon --dbus-enable";
serviceConfig = {
ExecStart = ''
${pkgs.thermald}/sbin/thermald \
--no-daemon \
${optionalString cfg.debug "--loglevel=debug"} \
${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \
--dbus-enable
'';
};
};
};
}

View File

@ -88,7 +88,7 @@ in
};
maxJobs = mkOption {
type = types.int;
type = types.either types.int (types.enum ["auto"]);
default = 1;
example = 64;
description = ''

View File

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "0.9.14";
version = "0.9.15";
name = "drumgizmo-${version}";
src = fetchurl {
url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4";
sha256 = "13bgqyw74pq3ss63zd9bjmgr4dah792pcphyqmr7bnvrgfjr6bx6";
};
configureFlags = [ "--enable-lv2" ];

View File

@ -2,13 +2,13 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
version = "4.0.17";
version = "4.0.18";
pname = "fldigi";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "1z8w0dxfc2nm1iy1vv18s5s88ys9vvbqawjvhsymxj56jqjzzp4q";
sha256 = "0a3z9xj9gsa6fskiai9410kwqfb6156km59y36a31mhyddzk27p7";
};
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "ir.lv2-${version}";
version = "1.2.3";
version = "1.2.4";
src = fetchFromGitHub {
owner = "tomszilagyi";
repo = "ir.lv2";
rev = "${version}";
sha256 = "16vy06qb0vgwg4yx15grzh5m2q3cbzm3jd0p37g2qb8rgvjhladg";
sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6";
};
buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
mkdir "$out/include"
mkdir -p "$out/share/doc"
make PREFIX="$out" install
make PREFIX="$out" INSTDIR="$out/lib/lv2" install
install -Dm755 convert4chan "$out/bin/convert4chan"
'';

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "musescore-${version}";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${version}";
sha256 = "00inrw9g8g34g74bhg5gp0rr5nydhjraiyn7vpl7kaqi5yzmhawd";
sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1";
};
cmakeFlags = [

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
version = "0.5.1";
version = "0.5.2";
name = "qmidinet-${version}";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
sha256 = "1cvz8y63vdqfpxh7lq5qadqjcyhahbyq0py0qz6xrmpk5sxvy7ml";
sha256 = "0y2w3rymvc35r291sp2qaxn36wjwvxzk2iaw9y30q9fqc0vlpdns";
};
hardeningDisable = [ "format" ];

View File

@ -3,12 +3,12 @@
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
version = "20180803";
version = "20180812";
name = "x42-plugins-${version}";
src = fetchurl {
url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz";
sha256 = "1v7p6vnkcbzyvmcysabhmn603cndzx9mwzaw5dppy4wd687vhgis";
sha256 = "0gzwzxpa2k2w9c6j3pspwi9slfyd57wb192d6yqcg92pfmnxy9dz";
};
nativeBuildInputs = [ pkgconfig ];

View File

@ -18,9 +18,9 @@ let
sha256Hash = "016nyn1pqviy089hg0dq7m4cqb39fdxdcy4zknkaq7dmgv1dj6x9";
};
latestVersion = { # canary & dev
version = "3.3.0.4"; # "Android Studio 3.3 Canary 5"
build = "182.4928781";
sha256Hash = "110gh5ylgf1p8z0rdnvc6clkq3v721v6pjvll66a8v4zgz9ay8b4";
version = "3.3.0.5"; # "Android Studio 3.3 Canary 6"
build = "182.4954005";
sha256Hash = "0b8ias75f3p5nrmgp7iqz4n4r4dbwhgagqmyc1fqfd36wbglyaf4";
};
in rec {
# Old alias

View File

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

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv
{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv
, libuv, luaPackages, ncurses, pkgconfig
, unibilium, xsel, gperf
, libvterm-neovim
@ -25,7 +25,7 @@ let
buildInputs = [
libtermkey
libuv
libmsgpack
msgpack
ncurses
libvterm-neovim
unibilium

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper
, libmsgpack, neovim, pythonPackages, qtbase }:
, msgpack, neovim, pythonPackages, qtbase }:
stdenv.mkDerivation rec {
name = "neovim-qt-${version}";
@ -13,12 +13,11 @@ stdenv.mkDerivation rec {
};
cmakeFlags = [
"-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include"
"-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so"
"-DUSE_SYSTEM_MSGPACK=1"
];
buildInputs = with pythonPackages; [
neovim qtbase libmsgpack
neovim qtbase msgpack
] ++ (with pythonPackages; [
jinja2 msgpack python
]);
@ -28,13 +27,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preConfigure = ''
# avoid cmake trying to download libmsgpack
echo "" > third-party/CMakeLists.txt
# we rip out a number of tests that fail in the build env
# the GUI tests will never work but the others should - they did before neovim 0.2.0
# was released
sed -i test/CMakeLists.txt \
-e '/^add_xtest_gui/d' \
-e '/tst_neovimobject/d' \
-e '/tst_neovimconnector/d' \
-e '/tst_callallmethods/d' \
-e '/tst_encoding/d'
@ -42,7 +40,14 @@ stdenv.mkDerivation rec {
doCheck = true;
postInstall = ''
postInstall = if stdenv.isDarwin then ''
mkdir -p $out/Applications
mv $out/bin/nvim-qt.app $out/Applications
rmdir $out/bin || :
wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \
--prefix PATH : "${neovim}/bin"
'' else ''
wrapProgram "$out/bin/nvim-qt" \
--prefix PATH : "${neovim}/bin"
'';

View File

@ -4,16 +4,16 @@
stdenv.mkDerivation rec {
name = "okteta-${version}";
version = "17.12.3";
version = "0.25.2";
src = fetchurl {
url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz";
sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
sha256 = "00mw8gdqvn6vn6ir6kqnp7xi3lpn6iyp4f5aknxwq6mdcxgjmh1p";
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
buildInputs = [ shared-mime-info ];
propagatedBuildInputs = [
kconfig
kinit
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
karchive
kcrash
];
meta = with stdenv.lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg bkchr ];

View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem,
gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }:
let
version = "1.26.0";
version = "1.26.1";
channel = "stable";
plat = {
@ -12,9 +12,9 @@ let
}.${stdenv.system};
sha256 = {
"i686-linux" = "fd150bee8e1be4f5461013b8fee19f855200d046643e4ea5387aad170ad5f12b";
"x86_64-linux" = "618ca429e23777ef6b512c0cbd78bc711a7cf6f58752d9f805ced1dc62abb8f0";
"x86_64-darwin" = "07c2d678596e4e1f0bdf35b7d72a6d46851bf169d89f134fa73ff4f9007efbc3";
"i686-linux" = "1g7kqbz6mrf8ngx2bnwpi9fifq5rjznxgsgwjb532z3nh92ypa8n";
"x86_64-linux" = "02yldycakn5zxj1ji4nmhdyazqlkjqpzdj3g8j501c3j28pgiwjy";
"x86_64-darwin" = "0pnsfkh20mj7pzqw7wlfd98jqc6a1mnsq1iira15n7fafqgj8zpl";
}.${stdenv.system};
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
@ -49,8 +49,8 @@ in
};
buildInputs = if stdenv.system == "x86_64-darwin"
then [ unzip makeWrapper libXScrnSaver libsecret ]
else [ makeWrapper libXScrnSaver libxkbfile libsecret ];
then [ unzip libXScrnSaver libsecret ]
else [ wrapGAppsHook libXScrnSaver libxkbfile libsecret ];
installPhase =
if stdenv.system == "x86_64-darwin" then ''

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "avocode-${version}";
version = "3.2.0";
version = "3.4.0";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "111kcjqm8j2v941m2ly4ahhxalylnsvy5zmclj1f490japz2h1xy";
sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [

View File

@ -0,0 +1,25 @@
{ stdenv, fetchurl, ghostscript, libpng } :
let
version = "3.2.7a";
in stdenv.mkDerivation {
name = "fig2dev-${version}";
src = fetchurl {
url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
sha256 = "0a7vkfl38fvkhg3na5gr9c4fskas9wbs84y9djg85nzwbshik8mx";
};
buildInputs = [ libpng ];
GSEXE="${ghostscript}/bin/gs";
meta = with stdenv.lib; {
description = "Tool to convert Xfig files to other formats";
homepage = http://mcj.sourceforge.net/;
license = licenses.xfig;
platforms = platforms.linux;
};
}

View File

@ -1,28 +0,0 @@
source $stdenv/setup
makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man"
# We need chmod +wx on dirs, not just chmod +w
dontMakeSourcesWritable=1
postUnpack() {
find . -type d -exec chmod +x '{}' \;
}
preBuild() {
echo "#define XAW3D" >> Imakefile.tmp
echo "#define XAW3D1_5E" >> Imakefile.tmp
cat Imakefile >> Imakefile.tmp
mv Imakefile.tmp Imakefile
xmkmf
sed -e 's@[$][$]m@-- &@g' -i Makefile
}
installPhase() {
make install.all $makeFlags
wrapProgram $out/bin/xfig \
--set XAPPLRESDIR $out/etc/X11/app-defaults
}
genericBuild

View File

@ -1,47 +1,42 @@
{ stdenv, fetchurl, makeWrapper, imake
, xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:
{ stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm
, libXmu, libXi, libXp, Xaw3d, fig2dev
}:
let version = "3.2.5b"; in
stdenv.mkDerivation {
let
version = "3.2.7a";
in stdenv.mkDerivation {
name = "xfig-${version}";
src = fetchurl {
url = "mirror://sourceforge/mcj/xfig.${version}.full.tar.gz";
sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw";
url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";
sha256 = "096zgp0bqnxhgxbrv2jjylrjz3pr4da0xxznlk2z7ffxr5pri2fa";
};
builder = ./builder.sh;
postPatch = ''
sed -i 's:"fig2dev":"${fig2dev}/bin/fig2dev":' src/main.c
'';
buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
postInstall = ''
mkdir -p $out/share/X11/app-defaults
cp app-defaults/* $out/share/X11/app-defaults
nativeBuildInputs = [ imake makeWrapper ];
wrapProgram $out/bin/xfig \
--set XAPPLRESDIR $out/share/X11/app-defaults
'';
hardeningDisable = [ "format" ];
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11";
nativeBuildInputs = [ makeWrapper ];
patches =
let
debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3";
in
[
(fetchurl {
url = "${debPrefix}/35_CVE-2010-4262.patch";
sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5";
})
(fetchurl {
url = "${debPrefix}/13_remove_extra_libs.patch";
sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av";
})
(fetchurl {
url = "${debPrefix}/36_libpng15.patch";
sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn";
})
];
buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d ];
meta = {
meta = with stdenv.lib; {
description = "An interactive drawing tool for X11";
homepage = http://xfig.org;
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
longDescription = ''
Note that you need to have the <literal>netpbm</literal> tools
in your path to export bitmaps.
'';
inherit (fig2dev.meta) license homepage platforms;
};
}

View File

@ -77,6 +77,7 @@ let
calendarsupport = callPackage ./calendarsupport.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
dragon = callPackage ./dragon.nix {};
eventviews = callPackage ./eventviews.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};

View File

@ -0,0 +1,25 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
baloo, baloo-widgets, kactivities, kbookmarks, kcmutils,
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
kparts, ktexteditor, kwindowsystem, phonon, solid, phonon-backend-gstreamer
}:
mkDerivation {
name = "dragon";
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];
description = "A simple media player for KDE";
maintainers = [ lib.maintainers.jonathanreeve ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
phonon solid phonon-backend-gstreamer
];
outputs = [ "out" "dev" ];
}

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "chirp-daily-${version}";
version = "20180707";
version = "20180815";
src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
sha256 = "09siq74k0ss65ssck7i7h515dxp7fhdz5klc3y0yp9wajn706ic3";
sha256 = "0z3jh9sbszs8x0xjmkgxa3b1xnw3w9b13pml4i5apx3mj171npyv";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -7,7 +7,7 @@
let
inherit (pythonPackages) python buildPythonApplication;
in buildPythonApplication rec {
version = "4.2.8";
version = "5.0.0";
name = "gramps-${version}";
nativeBuildInputs = [ wrapGAppsHook ];
@ -20,7 +20,7 @@ in buildPythonApplication rec {
owner = "gramps-project";
repo = "gramps";
rev = "v${version}";
sha256 = "17y6rjvvcz7lwjck4f5nmhnn07i9k5vzk5dp1jk7j3ldxjagscsd";
sha256 = "056l4ihmd3gdsiv6wwv4ckgh8bfzd5nii6z4afsdn2nmjbj4hw9m";
};
pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ];

View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hugo-${version}";
version = "0.46";
version = "0.47";
goPackagePath = "github.com/gohugoio/hugo";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
sha256 = "0w5xkb6s03hprb4v151gdk8zzsgvy0i406363j1w03bic8ajwgmj";
sha256 = "1h62ix285mx977mgawyanyvsqqic1xx0gmi1r5wn43w9yc29wr0z";
};
goDeps = ./deps.nix;

View File

@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
@ -149,8 +149,8 @@
fetch = {
type = "git";
url = "https://github.com/gobwas/glob";
rev = "f00a7392b43971b2fdb562418faab1f18da2067a";
sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29";
rev = "f756513aec94125582ee6c0dc94179251ef87370";
sha256 = "1pyzlvb950864syf2safazv39s7rpi08r7x2vby82kj9ykqgvhc4";
};
}
{
@ -158,8 +158,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71";
sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7";
rev = "3ff3320c2a1756a3691521efc290b4701575147c";
sha256 = "1b0kpix2qxv3qiiq739nk9fjh453if0mcpr9gmlizicdpjp5alw2";
};
}
{
@ -284,8 +284,8 @@
fetch = {
type = "git";
url = "https://github.com/nicksnyder/go-i18n";
rev = "461e8b98df7454b4cb46a1611a6734f05ee331d0";
sha256 = "0aq1q06y6azsi6mfmary5xs7gmmg8fh8lhx1wbpdlqk11asm9rq0";
rev = "04f547cc50da4c144c5fdfd4495aef143637a236";
sha256 = "1h4ndn822k7i04h9k5dxm6c29mhhhqhl63vzpmz2l1k0zpj7xyd1";
};
}
{
@ -311,8 +311,8 @@
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
rev = "11635eb403ff09dbc3a6b5a007ab5ab09151c229";
sha256 = "14j8ibm6h9rydiwfp9b5c7rwhnx04yqyxv1a7p7rmfwyg4zd714n";
rev = "46c73eb196baff5bb07288f245b223bd1a30fba6";
sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj";
};
}
{
@ -365,8 +365,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
rev = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2";
sha256 = "1f9154lijbz0kkgqwmbphykwl4adv4fvkx6n1p7fdq3x5j9g8i17";
};
}
{
@ -383,8 +383,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
rev = "947b89bd1b7dabfed991ac30e1a56f5193f0c88b";
sha256 = "0n4h5cb07n96fcw9k8dwnj6yisf2x357lsiwjmrq6xr1vkzdlk8c";
};
}
{
@ -392,8 +392,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793";
sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh";
rev = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9";
sha256 = "177ziws6mwxdlvicmgpv7w7zy5ri2wgnw2f2v3789b5skv9d6a6b";
};
}
{
@ -401,8 +401,8 @@
fetch = {
type = "git";
url = "https://github.com/tdewolff/minify";
rev = "cf3a1790b606e292e4a0ee82e949a4f0d1c7617d";
sha256 = "1r496149l5iqzxkfcbll5dqcqxy4a7jjxvzm62c8hrybmwj574kn";
rev = "948b6490cf3cacab5f4d7474104c3d21bf6eda46";
sha256 = "1js5l0405kbic53qgim0lj3crw7cc2a2sbga35h9qcnm8l3cx22f";
};
}
{
@ -410,8 +410,8 @@
fetch = {
type = "git";
url = "https://github.com/tdewolff/parse";
rev = "4ceb50b40fad068875f5b093c5df0619012dc544";
sha256 = "1ap76hdiabn41r7zxc7nq3n3ld7zqf97jaf71zlzzjrphi3fwrg1";
rev = "dd9676af8dd934a61082c5b3038e79626847fa32";
sha256 = "1hp9qh8knx3q57aw5qavsf7ia3mxm8ka0bk6kjkqkqq8k9jq97qk";
};
}
{
@ -446,8 +446,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "f4c29de78a2a91c00474a2e689954305c350adf9";
sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x";
rev = "aaf60122140d3fcf75376d319f0554393160eb50";
sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv";
};
}
{
@ -464,8 +464,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "3dc4335d56c789b04b0ba99b7a37249d9b614314";
sha256 = "1105b7jqzz8g2bfkdbkj2pdzq4vhfmhm42khir88vjqfd1l7ha31";
rev = "1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded";
sha256 = "0g0nc549pmdmvja4mdqh0kgvznnw6wliqmx5wrnj02l3a23vizmi";
};
}
{
@ -473,8 +473,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "96e34ec0e18a62a1e59880c7bf617b655efecb66";
sha256 = "1n1p5zz0vyvlhac40hxml6c5xwpsw8rjx1pbls9381a0s19ncbdg";
rev = "6e3c4e7365ddcc329f090f96e4348398f6310088";
sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4";
};
}
{

View File

@ -6,13 +6,13 @@
let
pname = "krusader";
version = "2.7.0";
version = "2.7.1";
in mkDerivation rec {
name = "krusader-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
sha256 = "09ws3samxnjk0qi9pcfm2rmw0nr5mzn9pzpljgrdb5qj7cmm4hcb";
sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm";
};
meta = with lib; {

View File

@ -0,0 +1,54 @@
{ stdenv, fetchurl, qtbase, qmake, makeDesktopItem, openjpeg, pkgconfig, fftw,
libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }:
stdenv.mkDerivation rec {
version = "9.2.6";
name = "qsstv-${version}";
src = fetchurl {
url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz";
sha256 = "0sx70yk389fq5djvjwnam6ics5knmg9b5x608bk2sjbfxkila108";
};
enableParallelBuilding = true;
nativeBuildInputs = [
qmake
pkgconfig
];
buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l
fftwFloat ];
desktopItem = makeDesktopItem {
name = "QSSTV";
exec = "qsstv";
icon = "qsstv.png";
comment = "Qt-based slow-scan TV and fax";
desktopName = "QSSTV";
genericName = "qsstv";
categories = "Application;HamRadio;";
};
installPhase = ''
# Install binary to the right location
make install INSTALL_ROOT=$out
mv $out/usr/bin $out/
rm -r $out/usr
# Install desktop icon
install -D qsstv/icons/qsstv.png $out/share/pixmaps/qsstv.png
# Install desktop item
cp -rv ${desktopItem}/share $out
'';
meta = with stdenv.lib; {
description = "Qt-based slow-scan TV and fax";
homepage = http://users.telenet.be/on4qz/;
platforms = platforms.linux;
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ hax404 ];
};
}

View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "193sz96jrygixgzkaxx1vrpkhmnr6c7yzhsvv4p1qn0jymh2xd57";
sha256bin64 = "0wwmfsxbphxqfw4g6jgxlr0p32vjf4h8yfd5zz36xpa79dryb8sv";
version = "68.0.3440.68";
sha256 = "0w5k1446j45796vj8p6kv5cdrkrxyr7rh8d8vavplfldbvg36bdw";
sha256bin64 = "0a7gmbcps3b85rhwgrvg41m9db2n3igwr4hncm7kcqnq5hr60v8s";
version = "69.0.3497.32";
};
dev = {
sha256 = "102lqnl2m9cbcql6sghib1504fyicx7cgv0jkfx863jpzhrfrkcv";
sha256bin64 = "1y3iy25b3cck7kz5g913z64x1wdj1znqbn049g8h82x3krp76bgx";
version = "69.0.3497.12";
sha256 = "15gk2jbjv3iy4hg4xm1f66x5jqfqh9f98wfzrcsd5ix3ki3f9g3c";
sha256bin64 = "1lir6q31dnjsbrz99bfx74r5j6f0c1a443ky1k0idbx6ysvr8nnm";
version = "70.0.3521.2";
};
stable = {
sha256 = "0hcmnn72xj9p3y77cb6cnr1vz81hiqmksdi6nw7xqfw5cwr7h5yw";
sha256bin64 = "0pa49yxj9s41mzhik7jixr4hwqanf31yzr1fsc6y5hkadbj7rwij";
version = "68.0.3440.75";
sha256 = "1676y2axl5ihvv8jid2i9wp4i4awxzij5nwvd5zx98506l3088bh";
sha256bin64 = "0d352maw1630g0hns3c0g0n95bp5iqh7nzs8bnv48kxz87snmpdj";
version = "68.0.3440.106";
};
}

View File

@ -1,7 +1,7 @@
{ callPackage, stdenv }:
let
stableVersion = "2.1.7";
stableVersion = "2.1.9";
# Currently there is no preview version.
previewVersion = stableVersion;
addVersion = args:
@ -10,8 +10,8 @@ let
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
guiSrcHash = "10zf429zjzf7v4y9r7mmkp42kh5ppmqinhvwqzb7jmsrpv2cnxj6";
serverSrcHash = "056swz6ygqdi37asah51v1yy0ky8q0p32vf7dxs697hd7nv78aqj";
guiSrcHash = "0gpif6f7zqz2n8q3pkr8xv3fdc904hq69661w8f1fna360xvksd7";
serverSrcHash = "1y19jzyyz0sjjxkrpgr6z10irb47v7d8khdvk5nzmgnjfxv875yx";
in {
guiStable = mkGui {
stable = true;

View File

@ -4,6 +4,16 @@
let
pythonPackages = python3Packages;
async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout
(oldAttrs:
rec {
pname = "async-timeout";
version = "2.0.1";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0";
};
}));
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
(oldAttrs:
rec {
@ -13,6 +23,9 @@ let
inherit pname version;
sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
};
propagatedBuildInputs = [ async-timeout ]
++ (with pythonPackages; [ attrs chardet multidict yarl ])
++ stdenv.lib.optional (pythonPackages.pythonOlder "3.7") pythonPackages.idna-ssl;
}));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
(oldAttrs:

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
stdenv.mkDerivation rec {
name = "quaternion-${version}";
@ -11,10 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib";
};
buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];
buildInputs = [ qtbase qtquickcontrols ];
nativeBuildInputs = [ cmake ];
patches = [
# https://github.com/QMatrixClient/Quaternion/pull/400
(fetchpatch {
url = "https://github.com/QMatrixClient/Quaternion/commit/6cb29834efc343dc2bcf1db62cfad2dc4c121c54.patch";
sha256 = "0n7mgzzrvx9sa657rfb99i0mjh1k0sn5br344mknqy3wgqdr7s3x";
})
];
# libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet
# https://github.com/QMatrixClient/Quaternion/issues/239
postPatch = ''
@ -22,7 +30,11 @@ stdenv.mkDerivation rec {
ln -s ${libqmatrixclient.src} lib
'';
postInstall = ''
postInstall = if stdenv.isDarwin then ''
mkdir -p $out/Applications
mv $out/bin/quaternion.app $out/Applications
rmdir $out/bin || :
'' else ''
substituteInPlace $out/share/applications/quaternion.desktop \
--replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
'';

View File

@ -20,7 +20,7 @@
, speex
, boost
, opendht
, libmsgpack
, msgpack
, gnutls
, zlib
, jsoncpp
@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
speex
boost
opendht
libmsgpack
msgpack
gnutls
zlib
jsoncpp

View File

@ -3,11 +3,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
version = "0.15.7";
version = "0.16.0";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "09sa2qcmns4b9by3hzmyppc6fi3845vppkal2ylrf2vi9yczb2ch";
sha256 = "1nl0ih5flhp57k96hv6nl5pzrm3r9piqmwzirz9nz8k9803mqp5m";
};
installPhase = ''

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, dpkg, makeWrapper
{ stdenv, fetchurl, dpkg
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3
, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }:
let
@ -68,7 +68,12 @@ in stdenv.mkDerivation {
inherit src;
buildInputs = [ dpkg makeWrapper ];
nativeBuildInputs = [
wrapGAppsHook
glib # For setup hook populating GSETTINGS_SCHEMA_PATH
];
buildInputs = [ dpkg ];
unpackPhase = "true";
installPhase = ''
@ -78,6 +83,8 @@ in stdenv.mkDerivation {
rm -rf $out/opt $out/usr
rm $out/bin/skypeforlinux
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
# Otherwise it looks "suspicious"
chmod -R g-w $out
'';
@ -88,8 +95,6 @@ in stdenv.mkDerivation {
patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
done
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
# Fix the desktop link
substituteInPlace $out/share/applications/skypeforlinux.desktop \
--replace /usr/bin/ $out/bin/ \

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qmake, pkgconfig
{ stdenv, fetchFromGitHub, qmake, pkgconfig, makeWrapper
, qtbase, qttools, qtwebkit, sqlite
}:
@ -13,9 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa";
};
nativeBuildInputs = [ qmake pkgconfig ];
nativeBuildInputs = [ qmake pkgconfig makeWrapper ];
buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
postFixup = ''
wrapProgram $out/bin/quiterss \
--prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}"
'';
meta = with stdenv.lib; {
description = "A Qt-based RSS/Atom news feed reader";
longDescription = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
version = "2.4.2";
version = "2.4.3";
src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
sha256 = "0pxga45fi7iyayy278hgl8x099isz6d7x1jq57p2m9qlsvfx8ap5";
sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk";
};
patches = [ ./find-sql.patch ];

View File

@ -3,12 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "6.7.0";
version = "6.7.1";
name = "frostwire-${version}";
src = fetchurl {
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
sha256 = "1qvk4w2ly2nz3ibsd6qdxaqb3g1a3l9f5a15b5zpzhsziln1fbxf";
sha256 = "1crhiksgky65wvb4fvqablsvixj04hbaacz23mskwrc63n4jaz0p";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig
, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
, debugSupport ? false # Debugging
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
sha256 = "1756hr92rvh4xlf6bk2wl24ypczhwf1rv1pdq05flk118jciqb05";
};
patches = [
(fetchpatch {
name = "fix-desktop-file-regression.patch";
url = "https://github.com/qbittorrent/qBittorrent/commit/078325a3eb85c286b9a3454192ed2deadeda604c.patch";
sha256 = "1xhpd4ncy2m9zxsllizkry2013ij0ii9p8b8jbb35sazw5p50c96";
})
];
# NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ pkgconfig ];

View File

@ -9,13 +9,13 @@ let
in stdenv.mkDerivation rec {
name = "resilio-sync-${version}";
version = "2.5.12";
version = "2.6.0";
src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
"x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7";
"i686-linux" = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh";
"x86_64-linux" = "0041axi9carspkfaxvyirfvsa29zz55al01x90nh93nzxvpvywsz";
"i686-linux" = "1ar36lp4f6a1z9i82g3gpak4q4ny09faqxdd59q1pvfzq25ypdhs";
}.${stdenv.system};
};

View File

@ -11,11 +11,6 @@ let
else if stdenv.system == "x86_64-darwin" then "macos64"
else throw "Unsupported system: ${stdenv.system}";
launcher = ''
#!${stdenv.shell}
exec ${jre}/bin/java -Xmx512m ${ stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''} de.willuhn.jameica.Main "$@"
'';
desktopItem = makeDesktopItem {
name = "jameica";
exec = "jameica";
@ -56,24 +51,24 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
mkdir -p $out/libexec $out/lib $out/bin $out/share/applications
mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,${name},java}/
# copy libraries except SWT
cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/lib/
cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/${name}/
# copy platform-specific SWT
cp lib/swt/${swtSystem}/swt.jar $out/lib
cp lib/swt/${swtSystem}/swt.jar $out/share/${name}/
install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/libexec/
install -Dm644 plugin.xml $out/libexec/
install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/
install -Dm644 plugin.xml $out/share/java/
install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
cp ${desktopItem}/share/applications/* $out/share/applications/
echo "${launcher}" > $out/bin/jameica
chmod +x $out/bin/jameica
wrapProgram $out/bin/jameica --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \
--set CLASSPATH "$out/libexec/jameica.jar:$out/lib/*" \
--run "cd $out/libexec"
# jameica expects its working dir set to the "program directory"
makeWrapper ${jre}/bin/java $out/bin/jameica \
--add-flags "-cp $out/share/java/jameica.jar:$out/share/${name}/* ${
stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''
} de.willuhn.jameica.Main" \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \
--run "cd $out/share/java/"
'';
meta = with stdenv.lib; {

View File

@ -6,13 +6,13 @@
mkDerivation rec {
name = "stellarium-${version}";
version = "0.18.1";
version = "0.18.2";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
sha256 = "0srwi08azzzayf50dr4dr1zcdcc8hwribzv7xvb7hbp6xp51c813";
sha256 = "17764i52dmipaz62k5n23fyx07d7cjir0dgav0s5b6sjd8gbjwbf";
};
nativeBuildInputs = [ cmake perl ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "igv-${version}";
version = "2.4.13";
version = "2.4.14";
src = fetchurl {
url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
sha256 = "0cl6fs1v9rqkzjq4syx0m1pr71hbhvidwa3ym57pvz8ardfs3qa1";
sha256 = "0z9hk01czkdgi55b0qdvvi43jsqkkx6gl7wglamv425c6rklcvhc";
};
buildInputs = [ unzip jre ];

View File

@ -0,0 +1,37 @@
{stdenv, fetchFromGitHub, cmake, zlib, python2}:
stdenv.mkDerivation rec {
name = "strelka-${version}";
version = "2.9.5";
src = fetchFromGitHub {
owner = "Illumina";
repo = "strelka";
rev = "v${version}";
sha256 = "0x4a6nkx1jnyag9svghsdjz1fz6q7qx5pn77wphdfnk81f9yspf8";
};
buildInputs = [ cmake zlib python2 ];
preConfigure = ''
sed -i 's|/usr/bin/env python|${python2}/bin/python|' src/python/lib/makeRunScript.py
patchShebangs .
'';
postFixup = ''
pushd $out/lib/python/pyflow
sed -i 's|/bin/bash|${stdenv.shell}|' pyflowTaskWrapper.py
rm pyflowTaskWrapper.pyc
echo "import pyflowTaskWrapper" | python2
popd
'';
meta = with stdenv.lib; {
description = "Germline and small variant caller";
license = licenses.gpl3;
homepage = https://github.com/Illumina/strelka;
maintainers = with maintainers; [ jbedo ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -1,17 +1,19 @@
{ stdenv, fetchurl, which, gfortran, libGLU, xorg } :
stdenv.mkDerivation rec {
version = "5.7";
version = "5.8.2";
name = "molden-${version}";
src = fetchurl {
url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
sha256 = "0gaq11gm09ax25lvgfrvxv9dxvi76hps116fp6k7sqgvdd68vf0s";
sha256 = "1lhjx8fa8xynnlk5g6ipvchhfnz6j5lgqxlsifx82pbbnbm6mps4";
};
nativeBuildInputs = [ which ];
buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ];
patches = [ ./dont_register_file_types.patch ];
postPatch = ''
substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \
--replace '-I/usr/X11R6/include' "" \

View File

@ -0,0 +1,29 @@
diff --git a/makefile b/makefile
index 58a9e74..64615b6 100644
--- a/makefile
+++ b/makefile
@@ -32,8 +32,6 @@ os :=
ifeq ($(uname), Linux)
os := $(shell head -n 1 /etc/issue | cut -d" " -f1)
ifeq ($(os), Ubuntu)
- EXTEN = exten
- EXTENZ = exten2
LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm
endif
ifeq ($(os), Debian)
@@ -278,7 +276,7 @@ LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
#
#LIBSG = -L/usr/X11R6/lib -Wl,-framework -Wl,GLUT -Wl,-framework -Wl,OpenGL -Wl,-framework -Wl,Cocoa -lGLU -lGL -lXmu -lX11 -lm
-all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf $(EXTEN)
+all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf
xwin.o: xwin.c rots.h
xwingl.o: xwin.c rots.h
@@ -344,5 +342,5 @@ exten:
exten2:
./register_extension.sh /usr/local/bin
-install: $(EXTENZ)
+install:
sudo install -t /usr/local/bin -m 755 molden gmolden ambfor/ambfor ambfor/ambmd surf/surf

View File

@ -3,7 +3,7 @@
}:
let
version = "8.1";
version = "8.2";
fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
in stdenv.mkDerivation {
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
sha256 = "0rxwvcp22364nnhwhqlr38w4rwv1yl60snxi2f8nqdflx1143n10";
sha256 = "0z74q17lzyga44m5pbsr1hmq12ly96y44pcz7glfvc4vbaq3jd8p";
};
nativeBuildInputs = [ perl procps fftw.dev ];

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem
, python3, python3Packages
, glew, freeglut, libpng, libxml2, tk, freetype, libmsgpack }:
, glew, freeglut, libpng, libxml2, tk, freetype, msgpack }:
with stdenv.lib;
@ -29,7 +29,7 @@ python3Packages.buildPythonApplication {
sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s";
};
buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype libmsgpack ];
buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype msgpack ];
NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
installPhase = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gtkwave-${version}";
version = "3.3.92";
version = "3.3.93";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
sha256 = "08916gv5vl7dgvlsq098mxljbciby9miyh8jqwn1q8sfdhzvmxak";
sha256 = "0a92zlwvshp75k7cv11rc4ab11fzsy0a5qfvxkh0bjvrq1k946ys";
};
nativeBuildInputs = [ pkgconfig ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "git-extras-${version}";
version = "4.5.0";
version = "4.6.0";
src = fetchurl {
url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
sha256 = "059680bvblbhrlkybg1yisr5zq62pir1rnaxz5izhfsw2ng9s2fb";
sha256 = "1jp5wi2h4jqbrjv0iqa45s0f9h3n5k1dxs89jkhg5n5k9jjs7fp3";
};
dontBuild = true;

View File

@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
name = "containerd-${version}";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria";
sha256 = "1rp015cm5fw9kfarcmfhfkr1sh0iz7kvqls6f8nfhwrrz5armd5v";
};
hardeningDisable = [ "fortify" ];

View File

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
description = "Linux development manual pages";
homepage = https://www.kernel.org/doc/man-pages/;
repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
license = licenses.gpl2Plus;
platforms = with platforms; unix;
priority = 30; # if a package comes with its own man page, prefer it
};

View File

@ -86,14 +86,14 @@ rec {
maintainers = with maintainers; [ mathnerd314 ];
};
};
noto-fonts-emoji = let version = "2017-09-13-design-refresh"; in stdenv.mkDerivation {
noto-fonts-emoji = let version = "2018-04-24-pistol-update"; in stdenv.mkDerivation {
name = "noto-fonts-emoji-${version}";
src = fetchFromGitHub {
owner = "googlei18n";
repo = "noto-emoji";
rev = "v${version}";
sha256 = "1ixz03207kzh6jhmw8bpi77pxkfzq46dk26sr41m5kkvc14d14vl";
sha256 = "1f9k182j0619xvwk60gw2hng3lcd483sva2fabjdhznk8yf9f7jg";
};
buildInputs = [ cairo ];

View File

@ -0,0 +1,33 @@
{ stdenv, rpmextract, fetchurl, unzip }:
stdenv.mkDerivation rec {
version = "0.701";
name = "vegur-font-${version}";
# Upstream doesn't version their URLs.
# http://dotcolon.net/font/vegur/ → http://dotcolon.net/DL/font/vegur.zip
src = fetchurl {
url = "http://download.opensuse.org/repositories/M17N:/fonts/SLE_12_SP3/src/dotcolon-vegur-fonts-0.701-1.4.src.rpm";
sha256 = "0ra3fds3b352rpzn0015km539c3l2ik2lqd5x6fr65ss9fg2xn34";
};
nativeBuildInputs = [ rpmextract unzip ];
unpackPhase = ''
rpmextract $src
unzip vegur.zip
'';
installPhase = ''
mkdir -p $out/share/fonts/Vegur
cp *.otf $out/share/fonts/Vegur
'';
meta = with stdenv.lib; {
homepage = http://dotcolon.net/font/vegur/;
description = "A humanist sans serif font.";
platforms = platforms.all;
maintainers = [ maintainers.samueldr ];
license = licenses.cc0;
};
}

View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/ed2029405786768b4c0f8bdbbd7aee8193394eb9.tar.gz";
sha256 = "0s6cbz7ylflpnqhxlpch48zb0l6xcp5501dj1qzvzldvwh46r8dc";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d5c89ad106556f7890c89c50a2b4d3fbdcea7616.tar.gz";
sha256 = "0j8r88wwf0qvqxcnwmcs6xcn4vi0189c9f5chfl80941ggxfbpxk";
}

View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
version = "1.20.7";
version = "1.21.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
sha256 = "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh";
sha256 = "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby";
};
nativeBuildInputs = [ pkgconfig ];
@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
libinput utillinux fribidi SDL2 ];
# as of 1.21.0 compilation will fail due to -Werror=format-security
hardeningDisable = [ "format" ];
# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
configureFlags = [
"--enable-sdl"

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gdm-${version}";
version = "3.28.2";
version = "3.28.3";
src = fetchurl {
url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0wdm1503x66n1crdlmzmincbd2hccpxsdgjsl5anx3yjpdzs0hb0";
sha256 = "12d1cp2dyca8rwh9y9cg8xn6grdp8nmxkkqwg4xpkr8i8ml65n88";
};
# Only needed to make it build

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "mate-themes-${version}";
version = "3.22.17";
version = "3.22.18";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/themes/${mate.getRelease version}/${name}.tar.xz";
sha256 = "1bf1swyrr5dkfsp1ihc0svr5nnwv22zxjwgmf6zhxl638ng9f41h";
sha256 = "0538bw8qismp16ymxbjk0ww7yjw1ch5v3f3d4vib3770xvgmmcfm";
};
nativeBuildInputs = [ pkgconfig intltool ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "closure-compiler-${version}";
version = "20180716";
version = "20180805";
src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
sha256 = "06yc85pbcw1v36j12qwxkk0pbhziglp3zjkv3xza2v68zvyqy6hd";
sha256 = "1jis9ykbbynq6pa8sl1jy8888l2bk9g4xsiiiab51zn62shqnq26";
};
sourceRoot = ".";

View File

@ -0,0 +1,8 @@
{ callPackage, Foundation, libobjc }:
callPackage ./generic-cmake.nix (rec {
inherit Foundation libobjc;
version = "5.14.0.177";
sha256 = "164l30fkvfgs1rh663h7dnm1yp7425bi9x2lh2y6zml8h4pgmxfl";
enableParallelBuilding = false;
})

View File

@ -1073,16 +1073,15 @@ self: super: {
# cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
# Lets remove this once the LTS has upraded to 0.29.6.
hpack = super.hpack_0_29_6;
hpack = super.hpack_0_29_7;
cabal2nix =
# The test suite does not know how to find the 'cabal2nix' binary.
overrideCabal super.cabal2nix (drv: {
preCheck = ''
export PATH="$PWD/dist/build/cabal2nix:$PATH"
export HOME="$TMPDIR/home"
'';
});
# The test suite does not know how to find the 'cabal2nix' binary.
cabal2nix = overrideCabal super.cabal2nix (drv: {
preCheck = ''
export PATH="$PWD/dist/build/cabal2nix:$PATH"
export HOME="$TMPDIR/home"
'';
});
# Break out of "aeson <1.3, temporary <1.3".
stack = doJailbreak super.stack;
@ -1122,4 +1121,10 @@ self: super: {
# https://github.com/MarcWeber/hasktags/issues/52
hasktags = dontCheck super.hasktags;
# https://github.com/haskell/hoopl/issues/50
hoopl = dontCheck super.hoopl;
# https://github.com/snapframework/xmlhtml/pull/37
xmlhtml = doJailbreak super.xmlhtml;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -46,4 +46,14 @@ self: super: {
xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; });
hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x
# Reduction stack overflow; size = 38
# https://github.com/jystic/hadoop-tools/issues/31
hadoop-rpc =
let patch = pkgs.fetchpatch
{ url = https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch;
sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp";
stripLen = 1;
};
in appendPatch super.hadoop-rpc patch;
}

View File

@ -43,7 +43,7 @@ core-packages:
default-package-overrides:
# Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
- base-compat-batteries ==0.10.1
# LTS Haskell 12.5
# LTS Haskell 12.6
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -219,7 +219,7 @@ default-package-overrides:
- auto ==0.4.3.1
- autoexporter ==1.1.10
- auto-update ==0.1.4
- avro ==0.3.3.1
- avro ==0.3.4.2
- avwx ==0.3.0.2
- backprop ==0.2.5.0
- bank-holidays-england ==0.1.0.7
@ -244,7 +244,7 @@ default-package-overrides:
- bench ==1.0.11
- bencode ==0.6.0.0
- between ==0.11.0.0
- bhoogle ==0.1.3.2
- bhoogle ==0.1.3.4
- bibtex ==0.1.0.6
- bifunctors ==5.5.3
- bimap ==0.3.3
@ -351,7 +351,7 @@ default-package-overrides:
- cast ==0.1.0.2
- category ==0.2.0.1
- cborg ==0.2.0.0
- cereal ==0.5.5.0
- cereal ==0.5.7.0
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
- cereal-time ==0.1.0.0
@ -364,7 +364,7 @@ default-package-overrides:
- chart-unit ==0.7.0.0
- chaselev-deque ==0.5.0.5
- ChasingBottoms ==1.3.1.4
- chatwork ==0.1.3.4
- chatwork ==0.1.3.5
- cheapskate ==0.1.1
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
@ -586,7 +586,7 @@ default-package-overrides:
- diagrams-rasterific ==1.4.1
- diagrams-solve ==0.1.1
- diagrams-svg ==1.4.2
- di-core ==1.0.2
- di-core ==1.0.3
- dictionary-sharing ==0.1.0.0
- di-df1 ==1.0.2
- Diff ==0.3.4
@ -787,7 +787,7 @@ default-package-overrides:
- generic-aeson ==0.2.0.9
- generic-arbitrary ==0.1.0
- generic-deriving ==1.12.2
- generic-lens ==1.0.0.1
- generic-lens ==1.0.0.2
- GenericPretty ==1.2.2
- generic-random ==1.2.0.0
- generics-eot ==0.4
@ -944,7 +944,7 @@ default-package-overrides:
- hebrew-time ==0.1.1
- hedgehog ==0.6
- hedgehog-corpus ==0.1.0
- hedis ==0.10.2
- hedis ==0.10.3
- here ==1.2.13
- heredoc ==0.2.0.0
- heterocephalus ==1.0.5.2
@ -954,7 +954,7 @@ default-package-overrides:
- hexpat ==0.20.13
- hexstring ==0.11.1
- hfsevents ==0.1.6
- hidapi ==0.1.4
- hidapi ==0.1.5
- hidden-char ==0.1.0.2
- hierarchical-clustering ==0.4.6
- hierarchy ==1.0.2
@ -1064,7 +1064,7 @@ default-package-overrides:
- hunit-dejafu ==1.2.0.6
- hvect ==0.4.0.0
- hvega ==0.1.0.3
- hw-balancedparens ==0.2.0.1
- hw-balancedparens ==0.2.0.2
- hw-bits ==0.7.0.2
- hw-conduit ==0.2.0.3
- hw-diagnostics ==0.0.0.5
@ -1098,7 +1098,7 @@ default-package-overrides:
- hybrid-vectors ==0.2.2
- hyperloglog ==0.4.2
- hyphenation ==0.7.1
- hyraxAbif ==0.2.3.5
- hyraxAbif ==0.2.3.9
- iconv ==0.4.1.3
- identicon ==0.2.2
- ieee754 ==0.8.0
@ -1676,7 +1676,7 @@ default-package-overrides:
- quicklz ==1.5.0.11
- rainbow ==0.30.0.2
- rainbox ==0.20.0.0
- rakuten ==0.1.1.4
- rakuten ==0.1.1.5
- ramus ==0.1.2
- random ==1.1
- random-bytestring ==0.1.3.1
@ -1729,7 +1729,7 @@ default-package-overrides:
- relational-query-HDBC ==0.7.1.1
- relational-record ==0.2.2.0
- relational-schemas ==0.1.6.2
- relude ==0.1.0
- relude ==0.1.1
- renderable ==0.2.0.1
- repa ==3.4.1.3
- repline ==0.1.7.0
@ -1775,9 +1775,9 @@ default-package-overrides:
- sandi ==0.4.2
- sandman ==0.2.0.1
- say ==0.1.0.0
- sbp ==2.3.16
- SCalendar ==1.1.0
- sbp ==2.3.17
- scalendar ==1.2.0
- SCalendar ==1.1.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
@ -1942,7 +1942,7 @@ default-package-overrides:
- store ==0.5.0
- store-core ==0.4.4
- Strafunski-StrategyLib ==5.0.1.0
- stratosphere ==0.24.3
- stratosphere ==0.24.4
- streaming ==0.2.1.0
- streaming-attoparsec ==1.0.0
- streaming-bytestring ==0.1.6
@ -2033,7 +2033,7 @@ default-package-overrides:
- texmath ==0.11.0.1
- text ==1.2.3.0
- text-binary ==0.2.1.1
- text-builder ==0.5.1.1
- text-builder ==0.5.3
- text-conversions ==0.3.0
- text-icu ==0.7.0.1
- text-latin1 ==0.3.1
@ -2093,7 +2093,7 @@ default-package-overrides:
- tmapchan ==0.0.3
- tmapmvar ==0.0.4
- tmp-postgres ==0.1.1.1
- tomland ==0.3
- tomland ==0.3.1
- tostring ==0.2.1.1
- transaction ==0.1.1.3
- transformers-base ==0.4.5.2
@ -2207,7 +2207,7 @@ default-package-overrides:
- verbosity ==0.2.3.0
- versions ==3.4.0.1
- ViennaRNAParser ==1.3.3
- viewprof ==0.0.0.21
- viewprof ==0.0.0.22
- vinyl ==0.8.1.1
- vivid ==0.3.0.2
- vivid-osc ==0.3.0.0
@ -2344,7 +2344,7 @@ default-package-overrides:
- yesod-static ==1.6.0
- yesod-test ==1.6.5
- yesod-text-markdown ==0.1.10
- yesod-websockets ==0.3.0
- yesod-websockets ==0.3.0.1
- yes-precure5-command ==5.5.3
- yi-language ==0.17.1
- yi-rope ==0.11

File diff suppressed because it is too large Load Diff

View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
version = "2.5.1";
version = "2.5.2";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
sha256 = "1zqq2jsaq547rm8qh8zpj36059jahsba733cwrmg6iq0c8ai4z3s";
sha256 = "0bi85gvgpwd9ndg0kiwlrp560934dzy1072zpf587vrmpvqrcps9";
};
buildInputs = [ unzip makeWrapper ];

View File

@ -152,6 +152,7 @@ let
meta = {
homepage = https://www.perl.org/;
description = "The standard implementation of the Perl 5 programmming language";
license = licenses.artistic1;
maintainers = [ maintainers.eelco ];
platforms = platforms.all;
};

View File

@ -220,8 +220,8 @@ let
in {
php71 = generic {
version = "7.1.20";
sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
version = "7.1.21";
sha256 = "104mn4kppklb21hgz1a50kgmc0ak5y996sx990xpc8yy9dbrqh62";
};
php72 = generic {

View File

@ -1,8 +1,8 @@
{ fetchurl
, version ? "2.7.6"
, sha256 ? "1sqy6z1kngq91nxmv1hw4xhw1ycwx9s76hfbpcdlgkm9haji9xv7"
, version ? "2.7.7"
, sha256 ? "1jsmmd31j8j066b83lin4bbqz19jhrirarzb41f3sjhfdjiwkcjc"
}:
fetchurl {
url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz";
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
sha256 = sha256;
}

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "arrow-cpp-${version}";
version = "0.9.0";
version = "0.10.0";
src = fetchurl {
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
};
sourceRoot = "apache-arrow-${version}/cpp";

View File

@ -10,6 +10,7 @@
, dbus
, glib
, libxml2
, fixDarwinDylibNames
, gnome3 # To pass updateScript
}:
@ -24,7 +25,9 @@ stdenv.mkDerivation rec {
sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1";
};
nativeBuildInputs = [ meson ninja pkgconfig ];
nativeBuildInputs = [ meson ninja pkgconfig ]
# Fixup rpaths because of meson, remove with meson-0.47
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
doCheck = false; # fails with "No test data file provided"

View File

@ -11,6 +11,7 @@
, libX11
, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
, libXi
, fixDarwinDylibNames
, gnome3 # To pass updateScript
}:
@ -27,7 +28,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]
# Fixup rpaths because of meson, remove with meson-0.47
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ dbus glib libX11 libXtst libXi ];
doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "babl-0.1.54";
name = "babl-0.1.56";
src = fetchurl {
url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
sha256 = "01rad0sf9bkg7124qz5zdn08nl1q00yy5lg6ca3v053jblsg2asd";
sha256 = "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla";
};
doCheck = true;

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, writeTextDir }:
{ targetPlatform, stdenv, fetchurl, writeTextDir }:
let self =
stdenv.mkDerivation rec {
@ -36,12 +36,12 @@ stdenv.mkDerivation rec {
set_target_properties(c-ares::cares PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${self}/include"
INTERFACE_LINK_LIBRARIES "nsl;rt"
${stdenv.lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''}
)
set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(c-ares::cares PROPERTIES
IMPORTED_LOCATION_RELEASE "${self}/lib/libcares.so.2.2.0"
IMPORTED_SONAME_RELEASE "libcares.so.2"
IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${targetPlatform.extensions.sharedLibrary}"
IMPORTED_SONAME_RELEASE "libcares${targetPlatform.extensions.sharedLibrary}"
)
add_library(c-ares::cares_shared INTERFACE IMPORTED)
set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas
{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas
, gmpxx
, optimize ? false # impure
}:
@ -6,23 +6,30 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "fflas-ffpack";
version = "2.3.2";
src = fetchFromGitHub {
owner = "linbox-team";
repo = "${pname}";
rev = "v${version}";
sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl";
};
checkInputs = [
gmpxx
];
enableParallelBuilding = true;
nativeBuildInputs = [
autoreconfHook
pkgconfig
] ++ stdenv.lib.optionals doCheck checkInputs;
buildInputs = [ givaro openblas];
buildInputs = [ givaro blas ];
configureFlags = [
"--with-blas-libs=-lopenblas"
"--with-lapack-libs=-lopenblas"
"--with-blas-libs=-l${blas.linkName}"
"--with-lapack-libs=-l${blas.linkName}"
] ++ stdenv.lib.optionals (!optimize) [
# disable SIMD instructions (which are enabled *when available* by default)
"--disable-sse"
@ -36,13 +43,15 @@ stdenv.mkDerivation rec {
"--disable-fma"
"--disable-fma4"
];
doCheck = true;
meta = {
inherit version;
description = ''Finite Field Linear Algebra Subroutines'';
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
homepage = https://linbox-team.github.io/fflas-ffpack/;
};
}

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "folly-${version}";
version = "2018.07.09.00";
version = "2018.08.13.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "08irwa2pb3f2gnk31rq31jjrqk2xxx0a0m72gf0bsv2w9fgn5sfm";
sha256 = "1lhq3l7rirhi4vwgiym0r3rff1i69c7bdpi1hm8r4axs2dfjvxdr";
};
nativeBuildInputs = [ autoreconfHook python pkgconfig ];

View File

@ -3,13 +3,13 @@
, libwebp, gnome3, libintl }:
let
version = "0.4.4";
version = "0.4.6";
in stdenv.mkDerivation rec {
name = "gegl-${version}";
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
sha256 = "143qwn92xc5wm09p9iwrpw9y0ahha5lcyx1bb0lzwcb1fgd4bjzq";
sha256 = "1rcsa60z09jjayk0q6jam4w8rivh400a08bv2xykiv5qyr1yp5zk";
};
# needs fonts otherwise, don't know how to pass them

View File

@ -1,19 +1,33 @@
{stdenv, fetchurl}:
{ stdenv
, lib
, fetchurl
, optimize ? false # impure hardware optimizations
}:
stdenv.mkDerivation rec {
name = "gf2x-${version}";
version = "1.2";
version = "1.2"; # remember to also update the url
src = fetchurl {
# find link to latest version (with file id) here: https://gforge.inria.fr/projects/gf2x/
url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-1.2.tar.gz";
# Requested a predictable link:
# https://gforge.inria.fr/tracker/index.php?func=detail&aid=21704&group_id=1874&atid=6982
url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-${version}.tar.gz";
sha256 = "0d6vh1mxskvv3bxl6byp7gxxw3zzpkldrxnyajhnl05m0gx7yhk1";
};
meta = with stdenv.lib; {
# no actual checks present yet (as of 1.2), but can't hurt trying
# for an indirect test, run ntl's test suite
doCheck = true;
configureFlags = lib.optionals (!optimize) [
"--disable-hardware-specific-code"
];
meta = with lib; {
description = ''Routines for fast arithmetic in GF(2)[x]'';
homepage = http://gf2x.gforge.inria.fr;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ raskin ];
maintainers = with maintainers; [ raskin timokau ];
platforms = platforms.unix;
};
}

View File

@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
cmakeFlags =
[ "-DgRPC_ZLIB_PROVIDER=package"
"-DgRPC_CARES_PROVIDER=package"
@ -16,11 +17,19 @@ stdenv.mkDerivation rec {
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_GFLAGS_PROVIDER=package"
];
# CMake creates a build directory by default, this conflicts with the
# basel BUILD file on case-insensitive filesystems.
preConfigure = ''
rm -vf BUILD
'';
enableParallelBuilds = true;
meta = with stdenv.lib; {
description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
license = licenses.asl20;
maintainers = [ maintainers.lnl7 ];
homepage = https://grpc.io/;
};
}

View File

@ -2,7 +2,7 @@
, gdk_pixbuf, xlibsWrapper, gobjectIntrospection
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? true, cups ? null
, gdktarget ? "x11"
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
, AppKit, Cocoa
, fetchpatch
}:

View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info
, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection
, xorg, epoxy, json-glib, libxkbcommon, gmp
, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3
, x11Support ? stdenv.isLinux
, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux, cups ? null
, darwin, gnome3
, AppKit, Cocoa
}:
assert cupsSupport -> cups != null;
@ -36,12 +37,13 @@ stdenv.mkDerivation rec {
})
];
buildInputs = [ libxkbcommon epoxy json-glib ];
buildInputs = [ libxkbcommon epoxy json-glib ]
++ optional stdenv.isDarwin AppKit;
propagatedBuildInputs = with xorg; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas
libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed
++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ])
++ optional xineramaSupport libXinerama
++ optional cupsSupport cups;
#TODO: colord?
@ -55,9 +57,9 @@ stdenv.mkDerivation rec {
"--disable-debug"
"--disable-dependency-tracking"
"--disable-glibtest"
"--with-gdktarget=quartz"
] ++ optional (stdenv.isDarwin && !x11Support)
"--enable-quartz-backend"
] ++ optional stdenv.isLinux [
++ optional x11Support [
"--enable-x11-backend"
] ++ optional waylandSupport [
"--enable-wayland-backend"

View File

@ -1,39 +1,30 @@
{ stdenv, fetchurl, lib, file
, pkgconfig, autoconf
{ stdenv, fetchbzr
, pkgconfig, systemd, autoreconfHook
, glib, dbus-glib, json-glib
, gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }:
with lib;
stdenv.mkDerivation rec {
name = "indicator-application-gtk3-${version}";
version = "${versionMajor}.${versionMinor}";
versionMajor = "12.10";
versionMinor = "0";
pname = "indicator-application";
version = "12.10.1";
src = fetchurl {
url = "${meta.homepage}/${versionMajor}/${version}/+download/indicator-application-${version}.tar.gz";
sha256 = "1z8ar0k47l4his7zvffbc2kn658nid51svqnfv0dms601w53gbpr";
name = "${pname}-gtk3-${version}";
src = fetchbzr {
url = "https://code.launchpad.net/~indicator-applet-developers/${pname}/trunk.17.04";
rev = "260";
sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1";
};
nativeBuildInputs = [ pkgconfig autoconf ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
glib dbus-glib json-glib
glib dbus-glib json-glib systemd
gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3
];
postPatch = ''
substituteInPlace configure.ac \
--replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \
"DBUSSERVICEDIR=$out/share/dbus-1/services"
autoconf
for f in {configure,ltmain.sh,m4/libtool.m4}; do
substituteInPlace $f \
--replace /usr/bin/file ${file}/bin/file
done
substituteInPlace src/Makefile.in \
--replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib"
substituteInPlace data/Makefile.am \
--replace "/etc/xdg/autostart" "$out/etc/xdg/autostart"
'';
configureFlags = [
@ -47,7 +38,16 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
];
meta = {
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user";
PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib/indicators3/7/";
# Upstart is not used in NixOS
postFixup = ''
rm -rf $out/share/indicator-application/upstart
rm -rf $out/share/upstart
'';
meta = with stdenv.lib; {
description = "Indicator to take menus from applications and place them in the panel";
homepage = https://launchpad.net/indicator-application;
license = licenses.gpl3;

View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.48/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.49/ -A '*.tar.xz' )

View File

@ -3,627 +3,627 @@
{
attica = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz";
sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8";
name = "attica-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/attica-5.49.0.tar.xz";
sha256 = "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn";
name = "attica-5.49.0.tar.xz";
};
};
baloo = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz";
sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj";
name = "baloo-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/baloo-5.49.0.tar.xz";
sha256 = "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph";
name = "baloo-5.49.0.tar.xz";
};
};
bluez-qt = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz";
sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949";
name = "bluez-qt-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/bluez-qt-5.49.0.tar.xz";
sha256 = "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard";
name = "bluez-qt-5.49.0.tar.xz";
};
};
breeze-icons = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz";
sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh";
name = "breeze-icons-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/breeze-icons-5.49.0.tar.xz";
sha256 = "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph";
name = "breeze-icons-5.49.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/extra-cmake-modules-5.48.0.tar.xz";
sha256 = "1675xnc9hv8z8gp95ici2zqmbv7i6f65g0kln4fskxmlxnfplnzw";
name = "extra-cmake-modules-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/extra-cmake-modules-5.49.0.tar.xz";
sha256 = "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0";
name = "extra-cmake-modules-5.49.0.tar.xz";
};
};
frameworkintegration = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz";
sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y";
name = "frameworkintegration-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/frameworkintegration-5.49.0.tar.xz";
sha256 = "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx";
name = "frameworkintegration-5.49.0.tar.xz";
};
};
kactivities = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz";
sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8";
name = "kactivities-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kactivities-5.49.0.tar.xz";
sha256 = "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim";
name = "kactivities-5.49.0.tar.xz";
};
};
kactivities-stats = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz";
sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6";
name = "kactivities-stats-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kactivities-stats-5.49.0.tar.xz";
sha256 = "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f";
name = "kactivities-stats-5.49.0.tar.xz";
};
};
kapidox = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz";
sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4";
name = "kapidox-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kapidox-5.49.0.tar.xz";
sha256 = "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559";
name = "kapidox-5.49.0.tar.xz";
};
};
karchive = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz";
sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6";
name = "karchive-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/karchive-5.49.0.tar.xz";
sha256 = "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0";
name = "karchive-5.49.0.tar.xz";
};
};
kauth = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz";
sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7";
name = "kauth-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kauth-5.49.0.tar.xz";
sha256 = "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8";
name = "kauth-5.49.0.tar.xz";
};
};
kbookmarks = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz";
sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar";
name = "kbookmarks-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kbookmarks-5.49.0.tar.xz";
sha256 = "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53";
name = "kbookmarks-5.49.0.tar.xz";
};
};
kcmutils = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz";
sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw";
name = "kcmutils-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kcmutils-5.49.0.tar.xz";
sha256 = "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q";
name = "kcmutils-5.49.0.tar.xz";
};
};
kcodecs = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz";
sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n";
name = "kcodecs-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kcodecs-5.49.0.tar.xz";
sha256 = "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz";
name = "kcodecs-5.49.0.tar.xz";
};
};
kcompletion = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz";
sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp";
name = "kcompletion-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kcompletion-5.49.0.tar.xz";
sha256 = "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi";
name = "kcompletion-5.49.0.tar.xz";
};
};
kconfig = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz";
sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3";
name = "kconfig-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kconfig-5.49.0.tar.xz";
sha256 = "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf";
name = "kconfig-5.49.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz";
sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9";
name = "kconfigwidgets-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kconfigwidgets-5.49.0.tar.xz";
sha256 = "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz";
name = "kconfigwidgets-5.49.0.tar.xz";
};
};
kcoreaddons = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz";
sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f";
name = "kcoreaddons-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kcoreaddons-5.49.0.tar.xz";
sha256 = "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj";
name = "kcoreaddons-5.49.0.tar.xz";
};
};
kcrash = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz";
sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8";
name = "kcrash-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kcrash-5.49.0.tar.xz";
sha256 = "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3";
name = "kcrash-5.49.0.tar.xz";
};
};
kdbusaddons = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz";
sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr";
name = "kdbusaddons-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kdbusaddons-5.49.0.tar.xz";
sha256 = "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh";
name = "kdbusaddons-5.49.0.tar.xz";
};
};
kdeclarative = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz";
sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd";
name = "kdeclarative-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kdeclarative-5.49.0.tar.xz";
sha256 = "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9";
name = "kdeclarative-5.49.0.tar.xz";
};
};
kded = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz";
sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954";
name = "kded-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kded-5.49.0.tar.xz";
sha256 = "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc";
name = "kded-5.49.0.tar.xz";
};
};
kdelibs4support = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz";
sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf";
name = "kdelibs4support-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/portingAids/kdelibs4support-5.49.0.tar.xz";
sha256 = "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi";
name = "kdelibs4support-5.49.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz";
sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l";
name = "kdesignerplugin-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kdesignerplugin-5.49.0.tar.xz";
sha256 = "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd";
name = "kdesignerplugin-5.49.0.tar.xz";
};
};
kdesu = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz";
sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5";
name = "kdesu-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kdesu-5.49.0.tar.xz";
sha256 = "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k";
name = "kdesu-5.49.0.tar.xz";
};
};
kdewebkit = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz";
sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv";
name = "kdewebkit-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kdewebkit-5.49.0.tar.xz";
sha256 = "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n";
name = "kdewebkit-5.49.0.tar.xz";
};
};
kdnssd = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz";
sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5";
name = "kdnssd-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kdnssd-5.49.0.tar.xz";
sha256 = "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr";
name = "kdnssd-5.49.0.tar.xz";
};
};
kdoctools = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz";
sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8";
name = "kdoctools-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kdoctools-5.49.0.tar.xz";
sha256 = "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl";
name = "kdoctools-5.49.0.tar.xz";
};
};
kemoticons = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz";
sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9";
name = "kemoticons-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kemoticons-5.49.0.tar.xz";
sha256 = "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn";
name = "kemoticons-5.49.0.tar.xz";
};
};
kfilemetadata = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz";
sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f";
name = "kfilemetadata-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kfilemetadata-5.49.0.tar.xz";
sha256 = "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80";
name = "kfilemetadata-5.49.0.tar.xz";
};
};
kglobalaccel = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz";
sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7";
name = "kglobalaccel-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kglobalaccel-5.49.0.tar.xz";
sha256 = "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl";
name = "kglobalaccel-5.49.0.tar.xz";
};
};
kguiaddons = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz";
sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz";
name = "kguiaddons-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kguiaddons-5.49.0.tar.xz";
sha256 = "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk";
name = "kguiaddons-5.49.0.tar.xz";
};
};
kholidays = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz";
sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4";
name = "kholidays-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kholidays-5.49.0.tar.xz";
sha256 = "0yc4i4qsk3w1v0andw737ps1ad70696q140k0ycfhk6qmv1wvsdp";
name = "kholidays-5.49.0.tar.xz";
};
};
khtml = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz";
sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1";
name = "khtml-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/portingAids/khtml-5.49.0.tar.xz";
sha256 = "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64";
name = "khtml-5.49.0.tar.xz";
};
};
ki18n = {
version = "5.48.1";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz";
sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h";
name = "ki18n-5.48.1.tar.xz";
url = "${mirror}/stable/frameworks/5.49/ki18n-5.49.0.tar.xz";
sha256 = "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz";
name = "ki18n-5.49.0.tar.xz";
};
};
kiconthemes = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz";
sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4";
name = "kiconthemes-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kiconthemes-5.49.0.tar.xz";
sha256 = "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m";
name = "kiconthemes-5.49.0.tar.xz";
};
};
kidletime = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz";
sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm";
name = "kidletime-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kidletime-5.49.0.tar.xz";
sha256 = "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv";
name = "kidletime-5.49.0.tar.xz";
};
};
kimageformats = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz";
sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc";
name = "kimageformats-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kimageformats-5.49.0.tar.xz";
sha256 = "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4";
name = "kimageformats-5.49.0.tar.xz";
};
};
kinit = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz";
sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a";
name = "kinit-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kinit-5.49.0.tar.xz";
sha256 = "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95";
name = "kinit-5.49.0.tar.xz";
};
};
kio = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz";
sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0";
name = "kio-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kio-5.49.0.tar.xz";
sha256 = "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k";
name = "kio-5.49.0.tar.xz";
};
};
kirigami2 = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz";
sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52";
name = "kirigami2-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kirigami2-5.49.0.tar.xz";
sha256 = "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz";
name = "kirigami2-5.49.0.tar.xz";
};
};
kitemmodels = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz";
sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf";
name = "kitemmodels-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kitemmodels-5.49.0.tar.xz";
sha256 = "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg";
name = "kitemmodels-5.49.0.tar.xz";
};
};
kitemviews = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz";
sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w";
name = "kitemviews-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kitemviews-5.49.0.tar.xz";
sha256 = "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp";
name = "kitemviews-5.49.0.tar.xz";
};
};
kjobwidgets = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz";
sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w";
name = "kjobwidgets-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kjobwidgets-5.49.0.tar.xz";
sha256 = "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g";
name = "kjobwidgets-5.49.0.tar.xz";
};
};
kjs = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz";
sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4";
name = "kjs-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/portingAids/kjs-5.49.0.tar.xz";
sha256 = "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0";
name = "kjs-5.49.0.tar.xz";
};
};
kjsembed = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz";
sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx";
name = "kjsembed-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/portingAids/kjsembed-5.49.0.tar.xz";
sha256 = "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m";
name = "kjsembed-5.49.0.tar.xz";
};
};
kmediaplayer = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz";
sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq";
name = "kmediaplayer-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/portingAids/kmediaplayer-5.49.0.tar.xz";
sha256 = "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx";
name = "kmediaplayer-5.49.0.tar.xz";
};
};
knewstuff = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz";
sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv";
name = "knewstuff-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/knewstuff-5.49.0.tar.xz";
sha256 = "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk";
name = "knewstuff-5.49.0.tar.xz";
};
};
knotifications = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz";
sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb";
name = "knotifications-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/knotifications-5.49.0.tar.xz";
sha256 = "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9";
name = "knotifications-5.49.0.tar.xz";
};
};
knotifyconfig = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz";
sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm";
name = "knotifyconfig-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/knotifyconfig-5.49.0.tar.xz";
sha256 = "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa";
name = "knotifyconfig-5.49.0.tar.xz";
};
};
kpackage = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz";
sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr";
name = "kpackage-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kpackage-5.49.0.tar.xz";
sha256 = "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd";
name = "kpackage-5.49.0.tar.xz";
};
};
kparts = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz";
sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv";
name = "kparts-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kparts-5.49.0.tar.xz";
sha256 = "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k";
name = "kparts-5.49.0.tar.xz";
};
};
kpeople = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz";
sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7";
name = "kpeople-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kpeople-5.49.0.tar.xz";
sha256 = "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv";
name = "kpeople-5.49.0.tar.xz";
};
};
kplotting = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz";
sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg";
name = "kplotting-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kplotting-5.49.0.tar.xz";
sha256 = "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0";
name = "kplotting-5.49.0.tar.xz";
};
};
kpty = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz";
sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk";
name = "kpty-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kpty-5.49.0.tar.xz";
sha256 = "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg";
name = "kpty-5.49.0.tar.xz";
};
};
kross = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz";
sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q";
name = "kross-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/portingAids/kross-5.49.0.tar.xz";
sha256 = "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz";
name = "kross-5.49.0.tar.xz";
};
};
krunner = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz";
sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn";
name = "krunner-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/krunner-5.49.0.tar.xz";
sha256 = "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19";
name = "krunner-5.49.0.tar.xz";
};
};
kservice = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz";
sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis";
name = "kservice-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kservice-5.49.0.tar.xz";
sha256 = "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z";
name = "kservice-5.49.0.tar.xz";
};
};
ktexteditor = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz";
sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7";
name = "ktexteditor-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/ktexteditor-5.49.0.tar.xz";
sha256 = "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj";
name = "ktexteditor-5.49.0.tar.xz";
};
};
ktextwidgets = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz";
sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg";
name = "ktextwidgets-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/ktextwidgets-5.49.0.tar.xz";
sha256 = "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1";
name = "ktextwidgets-5.49.0.tar.xz";
};
};
kunitconversion = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz";
sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db";
name = "kunitconversion-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kunitconversion-5.49.0.tar.xz";
sha256 = "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79";
name = "kunitconversion-5.49.0.tar.xz";
};
};
kwallet = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz";
sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr";
name = "kwallet-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kwallet-5.49.0.tar.xz";
sha256 = "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z";
name = "kwallet-5.49.0.tar.xz";
};
};
kwayland = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz";
sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4";
name = "kwayland-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kwayland-5.49.0.tar.xz";
sha256 = "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6";
name = "kwayland-5.49.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz";
sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7";
name = "kwidgetsaddons-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kwidgetsaddons-5.49.0.tar.xz";
sha256 = "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92";
name = "kwidgetsaddons-5.49.0.tar.xz";
};
};
kwindowsystem = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz";
sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n";
name = "kwindowsystem-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kwindowsystem-5.49.0.tar.xz";
sha256 = "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp";
name = "kwindowsystem-5.49.0.tar.xz";
};
};
kxmlgui = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz";
sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h";
name = "kxmlgui-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kxmlgui-5.49.0.tar.xz";
sha256 = "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa";
name = "kxmlgui-5.49.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz";
sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40";
name = "kxmlrpcclient-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/kxmlrpcclient-5.49.0.tar.xz";
sha256 = "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06";
name = "kxmlrpcclient-5.49.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz";
sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im";
name = "modemmanager-qt-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/modemmanager-qt-5.49.0.tar.xz";
sha256 = "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2";
name = "modemmanager-qt-5.49.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz";
sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v";
name = "networkmanager-qt-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/networkmanager-qt-5.49.0.tar.xz";
sha256 = "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z";
name = "networkmanager-qt-5.49.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz";
sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw";
name = "oxygen-icons5-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/oxygen-icons5-5.49.0.tar.xz";
sha256 = "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g";
name = "oxygen-icons5-5.49.0.tar.xz";
};
};
plasma-framework = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz";
sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82";
name = "plasma-framework-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/plasma-framework-5.49.0.tar.xz";
sha256 = "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv";
name = "plasma-framework-5.49.0.tar.xz";
};
};
prison = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz";
sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q";
name = "prison-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/prison-5.49.0.tar.xz";
sha256 = "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d";
name = "prison-5.49.0.tar.xz";
};
};
purpose = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz";
sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp";
name = "purpose-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/purpose-5.49.0.tar.xz";
sha256 = "014izz6vvk3vqw7s2qy33dqfflyylk8vqr9srkf391f6yfld9ygz";
name = "purpose-5.49.0.tar.xz";
};
};
qqc2-desktop-style = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/qqc2-desktop-style-5.48.0.tar.xz";
sha256 = "1wc4vxjipdw3zq1lqwz3s7f0gzrcvs8svy9ip5r40qcz2w55s4an";
name = "qqc2-desktop-style-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/qqc2-desktop-style-5.49.0.tar.xz";
sha256 = "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj";
name = "qqc2-desktop-style-5.49.0.tar.xz";
};
};
solid = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz";
sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns";
name = "solid-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/solid-5.49.0.tar.xz";
sha256 = "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp";
name = "solid-5.49.0.tar.xz";
};
};
sonnet = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz";
sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4";
name = "sonnet-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/sonnet-5.49.0.tar.xz";
sha256 = "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3";
name = "sonnet-5.49.0.tar.xz";
};
};
syntax-highlighting = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz";
sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5";
name = "syntax-highlighting-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/syntax-highlighting-5.49.0.tar.xz";
sha256 = "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v";
name = "syntax-highlighting-5.49.0.tar.xz";
};
};
threadweaver = {
version = "5.48.0";
version = "5.49.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz";
sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125";
name = "threadweaver-5.48.0.tar.xz";
url = "${mirror}/stable/frameworks/5.49/threadweaver-5.49.0.tar.xz";
sha256 = "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7";
name = "threadweaver-5.49.0.tar.xz";
};
};
}

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, libelf }:
let
version = "20180527";
version = "20180809";
src = fetchurl {
url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
# Upstream displays this hash broken into three parts:

View File

@ -11,11 +11,11 @@ assert javaSupport -> jdk != null;
stdenv.mkDerivation rec {
name = "libguestfs-${version}";
version = "1.38.3";
version = "1.38.4";
src = fetchurl {
url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
sha256 = "130nc9v9f8k5kwz9hzqd43fjxg01hl7jh0jw1fhs4ah5hmg71v34";
sha256 = "1xsazw6yrbgmc647j8l896fzv534157sqmdzac09rxkxwiy0wm16";
};
nativeBuildInputs = [ pkgconfig ];

View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description= "A Qt5 library to write cross-platfrom clients for Matrix";
homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html;
license = licenses.lgpl21;
platforms = platforms.linux;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ peterhoeg ];
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "librealsense-${version}";
version = "2.14.1";
version = "2.15.0";
src = fetchFromGitHub {
owner = "IntelRealSense";
repo = "librealsense";
rev = "v${version}";
sha256 = "1gxfnc1c87a3xfp0dpcp32jjjmxz7f9aw6jcda87lr2xvhpvq0n5";
sha256 = "12918gcn0w5h6bqgx6s44w44bs1x2pcndn2833xzya69rddkdv6x";
};
buildInputs = [

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gnutls, zlib }:
stdenv.mkDerivation rec {
name = "librelp-1.2.16";
name = "librelp-1.2.17";
src = fetchurl {
url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
sha256 = "0lzxc2ydjbbs50dalqp2s107ckp63arpk223cigasq0hl395s8qc";
sha256 = "1w6blhfr3rlmvjj0fbr8rsycrkm5b92n44zaaijg1jnvxjfqpy0v";
};
nativeBuildInputs = [ pkgconfig ];

View File

@ -27,6 +27,7 @@ let
meta = with lib; {
description = "Free TLS/SSL implementation";
homepage = "https://www.libressl.org";
license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ];
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
};

View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
rev = "0.6.34";
rev = "0.6.35";
name = "libsolv-${rev}";
src = fetchFromGitHub {
inherit rev;
owner = "openSUSE";
repo = "libsolv";
sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7";
sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq";
};
cmakeFlags = [

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack
{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
, libvpx, check, libconfig, pkgconfig }:
let
@ -20,7 +20,7 @@ let
];
buildInputs = [
libsodium libmsgpack ncurses libconfig
libsodium msgpack ncurses libconfig
] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
libopus libvpx
];

View File

@ -60,7 +60,9 @@ in stdenv.mkDerivation rec {
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
patchShebangs . # fixes /usr/bin/python references
'';
substituteInPlace src/util/virjsoncompat.c --replace \
'"libjansson.so.4"' '"${jansson}/lib/libjansson${stdenv.targetPlatform.extensions.sharedLibrary}"'
'';
configureFlags = [
"--localstatedir=/var"

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libwps-${version}";
version = "0.4.9";
version = "0.4.10";
src = fetchurl {
url = "mirror://sourceforge/libwps/${name}.tar.bz2";
sha256 = "1wn5lvx7c9dp98d9akqjhkv5fk94725hbvqzbjpy1v8y4mm9knb6";
sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4";
};
nativeBuildInputs = [ pkgconfig ];

View File

@ -4,7 +4,7 @@
, autoreconfHook
, givaro
, pkgconfig
, openblas
, blas
, fflas-ffpack
, gmpxx
, optimize ? false # impure
@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
buildInputs = [
givaro
openblas
blas
gmpxx
fflas-ffpack
];
configureFlags = [
"--with-blas-libs=-lopenblas"
"--with-blas-libs=-l${blas.linkName}"
"--disable-optimization"
] ++ stdenv.lib.optionals (!optimize) [
# disable SIMD instructions (which are enabled *when available* by default)
@ -65,12 +65,14 @@ stdenv.mkDerivation rec {
doCheck = true;
enableParallelBuilding = true;
meta = {
inherit version;
description = "C++ library for exact, high-performance linear algebra";
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.timokau];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
homepage = http://linalg.org/;
};
}

View File

@ -0,0 +1,26 @@
{ stdenv
, fetchFromGitHub
, lmdb }:
stdenv.mkDerivation rec {
name = "lmdbxx-${version}";
version = "0.9.14.0";
src = fetchFromGitHub {
owner = "bendiken";
repo = "lmdbxx";
rev = "${version}";
sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6";
};
buildInputs = [ lmdb ];
makeFlags = [ "PREFIX=$(out)" ];
meta = {
homepage = "https://github.com/bendiken/lmdbxx#readme";
description = "C++11 wrapper for the LMDB embedded B+ tree database library";
license = stdenv.lib.licenses.unlicense;
maintainers = with stdenv.lib.maintainers; [ fgaz ];
};
}

View File

@ -1,12 +1,12 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2.1.5";
version = "3.0.1";
src = fetchFromGitHub {
owner = "msgpack";
repo = "msgpack-c";
rev = "cpp-${version}";
sha256 = "0n4kvma3dldfsvv7b0zw23qln6av5im2aqqd6m890i75zwwkw0zv";
sha256 = "0nr6y9v4xbvzv717j9w9lhmags1y2s5mq103v044qlyd2jkbg2p4";
};
})

View File

@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
name = "libmsgpack-${version}";
name = "msgpack-${version}";
inherit src patches;

View File

@ -113,9 +113,10 @@ in stdenv.mkDerivation rec {
rm -f "$out"/lib/*.a
'';
meta = {
meta = with stdenv.lib; {
homepage = https://developer.mozilla.org/en-US/docs/NSS;
description = "A set of libraries for development of security-enabled client and server applications";
platforms = stdenv.lib.platforms.all;
license = licenses.mpl20;
platforms = platforms.all;
};
}

View File

@ -14,16 +14,13 @@ assert withGf2x -> gf2x != null;
stdenv.mkDerivation rec {
name = "ntl-${version}";
version = "11.2.1";
version = "11.3.0";
src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489";
sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s";
};
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace DoConfig --replace g++ c++
'';
buildInputs = [
gmp
];
@ -51,6 +48,7 @@ stdenv.mkDerivation rec {
else
"generic" # "chooses options that should be OK for most platforms"
}"
"CXX=c++"
] ++ lib.optionals withGf2x [
"NTL_GF2X_LIB=on"
"GF2X_PREFIX=${gf2x}"
@ -66,6 +64,8 @@ stdenv.mkDerivation rec {
length integers, and for vectors, matrices, and polynomials over
the integers and over finite fields.
'';
# Upstream contact: maintainer is victorshoup on GitHub. Alternatively the
# email listed on the homepage.
homepage = http://www.shoup.net/ntl/;
maintainers = with maintainers; [ timokau ];
license = licenses.gpl2Plus;

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