diff options
Diffstat (limited to 'pkgs')
151 files changed, 3881 insertions, 2933 deletions
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 331ef6b92a4f..f597d6b6527c 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -2,8 +2,8 @@ , makeWrapper, makeDesktopItem , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative -, qtlocation, qtquickcontrols2, qtwebchannel -, qtwebengine, qtx11extras, qtxmlpatterns +, qtlocation, qtquickcontrols, qtquickcontrols2 +, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind , libsodium, pcsclite, zeromq, cppzmq, pkgconfig , hidapi @@ -11,22 +11,35 @@ with stdenv.lib; +let + qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; + + qml2ImportPath = concatMapStringsSep ":" qmlPath [ + qtbase.bin qtmultimedia.bin qtgraphicaleffects + qtdeclarative.bin qtlocation.bin + qtquickcontrols qtquickcontrols2.bin + qtwebchannel.bin qtwebengine.bin qtxmlpatterns + ]; + +in + stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.13.0.4"; + version = "0.14.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "142yj5s15bhm300dislq3x5inw1f37shnrd5vyj78jjcvry3wymw"; + sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8"; }; nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtmultimedia qtgraphicaleffects - qtdeclarative qtlocation qtquickcontrols2 + qtdeclarative qtlocation + qtquickcontrols qtquickcontrols2 qtwebchannel qtwebengine qtx11extras qtxmlpatterns monero unbound readline boost libunwind libsodium pcsclite zeromq @@ -81,6 +94,11 @@ stdenv.mkDerivation rec { cp $src/images/appicons/$size.png \ $out/share/icons/hicolor/$size/apps/monero.png done; + + # wrap runtime dependencies + wrapProgram $out/bin/monero-wallet-gui \ + --set QML2_IMPORT_PATH "${qml2ImportPath}" \ + --set QT_PLUGIN_PATH "${qtbase.bin}/${qtbase.qtPluginPrefix}" ''; meta = { diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 74f817d81350..ae733151622d 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -13,15 +13,17 @@ index 79223c0..e80b317 100644 parser.addHelpOption(); parser.process(app); diff --git a/Logger.cpp b/Logger.cpp -index 660bafc..dae24d4 100644 +index 6b1daba..c357762 100644 --- a/Logger.cpp +++ b/Logger.cpp -@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log"; - #elif defined(Q_OS_MAC) - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs"; +@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log"; + static const QString appFolder = "Library/Logs"; #else // linux + bsd + //HomeLocation = "~" - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0); +- static const QString appFolder = ".bitmonero"; + static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0); ++ static const QString appFolder = "bitmonero"; #endif - + diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 3a962458632e..94c277f63eb0 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.13.0.4"; + version = "0.14.0.2"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1ambgakapijhsi1pd70vw8vvnlwa3nid944lqkbfq3wl25lmc70d"; + sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k"; }; nativeBuildInputs = [ cmake pkgconfig git ]; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index b3a0c6377214..1b0dfebe22c2 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm -, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp +, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: @@ -49,7 +49,6 @@ let protobuf qca2 qjson - qt4 sqlite taglib ] diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 8ec4a342522d..9407a1c26882 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "3.0.1"; + version = "3.0.5"; src = fetchzip { url = "https://download.musescore.com/releases/MuseScore-${version}/MuseScore-${version}.zip"; - sha256 = "1l9djxq5hdfqiya2jwcag7qq4dhmb9qcv68y27dlza19imrnim80"; + sha256 = "1pbf6v0l3nixxr8k5igwhj09wnqvw92av6q6yjrbb3kyjh5br2d8"; stripRoot = false; }; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 084487fd407a..5957a740f350 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "0k4vlg3clsn2i4k12imvcjiwlp9nx1mikwyrnarg9shxzzdzcf4y"; + sha256 = "0cd1jfb3ynfrsbz8jwfsbvs5liyddxg4zghrvz931qkkqi117hbh"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index c10358eed1e4..eab498b96249 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.5"; + name = "qmmp-1.3.1"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "1xs8kg65088yzdhdkymmknkp1s4adzv095f5jhjvy62s8ymyjvnx"; + sha256 = "1dmybzibpr6hpr2iv1wvrjgww842mng2x0rh1mr8gs8j191xvlhw"; }; buildInputs = diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 73f24e03e307..cba85aacfbb8 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "17a61lliplhs14b3x83qz3kv7ww4dn3a02jfdlcx2z903hwn5sld"; + sha256 = "0402rdr46za21w34m7ajzbwiiqcd1h0da3b0ldsr2z5g2mrkzxv8"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index e44df51404a4..0918cf42830b 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "18xjj14g8gnnbwyrf39bdxc5aswb620w9i323skdf6rnaq229jyv"; + sha256 = "1b9w4cml3cmcg09kh852cahas6l9ks8wl3gzp1az8rzxz4229yg1"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 24c033001cb6..63bb966e3887 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.10.1"; + version = "1.5.10.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "02mmy17sa3dlwmjjahn8rfd6h67c5s0q3fvkf6ljrc2mbbpwc375"; + sha256 = "1rr99qkq80s8l2iv3x4ccxan07m15dvmd5s9b10386bfjbwbya01"; }; buildInputs = [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f3e5602a7996..7cd436288e67 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0d7d6n7n1zzhxpdykbwwbrw139mqxkp20d4l0570pk7975p1s2q9"; }; latestVersion = { # canary & dev - version = "3.5.0.6"; # "Android Studio 3.5 Canary 7" - build = "183.5346365"; - sha256Hash = "0dfkhzsxabrv8cwgyv3gicpglgpccmi1ig5shlhp6a006awgfyj0"; + version = "3.5.0.7"; # "Android Studio 3.5 Canary 8" + build = "191.5375575"; + sha256Hash = "0vssynvj0j4xbin9h95lciilc3j9mkm53vwzxxr3kqxwl74qx4mj"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index f8753ecd1eb8..efbf5864faa8 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; - broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118 maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index bc8f2c608693..f322c6442b84 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0fngj5hfinj66xpij2h3ag79mgmqcfrjpwynxdbjr5brch25ldwj"; + sha256 = "0n54p5day6gnmxqmgx4yd7q6y0mgv1nwh84yrz5r953yhd9m37rn"; }; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch index 9fa3c8a14141..fcbbbbb72eb3 100644 --- a/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -31,10 +31,10 @@ index be1cc4afb..6d0c1d7e5 100644 } return true; diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index 8b057b459..3fa4548ad 100644 +index dfff6fc29..419e54a5b 100644 --- a/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp -@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -82,7 +82,6 @@ bool DbConfigMysql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -42,7 +42,7 @@ index 8b057b459..3fa4548ad 100644 QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -90,16 +89,7 @@ bool DbConfigMysql::init(QSettings &settings) #endif const bool defaultInternalServer = true; @@ -51,38 +51,29 @@ index 8b057b459..3fa4548ad 100644 - defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE); - } -#endif -- const QStringList mysqldSearchPath = QStringList() -- << QStringLiteral("/usr/bin") -- << QStringLiteral("/usr/sbin") -- << QStringLiteral("/usr/local/sbin") -- << QStringLiteral("/usr/local/libexec") -- << QStringLiteral("/usr/libexec") -- << QStringLiteral("/opt/mysql/libexec") -- << QStringLiteral("/opt/local/lib/mysql5/bin") -- << QStringLiteral("/opt/mysql/sbin"); - if (defaultServerPath.isEmpty()) { -- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath); +- defaultServerPath = findExecutable(QStringLiteral("mysqld")); - } - -- const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath); +- const QString mysqladminPath = findExecutable(QStringLiteral("mysqladmin")); + const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") -@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -109,10 +99,10 @@ bool DbConfigMysql::init(QSettings &settings) #endif } -- mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath); +- mMysqlInstallDbPath = findExecutable(QStringLiteral("mysql_install_db")); + mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; -- mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath); +- mMysqlCheckPath = findExecutable(QStringLiteral("mysqlcheck")); + mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -129,7 +119,7 @@ bool DbConfigMysql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -91,7 +82,7 @@ index 8b057b459..3fa4548ad 100644 mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -139,9 +129,6 @@ bool DbConfigMysql::init(QSettings &settings) // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -101,7 +92,7 @@ index 8b057b459..3fa4548ad 100644 qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -150,9 +137,6 @@ bool DbConfigMysql::init(QSettings &settings) settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -111,7 +102,7 @@ index 8b057b459..3fa4548ad 100644 settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer() +@@ -206,7 +190,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file @@ -189,3 +180,6 @@ index 6b50ae50e..f94a8c5eb 100644 settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); +-- +2.18.1 + diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 6f6acd1e8bb8..e06c7f0d14aa 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.12.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.12.3/ ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 1efdd3e61235..416273d719fe 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1723 @@ { akonadi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-18.12.1.tar.xz"; - sha256 = "141j1wicfl8lgwdgs8yh0mcs4gw004wz8ck21pz55xc1mi4yh9cx"; - name = "akonadi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-18.12.3.tar.xz"; + sha256 = "f930deaade1cac1488b8af05cc28f4a78a441c34dbe875b673af3423f8a14658"; + name = "akonadi-18.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-18.12.1.tar.xz"; - sha256 = "108ax9bpng5qp3cbn3f2x096l9jsv0x3d8xckcfvd4a3svgap1ri"; - name = "akonadi-calendar-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-18.12.3.tar.xz"; + sha256 = "19f92642ba4d62dfccca19ac3ced94495e9137d60a77a672c5443585f30cdaee"; + name = "akonadi-calendar-18.12.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-tools-18.12.1.tar.xz"; - sha256 = "0a54jka0szi3d2dv4kr7s78lbm1sx6a47mccjzc2rp1w2x8dkagl"; - name = "akonadi-calendar-tools-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-tools-18.12.3.tar.xz"; + sha256 = "636ea364bea079cae0b899204add76b0d1d9a80d1955c914bc1dad3a6fc731ed"; + name = "akonadi-calendar-tools-18.12.3.tar.xz"; }; }; akonadiconsole = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadiconsole-18.12.1.tar.xz"; - sha256 = "06mhpk66ck37k6bfi83cmnjv39lwvm245m0climh1idfi6mn08wk"; - name = "akonadiconsole-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadiconsole-18.12.3.tar.xz"; + sha256 = "d052084ecc1665976f7db08d11a15609f017b0803dd30b71b5d1dccc60ac6ed0"; + name = "akonadiconsole-18.12.3.tar.xz"; }; }; akonadi-contacts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-contacts-18.12.1.tar.xz"; - sha256 = "1lnqq2qalvzq6g4dwfnlgvrz9wpnl4g64is8ylrb6jf4bvfg3kvq"; - name = "akonadi-contacts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-contacts-18.12.3.tar.xz"; + sha256 = "6ad8e352744c258b66a0c6155322681fa4ec50422c81fe4248414b0834e645cc"; + name = "akonadi-contacts-18.12.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-import-wizard-18.12.1.tar.xz"; - sha256 = "09r5nspv1l8i1ipjxn5xwi6swkggy10hsa8p5bj0qqclsf17ip5j"; - name = "akonadi-import-wizard-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-import-wizard-18.12.3.tar.xz"; + sha256 = "a74ca212ab05706d5beb94696a933cb46dfd83d5ebd6723de97f7ce4efbe6104"; + name = "akonadi-import-wizard-18.12.3.tar.xz"; }; }; akonadi-mime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-mime-18.12.1.tar.xz"; - sha256 = "0fyxls0qhvqcbhpw17vhr8m4h94s2d69c8bpf45k19f005gbb6dk"; - name = "akonadi-mime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-mime-18.12.3.tar.xz"; + sha256 = "ff7d91c77b629bba6b93ee6b15c0ebee08aa37368aa8bcae48ecbbacf64bc1b4"; + name = "akonadi-mime-18.12.3.tar.xz"; }; }; akonadi-notes = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-notes-18.12.1.tar.xz"; - sha256 = "1m2v3qj06pbpdncxcb37131q6xhbsrwp6qv72rmlwlj0cj7xyfl4"; - name = "akonadi-notes-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-notes-18.12.3.tar.xz"; + sha256 = "ac2f5ef0a3f4621d6af6fef028d641334212d940a1fc3ffc1e3cc6534ca6be60"; + name = "akonadi-notes-18.12.3.tar.xz"; }; }; akonadi-search = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-search-18.12.1.tar.xz"; - sha256 = "1wwv92kmk4kwr8dj7y34nb2337s80hwnjblnfz4kl3z3ka782gd6"; - name = "akonadi-search-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-search-18.12.3.tar.xz"; + sha256 = "6436a0f71229cf7917cb4f269f34a2046c24860ecfc03e7018b9d2a7f9e66346"; + name = "akonadi-search-18.12.3.tar.xz"; }; }; akregator = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akregator-18.12.1.tar.xz"; - sha256 = "0zjc6vgf5pdbmj7b3kl15aqkamg5slaxd5n4092pf7nf3v3r74r9"; - name = "akregator-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akregator-18.12.3.tar.xz"; + sha256 = "d3a4f0f4b677825d1b3e1461a020c17a36abe458d7e3ab40389627e2d8163ea1"; + name = "akregator-18.12.3.tar.xz"; }; }; analitza = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/analitza-18.12.1.tar.xz"; - sha256 = "0iwlkxcqj62l25ldpa325ymkvhim2mm152h3jqh3z1sc683hc1kv"; - name = "analitza-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/analitza-18.12.3.tar.xz"; + sha256 = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925"; + name = "analitza-18.12.3.tar.xz"; }; }; ark = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ark-18.12.1.tar.xz"; - sha256 = "1pcaaq8qdj3w15f0zqfwy7xwknpmb70yc7g4nmj4p48ahq5s2r86"; - name = "ark-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ark-18.12.3.tar.xz"; + sha256 = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722"; + name = "ark-18.12.3.tar.xz"; }; }; artikulate = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/artikulate-18.12.1.tar.xz"; - sha256 = "17msfgq83iy5dfl5qkmj4f89aa2gbk7p00f7bwiz2fnlg642wyq1"; - name = "artikulate-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/artikulate-18.12.3.tar.xz"; + sha256 = "f40cc532dd1093d53ab4f825716ea4f4f4d7f954ac6c58ef412b63323a76c278"; + name = "artikulate-18.12.3.tar.xz"; }; }; audiocd-kio = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/audiocd-kio-18.12.1.tar.xz"; - sha256 = "0kv03d2w0vf9fpp89ymnkizzyhckz9pjj8fcqwbacb78k6p52g6p"; - name = "audiocd-kio-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/audiocd-kio-18.12.3.tar.xz"; + sha256 = "c15ebda9330688c0304be36999f4900ccd7c0b1ce11e19c296975414dafe53c8"; + name = "audiocd-kio-18.12.3.tar.xz"; }; }; baloo-widgets = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/baloo-widgets-18.12.1.tar.xz"; - sha256 = "0axgx1zrbaki20vh9j9bd0h3qvn0ws4cza8smlgvlzx7fkbidmw3"; - name = "baloo-widgets-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/baloo-widgets-18.12.3.tar.xz"; + sha256 = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3"; + name = "baloo-widgets-18.12.3.tar.xz"; }; }; blinken = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/blinken-18.12.1.tar.xz"; - sha256 = "0ka47snqj1xwf8m1qqa1vxgjwm151dzlk22zg07yh987qgc6fbj2"; - name = "blinken-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/blinken-18.12.3.tar.xz"; + sha256 = "2b6a11fa56b8837618e157a4a974eb1dff956cfb8b93e6cb0601bda66a234579"; + name = "blinken-18.12.3.tar.xz"; }; }; bomber = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/bomber-18.12.1.tar.xz"; - sha256 = "0a5vvb2ka08lyvybr12gm3lfgvfj3r99kqw1prhr9n97w7f8yc1d"; - name = "bomber-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/bomber-18.12.3.tar.xz"; + sha256 = "5b8e24aba4fb14ffc72313f9754315d6a7d98a3e00ee118a2551ac3357ead771"; + name = "bomber-18.12.3.tar.xz"; }; }; bovo = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/bovo-18.12.1.tar.xz"; - sha256 = "19w4xfqx6bxs8fr8vkma57ibl5b1jdqfjax240fg81qyqzkx4xsp"; - name = "bovo-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/bovo-18.12.3.tar.xz"; + sha256 = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972"; + name = "bovo-18.12.3.tar.xz"; }; }; calendarsupport = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/calendarsupport-18.12.1.tar.xz"; - sha256 = "0hpq85wh94dlmrfabh1k76xdc9xqavfccjnfy20i71q2ml92gx4p"; - name = "calendarsupport-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/calendarsupport-18.12.3.tar.xz"; + sha256 = "e3c23c152a3e339628e79b168e56c22c5c2610600013f3aa8706168569cacfa5"; + name = "calendarsupport-18.12.3.tar.xz"; }; }; cantor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/cantor-18.12.1.tar.xz"; - sha256 = "132zlpcqkbjdb1vrcy6innf6qmxlqibzpf0bgdi33q797vw63drc"; - name = "cantor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/cantor-18.12.3.tar.xz"; + sha256 = "2537b8e8a9e5b72a2b3bf2b08d24c4978f52ef18ced61cdcfd2a09069f670398"; + name = "cantor-18.12.3.tar.xz"; }; }; cervisia = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/cervisia-18.12.1.tar.xz"; - sha256 = "02ka1crhkb3dka3qp82vs624fz3hcwydm559x5dq0cdbibdmhqx7"; - name = "cervisia-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/cervisia-18.12.3.tar.xz"; + sha256 = "a5e4034b0d1ee07c2efaef6e8eef17b48a340e9d046cd23efceaf67f07ab5a85"; + name = "cervisia-18.12.3.tar.xz"; }; }; dolphin = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/dolphin-18.12.1.tar.xz"; - sha256 = "1d3m2h8czxqmgpd060lnj05f0r4bqirqibvbakrl1sv2xxafz8qq"; - name = "dolphin-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/dolphin-18.12.3.tar.xz"; + sha256 = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1"; + name = "dolphin-18.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz"; - sha256 = "0j2cj91732p2wh0g73xxjghbbivlva4mr91vdjrp6dkc4b2vjxh8"; - name = "dolphin-plugins-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/dolphin-plugins-18.12.3.tar.xz"; + sha256 = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427"; + name = "dolphin-plugins-18.12.3.tar.xz"; }; }; dragon = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/dragon-18.12.1.tar.xz"; - sha256 = "0ffxpl30xdm5vgrfc6b1k2gzfp3jwakn6my4zq0zfrrlf75hbgkm"; - name = "dragon-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/dragon-18.12.3.tar.xz"; + sha256 = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3"; + name = "dragon-18.12.3.tar.xz"; }; }; eventviews = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/eventviews-18.12.1.tar.xz"; - sha256 = "0qvndqj8jhrn9p1g4d4p3l54d7hz9zzkkg92yfjcajcrnl2i0fn1"; - name = "eventviews-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/eventviews-18.12.3.tar.xz"; + sha256 = "994ddea6894fd73eeb851b04083bc886288e4531aa770c0b2e5d8e1740bbe4d0"; + name = "eventviews-18.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ffmpegthumbs-18.12.1.tar.xz"; - sha256 = "0j9vwqgsb9pz8hpacsmm4pxss25q7622fr7gq1n2dxf19f1zwxki"; - name = "ffmpegthumbs-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ffmpegthumbs-18.12.3.tar.xz"; + sha256 = "4db8ab905d80863f898b6a3ea8cd0cc7baad91ad953d6b65df230079be04b338"; + name = "ffmpegthumbs-18.12.3.tar.xz"; }; }; filelight = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/filelight-18.12.1.tar.xz"; - sha256 = "1p9k1ajyjlb001mz8w8jli3ha84z91sc43721xdpngcshz7i8i6f"; - name = "filelight-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/filelight-18.12.3.tar.xz"; + sha256 = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a"; + name = "filelight-18.12.3.tar.xz"; }; }; granatier = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/granatier-18.12.1.tar.xz"; - sha256 = "02lmap2axki56d3kfhmx7h6ibqjnx5ga73vsvvx1w4fjikgzm2rn"; - name = "granatier-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/granatier-18.12.3.tar.xz"; + sha256 = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af"; + name = "granatier-18.12.3.tar.xz"; }; }; grantlee-editor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/grantlee-editor-18.12.1.tar.xz"; - sha256 = "0r85wirr4dcvja5cynjb0n51lmlijkffg35czqpjvnf2xv1claj4"; - name = "grantlee-editor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/grantlee-editor-18.12.3.tar.xz"; + sha256 = "d46831a589815581bce45c3954eb12fcbb1692fb407f566952a39e3e8c546b9c"; + name = "grantlee-editor-18.12.3.tar.xz"; }; }; grantleetheme = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/grantleetheme-18.12.1.tar.xz"; - sha256 = "1c4n27abzpynh6nykfw9z2rhxlmmicvvw0081gsm9h7w1r8n4flc"; - name = "grantleetheme-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/grantleetheme-18.12.3.tar.xz"; + sha256 = "7853075503f2a19713ce43ba077dde8036f892dee7f41e64ebc9af06b4005402"; + name = "grantleetheme-18.12.3.tar.xz"; }; }; gwenview = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/gwenview-18.12.1.tar.xz"; - sha256 = "01iraiynpsacp8hnmdc9cxlk6qakbbypdck939kcij6j7gm5l2fm"; - name = "gwenview-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/gwenview-18.12.3.tar.xz"; + sha256 = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35"; + name = "gwenview-18.12.3.tar.xz"; }; }; incidenceeditor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/incidenceeditor-18.12.1.tar.xz"; - sha256 = "1h1da8vg9x450hm9g936rms6n9d5ddqdl7jrwah3khbzihjpkgvz"; - name = "incidenceeditor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/incidenceeditor-18.12.3.tar.xz"; + sha256 = "b0fa13390b31a24a8bca99f20b132841849d95dba9de3b8a4c9ae979d226ec02"; + name = "incidenceeditor-18.12.3.tar.xz"; }; }; juk = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/juk-18.12.1.tar.xz"; - sha256 = "14zlpac1z3gaym83d5vmr7vvqwdzxhfscydwb2qv4ng947lrrs1n"; - name = "juk-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/juk-18.12.3.tar.xz"; + sha256 = "8755710f551b3173561ebfcc996f32b3fd8de78d5574584f8e37015541a9fdca"; + name = "juk-18.12.3.tar.xz"; }; }; k3b = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/k3b-18.12.1.tar.xz"; - sha256 = "1f5l8jyi30qm225nxp0sahm7lwdk9r2gqzbdrrzhadx6gfm80a4s"; - name = "k3b-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/k3b-18.12.3.tar.xz"; + sha256 = "cee825ff0c058cc1cbe3bf47a7acbe3889949460ba383ffae3756b67b418362e"; + name = "k3b-18.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kaccounts-integration-18.12.1.tar.xz"; - sha256 = "1mb9rfp7vw9bkndlbwh5ayd9m3znwrl1i6kr0s5872sscmhx2giz"; - name = "kaccounts-integration-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kaccounts-integration-18.12.3.tar.xz"; + sha256 = "6e7e4d7aac270f605a5fd4ec9efea8c13807ccb67c11fd3412c1d794ab09e6ce"; + name = "kaccounts-integration-18.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kaccounts-providers-18.12.1.tar.xz"; - sha256 = "0pjk7wsqbgibx8racd4qikv3i1j4iqgnbp81mm5nss7hilrnv1vi"; - name = "kaccounts-providers-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kaccounts-providers-18.12.3.tar.xz"; + sha256 = "4d084ffdac10a8a8cc8b79a9b17116893c023288c9e29d1cbabe3d28cd0ba5f6"; + name = "kaccounts-providers-18.12.3.tar.xz"; }; }; kaddressbook = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kaddressbook-18.12.1.tar.xz"; - sha256 = "0n4abjcq2iana9xyzkghgrs6h9nr0k2vxqrxghnh5iqahn2766ak"; - name = "kaddressbook-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kaddressbook-18.12.3.tar.xz"; + sha256 = "81d3ba7d5e8ed14b0cc32825f1efbdccbf9f79ffe4e1f8c888179c3d04b5bd28"; + name = "kaddressbook-18.12.3.tar.xz"; }; }; kajongg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kajongg-18.12.1.tar.xz"; - sha256 = "11c1iyfwqjqihyb3lqvnrb9jsrah0wl1kbrbm2lbmaqf0qnqqr8a"; - name = "kajongg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kajongg-18.12.3.tar.xz"; + sha256 = "e3fba4ddb19e8dfd43f917d737bf13c2391a3042c6941181ab81f4bcd66096f9"; + name = "kajongg-18.12.3.tar.xz"; }; }; kalarm = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalarm-18.12.1.tar.xz"; - sha256 = "1z2rf30ad2rlkcc9ki09pkrvdd8b9f60vsjzvsqfgxx8i87z1lil"; - name = "kalarm-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalarm-18.12.3.tar.xz"; + sha256 = "5c116221e78755b8afd80287885cb50380c2136acd25aa615d3f6041cc0fbeb3"; + name = "kalarm-18.12.3.tar.xz"; }; }; kalarmcal = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalarmcal-18.12.1.tar.xz"; - sha256 = "0wykbg24llympx7m9bkf4aciv6pli359nnnzpli7rh4q58vbnfn7"; - name = "kalarmcal-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalarmcal-18.12.3.tar.xz"; + sha256 = "2658b2d8055558878cf84d50daf333a5f694a586800b9ccfd3eded3304af8ef8"; + name = "kalarmcal-18.12.3.tar.xz"; }; }; kalgebra = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalgebra-18.12.1.tar.xz"; - sha256 = "09g4v4f2xlilqrf2aqsz7zbjqnnrndhhlkkwbrypn148gdnxngs4"; - name = "kalgebra-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalgebra-18.12.3.tar.xz"; + sha256 = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5"; + name = "kalgebra-18.12.3.tar.xz"; }; }; kalzium = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalzium-18.12.1.tar.xz"; - sha256 = "1c5li3dhrfiw7kpjv6kfby2c2pq22sraqb3vc0s4nz1h9jnjcah7"; - name = "kalzium-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalzium-18.12.3.tar.xz"; + sha256 = "100f63b0c1624c10ce7bb54a6a8fa6dfaf6800f580bfc0889745e171fe135fef"; + name = "kalzium-18.12.3.tar.xz"; }; }; kamera = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kamera-18.12.1.tar.xz"; - sha256 = "177lgyhc5klrpssbk2bsdwmg5hnk92mbjwb7s39kl9h53kw0jmzj"; - name = "kamera-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kamera-18.12.3.tar.xz"; + sha256 = "5e0e5a710cffd95019279d68daa27fdd4fba1401450673efa757ffc8a7ca495f"; + name = "kamera-18.12.3.tar.xz"; }; }; kamoso = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kamoso-18.12.1.tar.xz"; - sha256 = "1j467cpga2shvibwx3df4vxksfkp5q1hp6az8kcky6gljcmxy06p"; - name = "kamoso-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kamoso-18.12.3.tar.xz"; + sha256 = "ed62bbdf8eeefb85605113c3a916b01eec16846825cffe9b0b0c1f5a4580feb3"; + name = "kamoso-18.12.3.tar.xz"; }; }; kanagram = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kanagram-18.12.1.tar.xz"; - sha256 = "0ybn3aal51p29g28daalwmpm85306ivgl8rkxhccq7pzfwaww1bx"; - name = "kanagram-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kanagram-18.12.3.tar.xz"; + sha256 = "dcc06543830ab06066f2f37eba6722f5cb0893355e30cee8d522085ed5fb2204"; + name = "kanagram-18.12.3.tar.xz"; }; }; kapman = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kapman-18.12.1.tar.xz"; - sha256 = "117fkqhn0mg3z14sl64vmkz26rclfrjarf7kvxicvbw0x8s3vsgj"; - name = "kapman-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kapman-18.12.3.tar.xz"; + sha256 = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c"; + name = "kapman-18.12.3.tar.xz"; }; }; kapptemplate = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kapptemplate-18.12.1.tar.xz"; - sha256 = "1q52d30zz1ip6x8z56i25ll8hgzd6fp4pckfgr6byh82ymck8kxa"; - name = "kapptemplate-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kapptemplate-18.12.3.tar.xz"; + sha256 = "dd4e34e1ed60f4cb03836576dfd5d306ec1890cd0fe583b516bf49c628f1078f"; + name = "kapptemplate-18.12.3.tar.xz"; }; }; kate = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kate-18.12.1.tar.xz"; - sha256 = "0p9j9r2ffqh6p5pdxhk1pi8km1ypdsjs1h0g4ncnzwpvkir1rhk7"; - name = "kate-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kate-18.12.3.tar.xz"; + sha256 = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1"; + name = "kate-18.12.3.tar.xz"; }; }; katomic = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/katomic-18.12.1.tar.xz"; - sha256 = "0pxj8vgx3ijvyznn5gvhv2scwbqhaqc2pmq2897b190vsx9mvkh6"; - name = "katomic-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/katomic-18.12.3.tar.xz"; + sha256 = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1"; + name = "katomic-18.12.3.tar.xz"; }; }; kbackup = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbackup-18.12.1.tar.xz"; - sha256 = "0x42d7zssddhxdsx7vpvk4630c69pvllpfz40dqk2n3hghx9xvsw"; - name = "kbackup-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbackup-18.12.3.tar.xz"; + sha256 = "7b42f7fff48f4cf735e27603d0e44ecd13d5c85474680f8d24850eaadd4f13bf"; + name = "kbackup-18.12.3.tar.xz"; }; }; kblackbox = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kblackbox-18.12.1.tar.xz"; - sha256 = "1wlwdfh23h175gsflmfmr63myds9vz3cs5dp8gr2zlxssdhc2s1p"; - name = "kblackbox-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kblackbox-18.12.3.tar.xz"; + sha256 = "d88b2906de45b129f1706b3d250b80f86acb0cc926a3cee679265b86c8934a9b"; + name = "kblackbox-18.12.3.tar.xz"; }; }; kblocks = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kblocks-18.12.1.tar.xz"; - sha256 = "1fzsyr8g536k54j3lgqr52a1cmcdmv85z11afhkz2186smnc63pa"; - name = "kblocks-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kblocks-18.12.3.tar.xz"; + sha256 = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332"; + name = "kblocks-18.12.3.tar.xz"; }; }; kblog = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kblog-18.12.1.tar.xz"; - sha256 = "0zdqjgan05049md0483l4c27gfwqdzmmx7wv3bziy91kd9bmfv0x"; - name = "kblog-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kblog-18.12.3.tar.xz"; + sha256 = "cd84b34312f6c5a9cf56322614caafcf434a800aeff66173a2c6f7cccc0fd2cc"; + name = "kblog-18.12.3.tar.xz"; }; }; kbounce = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbounce-18.12.1.tar.xz"; - sha256 = "1209x02jip17n63ilvbi5knz4584k16c6zbrp8rg982qcabny355"; - name = "kbounce-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbounce-18.12.3.tar.xz"; + sha256 = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343"; + name = "kbounce-18.12.3.tar.xz"; }; }; kbreakout = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbreakout-18.12.1.tar.xz"; - sha256 = "0myh4qncrvm2kd2gwvl7v2078cvv66czl9zsiava8lzq588wddwq"; - name = "kbreakout-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbreakout-18.12.3.tar.xz"; + sha256 = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af"; + name = "kbreakout-18.12.3.tar.xz"; }; }; kbruch = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbruch-18.12.1.tar.xz"; - sha256 = "0jlq08c6zjmdalhbgh2fy5qghj65l12jn7wvr0j2h0s6fqck1djh"; - name = "kbruch-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbruch-18.12.3.tar.xz"; + sha256 = "e98f79865c4d095d7682ab97b0e4e7d23715e402be676d66f184cfbe3eff598d"; + name = "kbruch-18.12.3.tar.xz"; }; }; kcachegrind = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcachegrind-18.12.1.tar.xz"; - sha256 = "0w7fdsflqmkisap6mr805b6knf83nrjrr6bxi1snrl43ipy5ls29"; - name = "kcachegrind-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcachegrind-18.12.3.tar.xz"; + sha256 = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf"; + name = "kcachegrind-18.12.3.tar.xz"; }; }; kcalc = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcalc-18.12.1.tar.xz"; - sha256 = "0ffafikh53yfwrsaiyxr4qxy01v8lv02y4xvj56qmhi429j9ax93"; - name = "kcalc-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcalc-18.12.3.tar.xz"; + sha256 = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f"; + name = "kcalc-18.12.3.tar.xz"; }; }; kcalcore = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcalcore-18.12.1.tar.xz"; - sha256 = "1383zmpw8nzx1fs3d55k38f3znbdc7rs21yrka6fmymgh5c3jkki"; - name = "kcalcore-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcalcore-18.12.3.tar.xz"; + sha256 = "d6d6ce1bbdea4eac352b74bcc4bee77da107fdbafab47440b6be5fc3f9d90452"; + name = "kcalcore-18.12.3.tar.xz"; }; }; kcalutils = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcalutils-18.12.1.tar.xz"; - sha256 = "0w6kc39j3m5db8s47q4wh4wm0szl9vwr455i26d99vv8jay6mbpp"; - name = "kcalutils-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcalutils-18.12.3.tar.xz"; + sha256 = "715c48c46cd62f773da4e804e66cdb97eae7c4832a7fe058db2fca61dc4111f9"; + name = "kcalutils-18.12.3.tar.xz"; }; }; kcharselect = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcharselect-18.12.1.tar.xz"; - sha256 = "1p4ap7vs1nd9gr4z71h6cx6fz99k1lliz28ibbky9a60wvnlfim6"; - name = "kcharselect-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcharselect-18.12.3.tar.xz"; + sha256 = "e24e0268c5810cd3cf733dd8fcc8a9e04a111b761d4c1351d9976b3888278dcb"; + name = "kcharselect-18.12.3.tar.xz"; }; }; kcolorchooser = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcolorchooser-18.12.1.tar.xz"; - sha256 = "1lhnnywpfb4v1hwlc8h71lrvb145pc7wcaz7f7wf2kyh5pjkfbzn"; - name = "kcolorchooser-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcolorchooser-18.12.3.tar.xz"; + sha256 = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228"; + name = "kcolorchooser-18.12.3.tar.xz"; }; }; kcontacts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcontacts-18.12.1.tar.xz"; - sha256 = "0d32l8hhggcy6dyyps5im74k0psnxrwxa6yni5bmj8m0z7f298ba"; - name = "kcontacts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcontacts-18.12.3.tar.xz"; + sha256 = "ba244937e36456065ec4c40fd1b44d011df487a940756ddc0ddd761f58454dd3"; + name = "kcontacts-18.12.3.tar.xz"; }; }; kcron = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcron-18.12.1.tar.xz"; - sha256 = "0211xs7zwii5a93827rsnp1gkay78h2hs49lvdc2kah9ccsh0kzn"; - name = "kcron-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcron-18.12.3.tar.xz"; + sha256 = "ba1d7e3ed5453a4867b4900deb957f1020f1533bdadfc36a1c6f83921bfd6ca3"; + name = "kcron-18.12.3.tar.xz"; }; }; kdav = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdav-18.12.1.tar.xz"; - sha256 = "0kr07p4gnxyzrgnbj7vkh93wmqwnvv8sc06i2yardr8qp6jhpg77"; - name = "kdav-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdav-18.12.3.tar.xz"; + sha256 = "3ce99c65573d6374e91abff50b3a738515da07371f07c1b6e4b1800069a77c23"; + name = "kdav-18.12.3.tar.xz"; }; }; kdebugsettings = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdebugsettings-18.12.1.tar.xz"; - sha256 = "1wbi0f82dwd7a8s6szg0yc2mraiinng9a5wjw8xjacgkyyjpqbr3"; - name = "kdebugsettings-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdebugsettings-18.12.3.tar.xz"; + sha256 = "680eeec77314d23ca3a40c803b4c22a1800dc982fa81cba9f44dbfa9222539f7"; + name = "kdebugsettings-18.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kde-dev-scripts-18.12.1.tar.xz"; - sha256 = "1k0xjlwpmdl2qpj4x04q9x299wmva2ds4y2wpayah865knvx91j3"; - name = "kde-dev-scripts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kde-dev-scripts-18.12.3.tar.xz"; + sha256 = "c62f05b86615a810beb2573ee2106bc68fc8be586b66bcdde62d3ba4e4c16fb4"; + name = "kde-dev-scripts-18.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kde-dev-utils-18.12.1.tar.xz"; - sha256 = "06k01z2ljkcsdzz4zsdp8hr3flss552h0jgy25qv7y1izggk05dj"; - name = "kde-dev-utils-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kde-dev-utils-18.12.3.tar.xz"; + sha256 = "f53b896b62b7d2267b78d23fb24cf495932c4c8b552d8bf56c722a49acc54be6"; + name = "kde-dev-utils-18.12.3.tar.xz"; }; }; kdeedu-data = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdeedu-data-18.12.1.tar.xz"; - sha256 = "1pnjydj3g768z5zxwbfwvxvlhdbg9rscr3vd1dw4srs338lp0maq"; - name = "kdeedu-data-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdeedu-data-18.12.3.tar.xz"; + sha256 = "cebaa135b21cba27015b1679e02a6625b9b444828ec7595e1a46f53dd7ae3999"; + name = "kdeedu-data-18.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-mobipocket-18.12.1.tar.xz"; - sha256 = "1bv3981nsy61m8shlwbry9yb37218s2q1k9fas3xgv1260rjmmfq"; - name = "kdegraphics-mobipocket-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-mobipocket-18.12.3.tar.xz"; + sha256 = "69ae8b6f45b8c9ec3a73e636f7a779257ebbd6f8016d24294bec844a51f2cc52"; + name = "kdegraphics-mobipocket-18.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-thumbnailers-18.12.1.tar.xz"; - sha256 = "1rz578dz6nr3m23kd4njdcx01nmjgskxlla4zqgd33gg08kppmvj"; - name = "kdegraphics-thumbnailers-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-thumbnailers-18.12.3.tar.xz"; + sha256 = "9bc36ea2eb8a177899bf81b1cdc63a92b8e5dae12308f3e71046a63e58aafec0"; + name = "kdegraphics-thumbnailers-18.12.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdenetwork-filesharing-18.12.1.tar.xz"; - sha256 = "1zxkbcdndbr3sygwpiiw70pxb71hil1x8zj7lgq2yyw968ianah4"; - name = "kdenetwork-filesharing-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdenetwork-filesharing-18.12.3.tar.xz"; + sha256 = "296c71526de0e51b4385962c76c2870cfe344b9dafdd2f5f2fba81801350d503"; + name = "kdenetwork-filesharing-18.12.3.tar.xz"; }; }; kdenlive = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdenlive-18.12.1.tar.xz"; - sha256 = "189p0sqlmfkaxsdiy1mh0mmskw6ha4zi64fx99w7wnbid8x52bjf"; - name = "kdenlive-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdenlive-18.12.3.tar.xz"; + sha256 = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64"; + name = "kdenlive-18.12.3.tar.xz"; }; }; kdepim-addons = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdepim-addons-18.12.1.tar.xz"; - sha256 = "1gz6rqg39vl2arzs64srpr7xn1syxxiznz58gdss40152gz0hlsp"; - name = "kdepim-addons-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdepim-addons-18.12.3.tar.xz"; + sha256 = "450a3f257e998e733b69703a1a813abab93c571c602702cbb4d9ab4ac25e8ce5"; + name = "kdepim-addons-18.12.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdepim-apps-libs-18.12.1.tar.xz"; - sha256 = "06q306m09666jh4cx3w0bif81x424hxlvsf31wjhfzdp737xfq3i"; - name = "kdepim-apps-libs-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdepim-apps-libs-18.12.3.tar.xz"; + sha256 = "40a6fb24fc262f5340fda4aed453c5d515976aea745765e83cf8053b44d60164"; + name = "kdepim-apps-libs-18.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdepim-runtime-18.12.1.tar.xz"; - sha256 = "1vb9rqzyjww7lkc3g2aw43ks7is1bg1nx2mbn8wvmc7cgga66nbc"; - name = "kdepim-runtime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdepim-runtime-18.12.3.tar.xz"; + sha256 = "f3a5da19bb0f60e148d071cf07fd9fd4e6ea116f6125567c767c03b98ea844c3"; + name = "kdepim-runtime-18.12.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdesdk-kioslaves-18.12.1.tar.xz"; - sha256 = "05bds4r70ys4mygmjl5x5hcrygds57mqqmzfv79zq9hcfp2b0g69"; - name = "kdesdk-kioslaves-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdesdk-kioslaves-18.12.3.tar.xz"; + sha256 = "1f1951eca1c4081277782e80ef6b7c6768b2bb5a7d1830d69954f2fec27462ad"; + name = "kdesdk-kioslaves-18.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdesdk-thumbnailers-18.12.1.tar.xz"; - sha256 = "1584qy2aa8q7zzgf2zxqw7p2h2l2xfgsa2mrmxaa36xaxbglcvkb"; - name = "kdesdk-thumbnailers-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdesdk-thumbnailers-18.12.3.tar.xz"; + sha256 = "a4694da94bd671a1395a32a527c919fb2207e8a959ceff32a11488e2015a784b"; + name = "kdesdk-thumbnailers-18.12.3.tar.xz"; }; }; kdf = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdf-18.12.1.tar.xz"; - sha256 = "0zr6k8di9fvzmgvh4s8ji81zdynpkg5yrnddlc9mgid0w9czaw11"; - name = "kdf-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdf-18.12.3.tar.xz"; + sha256 = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae"; + name = "kdf-18.12.3.tar.xz"; }; }; kdialog = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdialog-18.12.1.tar.xz"; - sha256 = "0i4c2kjyp0dix12vxhj078h7vbylcqxgqx10hzwaszx3wlrycwa2"; - name = "kdialog-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdialog-18.12.3.tar.xz"; + sha256 = "8b17013ced4b02ceaf89ed3d3fdcfa4fce06fac54d54041fb1e47169f2def212"; + name = "kdialog-18.12.3.tar.xz"; }; }; kdiamond = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdiamond-18.12.1.tar.xz"; - sha256 = "0j5g1gh267q528k0947brc8nvgq81690hqp7mrf90wxg8qp4ysm4"; - name = "kdiamond-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdiamond-18.12.3.tar.xz"; + sha256 = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500"; + name = "kdiamond-18.12.3.tar.xz"; }; }; keditbookmarks = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/keditbookmarks-18.12.1.tar.xz"; - sha256 = "0fnxmgfgnh8d6sg7g7ai53xywa22qv4pn4xxj503rjs4a3fsm3j1"; - name = "keditbookmarks-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/keditbookmarks-18.12.3.tar.xz"; + sha256 = "8d1f1a6ffa3b68d318ac6eb72707e5e5bb4f6f43ebb25c0475121469a71f6a8d"; + name = "keditbookmarks-18.12.3.tar.xz"; }; }; kfind = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kfind-18.12.1.tar.xz"; - sha256 = "1vhi66syjhmc5i64ffgpilyxw9y10qb7633p3gx7vsnbjhvfx45b"; - name = "kfind-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kfind-18.12.3.tar.xz"; + sha256 = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9"; + name = "kfind-18.12.3.tar.xz"; }; }; kfloppy = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kfloppy-18.12.1.tar.xz"; - sha256 = "1fx40gb7h0z832qidn635jj7caipxcrzxmrbdfnj8ji2sczs1hyq"; - name = "kfloppy-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kfloppy-18.12.3.tar.xz"; + sha256 = "d68af7c572591a1a297cc823c1cb16a8a15973983c31f2e598d75dcc09ae2363"; + name = "kfloppy-18.12.3.tar.xz"; }; }; kfourinline = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kfourinline-18.12.1.tar.xz"; - sha256 = "1dwa4nw6998ljbppr4bhwpdg201djk5rjrzjgfs5xv0pynamph0g"; - name = "kfourinline-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kfourinline-18.12.3.tar.xz"; + sha256 = "cd3c3129c50502d9fe35f2382fcb1a512519626eb1b776600fdac2190390b9ce"; + name = "kfourinline-18.12.3.tar.xz"; }; }; kgeography = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kgeography-18.12.1.tar.xz"; - sha256 = "02xir13p0r67vx3csdra9nza82a25k807cjl3w2pq3dqcg9grrcf"; - name = "kgeography-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kgeography-18.12.3.tar.xz"; + sha256 = "ae019c4fc6c2b52344466266a19c6047e5dc414a92461a21d0e9c003dd4433c9"; + name = "kgeography-18.12.3.tar.xz"; }; }; kget = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kget-18.12.1.tar.xz"; - sha256 = "0jlpih49rifpqzxzgjc4kv3hv7y42v6pcamyvrmk6q1768lqp7nb"; - name = "kget-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kget-18.12.3.tar.xz"; + sha256 = "3386c07c61f072df4259f83895be43c64559c059c24df1b31ca66c4f2b599f86"; + name = "kget-18.12.3.tar.xz"; }; }; kgoldrunner = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kgoldrunner-18.12.1.tar.xz"; - sha256 = "19qdw319lzfhmmmmawdpb0dlkz9k1iz6imkwf1qndfv89b6wklba"; - name = "kgoldrunner-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kgoldrunner-18.12.3.tar.xz"; + sha256 = "1d54b485ccb81106853d5229422c753a5b0bbd2f9239a17b1c44f737a32d93b6"; + name = "kgoldrunner-18.12.3.tar.xz"; }; }; kgpg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kgpg-18.12.1.tar.xz"; - sha256 = "1rar3hj3wc9vpxc81h0ly1mi87m9cdx17j58k9n02q91jqb8892y"; - name = "kgpg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kgpg-18.12.3.tar.xz"; + sha256 = "05d70923f4c9d068b339dc0a3d3f28890cafe1fbef9820dd6157c1f5fd8f19e8"; + name = "kgpg-18.12.3.tar.xz"; }; }; khangman = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/khangman-18.12.1.tar.xz"; - sha256 = "10wk0xdrs6pldg8j5bnsbdx835isxrapb1gm9gx4vjj49riq062q"; - name = "khangman-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/khangman-18.12.3.tar.xz"; + sha256 = "1a7cdd27abf229603965ff6b3392bd7935f7f5a2d6418b23f802cfae45f74013"; + name = "khangman-18.12.3.tar.xz"; }; }; khelpcenter = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/khelpcenter-18.12.1.tar.xz"; - sha256 = "143f61ngvljm4046q4allwxhx6fis0hd92xdqk8955xwdf42fq6y"; - name = "khelpcenter-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/khelpcenter-18.12.3.tar.xz"; + sha256 = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8"; + name = "khelpcenter-18.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kidentitymanagement-18.12.1.tar.xz"; - sha256 = "1pl8yzrhfvkxcxasywzklhpx2477whn662s13c5mp6yhpxyxl5xq"; - name = "kidentitymanagement-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kidentitymanagement-18.12.3.tar.xz"; + sha256 = "4e8cac86c2ecfe6325bbf8fb7e50a026f6af978be3809f327eddfed7b3aed662"; + name = "kidentitymanagement-18.12.3.tar.xz"; }; }; kig = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kig-18.12.1.tar.xz"; - sha256 = "0cc093gwq2cr4ir3rdfkhijjsjvjddw4n7hvrxbshv7pqmnbrjgc"; - name = "kig-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kig-18.12.3.tar.xz"; + sha256 = "abba87c3569e571e6d1761dc2e6c0e32969ea09eba6d9c0462cb4dc7bd62d7a2"; + name = "kig-18.12.3.tar.xz"; }; }; kigo = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kigo-18.12.1.tar.xz"; - sha256 = "07m3p9r59c4qfwpgipb024mzxi4safiidpypm8gmx87vbsqc99f2"; - name = "kigo-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kigo-18.12.3.tar.xz"; + sha256 = "fa767319c3ac3e2dea48a5b09284e47e5f0c5d1862af813258758773998d1484"; + name = "kigo-18.12.3.tar.xz"; }; }; killbots = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/killbots-18.12.1.tar.xz"; - sha256 = "12jbvqmi0cx5ma7lai67qamml7qig269vhvjrcvm7jwlg0qx8v43"; - name = "killbots-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/killbots-18.12.3.tar.xz"; + sha256 = "4efb4fcd4f34f1843b990a92e5b0309c196071f0778cdc8376eff5eef405deb9"; + name = "killbots-18.12.3.tar.xz"; }; }; kimagemapeditor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kimagemapeditor-18.12.1.tar.xz"; - sha256 = "1mqzd3ja27c4askz9cxfaf6g8wcwlasjka79h4dmvjrw4rkqs4y4"; - name = "kimagemapeditor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kimagemapeditor-18.12.3.tar.xz"; + sha256 = "addaaf257c35e8169288a8e7a50a1628f3ceeb6a2a845c3d260dfe94662438c6"; + name = "kimagemapeditor-18.12.3.tar.xz"; }; }; kimap = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kimap-18.12.1.tar.xz"; - sha256 = "1v1qd91pr4xx0wsvvqlg8pcsbyi0n7c90ki0pz8v8z2vay5fagnm"; - name = "kimap-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kimap-18.12.3.tar.xz"; + sha256 = "00aed701a3bdcc218902998e63e7c587549f77a1aa0d1bd7dad4a1837adc9992"; + name = "kimap-18.12.3.tar.xz"; }; }; kio-extras = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kio-extras-18.12.1.tar.xz"; - sha256 = "17y5awdyck2zjrgb9l2s4rdyvp1pqc6jrdyjv5vhchjdkfb91vw3"; - name = "kio-extras-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kio-extras-18.12.3.tar.xz"; + sha256 = "f8879abaea6fcf31ee0bd4a55d0c24a5fded6d61abed1b059f704f797793aef2"; + name = "kio-extras-18.12.3.tar.xz"; }; }; kirigami-gallery = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kirigami-gallery-18.12.1.tar.xz"; - sha256 = "1wrvhpdg2qk6ri1hjhdbk6w6rzyxamn6hxfl4mjcaip9gamjlbr0"; - name = "kirigami-gallery-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kirigami-gallery-18.12.3.tar.xz"; + sha256 = "64da8da506718e6b7b62e04a9d2fc40ec73f909f9a6b5afd29b4c81c20053e39"; + name = "kirigami-gallery-18.12.3.tar.xz"; }; }; kiriki = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kiriki-18.12.1.tar.xz"; - sha256 = "1sxn7qvhyaaf4681hx1hgv2mmfhn64qn6q0rad9vps69cb1rx7pz"; - name = "kiriki-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kiriki-18.12.3.tar.xz"; + sha256 = "0b67b5069625fe04f6ffaa65d0d4abcf86f2f067483b4db15508d2b5ee9742ac"; + name = "kiriki-18.12.3.tar.xz"; }; }; kiten = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kiten-18.12.1.tar.xz"; - sha256 = "1d964cc7bkr1vgsbbnm9c8na2nls3kmfk9wfkrzdgnj2643dl947"; - name = "kiten-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kiten-18.12.3.tar.xz"; + sha256 = "0e0bc0b0b2609a7872b45647976c87ec92ccb068d05113b8dc58e43c6eb1facf"; + name = "kiten-18.12.3.tar.xz"; }; }; kitinerary = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kitinerary-18.12.1.tar.xz"; - sha256 = "14bkyi4xj00i8bzjq6z68y67iyylix0c1n8wr1nz0s05pmlg8sws"; - name = "kitinerary-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kitinerary-18.12.3.tar.xz"; + sha256 = "f45ef90cb3fb53d83a30837c304b9f7cfa5dbf2953421233d97c101d66a81f35"; + name = "kitinerary-18.12.3.tar.xz"; }; }; kjumpingcube = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kjumpingcube-18.12.1.tar.xz"; - sha256 = "0i7lj2qi3mdvghpxyhwiakivxsd85ahy427d418sdykh7dfmn9ih"; - name = "kjumpingcube-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kjumpingcube-18.12.3.tar.xz"; + sha256 = "6409a3bb398ab90959afc24fa42b01b6e544526b1dab6f36bb700703fa794993"; + name = "kjumpingcube-18.12.3.tar.xz"; }; }; kldap = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kldap-18.12.1.tar.xz"; - sha256 = "117w3jk4i77p8a7dvj03kgxqlhgbkmhyl7w282gl38kxyr7z8hbn"; - name = "kldap-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kldap-18.12.3.tar.xz"; + sha256 = "dc5c8f33aad9e82f0cee65c6fc530f6bd9b82ec9cc21d1ce904f0fe9bdf5140e"; + name = "kldap-18.12.3.tar.xz"; }; }; kleopatra = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kleopatra-18.12.1.tar.xz"; - sha256 = "1njgfigld774r9xyckip118svxrkylh0a5ib5y8976zb0v71m5mj"; - name = "kleopatra-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kleopatra-18.12.3.tar.xz"; + sha256 = "ea165519846d70206e951d8d904bc02d17ed724db100638e657f7c930c4c490b"; + name = "kleopatra-18.12.3.tar.xz"; }; }; klettres = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/klettres-18.12.1.tar.xz"; - sha256 = "0xxrkx468wx2f3gb3d77i648xxmy6bq6q0nq121fk2apgdp2dzqk"; - name = "klettres-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/klettres-18.12.3.tar.xz"; + sha256 = "4ca89a54858d1f8ac43e8cb485b80a3bb5ead501d39e7e30d8c9b6b8d2d7fd93"; + name = "klettres-18.12.3.tar.xz"; }; }; klickety = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/klickety-18.12.1.tar.xz"; - sha256 = "14jvifvm47q0ca7jq7d152l53nswhbwggs0q067n3chmf07g2izy"; - name = "klickety-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/klickety-18.12.3.tar.xz"; + sha256 = "45ed455fd9628aaf081bfa6b672199fbb6913c7dc5d5c04ad9df206a3bd962a5"; + name = "klickety-18.12.3.tar.xz"; }; }; klines = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/klines-18.12.1.tar.xz"; - sha256 = "1bs7vaqs67232msmsrsfi9avbqrzvyjihsakzxpkn976xwql3zxf"; - name = "klines-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/klines-18.12.3.tar.xz"; + sha256 = "6d93e5bee1135f4eeb67e7f845a4fd658be7e5fb33f42c0ad6320200bc86fd80"; + name = "klines-18.12.3.tar.xz"; }; }; kmag = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmag-18.12.1.tar.xz"; - sha256 = "1ig9fbnza2xvxvd1adh9riv3zmrdmm0km8jpqjmh124i8g416qpw"; - name = "kmag-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmag-18.12.3.tar.xz"; + sha256 = "04f1357e46bb3e32c85f08c9d5655cde6351c6efd27824a17019ea8562e8d5ba"; + name = "kmag-18.12.3.tar.xz"; }; }; kmahjongg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmahjongg-18.12.1.tar.xz"; - sha256 = "0ajml6xy4ljmrn5qbvy08mcf5v5jqzmclsbr6811rrxqxb5fqbqd"; - name = "kmahjongg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmahjongg-18.12.3.tar.xz"; + sha256 = "188a8d921b72965d4ed0f6490048cde7b9d5606cca7d3cea12463dc71a90ccf6"; + name = "kmahjongg-18.12.3.tar.xz"; }; }; kmail = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmail-18.12.1.tar.xz"; - sha256 = "1wakrrlxp3v0k93hx2c8p136a3hd746l8fxks0g3cwvhl1immxw7"; - name = "kmail-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmail-18.12.3.tar.xz"; + sha256 = "9dd9865d4a463ac552c25126ecaee662b83548091c5abef168bdc7a6d2fb5c76"; + name = "kmail-18.12.3.tar.xz"; }; }; kmail-account-wizard = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmail-account-wizard-18.12.1.tar.xz"; - sha256 = "0v3lwgk3b30ggv6573r6k5z09lcpfzspp5znnsn4650fgrrzg2j3"; - name = "kmail-account-wizard-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmail-account-wizard-18.12.3.tar.xz"; + sha256 = "102a4170cb4f80c7a9ba3aec7a4d34a3e6a8ca18c975b5c0ea33cf7bac9e21df"; + name = "kmail-account-wizard-18.12.3.tar.xz"; }; }; kmailtransport = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmailtransport-18.12.1.tar.xz"; - sha256 = "1ybaps485ic2m8nfy63kw6x7f3l2l67lhyy5zsm7rjipbaqgi2vm"; - name = "kmailtransport-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmailtransport-18.12.3.tar.xz"; + sha256 = "8aaa6045f29195074c61fd58112ca7dfbe594df66cac91bac7b246ab2ab9fad1"; + name = "kmailtransport-18.12.3.tar.xz"; }; }; kmbox = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmbox-18.12.1.tar.xz"; - sha256 = "0anh25klbgb67ynl9mlcny2mrawsd98mzyffvgsd8xkback684zf"; - name = "kmbox-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmbox-18.12.3.tar.xz"; + sha256 = "13a88db1ab0d628a3053a0d6ab5d89cd2f6cbadb3082b52e5dc7048516a10841"; + name = "kmbox-18.12.3.tar.xz"; }; }; kmime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmime-18.12.1.tar.xz"; - sha256 = "05kjfqaadkflyh1vabzgbx33vr3c70sm2nkp8r9dsa7kg3wij0n2"; - name = "kmime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmime-18.12.3.tar.xz"; + sha256 = "a09b0757e6ba663bf52d9bb8f7f104f3f19f734a858f6d532a6a20888ebcd274"; + name = "kmime-18.12.3.tar.xz"; }; }; kmines = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmines-18.12.1.tar.xz"; - sha256 = "0dq1jirzb6ljhb7wdrrkyxvmlwg84xzhfikcn9v6nmz9f3pbliwi"; - name = "kmines-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmines-18.12.3.tar.xz"; + sha256 = "40c16b57614098555c32252c75e3890922b62d7005b9059f6ae92e11c96d980f"; + name = "kmines-18.12.3.tar.xz"; }; }; kmix = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmix-18.12.1.tar.xz"; - sha256 = "1ra7jmi5xlq9gbh7csv40sxr20lv8dz659m1jx4ixkzppcj42s73"; - name = "kmix-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmix-18.12.3.tar.xz"; + sha256 = "4edf31a36a5d700cc190ba7a5a0d76789729069d48324a22bda7977cb4ed081a"; + name = "kmix-18.12.3.tar.xz"; }; }; kmousetool = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmousetool-18.12.1.tar.xz"; - sha256 = "07ywyxkm510faaqzywp5rw0lr2x1djhyhkjwyv8l42iw7231bn8x"; - name = "kmousetool-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmousetool-18.12.3.tar.xz"; + sha256 = "34f6bb6f69c284e9cc88d8a31d59c16f003310c33e1e1affd5c363d18f8a91a8"; + name = "kmousetool-18.12.3.tar.xz"; }; }; kmouth = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmouth-18.12.1.tar.xz"; - sha256 = "1g82shlrfm70ddfy2zfv12gv8hwzavz47q4qsyblyzq329kwgww5"; - name = "kmouth-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmouth-18.12.3.tar.xz"; + sha256 = "89b83fb8b4a5eb3c7a6409cd25c730a8bc3be72983c1a75f5e3d3abf01064486"; + name = "kmouth-18.12.3.tar.xz"; }; }; kmplot = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmplot-18.12.1.tar.xz"; - sha256 = "0xl913pajyrhadld2ij9y0ai2w558wa60qfx1y1xwsjfm8124qgf"; - name = "kmplot-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmplot-18.12.3.tar.xz"; + sha256 = "2dd6eec34088b5d3b591091cce41616ee310a66aa2d16e5800db56044d60dd7b"; + name = "kmplot-18.12.3.tar.xz"; }; }; knavalbattle = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knavalbattle-18.12.1.tar.xz"; - sha256 = "1p03c980w4d10mkmvm01imi7vg6cp3wqz0wvw2d5vz47i0jhm2w8"; - name = "knavalbattle-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knavalbattle-18.12.3.tar.xz"; + sha256 = "bce9294830a55e96b234c93fa20eb7d7ae963223e724ab0211ec472c79d35fa3"; + name = "knavalbattle-18.12.3.tar.xz"; }; }; knetwalk = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knetwalk-18.12.1.tar.xz"; - sha256 = "0x5794f91b84l4d8hgkqi33rdqa7s1plhprhmbfvsi4grpms6c0c"; - name = "knetwalk-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knetwalk-18.12.3.tar.xz"; + sha256 = "75ed9859ebb0c40d4efadaf1724b50c1a0436a5d3cd7cb540031cf5535794e3f"; + name = "knetwalk-18.12.3.tar.xz"; }; }; knights = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knights-18.12.1.tar.xz"; - sha256 = "17n7zi100q62wjavfr87369yqp2mjxqz0lyqalagjp25d80z18l2"; - name = "knights-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knights-18.12.3.tar.xz"; + sha256 = "9472ffa7800bd79a84dd0c36e3058d3f6e0813b5695aeffeb73bccb801870990"; + name = "knights-18.12.3.tar.xz"; }; }; knotes = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knotes-18.12.1.tar.xz"; - sha256 = "12n40znf9vczvbf5xfj4zsxwbj2rdj7l1iasmiiil2md8iyjs6dz"; - name = "knotes-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knotes-18.12.3.tar.xz"; + sha256 = "4cd3a4e5064211f3df6ebf4711c2f4e01b09c77580493de9070c9ee842059578"; + name = "knotes-18.12.3.tar.xz"; }; }; kolf = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kolf-18.12.1.tar.xz"; - sha256 = "072nmvsxm8ky1nz2pp6ri74ms3rql0qqg004mzbbq061dil4k63i"; - name = "kolf-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kolf-18.12.3.tar.xz"; + sha256 = "330cd299702e282a8b248b81cd50ee7ff60a6f512967029730ab87bedb69652f"; + name = "kolf-18.12.3.tar.xz"; }; }; kollision = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kollision-18.12.1.tar.xz"; - sha256 = "0idjjfgj8fk0c0l5i6x80cg20p1rpq6kab8z9rh2izvg1v6h7qvl"; - name = "kollision-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kollision-18.12.3.tar.xz"; + sha256 = "17376f73da0ea5e05998a4f9f0ccb6c0e41461007b8815637ac1980673e9a856"; + name = "kollision-18.12.3.tar.xz"; }; }; kolourpaint = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kolourpaint-18.12.1.tar.xz"; - sha256 = "0h454h5rzk0wki8lbmz57xx3859c27sy9vk1mwawfj963785f2nd"; - name = "kolourpaint-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kolourpaint-18.12.3.tar.xz"; + sha256 = "450b714f0d73b59d31c4ceda142a3496d14e51d84b8c8968548a15e05c138f98"; + name = "kolourpaint-18.12.3.tar.xz"; }; }; kompare = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kompare-18.12.1.tar.xz"; - sha256 = "099fkxmk7g19l07lf2v3hmqrgfd17fbsv4m5cxdjci8alizw8pp9"; - name = "kompare-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kompare-18.12.3.tar.xz"; + sha256 = "7a132a0aced98079fdec37188e9a46f5399e7584ab9d39801d7f0f8176623285"; + name = "kompare-18.12.3.tar.xz"; }; }; konqueror = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/konqueror-18.12.1.tar.xz"; - sha256 = "08j4x2xi1iv5661gjpcakp2dmdhvhw3jad98kq3xj9989s7phpfy"; - name = "konqueror-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/konqueror-18.12.3.tar.xz"; + sha256 = "d9eb2bb4cd121f9967c6d6e7275dfb56bd41aec03c2b9d903d543b330ca4666a"; + name = "konqueror-18.12.3.tar.xz"; }; }; konquest = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/konquest-18.12.1.tar.xz"; - sha256 = "0mlk2vm53nc9dc7ca9ah3ly9qs94md24pi2gmv68pz1ysr51i483"; - name = "konquest-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/konquest-18.12.3.tar.xz"; + sha256 = "3698253f8e873819680ed99f377a679bacf5351f3fadc92c07fbaa0f6b269172"; + name = "konquest-18.12.3.tar.xz"; }; }; konsole = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/konsole-18.12.1.tar.xz"; - sha256 = "15w1jizs4q6mivv7qjkf0gkqlz0jnrz7b2i59r3kx2fvwwwl18rg"; - name = "konsole-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/konsole-18.12.3.tar.xz"; + sha256 = "01ff3245d755a6e38207e58e50e5f82e5c681ead2ad7176d46aec00a8a562e08"; + name = "konsole-18.12.3.tar.xz"; }; }; kontact = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kontact-18.12.1.tar.xz"; - sha256 = "0bqn9vh75wpkks1l9hd2bm33k1im356x2091xlnnzs70m4gjxhag"; - name = "kontact-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kontact-18.12.3.tar.xz"; + sha256 = "81426545a958d6d71210040f5ede6407048a16d320ea90c405318cdd7e8e9315"; + name = "kontact-18.12.3.tar.xz"; }; }; kontactinterface = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kontactinterface-18.12.1.tar.xz"; - sha256 = "0khba3wnpwji4mm5n56bcnffd1v9w4a1b1r7lhlz88dqkakqyb61"; - name = "kontactinterface-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kontactinterface-18.12.3.tar.xz"; + sha256 = "4895e884c93ebff36a721f5161386105e729925dbbbf6fafb94c75ba4b291e41"; + name = "kontactinterface-18.12.3.tar.xz"; }; }; kopete = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kopete-18.12.1.tar.xz"; - sha256 = "12q62nj287qc4gz8q66spk1d0xykrwkphwaxrh2i3sd07bjmyzqs"; - name = "kopete-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kopete-18.12.3.tar.xz"; + sha256 = "8ca7a41e39be23ca6802deade7b5edb88b7e3000bc8e6fb2f68efbc15c2c8d3b"; + name = "kopete-18.12.3.tar.xz"; }; }; korganizer = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/korganizer-18.12.1.tar.xz"; - sha256 = "1g8wjrghzxgx9xhqf98z9xlq5svl2v931ifczsfkvs9d3smx2zsg"; - name = "korganizer-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/korganizer-18.12.3.tar.xz"; + sha256 = "6a63e60b60af6cb95c78382da15e9e3cf04f936689ce12b62fe38968fad75a9c"; + name = "korganizer-18.12.3.tar.xz"; }; }; kpat = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kpat-18.12.1.tar.xz"; - sha256 = "1ami2bssnjm01k3i6bqqciszablkw6975hac2d8zzvg2bz8g4a2a"; - name = "kpat-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kpat-18.12.3.tar.xz"; + sha256 = "62c31d6f7a9bb49c09725722bea472811d897b149e29558ca6e248b5d2a41377"; + name = "kpat-18.12.3.tar.xz"; }; }; kpimtextedit = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kpimtextedit-18.12.1.tar.xz"; - sha256 = "13ki9gjgakyqcxx4hvs0plqgw0rqx0z95dnyaqv1safqkwrr76hb"; - name = "kpimtextedit-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kpimtextedit-18.12.3.tar.xz"; + sha256 = "54586fc97eb863eaa57e589d4461dd9cfbc4d12e58425afadcd22d64ba8a570d"; + name = "kpimtextedit-18.12.3.tar.xz"; }; }; kpkpass = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kpkpass-18.12.1.tar.xz"; - sha256 = "1sw3gpvai71lliq4y1snxrhzi9jhl1vxkimlxl2nmhg951nzd4xx"; - name = "kpkpass-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kpkpass-18.12.3.tar.xz"; + sha256 = "cd70809ab7a052e0ca2a18266ec5564bde16ac917988798290e3f01e428bd84f"; + name = "kpkpass-18.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kqtquickcharts-18.12.1.tar.xz"; - sha256 = "0i8qww267q797pxk3k66d09b0dp7ixbxf92p5bsqf7z4p2graayl"; - name = "kqtquickcharts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kqtquickcharts-18.12.3.tar.xz"; + sha256 = "739859dc261856cf253ac67e2273b20dee476735b4107ece991d7146d45c1bbe"; + name = "kqtquickcharts-18.12.3.tar.xz"; }; }; krdc = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/krdc-18.12.1.tar.xz"; - sha256 = "1smdav92rfr92mxk8q7wcmmvrf746vn2xyw36hyszq561ycgwwrx"; - name = "krdc-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/krdc-18.12.3.tar.xz"; + sha256 = "c01896b73ab058a20f4c3d8997c28cbb81a7000f5aec346592a9315412c10666"; + name = "krdc-18.12.3.tar.xz"; }; }; kreversi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kreversi-18.12.1.tar.xz"; - sha256 = "171w76xv9dbhy7pxs9swq7xknrwkjk5ndgq4waj6m5dh0109qmx4"; - name = "kreversi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kreversi-18.12.3.tar.xz"; + sha256 = "818ef2ded02caacf2ccf3c012e992070c3b898db319682e8a42cf5726d56b3fc"; + name = "kreversi-18.12.3.tar.xz"; }; }; krfb = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/krfb-18.12.1.tar.xz"; - sha256 = "0bhhlp4ask2xqzq9igw0akxr0gb0iilaljwqrcw91fx36sxq46p4"; - name = "krfb-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/krfb-18.12.3.tar.xz"; + sha256 = "9596adfe7135930c6c9c8ecd05035e401d80a5e2cd532ba343b7d4c0f57a799b"; + name = "krfb-18.12.3.tar.xz"; }; }; kross-interpreters = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kross-interpreters-18.12.1.tar.xz"; - sha256 = "0k57qprmpspp9b8vb124h1whgyskmwd6q7l60vswqizc64xa2src"; - name = "kross-interpreters-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kross-interpreters-18.12.3.tar.xz"; + sha256 = "ce2231b2faa9accc6342a37024651b988eefbcb9b3968025ffa4752d0cbdc70c"; + name = "kross-interpreters-18.12.3.tar.xz"; }; }; kruler = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kruler-18.12.1.tar.xz"; - sha256 = "1wfxapw6grx860wa6fyya8fnvlrpmdzsz64fnx64h0mky09j21r6"; - name = "kruler-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kruler-18.12.3.tar.xz"; + sha256 = "1b347c552648caca99364a0524945d0849cd84b29e4d07f62ee518ec07a98e33"; + name = "kruler-18.12.3.tar.xz"; }; }; kshisen = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kshisen-18.12.1.tar.xz"; - sha256 = "0wz4jfrqqvzz2p5f6hwyj7rpijsnhbzmm2m7jhjrljjl5lfdqd3x"; - name = "kshisen-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kshisen-18.12.3.tar.xz"; + sha256 = "00c5de16c335262287bab37b07822b6fd2997abcec25a0ad0a7d1ece6769060f"; + name = "kshisen-18.12.3.tar.xz"; }; }; ksirk = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksirk-18.12.1.tar.xz"; - sha256 = "108bw284jsff3qgg98vzs93m6dl8wjfkmbrkjgij03w00jb47bqf"; - name = "ksirk-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksirk-18.12.3.tar.xz"; + sha256 = "cb8f3cc98fe861b0f4ebff77aeeffa12905b98b6db0c8800525f4fb052be4e7a"; + name = "ksirk-18.12.3.tar.xz"; }; }; ksmtp = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksmtp-18.12.1.tar.xz"; - sha256 = "0zj4gpfz2njrdnfbjy7s9xci0il7qmmzargkszgj9jdzpm5qlaas"; - name = "ksmtp-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksmtp-18.12.3.tar.xz"; + sha256 = "90578b1b3ac1ce14bf4f34799b1b400b06734c72f3fecd41f5f07aed37ed3b74"; + name = "ksmtp-18.12.3.tar.xz"; }; }; ksnakeduel = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksnakeduel-18.12.1.tar.xz"; - sha256 = "1l0gfh5vfcfnk3sdl8wsqbc2vcmsdf9frpngfacv4ndm4xc371ql"; - name = "ksnakeduel-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksnakeduel-18.12.3.tar.xz"; + sha256 = "5d55e4c11baecbd77b94dd004b490a7f73870a383e0bf3ad0381f22d36a27a36"; + name = "ksnakeduel-18.12.3.tar.xz"; }; }; kspaceduel = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kspaceduel-18.12.1.tar.xz"; - sha256 = "01pcnqpzbrnwxavmfpdib78kc44am9in711012j2621cccx2r9cw"; - name = "kspaceduel-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kspaceduel-18.12.3.tar.xz"; + sha256 = "f40d0a7c578f461875efaf9e25d2b061486a21f750ce8bc922db4aed6fed1f11"; + name = "kspaceduel-18.12.3.tar.xz"; }; }; ksquares = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksquares-18.12.1.tar.xz"; - sha256 = "1gyd7qipp821jzn94yrw4b0d46ays0hs26q17hxnbx07hyfj3kcb"; - name = "ksquares-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksquares-18.12.3.tar.xz"; + sha256 = "82a90b7fe5ca8e46950a0de1742783c522fcd85bbc3aabe5955834865bc36b7d"; + name = "ksquares-18.12.3.tar.xz"; }; }; ksudoku = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksudoku-18.12.1.tar.xz"; - sha256 = "1cm5r4fkc7ha0c3mbcank9h2fhym7qc8k1q69lpmzrbm9hw2kgrs"; - name = "ksudoku-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksudoku-18.12.3.tar.xz"; + sha256 = "4a44248f2bde9c66c911fe7ed7bd54e31956053dac18e29217a355ad2b3a05e1"; + name = "ksudoku-18.12.3.tar.xz"; }; }; ksystemlog = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksystemlog-18.12.1.tar.xz"; - sha256 = "1s5b4j67q6nm7r4b1ibvypsd5z9la7cri7z1r7hzihv4nry8pk5c"; - name = "ksystemlog-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksystemlog-18.12.3.tar.xz"; + sha256 = "93f276698b74af654f3ed147d5c025162bd919ec6c79a7c7dd7678051c307e52"; + name = "ksystemlog-18.12.3.tar.xz"; }; }; kteatime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kteatime-18.12.1.tar.xz"; - sha256 = "01p4d61d16k2pppf51sz52y0w4qc1dyqnmhjlnr5w75rfmwvvivg"; - name = "kteatime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kteatime-18.12.3.tar.xz"; + sha256 = "24b3e51edc9d6625ca5b3542bd5edd1d42d79142f2c30f886e1b9515dcdfac6d"; + name = "kteatime-18.12.3.tar.xz"; }; }; ktimer = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktimer-18.12.1.tar.xz"; - sha256 = "0wqkfvbdcnwh1jzn2ac7k4pa8amr51ajhljc95mvps03m9d92rsf"; - name = "ktimer-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktimer-18.12.3.tar.xz"; + sha256 = "b3808fa9821c3a624b880b9a5607c8e12287cd38418ff06dd9af8345f324fe7e"; + name = "ktimer-18.12.3.tar.xz"; }; }; ktnef = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktnef-18.12.1.tar.xz"; - sha256 = "0id7hkmgr5zc12zfrj5ydxyhgdrlx4ip1dsw301i27id104fqb69"; - name = "ktnef-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktnef-18.12.3.tar.xz"; + sha256 = "7633f86514d01a1e3709f6854b3b9c859fa1905043bb53240c1ae53f3b76a6ec"; + name = "ktnef-18.12.3.tar.xz"; }; }; ktouch = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktouch-18.12.1.tar.xz"; - sha256 = "0v3lhxx45l41bw14wi7n4k29d1c9xmacrscjyj84fmy09nlyyaa5"; - name = "ktouch-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktouch-18.12.3.tar.xz"; + sha256 = "194f308a114c89873ee88eb069ecda88d5d1e1ad97c150e2d61cf248719b4bb6"; + name = "ktouch-18.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-accounts-kcm-18.12.1.tar.xz"; - sha256 = "1aswmp7504kpwlb37rvxx514ac5256h5lhwj9xl479vyxgaazxsn"; - name = "ktp-accounts-kcm-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-accounts-kcm-18.12.3.tar.xz"; + sha256 = "ab6ab0f6cb438ec68b110158f7c6555572f04ad69da04f5e1d144cfc4a8ee8cb"; + name = "ktp-accounts-kcm-18.12.3.tar.xz"; }; }; ktp-approver = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-approver-18.12.1.tar.xz"; - sha256 = "1jr5kxlj2229rknxhi5jsgdjgx9n0n5jx7lc4aa2c96kd843n2ah"; - name = "ktp-approver-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-approver-18.12.3.tar.xz"; + sha256 = "0616fcad79fdeae5f2a58b167419f1745e94cea21950faa535e7b5a6c2e53cf6"; + name = "ktp-approver-18.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-auth-handler-18.12.1.tar.xz"; - sha256 = "1fwcibz8dh94xaprpyybn0dlh1fyd6rsx9zsx8cyxqhx96fq8v28"; - name = "ktp-auth-handler-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-auth-handler-18.12.3.tar.xz"; + sha256 = "91d6e0148c9006117bc67969012f7a12405e186fc8ffd4011732dc3e7c16a4be"; + name = "ktp-auth-handler-18.12.3.tar.xz"; }; }; ktp-call-ui = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-call-ui-18.12.1.tar.xz"; - sha256 = "1f63w374d9smz7147lax9zqfvikqhl2hllvnlb03zl49kh13s8h3"; - name = "ktp-call-ui-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-call-ui-18.12.3.tar.xz"; + sha256 = "3558b9ef7a2a000f6b49454c4477dcd9700168a1f2c060267b24c78725097571"; + name = "ktp-call-ui-18.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-common-internals-18.12.1.tar.xz"; - sha256 = "1frnzsql9mk78bjfc2kpwmsf8nkx1ybhm1snq125kkzayqipvdkp"; - name = "ktp-common-internals-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-common-internals-18.12.3.tar.xz"; + sha256 = "3913a515d98f74940e0db6b85fc5c6c128c68cffb427c93164052be437634740"; + name = "ktp-common-internals-18.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-list-18.12.1.tar.xz"; - sha256 = "13aiy156372qapwddr2i3nf1jkzbj9905rvd55akwpa8sy70m3kw"; - name = "ktp-contact-list-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-list-18.12.3.tar.xz"; + sha256 = "8f858371ec3760bc042dbf6f022ba834ca5b9ae43997e67bf395978df603d0c1"; + name = "ktp-contact-list-18.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-runner-18.12.1.tar.xz"; - sha256 = "1grpgg3fgyzf97n60jmpjgviz5194awmrl6yfaal7hd1cdkfrs34"; - name = "ktp-contact-runner-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-runner-18.12.3.tar.xz"; + sha256 = "886d561952ac1a8a5fa50ffdff8699358480d18d58cbaec217ed865d2047f0a9"; + name = "ktp-contact-runner-18.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-desktop-applets-18.12.1.tar.xz"; - sha256 = "0iikcp7rvvrn7189kdzj1i4qzhkgh06gzr8hm49gy29qxqk36ykn"; - name = "ktp-desktop-applets-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-desktop-applets-18.12.3.tar.xz"; + sha256 = "439dca1046beba0d2579918f2e409e6629e5063da6eeb1001bcd65ff3edb32c4"; + name = "ktp-desktop-applets-18.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-filetransfer-handler-18.12.1.tar.xz"; - sha256 = "04dnh7yb0jajs79xh1wyq9d48nklvldc7lnk1lp194iz8yydvylx"; - name = "ktp-filetransfer-handler-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-filetransfer-handler-18.12.3.tar.xz"; + sha256 = "898c7f4ffc8d8bec691cc9744fb356722cf7957f39d2d855138492b647542231"; + name = "ktp-filetransfer-handler-18.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-kded-module-18.12.1.tar.xz"; - sha256 = "0kmw8pifb4xry3zqpq671rh39ziaka8zx60p5xzs10rl17rmxwzs"; - name = "ktp-kded-module-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-kded-module-18.12.3.tar.xz"; + sha256 = "ebbd02a1441caf8e9ced851c8f814255ac4b9e75485a4bc59026f647d3fd4854"; + name = "ktp-kded-module-18.12.3.tar.xz"; }; }; ktp-send-file = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-send-file-18.12.1.tar.xz"; - sha256 = "01i059vsaydw410sv15vzwysgxcy2n9wm3qcnal4fx7wgw5xx163"; - name = "ktp-send-file-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-send-file-18.12.3.tar.xz"; + sha256 = "0015551c42d66f14ae508eee76f138584bbec3b77a4aff4a003255b52d8414f2"; + name = "ktp-send-file-18.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-text-ui-18.12.1.tar.xz"; - sha256 = "14smhdcvy0v1s1rbkss1g6jyzfm6y1nqjp8a9wcbygbzh88g0bjy"; - name = "ktp-text-ui-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-text-ui-18.12.3.tar.xz"; + sha256 = "6a37a26b0b226d5d30b298a4d6d85f8dcfe9f39cbc35e1b6322651678815a34e"; + name = "ktp-text-ui-18.12.3.tar.xz"; }; }; ktuberling = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktuberling-18.12.1.tar.xz"; - sha256 = "0h0w2knfs97bzxaja3dkc78fjfymic09b6zid41kxd4mi41lngkk"; - name = "ktuberling-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktuberling-18.12.3.tar.xz"; + sha256 = "b69815f3553f843c30ab9d026ca7da97e62e66b58851111d1e4d29e57d67bd04"; + name = "ktuberling-18.12.3.tar.xz"; }; }; kturtle = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kturtle-18.12.1.tar.xz"; - sha256 = "0b2505gmys2p11ryj7bqr60zgh0ydp16xidhkv6hhykmrmp2bsm1"; - name = "kturtle-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kturtle-18.12.3.tar.xz"; + sha256 = "4677335b4f8a3e363425652815d19ae13e9f8942b01051553b485100c4996253"; + name = "kturtle-18.12.3.tar.xz"; }; }; kubrick = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kubrick-18.12.1.tar.xz"; - sha256 = "0vq8djk5xc00cz4a2inbw62x9pigxxjcxi92h8qayigi7cf9xrll"; - name = "kubrick-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kubrick-18.12.3.tar.xz"; + sha256 = "0deb9022a028a6c068203e5bf20820b5561c92b5117735e8a58f212c2ba460e3"; + name = "kubrick-18.12.3.tar.xz"; }; }; kwalletmanager = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kwalletmanager-18.12.1.tar.xz"; - sha256 = "1d3kdxc53n2ss73r9ld6rr5w9zhvkglrcbw8whq2hsam79mh0vsn"; - name = "kwalletmanager-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kwalletmanager-18.12.3.tar.xz"; + sha256 = "78232285c08241dc06cd6da88dcdce0d850417dd73f0d07034ec6d9a6f97f478"; + name = "kwalletmanager-18.12.3.tar.xz"; }; }; kwave = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kwave-18.12.1.tar.xz"; - sha256 = "150lqffzzyb2ajyg97sprzbm6zq1iq4psl6vics51lw7sybwj4m3"; - name = "kwave-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kwave-18.12.3.tar.xz"; + sha256 = "4ca9a15ecd06b96e013855f8109b52fcd4a848652438b2e7a2f55a8fcb1d1c48"; + name = "kwave-18.12.3.tar.xz"; }; }; kwordquiz = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kwordquiz-18.12.1.tar.xz"; - sha256 = "1da9jjdk2avdmdm16s63h0hk5swml37afwdnsd777ilj2x8a5ndf"; - name = "kwordquiz-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kwordquiz-18.12.3.tar.xz"; + sha256 = "e609d6b7f93abe0ca7ba844c51dff8d89d435daa9d0a6be68e789b70370459cc"; + name = "kwordquiz-18.12.3.tar.xz"; }; }; libgravatar = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libgravatar-18.12.1.tar.xz"; - sha256 = "1a7b46zqv5m7c9arfmcxhrcnrkcligz3ryygxv801zfa7277l8j6"; - name = "libgravatar-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libgravatar-18.12.3.tar.xz"; + sha256 = "c44c139fbaffda352f0fe461065622cff65b6f1cc13cee8a0137acb27de143ee"; + name = "libgravatar-18.12.3.tar.xz"; }; }; libkcddb = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkcddb-18.12.1.tar.xz"; - sha256 = "1k9rbkf12g1hsn23nyhc65zrppkikk8xplm7l321kxpnq2prm155"; - name = "libkcddb-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkcddb-18.12.3.tar.xz"; + sha256 = "38bffd551b82628a25b46bd598c257927855b77c6b6b73a9b69ac7bf538afc29"; + name = "libkcddb-18.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkcompactdisc-18.12.1.tar.xz"; - sha256 = "0v7fh9s9qbljgfjyi3bd9w7wp69y4qjg0jj8cmn11snrsd8zzaac"; - name = "libkcompactdisc-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkcompactdisc-18.12.3.tar.xz"; + sha256 = "a464ebfdd1a2834c2597e7ffd1b0d946ddfda348eea5ac8d1d42b46d6c478926"; + name = "libkcompactdisc-18.12.3.tar.xz"; }; }; libkdcraw = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkdcraw-18.12.1.tar.xz"; - sha256 = "1g58cpzqzl6vl62lbrqd8fyscxspqypxq4lyj3d2k9b0b66hjc6c"; - name = "libkdcraw-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkdcraw-18.12.3.tar.xz"; + sha256 = "c4b6541419b2ebee15d24744d10e67c9a137e616766e765c13e5056c2a37ef99"; + name = "libkdcraw-18.12.3.tar.xz"; }; }; libkdegames = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkdegames-18.12.1.tar.xz"; - sha256 = "0iksk5gnl860xcmpaj56wxaamhm9zhjnyszj4nssppssn8kr1r65"; - name = "libkdegames-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkdegames-18.12.3.tar.xz"; + sha256 = "7c833fe476043f0492a09a52af60ee7652805cccbbb72e5f473a9d35abff9ed9"; + name = "libkdegames-18.12.3.tar.xz"; }; }; libkdepim = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkdepim-18.12.1.tar.xz"; - sha256 = "1qvzj68p630mzafwyv7f3q1fd615yca7amc0q7kp2cs08fnv67fp"; - name = "libkdepim-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkdepim-18.12.3.tar.xz"; + sha256 = "1c53148dd9f477b1ca2ea622b25100eab95531115e9798264d3e65d28183e640"; + name = "libkdepim-18.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkeduvocdocument-18.12.1.tar.xz"; - sha256 = "0zgl0dw8sb5lffzv580nql04i0n31ma8569wrhh75kg12qb5yd7w"; - name = "libkeduvocdocument-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkeduvocdocument-18.12.3.tar.xz"; + sha256 = "907076104f445f22fa31c2fa5ecfdabbb8b18faab52fc10c879a53d6245aaad4"; + name = "libkeduvocdocument-18.12.3.tar.xz"; }; }; libkexiv2 = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkexiv2-18.12.1.tar.xz"; - sha256 = "1jgk14dgf30czsah0mjrs7lsll0s4aks2075pfmvrnsl71vfbsj3"; - name = "libkexiv2-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkexiv2-18.12.3.tar.xz"; + sha256 = "1d14ff63af42ab7e19e2039648a95ea5dc946afbe3e3df52c17ce1618a02ebdc"; + name = "libkexiv2-18.12.3.tar.xz"; }; }; libkgapi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkgapi-18.12.1.tar.xz"; - sha256 = "1g5mzdw4mrlqhi9zby51m1sgkq1gjmkd7smja287kjf7whdx0sn3"; - name = "libkgapi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkgapi-18.12.3.tar.xz"; + sha256 = "de0314fd83d8fa8f88e6a355c4725047d2e507e0d40f1950c8ae083c2bc21924"; + name = "libkgapi-18.12.3.tar.xz"; }; }; libkgeomap = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkgeomap-18.12.1.tar.xz"; - sha256 = "0ijf71ss8qirrgx45x4wnry049d2bllgnlzm8gll4mj1hv9jhjdz"; - name = "libkgeomap-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkgeomap-18.12.3.tar.xz"; + sha256 = "2c4459e61e471f0344d03cfa5f00fe2a1890cd2c1501323ceed26d522496c47b"; + name = "libkgeomap-18.12.3.tar.xz"; }; }; libkipi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkipi-18.12.1.tar.xz"; - sha256 = "1372kmqni0vb8bryv0h30pljikabjdq44v1fjpgg81f4v1n4pfxv"; - name = "libkipi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkipi-18.12.3.tar.xz"; + sha256 = "96abf4552d535cf101c76ff5b1cb0198eccfd4bdfb7dc192b66bf709af037a31"; + name = "libkipi-18.12.3.tar.xz"; }; }; libkleo = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkleo-18.12.1.tar.xz"; - sha256 = "1p1bw0wzwg2zccgkqs50j92rzkpvcspjdj85zanmryg568mz9r1x"; - name = "libkleo-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkleo-18.12.3.tar.xz"; + sha256 = "e528ed366352404d48313a8c154f56c672470bf06524ea7a150a726d3eb87d69"; + name = "libkleo-18.12.3.tar.xz"; }; }; libkmahjongg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkmahjongg-18.12.1.tar.xz"; - sha256 = "1q590f7l10a1zjcg3dv3ns1003xrnr7zlmff03zg3a9zcqj11kwv"; - name = "libkmahjongg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkmahjongg-18.12.3.tar.xz"; + sha256 = "25e5cea50b6c96f18efa8d013ab58abfaac7845edb969b8e63e0c297482a6be4"; + name = "libkmahjongg-18.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkomparediff2-18.12.1.tar.xz"; - sha256 = "0ik6bclbipp01gfy3zfkijvl5m0y3z2dfxr76jvzmi53ypm7g0xn"; - name = "libkomparediff2-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkomparediff2-18.12.3.tar.xz"; + sha256 = "f70bf7470f67419a7071a4df23d929c4c4ed80d588b3096d48486ee0f27d890c"; + name = "libkomparediff2-18.12.3.tar.xz"; }; }; libksane = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libksane-18.12.1.tar.xz"; - sha256 = "15dgc5dshs6yzv03wvc5xvqfz70gqy51a0r54qzbr5fc9s6pywr8"; - name = "libksane-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libksane-18.12.3.tar.xz"; + sha256 = "40bf814cebac7ef00dc18fbdeabb2f9fd786c9144d787d5dc36a58fe18c33034"; + name = "libksane-18.12.3.tar.xz"; }; }; libksieve = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libksieve-18.12.1.tar.xz"; - sha256 = "0kcg94bsww3vlc3vpybw20c4iax0bfkamicy7hwyyyzwgx38dvd1"; - name = "libksieve-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libksieve-18.12.3.tar.xz"; + sha256 = "ce18756940d86dff8eafd77883d202ab90e3d8273f5248ffd97627b974211754"; + name = "libksieve-18.12.3.tar.xz"; }; }; lokalize = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/lokalize-18.12.1.tar.xz"; - sha256 = "1spzi7zbckvxy3izmcqjnslmqf4vgr7zrwa0idmqi4q59dcsgw9g"; - name = "lokalize-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/lokalize-18.12.3.tar.xz"; + sha256 = "cce11b9384d27006855a141d2241a67d05679baa7096db2311c49a78bd642fed"; + name = "lokalize-18.12.3.tar.xz"; }; }; lskat = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/lskat-18.12.1.tar.xz"; - sha256 = "0603lxw1fxz9vpawy59z3qga0f1bvvgv9yqk29b16fmp5hf5qgxm"; - name = "lskat-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/lskat-18.12.3.tar.xz"; + sha256 = "d81d3af26b9f23abc40f1e2f97410d662c11d4641b67c32d427846a561f0b1e2"; + name = "lskat-18.12.3.tar.xz"; }; }; mailcommon = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/mailcommon-18.12.1.tar.xz"; - sha256 = "0l1b115vnxfl2ykwnj09ikv7vlfa5bvfzlii6jj2znkmspi9y7r2"; - name = "mailcommon-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/mailcommon-18.12.3.tar.xz"; + sha256 = "789d89fad58af80202dfcc41f7c7435871a60309d1d46f93cabcb37dd6ae97e1"; + name = "mailcommon-18.12.3.tar.xz"; }; }; mailimporter = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/mailimporter-18.12.1.tar.xz"; - sha256 = "1k8gqjabcvafcvsqwclvz58r15k1bpz52wnnnbwcp0y27ab08a98"; - name = "mailimporter-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/mailimporter-18.12.3.tar.xz"; + sha256 = "1c0e583fa36fc1b87154367cbe02cf1ec68d9f36d8a37bd6b220e9d9aadfcfa3"; + name = "mailimporter-18.12.3.tar.xz"; }; }; marble = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/marble-18.12.1.tar.xz"; - sha256 = "0hamj04ma9qycfisjv48myxj1427rz7g0lmw7pwanzghg610fgwy"; - name = "marble-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/marble-18.12.3.tar.xz"; + sha256 = "0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee"; + name = "marble-18.12.3.tar.xz"; }; }; mbox-importer = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/mbox-importer-18.12.1.tar.xz"; - sha256 = "1h2abj7v6v3rmvsv9bb1wj7sabhh9f35bx1yfk2hhfzf6l4r5f2n"; - name = "mbox-importer-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/mbox-importer-18.12.3.tar.xz"; + sha256 = "a220ca69dd6f78cf18c3d8cb1bb293dc2ab2ff45f2a25df72cad8df78f581201"; + name = "mbox-importer-18.12.3.tar.xz"; }; }; messagelib = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/messagelib-18.12.1.tar.xz"; - sha256 = "1hfk54w0dhp82fxa4q19d4224pjnw5f8m7ap4gwlrqdj350liqd8"; - name = "messagelib-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/messagelib-18.12.3.tar.xz"; + sha256 = "0064a8df62a08d0dfb06af28d4aff8a645a0e8bb01d91ab23647b3d26d3af7d8"; + name = "messagelib-18.12.3.tar.xz"; }; }; minuet = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/minuet-18.12.1.tar.xz"; - sha256 = "160wq3j7vcf1k0ayd8axg37ghj5ymn56g7znaz4gzc8ar1q5nccz"; - name = "minuet-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/minuet-18.12.3.tar.xz"; + sha256 = "9244ec364d031c73f9aed9568012a28b847ec4dceca61040324af7afd3d64009"; + name = "minuet-18.12.3.tar.xz"; }; }; okular = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/okular-18.12.1.tar.xz"; - sha256 = "1k1srr2434j665v6m89vl7x42361pqxaw45dc5b4bhw8q2xfipyl"; - name = "okular-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/okular-18.12.3.tar.xz"; + sha256 = "d7ef9b59acb5746ebc64399f4c1a99faf0c1530bf6a818b3bfd34b73476d90ab"; + name = "okular-18.12.3.tar.xz"; }; }; palapeli = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/palapeli-18.12.1.tar.xz"; - sha256 = "0pwflnnnbfxf185m3r4vdw5jpd5jld0wm0qnwk2gl41v2ahb5pqd"; - name = "palapeli-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/palapeli-18.12.3.tar.xz"; + sha256 = "b28fa1cf7a763125a09baa8f4e7562e17892475444d3907e566281328502e593"; + name = "palapeli-18.12.3.tar.xz"; }; }; parley = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/parley-18.12.1.tar.xz"; - sha256 = "1yv4m9f4jhc36ffnrxd6rq5117rj163hs6835mkkzja7z13csn6z"; - name = "parley-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/parley-18.12.3.tar.xz"; + sha256 = "289bc5aa88d7a33fdf0d668b45412f163d74e86d3deb9492db53a11f7c6a7f75"; + name = "parley-18.12.3.tar.xz"; }; }; picmi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/picmi-18.12.1.tar.xz"; - sha256 = "0dmhvxy0g4jjbxk53bz1g1r8vqdzhzbcwg0f1ck85gz7f5g67b7v"; - name = "picmi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/picmi-18.12.3.tar.xz"; + sha256 = "0691c70d746aa9d444559970e002561a1123963d617b36ceef4a8c3ee4730f49"; + name = "picmi-18.12.3.tar.xz"; }; }; pimcommon = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/pimcommon-18.12.1.tar.xz"; - sha256 = "09av3zdr463gjc877ipa5vz84yf4qpj2ixs9x4ajmfmsmb5m6w7z"; - name = "pimcommon-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/pimcommon-18.12.3.tar.xz"; + sha256 = "f4a0bf8146d1140c0252a5315baa826651968352a828c004d91b06e0e98c6b9e"; + name = "pimcommon-18.12.3.tar.xz"; }; }; pim-data-exporter = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/pim-data-exporter-18.12.1.tar.xz"; - sha256 = "111n4l9z3dazz7qhv67k00s88p515r8ai2sm419pbyfdn6wxpzmb"; - name = "pim-data-exporter-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/pim-data-exporter-18.12.3.tar.xz"; + sha256 = "7deb5baf5a36b96f1414e0b67192cd1ad48f396fb3cb5f5eb2fc90a312d74941"; + name = "pim-data-exporter-18.12.3.tar.xz"; }; }; pim-sieve-editor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/pim-sieve-editor-18.12.1.tar.xz"; - sha256 = "0i0jrmz4cyjcpapga89ixfqx7xg0nyk3r75ymfzw891fyhm7ns67"; - name = "pim-sieve-editor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/pim-sieve-editor-18.12.3.tar.xz"; + sha256 = "6e755ec258b0a75e4e83adb82551c1779c2ab7766aef26d2f1c9c00f3809deb5"; + name = "pim-sieve-editor-18.12.3.tar.xz"; }; }; poxml = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/poxml-18.12.1.tar.xz"; - sha256 = "0hrpvpsy3mbyrikj68lr2af9m162w3nzhcpdqgrhsv5ji3j0bpqb"; - name = "poxml-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/poxml-18.12.3.tar.xz"; + sha256 = "6714e371957d175b859894149a3791acb3b8ef62b653b7b09f34819e92c8eaf7"; + name = "poxml-18.12.3.tar.xz"; }; }; print-manager = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/print-manager-18.12.1.tar.xz"; - sha256 = "01kk592gi2rrqwaxmfd1fycnya0rvjafxxv6lrk3rs0nm4g9phxr"; - name = "print-manager-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/print-manager-18.12.3.tar.xz"; + sha256 = "917ea500bcd11d2ca3cc1e7de1b38d7ef72f1d397182aaac2c6a31cd338f387d"; + name = "print-manager-18.12.3.tar.xz"; }; }; rocs = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/rocs-18.12.1.tar.xz"; - sha256 = "0d34bv8ya5lrdrbqqlc927x4cdfjwyr8q2xbmx4c1vaw8w29glw9"; - name = "rocs-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/rocs-18.12.3.tar.xz"; + sha256 = "6b007b0b11a8128787c316f055a99dde83619dd35287e04867949e84661c2b11"; + name = "rocs-18.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/signon-kwallet-extension-18.12.1.tar.xz"; - sha256 = "018vyzd3rspfsqansxfbv4q0izgj7dfpmzjj04x8pffg1w0x902n"; - name = "signon-kwallet-extension-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/signon-kwallet-extension-18.12.3.tar.xz"; + sha256 = "9a6c25cf19a382cbfd219c043838ad691c4c53ae8c3bc9f4b59f9f6f98bd3a4f"; + name = "signon-kwallet-extension-18.12.3.tar.xz"; }; }; spectacle = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/spectacle-18.12.1.tar.xz"; - sha256 = "1r9iapwi1lp1p7x0dimblpmsizv1ys9708vdlzrk8q4m8rwn7ld9"; - name = "spectacle-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/spectacle-18.12.3.tar.xz"; + sha256 = "8abf85b85de7844c503ef84182303c47cf425f5c14d71e723e3c887ee87ce06e"; + name = "spectacle-18.12.3.tar.xz"; }; }; step = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/step-18.12.1.tar.xz"; - sha256 = "1gn8l09r5rllz1mypsw2wfjhijy0i0bi4lspp271dinms6ryx6p4"; - name = "step-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/step-18.12.3.tar.xz"; + sha256 = "35abaf0a4597e141f4db08ad91ebcefafe43609b986a93a11e5f3ec19165c755"; + name = "step-18.12.3.tar.xz"; }; }; svgpart = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/svgpart-18.12.1.tar.xz"; - sha256 = "06rvbav94ysifha47lp52pvpc77y33p4zq4yfbmyh1pqkiw5db2s"; - name = "svgpart-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/svgpart-18.12.3.tar.xz"; + sha256 = "675ab3b652b0d2619abb305ce7c00beb8a80067416e4ea7e216cfa201a7ff8ef"; + name = "svgpart-18.12.3.tar.xz"; }; }; sweeper = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/sweeper-18.12.1.tar.xz"; - sha256 = "0bp0my9gf4n5p7v3g0q390lf9q4lh42mg2zngwadqcvrsi2w4av4"; - name = "sweeper-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/sweeper-18.12.3.tar.xz"; + sha256 = "8007da0f4d835e376fb049d539ca9fd6840ef7196f25b62cf652374a645fc6e0"; + name = "sweeper-18.12.3.tar.xz"; }; }; umbrello = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/umbrello-18.12.1.tar.xz"; - sha256 = "12kk04frx8fxcih22nv5c1765wawlf7wpiscaqmzlmrpa611x65r"; - name = "umbrello-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/umbrello-18.12.3.tar.xz"; + sha256 = "2ab53b33cf1fcaea470c01b2421e911d4287b1d0421fa33e0b60043fe6943cc7"; + name = "umbrello-18.12.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/zeroconf-ioslave-18.12.1.tar.xz"; - sha256 = "1gzr50kqlwd2d47yc2k6yz2v0w2gp10c7glhb61jpdzsqy7r7cvp"; - name = "zeroconf-ioslave-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/zeroconf-ioslave-18.12.3.tar.xz"; + sha256 = "b3adcaec0ebd89ddaf839954fb387e59791683d98f93da0c3dacb0266cd02a12"; + name = "zeroconf-ioslave-18.12.3.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 2928d271efcf..928a1bae108a 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }: let - version = "5.2.20"; + version = "5.3.22"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m"; + sha256 = "0cnw01g3j5l07f2lng604mx8qqm61i5sflryj1vya2gkjmrphkan"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 82468e1bf9f0..11c643fac2c3 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "polar-bookshelf-${version}"; - version = "1.12.0"; + version = "1.13.10"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "058pl54mkbvcjyjmdz81r0ibk1qkc3798pkkdw1kp2cbg16qkfyh"; + sha256 = "1bxcyf6n2m5x1z8ic6kzskinyyc6lh6nj0bycbwc524n6ms5j99p"; }; buildInputs = [ diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 825b52cda7f8..293f6aaa3c6f 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -74,15 +74,15 @@ let in rec { application = mkSweetHome3D rec { - version = "6.0"; + version = "6.1.2"; module = "SweetHome3D"; name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "1l4kc1c2iwkggmcdb2wksb4vrh97ll804vc51yawhdlq9g567ky9"; - rev = "6647"; + sha256 = "14svi112kml175dblzcdjzhlfwbp1cy6rki49mqb3632hwmif6ya"; + rev = "6750"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index 4a6ad4e5ea38..80dffe6d93f2 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -12,7 +12,9 @@ python2.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 vte libnotify keybinder3 ]; + buildInputs = [ gtk3 vte libnotify keybinder3 + gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 + ]; propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index dcc77604e6ea..ab1e0b5dda26 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -3,17 +3,18 @@ , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl +, udevSupport ? true, udev , swaySupport ? true, sway }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "0vkx1b6bgr75wkx89ppxhg4103vl2g0sky22npmfkvbkpgh8dj38"; + sha256 = "006pzx4crsqn9vk28g87306xh3jrfwk4ib9cmsxqrxy8v0kl2s4g"; }; nativeBuildInputs = [ @@ -25,19 +26,21 @@ ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl + ++ optional udevSupport udev ++ optional swaySupport sway; mesonFlags = [ "-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }" "-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }" "-Dlibnl=${ if nlSupport then "enabled" else "disabled" }" + "-Dlibudev=${ if udevSupport then "enabled" else "disabled" }" "-Dout=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; license = licenses.mit; - maintainers = [ maintainers.FlorianFranzen ]; + maintainers = with maintainers; [ FlorianFranzen minijackson ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index d4afe4ea9e14..6fc7de1d4d57 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }: rustPlatform.buildRustPackage rec { - name = "zola-${version}"; - version = "0.5.1"; + pname = "zola"; + version = "0.6.0"; src = fetchFromGitHub { owner = "getzola"; - repo = "zola"; + repo = pname; rev = "v${version}"; - sha256 = "1jj6yfb3qkfq3nwcxfrc7k1gqyls873imxgpifbwjx9slg6ssis9"; + sha256 = "11y5gb6lx040ax4b16fr3whkj4vmv8hlkvb50h58gs77payglf6l"; }; - cargoSha256 = "1hn2l25fariidgdr32mfx2yqb3g8xk4qafs614bdjiyvfrb7j752"; + cargoSha256 = "19hqkj27dbsy4pi0i8mjjlhi4351yifvc6zln6scc2nd60p251h6"; - nativeBuildInputs = [ cmake pkgconfig openssl ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; postInstall = '' install -D -m 444 completions/zola.bash \ diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix new file mode 100644 index 000000000000..b86cb7d3dd92 --- /dev/null +++ b/pkgs/applications/networking/brig/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "brig-${version}"; + version = "0.3.0"; + rev = "v${version}"; + + goPackagePath = "github.com/sahib/brig"; + subPackages = ["."]; + + src = fetchFromGitHub { + owner = "sahib"; + repo = "brig"; + inherit rev; + sha256 = "01hpb6cvq8cw21ka74jllggkv5pavc0sbl1207x32gzxslw3gsvy"; + }; + + meta = with stdenv.lib; { + description = "File synchronization on top of ipfs with git like interface and FUSE filesystem"; + homepage = https://github.com/sahib/brig; + license = licenses.agpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index ffae170a1990..ef31898dd0c7 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1q3dc416fr9nzy64pl7rydahygnird0vpk9yflssw7v9gx84m6x9"; + sha256 = "06pf4h76zsqs3dsxr57y9sb9sw48nfyw1x2q1725zww61jfz2a6y"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 47270cbcba8a..15e0b5a07b43 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "0sjjlfndz8s78fl7vb8alz3nsksjrm4hbnnj11xa0i6k16v6pv1y"; + sha256 = "1l6b4bs5x373pw210nl8xal03ns2ib1ls49y64s3lqjfh5wjmnjy"; }; nativeBuildInputs = [ dune ]; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index cffe74a0e806..24529d83e04c 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python36Packages }: +{ stdenv, fetchpatch, python36Packages }: with stdenv.lib; @@ -19,6 +19,13 @@ buildPythonPackage rec { checkInputs = [ mock pytest coverage tox ]; propagatedBuildInputs = [ urwid tweepy future ]; + patches = [ + (fetchpatch { + url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch"; + sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3"; + }) + ]; + checkPhase = '' TMP_TURSES=`echo turses-$RANDOM` mkdir $TMP_TURSES @@ -26,7 +33,7 @@ buildPythonPackage rec { rm -rf $TMP_TURSES ''; - patchPhase = '' + postPatch = '' sed -i -e 's|urwid==1.3.0|urwid==${getVersion urwid}|' setup.py sed -i -e "s|future==0.14.3|future==${getVersion future}|" setup.py sed -i -e "s|tweepy==3.3.0|tweepy==${getVersion tweepy}|" setup.py @@ -35,7 +42,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/alejandrogomez/turses; + homepage = https://github.com/louipc/turses; description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = with maintainers; [ garbas ]; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index be31f5fd102f..6bb84c523362 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-cli-${version}"; - version = "7.8.0"; + version = "8.0.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; - sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; + sha256 = "0ysyam06ll70d0baa3hb7wcgqnqflssr64bqjr3db6fnk1q096m8"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix new file mode 100644 index 000000000000..804e71c1bfa7 --- /dev/null +++ b/pkgs/applications/science/biology/itsx/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, hmmer, perl }: + +stdenv.mkDerivation rec { + version = "1.1.1"; + name = "itsx-${version}"; + + src = fetchurl { + url = "http://microbiology.se/sw/ITSx_${version}.tar.gz"; + sha256 = "0lrmy2n3ax7f208k0k8l3yz0j5cpz05hv4hx1nnxzn0c51z1pc31"; + }; + + buildInputs = [ hmmer perl ]; + + buildPhase = '' + sed -e "s,profileDB = .*,profileDB = \"$out/share/ITSx_db/HMMs\";," -i ITSx + sed "3 a \$ENV{\'PATH\'}='${hmmer}/bin:'.\"\$ENV{\'PATH\'}\";" -i ITSx + mkdir bin + mv ITSx bin + ''; + + installPhase = '' + mkdir -p $out/share/doc && cp -a bin $out/ + cp *pdf $out/share/doc + cp -r ITSx_db $out/share + ''; + + meta = with stdenv.lib; { + description = "Improved software detection and extraction of ITS1 and ITS2 from ribosomal ITS sequences of fungi and other eukaryotes for use in environmental sequencing"; + homepage = http://microbiology.se/software/itsx/; + license = licenses.gpl3; + maintainers = [ maintainers.bzizou ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index 3f28b5e31ccd..85c2b99b3a78 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "minimap2"; - version = "2.15"; + version = "2.16"; src = fetchFromGitHub { repo = pname; owner = "lh3"; rev = "v${version}"; - sha256 = "0dy3m2wjmi3whjnmkj3maa1aadz525h7736wm8vvdcwq71ijqb7v"; + sha256 = "1ggm5psv3gwsz627ik9kl6ry9gzgmfsvya6ni0gv6ahwlrhdim73"; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index fe25a04c420a..68efc2030e53 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.9h"; + version = "4.9i"; name = "paml-${version}"; src = fetchurl { url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; - sha256 = "1czdfb3naadq0d3y42isrbyja33c3p28k8dv9mxlx2h19b7zcfv2"; + sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw"; }; preBuild = '' diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 3298bc167517..e15709191bfd 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.7.5", - "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn", - "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb", + "version": "11.9.1", + "repo_hash": "11dx931n79ynw8j6vbjsb832dkkp2s4vzji53km4ib9njn5nja0l", + "deb_hash": "133qjxmrn2rl9avi0nwcdbky53vgxbzp4g3vcgwg21xyfr8k8s4n", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.1-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.7.5", + "rev": "v11.9.1", "passthru": { - "GITALY_SERVER_VERSION": "1.12.2", - "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.2" + "GITALY_SERVER_VERSION": "1.27.1", + "GITLAB_PAGES_VERSION": "1.5.0", + "GITLAB_SHELL_VERSION": "8.7.1", + "GITLAB_WORKHORSE_VERSION": "8.3.1" } }, "ee": { - "version": "11.7.5", - "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm", - "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb", + "version": "11.9.1", + "repo_hash": "13d6vg505rifgxpks9b7x2zq65b41naj7znkzm5i1kdvklfygqpd", + "deb_hash": "1z5i04cxwgcmx55yzhpw0ss1rwaqz1jl6hwpgbyly6prrbl5h59x", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.1-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.7.5-ee", + "rev": "v11.9.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.12.2", - "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.2" + "GITALY_SERVER_VERSION": "1.27.1", + "GITLAB_PAGES_VERSION": "1.5.0", + "GITLAB_SHELL_VERSION": "8.7.1", + "GITLAB_WORKHORSE_VERSION": "8.3.1" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 81f1864099f3..8a8ce5771cf4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,10 +3,10 @@ source 'https://rubygems.org' # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 gem 'bundler', '>= 1.16.5' -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.6.5' -gem 'gitaly-proto', '~> 1.3.0' +gem 'gitaly-proto', '~> 1.13.0' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2', require: false @@ -14,6 +14,7 @@ gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false gem 'grpc', '~> 1.15.0' gem 'sentry-raven', '~> 2.7.2', require: false gem 'faraday', '~> 0.12' +gem 'rbtrace', require: false # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE @@ -27,4 +28,11 @@ group :development, :test do gem 'rspec-parameterized', require: false gem 'timecop', require: false gem 'factory_bot', require: false + gem 'pry', '~> 0.12.2', require: false + + # gitlab-shell spec gems + gem 'listen', '~> 0.5.0' + gem 'simplecov', '~> 0.9.0', require: false + gem 'vcr', '~> 4.0.0' + gem 'webmock', '~> 3.4.0' end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 59f8ad69f223..4deb64c4cd5b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -10,6 +10,8 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) ast (2.4.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) @@ -19,18 +21,22 @@ GEM adamantium (~> 0.2.0) equalizer (~> 0.0.9) concurrent-ruby (1.1.3) + crack (0.4.3) + safe_yaml (~> 1.0.0) crass (1.0.4) debug_inspector (0.0.3) diff-lcs (1.3) + docile (1.1.5) equalizer (0.0.11) escape_utils (1.2.1) factory_bot (4.11.1) activesupport (>= 3.0.0) faraday (0.15.3) multipart-post (>= 1.2, < 3) + ffi (1.10.0) gemojione (3.3.0) json - gitaly-proto (1.3.0) + gitaly-proto (1.13.0) grpc (~> 1.0) github-linguist (6.2.0) charlock_holmes (~> 0.7.6) @@ -58,29 +64,35 @@ GEM gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + googleapis-common-protos-types (1.0.3) google-protobuf (~> 3.0) grpc (1.15.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) + hashdiff (0.3.8) i18n (1.1.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) json (2.1.0) licensee (8.9.2) rugged (~> 0.24) + listen (0.5.3) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) + method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) + msgpack (1.2.6) + multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri + optimist (3.0.0) parallel (1.12.1) parser (2.5.3.0) ast (~> 2.4.0) @@ -91,7 +103,15 @@ GEM parser unparser procto (0.0.3) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (3.0.3) rainbow (3.0.0) + rbtrace (0.4.11) + ffi (>= 1.0.6) + msgpack (>= 0.4.3) + optimist (>= 3.0.0) rdoc (4.3.0) rouge (3.3.0) rspec (3.7.0) @@ -121,13 +141,19 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.10.0) - rugged (0.27.5) + rugged (0.28.0) + safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sentry-raven (2.7.2) + sentry-raven (2.7.4) faraday (>= 0.7.6, < 1.0) + simplecov (0.9.2) + docile (~> 1.1.0) + multi_json (~> 1.0) + simplecov-html (~> 0.9.0) + simplecov-html (0.9.0) stringex (2.8.4) thread_safe (0.3.6) timecop (0.9.1) @@ -142,6 +168,11 @@ GEM equalizer (~> 0.0.9) parser (>= 2.3.1.2, < 2.6) procto (~> 0.0.2) + vcr (4.0.0) + webmock (3.4.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff PLATFORMS ruby @@ -151,7 +182,7 @@ DEPENDENCIES bundler (>= 1.16.5) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.13.0) github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) @@ -159,13 +190,19 @@ DEPENDENCIES google-protobuf (~> 3.6) grpc (~> 1.15.0) licensee (~> 8.9.0) + listen (~> 0.5.0) + pry (~> 0.12.2) + rbtrace rdoc (~> 4.2) rspec rspec-parameterized rubocop (~> 0.50) - rugged (~> 0.27) + rugged (~> 0.28) sentry-raven (~> 2.7.2) + simplecov (~> 0.9.0) timecop + vcr (~> 4.0.0) + webmock (~> 3.4.0) BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 349b75f19347..d84406e23b3d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "1.12.2"; + version = "1.27.1"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy"; + sha256 = "0sr1jjw1rvyxrv6vaqvl138m0x2xgjksjdy92ajslrjxrnjlrjvp"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index c06be7891ffb..61abc97ed548 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -25,6 +25,15 @@ }; version = "0.2.0"; }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; ast = { source = { remotes = ["https://rubygems.org"]; @@ -75,6 +84,15 @@ }; version = "1.1.3"; }; + crack = { + dependencies = ["safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; + }; crass = { source = { remotes = ["https://rubygems.org"]; @@ -99,6 +117,14 @@ }; version = "1.3"; }; + docile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; equalizer = { source = { remotes = ["https://rubygems.org"]; @@ -133,6 +159,14 @@ }; version = "0.15.3"; }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + type = "gem"; + }; + version = "1.10.0"; + }; gemojione = { dependencies = ["json"]; source = { @@ -146,10 +180,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680"; + sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; type = "gem"; }; - version = "1.3.0"; + version = "1.13.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -224,10 +258,10 @@ dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -238,6 +272,14 @@ }; version = "1.15.0"; }; + hashdiff = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; + type = "gem"; + }; + version = "0.3.8"; + }; i18n = { dependencies = ["concurrent-ruby"]; source = { @@ -272,6 +314,14 @@ }; version = "8.9.2"; }; + listen = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl"; + type = "gem"; + }; + version = "0.5.3"; + }; memoizable = { dependencies = ["thread_safe"]; source = { @@ -281,6 +331,14 @@ }; version = "0.4.2"; }; + method_source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; mime-types = { dependencies = ["mime-types-data"]; source = { @@ -301,10 +359,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -314,6 +372,22 @@ }; version = "5.11.3"; }; + msgpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; + type = "gem"; + }; + version = "1.2.6"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; multipart-post = { source = { remotes = ["https://rubygems.org"]; @@ -326,10 +400,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -340,6 +414,14 @@ }; version = "1.5.0"; }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; parallel = { source = { remotes = ["https://rubygems.org"]; @@ -390,6 +472,23 @@ }; version = "0.0.3"; }; + pry = { + dependencies = ["coderay" "method_source"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + type = "gem"; + }; + version = "0.12.2"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; rainbow = { source = { remotes = ["https://rubygems.org"]; @@ -398,6 +497,15 @@ }; version = "3.0.0"; }; + rbtrace = { + dependencies = ["ffi" "msgpack" "optimist"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; + type = "gem"; + }; + version = "0.4.11"; + }; rdoc = { source = { remotes = ["https://rubygems.org"]; @@ -487,10 +595,18 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.0"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; @@ -505,10 +621,27 @@ dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; + sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; + type = "gem"; + }; + version = "2.7.4"; + }; + simplecov = { + dependencies = ["docile" "multi_json" "simplecov-html"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; type = "gem"; }; - version = "2.7.2"; + version = "0.9.2"; + }; + simplecov-html = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; + type = "gem"; + }; + version = "0.9.0"; }; stringex = { source = { @@ -560,4 +693,21 @@ }; version = "0.2.8"; }; + vcr = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr"; + type = "gem"; + }; + version = "4.0.0"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib"; + type = "gem"; + }; + version = "3.4.2"; + }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index bb48a441253f..c3199142da3f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "8.4.4"; + version = "8.7.1"; name = "gitlab-shell-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq"; + sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia"; }; buildInputs = [ ruby bundler go ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 7819c863a359..9b5efeaee801 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -1,16 +1,16 @@ diff --git a/go/internal/config/config.go b/go/internal/config/config.go -index 435cb29..078c1df 100644 +index f951fe6..b422fe3 100644 --- a/go/internal/config/config.go +++ b/go/internal/config/config.go -@@ -2,7 +2,6 @@ package config - +@@ -3,7 +3,6 @@ package config import ( "io/ioutil" + "net/url" - "os" "path" + "strings" - yaml "gopkg.in/yaml.v2" -@@ -26,16 +25,13 @@ type Config struct { +@@ -30,16 +29,13 @@ type Config struct { } func New() (*Config, error) { @@ -28,12 +28,25 @@ index 435cb29..078c1df 100644 + return newFromFile("/run/gitlab/shell-config.yml") } - func newFromFile(filename string) (*Config, error) { + func (c *Config) FeatureEnabled(featureName string) bool { +diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb +index 0600a18..c46f2d7 100644 +--- a/lib/gitlab_keys.rb ++++ b/lib/gitlab_keys.rb +@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength + attr_accessor :auth_file, :key + + def self.command(whatever) +- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" ++ "/run/current-system/sw/bin/gitlab-shell #{whatever}" + end + + def self.command_key(key_id) diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb -index 57c70f5..700569b 100644 +index 2cb76a8..f59ad5e 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb -@@ -187,7 +187,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength +@@ -190,7 +190,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength args = [executable, gitaly_address, json_args] # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. @@ -43,16 +56,3 @@ index 57c70f5..700569b 100644 end def api -diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb -index 0600a18..6814f0a 100644 ---- a/lib/gitlab_keys.rb -+++ b/lib/gitlab_keys.rb -@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength - attr_accessor :auth_file, :key - - def self.command(whatever) -- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" -+ "/run/current-system/sw/bin/gitlab-shell #{whatever}" - end - - def self.command_key(key_id) diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index c49bbe9ccef7..6540ee0be963 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "8.0.2"; + version = "8.3.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690"; + sha256 = "14zmxajzx6r2wrsxkmqp7j94yxnq4qpg27wih5l8lhf1imzgnk3j"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index f59e61208ac3..f36e2e38d6be 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'pg', '~> 1.1', group: :postgres -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'grape-path-helpers', '~> 1.0' gem 'faraday', '~> 0.12' @@ -68,7 +68,7 @@ gem 'gpgme', '~> 2.0.18' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API @@ -94,13 +94,15 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 2.0.1' -gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.7.1' -gem 'fog-local', '~> 0.3' -gem 'fog-openstack', '~> 0.1' +gem 'fog-aws', '~> 3.3' +# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. +# Also see config/initializers/fog_core_patch.rb. +gem 'fog-core', '= 2.1.0' +gem 'fog-google', '~> 1.8' +gem 'fog-local', '~> 0.6' +gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.2.0' +gem 'fog-aliyun', '~> 0.3' # for Google storage gem 'google-api-client', '~> 0.23' @@ -113,10 +115,9 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.0.0' +gem 'deckar01-task_list', '2.2.0' gem 'gitlab-markup', '~> 1.6.5' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.0' @@ -126,9 +127,9 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.8' gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' -gem 'truncato', '~> 0.7.9' +gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.5' +gem 'nokogiri', '~> 1.10.1' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -144,7 +145,7 @@ gem 'diffy', '~> 3.1.0' gem 'rack', '2.0.6' group :unicorn do - gem 'unicorn', '~> 5.1.0' + gem 'unicorn', '~> 5.4.1' gem 'unicorn-worker-killer', '~> 0.4.4' end @@ -161,12 +162,12 @@ gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.2.1' -gem 'sidekiq-cron', '~> 0.6.0' +gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.6.0' gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' # Cron Parser -gem 'rufus-scheduler', '~> 3.4' +gem 'fugit', '~> 1.1' # HTTP requests gem 'httparty', '~> 0.13.3' @@ -185,10 +186,10 @@ gem 're2', '~> 1.1.1' # Misc -gem 'version_sorter', '~> 2.1.0' +gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 2.2.1' +gem 'js_regex', '~> 3.1' # User agent parsing gem 'device_detector' @@ -203,9 +204,6 @@ gem 'connection_pool', '~> 2.0' # Discord integration gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false -# HipChat integration -gem 'hipchat', '~> 1.5.0' - # JIRA integration gem 'jira-ruby', '~> 1.4' @@ -225,7 +223,7 @@ gem 'asana', '~> 0.8.1' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.0.0' +gem 'kubeclient', '~> 4.2.2' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -305,6 +303,12 @@ group :metrics do gem 'raindrops', '~> 0.18' end +group :tracing do + # OpenTracing + gem 'opentracing', '~> 0.4.3' + gem 'jaeger-client', '~> 0.10.0' +end + group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false @@ -321,7 +325,7 @@ group :development do end group :development, :test do - gem 'bootsnap', '~> 1.3' + gem 'bootsnap', '~> 1.4' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' @@ -378,7 +382,7 @@ group :test do gem 'shoulda-matchers', '~> 3.1.2', require: false gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' + gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' @@ -408,7 +412,7 @@ gem 'sys-filesystem', '~> 1.1.6' # SSH host key support gem 'net-ssh', '~> 5.0' -gem 'sshkey', '~> 1.9.0' +gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -417,7 +421,8 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' + gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 77b4360cf413..1be6f2289544 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -85,7 +85,7 @@ GEM binding_ninja (0.2.2) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.1) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -113,6 +113,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) + character_set (1.1.2) charlock_holmes (0.7.6) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) @@ -143,7 +144,7 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.0) + deckar01-task_list (2.2.0) html-pipeline declarative (0.0.10) declarative-option (0.1.0) @@ -185,7 +186,7 @@ GEM erubi (1.7.1) erubis (2.7.0) escape_utils (1.2.1) - et-orbi (1.0.3) + et-orbi (1.1.7) tzinfo eventmachine (1.2.7) excon (0.62.0) @@ -206,7 +207,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.9.25) + ffi (1.10.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -217,32 +218,33 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.2.0) - fog-core (~> 1.27) - fog-json (~> 1.0) + fog-aliyun (0.3.3) + fog-core + fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.3.0) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.1.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-google (1.7.1) - fog-core - fog-json - fog-xml + mime-types + fog-google (1.8.2) + fog-core (<= 2.1.0) + fog-json (~> 1.2) + fog-xml (~> 0.1.0) google-api-client (~> 0.23.0) - fog-json (1.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-local (0.3.1) - fog-core (~> 1.27) - fog-openstack (0.1.21) - fog-core (>= 1.40) + fog-local (0.6.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (1.0.8) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -258,6 +260,9 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) + fugit (1.1.7) + et-orbi (~> 1.1, >= 1.1.7) + raabro (~> 1.1) fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -274,7 +279,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.5.0) + gitaly-proto (1.13.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -282,11 +287,11 @@ GEM gitlab-markup (1.6.5) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) - gitlab-styles (2.4.1) + gitlab-styles (2.5.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -305,7 +310,7 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + googleapis-common-protos-types (1.0.3) google-protobuf (~> 3.0) googleauth (0.6.6) faraday (~> 0.12) @@ -353,15 +358,12 @@ GEM thor tilt hangouts-chat (0.0.5) - hashdiff (0.3.4) + hashdiff (0.3.8) hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) - hipchat (1.5.2) - httparty - mimemagic html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) @@ -389,13 +391,18 @@ GEM cause json ipaddress (0.8.3) + jaeger-client (0.10.0) + opentracing (~> 0.3) + thrift jira-ruby (1.4.1) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - js_regex (2.2.1) - regexp_parser (>= 0.4.11, <= 0.5.0) + js_regex (3.1.1) + character_set (~> 1.1) + regexp_parser (~> 1.1) + regexp_property_values (~> 0.3) json (1.8.6) json-jwt (1.9.4) activesupport @@ -416,10 +423,10 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) + kgio (2.11.2) knapsack (1.17.0) rake - kubeclient (4.0.0) + kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) @@ -462,9 +469,9 @@ GEM mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -477,8 +484,8 @@ GEM net-ssh (5.0.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri numerizer (0.1.1) @@ -544,6 +551,8 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) + opentracing (0.4.3) + optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) @@ -575,7 +584,7 @@ GEM atomic (>= 1.0.0) peek redis - pg (0.18.4) + pg (1.1.3) po_to_json (1.0.1) json (>= 1.6.0) powerpack (0.1.1) @@ -606,6 +615,7 @@ GEM get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) + raabro (1.1.6) rack (2.0.6) rack-accept (0.4.5) rack (>= 0.4) @@ -618,7 +628,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-proxy (0.6.0) rack @@ -657,23 +667,22 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - raindrops (0.18.0) + raindrops (0.19.0) rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbtrace (0.4.10) + rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) - trollop (>= 1.16.2) + optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) recaptcha (3.0.0) json recursive-open-struct (1.1.0) - redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -693,7 +702,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (0.5.0) + regexp_parser (1.3.0) + regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -775,9 +785,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rufus-scheduler (3.4.0) - et-orbi (~> 1.0) - rugged (0.27.5) + rugged (0.28.0) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -816,12 +824,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (0.6.0) - rufus-scheduler (>= 3.3.0) + sidekiq-cron (1.0.4) + fugit (~> 1.1) sidekiq (>= 4.2.1) signet (0.11.0) addressable (~> 2.3) @@ -847,7 +856,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (1.9.0) + sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) state_machines-activemodel (0.5.1) @@ -868,6 +877,7 @@ GEM rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) + thrift (0.11.0.0) tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) @@ -875,10 +885,9 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - trollop (2.1.3) - truncato (0.7.10) + truncato (0.7.11) htmlentities (~> 4.3.1) - nokogiri (~> 1.8.0, >= 1.7.0) + nokogiri (>= 1.7.0, <= 2.0) tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) @@ -890,7 +899,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.3.2) - unicorn (5.1.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -908,7 +917,7 @@ GEM validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) - version_sorter (2.1.0) + version_sorter (2.2.4) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -917,7 +926,7 @@ GEM vmstat (2.3.0) warden (1.2.7) rack (>= 1.0) - webmock (2.3.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -957,7 +966,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) - bootsnap (~> 1.3) + bootsnap (~> 1.4) bootstrap_form (~> 2.7.0) brakeman (~> 4.2) browser (~> 2.5) @@ -974,7 +983,7 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.0) + deckar01-task_list (= 2.2.0) device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) @@ -994,27 +1003,28 @@ DEPENDENCIES flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) - fog-aliyun (~> 0.2.0) - fog-aws (~> 2.0.1) - fog-core (~> 1.44) - fog-google (~> 1.7.1) - fog-local (~> 0.3) - fog-openstack (~> 0.1) + fog-aliyun (~> 0.3) + fog-aws (~> 3.3) + fog-core (= 2.1.0) + fog-google (~> 1.8) + fog-local (~> 0.6) + fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) foreman (~> 0.84.0) + fugit (~> 1.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.5.0) + gitaly-proto (~> 1.13.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (~> 3.6) @@ -1031,20 +1041,20 @@ DEPENDENCIES hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) - hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text httparty (~> 0.13.3) icalendar influxdb (~> 0.2) + jaeger-client (~> 0.10.0) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - js_regex (~> 2.2.1) + js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.0.0) + kubeclient (~> 4.2.2) letter_opener_web (~> 1.3.0) license_finder (~> 5.4) licensee (~> 8.9) @@ -1059,7 +1069,7 @@ DEPENDENCIES nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) - nokogiri (~> 1.8.5) + nokogiri (~> 1.10.1) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1077,6 +1087,7 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) + opentracing (~> 0.4.3) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) @@ -1084,7 +1095,7 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - pg (~> 0.18.2) + pg (~> 1.1) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.5.1) @@ -1107,7 +1118,6 @@ DEPENDENCIES rdoc (~> 6.0) re2 (~> 1.1.1) recaptcha (~> 3.0) - redcarpet (~> 3.4) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) @@ -1128,8 +1138,7 @@ DEPENDENCIES ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 1.2.2) - rufus-scheduler (~> 3.4) - rugged (~> 0.27) + rugged (~> 0.28) sanitize (~> 4.6) sass (~> 3.5) sass-rails (~> 5.0.6) @@ -1142,14 +1151,14 @@ DEPENDENCIES sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) sidekiq (~> 5.2.1) - sidekiq-cron (~> 0.6.0) + sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) - sshkey (~> 1.9.0) + sshkey (~> 2.0) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) @@ -1157,17 +1166,17 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) - truncato (~> 0.7.9) + truncato (~> 0.7.11) u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.1.0) + unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) - version_sorter (~> 2.1.0) + version_sorter (~> 2.2.4) virtus (~> 1.0.1) vmstat (~> 2.3.0) - webmock (~> 2.3.2) + webmock (~> 3.5.1) webpack-rails (~> 0.9.10) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 10b8c3f25ead..f3e2dd91d556 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -309,10 +309,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; + sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.1"; }; bootstrap_form = { source = { @@ -407,6 +407,14 @@ }; version = "0.1"; }; + character_set = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9"; + type = "gem"; + }; + version = "1.1.2"; + }; charlock_holmes = { source = { remotes = ["https://rubygems.org"]; @@ -587,10 +595,10 @@ dependencies = ["html-pipeline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j"; + sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; declarative = { source = { @@ -772,10 +780,10 @@ dependencies = ["tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi"; + sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.7"; }; eventmachine = { source = { @@ -881,10 +889,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; flipper = { source = { @@ -925,64 +933,64 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; + sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.3"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; + sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs"; type = "gem"; }; - version = "2.0.1"; + version = "3.3.0"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; type = "gem"; }; - version = "1.45.0"; + version = "2.1.0"; }; fog-google = { dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; + sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.2"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; fog-local = { dependencies = ["fog-core"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn"; + sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; type = "gem"; }; - version = "0.3.1"; + version = "0.6.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys"; + sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; type = "gem"; }; - version = "0.1.21"; + version = "1.0.8"; }; fog-rackspace = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1028,6 +1036,15 @@ }; version = "0.2.5"; }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; + type = "gem"; + }; + version = "1.1.7"; + }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; source = { @@ -1085,10 +1102,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; + sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; type = "gem"; }; - version = "1.5.0"; + version = "1.13.0"; }; github-markup = { source = { @@ -1130,19 +1147,19 @@ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; + sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.1"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; + sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.1"; }; globalid = { dependencies = ["activesupport"]; @@ -1183,10 +1200,10 @@ dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1306,10 +1323,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; }; hashie = { source = { @@ -1337,15 +1354,6 @@ }; version = "2.6.0"; }; - hipchat = { - dependencies = ["httparty" "mimemagic"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; - type = "gem"; - }; - version = "1.5.2"; - }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; source = { @@ -1465,6 +1473,15 @@ }; version = "0.8.3"; }; + jaeger-client = { + dependencies = ["opentracing" "thrift"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + type = "gem"; + }; + version = "0.10.0"; + }; jira-ruby = { dependencies = ["activesupport" "multipart-post" "oauth"]; source = { @@ -1483,13 +1500,13 @@ version = "1.3.2"; }; js_regex = { - dependencies = ["regexp_parser"]; + dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; type = "gem"; }; - version = "2.2.1"; + version = "3.1.1"; }; json = { source = { @@ -1563,10 +1580,10 @@ kgio = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118"; + sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.2"; }; knapsack = { dependencies = ["rake"]; @@ -1581,10 +1598,10 @@ dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg"; + sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.2"; }; launchy = { dependencies = ["addressable"]; @@ -1743,10 +1760,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -1759,10 +1776,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -1857,10 +1874,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2067,6 +2084,22 @@ }; version = "2.2.3"; }; + opentracing = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf"; + type = "gem"; + }; + version = "0.4.3"; + }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; org-ruby = { dependencies = ["rubypants"]; source = { @@ -2174,10 +2207,10 @@ pg = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; type = "gem"; }; - version = "0.18.4"; + version = "1.1.3"; }; po_to_json = { dependencies = ["json"]; @@ -2299,6 +2332,14 @@ }; version = "0.0.3.3"; }; + raabro = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; + type = "gem"; + }; + version = "1.1.6"; + }; rack = { source = { remotes = ["https://rubygems.org"]; @@ -2346,10 +2387,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq"; + sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; rack-proxy = { dependencies = ["rack"]; @@ -2443,10 +2484,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz"; + sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; rake = { source = { @@ -2483,13 +2524,13 @@ version = "0.3.6"; }; rbtrace = { - dependencies = ["ffi" "msgpack" "trollop"]; + dependencies = ["ffi" "msgpack" "optimist"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; rdoc = { source = { @@ -2524,14 +2565,6 @@ }; version = "1.1.0"; }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; RedCloth = { source = { remotes = ["https://rubygems.org"]; @@ -2605,10 +2638,18 @@ regexp_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq"; type = "gem"; }; - version = "0.5.0"; + version = "1.3.0"; + }; + regexp_property_values = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; + type = "gem"; + }; + version = "0.3.4"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -2895,22 +2936,13 @@ }; version = "1.2.2"; }; - rufus-scheduler = { - dependencies = ["et-orbi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8"; - type = "gem"; - }; - version = "3.4.0"; - }; rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.0"; }; safe_yaml = { source = { @@ -3045,22 +3077,22 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26"; + sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.5"; }; sidekiq-cron = { - dependencies = ["rufus-scheduler" "sidekiq"]; + dependencies = ["fugit" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj"; + sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.4"; }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; @@ -3151,10 +3183,10 @@ sshkey = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; type = "gem"; }; - version = "1.9.0"; + version = "2.0.0"; }; stackprof = { source = { @@ -3256,6 +3288,14 @@ }; version = "0.3.6"; }; + thrift = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; + type = "gem"; + }; + version = "0.11.0.0"; + }; tilt = { source = { remotes = ["https://rubygems.org"]; @@ -3298,22 +3338,14 @@ }; version = "1.0.0"; }; - trollop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; - type = "gem"; - }; - version = "2.1.3"; - }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b"; + sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; type = "gem"; }; - version = "0.7.10"; + version = "0.7.11"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -3378,10 +3410,10 @@ dependencies = ["kgio" "raindrops"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; + sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; type = "gem"; }; - version = "5.1.0"; + version = "5.4.1"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -3421,10 +3453,10 @@ version_sorter = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr"; + sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.4"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; @@ -3456,10 +3488,10 @@ dependencies = ["addressable" "crack" "hashdiff"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; type = "gem"; }; - version = "2.3.2"; + version = "3.5.1"; }; webpack-rails = { dependencies = ["railties"]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index f01944a0e877..2847bd3e6c27 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'pg', '~> 1.1', group: :postgres -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'grape-path-helpers', '~> 1.0' gem 'faraday', '~> 0.12' @@ -71,7 +71,7 @@ gem 'gpgme', '~> 2.0.18' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API @@ -97,13 +97,15 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 2.0.1' -gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.7.1' -gem 'fog-local', '~> 0.3' -gem 'fog-openstack', '~> 0.1' +gem 'fog-aws', '~> 3.3' +# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. +# Also see config/initializers/fog_core_patch.rb. +gem 'fog-core', '= 2.1.0' +gem 'fog-google', '~> 1.8' +gem 'fog-local', '~> 0.6' +gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.2.0' +gem 'fog-aliyun', '~> 0.3' # for Google storage gem 'google-api-client', '~> 0.23' @@ -123,10 +125,9 @@ gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.0.0' +gem 'deckar01-task_list', '2.2.0' gem 'gitlab-markup', '~> 1.6.5' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.0' @@ -136,9 +137,9 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.8' gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' -gem 'truncato', '~> 0.7.9' +gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.5' +gem 'nokogiri', '~> 1.10.1' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -154,7 +155,7 @@ gem 'diffy', '~> 3.1.0' gem 'rack', '2.0.6' group :unicorn do - gem 'unicorn', '~> 5.1.0' + gem 'unicorn', '~> 5.4.1' gem 'unicorn-worker-killer', '~> 0.4.4' end @@ -171,12 +172,12 @@ gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.2.1' -gem 'sidekiq-cron', '~> 0.6.0' +gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.6.0' gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' # Cron Parser -gem 'rufus-scheduler', '~> 3.4' +gem 'fugit', '~> 1.1' # HTTP requests gem 'httparty', '~> 0.13.3' @@ -195,10 +196,10 @@ gem 're2', '~> 1.1.1' # Misc -gem 'version_sorter', '~> 2.1.0' +gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 2.2.1' +gem 'js_regex', '~> 3.1' # User agent parsing gem 'device_detector' @@ -213,9 +214,6 @@ gem 'connection_pool', '~> 2.0' # Discord integration gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false -# HipChat integration -gem 'hipchat', '~> 1.5.0' - # JIRA integration gem 'jira-ruby', '~> 1.4' @@ -235,7 +233,7 @@ gem 'asana', '~> 0.8.1' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.0.0' +gem 'kubeclient', '~> 4.2.2' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -317,6 +315,12 @@ group :metrics do gem 'raindrops', '~> 0.18' end +group :tracing do + # OpenTracing + gem 'opentracing', '~> 0.4.3' + gem 'jaeger-client', '~> 0.10.0' +end + group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false @@ -333,7 +337,7 @@ group :development do end group :development, :test do - gem 'bootsnap', '~> 1.3' + gem 'bootsnap', '~> 1.4' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' @@ -390,7 +394,7 @@ group :test do gem 'shoulda-matchers', '~> 3.1.2', require: false gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' + gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' @@ -423,7 +427,7 @@ gem 'net-ntp' # SSH host key support gem 'net-ssh', '~> 5.0' -gem 'sshkey', '~> 1.9.0' +gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -432,7 +436,8 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' + gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index 8d07afb59bf1..251d759be059 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -93,7 +93,7 @@ GEM binding_ninja (0.2.2) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.1) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -121,6 +121,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) + character_set (1.1.2) charlock_holmes (0.7.6) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) @@ -151,7 +152,7 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.0) + deckar01-task_list (2.2.0) html-pipeline declarative (0.0.10) declarative-option (0.1.0) @@ -206,7 +207,7 @@ GEM erubi (1.7.1) erubis (2.7.0) escape_utils (1.2.1) - et-orbi (1.0.3) + et-orbi (1.1.7) tzinfo eventmachine (1.2.7) excon (0.62.0) @@ -230,7 +231,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.9.25) + ffi (1.10.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -241,32 +242,33 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.2.0) - fog-core (~> 1.27) - fog-json (~> 1.0) + fog-aliyun (0.3.3) + fog-core + fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.3.0) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.1.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-google (1.7.1) - fog-core - fog-json - fog-xml + mime-types + fog-google (1.8.2) + fog-core (<= 2.1.0) + fog-json (~> 1.2) + fog-xml (~> 0.1.0) google-api-client (~> 0.23.0) - fog-json (1.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-local (0.3.1) - fog-core (~> 1.27) - fog-openstack (0.1.21) - fog-core (>= 1.40) + fog-local (0.6.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (1.0.8) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -282,6 +284,9 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) + fugit (1.1.7) + et-orbi (~> 1.1, >= 1.1.7) + raabro (~> 1.1) fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -298,7 +303,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.5.0) + gitaly-proto (1.13.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -307,11 +312,11 @@ GEM gitlab-markup (1.6.5) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) - gitlab-styles (2.4.1) + gitlab-styles (2.5.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -330,7 +335,7 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + googleapis-common-protos-types (1.0.3) google-protobuf (~> 3.0) googleauth (0.6.6) faraday (~> 0.12) @@ -380,15 +385,12 @@ GEM thor tilt hangouts-chat (0.0.5) - hashdiff (0.3.4) + hashdiff (0.3.8) hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) - hipchat (1.5.2) - httparty - mimemagic html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) @@ -416,14 +418,19 @@ GEM cause json ipaddress (0.8.3) + jaeger-client (0.10.0) + opentracing (~> 0.3) + thrift jira-ruby (1.4.1) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.3.1) jquery-atwho-rails (1.3.2) - js_regex (2.2.1) - regexp_parser (>= 0.4.11, <= 0.5.0) + js_regex (3.1.1) + character_set (~> 1.1) + regexp_parser (~> 1.1) + regexp_property_values (~> 0.3) json (1.8.6) json-jwt (1.9.4) activesupport @@ -444,10 +451,10 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) + kgio (2.11.2) knapsack (1.17.0) rake - kubeclient (4.0.0) + kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) @@ -490,9 +497,9 @@ GEM mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -507,8 +514,8 @@ GEM net-ssh (5.0.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri numerizer (0.1.1) @@ -574,6 +581,8 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) + opentracing (0.4.3) + optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) @@ -605,7 +614,7 @@ GEM atomic (>= 1.0.0) peek redis - pg (0.18.4) + pg (1.1.3) po_to_json (1.0.1) json (>= 1.6.0) powerpack (0.1.1) @@ -636,6 +645,7 @@ GEM get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) + raabro (1.1.6) rack (2.0.6) rack-accept (0.4.5) rack (>= 0.4) @@ -648,7 +658,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-proxy (0.6.0) rack @@ -687,23 +697,22 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - raindrops (0.18.0) + raindrops (0.19.0) rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbtrace (0.4.10) + rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) - trollop (>= 1.16.2) + optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) recaptcha (3.0.0) json recursive-open-struct (1.1.0) - redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -723,7 +732,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (0.5.0) + regexp_parser (1.3.0) + regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -805,9 +815,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rufus-scheduler (3.4.0) - et-orbi (~> 1.0) - rugged (0.27.5) + rugged (0.28.0) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -846,12 +854,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (0.6.0) - rufus-scheduler (>= 3.3.0) + sidekiq-cron (1.0.4) + fugit (~> 1.1) sidekiq (>= 4.2.1) signet (0.11.0) addressable (~> 2.3) @@ -877,7 +886,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (1.9.0) + sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) state_machines-activemodel (0.5.1) @@ -898,6 +907,7 @@ GEM rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) + thrift (0.11.0.0) tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) @@ -905,10 +915,9 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - trollop (2.1.3) - truncato (0.7.10) + truncato (0.7.11) htmlentities (~> 4.3.1) - nokogiri (~> 1.8.0, >= 1.7.0) + nokogiri (>= 1.7.0, <= 2.0) tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) @@ -920,7 +929,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.3.2) - unicorn (5.1.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -938,7 +947,7 @@ GEM validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) - version_sorter (2.1.0) + version_sorter (2.2.4) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -947,7 +956,7 @@ GEM vmstat (2.3.0) warden (1.2.7) rack (>= 1.0) - webmock (2.3.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -988,7 +997,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) - bootsnap (~> 1.3) + bootsnap (~> 1.4) bootstrap_form (~> 2.7.0) brakeman (~> 4.2) browser (~> 2.5) @@ -1005,7 +1014,7 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.0) + deckar01-task_list (= 2.2.0) device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) @@ -1029,28 +1038,29 @@ DEPENDENCIES flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) - fog-aliyun (~> 0.2.0) - fog-aws (~> 2.0.1) - fog-core (~> 1.44) - fog-google (~> 1.7.1) - fog-local (~> 0.3) - fog-openstack (~> 0.1) + fog-aliyun (~> 0.3) + fog-aws (~> 3.3) + fog-core (= 2.1.0) + fog-google (~> 1.8) + fog-local (~> 0.6) + fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) foreman (~> 0.84.0) + fugit (~> 1.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.5.0) + gitaly-proto (~> 1.13.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-license (~> 1.0) gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (~> 3.6) @@ -1068,20 +1078,20 @@ DEPENDENCIES hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) - hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text httparty (~> 0.13.3) icalendar influxdb (~> 0.2) + jaeger-client (~> 0.10.0) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - js_regex (~> 2.2.1) + js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.0.0) + kubeclient (~> 4.2.2) letter_opener_web (~> 1.3.0) license_finder (~> 5.4) licensee (~> 8.9) @@ -1098,7 +1108,7 @@ DEPENDENCIES net-ldap net-ntp net-ssh (~> 5.0) - nokogiri (~> 1.8.5) + nokogiri (~> 1.10.1) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1116,6 +1126,7 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) + opentracing (~> 0.4.3) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) @@ -1123,7 +1134,7 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - pg (~> 0.18.2) + pg (~> 1.1) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.5.1) @@ -1146,7 +1157,6 @@ DEPENDENCIES rdoc (~> 6.0) re2 (~> 1.1.1) recaptcha (~> 3.0) - redcarpet (~> 3.4) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) @@ -1167,8 +1177,7 @@ DEPENDENCIES ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 1.2.2) - rufus-scheduler (~> 3.4) - rugged (~> 0.27) + rugged (~> 0.28) sanitize (~> 4.6) sass (~> 3.5) sass-rails (~> 5.0.6) @@ -1181,14 +1190,14 @@ DEPENDENCIES sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) sidekiq (~> 5.2.1) - sidekiq-cron (~> 0.6.0) + sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) - sshkey (~> 1.9.0) + sshkey (~> 2.0) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) @@ -1196,17 +1205,17 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) - truncato (~> 0.7.9) + truncato (~> 0.7.11) u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.1.0) + unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) - version_sorter (~> 2.1.0) + version_sorter (~> 2.2.4) virtus (~> 1.0.1) vmstat (~> 2.3.0) - webmock (~> 2.3.2) + webmock (~> 3.5.1) webpack-rails (~> 0.9.10) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index 03f885f2f9e5..c62c26b2bd10 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -344,10 +344,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; + sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.1"; }; bootstrap_form = { source = { @@ -442,6 +442,14 @@ }; version = "0.1"; }; + character_set = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9"; + type = "gem"; + }; + version = "1.1.2"; + }; charlock_holmes = { source = { remotes = ["https://rubygems.org"]; @@ -622,10 +630,10 @@ dependencies = ["html-pipeline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j"; + sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; declarative = { source = { @@ -851,10 +859,10 @@ dependencies = ["tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi"; + sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.7"; }; eventmachine = { source = { @@ -969,10 +977,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; flipper = { source = { @@ -1013,64 +1021,64 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; + sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.3"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; + sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs"; type = "gem"; }; - version = "2.0.1"; + version = "3.3.0"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; type = "gem"; }; - version = "1.45.0"; + version = "2.1.0"; }; fog-google = { dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; + sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.2"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; fog-local = { dependencies = ["fog-core"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn"; + sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; type = "gem"; }; - version = "0.3.1"; + version = "0.6.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys"; + sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; type = "gem"; }; - version = "0.1.21"; + version = "1.0.8"; }; fog-rackspace = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1116,6 +1124,15 @@ }; version = "0.2.5"; }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; + type = "gem"; + }; + version = "1.1.7"; + }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; source = { @@ -1173,10 +1190,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; + sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; type = "gem"; }; - version = "1.5.0"; + version = "1.13.0"; }; github-markup = { source = { @@ -1226,19 +1243,19 @@ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; + sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.1"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; + sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.1"; }; globalid = { dependencies = ["activesupport"]; @@ -1279,10 +1296,10 @@ dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1411,10 +1428,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; }; hashie = { source = { @@ -1442,15 +1459,6 @@ }; version = "2.6.0"; }; - hipchat = { - dependencies = ["httparty" "mimemagic"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; - type = "gem"; - }; - version = "1.5.2"; - }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; source = { @@ -1570,6 +1578,15 @@ }; version = "0.8.3"; }; + jaeger-client = { + dependencies = ["opentracing" "thrift"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + type = "gem"; + }; + version = "0.10.0"; + }; jira-ruby = { dependencies = ["activesupport" "multipart-post" "oauth"]; source = { @@ -1596,13 +1613,13 @@ version = "1.3.2"; }; js_regex = { - dependencies = ["regexp_parser"]; + dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; type = "gem"; }; - version = "2.2.1"; + version = "3.1.1"; }; json = { source = { @@ -1676,10 +1693,10 @@ kgio = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118"; + sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.2"; }; knapsack = { dependencies = ["rake"]; @@ -1694,10 +1711,10 @@ dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg"; + sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.2"; }; launchy = { dependencies = ["addressable"]; @@ -1856,10 +1873,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -1872,10 +1889,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -1986,10 +2003,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2196,6 +2213,22 @@ }; version = "2.2.3"; }; + opentracing = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf"; + type = "gem"; + }; + version = "0.4.3"; + }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; org-ruby = { dependencies = ["rubypants"]; source = { @@ -2303,10 +2336,10 @@ pg = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; type = "gem"; }; - version = "0.18.4"; + version = "1.1.3"; }; po_to_json = { dependencies = ["json"]; @@ -2428,6 +2461,14 @@ }; version = "0.0.3.3"; }; + raabro = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; + type = "gem"; + }; + version = "1.1.6"; + }; rack = { source = { remotes = ["https://rubygems.org"]; @@ -2475,10 +2516,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq"; + sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; rack-proxy = { dependencies = ["rack"]; @@ -2572,10 +2613,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz"; + sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; rake = { source = { @@ -2612,13 +2653,13 @@ version = "0.3.6"; }; rbtrace = { - dependencies = ["ffi" "msgpack" "trollop"]; + dependencies = ["ffi" "msgpack" "optimist"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; rdoc = { source = { @@ -2653,14 +2694,6 @@ }; version = "1.1.0"; }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; RedCloth = { source = { remotes = ["https://rubygems.org"]; @@ -2734,10 +2767,18 @@ regexp_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq"; type = "gem"; }; - version = "0.5.0"; + version = "1.3.0"; + }; + regexp_property_values = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; + type = "gem"; + }; + version = "0.3.4"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -3024,22 +3065,13 @@ }; version = "1.2.2"; }; - rufus-scheduler = { - dependencies = ["et-orbi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8"; - type = "gem"; - }; - version = "3.4.0"; - }; rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.0"; }; safe_yaml = { source = { @@ -3174,22 +3206,22 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26"; + sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.5"; }; sidekiq-cron = { - dependencies = ["rufus-scheduler" "sidekiq"]; + dependencies = ["fugit" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj"; + sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.4"; }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; @@ -3280,10 +3312,10 @@ sshkey = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; type = "gem"; }; - version = "1.9.0"; + version = "2.0.0"; }; stackprof = { source = { @@ -3385,6 +3417,14 @@ }; version = "0.3.6"; }; + thrift = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; + type = "gem"; + }; + version = "0.11.0.0"; + }; tilt = { source = { remotes = ["https://rubygems.org"]; @@ -3427,22 +3467,14 @@ }; version = "1.0.0"; }; - trollop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; - type = "gem"; - }; - version = "2.1.3"; - }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b"; + sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; type = "gem"; }; - version = "0.7.10"; + version = "0.7.11"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -3507,10 +3539,10 @@ dependencies = ["kgio" "raindrops"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; + sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; type = "gem"; }; - version = "5.1.0"; + version = "5.4.1"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -3550,10 +3582,10 @@ version_sorter = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr"; + sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.4"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; @@ -3585,10 +3617,10 @@ dependencies = ["addressable" "crack" "hashdiff"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; type = "gem"; }; - version = "2.3.2"; + version = "3.5.1"; }; webpack-rails = { dependencies = ["railties"]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 5b786b255019..28056bf6cb81 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -11,14 +11,14 @@ assert withGUI -> qtbase != null && qtmultimedia != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "mkvtoolnix-${version}"; - version = "31.0.0"; + pname = "mkvtoolnix"; + version = "32.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1fml374ivzzmac0ixhngj4bdxszcaw5yxdmacpn6ia7pdyvpf5lh"; + sha256 = "022mmgm0a6qxybjrygisg731sg9m9d8svd0mxr77wfknwa7m09c9"; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ef93c97fd4d4..344f1abc8b26 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -349,7 +349,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . + tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . # Compute a checksum of the tarball. echo "Computing layer checksum..." diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index ff814c1f6130..4cf338b9b252 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -9,6 +9,7 @@ layerPath="./layers/$layerNumber" echo "Creating layer #$layerNumber for $@" mkdir -p "$layerPath" +tar --no-recursion -rf "$layerPath/layer.tar" /nix /nix/store tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 "$@" diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 7936a216ada7..b394cb47157c 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -1,49 +1,55 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale, bdf2psf }: +{ stdenv, fetchurl, fetchFromGitHub +, mkfontdir, mkfontscale, bdf2psf, bdftopcf +}: stdenv.mkDerivation rec { - name = "gohufont-2.0"; + name = "gohufont-${version}"; + version = "2.1"; - pcf = fetchurl { - url = "http://font.gohu.org/gohufont-2.0.tar.gz"; - sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s"; + src = fetchurl { + url = "http://font.gohu.org/${name}.tar.gz"; + sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm"; }; - bdf = fetchurl { - url = "http://font.gohu.org/gohufont-bdf-2.0.tar.gz"; - sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr"; + bdf = fetchFromGitHub { + owner = "hchargois"; + repo = "gohufont"; + rev = "cc36b8c9fed7141763e55dcee0a97abffcf08224"; + sha256 = "1hmp11mrr01b29phw0xyj4h9b92qz19cf56ssf6c47c5j2c4xmbv"; }; - nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf ]; + nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf bdftopcf ]; - unpackPhase = '' - mkdir pcf bdf - tar -xzf $pcf --strip-components=1 -C pcf - tar -xzf $bdf --strip-components=1 -C bdf - ''; - - installPhase = '' + buildPhase = '' # convert bdf to psf fonts - sourceRoot="$(pwd)" + build=$(pwd) mkdir psf + cd ${bdf2psf}/usr/share/bdf2psf + for i in $bdf/*.bdf; do + bdf2psf \ + --fb "$i" standard.equivalents \ + ascii.set+useful.set+linux.set 512 \ + "$build/psf/$(basename $i .bdf).psf" + done + cd $build - cd "${bdf2psf}/usr/share/bdf2psf" - for i in $sourceRoot/bdf/*.bdf; do - bdf2psf --fb $i standard.equivalents \ - ascii.set+useful.set+linux.set 512 \ - "$sourceRoot/psf/$(basename $i .bdf).psf" + # convert hidpi variant to pcf + for i in $bdf/hidpi/*.bdf; do + name=$(basename $i .bdf).pcf + bdftopcf -o "$name" "$i" done - cd "$sourceRoot" + ''; + installPhase = '' # install the psf fonts (for the virtual console) fontDir="$out/share/consolefonts" mkdir -p "$fontDir" - mv psf/*.psf "$fontDir" - + mv -t "$fontDir" psf/*.psf # install the pcf fonts (for xorg applications) fontDir="$out/share/fonts/misc" mkdir -p "$fontDir" - mv pcf/*.pcf.gz "$fontDir" + mv -t "$fontDir" *.pcf.gz *.pcf cd "$fontDir" mkfontdir @@ -52,15 +58,15 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0msl5y9q6hjbhc85v121x1b1rhsh2rbqqy4k234i5mpp8l3087r7"; + outputHash = "0kl7k8idl0fnsap2c4j02i33z017p2s4gi2cgspy6ica46fczcc1"; meta = with stdenv.lib; { description = '' A monospace bitmap font well suited for programming and terminal use ''; - homepage = http://font.gohu.org/; - license = licenses.wtfpl; - maintainers = with maintainers; [ epitrochoid ]; - platforms = platforms.linux; + homepage = http://font.gohu.org/; + license = licenses.wtfpl; + maintainers = with maintainers; [ epitrochoid rnhmjoj ]; + platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix new file mode 100644 index 000000000000..1fdf88b79abe --- /dev/null +++ b/pkgs/data/fonts/manrope/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "manrope"; + version = "3"; + src = fetchFromGitHub { + owner = "sharanda"; + repo = pname; + rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; + sha256 = "1k6nmczbl97b9j2a8vx6a1r3q4gd1c2qydv0y9gn8xyl7x8fcvhs"; + }; + dontBuild = true; + installPhase = '' + install -Dm644 -t $out/share/fonts/opentype "desktop font"/* + ''; + meta = with stdenv.lib; { + description = "Open-source modern sans-serif font family"; + homepage = https://github.com/sharanda/manrope; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index 49a71987e754..0866fd104d23 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: stdenv.mkDerivation rec { - name = "lxrandr-0.3.1"; + name = "lxrandr-0.3.2"; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "6d98338485a90d9e47f6d08184df77ca0d9715517f8a45a914e861750589184e"; + sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"; }; configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 814795499a99..5c27d0d2f182 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.5/ ) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 2d382e906325..5a856032e47c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -67,4 +67,25 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; + # Needs a recent version from the "develop" branch of the upstream git + # repository to compile with ghc 8.6.4. + liquid-fixpoint = assert super.liquid-fixpoint.version == "0.7.0.7"; overrideSrc super.liquid-fixpoint { + src = pkgs.fetchFromGitHub { + owner = "ucsd-progsys"; + repo = "liquid-fixpoint"; + rev = "42c027ab9ae47907c588a2f1f9c05a5e0aa881e9"; + sha256 = "17qmzq1vx7h04yd38drr6sh6hys3q2rz62qh3pna9kbxlcnikkqf"; + }; + version = "0.8.0.2-pre-release"; + }; + liquidhaskell = assert super.liquidhaskell.version == "0.8.2.4"; overrideSrc super.liquidhaskell { + src = pkgs.fetchFromGitHub { + owner = "ucsd-progsys"; + repo = "liquidhaskell"; + rev = "254e77da9cd36e95b72c526bfb9eec50d3447050"; + sha256 = "089x41z51iw542ijz32j9ns6flcc4hsbjqx7rfznvmm7a4q78yza"; + }; + version = "0.8.6.0-pre-release"; + }; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ce6fdfbe6ac6..439a7f4dfea3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.13 + # LTS Haskell 13.14 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -263,6 +263,7 @@ default-package-overrides: - bazel-runfiles ==0.7.0.1 - bbdb ==0.8 - bcrypt ==0.0.11 + - beam-core ==0.8.0.0 - bench ==1.0.12 - benchpress ==0.2.2.12 - bencode ==0.6.0.0 @@ -386,7 +387,7 @@ default-package-overrides: - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - - checkers ==0.4.11 + - checkers ==0.4.14 - checksum ==0.0 - choice ==0.2.2 - chronologique ==0.3.1.1 @@ -600,7 +601,7 @@ default-package-overrides: - direct-sqlite ==2.3.24 - discount ==0.1.1 - disk-free-space ==0.1.0.1 - - distributed-closure ==0.4.1 + - distributed-closure ==0.4.1.1 - distribution-opensuse ==1.1.1 - distributive ==0.6 - dlist ==0.8.0.5 @@ -743,7 +744,7 @@ default-package-overrides: - fmt ==0.6.1.1 - fn ==0.3.0.2 - focus ==1.0.1.2 - - focuslist ==0.1.0.1 + - focuslist ==0.1.0.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.8 - fold-debounce-conduit ==0.2.0.3 @@ -1034,7 +1035,7 @@ default-package-overrides: - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - http2 ==1.6.4 - - HTTP ==4000.3.12 + - HTTP ==4000.3.13 - http-api-data ==0.4 - http-client ==0.5.14 - http-client-tls ==0.3.5.3 @@ -1134,7 +1135,7 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.1.0 - io-streams-haproxy ==1.0.1.0 - - ip ==1.4.2 + - ip ==1.4.2.1 - ip6addr ==1.0.0 - iproute ==1.7.7 - IPv6Addr ==1.1.2 @@ -1153,6 +1154,7 @@ default-package-overrides: - jack ==0.7.1.4 - jose ==0.8.0.0 - jose-jwt ==0.8.0 + - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.9.3 @@ -1188,7 +1190,7 @@ default-package-overrides: - lame ==0.1.1 - language-c ==0.8.2 - language-c-quote ==0.12.2 - - language-docker ==8.0.1 + - language-docker ==8.0.2 - language-ecmascript ==0.19 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 @@ -1268,7 +1270,7 @@ default-package-overrides: - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - mainland-pretty ==0.7 - - main-tester ==0.2.0.0 + - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.6 - mapquest-api ==0.3.1 @@ -1294,7 +1296,7 @@ default-package-overrides: - mega-sdist ==0.3.3.2 - memory ==0.14.18 - MemoTrie ==0.6.9 - - menshen ==0.0.1 + - menshen ==0.0.2 - mercury-api ==0.1.0.2 - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1401,7 +1403,7 @@ default-package-overrides: - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.4 - netlib-ffi ==0.1.1 - - netpbm ==1.0.2 + - netpbm ==1.0.3 - netrc ==0.2.0.0 - nettle ==0.3.0 - netwire ==5.0.3 @@ -1840,7 +1842,7 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - - simple-cmd ==0.1.3 + - simple-cmd ==0.1.3.1 - simple-cmd-args ==0.1.0.1 - simple-log ==0.9.11 - simple-reflect ==0.3.3 @@ -2050,7 +2052,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 - - tidal ==1.0.8 + - tidal ==1.0.10 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2154,7 +2156,7 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - - util ==0.1.12.0 + - util ==0.1.13.0 - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 @@ -2231,7 +2233,7 @@ default-package-overrides: - webrtc-vad ==0.1.0.3 - websockets ==0.12.5.3 - websockets-snap ==0.10.3.0 - - weigh ==0.0.13 + - weigh ==0.0.14 - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.10 - wild-bind ==0.1.2.3 @@ -2304,7 +2306,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1 - yesod-auth-oauth2 ==0.6.1.1 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.12 + - yesod-core ==1.6.13 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 @@ -2429,6 +2431,8 @@ package-maintainers: - lambdabot-core - lambdabot-irc-plugins - language-nix + - liquid-fixpoint + - liquidhaskell - logging-facade-syslog - nix-paths - pandoc @@ -2816,6 +2820,7 @@ broken-packages: - applicative-parsec - applicative-quoters - applicative-splice + - approveapi - ApproxFun-hs - arb-fft - arbb-vm @@ -3003,6 +3008,7 @@ broken-packages: - beam - beam-core - beam-migrate + - beam-mysql - beam-newtype-field - beam-postgres - beam-sqlite @@ -3092,6 +3098,7 @@ broken-packages: - BiobaseBlast - BiobaseDotP - BiobaseEnsembl + - BiobaseFasta - BiobaseFR3D - BiobaseHTTP - BiobaseHTTPTools @@ -3100,6 +3107,7 @@ broken-packages: - BiobaseNewick - BiobaseTrainingData - BiobaseTurner + - BiobaseTypes - BiobaseVienna - BiobaseXNA - biocore @@ -3423,6 +3431,7 @@ broken-packages: - Checked - checked - checkmate + - chessIO - chevalier-common - chiasma - chitauri @@ -5528,6 +5537,7 @@ broken-packages: - hist-pl-types - historian - hit-graph + - hit-on - HJavaScript - hjcase - hjs @@ -6319,6 +6329,7 @@ broken-packages: - Ketchup - keter - kevin + - keycloak-hs - keyed - keyring - keysafe @@ -6568,8 +6579,6 @@ broken-packages: - lio-simple - lipsum-gen - liquid - - liquid-fixpoint - - liquidhaskell - liquidhaskell-cabal - liquidhaskell-cabal-demo - list-fusion-probe @@ -6772,6 +6781,7 @@ broken-packages: - matplotlib - matrix-as-xyz - matsuri + - matterhorn - maude - maxent - maxent-learner-hw @@ -6983,6 +6993,8 @@ broken-packages: - more-containers - morfette - morfeusz + - morley + - morley-prelude - morph - morphisms-functors - morphisms-functors-inventory @@ -7177,6 +7189,7 @@ broken-packages: - neural - neural-network-blashs - neural-network-hmatrix + - newhope - newports - newt - newtype-deriving @@ -7861,6 +7874,7 @@ broken-packages: - quickcheck-state-machine - quickcheck-state-machine-distributed - quickcheck-webdriver + - quickcheck-with-counterexamples - QuickCheckVariant - QuickPlot - quickpull @@ -7994,6 +8008,7 @@ broken-packages: - reflection-extras - reflex - reflex-animation + - reflex-basic-host - reflex-dom-core - reflex-gloss - reflex-gloss-scene @@ -8263,6 +8278,7 @@ broken-packages: - scholdoc-citeproc - scholdoc-texmath - scholdoc-types + - SciBaseTypes - science-constants-dimensional - scion - scion-browser @@ -8529,6 +8545,7 @@ broken-packages: - skeletons - skell - skemmtun + - skews - skulk - skylark-client - skype4hs @@ -8906,6 +8923,7 @@ broken-packages: - symantic - symantic-cli - symantic-grammar + - symantic-http-test - symantic-lib - symengine - symengine-hs @@ -8948,6 +8966,7 @@ broken-packages: - Tablify - tabloid - tabs + - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -8972,6 +8991,7 @@ broken-packages: - tamper - Tape - target + - tart - task - task-distribution - taskell @@ -8996,6 +9016,7 @@ broken-packages: - tcp-streams-openssl - tdd-util - tdigest-Chart + - tds - TeaHS - teams - teeth @@ -9028,6 +9049,7 @@ broken-packages: - terminal-punch - terminal-text - termination-combinators + - termonad - termplot - terntup - terrahs @@ -9199,6 +9221,7 @@ broken-packages: - traced - tracetree - tracker + - trackit - traction - tracy - traildb @@ -9222,6 +9245,7 @@ broken-packages: - trasa - trasa-client - trasa-server + - trasa-th - travis - travis-meta-yaml - trawl @@ -9752,6 +9776,7 @@ broken-packages: - xml-tydom-core - xml2json - xml2x + - xmlbf-xmlhtml - XmlHtmlWriter - XMLParser - xmltv diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5ade7f900efa..4ea117854bd0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1570,26 +1570,29 @@ self: { }) {}; "BiobaseFasta" = callPackage - ({ mkDerivation, base, BiobaseTypes, bytestring, deepseq, filepath - , lens, QuickCheck, resourcet, streaming, streaming-bytestring - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, tasty-silver - , tasty-th, text + ({ mkDerivation, base, BiobaseTypes, bytestring, filepath, lens + , QuickCheck, resourcet, streaming, streaming-bytestring + , string-conversions, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-silver, tasty-th, text }: mkDerivation { pname = "BiobaseFasta"; - version = "0.2.0.0"; - sha256 = "1ilsq8wjvmz1pw00rfk78f1si7s4ld3gbbp6w8nfq051hgg5ydsh"; + version = "0.3.0.0"; + sha256 = "0ka04dfgqv031k17dwnxkrq77r7xzmmbj8byrdrqr7r0z0ad0ns1"; libraryHaskellDepends = [ - base BiobaseTypes bytestring deepseq lens resourcet streaming - streaming-bytestring + base BiobaseTypes bytestring lens resourcet streaming + streaming-bytestring string-conversions ]; testHaskellDepends = [ - base bytestring filepath QuickCheck resourcet streaming - streaming-bytestring tasty tasty-golden tasty-hunit - tasty-quickcheck tasty-silver tasty-th text + base BiobaseTypes bytestring filepath lens QuickCheck resourcet + streaming streaming-bytestring string-conversions tasty + tasty-golden tasty-hunit tasty-quickcheck tasty-silver tasty-th + text ]; description = "streaming FASTA parser"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseHTTP" = callPackage @@ -1764,8 +1767,8 @@ self: { }: mkDerivation { pname = "BiobaseTypes"; - version = "0.1.4.0"; - sha256 = "1ih3l72i9ahgxb261y43gncdrha3jpzkpavvhbsyqv6vi7pgcj4r"; + version = "0.2.0.0"; + sha256 = "16irdkcrih8b1mnjmnzq1bz2hbn02ayzhsmx97fqvy9py21mvrgv"; libraryHaskellDepends = [ aeson attoparsec base bimaps binary bytestring cereal cereal-text cereal-vector containers data-default deepseq ForestStructures @@ -1778,6 +1781,8 @@ self: { ]; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseVienna" = callPackage @@ -3833,27 +3838,35 @@ self: { "DPutils" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , criterion, kan-extensions, lens, mtl, parallel, pipes - , pipes-bytestring, pipes-parse, QuickCheck, streaming - , streaming-bytestring, stringsearch, tasty, tasty-quickcheck - , tasty-th, timeit, transformers, vector + , pipes-bytestring, pipes-parse, primitive, QuickCheck, smallcheck + , streaming, streaming-bytestring, stringsearch, tasty + , tasty-quickcheck, tasty-smallcheck, tasty-th, timeit + , transformers, vector }: mkDerivation { pname = "DPutils"; - version = "0.0.2.0"; - sha256 = "0axavxxg0n1dsdby8306yrinjhbfrvy5a27kkwiw75xvjprk4w5w"; + version = "0.1.0.0"; + sha256 = "153g1rr13jjwqkvfj85nwjhaa0zq8khn24n3dib80nyk0scd4w62"; libraryHaskellDepends = [ - attoparsec base bytestring containers kan-extensions parallel pipes - QuickCheck streaming streaming-bytestring stringsearch transformers + attoparsec base bytestring containers criterion kan-extensions lens + mtl parallel pipes pipes-bytestring pipes-parse primitive + QuickCheck smallcheck streaming streaming-bytestring stringsearch + tasty tasty-quickcheck tasty-smallcheck tasty-th transformers vector ]; testHaskellDepends = [ - base bytestring containers lens mtl pipes pipes-bytestring - pipes-parse QuickCheck streaming streaming-bytestring tasty - tasty-quickcheck tasty-th vector + attoparsec base bytestring containers criterion kan-extensions lens + mtl parallel pipes pipes-bytestring pipes-parse primitive + QuickCheck smallcheck streaming streaming-bytestring stringsearch + tasty tasty-quickcheck tasty-smallcheck tasty-th transformers + vector ]; benchmarkHaskellDepends = [ - base bytestring criterion streaming streaming-bytestring timeit - vector + attoparsec base bytestring containers criterion kan-extensions lens + mtl parallel pipes pipes-bytestring pipes-parse primitive + QuickCheck smallcheck streaming streaming-bytestring stringsearch + tasty tasty-quickcheck tasty-smallcheck tasty-th timeit + transformers vector ]; description = "utilities for DP"; license = stdenv.lib.licenses.bsd3; @@ -9030,30 +9043,6 @@ self: { }) {}; "HTTP" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive, conduit - , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl - , network, network-uri, parsec, pureMD5, split, test-framework - , test-framework-hunit, time, wai, warp - }: - mkDerivation { - pname = "HTTP"; - version = "4000.3.12"; - sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3"; - revision = "2"; - editedCabalFile = "1gw6xzp1n4gsqwnbfr29ds8v4wpk78b2bha8i108dqav97viwm8c"; - libraryHaskellDepends = [ - array base bytestring mtl network network-uri parsec time - ]; - testHaskellDepends = [ - base bytestring case-insensitive conduit conduit-extra deepseq - http-types httpd-shed HUnit mtl network network-uri pureMD5 split - test-framework test-framework-hunit wai warp - ]; - description = "A library for client-side HTTP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HTTP_4000_3_13" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed , HUnit, mtl, network, network-uri, parsec, pureMD5, split , test-framework, test-framework-hunit, time @@ -9071,7 +9060,6 @@ self: { ]; description = "A library for client-side HTTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HTTP-Simple" = callPackage @@ -15356,16 +15344,19 @@ self: { }: mkDerivation { pname = "PrimitiveArray"; - version = "0.9.0.0"; - sha256 = "0zhv17cjdppli5q66j1yabbgx3ad172w4jj4zhn0va2wsc9fs5vi"; + version = "0.9.1.0"; + sha256 = "1kz3jvq4bc7hap7633a87nbgp9gi081qnnhmld26j8rj7wdzkrbp"; libraryHaskellDepends = [ - aeson base binary bits cereal cereal-vector deepseq DPutils - hashable lens log-domain mtl OrderedBits primitive QuickCheck - smallcheck text vector vector-binary-instances vector-th-unbox + aeson base binary bits cereal cereal-vector containers deepseq + DPutils hashable lens log-domain mtl OrderedBits primitive + QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th text vector vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ - base containers QuickCheck smallcheck tasty tasty-quickcheck - tasty-smallcheck tasty-th + aeson base binary bits cereal cereal-vector containers deepseq + DPutils hashable lens log-domain mtl OrderedBits primitive + QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th text vector vector-binary-instances vector-th-unbox ]; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -15739,6 +15730,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_13" = callPackage + ({ mkDerivation, base, containers, deepseq, process, random + , splitmix, template-haskell, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.13"; + sha256 = "1k2iy1fzjp88ssnx4h05364zswky1nkhk051zr6nkyba8j18jx11"; + libraryHaskellDepends = [ + base containers deepseq random splitmix template-haskell + transformers + ]; + testHaskellDepends = [ base deepseq process ]; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -17094,23 +17103,30 @@ self: { "SciBaseTypes" = callPackage ({ mkDerivation, aeson, base, binary, cereal, deepseq, hashable - , lens, log-domain, mtl, QuickCheck, tasty, tasty-quickcheck - , tasty-th, vector, vector-th-unbox + , lens, log-domain, mtl, QuickCheck, semirings, tasty + , tasty-quickcheck, tasty-th, vector, vector-th-unbox }: mkDerivation { pname = "SciBaseTypes"; - version = "0.0.0.1"; - sha256 = "14xzlyca61jhfak1vjll5k2ac2hq55hfvbmqbpk8ls56amlyal5j"; + version = "0.1.0.0"; + sha256 = "1c0cgzxhamgswn1zhrarbx5vrmzl160nk8dadzi6mphwd2rv6lfr"; libraryHaskellDepends = [ aeson base binary cereal deepseq hashable lens log-domain mtl - vector vector-th-unbox + semirings vector vector-th-unbox ]; testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck tasty-th + aeson base binary cereal deepseq hashable lens log-domain mtl + QuickCheck semirings tasty tasty-quickcheck tasty-th vector + vector-th-unbox + ]; + benchmarkHaskellDepends = [ + aeson base binary cereal deepseq hashable lens log-domain mtl + semirings vector vector-th-unbox ]; - benchmarkHaskellDepends = [ base ]; description = "Base types and classes for statistics, sciences and humanities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SciFlow" = callPackage @@ -29597,6 +29613,8 @@ self: { ]; description = "ApproveAPI Haskell Client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "approx-rand-test" = callPackage @@ -29723,17 +29741,17 @@ self: { "arbor-datadog" = callPackage ({ mkDerivation, aeson, auto-update, base, buffer-builder , bytestring, Cabal, dlist, generic-lens, hspec, lens, mtl, network - , random, resourcet, text, time, transformers, unordered-containers - , vector + , optparse-applicative, random, resourcet, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "arbor-datadog"; - version = "0.0.0.1"; - sha256 = "0lc3c2jnn2kmfyg7xgsnkgzkfir1ycn6qyq1z44501g360wrq0cv"; + version = "0.1.0.0"; + sha256 = "1w7bg8vj10mplfq39klhivj8hfb2cbgw9vhj1h64gm9v2xw25wlq"; libraryHaskellDepends = [ aeson auto-update base buffer-builder bytestring dlist generic-lens - lens mtl network random resourcet text time transformers - unordered-containers vector + lens mtl network optparse-applicative random resourcet text time + transformers unordered-containers vector ]; testHaskellDepends = [ base Cabal generic-lens hspec lens network resourcet time @@ -29779,16 +29797,16 @@ self: { "arbor-monad-logger" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hedgehog, hspec - , hw-hspec-hedgehog, monad-logger, mtl, text + , hw-hspec-hedgehog, monad-logger, mtl, optparse-applicative, text }: mkDerivation { pname = "arbor-monad-logger"; - version = "0.1.0.0"; - sha256 = "0m6gi36ckaq4v5mzpp6abcq93hyvvr0f7fdh4v87c4n044757agn"; + version = "0.1.1.1"; + sha256 = "13lgpr2j2vq2d4mbxl72h86iw5n028m5q0n2hbiz4hgk2yn2f2hs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring fast-logger monad-logger text + base bytestring fast-logger monad-logger optparse-applicative text ]; executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; @@ -29828,10 +29846,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric-datadog"; - version = "1.0.0"; - sha256 = "07hqghjrl25ky0rn4mnwia5b90zhf88w6zkqyscs527c0c6dkybc"; - revision = "2"; - editedCabalFile = "0x8dp7xh1rpd9db2kiya8sr9nc7wzka256jxsvxqfmphd08yc4ad"; + version = "1.1.0"; + sha256 = "1ly7vn630vm256jg1b6h39vzd7zv658h7j4vfv4jkdrrcl3jmbr0"; libraryHaskellDepends = [ arbor-datadog arbor-monad-metric base bytestring containers generic-lens lens mtl network resourcet stm text transformers @@ -30293,8 +30309,8 @@ self: { pname = "arithmoi"; version = "0.8.0.0"; sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2"; - revision = "2"; - editedCabalFile = "1jv5ch28pjiq3a83hyvknzfwmsbwgqs6g9618z79ss3385k0cwl9"; + revision = "3"; + editedCabalFile = "1cn6axcdiahaqnq1rsm0snr78lrypay6cxh3yxw3vrrwilavri1i"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers deepseq exact-pi ghc-prim integer-gmp @@ -30667,6 +30683,22 @@ self: { license = "LGPL"; }) {}; + "asap" = callPackage + ({ mkDerivation, base, bytestring, hedgehog, jwt, lens, mtl + , semigroups, text, time, uuid + }: + mkDerivation { + pname = "asap"; + version = "0.0.4"; + sha256 = "08yfangqxmdh2w39fqnicn16jnb1x9f263f99253khx3sv4q7qrf"; + libraryHaskellDepends = [ + base bytestring jwt lens mtl semigroups text time uuid + ]; + testHaskellDepends = [ base hedgehog jwt mtl text time ]; + description = "Atlassian Service Authentication Protocol"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascetic" = callPackage ({ mkDerivation, base, MissingH }: mkDerivation { @@ -30924,37 +30956,37 @@ self: { broken = true; }) {}; - "asif_4_1_0" = callPackage + "asif_5_0_2" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits - , hw-hspec-hedgehog, hw-ip, iproute, lens, network, old-locale + , hw-hspec-hedgehog, hw-ip, lens, network, old-locale , optparse-applicative, profunctors, resourcet, temporary-resourcet , text, thyme, transformers, vector }: mkDerivation { pname = "asif"; - version = "4.1.0"; - sha256 = "1ys8cj08pj7z3yiks014z9jmvzkxnbh11khihzg57ig4z4w7bvp3"; + version = "5.0.2"; + sha256 = "19wsjpk3jnij6b4ap84g5jaka734za2381yz4x5ahm4f1nvc6gdf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base binary bytestring conduit conduit-combinators conduit-extra containers cpu either exceptions foldl generic-lens - hw-bits hw-ip iproute lens network old-locale profunctors resourcet + hw-bits hw-ip lens network old-locale profunctors resourcet temporary-resourcet text thyme transformers vector ]; executableHaskellDepends = [ attoparsec base binary bytestring conduit conduit-combinators conduit-extra containers cpu directory either exceptions foldl - generic-lens hw-bits hw-ip iproute lens network old-locale + generic-lens hw-bits hw-ip lens network old-locale optparse-applicative profunctors resourcet temporary-resourcet text thyme transformers vector ]; testHaskellDepends = [ attoparsec base binary bytestring conduit conduit-combinators conduit-extra containers cpu either exceptions foldl generic-lens - hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens network + hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip lens network old-locale profunctors resourcet temporary-resourcet text thyme transformers vector ]; @@ -31993,24 +32025,24 @@ self: { "ats-pkg" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, cpphs - , dependency, dhall, directory, file-embed, filepath, http-client - , http-client-tls, libarchive, lzma, microlens, mtl + , dependency, dhall, directory, file-embed, filemanip, filepath + , http-client, http-client-tls, lzma, microlens, mtl , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-c, shake-ext, temporary, text, unix, zip-archive, zlib + , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.10"; - sha256 = "0ra18d4rid6pr53rraca8a63aa853kh2qdyj8d3pp2difpg5r0rz"; + version = "3.2.5.12"; + sha256 = "174nxhkfb1qvlfxjifrb1pqfrh4na64wvfrnblzpfp03di0hbh3m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed filepath http-client http-client-tls libarchive lzma + file-embed filemanip filepath http-client http-client-tls lzma microlens mtl parallel-io process shake shake-ats shake-c shake-ext - text unix zip-archive zlib + tar text unix zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -33662,19 +33694,19 @@ self: { "aws-lambda-haskell-runtime" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit - , directory, filepath, hspec, microlens-platform, mtl + , directory, filepath, hspec, http-client, microlens-platform, mtl , optparse-generic, process, template-haskell, text, uuid, wreq }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "1.0.9"; - sha256 = "0cx59jmqzjz1ff1mng63pf008mxmfffpv9nlcmrisjliginjh2v3"; + version = "1.0.10"; + sha256 = "09rd4jfw59j003q14y76isdb5dg23r0vxqkg8jqf49c9gap7wqsq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit directory filepath - microlens-platform mtl optparse-generic process template-haskell - text uuid wreq + http-client microlens-platform mtl optparse-generic process + template-haskell text uuid wreq ]; executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec mtl ]; @@ -34168,8 +34200,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.68.1"; - sha256 = "1q5bmnv78lzs3i9i0mcvp652rcrkipcccq6zypfic501d1hzq3ij"; + version = "0.5.68.2"; + sha256 = "1frinivjzyyjn9w3xqyr659wrjniv5598frdf9526g7ab484di8w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34861,6 +34893,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_8_1" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.8.1"; + sha256 = "1nwr9av27i9p72k0sn96mw3ywdczw65dy5gd5wxpabhhxlxdcas4"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -35018,6 +35065,29 @@ self: { broken = true; }) {}; + "base64-bytestring-type_1_0_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , binary, bytestring, cereal, deepseq, hashable, http-api-data + , QuickCheck, serialise, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "base64-bytestring-type"; + version = "1.0.1"; + sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring binary bytestring cereal + deepseq hashable http-api-data QuickCheck serialise text + ]; + testHaskellDepends = [ + aeson base binary bytestring cereal http-api-data serialise tasty + tasty-quickcheck + ]; + description = "A newtype around ByteString, for base64 encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "base64-conduit" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit , hspec, QuickCheck, transformers @@ -35705,6 +35775,8 @@ self: { ]; description = "Connection layer between beam and MySQL/MariaDB"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beam-newtype-field" = callPackage @@ -38415,17 +38487,18 @@ self: { }) {}; "bisc" = callPackage - ({ mkDerivation, base, directory, filepath, selda, selda-sqlite - , text, xdg-basedir + ({ mkDerivation, base, configurator, directory, filepath, mtl + , selda, selda-sqlite, text, xdg-basedir }: mkDerivation { pname = "bisc"; - version = "0.1.0.0"; - sha256 = "16gjnqjp1rhsi59nxhx24zxwabzk75wiz97163pd657j02a5mwl0"; + version = "0.2.0.0"; + sha256 = "07fgilmgkz95ar8gc1dvxq65xd82hvqr7y54550f1i55d2h3q95j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory filepath selda selda-sqlite text xdg-basedir + base configurator directory filepath mtl selda selda-sqlite text + xdg-basedir ]; description = "A small tool that clears qutebrowser cookies"; license = stdenv.lib.licenses.gpl3; @@ -42612,18 +42685,18 @@ self: { "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, mtl, parameterized-utils - , prettyclass, QuickCheck, random + , pretty, QuickCheck, random }: mkDerivation { pname = "bv-sized"; - version = "0.5.0"; - sha256 = "08q4hg2kil8ahqpz0pmyxxnij3n3xhlfp5dr3ri3imgc1b2sn1m6"; + version = "0.6.0"; + sha256 = "0bhci00l4946z3b6ynzpi3k17bnawir88kqpp36jai8filb0znc5"; libraryHaskellDepends = [ - base containers lens mtl parameterized-utils prettyclass QuickCheck + base containers lens mtl parameterized-utils pretty QuickCheck random ]; testHaskellDepends = [ - base lens parameterized-utils prettyclass QuickCheck random + base lens parameterized-utils pretty QuickCheck random ]; description = "a BitVector datatype that is parameterized by the vector width"; license = stdenv.lib.licenses.bsd3; @@ -48061,8 +48134,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.4.11"; - sha256 = "0f1dhiymdihrnpz9h9p4mi8iica07qv3wm47acvdkhxrc4sjsq6h"; + version = "0.4.14"; + sha256 = "0pnb7xdhaq4rw28hd4cz1b04w52ffjghw3x9zchiwm4h8hwhvibz"; libraryHaskellDepends = [ array base QuickCheck random semigroupoids ]; @@ -48165,6 +48238,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "chessIO" = callPackage + ({ mkDerivation, base, directory, parallel, time, vector }: + mkDerivation { + pname = "chessIO"; + version = "0.0.0.0"; + sha256 = "01p8n1pvzzbwfypiix64kgklanhgm5i46i0ijrkplkfrqs1m7wlw"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base directory parallel time vector ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "chesshs" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers }: mkDerivation { @@ -49052,6 +49138,34 @@ self: { broken = true; }) {}; + "circuit-breaker" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances + , random, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unliftio, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "circuit-breaker"; + version = "0.1.0.0"; + sha256 = "1yg6d0676z94070rwqzf13bpg1qzqyh5wk38yqcp7w1aib304mw7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base mtl random text time transformers unliftio unliftio-core + unordered-containers + ]; + executableHaskellDepends = [ + base mtl random text time transformers unliftio unliftio-core + unordered-containers + ]; + testHaskellDepends = [ + base mtl QuickCheck quickcheck-instances random tasty tasty-hunit + tasty-quickcheck text time transformers unliftio unliftio-core + unordered-containers + ]; + description = "An implementation of the \"circuit breaker\" pattern to disable repeated calls to a failing system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cirru-parser" = callPackage ({ mkDerivation, aeson, base, text, vector }: mkDerivation { @@ -49385,8 +49499,8 @@ self: { }: mkDerivation { pname = "clang-pure"; - version = "0.2.0.3"; - sha256 = "1x7mw4qw5mfkv6nhqaxp9pgry7xdsb3x24fvkpb7c2iigv1yyk8n"; + version = "0.2.0.4"; + sha256 = "13c03zj15xx8hq6gqvq62dfqz936mrrz34irk7bqyi0sbhqgrjn1"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal inline-c process ]; @@ -51203,19 +51317,19 @@ self: { }) {cmph = null;}; "cmt" = callPackage - ({ mkDerivation, attoparsec, base, classy-prelude, directory - , file-embed, filepath, process, tasty, tasty-discover + ({ mkDerivation, attoparsec, base, classy-prelude, containers + , directory, file-embed, filepath, process, tasty, tasty-discover , tasty-expected-failure, tasty-hunit, terminal-size, text }: mkDerivation { pname = "cmt"; - version = "0.4.0.0"; - sha256 = "17faw3g078i2a15zl1d31wd0ag3hk347hf23widdkcnf6bs4qmr6"; + version = "0.5.0.0"; + sha256 = "0wnnqzcqxk976q0zy35gi9l46w2fdjvqnx2nxijmfsxj3f221ggx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base classy-prelude directory filepath process - terminal-size text + attoparsec base classy-prelude containers directory filepath + process terminal-size text ]; executableHaskellDepends = [ base classy-prelude ]; testHaskellDepends = [ @@ -53813,6 +53927,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "concurrency_1_7_0_0" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.7.0.0"; + sha256 = "16zg4c2x2ym7crvrimzp8jr3mw6qlbdzkfmv1h6smjp3bn8qxf06"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrency-benchmarks" = callPackage ({ mkDerivation, async, base, bench-graph, bytestring, Chart , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics @@ -55221,8 +55352,8 @@ self: { }: mkDerivation { pname = "console-program"; - version = "0.4.2.2"; - sha256 = "1zr6c9wdlx16v559zzjah84v0psphyzyq5d837ncshkxmssri8ja"; + version = "0.4.2.3"; + sha256 = "165ay133dxr0midy8yhsnsw5pf1lqh6pg4x63gjip945hfjl0lwq"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht @@ -55476,8 +55607,8 @@ self: { }: mkDerivation { pname = "constraints-extras"; - version = "0.2.3.3"; - sha256 = "1399jah0lh127z56wv0h2c94s26fanw58x0x8imakjlj2dlg8km1"; + version = "0.2.3.4"; + sha256 = "1xkivpkjgnnrs5fyg0g77f84zh3sxqgxif0l2rhcq1wdad709q55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; @@ -55775,8 +55906,8 @@ self: { ({ mkDerivation, base, deepseq, primitive }: mkDerivation { pname = "contiguous"; - version = "0.3.2.0"; - sha256 = "0mgsha615rzaki7cn6w78ihrni3s9hza23srmxy9rpvybvh6xql7"; + version = "0.3.3.0"; + sha256 = "0hpglbbydyi46rw0jybb87g4wsc5qp4vnswijznav90j8sl34lhc"; libraryHaskellDepends = [ base deepseq primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; @@ -57084,10 +57215,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.1.1.0"; - sha256 = "1qmz4m9kbkmcb0i7iy1ay1hkkqh826v98lpqf0zpk7sin686xjv4"; - revision = "1"; - editedCabalFile = "004178xsld8mmy07z23x51vzbjrjprv17k8mq29vgibkm5kd1l5r"; + version = "0.1.1.1"; + sha256 = "06nwkys90i0rdhg1nvwzii88z5f3ijn9kjwrg6lgy2m973zr8668"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57216,8 +57345,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.1"; - sha256 = "04hvb1z483gh7mb5q1mvsiym8jg29512wnrfdssl8y9c90qhk2sp"; + version = "3.6.2"; + sha256 = "0byrfj9lqv4k5d0s3d7ib6bwcz50bl23qnk2nk8bzk9s1356g6yi"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -57357,6 +57486,8 @@ self: { pname = "cql-io"; version = "1.1.0"; sha256 = "1pqqq31f9xcpn5rykkgrakgl17dm1nnskh1m88fxaynzjj485pkw"; + revision = "1"; + editedCabalFile = "0zxc28i4c26qi6xpgsyhn0f539ni6wv6c1pixh056bzm9pwp60d7"; libraryHaskellDepends = [ async auto-update base bytestring containers cql cryptonite data-default-class exceptions hashable HsOpenSSL iproute lens mtl @@ -58981,15 +59112,15 @@ self: { "cryptostore" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, basement , bytestring, cryptonite, hourglass, memory, pem, tasty - , tasty-hunit, tasty-quickcheck, x509 + , tasty-hunit, tasty-quickcheck, x509, x509-validation }: mkDerivation { pname = "cryptostore"; - version = "0.1.0.0"; - sha256 = "1pq53k0dx0akwp1rkgadyb256w0lds8iq7yn2xb217nyjyghyrqz"; + version = "0.2.0.0"; + sha256 = "1j7pk42mivwlcrjyrjdkldidhsv3k5myqq0ld8sksgkbkn1k1z7w"; libraryHaskellDepends = [ asn1-encoding asn1-types base basement bytestring cryptonite - hourglass memory pem x509 + hourglass memory pem x509 x509-validation ]; testHaskellDepends = [ asn1-types base bytestring cryptonite hourglass memory pem tasty @@ -59101,8 +59232,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.2"; - sha256 = "0c16h2m8zkpyjbclvqpd8kq46ciw6qwc94d6v2d66c3g0ixx53vx"; + version = "0.7.3"; + sha256 = "18xn06drza3pwyhidlkr478hvn8ss93f3f30wmfrh79ngabip4kp"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -59704,6 +59835,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "curl-cookiejar" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, http-client, time + }: + mkDerivation { + pname = "curl-cookiejar"; + version = "0.1.0.0"; + sha256 = "0fflf6p1qnr7h4dhpv8d1pm1whfphz1dva2yk6s2wk8dv6wbbdfj"; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra http-client time + ]; + description = "Parsing and pretty-printing of cURL/wget cookie jars"; + license = stdenv.lib.licenses.mit; + }) {}; + "curl-runnings" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, cmdargs , connection, directory, hspec, hspec-expectations, http-client-tls @@ -62550,22 +62696,23 @@ self: { }) {}; "datadog-tracing" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, ffunctor - , generic-random, hspec-golden-aeson, mtl, prettyprinter - , QuickCheck, quickcheck-text, refined, servant, servant-client - , servant-server, tasty, tasty-discover, tasty-hspec, text, time - , warp + ({ mkDerivation, aeson, base, bytestring, containers, data-msgpack + , ffunctor, generic-random, hspec-golden-aeson, http-media, mtl + , prettyprinter, QuickCheck, quickcheck-text, refined, scientific + , servant, servant-client, servant-server, tasty, tasty-discover + , tasty-hspec, text, time, unordered-containers, vector, warp }: mkDerivation { pname = "datadog-tracing"; - version = "1.2.0"; - sha256 = "1227rkrmlbqbxbvmyhm5yg5wd0jbbiy7vjyqq6vzksvpx2kifsdy"; + version = "1.3.1"; + sha256 = "1w471bjccf0jqssyf076zz8n68i4j5wm40gf258gqbdigs0iqj3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers ffunctor generic-random mtl - prettyprinter QuickCheck quickcheck-text refined servant - servant-client text time + aeson base bytestring containers data-msgpack ffunctor + generic-random http-media mtl prettyprinter QuickCheck + quickcheck-text refined scientific servant servant-client text time + unordered-containers vector ]; executableHaskellDepends = [ aeson base bytestring containers mtl servant servant-server text @@ -64335,14 +64482,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_2_0_0_1" = callPackage + "dejafu_2_1_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "2.0.0.1"; - sha256 = "0hdw4y81inxq4ivkfb4b7sj68ysb8n9czfyhifmhkqfaddg5inzg"; + version = "2.1.0.0"; + sha256 = "19jvcfkwavmvf08dwsch3izk9qzw8ldrghpvjgv2vh5dxr7wr9xq"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -64696,6 +64843,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "dependent-sum_0_5" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dependent-sum"; + version = "0.5"; + sha256 = "1n5ln2fain1x9zkrzy1sknwm528lrdsnsg52z1d0hfpy5sngndsr"; + libraryHaskellDepends = [ base ]; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dependent-sum-aeson-orphans" = callPackage ({ mkDerivation, aeson, base, constraints, constraints-extras , dependent-map, dependent-sum @@ -65525,6 +65684,8 @@ self: { pname = "dhall"; version = "1.21.0"; sha256 = "03nzp79mmivnyg6s179abf8bj8j60hkng9kgbmfjzvwlfrpwq8lv"; + revision = "1"; + editedCabalFile = "0ap1490jks9hmwf73vlrj7bsfrf4m5yvgqxx3ix57w23ia5gy662"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67741,17 +67902,19 @@ self: { }) {}; "disjoint-containers" = callPackage - ({ mkDerivation, aeson, base, containers, doctest, QuickCheck - , quickcheck-classes, semigroups, transformers + ({ mkDerivation, aeson, base, containers, doctest, enum-types + , QuickCheck, quickcheck-classes, quickcheck-enum-instances + , semigroups, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "disjoint-containers"; - version = "0.2.3"; - sha256 = "0a6y1m0jq3lxj5vwgn4j4ij8xgkrkxb4nr7n3ba98sv8iaf1q8gw"; + version = "0.2.4"; + sha256 = "0x64x327842da1a3bhbkrc88za300f3c2wd9fyci3qqm0mv7fdjk"; libraryHaskellDepends = [ aeson base containers transformers ]; testHaskellDepends = [ - aeson base containers doctest QuickCheck quickcheck-classes - semigroups + aeson base containers doctest enum-types QuickCheck + quickcheck-classes quickcheck-enum-instances semigroups tasty + tasty-quickcheck ]; description = "Disjoint containers"; license = stdenv.lib.licenses.bsd3; @@ -67919,27 +68082,6 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.4.1"; - sha256 = "1rkw5r5r3jlrkckjkqv290qx890a8sipx1c7n2syk1f6bshgwkny"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring constraints syb template-haskell - ]; - executableHaskellDepends = [ async base binary bytestring ]; - testHaskellDepends = [ base binary hspec QuickCheck ]; - description = "Serializable closures for distributed programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "distributed-closure_0_4_1_1" = callPackage - ({ mkDerivation, async, base, binary, bytestring, constraints - , hspec, QuickCheck, syb, template-haskell - }: - mkDerivation { - pname = "distributed-closure"; version = "0.4.1.1"; sha256 = "0w3n13a0rdi6cw5h3sivrfnr96qizd2hk0gma7b9c7hdh0sxw89r"; isLibrary = true; @@ -72451,8 +72593,8 @@ self: { pname = "either"; version = "5.0.1"; sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc"; - revision = "1"; - editedCabalFile = "1kf0dy6nki64kkmjw8214jz3n086g1pghfm26f012b6qv0iakzca"; + revision = "2"; + editedCabalFile = "0859h2dc77fq0f14jh11h4i89hrg3iqvzk0yrk78516k6m7n96zc"; libraryHaskellDepends = [ base bifunctors mtl profunctors semigroupoids semigroups ]; @@ -74607,18 +74749,22 @@ self: { }) {}; "erd" = callPackage - ({ mkDerivation, base, bytestring, containers, graphviz, parsec - , text + ({ mkDerivation, base, bytestring, containers, graphviz, hspec + , parsec, QuickCheck, raw-strings-qq, tasty, tasty-hunit, text }: mkDerivation { pname = "erd"; - version = "0.1.3.0"; - sha256 = "00cf1q7472kkl12z48dwnhixvyk99451by577qmfj0vhlnl1dc09"; + version = "0.2.0.0"; + sha256 = "1lxqjvsmkqhqaw63r6qp6z9kjz73ki6y3vr85bjs5i0m7ff87799"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers graphviz parsec text ]; + testHaskellDepends = [ + base bytestring containers graphviz hspec parsec QuickCheck + raw-strings-qq tasty tasty-hunit text + ]; description = "An entity-relationship diagram generator from a plain text description"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -76411,6 +76557,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptions_0_10_1" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers, transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.10.1"; + sha256 = "17fz74bi6qy3w7li7ifkcvsy3f9zyj69956jvaqvl5diyqnh791v"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + transformers-compat + ]; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exchangerates" = callPackage ({ mkDerivation, aeson, base, containers, directory, genvalidity , genvalidity-containers, genvalidity-hspec @@ -78231,8 +78399,8 @@ self: { }: mkDerivation { pname = "fastparser"; - version = "0.3.1.1"; - sha256 = "0wj50rpjr69sl4kkw6zybh2s9iq9ysv6sc83k50l5kq12p28yc5d"; + version = "0.3.1.2"; + sha256 = "0hyai0v9h4zlbr8fnal6l4z9y8zrh4ghhp2wymhf6fg23lahscid"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers kan-extensions microlens thyme transformers vector-space @@ -80642,8 +80810,8 @@ self: { ({ mkDerivation, async, base, clock, time }: mkDerivation { pname = "fixed-timestep"; - version = "0.1.0.0"; - sha256 = "1zhqh6y4j5v8vwf417jjgix5z1z67zrxgdpcrsyk4i8pi69892hv"; + version = "0.2.0.1"; + sha256 = "0rk5ym38m48khss38v8x09sdfz2nyhw7bw3dbjzy5qad09nzsipl"; libraryHaskellDepends = [ async base clock time ]; description = "Pure Haskell library to repeat an action at a specific frequency"; license = stdenv.lib.licenses.mit; @@ -82035,32 +82203,6 @@ self: { }: mkDerivation { pname = "focuslist"; - version = "0.1.0.1"; - sha256 = "1qq5ixaxrwy2wn8xz8ckva9m50bkygj2gpw89fdry4wglvkrmvpx"; - revision = "2"; - editedCabalFile = "12x38kxhcjdqfwl8y8zdrwcpv6jdm7jaqc48ww3hg6fpv8rvvd49"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base containers lens mono-traversable QuickCheck - ]; - testHaskellDepends = [ - base doctest genvalidity-containers genvalidity-hspec hedgehog lens - QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell - ]; - description = "Lists with a focused element"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "focuslist_0_1_0_2" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , genvalidity-containers, genvalidity-hspec, hedgehog, lens - , mono-traversable, QuickCheck, tasty, tasty-hedgehog, tasty-hspec - , template-haskell - }: - mkDerivation { - pname = "focuslist"; version = "0.1.0.2"; sha256 = "06s8655l7nzpmwf6z8p11g9mngb9a0kw10riii67sq8jcanpllkq"; isLibrary = true; @@ -82075,7 +82217,6 @@ self: { ]; description = "Lists with a focused element"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fold-debounce" = callPackage @@ -85221,6 +85362,17 @@ self: { broken = true; }) {}; + "funspection" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "funspection"; + version = "0.1.0.0"; + sha256 = "1bq7gj8kcgz8ccy6skkqbrfkxavkg3s511shm8fd9s8syqwdglr8"; + libraryHaskellDepends = [ base ]; + description = "Type-level function utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fused-effects" = callPackage ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom , QuickCheck, random @@ -85280,57 +85432,38 @@ self: { }) {}; "futhark" = callPackage - ({ mkDerivation, aeson, alex, ansi-terminal, array, base - , bifunctors, binary, blaze-html, bytestring, containers - , data-binary-ieee754, directory, directory-tree, dlist, extra - , file-embed, filepath, free, gitrev, happy, haskeline, http-client - , http-client-tls, http-conduit, HUnit, language-c-quote - , mainland-pretty, markdown, megaparsec, mtl, neat-interpolation - , parallel, parser-combinators, process, process-extras, QuickCheck - , random, raw-strings-qq, regex-tdfa, srcloc, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text - , th-lift-instances, time, transformers, vector + ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary + , blaze-html, bytestring, containers, data-binary-ieee754 + , directory, directory-tree, dlist, file-embed, filepath, free + , gitrev, happy, haskeline, http-client, http-client-tls + , http-conduit, language-c-quote, mainland-pretty, markdown + , megaparsec, mtl, neat-interpolation, parallel, parser-combinators + , process, process-extras, QuickCheck, random, regex-tdfa, srcloc + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary + , text, time, transformers, utf8-string, vector , vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.9.1"; - sha256 = "1l7i4xxh9zb53qqzznqj6kkh6p67a11kkr5839c9kkjwnb6sc86k"; + version = "0.10.1"; + sha256 = "03lmzl9z75vfy0phr1vkcxjkqhl1n9avkib7awflib90a6jhpl15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal array base bifunctors binary blaze-html - bytestring containers data-binary-ieee754 directory directory-tree - dlist extra file-embed filepath free gitrev haskeline http-client + aeson ansi-terminal array base binary blaze-html bytestring + containers data-binary-ieee754 directory directory-tree dlist + file-embed filepath free gitrev haskeline http-client http-client-tls http-conduit language-c-quote mainland-pretty markdown megaparsec mtl neat-interpolation parallel - parser-combinators process process-extras random raw-strings-qq - regex-tdfa srcloc template-haskell temporary text th-lift-instances - time transformers vector vector-binary-instances versions - zip-archive zlib + parser-combinators process process-extras random regex-tdfa srcloc + template-haskell temporary text time transformers utf8-string + vector vector-binary-instances versions zip-archive zlib ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - aeson ansi-terminal array base bifunctors binary blaze-html - bytestring containers data-binary-ieee754 directory directory-tree - dlist extra file-embed filepath free gitrev haskeline http-client - http-client-tls http-conduit language-c-quote mainland-pretty - markdown megaparsec mtl neat-interpolation parallel - parser-combinators process process-extras random raw-strings-qq - regex-tdfa srcloc template-haskell temporary text th-lift-instances - time transformers vector vector-binary-instances versions - zip-archive zlib - ]; + executableHaskellDepends = [ base text ]; testHaskellDepends = [ - aeson ansi-terminal array base bifunctors binary blaze-html - bytestring containers data-binary-ieee754 directory directory-tree - dlist extra file-embed filepath free gitrev haskeline http-client - http-client-tls http-conduit HUnit language-c-quote mainland-pretty - markdown megaparsec mtl neat-interpolation parallel - parser-combinators process process-extras QuickCheck random - raw-strings-qq regex-tdfa srcloc tasty tasty-hunit tasty-quickcheck - template-haskell temporary text th-lift-instances time transformers - vector vector-binary-instances versions zip-archive zlib + base containers megaparsec mtl parser-combinators QuickCheck tasty + tasty-hunit tasty-quickcheck text ]; description = "An optimising compiler for a functional, array-oriented language"; license = stdenv.lib.licenses.isc; @@ -86546,21 +86679,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-data_0_5_0_0" = callPackage + "generic-data_0_6_0_0" = callPackage ({ mkDerivation, base, base-orphans, contravariant, generic-lens , one-liner, show-combinators, tasty, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "0.5.0.0"; - sha256 = "1hy43a1f5y1ymszilz908sl7an7hj7sz7yzchhxh83ki2sf0ya7s"; + version = "0.6.0.0"; + sha256 = "0aiz7m78ysmx31754g28x0zls1kds12p2h3n35k7mxf7g1lla6fx"; libraryHaskellDepends = [ base base-orphans contravariant show-combinators ]; testHaskellDepends = [ base generic-lens one-liner tasty tasty-hunit ]; - description = "Utilities for GHC.Generics"; + description = "Deriving instances with GHC.Generics and related utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -86877,6 +87010,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generics-mrsop_2_0_0" = callPackage + ({ mkDerivation, base, containers, mtl, template-haskell }: + mkDerivation { + pname = "generics-mrsop"; + version = "2.0.0"; + sha256 = "1cdjh5bjvx8xfglwnm48lfybdz4n8v7v8va2c3zyihzqbxh6akml"; + libraryHaskellDepends = [ base containers mtl template-haskell ]; + description = "Generic Programming with Mutually Recursive Sums of Products"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core , template-haskell @@ -88978,6 +89123,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-syntax-highlighter_0_0_3_1" = callPackage + ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.3.1"; + sha256 = "1r45954nchn5rink3qrdv6pqigwsm1a2fyb297b56kpgz47cfgd7"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ghc text ]; + testHaskellDepends = [ base hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "Syntax highlighter for Haskell using lexer of GHC itself"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-tcplugins-extra" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -96623,8 +96783,8 @@ self: { }: mkDerivation { pname = "graphmod"; - version = "1.4.2"; - sha256 = "196647zh8cz7gpm7z18wqsx0rad3mvq7qrl20varvi34hxck6fwq"; + version = "1.4.3"; + sha256 = "1hcj1pmb65a4wkdn2d1p6b7hf91p4dqb9gprihrldfc6xii3hc3z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103979,8 +104139,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.12.0"; - sha256 = "0n1abvz7a03d3xgkykkk2ggm74lsh1kg0jv0z1k9874pncxx4li4"; + version = "0.0.13.0"; + sha256 = "1hyy1jx5b7k3rhk3xmr4nsx2ay7jgq70nxy01a7ap1y4gzy9pjns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -109567,16 +109727,14 @@ self: { "hedgehog-classes" = callPackage ({ mkDerivation, aeson, base, containers, hedgehog, pretty-show - , transformers, wl-pprint-annotated + , semirings, transformers, wl-pprint-annotated }: mkDerivation { pname = "hedgehog-classes"; - version = "0.1.1.0"; - sha256 = "1fi4n7g6daf9a8dzc876830jqdlc6pl5nyb9q7q9rffiv43sbmv2"; - revision = "2"; - editedCabalFile = "0m1ajqbg5k9k7xmgq5xm7s6l3lckr634bfsnbm9ydkr0cgs8rwcc"; + version = "0.1.2"; + sha256 = "0lvlsv7mgmys03v4xnjvfb19426xa1vwfnrbpf0yg8h0pv6hz7wv"; libraryHaskellDepends = [ - aeson base containers hedgehog pretty-show transformers + aeson base containers hedgehog pretty-show semirings transformers wl-pprint-annotated ]; testHaskellDepends = [ aeson base containers hedgehog ]; @@ -111538,6 +111696,8 @@ self: { pname = "hgeometry"; version = "0.8.0.0"; sha256 = "0hypd5936kssw435lcvqj9d7whdzfdfbhvi5hhbi90k5x89xfx6f"; + revision = "1"; + editedCabalFile = "1hln65kfw2ji43pkwipyg12i0lq9ly6p3hv2xd7vzp4pzkcpy3zz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -112744,8 +112904,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "0.9.0"; - sha256 = "0hkz9p3ljfqvmf07pkkijav3lppvwvyp5hvlqbqcfplmv9n84wdb"; + version = "0.10.0"; + sha256 = "0a89h3vn8arms93fj3p3ip208wamljkdxikkg7dlrf143iymcs8n"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -113171,6 +113331,8 @@ self: { executableHaskellDepends = [ base ]; description = "Haskell Git Helper Tool"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hjcase" = callPackage @@ -115760,8 +115922,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.17.5"; - sha256 = "1vpx6v8b0jixn82iqz085w2qpyj5pl2qyhrcd0a4p0vs5qmplf60"; + version = "5.0.17.6"; + sha256 = "0kgcgadrp02pcwp0pp56p09kvw3k9i6n4r7qsms3lagq1wcar4dv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -117682,6 +117844,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hs-functors_0_1_4_0" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "hs-functors"; + version = "0.1.4.0"; + sha256 = "0crih1v1zg0w1m4xcsz1v00j4x2w82fdd17bkhiqa1d56kx3d1af"; + libraryHaskellDepends = [ base transformers ]; + description = "Functors from products of Haskell and its dual to Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-gchart" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -123997,12 +124171,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_2_0_0_0" = callPackage + "hunit-dejafu_2_0_0_1" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "2.0.0.0"; - sha256 = "0j48wg6nq90hgl3jfdiy020az5m8vcpbnfvxcpjci3vzd24c4gx9"; + version = "2.0.0.1"; + sha256 = "0n7npk8ksp14f2ib47navmc50rlnqrcsgdnxmd5qylg431h15sfz"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -124705,14 +124879,14 @@ self: { broken = true; }) {}; - "hw-ip_2_1_0_0" = callPackage + "hw-ip_2_3_1_0" = callPackage ({ mkDerivation, appar, base, containers, generic-lens, hedgehog , hspec, hw-bits, hw-hspec-hedgehog, iproute, text }: mkDerivation { pname = "hw-ip"; - version = "2.1.0.0"; - sha256 = "1mnmm05xrmxazfc98g6747l62ch33m1qcwhlk7icvsmgqwdxwc09"; + version = "2.3.1.0"; + sha256 = "19a2z6lx064y4y2qzhfzzwwpy4hisf86a57ah1f9jjjrvnxr1363"; libraryHaskellDepends = [ appar base containers generic-lens hw-bits iproute text ]; @@ -128045,8 +128219,8 @@ self: { }: mkDerivation { pname = "imperative-edsl"; - version = "0.7.1"; - sha256 = "0cia9yq5z7h3024kwhwjzzaq97281aib1nwimj6b4rp425yfybfr"; + version = "0.8"; + sha256 = "0mz6yy472wvcg4ywjhaaqi0cxyy9l437pw4rkwd2j392n6hlfbar"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -128904,6 +129078,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_6_1_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, scientific, tagged + , template-haskell, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.6.1.3"; + sha256 = "1l03bwmwxb42cha8v3fj616ks927mcklxrmqxrr1ms53m7bsa587"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ base doctest template-haskell ]; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -130625,8 +130823,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.4.2"; - sha256 = "0r1ipv6mcbxpzwkfhr6hm2srr01wr5np20axgvqvplaskai9cj87"; + version = "1.4.2.1"; + sha256 = "0661bygbgd2j897hbzs2pgqdk12px2d904r13lfw7bcrp892xja1"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable primitive text vector @@ -130646,24 +130844,25 @@ self: { broken = true; }) {}; - "ip_1_4_2_1" = callPackage + "ip_1_5_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, doctest, hashable, hspec, hspec-discover, HUnit , primitive, QuickCheck, quickcheck-classes, test-framework , test-framework-hunit, test-framework-quickcheck2, text, vector + , wide-word }: mkDerivation { pname = "ip"; - version = "1.4.2.1"; - sha256 = "0661bygbgd2j897hbzs2pgqdk12px2d904r13lfw7bcrp892xja1"; + version = "1.5.0"; + sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable primitive text - vector + vector wide-word ]; testHaskellDepends = [ attoparsec base bytestring doctest hspec HUnit QuickCheck quickcheck-classes test-framework test-framework-hunit - test-framework-quickcheck2 text + test-framework-quickcheck2 text wide-word ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -132462,8 +132661,8 @@ self: { ({ mkDerivation, base, doctest, hspec, hspec-discover, time }: mkDerivation { pname = "japanese-holidays"; - version = "0.1.2.0"; - sha256 = "0mhrfmn5jpp7i9wscimgsbgaqwmpjdjr35ddg13ky44w27n4ii3k"; + version = "0.2.0.0"; + sha256 = "13v8ibbz0sb7rw8y8v1dnyfpc3mc83x63dijnrl45xglwmi2qnjk"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest hspec time ]; testToolDepends = [ hspec-discover ]; @@ -134738,10 +134937,10 @@ self: { }: mkDerivation { pname = "jwt"; - version = "0.9.0"; - sha256 = "1glkaahp3jq744s61y0ja5fdggwac9p1dwia4c19k1ld6qhd5395"; + version = "0.10.0"; + sha256 = "1a1fqmqfm2ajq75mq2x6la8jb2g5hzl4dk8cgx9xsrikp8c7n75w"; revision = "1"; - editedCabalFile = "1vpd4pq8mh4dha7i2pfv4iqpw411yachzkf7p9rnfyicipj53pw2"; + editedCabalFile = "0agwck6lidcxlixk5jgw0pw162xrsnlsgj8y8jwlyhjpqfq52ifi"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite http-types memory network-uri scientific semigroups text time unordered-containers @@ -136135,6 +136334,8 @@ self: { ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keycode" = callPackage @@ -137233,14 +137434,17 @@ self: { }) {}; "lambda-options" = callPackage - ({ mkDerivation, base, containers, mtl, read-bounded }: + ({ mkDerivation, base, containers, funspection, mtl, read-bounded + }: mkDerivation { pname = "lambda-options"; - version = "0.9.1.0"; - sha256 = "0rylch5v4lpd5ynyhrzzj72npqdv6q8mp2rx9v7p641r0njw5r5n"; - libraryHaskellDepends = [ base containers mtl read-bounded ]; - description = "Declarative command line parser using type-driven pattern matching"; - license = stdenv.lib.licenses.bsd2; + version = "1.0.0.0"; + sha256 = "1cpd5s0m10d09mqbpy1qxnrpy8np21ci6fcd09d01xj7lx8p2yzx"; + libraryHaskellDepends = [ + base containers funspection mtl read-bounded + ]; + description = "Declarative command-line parser using type-driven pattern matching"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -138256,28 +138460,6 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "8.0.1"; - sha256 = "0wmnwsf2avdygd3mnz9bd53hlmasgh6cbmzxir2b2ycnp21a1ily"; - libraryHaskellDepends = [ - base bytestring containers free megaparsec mtl prettyprinter split - template-haskell text th-lift time - ]; - testHaskellDepends = [ - base bytestring containers directory filepath free Glob hspec HUnit - megaparsec mtl prettyprinter process QuickCheck split - template-haskell text th-lift time - ]; - description = "Dockerfile parser, pretty-printer and embedded DSL"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "language-docker_8_0_2" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process - , QuickCheck, split, template-haskell, text, th-lift, time - }: - mkDerivation { - pname = "language-docker"; version = "8.0.2"; sha256 = "00fgxddlim1h7xcklr1q38sxbf8zh1m84mha6yzab5as1x14lhij"; libraryHaskellDepends = [ @@ -138291,7 +138473,6 @@ self: { ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-dockerfile" = callPackage @@ -140658,8 +140839,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "2"; - editedCabalFile = "1b14fcncz2yby0d4jhx2h0ma6nx0fd1z7hrg1va4h7zn06m99482"; + revision = "3"; + editedCabalFile = "1ll8j0zymxnr2xxp2h1aaqfcwd6ihjdllk5b7q02r5kw2b8a266b"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; @@ -141197,15 +141378,15 @@ self: { }) {}; "libarchive" = callPackage - ({ mkDerivation, base, bytestring, c2hs, composition-prelude + ({ mkDerivation, base, bytestring, c2hs, composition-prelude, dlist , filepath, libarchive }: mkDerivation { pname = "libarchive"; - version = "1.0.2.0"; - sha256 = "16x5d8al5a8a6iq19jnymi86l3wj3kaqqzwil6vryb2brglmvwc8"; + version = "1.0.5.0"; + sha256 = "0ndla9nkrgc3q10dp2c407whqfwcwjv95rd22cmjx70c3609mm9r"; libraryHaskellDepends = [ - base bytestring composition-prelude filepath + base bytestring composition-prelude dlist filepath ]; libraryPkgconfigDepends = [ libarchive ]; libraryToolDepends = [ c2hs ]; @@ -143417,8 +143598,7 @@ self: { doCheck = false; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; @@ -143461,8 +143641,7 @@ self: { testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -146038,8 +146217,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "6"; - editedCabalFile = "1zkf8ss6siai3py4drb5hr0m3np2kk3vrzb6kcxhq0vxxz3xynjh"; + revision = "7"; + editedCabalFile = "0bwl2hpj0w1wg86az52iwz0afs1h99b599vdn0fgygw2ivhbvqjv"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -147524,22 +147703,6 @@ self: { }: mkDerivation { pname = "main-tester"; - version = "0.2.0.0"; - sha256 = "0iqb7p90hsygpscyddpvrxdaxka8hdc5xk3acacfns0didc7icnc"; - libraryHaskellDepends = [ base bytestring directory ]; - testHaskellDepends = [ - base bytestring hspec hspec-core QuickCheck text - ]; - description = "Capture stdout/stderr/exit code, and replace stdin of your main function"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "main-tester_0_2_0_1" = callPackage - ({ mkDerivation, base, bytestring, directory, hspec, hspec-core - , QuickCheck, text - }: - mkDerivation { - pname = "main-tester"; version = "0.2.0.1"; sha256 = "0hkqllckiq74mhnd76jd0cv5az6n0cf70xncy9r1jkip9s9za1ng"; libraryHaskellDepends = [ base bytestring directory ]; @@ -147548,7 +147711,6 @@ self: { ]; description = "Capture stdout/stderr/exit code, and replace stdin of your main function"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mainland-pretty_0_6_2" = callPackage @@ -148865,23 +149027,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv-io_0_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq, directory + , filepath, JuicyPixels, massiv, netpbm, process, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "0.1.6.0"; + sha256 = "0ggl24w7y9bhlf0dh379raiq8fi2gb29whypp3jy37h8m6ldsngn"; + libraryHaskellDepends = [ + base bytestring data-default deepseq directory filepath JuicyPixels + massiv netpbm process vector + ]; + description = "Import/export of Image files into massiv Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-scheduler" = callPackage ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell - , unliftio-core + , unliftio, unliftio-core }: mkDerivation { pname = "massiv-scheduler"; - version = "0.1.0.0"; - sha256 = "0yqcpcaff6hx8pn39bh88s5g9nryc4qyr3765wbqbh02fbrjpxkq"; - revision = "1"; - editedCabalFile = "1mlbhm8scqlpkqjlc34wmpinvx2lpihhi8jkn99plhxh1s37ai8j"; + version = "0.1.1.0"; + sha256 = "1i2j1gapkpx4n7x2s3nnsmns55hl4nrk4csgxak05gnj66p938v3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ atomic-primops base deepseq exceptions unliftio-core ]; testHaskellDepends = [ - base deepseq doctest hspec QuickCheck template-haskell + base deepseq doctest hspec QuickCheck template-haskell unliftio ]; description = "Work stealing scheduler for Massiv (Массив) and other parallel applications"; license = stdenv.lib.licenses.bsd3; @@ -149376,6 +149553,8 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mattermost-api" = callPackage @@ -150672,22 +150851,6 @@ self: { }: mkDerivation { pname = "menshen"; - version = "0.0.1"; - sha256 = "1i4h5s3d57466hzyp7mag1z7dbp306qm2sf4k3a0frpsz2n2ijsw"; - libraryHaskellDepends = [ base regex-tdfa scientific text ]; - testHaskellDepends = [ - aeson base hspec QuickCheck regex-tdfa scientific text - ]; - description = "Data Validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "menshen_0_0_2" = callPackage - ({ mkDerivation, aeson, base, hspec, QuickCheck, regex-tdfa - , scientific, text - }: - mkDerivation { - pname = "menshen"; version = "0.0.2"; sha256 = "05z6vmxgxfsl4s5bsxrkd929mfml0yk51gwinhwv9c090f5yvbli"; libraryHaskellDepends = [ base regex-tdfa scientific text ]; @@ -150696,7 +150859,6 @@ self: { ]; description = "Data Validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mercury-api" = callPackage @@ -154535,12 +154697,12 @@ self: { }) {}; "monadacme" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "monadacme"; - version = "0.0.2"; - sha256 = "1qam6k3gax2kf9zbf0q2mbsknkmx8y73i9qshbylj8wrpf896y97"; - libraryHaskellDepends = [ base ]; + version = "0.1.0.0"; + sha256 = "1k1jqi0q2n34xd07qp3fd4jw48iq4909m1pq2dm90sg46n6003sr"; + libraryHaskellDepends = [ base transformers ]; description = "The Acme and AcmeT monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155448,6 +155610,59 @@ self: { broken = true; }) {morfeusz = null;}; + "morley" = callPackage + ({ mkDerivation, aeson, aeson-options, autoexporter, base-noprelude + , base16-bytestring, base58-bytestring, bifunctors, bytestring + , containers, cryptonite, data-default, directory, filepath, fmt + , formatting, hspec, hspec-golden-aeson, HUnit, lens, megaparsec + , memory, morley-prelude, mtl, named, optparse-applicative + , parser-combinators, pretty-simple, QuickCheck + , quickcheck-arbitrary-adt, quickcheck-instances, singletons, syb + , text, time, timerep, universum, vinyl + }: + mkDerivation { + pname = "morley"; + version = "0.1.0.1"; + sha256 = "0lxpc04hmmkssfyvxcx8wp0g81si44zgqm7wbsvnvs1f07lim0nd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-options base-noprelude base16-bytestring + base58-bytestring bifunctors bytestring containers cryptonite + data-default directory fmt formatting hspec lens megaparsec memory + morley-prelude mtl named parser-combinators QuickCheck singletons + syb text time timerep vinyl + ]; + libraryToolDepends = [ autoexporter ]; + executableHaskellDepends = [ + base-noprelude fmt megaparsec morley-prelude named + optparse-applicative pretty-simple text + ]; + testHaskellDepends = [ + aeson base-noprelude containers directory filepath fmt formatting + hspec hspec-golden-aeson HUnit lens megaparsec morley-prelude + QuickCheck quickcheck-arbitrary-adt quickcheck-instances text time + universum vinyl + ]; + description = "Developer tools for the Michelson Language"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "morley-prelude" = callPackage + ({ mkDerivation, base-noprelude, universum }: + mkDerivation { + pname = "morley-prelude"; + version = "0.1.0.0"; + sha256 = "0711q97y8f5ndfn3sgxmgf7i7ymakryvnb6r2d8dvg8030gvcq86"; + libraryHaskellDepends = [ base-noprelude universum ]; + description = "A custom prelude used in Morley"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "morph" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , optparse-applicative, postgresql-simple, text, yaml @@ -156062,23 +156277,20 @@ self: { }) {}; "msgpack" = callPackage - ({ mkDerivation, base, binary, blaze-builder, bytestring - , containers, data-binary-ieee754, deepseq, hashable, mtl - , QuickCheck, tasty, tasty-quickcheck, text, unordered-containers - , vector + ({ mkDerivation, async, base, binary, bytestring, containers + , data-binary-ieee754, deepseq, hashable, mtl, QuickCheck, tasty + , tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "msgpack"; - version = "1.0.0"; - sha256 = "0kk6nqn290sh0l0hhglccs0cqgk0fb3xdjzqz19yw9wb8aw01xh8"; - revision = "1"; - editedCabalFile = "0fg5hragvpil7212w7pyyiws0zlf4imas9sjj235lb1wjpka52qp"; + version = "1.0.1.0"; + sha256 = "1ljb9rdhdbxqs32brrwd42c8v3z7yrl6pr4mzmid1rfqdipard77"; libraryHaskellDepends = [ - base binary blaze-builder bytestring containers data-binary-ieee754 - deepseq hashable mtl text unordered-containers vector + base binary bytestring containers data-binary-ieee754 deepseq + hashable mtl text unordered-containers vector ]; testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck + async base bytestring QuickCheck tasty tasty-quickcheck ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; @@ -156138,6 +156350,8 @@ self: { pname = "msgpack-rpc"; version = "1.0.0"; sha256 = "00m5hpj5cd521j3jzsaw49asbpxvka0x1zi2qs26si82wxgnpjkn"; + revision = "2"; + editedCabalFile = "10vhvch66vk12gxgvivzz7x829ml8v08qcw9phylf4icwrgirn0p"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra exceptions monad-control msgpack mtl network random text @@ -159865,27 +160079,6 @@ self: { }: mkDerivation { pname = "netpbm"; - version = "1.0.2"; - sha256 = "1my2zi26wspzh0pplfhgwj9vmkv41hwvrzl8k1virqsbm6y08sl4"; - revision = "1"; - editedCabalFile = "1vhwjv5c5gxn9l9982da54nzczbmj8rl09xn8ac7rix0zmmyvl50"; - libraryHaskellDepends = [ - attoparsec attoparsec-binary base bytestring storable-record - unordered-containers vector vector-th-unbox - ]; - testHaskellDepends = [ base bytestring hspec HUnit vector ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Loading PBM, PGM, PPM image files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "netpbm_1_0_3" = callPackage - ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring - , criterion, hspec, HUnit, storable-record, unordered-containers - , vector, vector-th-unbox - }: - mkDerivation { - pname = "netpbm"; version = "1.0.3"; sha256 = "17cxh15wf7m9ljg0scd5i71ki95fiz8qhrfk4w1zvk4pf2gb7z38"; libraryHaskellDepends = [ @@ -159896,7 +160089,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Loading PBM, PGM, PPM image files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netrc" = callPackage @@ -160165,15 +160357,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network_3_0_1_0" = callPackage + "network_3_0_1_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec - , hspec-discover, HUnit, unix + , hspec-discover, HUnit }: mkDerivation { pname = "network"; - version = "3.0.1.0"; - sha256 = "1dk1dabj779sppjl8vbi4kw8l5da5yfc7x5yn0mjy9zrzlfwqq3l"; - libraryHaskellDepends = [ base bytestring deepseq unix ]; + version = "3.0.1.1"; + sha256 = "1xacvl5wf47cz61igb94zf961b9ks0yhr02myxgjf53clm70dg6j"; + libraryHaskellDepends = [ base bytestring deepseq ]; testHaskellDepends = [ base bytestring directory hspec HUnit ]; testToolDepends = [ hspec-discover ]; description = "Low-level networking interface"; @@ -161305,6 +161497,39 @@ self: { broken = true; }) {inherit (pkgs) blas;}; + "newhope" = callPackage + ({ mkDerivation, AES, base, bytestring, containers, deepseq, hspec + , HUnit, mtl, parallel, QuickCheck, raw-strings-qq, statistics + , system-fileio, system-filepath, tasty, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, text, trifecta, vector + }: + mkDerivation { + pname = "newhope"; + version = "0.1.0.0"; + sha256 = "1yqxdir74mdi2dkccl1wcr2xzxrvg6y8ssskdq0laxb3q8xyzpwa"; + revision = "1"; + editedCabalFile = "18508knx0m46k9wpcxdvb1kahg5vrqc734ifwam9q5kljpm9l0sy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + AES base bytestring containers deepseq mtl vector + ]; + executableHaskellDepends = [ + AES base bytestring containers deepseq mtl system-fileio + system-filepath tasty-quickcheck text vector + ]; + testHaskellDepends = [ + AES base bytestring containers deepseq hspec HUnit mtl parallel + QuickCheck raw-strings-qq statistics system-fileio system-filepath + tasty tasty-expected-failure tasty-hunit tasty-quickcheck text + trifecta vector + ]; + description = "Library implementing the NewHope cryptographic key-exchange protocol"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "newports" = callPackage ({ mkDerivation, base, directory, old-time }: mkDerivation { @@ -161698,12 +161923,12 @@ self: { }) {}; "nimber" = callPackage - ({ mkDerivation, arithmoi, base }: + ({ mkDerivation, base, integer-logarithms }: mkDerivation { pname = "nimber"; - version = "0.1.3"; - sha256 = "0350fmddnfp09051i89fl5ibrxqy36cx5560l00cjssx2gs2dh8w"; - libraryHaskellDepends = [ arithmoi base ]; + version = "0.1.4"; + sha256 = "1k177w8lccpqq4mwj089v7fbqvbrqskqxqj0gaingm0kmskggaaj"; + libraryHaskellDepends = [ base integer-logarithms ]; description = "Finite nimber arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -166365,8 +166590,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "ordered-containers"; - version = "0.1.1"; - sha256 = "0m86imawwvr0bl18bbv9np8hlhs8ssn4l2dvxswa8f83fm61ai5a"; + version = "0.2.1"; + sha256 = "1ycmlwyyflxd2bmrxqydkznqpz98sbs3c84zsszdmwn2dgyjgm01"; libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = stdenv.lib.licenses.bsd3; @@ -167843,25 +168068,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_1_1_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hspec - , hspec-expectations, pandoc-types, tasty, tasty-hspec, tasty-hunit - , temporary, typed-process + "pandoc-pyplot_2_0_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , hspec, hspec-expectations, pandoc-types, random, tasty + , tasty-hspec, tasty-hunit, temporary, text, typed-process }: mkDerivation { pname = "pandoc-pyplot"; - version = "1.1.0.0"; - sha256 = "0c04ayg4rnlycsw16gafiwvixxwc66wxfm4nk25bclbl67zyw8qj"; + version = "2.0.0.0"; + sha256 = "0mh934ab65fbncva9nmgs8mifsjkh57ay952wl5rn9s6037fj5m5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath pandoc-types temporary - typed-process + base containers directory filepath hashable pandoc-types random + temporary text typed-process ]; executableHaskellDepends = [ base pandoc-types ]; testHaskellDepends = [ base directory filepath hspec hspec-expectations pandoc-types tasty - tasty-hspec tasty-hunit temporary + tasty-hspec tasty-hunit temporary text ]; description = "A Pandoc filter for including figures generated from Matplotlib"; license = stdenv.lib.licenses.mit; @@ -167909,6 +168134,8 @@ self: { pname = "pandoc-types"; version = "1.17.5.4"; sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j"; + revision = "1"; + editedCabalFile = "0bpd2iqmriajl5qg44j4z9c4agb9gsdwbn5l4c5yry6flivysq3c"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -178794,8 +179021,8 @@ self: { }: mkDerivation { pname = "primitive-containers"; - version = "0.3.1"; - sha256 = "0ikpnci6lk6nmalyr5kkqwrr12kpclr8ka001hlz0mcy8rrxncq3"; + version = "0.3.3"; + sha256 = "12qcgh20w3dk08gz2fwi69q2gqygiadsnvcgjvv2gqspncdwqxza"; libraryHaskellDepends = [ aeson base contiguous deepseq hashable primitive primitive-sort quantification text unordered-containers vector @@ -181245,22 +181472,26 @@ self: { }) {}; "publish" = callPackage - ({ mkDerivation, base, bytestring, chronologique, directory - , filepath, hinotify, pandoc, pandoc-types, template-haskell, text - , typed-process, unbeliever, unix, unordered-containers + ({ mkDerivation, base, bytestring, chronologique, deepseq + , directory, filepath, hinotify, hspec, pandoc, pandoc-types + , template-haskell, text, typed-process, unbeliever, unix + , unordered-containers }: mkDerivation { pname = "publish"; - version = "0.3.2"; - sha256 = "1jkmp5wsd8ffrxvj965z9pch5g8vxkfwv70hxa3lipdh46k6ll7l"; - revision = "1"; - editedCabalFile = "136hi1c3ap2dvhn79dqdn29dfq5ncilg6qap41d0wf4jp7p419a8"; + version = "0.4.4"; + sha256 = "1a75pqz9gvzda70182gvfwjjzsrqdspngj00mlma1ayr9jy4sxr4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring chronologique directory filepath hinotify pandoc - pandoc-types template-haskell text typed-process unbeliever unix - unordered-containers + base bytestring chronologique deepseq directory filepath hinotify + pandoc pandoc-types template-haskell text typed-process unbeliever + unix unordered-containers + ]; + testHaskellDepends = [ + base bytestring chronologique deepseq directory filepath hinotify + hspec pandoc pandoc-types template-haskell text typed-process + unbeliever unix unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; license = stdenv.lib.licenses.bsd3; @@ -183274,6 +183505,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_20" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring + , case-insensitive, containers, hashable, old-time, QuickCheck + , scientific, splitmix, tagged, text, time, transformers + , transformers-compat, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.20"; + sha256 = "1f5mr70hgzg0ys8x6fkhdlh7bvvy4c1p4z23s4qzc6r9jvd11vya"; + libraryHaskellDepends = [ + array base base-compat bytestring case-insensitive containers + hashable old-time QuickCheck scientific splitmix tagged text time + transformers transformers-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + base containers QuickCheck tagged uuid-types + ]; + benchmarkHaskellDepends = [ base bytestring QuickCheck ]; + description = "Common quickcheck instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -183599,11 +183855,13 @@ self: { ({ mkDerivation, base, QuickCheck, template-haskell }: mkDerivation { pname = "quickcheck-with-counterexamples"; - version = "1.1"; - sha256 = "13vnr98g9cds2jbg76z528lji5mfcxghwjj4sry0011wlrwrx1fd"; + version = "1.2"; + sha256 = "0shigzw0r59cwa22f56522qfv0lsaq1z2861lgy1lhhclzswr6zg"; libraryHaskellDepends = [ base QuickCheck template-haskell ]; description = "Get counterexamples from QuickCheck as Haskell values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quicklz" = callPackage @@ -184025,8 +184283,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.2.0"; - sha256 = "0841p4yw0hd1mjx0ida662n6apfhmjyw76ar9gaysivbgh75dw4y"; + version = "0.2.1"; + sha256 = "17wbnagrikmhkn4pgbwsj9n3k37xnq1a3j58280xikph2iy4mrcq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq vector ]; @@ -185536,10 +185794,8 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.2.1"; - sha256 = "1z2qk62p6bjcj5p7r9xdc992cacdi9f5bwxzrxiqz3m3zj7qn63w"; - revision = "1"; - editedCabalFile = "1y7n3l959ydvwypb27vdkkkgfglk2jwkjblnq8kqn3540jl7qfhr"; + version = "0.3"; + sha256 = "0kxnl7vvqkmrq2cjwgrb4342bvr8a57v652f2pd5yvndamcz5m3w"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -186295,8 +186551,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "read-bounded"; - version = "0.1.1.1"; - sha256 = "0l4hhnk1s1a5hqda2bw9dgmid0xcqy40wa49dwv2p6314r9074gx"; + version = "0.1.1.2"; + sha256 = "1h525al4aavplyimhxsvk96cajl8m7rnlqq3wxh9gqlc1sy4ywcg"; libraryHaskellDepends = [ base ]; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; @@ -187439,6 +187695,8 @@ self: { executableHaskellDepends = [ base mtl reflex ]; description = "A basic `reflex` host for backend work"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-dom" = callPackage @@ -194096,22 +194354,25 @@ self: { broken = true; }) {}; - "salak_0_2_3" = callPackage - ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen - , mtl, QuickCheck, scientific, stm, text, transformers - , unordered-containers, vector, yaml + "salak_0_2_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, containers, data-default + , directory, filepath, hspec, menshen, mtl, pqueue, QuickCheck + , scientific, stm, text, transformers, unordered-containers, vector + , yaml }: mkDerivation { pname = "salak"; - version = "0.2.3"; - sha256 = "1ifa4gvwm3sri6nmgqsi7vrl7vafyzraz9v2y3a8k7gmn0izkmb5"; + version = "0.2.4"; + sha256 = "0yawa5yw94259b1ri0x36zgi3q2cg6ny72rhc1kpmbcw95330pai"; libraryHaskellDepends = [ - aeson base directory filepath menshen mtl scientific stm text - transformers unordered-containers vector yaml + aeson attoparsec base containers data-default directory filepath + menshen mtl pqueue scientific stm text transformers + unordered-containers vector yaml ]; testHaskellDepends = [ - aeson base directory filepath hspec menshen mtl QuickCheck - scientific stm text transformers unordered-containers vector yaml + aeson attoparsec base containers data-default directory filepath + hspec menshen mtl pqueue QuickCheck scientific stm text + transformers unordered-containers vector yaml ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; @@ -195288,6 +195549,26 @@ self: { broken = true; }) {}; + "scheduler" = callPackage + ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest + , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell + , unliftio, unliftio-core + }: + mkDerivation { + pname = "scheduler"; + version = "1.0.0"; + sha256 = "1l8ifgdfzn8w6sd0d9pmlhipbmqs16krzicixf4rxxvr2pl8a2ld"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + atomic-primops base deepseq exceptions unliftio-core + ]; + testHaskellDepends = [ + base deepseq doctest hspec QuickCheck template-haskell unliftio + ]; + description = "Work stealing scheduler"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -199687,6 +199968,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-rawm_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, doctest, filepath, Glob + , hspec-wai, http-client, http-media, http-types, lens, resourcet + , servant, servant-client, servant-client-core, servant-docs + , servant-server, tasty, tasty-hspec, tasty-hunit, text + , transformers, wai, wai-app-static, warp + }: + mkDerivation { + pname = "servant-rawm"; + version = "0.3.1.0"; + sha256 = "055ys4gkywy1ld0d736fsmc39fix2b4ad4myb7qn0sbax6y9zn3q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring filepath http-client http-media http-types lens + resourcet servant-client servant-client-core servant-docs + servant-server wai wai-app-static + ]; + testHaskellDepends = [ + base bytestring doctest Glob hspec-wai http-client http-media + http-types servant servant-client servant-client-core + servant-server tasty tasty-hspec tasty-hunit text transformers wai + warp + ]; + description = "Embed a raw 'Application' in a Servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-reflex" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, exceptions, ghcjs-dom, http-api-data, http-media @@ -203112,17 +203422,6 @@ self: { }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, filepath, process }: - mkDerivation { - pname = "simple-cmd"; - version = "0.1.3"; - sha256 = "04bbdfmfy08fl07f0pqzp31jy4fdky4d9hazyxpqla8m3rs49xa9"; - libraryHaskellDepends = [ base directory filepath process ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_1_3_1" = callPackage ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; @@ -203131,7 +203430,6 @@ self: { libraryHaskellDepends = [ base directory filepath process unix ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -204601,6 +204899,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -209090,6 +209390,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "splitmix_0_0_2" = callPackage + ({ mkDerivation, async, base, base-compat-batteries, bytestring + , containers, criterion, deepseq, process, random, tf-random, time + , vector + }: + mkDerivation { + pname = "splitmix"; + version = "0.0.2"; + sha256 = "1y9vlik5icwimw6c8zh9pzgp0pbxvwxg48r54qsypnn1p4dbgaz6"; + libraryHaskellDepends = [ base deepseq random time ]; + testHaskellDepends = [ + async base base-compat-batteries bytestring deepseq process random + tf-random vector + ]; + benchmarkHaskellDepends = [ + base containers criterion random tf-random + ]; + description = "Fast Splittable PRNG"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "splitter" = callPackage ({ mkDerivation, base, directory, filepath, parsec, range }: mkDerivation { @@ -211768,8 +212090,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; - revision = "1"; - editedCabalFile = "03ga9vwaxsf0c73fciavkm925l7lkgya1a6xghyb8ainrav0bfq4"; + revision = "2"; + editedCabalFile = "074399mj4p0sk49rqc9a3fikpsly95mndnmm71ya7wy34nxyafzv"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -215025,7 +215347,6 @@ self: { ]; description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supercollider-ht" = callPackage @@ -215349,6 +215670,8 @@ self: { pname = "sv-core"; version = "0.4"; sha256 = "0m87rffkv5716dh6v00p4gc257fdc81fahjafs02kkf8fbiivmkh"; + revision = "1"; + editedCabalFile = "0qzklsb21ha7jgfgx3h565pc3659hd3h1l0ci1yr0mdmj08ignbs"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -216010,6 +216333,134 @@ self: { broken = true; }) {}; + "symantic-http" = callPackage + ({ mkDerivation, base, bytestring, http-api-data, http-media + , http-types, network-uri, stm, text, time, transformers + }: + mkDerivation { + pname = "symantic-http"; + version = "0.0.0.20190324"; + sha256 = "0fvj527b5wjq0wfvzd0n8zna4cy5x1ngj47ysrvyv30ddvh94r4c"; + libraryHaskellDepends = [ + base bytestring http-api-data http-media http-types network-uri stm + text time transformers + ]; + description = "Symantic combinators for deriving clients or a server from an HTTP API"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-client" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-client, http-media, http-types, monad-classes + , network-uri, stm, symantic-http, text, time, transformers, word8 + }: + mkDerivation { + pname = "symantic-http-client"; + version = "0.0.0.20190324"; + sha256 = "0y7va5gnf285h2hv82jfjq63k141mwgy8h4s1wbdqmjirrh75d1d"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-client http-media http-types monad-classes network-uri stm + symantic-http text time transformers word8 + ]; + description = "symantic-http applied to the derivation of HTTP clients"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-demo" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-client, http-media, http-types, monad-classes + , network, network-uri, pipes, pipes-bytestring, pipes-safe + , symantic-http, symantic-http-client, symantic-http-pipes + , symantic-http-server, text, time, transformers, wai, wai-extra + , warp + }: + mkDerivation { + pname = "symantic-http-demo"; + version = "0.0.0.0"; + sha256 = "09fkni3zal4bvhf00b57qpf83bk7azcxps4s9nd01zsmnzvhlfs7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base pipes symantic-http text ]; + executableHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-client http-media http-types monad-classes network network-uri + pipes pipes-bytestring pipes-safe symantic-http + symantic-http-client symantic-http-pipes symantic-http-server text + time transformers wai wai-extra warp + ]; + description = "Demo for symantic-http and its companion libraries"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-pipes" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-media, http-types, lens-family-core + , monad-classes, network-uri, pipes, pipes-bytestring, pipes-group + , pipes-parse, pipes-safe, stm, symantic-http, text, time + , transformers, word8 + }: + mkDerivation { + pname = "symantic-http-pipes"; + version = "0.0.0.20190324"; + sha256 = "0c44vcvcpjlpj2wc58mqaaky68s3cjqa8gimv3nnj634m2avmsll"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-media http-types lens-family-core monad-classes network-uri + pipes pipes-bytestring pipes-group pipes-parse pipes-safe stm + symantic-http text time transformers word8 + ]; + description = "Streaming support through pipes for symantic-http"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-server" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-media, http-types, monad-classes, network-uri + , stm, symantic-http, text, time, transformers, wai, warp, word8 + }: + mkDerivation { + pname = "symantic-http-server"; + version = "0.0.0.20190324"; + sha256 = "0drng8xsafq5xm08frjg4fc206lxwb7wq2jj6n7zlv8k3nfnzvzy"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-media http-types monad-classes network-uri stm symantic-http + text time transformers wai warp word8 + ]; + description = "symantic-http applied to the derivation of HTTP servers"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-test" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , deepseq, filepath, hashable, hspec, hspec-wai, http-api-data + , http-client, http-media, http-types, monad-classes, network + , network-uri, pipes, pipes-bytestring, pipes-safe, symantic-http + , symantic-http-client, symantic-http-pipes, symantic-http-server + , tasty, tasty-hspec, tasty-hunit, text, time, transformers, wai + , wai-extra, warp + }: + mkDerivation { + pname = "symantic-http-test"; + version = "0.0.0.20190324"; + sha256 = "0ppxdy1m1a0y3jbkbcaf1syknk5ybri1scs5vhkphvm50fa21qcj"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base base64-bytestring bytestring containers deepseq filepath + hashable hspec hspec-wai http-api-data http-client http-media + http-types monad-classes network network-uri pipes pipes-bytestring + pipes-safe symantic-http symantic-http-client symantic-http-pipes + symantic-http-server tasty tasty-hspec tasty-hunit text time + transformers wai wai-extra warp + ]; + description = "Test symantic-http and its companion libraries"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "symantic-lib" = callPackage ({ mkDerivation, base, bytestring, containers, megaparsec , monad-classes, mono-traversable, symantic, symantic-grammar @@ -216241,20 +216692,20 @@ self: { "syntactic" = callPackage ({ mkDerivation, base, constraints, containers, criterion , data-hash, deepseq, mtl, QuickCheck, syb, tagged, tasty - , tasty-golden, tasty-quickcheck, tasty-th, template-haskell - , tree-view, utf8-string + , tasty-golden, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, tree-view, utf8-string }: mkDerivation { pname = "syntactic"; - version = "3.7.1"; - sha256 = "06k2n84dn9rp59rcv29hqkrm5mri6hyhh0hdbh7qfqxa7m06sl6w"; + version = "3.8"; + sha256 = "1vwr2wfa9b4782k3v4bp0p5qqy14mwx9mmlax0jskpqwzx0azxvi"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view ]; testHaskellDepends = [ base containers mtl QuickCheck tagged tasty tasty-golden - tasty-quickcheck tasty-th utf8-string + tasty-hunit tasty-quickcheck tasty-th utf8-string ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Generic representation and manipulation of abstract syntax"; @@ -217360,6 +217811,8 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -218184,6 +218637,8 @@ self: { ]; description = "Terminal Art"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "task" = callPackage @@ -218378,12 +218833,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_2_0_0_0" = callPackage + "tasty-dejafu_2_0_0_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "2.0.0.0"; - sha256 = "1jy1rh26xr64kwvywcfmb55x088hbrg8dhcixy9lhw76xrzjpkia"; + version = "2.0.0.1"; + sha256 = "19cgzr1gcy1khvw2a6bfd620zmrc4szkdwyf3rfyacxgbgqy1b1z"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -219198,6 +219653,8 @@ self: { executableHaskellDepends = [ base ]; description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "teams" = callPackage @@ -220300,6 +220757,8 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;}; "termplot" = callPackage @@ -220521,6 +220980,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.5"; sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"; + revision = "1"; + editedCabalFile = "1vmpk70h1594h9s216d3ngkb399fpny1d3sh4gg0vrc75p4as68d"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; @@ -221752,6 +222213,8 @@ self: { pname = "text-show"; version = "3.8"; sha256 = "1yqmyfmnnph28v0c0rkh0z38xaxrrsljf1zg6zccqw322frw9fsi"; + revision = "1"; + editedCabalFile = "03q739smdz7z0nnx6pg7d58mmq65y7abhdxwy57akf7pichnw13b"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -221785,6 +222248,8 @@ self: { pname = "text-show-instances"; version = "3.7"; sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c"; + revision = "1"; + editedCabalFile = "0rw9xbyinjrp0rgqwklsv4552k0g0n2nnq7n02i0015q8psfdz6z"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -222498,6 +222963,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_7" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.7"; + sha256 = "0qqxrm04nqh062cw6a2p6grvvfpg0nxkj3aymmar29yky17y8vgy"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -222835,6 +223320,8 @@ self: { pname = "these"; version = "0.8"; sha256 = "145m71z43rqgps0nh29hcfkr3cbs9l82y3dfycf7i5fjr2472rga"; + revision = "1"; + editedCabalFile = "0y7q2bzqgd2ii47kqy6fij1qd0l7immgcx6lkq9bswkgvdband11"; libraryHaskellDepends = [ aeson assoc base base-compat bifunctors binary containers data-default-class deepseq hashable keys lens mtl QuickCheck @@ -223492,24 +223979,6 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.0.8"; - sha256 = "0mxwaalbc23rmk163r40vqw15f3kjg5bagpq7f6rn3nyks7095qz"; - libraryHaskellDepends = [ - base bifunctors colour containers hosc mwc-random network parsec - template-haskell text transformers vector - ]; - testHaskellDepends = [ base containers microspec parsec ]; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_1_0_10" = callPackage - ({ mkDerivation, base, bifunctors, colour, containers, hosc - , microspec, mwc-random, network, parsec, template-haskell, text - , transformers, vector - }: - mkDerivation { - pname = "tidal"; version = "1.0.10"; sha256 = "1pays7hjsv7rpc0ldmzhavxkyp3avcwz912zfm9y80fyhhyyf4jp"; libraryHaskellDepends = [ @@ -223519,7 +223988,6 @@ self: { testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -226194,6 +226662,8 @@ self: { ]; description = "A command-line tool for live monitoring"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "traction" = callPackage @@ -226728,44 +227198,36 @@ self: { "trasa" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, hashable - , http-media, http-types, tasty, tasty-hunit, tasty-quickcheck - , text, unordered-containers, vinyl + , http-media, http-types, quantification, text + , unordered-containers }: mkDerivation { pname = "trasa"; - version = "0.3"; - sha256 = "0v1srhmzwc8vdkwwpik91bvrq73driryl0lyazx7zvpvmqhxkmi6"; + version = "0.4"; + sha256 = "059zbm4bfzcv0qlvr55l49xs5izycb2hdjbyqvri5f3vrnwnic1q"; libraryHaskellDepends = [ - base binary bytestring hashable http-media http-types text - unordered-containers vinyl - ]; - testHaskellDepends = [ - base bytestring doctest tasty tasty-hunit tasty-quickcheck text - vinyl + base binary bytestring hashable http-media http-types + quantification text unordered-containers ]; + testHaskellDepends = [ base doctest ]; description = "Type Safe Web Routing"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "trasa-client" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive - , containers, http-client, http-media, http-types, ip, text, trasa - , unordered-containers + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers, http-client, http-media, http-types, text, trasa }: mkDerivation { pname = "trasa-client"; - version = "0.3"; - sha256 = "1cq0wbjv0kbhvprrggbkqqy6h6ixywfr816b9pd2qqmsnw4lq6ns"; + version = "0.4"; + sha256 = "0xfqjvc1a4vbm8kvw1s11n174sc33hb7psd5lwpa6hipifw3kmb1"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers http-client http-media http-types text trasa ]; - testHaskellDepends = [ - aeson base http-client http-types ip text trasa - unordered-containers - ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -226791,23 +227253,36 @@ self: { "trasa-server" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , doctest, http-client, http-media, http-types, mtl, tasty - , tasty-hunit, tasty-quickcheck, text, trasa, vinyl, wai, warp + , http-media, http-types, mtl, text, trasa, wai }: mkDerivation { pname = "trasa-server"; - version = "0.2"; - sha256 = "1jiqlsmiz82xh0mxj72bm0daqjvn5h5wb44i50q4pbsijaqgvsyy"; + version = "0.4"; + sha256 = "1xh85kh9ilsq8zy19if4s93zmjqxbpgqpvhkh9jpk8klia7zc0pv"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-media http-types mtl text trasa wai ]; - testHaskellDepends = [ - base bytestring doctest http-client tasty tasty-hunit - tasty-quickcheck text trasa vinyl warp - ]; description = "Type safe web server"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "trasa-th" = callPackage + ({ mkDerivation, base, containers, megaparsec, template-haskell + , trasa + }: + mkDerivation { + pname = "trasa-th"; + version = "0.4"; + sha256 = "1jfnm0im5qk6s6a9fbdrz228mic5ribi53fyl7nnk8gsr5lrl22z"; + libraryHaskellDepends = [ + base containers megaparsec template-haskell trasa + ]; + testHaskellDepends = [ base trasa ]; + description = "Template Haskell to generate trasa routes"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -226937,8 +227412,8 @@ self: { pname = "tree-diff"; version = "0.0.2"; sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq"; - revision = "1"; - editedCabalFile = "1rl12a2ydg744s289lna4zb0sj0b16abmrngp6qd1kfkih2ygml0"; + revision = "2"; + editedCabalFile = "07pz7mhzvh7iwgn2rvw29valfdm4y845zqqffxb89ywbb6gnm8x8"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -229822,6 +230297,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typerep-map_0_3_2" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat + , hedgehog, primitive, QuickCheck, tasty, tasty-discover + , tasty-hedgehog, tasty-hspec, vector + }: + mkDerivation { + pname = "typerep-map"; + version = "0.3.2"; + sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim primitive vector + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover + tasty-hedgehog tasty-hspec + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq dependent-map dependent-sum + ghc-typelits-knownnat + ]; + doHaddock = false; + description = "Efficient implementation of a dependent map with types as keys"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "types-compat" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -230533,33 +231036,35 @@ self: { }) {}; "unbeliever" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal - , chronologique, containers, deepseq, directory, exceptions - , fingertree, gauge, hashable, hourglass, hspec, mtl, prettyprinter + ({ mkDerivation, aeson, async, base, bytestring, chronologique + , containers, deepseq, directory, exceptions, fingertree, gauge + , hashable, hourglass, hspec, mtl, prettyprinter , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm , template-haskell, terminal-size, text, text-short, transformers , unix, unordered-containers, vector }: mkDerivation { pname = "unbeliever"; - version = "0.9.2.0"; - sha256 = "0fy9slvc0gvxr6z7zmz1xyk5qkxrfq4nbs9q8z11viqp0qg0yssx"; + version = "0.9.3.2"; + sha256 = "1gsjmr9h7w08576smi978k5djhvjk4ry0ljgr6zxx7nj7cy1m84b"; + revision = "1"; + editedCabalFile = "0mlbjb79ylk2jb7mp6da1xfl2r28zfijwv5dd2l73l9mgi5h0s72"; libraryHaskellDepends = [ - aeson async base bytestring Cabal chronologique containers deepseq + aeson async base bytestring chronologique containers deepseq directory exceptions fingertree hashable hourglass mtl prettyprinter prettyprinter-ansi-terminal safe-exceptions scientific stm template-haskell terminal-size text text-short transformers unix unordered-containers vector ]; testHaskellDepends = [ - aeson async base bytestring Cabal chronologique containers deepseq + aeson async base bytestring chronologique containers deepseq directory exceptions fingertree hashable hourglass hspec mtl prettyprinter prettyprinter-ansi-terminal safe-exceptions scientific stm template-haskell terminal-size text text-short transformers unix unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson async base bytestring Cabal chronologique containers deepseq + aeson async base bytestring chronologique containers deepseq directory exceptions fingertree gauge hashable hourglass mtl prettyprinter prettyprinter-ansi-terminal safe-exceptions scientific stm template-haskell terminal-size text text-short @@ -233215,23 +233720,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.12.0"; - sha256 = "0qm7bm5dmcz7kn9p882fwpihj5azm2baxz68jnimmw1mp5w66fw2"; - libraryHaskellDepends = [ base ]; - description = "Utilities"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "util_0_1_13_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "util"; version = "0.1.13.0"; sha256 = "15b5m2v1v4ab65cfd6ppwinq2pnv5212g1qwnyw6rwyiaac8k3gd"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "util-exception" = callPackage @@ -236335,8 +236828,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "vulkan-api"; - version = "1.1.3.1"; - sha256 = "00wv54ggmmvq1lc9rmp9jn910m5sa30l772p28r2qsq4i8cxrbcy"; + version = "1.1.4.0"; + sha256 = "10q98v71miyb1yhnpvz9dlhjs38m4pbz7x1hndz8cfsnjk3n5b22"; libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; @@ -239814,20 +240307,6 @@ self: { ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: mkDerivation { pname = "weigh"; - version = "0.0.13"; - sha256 = "1ylfx0y9m8h3c2lwdil5l9mvngad419zd8qk7kw85s4hvnss9fp4"; - libraryHaskellDepends = [ - base deepseq mtl process split temporary - ]; - testHaskellDepends = [ base deepseq ]; - description = "Measure allocations of a Haskell functions/values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "weigh_0_0_14" = callPackage - ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: - mkDerivation { - pname = "weigh"; version = "0.0.14"; sha256 = "0l85marb5rl9nr1c0id42dnr5i9fk1jciy5h6lywhb34w3hbj61g"; libraryHaskellDepends = [ @@ -239836,7 +240315,6 @@ self: { testHaskellDepends = [ base deepseq ]; description = "Measure allocations of a Haskell functions/values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "weighted" = callPackage @@ -240538,8 +241016,8 @@ self: { }: mkDerivation { pname = "withdependencies"; - version = "0.2.4.2"; - sha256 = "04pk5giqlnls1p62fz9p0sb1288c9qk3ivsq2kb5207cjifyslgz"; + version = "0.2.4.3"; + sha256 = "1km9mrasxpzpkrm1cb5s06iwmqd33dmiwld8syx1f7rq9l3pk8d7"; libraryHaskellDepends = [ base conduit containers mtl profunctors ]; @@ -243655,6 +244133,28 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "xmlbf_0_5" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "xmlbf"; + version = "0.5"; + sha256 = "1wm7xypplnz9sl6ckh8kjsb66pd2cqgr412sdhdm0d7y0yixv2zy"; + libraryHaskellDepends = [ + base bytestring containers deepseq text transformers + unordered-containers + ]; + testHaskellDepends = [ + base bytestring deepseq QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck text transformers unordered-containers + ]; + description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmlbf-xeno" = callPackage ({ mkDerivation, base, bytestring, html-entities, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text @@ -243675,6 +244175,27 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "xmlbf-xeno_0_2" = callPackage + ({ mkDerivation, base, bytestring, html-entities, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , unordered-containers, xeno, xmlbf + }: + mkDerivation { + pname = "xmlbf-xeno"; + version = "0.2"; + sha256 = "1x33885kjddmc39p2jxafypcgpm5fajdxzdd6l9z5bpihlpgk7ig"; + libraryHaskellDepends = [ + base bytestring html-entities text unordered-containers xeno xmlbf + ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text unordered-containers xmlbf + ]; + description = "xeno backend support for the xmlbf library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmlbf-xmlhtml" = callPackage ({ mkDerivation, base, bytestring, html-entities, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text @@ -243682,8 +244203,8 @@ self: { }: mkDerivation { pname = "xmlbf-xmlhtml"; - version = "0.1.1"; - sha256 = "0x8fr4dqa1i3ylwh98r69xavrfgl2i97s9iili14wpqap0pg8aa4"; + version = "0.2"; + sha256 = "1h2w98jdr3r9isbl5g39gd3fxlm4vqib15grqgarhx2gj1k9vlxd"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xmlbf xmlhtml @@ -243694,6 +244215,8 @@ self: { ]; description = "xmlhtml backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmlgen" = callPackage @@ -246302,42 +246825,6 @@ self: { "yesod-core" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.12"; - sha256 = "1zyvjbphzkhch4wv8lj019dd3jnyicdj514fhy1ggwqkff3kyblj"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_13" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, bytestring, case-insensitive, cereal, clientsession , conduit, conduit-extra, containers, cookie, deepseq, fast-logger , gauge, hspec, hspec-expectations, http-types, HUnit, memory @@ -246371,7 +246858,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 297883ecd0a4..f276d0bf12ee 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages +{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv , gtk3Support ? false, gtk3 ? null , qt4 ? null @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; - patches = [ ./no-mkdir-localstatedir.patch ]; + patches = [ + ./no-mkdir-localstatedir.patch + (fetchpatch { + name ="CVE-2017-6519-CVE-2018-100084.patch"; + url = https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch; + sha256 = "06n7b7kz6xcc35c7xjfc1kj3k2llyjgi09nhy0ci32l1bhacjw0q"; + }) + ]; buildInputs = [ libdaemon dbus glib expat libiconv ] ++ (with perlPackages; [ perl XMLParser ]) diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix new file mode 100644 index 000000000000..12fc1834e905 --- /dev/null +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut +, Cocoa, OpenGL +}: + +stdenv.mkDerivation rec { + name = "bullet-${version}"; + version = "2019-03-27"; + + src = fetchFromGitHub { + owner = "olegklimov"; + repo = "bullet3"; + # roboschool needs the HEAD of a specific branch of this fork, see + # https://github.com/openai/roboschool/issues/126#issuecomment-421643980 + # https://github.com/openai/roboschool/pull/62 + # https://github.com/openai/roboschool/issues/124 + rev = "3687507ddc04a15de2c5db1e349ada3f2b34b3d6"; + sha256 = "1wd7vj9136dl7lfb8ll0rc2fdl723y3ls9ipp7657yfl2xrqhvkb"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + + patches = [ ./gwen-narrowing.patch ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt + sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt + ''; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_CPU_DEMOS=OFF" + "-DINSTALL_EXTRA_LIBS=ON" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DOPENGL_FOUND=true" + "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework" + "-DBUILD_BULLET2_DEMOS=OFF" + "-DBUILD_UNIT_TESTS=OFF" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A professional free 3D Game Multiphysics Library"; + longDescription = '' + Bullet 3D Game Multiphysics Library provides state of the art collision + detection, soft body and rigid body dynamics. + ''; + homepage = http://bulletphysics.org; + license = licenses.zlib; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 995844524dcf..d38aa7f0f958 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "cmocka-${version}"; + pname = "cmocka"; majorVersion = "1.1"; - version = "${majorVersion}.1"; + version = "${majorVersion}.3"; src = fetchurl { url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz"; - sha256 = "f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389"; + sha256 = "1bxzzafjlwzgldcb07hjnlnqvh88wh21r2kw7z8f704w5bvvrsj3"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index ce41ffa4929f..f240ad124c8b 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ ) diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 04e1af2326b6..8949ea8e390e 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }: +{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2 +, x11Support ? !stdenv.isDarwin, libX11, libXext +}: stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; @@ -13,8 +15,16 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ] - ++ stdenv.lib.optional stdenv.isDarwin libXext; + configureFlags = [ + (if x11Support then "--enable-x11" else "--disable-x11") + ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING"; + + enableParallelBuilding = true; + + propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ] + ++ stdenv.lib.optionals x11Support [ libX11 libXext]; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index c0ec9d927a83..067144ddfa0c 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.20.2"; + version = "3.20.3"; name = "libdap-${version}"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "0kp35ghj48wqgy67xyplwhmw21r8r0p00y2hw0fv65g4yrsgvsk0"; + sha256 = "0n6ciicaa7sn88gvg5sgcq0438i3vh6xbl9lxgafjqiznli1k5i9"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 59651af2b8cf..6a26910c8bd6 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "libebml-${version}"; - version = "1.3.6"; + pname = "libebml"; + version = "1.3.7"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "0fl8d35ywj9id93yp78qlxy7j81kjri957agq40r420kmwac3dzs"; + sha256 = "0pdfl83nbbdddbxajx34srg4mcfcz8ca21qyvlnpw81hfnrhmjkv"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index bbc694619d4c..6df996f30999 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -2,14 +2,14 @@ , libebml }: stdenv.mkDerivation rec { - name = "libmatroska-${version}"; - version = "1.4.9"; + pname = "libmatroska"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; rev = "release-${version}"; - sha256 = "1hfrcpvmyqnvdkw8rz1z20zw7fpnjyl5h0g9ky7k6y1a44b1fz86"; + sha256 = "01kp48ih9pqkm518ylbxicjmknqvb3njb71il2h2wa37whsaals8"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 875e0a97ae2e..918335597c9b 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "09s0rhjpvaa89767m58wk1bqcmdkjk7brwj32k083f2wsdbbzb11"; + sha256 = "03ljn4igi8l1fd1nvpn448d3sqvxyl0r0l9sbkimlx77g52wjv2j"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 7803b2a5ff11..f53db7241cf7 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "2.0.0"; name = "libsoundio-${version}"; src = fetchFromGitHub { owner = "andrewrk"; repo = "libsoundio"; rev = "${version}"; - sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p"; + sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix index 471789d3e0f6..44949cf2deb4 100644 --- a/pkgs/development/libraries/libxl/default.nix +++ b/pkgs/development/libraries/libxl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxl"; - version = "3.8.1"; + version = "3.8.4"; src = fetchurl { url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz"; - sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm"; + sha256 = "0jnvc9ilir3lvs81l6ldnyf6jbfsy7bcs5pkc75qfnvz01y7p6as"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 531261a58ca5..f9d07d8d7373 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2019.02.03"; + version = "2019.03.06"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "04474r1drvgjpk33yjj79dq2hq15ncw8y3w6g9625zryan8qv4qw"; + sha256 = "1gasdl95yjabv811knkmy5laj21a54z1jdfq36jdj984k1nw5l0b"; }; postPatch = '' diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 32245929ce62..379c370e1fcc 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -64,7 +64,11 @@ let qttools = [ ./qttools.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch ] ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch - ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch; + ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch + ./qtwebengine-darwin-sdk-10.10.patch + ./qtwebengine-darwin-old-sdk.patch + ]; qtwebkit = [ ./qtwebkit.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh index dc1088fc371c..2ab3dd71c24f 100644 --- a/pkgs/development/libraries/qt-5/5.11/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.11/fetch.sh @@ -1,2 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ \ - -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..3e1a8762b361 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,37 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) { + return(false) + } + } else:osx { +- !isMinXcodeVersion(7, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.") +- return(false) +- } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") + return(false) +@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) { + skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.") + return(false) + } +- !isMinOSXSDKVersion(10, 10): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) +- } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") + return(false) +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch new file mode 100644 index 000000000000..b065c2211017 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch @@ -0,0 +1,21 @@ +diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm +--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm ++++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm +@@ -45,7 +45,7 @@ NSString *RTCFieldTrialTrendlineFilterValue( + return [NSString stringWithFormat:format, windowSize, smoothingCoeff, thresholdGain]; + } + +-void RTCInitFieldTrialDictionary(NSDictionary<NSString *, NSString *> *fieldTrials) { ++void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials) { + if (!fieldTrials) { + RTCLogWarning(@"No fieldTrials provided."); + return; +diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h +--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h ++++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h +@@ -40,4 +40,4 @@ RTC_EXTERN NSString *RTCFieldTrialTrendlineFilterValue( + * Must be called before any other call into WebRTC. See: + * webrtc/system_wrappers/include/field_trial_default.h + */ +-RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary<NSString *, NSString *> *fieldTrials); ++RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials); diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index bc6432b5ca5a..6d0e241d7a54 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -63,7 +63,8 @@ let qtwebengine = [ ./qtwebengine-no-build-skip.patch ./qtwebengine-CVE-2019-5786.patch - ]; + ] + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index b77a58cafa2e..aa3a0fe94898 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1,2 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ \ - -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..364330169bf1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,21 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { + } else:osx { + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + !isMinXcodeVersion(8, 3, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") +- return(false) + } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") +@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { + return(false) + } + !isMinOSXSDKVersion(10, 12): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) + } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") diff --git a/pkgs/development/libraries/qt-5/5.6/fetch.sh b/pkgs/development/libraries/qt-5/5.6/fetch.sh index ee3a5ddf8deb..bb9eb66a01dc 100644 --- a/pkgs/development/libraries/qt-5/5.6/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.6/fetch.sh @@ -1,3 +1,2 @@ WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/ \ - http://download.qt.io/community_releases/5.6/5.6.3/ \ - -A '*.tar.xz' ) + http://download.qt.io/community_releases/5.6/5.6.3/ ) diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 589f175efd9c..be84691e6c33 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -43,7 +43,9 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = [ ./qtwebengine-no-build-skip.patch ]; + qtwebengine = [ ./qtwebengine-no-build-skip.patch ] + ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ]; qtvirtualkeyboard = [ (fetchpatch { diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index e631d3ae9b00..17ebe1e532df 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ \ - -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch new file mode 100644 index 000000000000..cf082cddd11a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch @@ -0,0 +1,38 @@ +Fix a following build error: + +In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: +In file included from ../../3rdparty/chromium/base/bind.h:8: +../../3rdparty/chromium/base/bind_internal.h:214:31: error: cannot initialize a parameter of type 'NSError *' with an lvalue of type 'const long' + return (receiver.*method)(std::forward<RunArgs>(args)...); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +../../3rdparty/chromium/base/bind_internal.h:285:20: note: in instantiation of function template specialization 'base::internal::FunctorTraits<void (device::BluetoothRemoteGat +tCharacteristicMac::*)(NSError *), void>::Invoke<device::BluetoothRemoteGattCharacteristicMac *, const long &>' requested here + return Traits::Invoke(std::forward<Functor>(functor), + ^ +../../3rdparty/chromium/base/bind_internal.h:361:43: note: in instantiation of function template specialization 'base::internal::InvokeHelper<false, void>::MakeItSo<void (devi +ce::BluetoothRemoteGattCharacteristicMac::*const &)(NSError *), device::BluetoothRemoteGattCharacteristicMac *, const long &>' requested here + return InvokeHelper<is_weak_call, R>::MakeItSo( + ^ +../../3rdparty/chromium/base/bind_internal.h:339:12: note: in instantiation of function template specialization 'base::internal::Invoker<base::internal::BindState<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>, void ()>::RunImpl<void (device::BluetoothRemoteGattCharacteristicMac::*const &)(NSError *), const std::__1::tuple<base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long> &, 0, 1>' requested here + return RunImpl(storage->functor_, + ^ +../../3rdparty/chromium/base/bind.h:62:45: note: in instantiation of member function 'base::internal::Invoker<base::internal::BindState<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>, void ()>::Run' requested here + PolymorphicInvoke invoke_func = &Invoker::Run; + ^ +../../3rdparty/chromium/base/bind.h:77:10: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here + return BindRepeating(std::forward<Functor>(functor), + ^ +../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:241:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, + +--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm ++++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm +@@ -239,7 +239,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, +- base::Unretained(this), nil)); ++ base::Unretained(this), nullptr)); + } + } + diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..7156c41c5ec1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,50 @@ +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -194,9 +194,6 @@ defineTest(runConfigure) { + } else { + log("Native Spellchecker .............. Not enabled (Default, enable with WEBENGINE_CONFIG+=use_native_spellchecker)$${EOL}") + } +- !isMinOSXSDKVersion(10, 10, 3) { +- log(" Force Touch API usage .............. Not enabled (Because the OS X SDK version to be used \"$${WEBENGINE_OSX_SDK_PRODUCT_VERSION}\" is lower than the required \"10.10.3\")$${EOL}") +- } + } + } + +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) { + return(false) + } + } else:osx { +- !isMinXcodeVersion(5, 1) { +- skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") +- return(false) +- } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") + return(false) +@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) { + skipBuild("Qt WebEngine requires OS X version 10.10 or newer.") + return(false) + } +- !isMinOSXSDKVersion(10, 10): { +- skipBuild("Qt WebEngine requires an OS X SDK version of 10.10 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) +- } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.") + return(false) +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index ddb828323371..91b7acf43654 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -67,32 +67,12 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' + optionalString stdenv.isDarwin ('' - # Remove annoying xcode check - substituteInPlace mkspecs/features/platform.prf \ - --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false \ - --replace "/usr/bin/xcodebuild" "xcodebuild" - - substituteInPlace src/3rdparty/chromium/build/mac_toolchain.py \ - --replace "/usr/bin/xcode-select" "xcode-select" - substituteInPlace src/core/config/mac_osx.pri \ - --replace /usr ${stdenv.cc} \ - --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false - + --replace /usr ${stdenv.cc} '' - # TODO remove when new Apple SDK is in - + (if lib.versionOlder qtCompatVersion "5.11" then '' - substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \ - --replace "NSArray<NSString*>*" "NSArray*" - substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \ - --replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \ - --replace "NSArray<VNRequest*>*" "NSArray*" \ - --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption" - '' else '' - substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm \ - --replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*" - substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h \ - --replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*" + + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") '' + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ + --replace '$sysroot/usr' "${darwin.xnu}" '') + '' @@ -114,9 +94,6 @@ print('sdk_platform_path=""') print('sdk_build="17B41"') EOF - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ - --replace '$sysroot/usr' "${darwin.xnu}" - # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index b37dd413f693..1213120ce1cb 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,43 +1,22 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2, - enableGtkSupport ? true # Whether to compile with support for Gtk - # integration (library file cairo2_gtk). Depends - # on lablgtk and gtk2. +{ stdenv, lib, fetchurl, buildDunePackage +, pkgconfig, cairo }: -let - inherit (stdenv.lib) optionals; - version = "0.5"; -in - -stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-cairo2-${version}"; +buildDunePackage rec { + pname = "cairo2"; + version = "0.6"; src = fetchurl { - url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz"; - sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj"; + url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; + sha256 = "1k2q7ipmddqnd2clybj4qb5xwzzrnl2fxnd6kv60dlzgya18lchs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib ocamlbuild cairo ] - ++ optionals enableGtkSupport [ gtk2 ]; - - # lablgtk2 is marked as a propagated build input since loading the - # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as - # well. - propagatedBuildInputs = optionals enableGtkSupport [ lablgtk ]; - - createFindlibDestdir = true; - - configurePhase = "ocaml setup.ml -configure --prefix $out" - + (if enableGtkSupport then " --enable-lablgtk2" - else " --disable-lablgtk2"); - - buildPhase = "ocaml setup.ml -build"; + buildInputs = [ cairo ]; - installPhase = "ocaml setup.ml -install"; + doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = { homepage = "https://github.com/Chris00/ocaml-cairo"; description = "Binding to Cairo, a 2D Vector Graphics Library"; longDescription = '' @@ -46,8 +25,7 @@ stdenv.mkDerivation { the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. ''; - license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.jirkamarsik ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ jirkamarsik vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index de759e922781..dba3e2569574 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml${ocaml.version}-extlib-1.7.5"; + name = "ocaml${ocaml.version}-extlib-1.7.6"; src = fetchurl { - url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz; - sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; + url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz; + sha256 = "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"; }; buildInputs = [ ocaml findlib cppo ]; diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 26131d0a98c8..7c6198add622 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,18 +1,10 @@ -{ stdenv,lib, fetchFromGitHub, pkgconfig, ocaml, findlib, dune, gtk3, cairo2 }: +{ lib, fetchFromGitHub, pkgconfig, buildDunePackage, gtk3, cairo2 }: -if !lib.versionAtLeast ocaml.version "4.05" -then throw "lablgtk3 is not available for OCaml ${ocaml.version}" -else - -# This package uses the dune.configurator library -# It thus needs said library to be compiled with this OCaml compiler -let __dune = dune; in -let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in - -stdenv.mkDerivation rec { +buildDunePackage rec { version = "3.0.beta5"; pname = "lablgtk3"; - name = "ocaml${ocaml.version}-${pname}-${version}"; + + minimumOCamlVersion = "4.05"; src = fetchFromGitHub { owner = "garrigue"; @@ -22,17 +14,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib dune gtk3 ]; + buildInputs = [ gtk3 ]; propagatedBuildInputs = [ cairo2 ]; - buildPhase = "dune build -p ${pname}"; - inherit (dune) installPhase; - meta = { description = "OCaml interface to gtk+-3"; homepage = "http://lablgtk.forge.ocamlcore.org/"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index 7e8807576eeb..a266e57dd859 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -1,9 +1,8 @@ -{ stdenv, ocaml, gtksourceview, lablgtk3 }: +{ buildDunePackage, gtksourceview, lablgtk3 }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-lablgtk3-sourceview3-${version}"; - buildPhase = "dune build -p lablgtk3-sourceview3"; +buildDunePackage rec { + pname = "lablgtk3-sourceview3"; buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; propagatedBuildInputs = [ lablgtk3 ]; - inherit (lablgtk3) src version meta nativeBuildInputs installPhase; + inherit (lablgtk3) src version meta nativeBuildInputs; } diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index 129f9dd7289f..0b8f83a1ea3e 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchFromGitHub, ocaml, findlib, dune }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-stdint-${version}"; - version = "0.5.0"; + pname = "stdint"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "0.5.1"; src = fetchFromGitHub { owner = "andrenth"; repo = "ocaml-stdint"; rev = version; - sha256 = "1xjzqq13m7cqrfwa6vcwxirm17w8bx025dgnjqjgd3k2lxfgd1j7"; + sha256 = "0z2z77m3clna9m9k0f8fd1400cdlglvy1kr893qs3907b3v0c057"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; + buildInputs = [ ocaml findlib dune ]; - createFindlibDestdir = true; + buildPhase = "dune build -p ${pname}"; + inherit (dune) installPhase; meta = { description = "Various signed and unsigned integers for OCaml"; diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix index e8eabcf43b30..117277fe1b6e 100644 --- a/pkgs/development/ocaml-modules/syslog/default.nix +++ b/pkgs/development/ocaml-modules/syslog/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; + buildFlags = [ "all" "opt" ]; + createFindlibDestdir = true; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index bb16ac46f991..d454d244959f 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,15 +1,8 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }: +{ lib, fetchFromGitHub, buildDunePackage, czmq, stdint }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "zmq is not available for OCaml ${ocaml.version}" -else - -let __dune = dune; in -let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; -in - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-zmq-${version}"; +buildDunePackage rec { + minimumOCamlVersion = "4.03"; + pname = "zmq"; version = "20180726"; src = fetchFromGitHub { owner = "issuu"; @@ -18,23 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; }; - patches = [ - ./ocaml-zmq-issue43.patch - ]; - - buildInputs = [ ocaml findlib dune czmq ]; + buildInputs = [ czmq ]; propagatedBuildInputs = [ stdint ]; - buildPhase = "dune build -p zmq"; - - inherit (dune) installPhase; - - meta = with stdenv.lib; { + meta = { description = "ZeroMQ bindings for OCaml"; - license = licenses.mit; - maintainers = with maintainers; [ akavel ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ akavel ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch b/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch deleted file mode 100644 index 0d01e8b45f39..000000000000 --- a/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100 -+++ source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100 -@@ -35,7 +35,7 @@ - #include "socket.h" - #include "msg.h" - --#include <uint64.h> -+#include <ocaml_stdint/uint64.h> - - /** - * Version diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 1ec50ef7780b..dff12fcaf92c 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.7.8"; + version = "2.7.9"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "11yx7vd0mp5gkq428af141dwnrwf8f9cp3f65243qbs9icjxnrrx"; + sha256 = "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf"; }; prePatch = '' diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix new file mode 100644 index 000000000000..2fd58010f5a7 --- /dev/null +++ b/pkgs/development/python-modules/baselines/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, gym +, scipy +, tqdm +, joblib +, dill +, progressbar2 +, cloudpickle +, click +, pyzmq +, tensorflow +, mpi4py +}: + +buildPythonPackage rec { + pname = "baselines"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n1mxkcg82gzhkb4j5zzwm335r3rc1sblknqs4x6nkrrh42d65cm"; + }; + + patches = [ + # already fixed upstream + ./fix-dep-names.patch + ]; + + propagatedBuildInputs = [ + gym + scipy + tqdm + joblib + pyzmq + dill + progressbar2 + mpi4py + cloudpickle + tensorflow + click + ]; + + # fails to create a daemon, probably because of sandboxing + doCheck = false; + + checkInputs = [ + pytest + ]; + + meta = with lib; { + description = "High-quality implementations of reinforcement learning algorithms"; + homepage = https://github.com/openai/baselines; + license = licenses.mit; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/development/python-modules/baselines/fix-dep-names.patch b/pkgs/development/python-modules/baselines/fix-dep-names.patch new file mode 100644 index 000000000000..5b0de29247af --- /dev/null +++ b/pkgs/development/python-modules/baselines/fix-dep-names.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index bf8badc..570be20 100644 +--- a/setup.py ++++ b/setup.py +@@ -10,11 +10,11 @@ setup(name='baselines', + packages=[package for package in find_packages() + if package.startswith('baselines')], + install_requires=[ +- 'gym[mujoco,atari,classic_control,robotics]', ++ 'gym', + 'scipy', + 'tqdm', + 'joblib', +- 'zmq', ++ 'pyzmq', + 'dill', + 'progressbar2', + 'mpi4py', diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 64f649ad28ab..3fc4c3e84ed4 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -25,12 +25,19 @@ buildPythonPackage rec { -k "not test_nightshade_image" ''; - buildInputs = [ cython glibcLocales ]; - LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ + cython + geos # for geos-config + proj + ]; + + buildInputs = [ + geos proj + ]; propagatedBuildInputs = [ # required - six pyshp shapely geos proj numpy + six pyshp shapely numpy # optional gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 05fe33f7e2eb..a40238412c6d 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.16.0"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "1gjs2lqy0ba6zhh13a1dhirk59i7lc4zcbl7h50619hdm5kv3g22"; + sha256 = "1z49z6f9rj9kp1v03s1hs1rg8cj49rh0yk0fc2qi57w7slgy2hkd"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix new file mode 100644 index 000000000000..daeb6ca45267 --- /dev/null +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi +, setuptools_scm +, cheroot, contextlib2, portend, routes, six, zc_lockfile +, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt +}: + +buildPythonPackage rec { + pname = "cherrypy"; + version = "17.4.1"; + + src = fetchPypi { + pname = "CherryPy"; + inherit version; + sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; + }; + + propagatedBuildInputs = [ + cheroot contextlib2 portend routes six zc_lockfile + ]; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ + backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = https://www.cherrypy.org; + description = "A pythonic, object-oriented HTTP framework"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 4a860c5510ca..b39353f649d1 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,54 +1,40 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, cheroot, contextlib2, portend, routes, six -, setuptools_scm, zc_lockfile, more-itertools -, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov -, backports_functools_lru_cache, requests_toolbelt, pytest-services +, setuptools_scm +, cheroot, portend, more-itertools, zc_lockfile, routes +, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services }: -let - srcInfo = if isPy3k then { - version = "18.1.0"; - sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615"; - } else { - version = "17.4.1"; - sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; - }; -in buildPythonPackage rec { - pname = "CherryPy"; - inherit (srcInfo) version; +buildPythonPackage rec { + pname = "cherrypy"; + version = "18.1.1"; + + disabled = !isPy3k; src = fetchPypi { - inherit pname; - inherit (srcInfo) version sha256; + pname = "CherryPy"; + inherit version; + sha256 = "6585c19b5e4faffa3613b5bf02c6a27dcc4c69a30d302aba819639a2af6fa48b"; }; - propagatedBuildInputs = if isPy3k then [ + propagatedBuildInputs = [ # required cheroot portend more-itertools zc_lockfile # optional routes - ] else [ - cheroot contextlib2 portend routes six zc_lockfile ]; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; - checkInputs = if isPy3k then [ + checkInputs = [ objgraph pytest pytestcov pathpy requests_toolbelt pytest-services - ] else [ - backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ]; checkPhase = '' - # 3 out of 5 SignalHandlingTests need network access - # test_2_File_Concurrency also fails upstream: https://github.com/cherrypy/cherrypy/issues/1306 - # ...and skipping it makes 2 other tests fail - LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload \ - and not test_2_File_Concurrency and not test_3_Redirect and not test_4_File_deletion" + pytest ''; meta = with lib; { - homepage = "http://www.cherrypy.org"; + homepage = https://www.cherrypy.org; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 381c114b44e4..45a9920dbe2e 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner }: buildPythonPackage rec { pname = "cssselect2"; @@ -9,11 +9,21 @@ buildPythonPackage rec { sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab"; }; - propagatedBuildInputs = [ tinycss2 ]; + # We're not interested in code quality tests + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-cov" "" \ + --replace "pytest-flake8" "" \ + --replace "pytest-isort" "" + substituteInPlace setup.cfg \ + --replace "--cov=cssselect2" "" \ + --replace "--flake8" "" \ + --replace "--isort" "" + ''; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + propagatedBuildInputs = [ tinycss2 ]; - LC_ALL = "en_US.UTF-8"; + checkInputs = [ pytest pytestrunner ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 5a7e50d43322..bb9958a6fef1 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -1,22 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, isPy27, futures, backports_functools_lru_cache, mock, pytest }: -buildPythonPackage rec { +let + skipTests = lib.optional isPy27 "test_standard_library_deprecates_user_issue_778"; + testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests; +in buildPythonPackage rec { pname = "isort"; - version = "4.3.4"; + version = "4.3.16"; # Note 4.x is the last version that supports Python2 src = fetchPypi { inherit pname version; - sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r"; + sha256 = "1v6lapqhc33rxr9698lqjyb49fis27i42p3ymngrw95py3qf7y08"; }; - propagatedBuildInputs = lib.optional isPy27 futures; + propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ]; checkInputs = [ mock pytest ]; + # isort excludes paths that contain /build/, so test fixtures don't work with TMPDIR=/build/ checkPhase = '' - py.test test_isort.py -k "not test_long_line_comments \ - and not test_import_case_produces_inconsistent_results_issue_472 \ - and not test_no_extra_lines_issue_557" + PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 1adfe13dd13b..fa11ab3fb907 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ twisted ]; + checkInputs = [ twisted ]; + checkPhase = '' trial formless nevow ''; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 899b18eecbed..32c5f38b66d0 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pandas pytest ]; PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_PARQUET = true; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" @@ -24,6 +25,10 @@ buildPythonPackage rec { "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; + preBuild = '' + export PYARROW_PARALLEL=$NIX_BUILD_CORES + ''; + preCheck = '' rm pyarrow/tests/test_jvm.py rm pyarrow/tests/test_hdfs.py @@ -43,13 +48,15 @@ buildPythonPackage rec { # when it is not intended to be imported at all rm pyarrow/tests/deserialize_buffer.py substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" + + # Fails to bind a socket + # "PermissionError: [Errno 1] Operation not permitted" + substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled" ''; ARROW_HOME = _arrow-cpp; PARQUET_HOME = _arrow-cpp; - setupPyBuildFlags = ["--with-parquet" ]; - checkPhase = '' mv pyarrow/tests tests rm -rf pyarrow diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix new file mode 100644 index 000000000000..944278ce3c2c --- /dev/null +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, libGLU_combined +, xorg +}: + +buildPythonPackage rec { + pname = "pybullet"; + version = "2.4.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b6dkrac5zydxqfrf827xhamsimychrn77dsfnz1kf7c1crlwcw9"; + }; + + buildInputs = [ + libGLU_combined + xorg.libX11 + ]; + + patches = [ + # make sure X11 and OpenGL can be found at runtime + ./static-libs.patch + ]; + + meta = with lib; { + description = "Open-source software for robot simulation, integrated with OpenAI Gym"; + homepage = https://pybullet.org/; + license = licenses.zlib; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/pybullet/static-libs.patch b/pkgs/development/python-modules/pybullet/static-libs.patch new file mode 100644 index 000000000000..08a68b814866 --- /dev/null +++ b/pkgs/development/python-modules/pybullet/static-libs.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 98efabdbf..e69e79084 100644 +--- a/setup.py ++++ b/setup.py +@@ -563,6 +563,8 @@ print("-----") + + extensions = [] + ++libraries += [ "X11", "GL" ] # statically link x11 and opengl ++ + pybullet_ext = Extension("pybullet", + sources = sources, + libraries = libraries, diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index b58e1f48bb80..17d60f7507d3 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -2,12 +2,12 @@ , setuptools }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.1.0"; pname = "pyshp"; src = fetchPypi { inherit pname version; - sha256 = "049xj760s75nkvs7rhz710a6x3lvvfajddknmfz1vkf2p3f2l2as"; + sha256 = "1h75a5fisqqj48m6wq7jhdxv6arjg3mvnr5q404pvfbjscj7yp76"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index 598767e6ca9b..fc4c192968f2 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "quandl"; - version = "3.4.5"; + version = "3.4.6"; src = fetchPypi { inherit version; pname = "Quandl"; - sha256 = "1rflyc6q3wa5ghc5v81yw79yg7lkpgd2c22mgbb0cvza724k53ys"; + sha256 = "15b58nj45bdax0aha6kwjz5pxj3bz8bs6ajwxqp9r89j13xxn94g"; }; doCheck = true; diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix new file mode 100644 index 000000000000..8aa45966bd20 --- /dev/null +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, python +, fetchFromGitHub +, fetchpatch +, qt5 +, boost +, assimp +, gym +, bullet-roboschool +, pkgconfig +, which +}: + +buildPythonPackage rec { + pname = "roboschool"; + version = "1.0.39"; + + src = fetchFromGitHub { + owner = "openai"; + repo = "roboschool"; + rev = version; + sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh"; + }; + + propagatedBuildInputs = [ + gym + ]; + + nativeBuildInputs = [ + pkgconfig + qt5.qtbase # needs the `moc` tool + which + ]; + + buildInputs = [ + bullet-roboschool + assimp + qt5.qtbase + boost + ]; + + NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}"; + + patches = [ + # Remove kwarg that was removed in upstream gym + # https://github.com/openai/roboschool/pull/180 + (fetchpatch { + name = "remove-close-kwarg.patch"; + url = "https://github.com/openai/roboschool/pull/180/commits/334f489c8ce7af4887e376139ec676f89da5b16f.patch"; + sha256 = "0bbz8b63m40a9lrwmh7c8d8gj9kpa8a7svdh08qhrddjkykvip6r"; + }) + ]; + + preBuild = '' + # First build the cpp dependencies + cd roboschool/cpp-household + make \ + MOC=moc \ + -j$NIX_BUILD_CORES + cd ../.. + ''; + + # Does a QT sanity check, but QT is not expected to work in isolation + doCheck = false; + + meta = with lib; { + description = "Open-source software for robot simulation, integrated with OpenAI Gym"; + homepage = https://github.com/openai/roboschool; + license = licenses.mit; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index b2c63ea97e3b..c1791db9fbc9 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.2.8"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "115k1z2klgsvyzg4q5ip0iqxyb565pkchhf2fsr846k68gqcgrjn"; + sha256 = "116r78nhw74rh857kv9l614xjr6k89919s6l8b14hlvy8fz8rg51"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 0fde898ca04f..bf57b9846ee5 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.10.4"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "13966vqxww7v2b5hf2kjismdzvqyjvxlcdvpkzpbsrpxy9pvn2n4"; + sha256 = "0kjcyw3xmps3maf4vzn1pypc6i60q8b67xj78v4gbv4yx2cp2fzr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index d72ad7094d16..5d8d7d562259 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -424,7 +424,6 @@ let showtext = [ pkgs.pkgconfig ]; spate = [ pkgs.pkgconfig ]; stringi = [ pkgs.pkgconfig ]; - sys = [ pkgs.libapparmor ]; sysfonts = [ pkgs.pkgconfig ]; tesseract = [ pkgs.pkgconfig ]; Cairo = [ pkgs.pkgconfig ]; @@ -443,6 +442,11 @@ let Matrix = [ pkgs.libiconv ]; mgcv = [ pkgs.libiconv ]; igraph = [ pkgs.libiconv ]; + ape = [ pkgs.libiconv ]; + expm = [ pkgs.libiconv ]; + mnormt = [ pkgs.libiconv ]; + phangorn = [ pkgs.libiconv ]; + quadprog = [ pkgs.libiconv ]; }; packagesRequireingX = [ diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 97140d10ca22..c08106eea2ff 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.11.0"; + version = "6.12.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0mg32bnl6j4p15akdhfc0wgilqvyphcgjimlaqq3jz51dmlr9scb"; + sha256 = "1fayb62i6p21q1d6y7ixljf37r7n7vwjwa69q5z6wr4zspaj79f9"; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 2d0bf244370f..ce15de8678d6 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.0.4"; - sha256 = "06lv3pmdz5l23rx3kqsi1k712bdl36i942hgbjh209s94mpb7f72"; + version = "3.0.5"; + sha256 = "0gn7fgxvx94bjm4cim29cdz91ar1rmfxk2f39wwgljvdvhinyryz"; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index f44e76c0b8e5..aa262fd54952 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.8.0"; + version = "11.9.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1g9r0ny25r4iv7m5jf8fbfak4rhlcz7mm3x7mwwpmiyhnjbwz08s"; + sha256 = "1la4pkf8xp5h75dlvb6w7ijczrnci3bmbl77h3y4jicz555jjir3"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "07xg46dl2d0scb7hqn5gcg3g4icr28z03n3q2rgqckn4782ha2s1"; + sha256 = "1axn34aqa17yk2c2vy73fb8ab3nc3021dzj0vk95qificlmj3par"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0jvhlcxlxpam2hr9gh0zcjgl04is3rm0lkm94v4m6wk9yxknx3wp"; + sha256 = "1b4r83glx0n3l060k33s397dw5dpajlxb880yzwsb11hvc6cs39h"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix index 23620a12530b..33bcca11bab0 100644 --- a/pkgs/development/tools/electron/3.x.nix +++ b/pkgs/development/tools/electron/3.x.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }: let - version = "3.1.4"; + version = "3.1.7"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "1llwpd10cz5nfwqimib7xkc3xxj3z4y19l97wxma3bciizmmgq3k"; + sha256 = "0hqsh2b0jlxh1izjg68zbx3kzp7jrfkscj7lmf00rydn49wz2078"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "0mb7q82r9ndvz181lnkplmvwkijzc2msrpfwpghrhsc4j3zbh0bf"; + sha256 = "1fcxgha4y9cz1yapns5ll5xawdvbajfagj7y4ar1v82wsa6a6zyz"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "0cf4jqq3n66dm11cy96q3nj1jxajv49yamhvn5g8a85nq4s5cx6f"; + sha256 = "13qczwaykjx4vrzn8w77p6mzwrrb8yfcqza4yc56n6if8whsyrg2"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0lxp7fpccwk6qdw79dgjlm9hywfwl3aj932qg2aff18vs077skrg"; + sha256 = "1l17invs5xi7sv4df77mrj1l6iiibx4vs85l3j42rgl7789m3b0x"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -59,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1indim895a58ds09z91c8jfqmdp7ba85rx6bhq6dabgnvkykwmz0"; + sha256 = "08d4iygzayvmxarjxx82742nm7day37n7fjw4kivlv6r14w3yjdl"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 8c6dce0114e8..30241f8e7f1b 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }: let - version = "4.0.6"; + version = "4.1.1"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -16,23 +16,22 @@ let linux = { inherit name version meta; - src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "1ffv4wlj827wyq7y2hfaz2d0fapqr2r9likb90ayzh91vmkc8c2y"; + sha256 = "1b2jgflhvgd3fpq6qshdjcn9ppas9b1qyg76n0gsv7b0fn7gk1p4"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "01b063jabx7fglh63dk7nh21xxadwxrrvavcwznpw6jhid48g2yz"; + sha256 = "1qgr30fzpp90r7nm06bh79j60dbfmhzr3bkxd5wvizw4k3qyy9ml"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "18dsb3pyj9gfn8xyzhblx7nidgp39pfqs1ml07nxfkf1bjdh4c4w"; + sha256 = "02yywf2clcan2lb6bvpvfzf7v080cmsqv0g9rwfsy7vazrnypc43"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0dx6bzj0laygqkyl8ngbh0yfzyc5mxr3fxlqb867cza9sz5hh95l"; + sha256 = "1qb2vkvf3vn246vsia4danxn84z70qi0y9smnfc6dgrf5xlbwabm"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -60,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0r1yn5lz808xdwp29g4kmlm5v0i1fsdxd4ph537gyz3sfn30dgq9"; + sha256 = "1aa0dxc9zsycb64wdfbk3qbcz7dciy4wdd7s2q2p7y8clxf2s5sv"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 8b5bea7ac6ce..27f0063e24be 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, intltool, pkgconfig, glib }: stdenv.mkDerivation { - name = "gnu-mdk-1.2.9"; + name = "gnu-mdk-1.2.10"; src = fetchurl { - url = https://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; - sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; + url = https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz; + sha256 = "1rwcq2b5vvv7318j92nxc5dayj27dpfhzc4rjiv4ccvsc0x35x5h"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib ]; diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index be7a488e96e8..80aeb17bef31 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, opaline }: +{ stdenv, fetchurl, ocaml, findlib, opaline }: stdenv.mkDerivation rec { name = "dune-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ]; + buildInputs = [ ocaml findlib ]; buildFlags = "release"; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A composable build system"; maintainers = [ stdenv.lib.maintainers.vbgl ]; license = stdenv.lib.licenses.mit; - inherit (ocamlPackages.ocaml.meta) platforms; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/yarn2nix/bin/yarn2nix.js b/pkgs/development/tools/yarn2nix/bin/yarn2nix.js deleted file mode 100755 index 3eadea559032..000000000000 --- a/pkgs/development/tools/yarn2nix/bin/yarn2nix.js +++ /dev/null @@ -1,144 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const crypto = require('crypto'); -const fs = require("fs"); -const https = require("https"); -const path = require("path"); -const util = require("util"); - -const lockfile = require("@yarnpkg/lockfile") -const docopt = require("docopt").docopt; - -//////////////////////////////////////////////////////////////////////////////// - -const USAGE = ` -Usage: yarn2nix [options] - -Options: - -h --help Shows this help. - --no-nix Hide the nix output - --no-patch Don't patch the lockfile if hashes are missing - --lockfile=FILE Specify path to the lockfile [default: ./yarn.lock]. -` - -const HEAD = ` -{fetchurl, linkFarm}: rec { - offline_cache = linkFarm "offline" packages; - packages = [ -`.trim(); - -//////////////////////////////////////////////////////////////////////////////// - -function generateNix(lockedDependencies) { - let found = {}; - - console.log(HEAD) - - for (var depRange in lockedDependencies) { - let dep = lockedDependencies[depRange]; - - let depRangeParts = depRange.split('@'); - let [url, sha1] = dep["resolved"].split("#"); - let file_name = path.basename(url) - - if (found.hasOwnProperty(file_name)) { - continue; - } else { - found[file_name] = null; - } - - - console.log(` - { - name = "${file_name}"; - path = fetchurl { - name = "${file_name}"; - url = "${url}"; - sha1 = "${sha1}"; - }; - }`) - } - - console.log(" ];") - console.log("}") -} - - -function getSha1(url) { - return new Promise((resolve, reject) => { - https.get(url, (res) => { - const { statusCode } = res; - const hash = crypto.createHash('sha1'); - if (statusCode !== 200) { - const err = new Error('Request Failed.\n' + - `Status Code: ${statusCode}`); - // consume response data to free up memory - res.resume(); - reject(err); - } - - res.on('data', (chunk) => { hash.update(chunk); }); - res.on('end', () => { resolve(hash.digest('hex')) }); - res.on('error', reject); - }); - }); -}; - -function updateResolvedSha1(pkg) { - // local dependency - if (!pkg.resolved) { return Promise.resolve(); } - let [url, sha1] = pkg.resolved.split("#", 2) - if (!sha1) { - return new Promise((resolve, reject) => { - getSha1(url).then(sha1 => { - pkg.resolved = `${url}#${sha1}`; - resolve(); - }).catch(reject); - }); - } else { - // nothing to do - return Promise.resolve(); - }; -} - -function values(obj) { - var entries = []; - for (let key in obj) { - entries.push(obj[key]); - } - return entries; -} - -//////////////////////////////////////////////////////////////////////////////// -// Main -//////////////////////////////////////////////////////////////////////////////// - -var options = docopt(USAGE); - -let data = fs.readFileSync(options['--lockfile'], 'utf8') -let json = lockfile.parse(data) -if (json.type != "success") { - throw new Error("yarn.lock parse error") -} - -// Check fore missing hashes in the yarn.lock and patch if necessary -var pkgs = values(json.object); -Promise.all(pkgs.map(updateResolvedSha1)).then(() => { - let newData = lockfile.stringify(json.object); - - if (newData != data) { - console.error("found changes in the lockfile", options["--lockfile"]); - - if (options["--no-patch"]) { - console.error("...aborting"); - process.exit(1); - } - - fs.writeFileSync(options['--lockfile'], newData); - } - - if (!options['--no-nix']) { - generateNix(json.object); - } -}) diff --git a/pkgs/development/tools/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix/default.nix deleted file mode 100644 index e86c0aac2c99..000000000000 --- a/pkgs/development/tools/yarn2nix/default.nix +++ /dev/null @@ -1,199 +0,0 @@ -{ stdenv, lib, fetchurl, linkFarm, runCommand, nodejs, yarn }: - -let - unlessNull = item: alt: - if item == null then alt else item; - - yarn2nix = mkYarnPackage { - src = ./.; - yarnNix = ./yarn.nix; - - passthru = { - inherit - defaultYarnFlags - linkNodeModulesHook - mkYarnModules - mkYarnNix - mkYarnPackage - # Export yarn again to make it easier to find out which yarn was used. - yarn - ; - }; - - meta = with lib; { - description = "generate nix expressions from a yarn.lock file"; - homepage = "https://github.com/moretea/yarn2nix"; - license = licenses.gpl3; - maintainers = with maintainers; [ manveru zimbatm ]; - }; - }; - - # Generates the yarn.nix from the yarn.lock file - mkYarnNix = yarnLock: - runCommand "yarn.nix" {} - "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out"; - - # Loads the generated offline cache. This will be used by yarn as - # the package source. - importOfflineCache = yarnNix: - let - pkg = import yarnNix { inherit fetchurl linkFarm; }; - in - pkg.offline_cache; - - defaultYarnFlags = [ - "--offline" - "--frozen-lockfile" - "--ignore-engines" - "--ignore-scripts" - ]; - - mkYarnModules = { - name, - packageJSON, - yarnLock, - yarnNix ? mkYarnNix yarnLock, - yarnFlags ? defaultYarnFlags, - pkgConfig ? {}, - preBuild ? "", - }: - let - offlineCache = importOfflineCache yarnNix; - extraBuildInputs = (lib.flatten (builtins.map (key: - pkgConfig.${key} . buildInputs or [] - ) (builtins.attrNames pkgConfig))); - postInstall = (builtins.map (key: - if (pkgConfig.${key} ? postInstall) then - '' - for f in $(find -L -path '*/node_modules/${key}' -type d); do - (cd "$f" && (${pkgConfig.${key}.postInstall})) - done - '' - else - "" - ) (builtins.attrNames pkgConfig)); - in - stdenv.mkDerivation { - inherit name preBuild; - phases = ["configurePhase" "buildPhase"]; - buildInputs = [ yarn nodejs ] ++ extraBuildInputs; - - configurePhase = '' - # Yarn writes cache directories etc to $HOME. - export HOME=$PWD/yarn_home - ''; - - buildPhase = '' - runHook preBuild - - cp ${packageJSON} ./package.json - cp ${yarnLock} ./yarn.lock - chmod +w ./yarn.lock - - yarn config --offline set yarn-offline-mirror ${offlineCache} - - # Do not look up in the registry, but in the offline cache. - # TODO: Ask upstream to fix this mess. - sed -i -E 's|^(\s*resolved\s*")https?://.*/|\1|' yarn.lock - yarn install ${lib.escapeShellArgs yarnFlags} - - ${lib.concatStringsSep "\n" postInstall} - - mkdir $out - mv node_modules $out/ - patchShebangs $out - ''; - }; - - # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into - # the shell-hook environment. - linkNodeModulesHook = '' - if [[ -d node_modules || -L node_modules ]]; then - echo "./node_modules is present. Replacing." - rm -rf node_modules - fi - - ln -s "$node_modules" node_modules - ''; - - mkYarnPackage = { - name ? null, - src, - packageJSON ? src + "/package.json", - yarnLock ? src + "/yarn.lock", - yarnNix ? mkYarnNix yarnLock, - yarnFlags ? defaultYarnFlags, - yarnPreBuild ? "", - pkgConfig ? {}, - extraBuildInputs ? [], - publishBinsFor ? null, - ... - }@attrs: - let - package = lib.importJSON packageJSON; - pname = package.name; - version = package.version; - deps = mkYarnModules { - name = "${pname}-modules-${version}"; - preBuild = yarnPreBuild; - inherit packageJSON yarnLock yarnNix yarnFlags pkgConfig; - }; - publishBinsFor_ = unlessNull publishBinsFor [pname]; - in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig"] // { - inherit src; - - name = unlessNull name "${pname}-${version}"; - - buildInputs = [ yarn nodejs ] ++ extraBuildInputs; - - node_modules = deps + "/node_modules"; - - configurePhase = attrs.configurePhase or '' - runHook preConfigure - - if [ -d npm-packages-offline-cache ]; then - echo "npm-pacakges-offline-cache dir present. Removing." - rm -rf npm-packages-offline-cache - fi - - if [[ -d node_modules || -L node_modules ]]; then - echo "./node_modules is present. Removing." - rm -rf node_modules - fi - - mkdir -p node_modules - ln -s $node_modules/* node_modules/ - ln -s $node_modules/.bin node_modules/ - - if [ -d node_modules/${pname} ]; then - echo "Error! There is already an ${pname} package in the top level node_modules dir!" - exit 1 - fi - - runHook postConfigure - ''; - - # Replace this phase on frontend packages where only the generated - # files are an interesting output. - installPhase = attrs.installPhase or '' - runHook preInstall - - mkdir -p $out - cp -r node_modules $out/node_modules - cp -r . $out/node_modules/${pname} - rm -rf $out/node_modules/${pname}/node_modules - - mkdir $out/bin - node ${./fixup_bin.js} $out ${lib.concatStringsSep " " publishBinsFor_} - - runHook postInstall - ''; - - passthru = { - inherit package deps; - } // (attrs.passthru or {}); - - # TODO: populate meta automatically - }); -in - yarn2nix diff --git a/pkgs/development/tools/yarn2nix/fixup_bin.js b/pkgs/development/tools/yarn2nix/fixup_bin.js deleted file mode 100644 index dab1759c2046..000000000000 --- a/pkgs/development/tools/yarn2nix/fixup_bin.js +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -/* Usage: - * node fixup_bin.js <output_dir> [<bin_pkg_1>, <bin_pkg_2> ... ] - */ - -const fs = require("fs"); -const path = require("path"); - -const output = process.argv[2]; -const packages_to_publish_bin = process.argv.slice(3); -const derivation_bin_path = output + "/bin"; - -function processPackage(name) { - console.log("Processing ", name); - const package_path = output + "/node_modules/" + name; - const package_json_path = package_path + "/package.json"; - const package_json = JSON.parse(fs.readFileSync(package_json_path)); - - if (!package_json.bin) { - console.log("No binaries provided"); - return; - } - - // There are two alternative syntaxes for `bin` - // a) just a plain string, in which case the name of the package is the name of the binary. - // b) an object, where key is the name of the eventual binary, and the value the path to that binary. - if (typeof package_json.bin == "string") { - let bin_name = package_json.bin; - package_json.bin = { }; - package_json.bin[package_json.name] = bin_name; - } - - for (let binName in package_json.bin) { - const bin_path = package_json.bin[binName]; - const full_bin_path = path.normalize(package_path + "/" + bin_path); - fs.symlinkSync(full_bin_path, derivation_bin_path + "/"+ binName); - console.log("Linked", binName); - } -} - -packages_to_publish_bin.forEach((pkg) => { - processPackage(pkg); -}); diff --git a/pkgs/development/tools/yarn2nix/package.json b/pkgs/development/tools/yarn2nix/package.json deleted file mode 100644 index 130eee67c560..000000000000 --- a/pkgs/development/tools/yarn2nix/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "yarn2nix", - "version": "1.0.0", - "description": "Convert packages.json and yarn.lock into a Nix expression that downloads all the dependencies", - "main": "index.js", - "repository": ".", - "author": "Maarten Hoogendoorn <maarten@moretea.nl>", - "license": "MIT", - "scripts": { - "yarn2nix": "bin/yarn2nix.js" - }, - "bin": { - "yarn2nix": "bin/yarn2nix.js" - }, - "dependencies": { - "@yarnpkg/lockfile": "^1.0.0", - "docopt": "^0.6.2" - } -} diff --git a/pkgs/development/tools/yarn2nix/yarn.lock b/pkgs/development/tools/yarn2nix/yarn.lock deleted file mode 100644 index 976d2c530e1e..000000000000 --- a/pkgs/development/tools/yarn2nix/yarn.lock +++ /dev/null @@ -1,11 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@yarnpkg/lockfile@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz#33d1dbb659a23b81f87f048762b35a446172add3" - -docopt@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11" \ No newline at end of file diff --git a/pkgs/development/tools/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix/yarn.nix deleted file mode 100644 index a9e42e7d986c..000000000000 --- a/pkgs/development/tools/yarn2nix/yarn.nix +++ /dev/null @@ -1,23 +0,0 @@ -{fetchurl, linkFarm}: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - - { - name = "lockfile-1.0.0.tgz"; - path = fetchurl { - name = "lockfile-1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz"; - sha1 = "33d1dbb659a23b81f87f048762b35a446172add3"; - }; - } - - { - name = "docopt-0.6.2.tgz"; - path = fetchurl { - name = "docopt-0.6.2.tgz"; - url = "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz"; - sha1 = "b28e9e2220da5ec49f7ea5bb24a47787405eeb11"; - }; - } - ]; -} diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index a3177b07f08b..32201c48ee98 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdsk-${version}"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; - sha256 = "1r0y07qd3zixi53vql5yqakvv77qm86s6qjwypk9ckggrp5r3w60"; + sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g"; }; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 59f0252259cc..66e17fd3a7a3 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { name = "visualboyadvance-m-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "1dppfvy24rgg3h84gv33l1y7zznkv3zxn2hf98w85pca6k1y2afz"; + sha256 = "03cs7wn01flx925sxhpz1j5sxa6s7wfxq71955kasn7a3xr1kxwn"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch b/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch new file mode 100644 index 000000000000..7ce1b4f527ec --- /dev/null +++ b/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch @@ -0,0 +1,13 @@ +diff --git a/ninfod/meson.build b/ninfod/meson.build +index ea7ec1b..fada05b 100644 +--- a/ninfod/meson.build ++++ b/ninfod/meson.build +@@ -10,7 +10,7 @@ ninfod_sources = files(''' + ninfod_name.c + '''.split()) + executable('ninfod', [ninfod_sources, git_version_h], +- dependencies : [cap_dep, crypto_dep, rt_dep, threads], ++ dependencies : [cap_dep, dependency('openssl'), rt_dep, threads], + link_with : [libcommon], + include_directories : inc, + install: true, diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 2248f0329c60..223d5c4fe0fb 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, fetchpatch -, libxslt, docbook_xsl, docbook_xml_dtd_44 -, libcap, nettle, libidn2, openssl +, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns +, libcap, nettle, libidn2, openssl, systemd }: with stdenv.lib; let - time = "20180629"; + time = "20190324"; # ninfod probably could build on cross, but the Makefile doesn't pass --host # etc to the sub configure... withNinfod = stdenv.hostPlatform == stdenv.buildPlatform; @@ -21,63 +21,37 @@ in stdenv.mkDerivation { owner = "iputils"; repo = "iputils"; rev = "s${time}"; - sha256 = "19rpl48pjgmyqlm4h7sml5gy7yg4cxciadxcs24q1zj40c05jls0"; + sha256 = "0b755gv3370c0rrphx14mrsqjb396zqnsm9lsws842a4k4zrqmvi"; }; - patches = [ - (fetchpatch { - name = "dont-hardcode-the-location-of-xsltproc.patch"; - url = "https://github.com/iputils/iputils/commit/d0ff83e87ea9064d9215a18e93076b85f0f9e828.patch"; - sha256 = "05wrwf0bfmax69bsgzh3b40n7rvyzw097j8z5ix0xsg0kciygjvx"; - }) - (fetchpatch { - name = "add-missing-idn-declarations.patch"; - url = "https://github.com/iputils/iputils/commit/5007d7067918fb3d950d34c01d059e5222db679a.patch"; - sha256 = "0dhgxdhjcbb2q6snm3mjp38l066knykmrx4k8rn167cizn7akpdx"; - }) - (fetchpatch { - name = "fix-ping-idn.patch"; - url = "https://github.com/iputils/iputils/commit/25899e849aa3abc1ad29ebf0b830262a859eaed5.patch"; - sha256 = "1bqjcdjjnc2j6indcli7s7gbbhkcaligvh94asixfrmjzkbn533n"; - }) - ]; - - prePatch = '' - substituteInPlace doc/custom-man.xsl \ - --replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" - for xmlFile in doc/*.xml; do - substituteInPlace $xmlFile \ - --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" - done - ''; - - # Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111 - makeFlags = optional stdenv.hostPlatform.isMusl "USE_IDN=no"; - - nativeBuildInputs = [ libxslt.bin ]; - buildInputs = [ libcap nettle ] + # ninfod cannot be build with nettle yet: + patches = + [ ./build-ninfod-with-openssl.patch + (fetchpatch { # tracepath: fix musl build, again + url = "https://github.com/iputils/iputils/commit/c9aca1b53324bcd1b5a2de5c645813f80eccd016.patch"; + sha256 = "0faqgkqbi57cyx1zgzzy6xgd24xr0iawix7mjs47j92ra9gw90cz"; + }) + (fetchpatch { # doc: Use namespace correctly + url = "https://github.com/iputils/iputils/commit/c503834519d21973323980850431101f90e663ef.patch"; + sha256 = "1yp6b6403ddccbhfzsb36cscxd36d4xb8syc1g02a18xkswiwf09"; + }) + ]; + + mesonFlags = + [ "-DUSE_CRYPTO=nettle" + "-DBUILD_RARPD=true" + "-DBUILD_TRACEROUTE6=true" + "-Dsystemdunitdir=etc/systemd/system" + ] + ++ optional (!withNinfod) "-DBUILD_NINFOD=false" + # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): + ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; + + nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns libcap ]; + buildInputs = [ libcap nettle systemd ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2 ++ optional withNinfod openssl; # TODO: Build with nettle - buildFlags = "man all" + optionalString withNinfod " ninfod"; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man8 - - for tool in arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6; do - cp $tool $out/bin/ - cp doc/$tool.8 $out/share/man/man8/ - done - - # TODO: Requires kernel module pg3 - cp ipg $out/bin/ - cp doc/pg3.8 $out/share/man/man8/ - '' + optionalString withNinfod '' - cp ninfod/ninfod $out/bin/ - cp doc/ninfod.8 $out/share/man/man8/ - ''; - meta = { homepage = https://github.com/iputils/iputils; description = "A set of small useful utilities for Linux networking"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d913b974e559..b5669538d83d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.108"; + version = "4.14.109"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0m6liqxbyfsy2xx01blsw383zaqpbjc4h7wn9y9i7k96gxl3rqxn"; + sha256 = "1q4fv07kl07yyi8173fdx7m98pdn3mz8z3a6y52qfmkryxjz2r1p"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index a5cd732727d0..fd4989164a00 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.31"; + version = "4.19.32"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02r822zhs1xcjy6jpf9fv0h4br47drd3xssxapr2b45y8anr1aks"; + sha256 = "1ng730lz7riiq7ja4k3x17njs9779jy49b15kbfy7bi48cax29m3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 1c9440494552..132baaae3446 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.165"; + version = "4.9.166"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0g045xvmal9px4acadjgbwih1bvphj9whrgk2y204dsbymm93827"; + sha256 = "1sxs7525432cbnzrf5i4dli213bwwk3w1qfaamfx6ddwgh47ry5q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index 6b9d7bde1145..3912b43ae42a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.4"; + version = "5.0.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0s7appc167gxamy08ky2n9y49avgqmscmq555m2jfvj9bjh3m1cg"; + sha256 = "1l4l5kqmakqhkc59nha363866d5gkbc94mhnpyh802may9xq1gaz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index edba8b090df8..5dab4b34f466 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libratbag-${version}"; - version = "0.9.904"; + version = "0.9.905"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "0d2gw4bviy6zf1q9a18chlsbqylhppbby336fznh6nkpdl3jckfd"; + sha256 = "0bh1nf9sv7wka0vh5bz9krf2cfxz0rr64hrpdm7imsb6cn39k01y"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index c0e8e1292330..394dbf63f170 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "161"; + version = "162"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1bqz53xgvwab3r487ihri3nvk7nsgjykdv8m993983vxsi2bgjmz"; + sha256 = "1zxj545wslp92npll0411grc49l53cgp8dqqn3zb4vcxrvfc4vh9"; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9a41fdb880a9..c783f816e7ea 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.90.1"; + version = "0.90.2"; components = { "abode" = ps: with ps; [ ]; "abode.alarm_control_panel" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1de084c84ea5..9e5fb6bfb008 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -97,7 +97,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.90.1"; + hassVersion = "0.90.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -112,7 +112,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1w8mbrzr760867a342jyihxbkx3i9pdsdxdv2ck15fy4axd3wbsh"; + sha256 = "0byikidvrvx8nxgddhpqz609rxb91j1kcppziv4ibb57g6lj7iwx"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 7528c4c8c035..802c6698df64 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.5"; + name = "dovecot-2.3.5.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "1zxa9banams9nmk99sf1rqahr11cdqxhwi7hyz3ddxqidpn15qdz"; + sha256 = "0gy3qzwbp6zsyn44pcfq8iiv9iy9q7z6py30h60alb1vkr3rv3yp"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index f94d185910f9..9a4f96c46ba8 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.14.1.5488"; - vsnHash = "cc260c476"; - sha256 = "8ee806f35ccedcecd0cab028bbe1f7e2ac7de24292b715978d3165c4712f5c40"; + version = "1.15.2.793"; + vsnHash = "782228f99"; + sha256 = "0yxxyczcgbk79bhnbbqpsj6vg1hi2pbf88r29dmskr664a5s0sk7"; }; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = plexpkg.sha256; src = fetchurl { - url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; + url = "https://downloads.plex.tv/plex-media-server-new/${version}-${vsnHash}/redhat/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; inherit sha256; }; @@ -45,15 +45,12 @@ in stdenv.mkDerivation rec { "Plex Transcoder" \ "Plex Tuner Service" ; do patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" - patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" + patchelf --set-rpath "$out/usr/lib/plexmediaserver/lib" "$out/usr/lib/plexmediaserver/$bin" done find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \ -print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \; - # executables need libstdc++.so.6 - ln -s "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}/libstdc++.so.6" "$out/usr/lib/plexmediaserver/libstdc++.so.6" - # Our next problem is the "Resources" directory in /usr/lib/plexmediaserver. # This is ostensibly a skeleton directory, which contains files that Plex # copies into its folder in /var. Unfortunately, there are some SQLite diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 75aced300ed3..3dcb6605a61e 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -101,13 +101,13 @@ let }; in stdenv.mkDerivation rec { name = "rippled-${version}"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ripple"; repo = "rippled"; rev = version; - sha256 = "1zx8qs32v5ibkwm9nm6m0qh0gcr0vcigr2wbxpd40pqqk73cqb3q"; + sha256 = "1lm0zzz0hi2sh2f4iqq3scapzdjbxcjgr700fgham9wqgaj2ash5"; }; hardeningDisable = ["format"]; diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index fba85e0f5f00..262d3dd389eb 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, qttools, alsaLib }: stdenv.mkDerivation rec { - version = "2019-01-12"; + version = "1.5"; pname = "OPL3BankEditor"; src = fetchFromGitHub { owner = "Wohlstand"; repo = pname; - rev = "a254c923df5b385e140de6ae42cf4908af8728d3"; - sha256 = "181zkr2zkv9xy6zijbzqbqf4z6phg98ramzh9hmwi5zcbw68wkqw"; + rev = "v${version}"; + sha256 = "16va5xfbyn2m63722ab5yph0l7kmghkbk6dkia93041mfhdyg9rc"; fetchSubmodules = true; }; diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index e2b03e6f3822..8e55d24fc985 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.4"; + name = "ncompress-4.2.4.5"; builder = ./builder.sh; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "0yjiwv1hwb253x3m6r1dq2k7m5c9nz0ib2j7fnm3hark7y6s42xh"; + sha256 = "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm"; }; meta = { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index aab7563cb020..6d6c6d5d5769 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { name = "ibus-typing-booster-${version}"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "124a6yd7g6ws8s6p5146rhvyjswk001fqncc32jsfmjjgmgisqn2"; + sha256 = "1d32p9k9vp64rpmj2cs3552ak9jn54vyi2hqdpzag33v16cydsl4"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 655cbf3bc656..8c310310d43f 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, dpkg }: stdenv.mkDerivation rec { - name = "bdf2psf-${version}"; - version = "1.190"; + pname = "bdf2psf"; + version = "1.191"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1dm1lwlnr3ikbl2nkmvj60n9qj5qa0g4dyszrv3qx88m2f6zq99w"; + sha256 = "0bqhn9rwrjipj7wd6c8i7rq39fc5jj5nc3mir931mfakknakkimk"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index aca449a4037b..a34dc0cdafe1 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1hv9plgbwffdv94d8h6qlmazbwi56967wzqvfzr47iigbvx81vwj"; + sha256 = "1qi29qy4kwqfbca5ghdmjidpwn2wghr19jwzrrk0xvlq1xb13jfa"; }; cargoSha256 = "0cq78im3hg7wns260gwvajikj80l7kjbg3zycy3nvdx34llgv0n5"; diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 2e91c5c3b63a..dc0280846854 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { @@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0vkb3jmyb3zg3xiig5vlxhh74m27rvqbkgrwdqzprifn9vcj17ir"; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + meta = with stdenv.lib; { description = "Command-line client for WebSockets (like netcat/socat)"; homepage = https://github.com/vi/websocat; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index b165142d85a4..45ff2947c685 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/curl-config "$dev" + '' + stdenv.lib.optionalString scpSupport '' sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la '' + stdenv.lib.optionalString gnutlsSupport '' ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 75e2b45110fe..f9df781715ac 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, which }: stdenv.mkDerivation rec { - name = "nbd-3.18"; + name = "nbd-3.19"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq"; + sha256 = "1446rdg490fxd8mg5gvrf4nddbw1w7lf2daxy9cpc19yy4968iml"; }; buildInputs = [ glib ] diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 4dbc455103c5..43018e401f1e 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "ndisc6-1.0.3"; + name = "ndisc6-1.0.4"; src = fetchurl { url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; - sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g"; + sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 6d4c77d51987..3e9d1f9f5f7e 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -59,7 +59,7 @@ pythonPackages.buildPythonApplication rec { service-identity pyyaml magic-wormhole treq ]; - checkInputs = with pythonPackages; [ hypothesis ]; + checkInputs = with pythonPackages; [ hypothesis twisted ]; # Install the documentation. postInstall = '' diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 9fb5e45a8edb..fbb370027d7e 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror , libiconv, npth, gettext, texinfo, pcsclite, sqlite +, buildPackages # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. @@ -15,13 +16,14 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.14"; + version = "2.2.15"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v"; + sha256 = "0m6lyphbb20i84isdxzfhcbzyc682hdrdv4aqkzmhrdksycf536b"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext texinfo @@ -36,7 +38,13 @@ stdenv.mkDerivation rec { ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; - configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; + configureFlags = [ + "--with-libgpg-error-prefix=${libgpgerror.dev}" + "--with-libgcrypt-prefix=${libgcrypt.dev}" + "--with-libassuan-prefix=${libassuan.dev}" + "--with-ksba-prefix=${libksba.dev}" + "--with-npth-prefix=${npth}" + ] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; postInstall = '' mkdir -p $out/lib/systemd/user diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index c72f75e24e27..ceff23911c7e 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.7.1"; + version = "2.7.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "1nv2dqd2k2n8mcdr6xl5g713xxkgvja6487by1wn4k0b416jij9i"; + sha256 = "0dbbfk47dpxx7zpb98n4w3ls3z5di57qnr2nsgxjvp49gk9j3f6k"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 25a9660aed90..4ec34a68122c 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "logcheck-${version}"; - version = "1.3.19"; + version = "1.3.20"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "1a9ccy92lg1lnx86di6i1wpdv4ccf5w7gials2iyq5915c4lqa86"; + sha256 = "1rmkvxhcwr9gb6z4dlgr6rrx5l70hshlxdggs6qx0w1ljcmx1dlz"; }; prePatch = '' diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix new file mode 100644 index 000000000000..590e5704b88d --- /dev/null +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "rootlesskit-${version}"; + version = "0.3.0-alpha.2"; + goPackagePath = "github.com/rootless-containers/rootlesskit"; + + src = fetchFromGitHub { + owner = "rootless-containers"; + repo = "rootlesskit"; + rev = "v${version}"; + sha256 = "11y4hcrpayyyi9j3b80ilccxs5bbwnqfpi5nsjgmjb9v01z35fw6"; + }; + + meta = with lib; { + homepage = https://github.com/rootless-containers/rootlesskit; + description = ''Kind of Linux-native "fake root" utility, made for mainly running Docker and Kubernetes as an unprivileged user''; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33464ab30a45..28665941d61a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -256,6 +256,7 @@ in curl = buildPackages.curl.override rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; + zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { @@ -265,7 +266,7 @@ in }; libssh2 = buildPackages.libssh2.override { fetchurl = stdenv.fetchurlBoot; - inherit openssl; + inherit zlib openssl; }; # On darwin, libkrb5 needs bootstrap_cmds which would require # converting many packages to fetchurl_boot to avoid evaluation cycles. @@ -277,7 +278,7 @@ in }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit pkgconfig openssl; + inherit zlib pkgconfig openssl; c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; @@ -1351,7 +1352,7 @@ in dtrx = callPackage ../tools/compression/dtrx { }; - dune = callPackage ../development/tools/ocaml/dune { }; + inherit (ocamlPackages) dune; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -1946,7 +1947,7 @@ in cksfv = callPackage ../tools/networking/cksfv { }; - clementine = callPackage ../applications/audio/clementine { + clementine = libsForQt5.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; }; @@ -6551,9 +6552,9 @@ in yaft = callPackage ../applications/misc/yaft { }; yarn = callPackage ../development/tools/yarn { }; - - yarn2nix = callPackage ../development/tools/yarn2nix { }; - inherit (yarn2nix) mkYarnPackage; + + yarn2nix = throw "Use upstream https://github.com/moretea/yarn2nix"; + mkYarnPackage = yarn2nix; yasr = callPackage ../applications/audio/yasr { }; @@ -15861,6 +15862,8 @@ in man-pages = callPackage ../data/documentation/man-pages { }; + manrope = callPackage ../data/fonts/manrope { }; + matcha = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -16486,6 +16489,8 @@ in notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; + brig = callPackage ../applications/networking/brig { }; + bristol = callPackage ../applications/audio/bristol { }; bs1770gain = callPackage ../applications/audio/bs1770gain { }; @@ -19316,6 +19321,8 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; + rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { @@ -21056,7 +21063,9 @@ in pacvim = callPackage ../games/pacvim { }; - performous = callPackage ../games/performous { }; + performous = callPackage ../games/performous { + boost = boost166; + }; pingus = callPackage ../games/pingus {}; @@ -21649,6 +21658,8 @@ in igv = callPackage ../applications/science/biology/igv { }; inormalize = callPackage ../applications/science/biology/inormalize { }; + + itsx = callPackage ../applications/science/biology/itsx { }; iv = callPackage ../applications/science/biology/iv { neuron-version = neuron.version; @@ -22583,7 +22594,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - websocat = callPackage ../tools/misc/websocat { }; + websocat = callPackage ../tools/misc/websocat { + inherit (darwin.apple_sdk.frameworks) Security; + }; epkowa = callPackage ../misc/drivers/epkowa { }; @@ -23330,6 +23343,10 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; + bullet-roboschool = callPackage ../development/libraries/bullet/roboschool-fork.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + }; + inherit (callPackages ../development/libraries/spdlog { }) spdlog_0 spdlog_1; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cf0e942bbed7..5907b0099dd3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -223,6 +223,8 @@ let dtoa = callPackage ../development/ocaml-modules/dtoa { }; + dune = callPackage ../development/tools/ocaml/dune { }; + earley = callPackage ../development/ocaml-modules/earley { }; earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { }; @@ -355,9 +357,7 @@ let lablgl = callPackage ../development/ocaml-modules/lablgl { }; - lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { - cairo2 = cairo2.override { enableGtkSupport = false; }; - }; + lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3463a6a5ed1..285f0e87fa1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -274,6 +274,8 @@ in { bap = pkgs.ocamlPackages.bap; }; + baselines = callPackage ../development/python-modules/baselines { }; + bash_kernel = callPackage ../development/python-modules/bash_kernel { }; bayespy = callPackage ../development/python-modules/bayespy { }; @@ -615,6 +617,8 @@ in { pybind11 = callPackage ../development/python-modules/pybind11 { }; + pybullet = callPackage ../development/python-modules/pybullet { }; + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) pkgconfig; }; @@ -1363,7 +1367,10 @@ in { cheetah = callPackage ../development/python-modules/cheetah { }; - cherrypy = callPackage ../development/python-modules/cherrypy {}; + cherrypy = if isPy3k then + callPackage ../development/python-modules/cherrypy { } + else + callPackage ../development/python-modules/cherrypy/17.nix { }; cfgv = callPackage ../development/python-modules/cfgv { }; @@ -4025,6 +4032,10 @@ in { retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + roboschool = callPackage ../development/python-modules/roboschool { + inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package + }; + qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; quamash = callPackage ../development/python-modules/quamash { }; |