From 5ab9f63c6c9e3435c57380107ba96ffa31c49420 Mon Sep 17 00:00:00 2001 From: HaoZeke Date: Fri, 4 Jan 2019 14:26:49 +0530 Subject: [PATCH 001/238] minuet: Fix build --- pkgs/applications/kde/minuet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index efe850ab414..f711f759272 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -2,7 +2,7 @@ , lib, extra-cmake-modules, gettext, python , drumstick, fluidsynth , kcoreaddons, kcrash, kdoctools -, qtquickcontrols2, qtsvg, qttools +, qtquickcontrols2, qtsvg, qttools, qtdeclarative }: mkDerivation { @@ -12,7 +12,7 @@ mkDerivation { maintainers = with maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ]; propagatedBuildInputs = [ drumstick fluidsynth From 3f2e5f723e82b59b8f003201da7777ef3c631f0b Mon Sep 17 00:00:00 2001 From: HaoZeke Date: Fri, 4 Jan 2019 16:58:01 +0530 Subject: [PATCH 002/238] minuet: Add myself as a maintainer --- pkgs/applications/kde/minuet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index f711f759272..cd98d56b86d 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -9,7 +9,7 @@ mkDerivation { name = "minuet"; meta = with lib; { license = with licenses; [ lgpl21 gpl3 ]; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg HaoZeke ]; }; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ]; From 9b7742eefc70b94c85c5942f2e4dc52a5b5f5cef Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 19 Jan 2019 22:05:58 +0100 Subject: [PATCH 003/238] gstreamer: fix plugin detection The `--suffix` option escapes it's arguments. This leads to the `GST_PLUGIN_SYTEM_PATH` variable to be not correctly expanded with the embedded bash script. Switching to `--run` and crafting the required export by hand bypasses the issue. --- pkgs/development/libraries/gstreamer/core/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 2c1faac387e..b69ab89df24 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$dev/bin/"*; do - wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" + # We can't use --suffix here due to quoting so we craft the export command by hand + wrapProgram "$prog" --run "export GST_PLUGIN_SYSTEM_PATH=\$GST_PLUGIN_SYSTEM_PATH"$\{GST_PLUGIN_SYSTEM_PATH:+:\}"\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" done ''; From de8f760fbd4d8895047c090516841d259b145719 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sun, 20 Jan 2019 22:59:14 +0000 Subject: [PATCH 004/238] ffmpeg, mpv: enable hardware-accelerated decoding with CUDA NVIDIA users can now use `mpv --hwdec=nvdec` to play videos that the software decoders cannot keep up with. --- pkgs/applications/video/mpv/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index ffbaa9fffdf..0487f9d7ae4 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs, mujs -, lua, libuchardet, libiconv ? null, darwin +, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin , waylandSupport ? false , wayland ? null @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs - luaEnv libuchardet mujs + luaEnv libuchardet mujs nv-codec-headers ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d11ef732a01..72929e127bc 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr -, x264, x265, xvidcore, zlib, libopus, speex +, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers , openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -161,7 +161,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex + libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers ] ++ optional openglSupport libGLU_combined ++ optional vpxSupport libvpx ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM From d1954624b40b7cfa541bf688ccd48c17fe9718f8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Feb 2019 17:02:40 -0600 Subject: [PATCH 005/238] kdeFrameworks: 5.54.0 -> 5.55.0 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 632 +++++++++--------- 2 files changed, 317 insertions(+), 317 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index ce41ffa4929..8946c697c24 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.55/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 5421a1edd31..6c0b80807cc 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/attica-5.54.0.tar.xz"; - sha256 = "1gr7w0mf3aq5xyl9il3483m9aqgb981vxn02g2khm6dfsr6z2aln"; - name = "attica-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/attica-5.55.0.tar.xz"; + sha256 = "0bsn9mi3nj23k2r3mfgjm9i1mp8qnwf08xn9x757wk3xas0cx98v"; + name = "attica-5.55.0.tar.xz"; }; }; baloo = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/baloo-5.54.0.tar.xz"; - sha256 = "0wv8zi03plr279v9p923rwkx2kwhbpd6xlzyqi4v14vhcrmapg1c"; - name = "baloo-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/baloo-5.55.0.tar.xz"; + sha256 = "068ms071639pskhjz37cszylvfzzqhp7x1rmwdfn5nlvzrv6lrxh"; + name = "baloo-5.55.0.tar.xz"; }; }; bluez-qt = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/bluez-qt-5.54.0.tar.xz"; - sha256 = "1br9496lahzqmzmvdic5835ig18w3g211l1w4qfzpgr50yin9n5v"; - name = "bluez-qt-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/bluez-qt-5.55.0.tar.xz"; + sha256 = "1ixad1ya3c339c675w8nwmbga8ydq16db9fk2az3gjm68z3dch8a"; + name = "bluez-qt-5.55.0.tar.xz"; }; }; breeze-icons = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/breeze-icons-5.54.0.tar.xz"; - sha256 = "1g5dppg2iq5bd3r3s8bi8jqnvnh1rm7s3sv51shmaamq5qf0n5jy"; - name = "breeze-icons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/breeze-icons-5.55.0.tar.xz"; + sha256 = "03mb7x8mc2h6cjb4mrifrbkbpj3lv9c0mg4m619rqiydg0p1yf49"; + name = "breeze-icons-5.55.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/extra-cmake-modules-5.54.0.tar.xz"; - sha256 = "0i3iqwvdqf2wpg8lsbna4vgmb18pnbv2772sg9k6zzhvkwsskdwi"; - name = "extra-cmake-modules-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/extra-cmake-modules-5.55.0.tar.xz"; + sha256 = "1x868hs9jiqzkqx7gld4mdm5dzfxc5kann22y15a4f7g5a957534"; + name = "extra-cmake-modules-5.55.0.tar.xz"; }; }; frameworkintegration = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/frameworkintegration-5.54.0.tar.xz"; - sha256 = "1rzi3ydw7hjhg4vbsfan7zgaa2a2bmp7mph95h2kidf8x816qv2d"; - name = "frameworkintegration-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/frameworkintegration-5.55.0.tar.xz"; + sha256 = "0pfpk268x06pjwciv4jr5v259kjck0sf4xzsgn29ifkmsk74wwmi"; + name = "frameworkintegration-5.55.0.tar.xz"; }; }; kactivities = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kactivities-5.54.0.tar.xz"; - sha256 = "0ipq71g6g7q6yncvbiabwn5kg2280k8ssibbbf6jyh2lg09dmjil"; - name = "kactivities-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kactivities-5.55.0.tar.xz"; + sha256 = "0dp9vx2nl9fnawzcz04fqa731s3bk2izxrqbvn71aqyrs7fymabg"; + name = "kactivities-5.55.0.tar.xz"; }; }; kactivities-stats = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kactivities-stats-5.54.0.tar.xz"; - sha256 = "1ns7f110a5vwabb33b1lnpa85kk5radf87bxm1gw4gzglsv7747d"; - name = "kactivities-stats-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kactivities-stats-5.55.0.tar.xz"; + sha256 = "12n178244ysfak0x9qm9a2k814qi56w8xpkg03na7hlsz2l4y9v6"; + name = "kactivities-stats-5.55.0.tar.xz"; }; }; kapidox = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kapidox-5.54.0.tar.xz"; - sha256 = "0zwjychzcamsky9l67xnw820b9m8r8pi56gsccg023l1rcigz46c"; - name = "kapidox-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kapidox-5.55.0.tar.xz"; + sha256 = "0x41adp3rnvr6njc57ffdyh6d5i5aw13xcjdr4p6kacw9pk63ajf"; + name = "kapidox-5.55.0.tar.xz"; }; }; karchive = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/karchive-5.54.0.tar.xz"; - sha256 = "141xqgdk7g3ky0amblrqr4pab1xvvdim5wvckrgawdkjiy5ana4g"; - name = "karchive-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/karchive-5.55.0.tar.xz"; + sha256 = "1llznxc5wjjnmbjx8iwi3a93gc2z0z344viknsgls1fwdjjfyxc4"; + name = "karchive-5.55.0.tar.xz"; }; }; kauth = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kauth-5.54.0.tar.xz"; - sha256 = "1ciabazig77rpfksvdlmixj2sa2qnasq13nwvjn3xksnajfm4p2h"; - name = "kauth-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kauth-5.55.0.tar.xz"; + sha256 = "1w6bp2kbp1sn4cl76fgl2pqrg660ix99qq4h65g090kc934np3zc"; + name = "kauth-5.55.0.tar.xz"; }; }; kbookmarks = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kbookmarks-5.54.0.tar.xz"; - sha256 = "1w4rqnzyars1pxam3nym1qily3ihd2j8cpkq8aha70nbj0dj3ckw"; - name = "kbookmarks-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kbookmarks-5.55.0.tar.xz"; + sha256 = "0vsn98znzdbiy8clbl9p3kiag3zvxgc9701gwg2ig8mpv3ci9lkg"; + name = "kbookmarks-5.55.0.tar.xz"; }; }; kcmutils = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcmutils-5.54.0.tar.xz"; - sha256 = "0a5jz9m27nyl1vchp68170j9v5z4csyv43vpnfs09l6wk9ggdcwh"; - name = "kcmutils-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcmutils-5.55.0.tar.xz"; + sha256 = "1f49864xpxrbj77n7l474wkn3rw4zy8vkl3psdya7ccdk7ac2s0k"; + name = "kcmutils-5.55.0.tar.xz"; }; }; kcodecs = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcodecs-5.54.0.tar.xz"; - sha256 = "1s0ky187fbi34wabpfvdwb1zbblzvk8g83h37ckj9j4rd69mjksc"; - name = "kcodecs-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcodecs-5.55.0.tar.xz"; + sha256 = "0491j6l28jwfpgaqs2816qpyggnra2df33iw3fgvb0wd4r4gvmjb"; + name = "kcodecs-5.55.0.tar.xz"; }; }; kcompletion = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcompletion-5.54.0.tar.xz"; - sha256 = "0sgg09l97amnng0ddxyjpk535097f87bmn60hjqrmpsqb0n3a460"; - name = "kcompletion-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcompletion-5.55.0.tar.xz"; + sha256 = "08ym79fqk7vshsf3jk37d6jvg7ys63kwflcn5dff5ci18jan2ir2"; + name = "kcompletion-5.55.0.tar.xz"; }; }; kconfig = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kconfig-5.54.0.tar.xz"; - sha256 = "14p4w0m04c8msdwb3mjfzx6w0lcmln65j3rfvqp58nv5n4yh5dp7"; - name = "kconfig-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kconfig-5.55.0.tar.xz"; + sha256 = "06gscipc3914gwiswhp1xx4sy74bpy645ykq2i6r1sb6sm16hmja"; + name = "kconfig-5.55.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kconfigwidgets-5.54.0.tar.xz"; - sha256 = "1l3hh7qgnz7mnn55abv03pq7zal9dgcw5gnhfr747wknd4h90w31"; - name = "kconfigwidgets-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kconfigwidgets-5.55.0.tar.xz"; + sha256 = "0npfp6z5lc2h8y6slmz3sbymyyv9k2w73rpsjzl5zswqhzlvrb5k"; + name = "kconfigwidgets-5.55.0.tar.xz"; }; }; kcoreaddons = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcoreaddons-5.54.0.tar.xz"; - sha256 = "1n27786js8j8na7kgxirhmswxcz3qkfiqzfabqmmsd0jp4rx1s79"; - name = "kcoreaddons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcoreaddons-5.55.0.tar.xz"; + sha256 = "1j7bc5fhak8db3vdfslbjdffbdclakhfwsni2a855d08yfrl1n1w"; + name = "kcoreaddons-5.55.0.tar.xz"; }; }; kcrash = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcrash-5.54.0.tar.xz"; - sha256 = "0wlrlzwdi9dpxkky9sadmbgw0rjisxhym9hr8gzydd2y8q4cr8a7"; - name = "kcrash-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcrash-5.55.0.tar.xz"; + sha256 = "08a8c5mbj6ll0d1ivhcjx5ga1jfbnwxsk618wcfpwwi6mkxrc3f9"; + name = "kcrash-5.55.0.tar.xz"; }; }; kdbusaddons = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdbusaddons-5.54.0.tar.xz"; - sha256 = "1fvlspqc3w3y4p04gnqz6vrfvl93iwckfk16p608fz7yfgdmlzbf"; - name = "kdbusaddons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdbusaddons-5.55.0.tar.xz"; + sha256 = "1sj3cycgci3ih65bkh7bsvbzyp7r654ppcryj4azpcsxqhy5gc7l"; + name = "kdbusaddons-5.55.0.tar.xz"; }; }; kdeclarative = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdeclarative-5.54.0.tar.xz"; - sha256 = "0ankjqrlpnj3c9sjnv5p8w279zizkl5ps3i5zw16hg44v6hdmcj0"; - name = "kdeclarative-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdeclarative-5.55.0.tar.xz"; + sha256 = "043jl7rn9yawh04fwgaxb8iwksn3z8qb4yfc4s6v1znwcs7ajlda"; + name = "kdeclarative-5.55.0.tar.xz"; }; }; kded = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kded-5.54.0.tar.xz"; - sha256 = "131hvxpqvkyh1sfb1j19jjzy7fyy6xisvpmx12lw1pvks0cnrqgn"; - name = "kded-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kded-5.55.0.tar.xz"; + sha256 = "0kn9kzzji257mppd12jzwiibha8127ajxvng2ls765lylv9nad7q"; + name = "kded-5.55.0.tar.xz"; }; }; kdelibs4support = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kdelibs4support-5.54.0.tar.xz"; - sha256 = "02kklfcjsll4pf4rfll7jrr7jpcwd57954ypjjhn3xgr6p0w0hdm"; - name = "kdelibs4support-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kdelibs4support-5.55.0.tar.xz"; + sha256 = "1l1gjv06yp9jdiapiypwscbb6y0rfgrnw9rdsl7kkxh9ps8b8j39"; + name = "kdelibs4support-5.55.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdesignerplugin-5.54.0.tar.xz"; - sha256 = "0hlywnzd3d6bvhib1xqiqx39m7k8g16wsj102f7awd5gw3xrz8ga"; - name = "kdesignerplugin-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdesignerplugin-5.55.0.tar.xz"; + sha256 = "114035wil0p5z6h0li8wjzivsdxhqbih54kn4nvhn43b71xnzs3y"; + name = "kdesignerplugin-5.55.0.tar.xz"; }; }; kdesu = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdesu-5.54.0.tar.xz"; - sha256 = "1qhw1hmq2b6rkyibidmg532llv31vkhmp0a7j2myzi40ydbx1lar"; - name = "kdesu-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdesu-5.55.0.tar.xz"; + sha256 = "1x2gjnmgpcaxvfav2pm92zfgxbn60awpvmn9ycs68rq47p6h9x0f"; + name = "kdesu-5.55.0.tar.xz"; }; }; kdewebkit = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdewebkit-5.54.0.tar.xz"; - sha256 = "0prl9751a8nv7qhg7fv8qygq0llh71w2p25sldl3zif44340jnhf"; - name = "kdewebkit-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdewebkit-5.55.0.tar.xz"; + sha256 = "1mnbdsiih94hlwwff9fs9gnzl3y7ayf1pskmz1rajgjmqd6rm7mm"; + name = "kdewebkit-5.55.0.tar.xz"; }; }; kdnssd = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdnssd-5.54.0.tar.xz"; - sha256 = "00sqx2hyqd9yw4nwdl8kmbzm0v0szgqv4nz0q6bchv3hfbax6zk7"; - name = "kdnssd-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdnssd-5.55.0.tar.xz"; + sha256 = "0lljj7mxmqm60kfzr37zb7z58mfyfh7zgykf7a5is1k0lxpgk6zc"; + name = "kdnssd-5.55.0.tar.xz"; }; }; kdoctools = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdoctools-5.54.0.tar.xz"; - sha256 = "0xbmdqlvyw9s2g8kwn1wmvz09pn4vs386ibm1p92wdnpspp5did6"; - name = "kdoctools-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdoctools-5.55.0.tar.xz"; + sha256 = "0dlal0vkxf5yh1hbfhrcrxqqi1w43q7bvv8ws8pb18jjgimzr46l"; + name = "kdoctools-5.55.0.tar.xz"; }; }; kemoticons = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kemoticons-5.54.0.tar.xz"; - sha256 = "0ypcffpp0m75qwam386q6pyfbsij16y2vgpkn38li6ypxlxsvx2v"; - name = "kemoticons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kemoticons-5.55.0.tar.xz"; + sha256 = "03vx22f9mjd10qm61f6ihr283w2sarrhg0rssxp7g7wahvshcvmh"; + name = "kemoticons-5.55.0.tar.xz"; }; }; kfilemetadata = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kfilemetadata-5.54.0.tar.xz"; - sha256 = "1hl61y15nqr5h5k4jqfz9bjj4gw6wdaiacxaslcwzn0sg4xyavab"; - name = "kfilemetadata-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kfilemetadata-5.55.0.tar.xz"; + sha256 = "0fqj266f9f66rfjzg0rl35fac5rn5n3npyfb4gsla3mdc8fjz9mi"; + name = "kfilemetadata-5.55.0.tar.xz"; }; }; kglobalaccel = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kglobalaccel-5.54.0.tar.xz"; - sha256 = "10gl8prc1n0si52cmiglkz8dx79dylmxrh5mjpmyy5yy16chs1s1"; - name = "kglobalaccel-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kglobalaccel-5.55.0.tar.xz"; + sha256 = "1c6dxp6jvbw8l74n1mv0v62yr34b9447szhvd61y4sxmmfjimhz4"; + name = "kglobalaccel-5.55.0.tar.xz"; }; }; kguiaddons = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kguiaddons-5.54.0.tar.xz"; - sha256 = "0lkqxsqdjmc7060pxi5j8gx15kmrb8450cpinzn89nzpdl7rj935"; - name = "kguiaddons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kguiaddons-5.55.0.tar.xz"; + sha256 = "190jwhvq2fi8g03saszlaslzxmcbqrbwli9f9vm6h5j9nnc0z6h3"; + name = "kguiaddons-5.55.0.tar.xz"; }; }; kholidays = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kholidays-5.54.0.tar.xz"; - sha256 = "1xp6mpnhlqkfl3pdaj6nq9sqy30z5wm6gms0ycy33n4ly2s8wb1y"; - name = "kholidays-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kholidays-5.55.0.tar.xz"; + sha256 = "0y44alimywggd4xvis9lz49j0fhgwkggzwpp7bnmcxjnbj9z0vd9"; + name = "kholidays-5.55.0.tar.xz"; }; }; khtml = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/khtml-5.54.0.tar.xz"; - sha256 = "17d8cim4ph7nxc5gkidhxc659yn9a7dqvnrihx9sj1cy01qnc7da"; - name = "khtml-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/khtml-5.55.0.tar.xz"; + sha256 = "0wh9z5xm0gaf1c2s7cq7763jfyv83d58x80nwsvb0ayd6y8id1bq"; + name = "khtml-5.55.0.tar.xz"; }; }; ki18n = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/ki18n-5.54.0.tar.xz"; - sha256 = "0drbyr2y44h1d88nbgxvp4ix46lin51r8vzhhnjhq2ydqy5za3p3"; - name = "ki18n-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/ki18n-5.55.0.tar.xz"; + sha256 = "0kvwjzqibby9fawyfb8bd81abjhsjlyi8xy9mcapnih5x2gx3z92"; + name = "ki18n-5.55.0.tar.xz"; }; }; kiconthemes = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kiconthemes-5.54.0.tar.xz"; - sha256 = "0hc3a6ax3yizpbvklxw3pm0r6j0r5jqx2ffbz1980g21lcgshd7g"; - name = "kiconthemes-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kiconthemes-5.55.0.tar.xz"; + sha256 = "1rgbfklb7xxg7z2zyrsmaxf883ixgfbkqilps3npwk3xac2f66rw"; + name = "kiconthemes-5.55.0.tar.xz"; }; }; kidletime = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kidletime-5.54.0.tar.xz"; - sha256 = "1x0z0ipdizgv6jkklxp6maclx8f6ya2bv1q39hvxxnnmly8q3vjm"; - name = "kidletime-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kidletime-5.55.0.tar.xz"; + sha256 = "1kq6zh6cjhzffjhxnc7l1pw6g38swxyspp8xl8c860zdhc9xfd1g"; + name = "kidletime-5.55.0.tar.xz"; }; }; kimageformats = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kimageformats-5.54.0.tar.xz"; - sha256 = "0xfzpzaqgdncwxvg27qb0ryqi78nbsi0xcsg9cjmgspfx5mlgi15"; - name = "kimageformats-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kimageformats-5.55.0.tar.xz"; + sha256 = "0hhxv8m5993vlpi5yf7w3fadzckficn16flshdkby7bwq8agrbz1"; + name = "kimageformats-5.55.0.tar.xz"; }; }; kinit = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kinit-5.54.0.tar.xz"; - sha256 = "0pmr6ckysdqpni49i9jgapsk88jfbrnlfybpcp3v51kl2nkwm0i9"; - name = "kinit-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kinit-5.55.0.tar.xz"; + sha256 = "11xwiny5sfqbdls249vnq6ssp5pzw1w9wg4ql9nkwwygl4ml8b9y"; + name = "kinit-5.55.0.tar.xz"; }; }; kio = { - version = "5.54.1"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kio-5.54.1.tar.xz"; - sha256 = "11wdsq87w1ddkrm0mpik2qf0c0k897f1rflszfrrwkplfb0z63xp"; - name = "kio-5.54.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kio-5.55.0.tar.xz"; + sha256 = "1k3cn7hvp5z9nirss29v164hahrlvlqivxlk64c8w9ynjx699ira"; + name = "kio-5.55.0.tar.xz"; }; }; kirigami2 = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kirigami2-5.54.0.tar.xz"; - sha256 = "0iny9br3vpakvv0bmgy0mmw2y10d4kqbahjpfa3726qai4gligp2"; - name = "kirigami2-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kirigami2-5.55.0.tar.xz"; + sha256 = "11djxli5cq7pn19lmjz2y7z39mhlr98jskasfzyax546j47v973k"; + name = "kirigami2-5.55.0.tar.xz"; }; }; kitemmodels = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kitemmodels-5.54.0.tar.xz"; - sha256 = "1s3wv75sbb4kpgz02cbm7smp8h6rk1ixv0gafbvz9514i9g4d760"; - name = "kitemmodels-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kitemmodels-5.55.0.tar.xz"; + sha256 = "13609avkqrfi79zyr737662nr8bwcfdya9dxc6gzyqx5i0l2nbw6"; + name = "kitemmodels-5.55.0.tar.xz"; }; }; kitemviews = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kitemviews-5.54.0.tar.xz"; - sha256 = "1cw9i8xik287rvb12alpqsph902nhfmbn4cfjx5gj7k888n8k3mk"; - name = "kitemviews-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kitemviews-5.55.0.tar.xz"; + sha256 = "1mgh7z5xcbhc7a2qq8mqfp7j4amk93hypkpy2zc3rdhc60ps94ad"; + name = "kitemviews-5.55.0.tar.xz"; }; }; kjobwidgets = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kjobwidgets-5.54.0.tar.xz"; - sha256 = "0d3jxabjlf2s4p34pzrpfsg4xp9s8qd7dmg50yxl59dijd42xgxq"; - name = "kjobwidgets-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kjobwidgets-5.55.0.tar.xz"; + sha256 = "1pbx974jpn8n2080gblmbh8q0yb5wxb9xblpm100rbhpg20sc2by"; + name = "kjobwidgets-5.55.0.tar.xz"; }; }; kjs = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kjs-5.54.0.tar.xz"; - sha256 = "0bidbvbwbrbwwm0drw6l43vgmsp50c946jjq7pgnq1gf7mhscwcy"; - name = "kjs-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kjs-5.55.0.tar.xz"; + sha256 = "0c1wyxsgn70jvw7zcjjpw12w9sg9xxvyslgnqlnnyh8sx7rrp70c"; + name = "kjs-5.55.0.tar.xz"; }; }; kjsembed = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kjsembed-5.54.0.tar.xz"; - sha256 = "1pjpk8ysrnh78infq99i0wrf78h8h7hbfnr1m7agzffhbqa671z8"; - name = "kjsembed-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kjsembed-5.55.0.tar.xz"; + sha256 = "0dh9012y9bqj48jp50lrsmd28bbvf4jd93l34vfzmza252yvyw3l"; + name = "kjsembed-5.55.0.tar.xz"; }; }; kmediaplayer = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kmediaplayer-5.54.0.tar.xz"; - sha256 = "0qalqqkn2yvxgr45l7zm36bcpxwbgn8ngxsvyb5cxfaalwr0mkyf"; - name = "kmediaplayer-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kmediaplayer-5.55.0.tar.xz"; + sha256 = "0gpfrhgk2l63lyz0bz93cg7mc5g7mjvrkfvpyndmi1v7vhndp5zq"; + name = "kmediaplayer-5.55.0.tar.xz"; }; }; knewstuff = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/knewstuff-5.54.0.tar.xz"; - sha256 = "1l3ibadjvaqqjsb1lhkf6jkzy80dk15fgid125bqk4amwsyygnd3"; - name = "knewstuff-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/knewstuff-5.55.0.tar.xz"; + sha256 = "0a2d9wrhjsjl0klsrn501sp9681v7qmq6hmalw061arjv165dzw2"; + name = "knewstuff-5.55.0.tar.xz"; }; }; knotifications = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/knotifications-5.54.0.tar.xz"; - sha256 = "1agglvwaf0wh3fcs0ww3jxn900ych4dsvbaylrx4qip6girfmiyn"; - name = "knotifications-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/knotifications-5.55.0.tar.xz"; + sha256 = "1dbrk9r3w8pmg15bhrb8qdk4fiqvc9qggb67zvk1n7ddlfkyarz6"; + name = "knotifications-5.55.0.tar.xz"; }; }; knotifyconfig = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/knotifyconfig-5.54.0.tar.xz"; - sha256 = "1ibxqi0y43qgjj4nikxwfppmda9xjmz63c5fml8c4w5d9mdag3if"; - name = "knotifyconfig-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/knotifyconfig-5.55.0.tar.xz"; + sha256 = "01hxj6s2sq5k5j6j1y4c5gxyl1886j7ghh0hdc95b7n4gdjwwbci"; + name = "knotifyconfig-5.55.0.tar.xz"; }; }; kpackage = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kpackage-5.54.0.tar.xz"; - sha256 = "1s1n7r3j7l4kvd85dgssaaz70dd2w8vp34kwg49ak58cdai01vzb"; - name = "kpackage-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kpackage-5.55.0.tar.xz"; + sha256 = "175b0lj4qybddjpc25b1p60lr8f9220i9ymk3wk3y3vf4893v833"; + name = "kpackage-5.55.0.tar.xz"; }; }; kparts = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kparts-5.54.0.tar.xz"; - sha256 = "0y2dr286hb2w4r7ifq39vd7ajsalqyh9d91dm19b2rpgdmvgxai6"; - name = "kparts-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kparts-5.55.0.tar.xz"; + sha256 = "0gqkgnvkdai8hbg1n32jq4a3yzlkarmw8a7hxlfr0ykgysanjh65"; + name = "kparts-5.55.0.tar.xz"; }; }; kpeople = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kpeople-5.54.0.tar.xz"; - sha256 = "0sl8wcj7w9vgczcv8mfvjlnghidyadbh1qsiv0pj63ywl7xgr1hx"; - name = "kpeople-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kpeople-5.55.0.tar.xz"; + sha256 = "0vbgi4l14g4f0klbxqbkjcag6yi0ghhpxn5nik5sssmcx8qyk885"; + name = "kpeople-5.55.0.tar.xz"; }; }; kplotting = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kplotting-5.54.0.tar.xz"; - sha256 = "02mab80jyfgdj8xwbwkm181cc5vpsmbn561242q7ayjgxdiszzw9"; - name = "kplotting-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kplotting-5.55.0.tar.xz"; + sha256 = "0nn2v1yvvpzpi1y1pm47zvmwsa942c7d9n8iqymqihnp0fqjr8y7"; + name = "kplotting-5.55.0.tar.xz"; }; }; kpty = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kpty-5.54.0.tar.xz"; - sha256 = "04sj612x15311yk2jmr3ak430syp5p59w559670sd18ih99mf8m3"; - name = "kpty-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kpty-5.55.0.tar.xz"; + sha256 = "0r5080xl7x13qmjnjssb0d1pk626anaa4xahb7fi869fndr4xhzn"; + name = "kpty-5.55.0.tar.xz"; }; }; kross = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kross-5.54.0.tar.xz"; - sha256 = "18ij9339khskla4r0afl0n6x4pd157y1l5bk2ldb9anpck3p71kd"; - name = "kross-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kross-5.55.0.tar.xz"; + sha256 = "0p3q36gka6m62nryc3l11d30mlhiqjpghvfcyq6wikiqlv2kqvjs"; + name = "kross-5.55.0.tar.xz"; }; }; krunner = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/krunner-5.54.0.tar.xz"; - sha256 = "06y592v32926wq9iaypryj0173ca05vv0p5rrs4n77kwhkl0zq0v"; - name = "krunner-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/krunner-5.55.0.tar.xz"; + sha256 = "0yw2jh9dailhcwkkjl2qggg5k90bwbfsn88a3hzwyj2ng2haypis"; + name = "krunner-5.55.0.tar.xz"; }; }; kservice = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kservice-5.54.0.tar.xz"; - sha256 = "10qmrqyfjhf5nzjailgmb86nq62ffrmiddk3880mh49fwxs4l3qx"; - name = "kservice-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kservice-5.55.0.tar.xz"; + sha256 = "0k8xksmw2ai7m0js7l98rv5v6ykifmnqiyy2yc1xhgn40lf1r89j"; + name = "kservice-5.55.0.tar.xz"; }; }; ktexteditor = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/ktexteditor-5.54.0.tar.xz"; - sha256 = "12yywvv82lmqmx89j1qxj45an49vx34brifxs9rpy3nxyh9c3vzy"; - name = "ktexteditor-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/ktexteditor-5.55.0.tar.xz"; + sha256 = "0b5zqhm5aw7jj7dj600xa674ik11gwyzamhyz5962xhvsg5pyjwx"; + name = "ktexteditor-5.55.0.tar.xz"; }; }; ktextwidgets = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/ktextwidgets-5.54.0.tar.xz"; - sha256 = "154j3an7x787l44hw1fmksm3h6kziyaw4l61zw9mas24z3d86hl5"; - name = "ktextwidgets-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/ktextwidgets-5.55.0.tar.xz"; + sha256 = "1ymqmb5z4flzrns3wdjagxbzbpighbincwbhy29a0mqg4zcm82xk"; + name = "ktextwidgets-5.55.0.tar.xz"; }; }; kunitconversion = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kunitconversion-5.54.0.tar.xz"; - sha256 = "0lxrydnjlilfm92aqrpd76dk8yfprgnb7nr66dwmbdmqz7znbl8h"; - name = "kunitconversion-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kunitconversion-5.55.0.tar.xz"; + sha256 = "1v5cfxk5v76w1f1qvrpilrs111wvp8bn2p3bswhqp4lg0qxync0q"; + name = "kunitconversion-5.55.0.tar.xz"; }; }; kwallet = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kwallet-5.54.0.tar.xz"; - sha256 = "0hyipka97g2djk43x8pqbjvrgswsp8kph6za0s5dl4napfikq8k2"; - name = "kwallet-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kwallet-5.55.0.tar.xz"; + sha256 = "1dp072h5r6yd81i69759pj8klfsikrg25za44sry2kh6fxvwmngm"; + name = "kwallet-5.55.0.tar.xz"; }; }; kwayland = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kwayland-5.54.0.tar.xz"; - sha256 = "0y1710l68qlf37zy26nyn25r50a00mrm5cnwgfs9f40s749amigf"; - name = "kwayland-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kwayland-5.55.0.tar.xz"; + sha256 = "0m9q13qzgvp03jrsyc59l6pp7jf0dvhx768p21drs46qxw6wla7l"; + name = "kwayland-5.55.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kwidgetsaddons-5.54.0.tar.xz"; - sha256 = "01qxklhigfazhma0f6m1fkcbh9waxpvzpz6y2jlflvgbw2db82gh"; - name = "kwidgetsaddons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kwidgetsaddons-5.55.0.tar.xz"; + sha256 = "0kpbvvmjrhxxjqc0cb63zlq06a3xspq43xv3wdingcn28zypynzc"; + name = "kwidgetsaddons-5.55.0.tar.xz"; }; }; kwindowsystem = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kwindowsystem-5.54.0.tar.xz"; - sha256 = "1n9h4gg5ih29avvcpplqfy7nq58xx6jv6a04m1wkjr1rzn4dyfnb"; - name = "kwindowsystem-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kwindowsystem-5.55.0.tar.xz"; + sha256 = "10zdxm08d758zbwlrbsn0ghxjpf39ids2s5pnca072gbrbrxv656"; + name = "kwindowsystem-5.55.0.tar.xz"; }; }; kxmlgui = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kxmlgui-5.54.0.tar.xz"; - sha256 = "01napbq81mcp9ngyl26an52l6ndsgrhzhy2mfd8jrbil2sbrcxq7"; - name = "kxmlgui-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kxmlgui-5.55.0.tar.xz"; + sha256 = "0ph67zarf1sccvp7882brrihv4dsmxq0nggan0rnk54qg0zdhgcn"; + name = "kxmlgui-5.55.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kxmlrpcclient-5.54.0.tar.xz"; - sha256 = "199syc5wl8myc4vcvbnw4a8mlfkb2gcmgs57p8w7akp7mz6l75y6"; - name = "kxmlrpcclient-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kxmlrpcclient-5.55.0.tar.xz"; + sha256 = "1573wnv2fbjjzgx3f1qm7y8wlj22bz45mny0rxci90i76nnh4538"; + name = "kxmlrpcclient-5.55.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/modemmanager-qt-5.54.0.tar.xz"; - sha256 = "0n54gh83b6d42azv40km7j223qb2f4f9ng23xvvawzc7l2ksm350"; - name = "modemmanager-qt-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/modemmanager-qt-5.55.0.tar.xz"; + sha256 = "10pkgm4dzsrfnjsf78pssd1wp0y27d1y834chd267hx9vgrv8axm"; + name = "modemmanager-qt-5.55.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/networkmanager-qt-5.54.0.tar.xz"; - sha256 = "0bh5li6r7r3nws5zj0hp4iy4xhiyh7rszzwpp6ag93vz5g5fsl9y"; - name = "networkmanager-qt-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/networkmanager-qt-5.55.0.tar.xz"; + sha256 = "0j8l4k13vsqh0a8mw8dw5bc78xvxhz2rh7bb870as04i32bvw772"; + name = "networkmanager-qt-5.55.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/oxygen-icons5-5.54.0.tar.xz"; - sha256 = "1sdd8ygkyl4d1mwrachcf0ahpikkby3xhdyz212xj9qmhmsgwa46"; - name = "oxygen-icons5-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/oxygen-icons5-5.55.0.tar.xz"; + sha256 = "0fvm9bq1573xkha4a577s1iik8nwzks8xhrli5mm6rbh53s12wp4"; + name = "oxygen-icons5-5.55.0.tar.xz"; }; }; plasma-framework = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/plasma-framework-5.54.0.tar.xz"; - sha256 = "1933i8irn76ilz3nychbnhy1bsc39iscn3qrab0lwmshfmw8c4zj"; - name = "plasma-framework-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/plasma-framework-5.55.0.tar.xz"; + sha256 = "1pvxxw52s03i11p5byd2sh8sbvlk6h8q6briq9d4qvjy6c0pmbq4"; + name = "plasma-framework-5.55.0.tar.xz"; }; }; prison = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/prison-5.54.0.tar.xz"; - sha256 = "1z7gymk4hkwaa0ni1454ndvpm2lwqyyfbih38h0lfb8lrswnv3kb"; - name = "prison-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/prison-5.55.0.tar.xz"; + sha256 = "1xadc2fq6csml78czg5p572cwvmqmn334a5dxjnd7k1pdx50gi07"; + name = "prison-5.55.0.tar.xz"; }; }; purpose = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/purpose-5.54.0.tar.xz"; - sha256 = "07rz8bqwvlz5g914q4vxdcdmrja5hxa29iazxz8nr171xnpg9x0w"; - name = "purpose-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/purpose-5.55.0.tar.xz"; + sha256 = "1krgjcfjrwvr7widz3rmcbbag4l0940gyzfpxni1p47c76kcb13b"; + name = "purpose-5.55.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/qqc2-desktop-style-5.54.0.tar.xz"; - sha256 = "1shw3c6cr5xanzyl5zv3isyhvzi20zn3xf7m963z1qn8ypaz1by8"; - name = "qqc2-desktop-style-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/qqc2-desktop-style-5.55.0.tar.xz"; + sha256 = "0aj37ldc3ywqap3sz73j54kbzycn529imr15jgl252k04rqpjya5"; + name = "qqc2-desktop-style-5.55.0.tar.xz"; }; }; solid = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/solid-5.54.0.tar.xz"; - sha256 = "0hmh9hndfs1ikaja07ddag7jr8804q4g6p74rhqsrfk2sjz0pmr9"; - name = "solid-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/solid-5.55.0.tar.xz"; + sha256 = "18dw55g41q34m2qzvybvpsas1dnyryqxnlf2md0xc4r36ib9p2pn"; + name = "solid-5.55.0.tar.xz"; }; }; sonnet = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/sonnet-5.54.0.tar.xz"; - sha256 = "0ccz0gbypzdndaxrfkjhry90jjdh5a56pm4j41z835q96w6piclz"; - name = "sonnet-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/sonnet-5.55.0.tar.xz"; + sha256 = "13bb1s2f4kfaikcga297j2fqlyr4qxdcq4v1b3zs1gas4z1wpcg6"; + name = "sonnet-5.55.0.tar.xz"; }; }; syndication = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/syndication-5.54.0.tar.xz"; - sha256 = "0zj8nv0hj5sf79v3clg2bqhs3m8hi1pzjar1cq6hkxprymw0hzx8"; - name = "syndication-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/syndication-5.55.0.tar.xz"; + sha256 = "1p9xwbzlrw4bh5is5i6fq3yalmpsf099rzf6d2qc3a0sc21hxs63"; + name = "syndication-5.55.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/syntax-highlighting-5.54.0.tar.xz"; - sha256 = "022mpkbgc458qcn25pn3a3m2dzy6lq23r7fqbgp22jr6xalfi5hl"; - name = "syntax-highlighting-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/syntax-highlighting-5.55.0.tar.xz"; + sha256 = "00w5nmz9l70znv8q7q1zw3f7gngwfgf41iwbs53zqcv1z7wmrz6m"; + name = "syntax-highlighting-5.55.0.tar.xz"; }; }; threadweaver = { - version = "5.54.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/threadweaver-5.54.0.tar.xz"; - sha256 = "011k2pm0wr60sxnydicnchnarx4r6qja0w6iih3jfkw733qm6bxp"; - name = "threadweaver-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/threadweaver-5.55.0.tar.xz"; + sha256 = "0r0ml5pz7h0vmydcg4gqqkl21lp6c5gqdwyfsnyad02dcjkh4hql"; + name = "threadweaver-5.55.0.tar.xz"; }; }; } From 7cf7d3a63f682561ecbc57289befe5f99701582a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Feb 2019 18:11:08 -0600 Subject: [PATCH 006/238] kdeFrameworks: fixup patch for extra-cmake-modules --- .../kde-frameworks/extra-cmake-modules/nix-lib-path.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch index 66f10f4abc1..bd105d2b4a9 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch @@ -1,5 +1,5 @@ diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index 52b2eb2..a04596c 100644 +index 275fd65..a04596c 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -232,34 +232,6 @@ @@ -14,7 +14,7 @@ index 52b2eb2..a04596c 100644 -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch +-# See https://wiki.debian.org/Multiarch -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") - AND NOT CMAKE_CROSSCOMPILING - AND NOT DEFINED ENV{FLATPAK_ID}) From 928b6f998524a0eb830c698b714ce81da3b41ce4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Feb 2019 11:37:56 -0600 Subject: [PATCH 007/238] plasma-5: 5.14.5 -> 5.15.0 https://www.kde.org/announcements/plasma-5.15.0.php --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++---------------- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 814795499a9..a94df11aa7e 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.15.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 0842034f0d8..3139da18294 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/bluedevil-5.14.5.tar.xz"; - sha256 = "1khqw11apvcf5g5m9z111rvk4scxh3z3yhcpwqws1h0s5c5lr7z7"; - name = "bluedevil-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/bluedevil-5.15.0.tar.xz"; + sha256 = "10ii06lzx0dldplcwmwba0aa18swip9v4rgyqzdy1idhphi2v9il"; + name = "bluedevil-5.15.0.tar.xz"; }; }; breeze = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/breeze-5.14.5.tar.xz"; - sha256 = "15hphz2mm2m3j0a0hwj7m65rggyaxdxy08yqs73bg3yg67n6x3p7"; - name = "breeze-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/breeze-5.15.0.tar.xz"; + sha256 = "06vk7br3i0r1lp4li7wd3fywxgz08yyim2gnrimni1xxn7kbh3ln"; + name = "breeze-5.15.0.tar.xz"; }; }; breeze-grub = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/breeze-grub-5.14.5.tar.xz"; - sha256 = "0bkaaxfl1ds58qcdrxswaacir7wcc65a960lwdkmpdl16g9f4gix"; - name = "breeze-grub-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/breeze-grub-5.15.0.tar.xz"; + sha256 = "1na8n7l3brx3bg9b1va4kbihwaaw1j627ic0dn1pv4amx70rjzk2"; + name = "breeze-grub-5.15.0.tar.xz"; }; }; breeze-gtk = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/breeze-gtk-5.14.5.tar.xz"; - sha256 = "0bysq83xbqmhb4wld51zd6lllr66b8w7pinizc99k8z1yz5jdb0m"; - name = "breeze-gtk-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/breeze-gtk-5.15.0.tar.xz"; + sha256 = "0fvmiikg5bn9ps2qjlhr7ly7nb0rk9yvn56mj4ymx9s8cai62f5m"; + name = "breeze-gtk-5.15.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/breeze-plymouth-5.14.5.tar.xz"; - sha256 = "1rbdpz9vlami7217v3dk8ljz0fgjz9zi1l0gwkhslayz5sybld96"; - name = "breeze-plymouth-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/breeze-plymouth-5.15.0.tar.xz"; + sha256 = "0mdjr3hdjwbazs7lnnl036rwiw0qcym1naf3x48awq2n1q7qryh8"; + name = "breeze-plymouth-5.15.0.tar.xz"; }; }; discover = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/discover-5.14.5.tar.xz"; - sha256 = "0gxhl2cv5yz3jw8fp8g8idi1k5hlhnvwbnvvg0dgnlzz6jb1s8dd"; - name = "discover-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/discover-5.15.0.tar.xz"; + sha256 = "048d2xims4ykl6142x7a1hrj3ycbsl4yvcynjsgi1jmxdxwl0xc9"; + name = "discover-5.15.0.tar.xz"; }; }; drkonqi = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/drkonqi-5.14.5.tar.xz"; - sha256 = "0xgym368f9r21wjh9fpv16m90dcj87g9p5df850fnn2k5n8x38z8"; - name = "drkonqi-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/drkonqi-5.15.0.tar.xz"; + sha256 = "1kili1ya44yps3mrn79rnjlp84qz4rnl3bpmwaaknng3qcs89ks9"; + name = "drkonqi-5.15.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kactivitymanagerd-5.14.5.tar.xz"; - sha256 = "0zms9npis0rklnbz93c69h4yg7dkrmfkzvzsfvkg90w37ap3vyl7"; - name = "kactivitymanagerd-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kactivitymanagerd-5.15.0.tar.xz"; + sha256 = "1mnq620af7p5nazp4mafgb8a2wwacc6gvq2aax3lqg6pd6kl63qd"; + name = "kactivitymanagerd-5.15.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kde-cli-tools-5.14.5.tar.xz"; - sha256 = "01mrnjqla4q07cnb1p51nq2pvj9vaamic3dsyj3b7hqky9fna9ln"; - name = "kde-cli-tools-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kde-cli-tools-5.15.0.tar.xz"; + sha256 = "1869lnigr6hiwjrrncvkak8vivjy6hff47yqbdv8v455p5sw39d0"; + name = "kde-cli-tools-5.15.0.tar.xz"; }; }; kdecoration = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kdecoration-5.14.5.tar.xz"; - sha256 = "115pli0qpa8lx0jasg1886fcg7gb2kk8v6k8r8l8c820l97sq7in"; - name = "kdecoration-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kdecoration-5.15.0.tar.xz"; + sha256 = "1pcyw6rrz0q7i2jnfvmjz2pixiw2aay19q3pxa1g3qvqydh3id5q"; + name = "kdecoration-5.15.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kde-gtk-config-5.14.5.tar.xz"; - sha256 = "12467wkjh2nmcf6r7n8qin1rryd39g0dg7gn43sdg6vdwpyl2kdm"; - name = "kde-gtk-config-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kde-gtk-config-5.15.0.tar.xz"; + sha256 = "157jhcaxvslcpkc1l6r50wiq4jp5p2vvj8xpplmx24lgxv4c13ay"; + name = "kde-gtk-config-5.15.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kdeplasma-addons-5.14.5.tar.xz"; - sha256 = "18sph3719d9pq2j5k7swiv9xbrpj659a3q66zvhz3dmh11y73f0m"; - name = "kdeplasma-addons-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kdeplasma-addons-5.15.0.tar.xz"; + sha256 = "0d467zypmcz6faj4499abww51pxylwh6s2ml5swpc7lcxhsi37i2"; + name = "kdeplasma-addons-5.15.0.tar.xz"; }; }; kgamma5 = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kgamma5-5.14.5.tar.xz"; - sha256 = "17smrdwyalknb3f6ckqs7kglfpqwajbiyd212wlsmqbva4by0fy0"; - name = "kgamma5-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kgamma5-5.15.0.tar.xz"; + sha256 = "1hnkfp11nmcyf6gnq04hri3x4i0n52nmadb6hhx0y5chgdrqf85z"; + name = "kgamma5-5.15.0.tar.xz"; }; }; khotkeys = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/khotkeys-5.14.5.tar.xz"; - sha256 = "0572jpgbhacx4gy40m594rbnxy3zaq5w3lcrfd8i2750ljswcq24"; - name = "khotkeys-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/khotkeys-5.15.0.tar.xz"; + sha256 = "00nbmmbwx7cvp1y3dgx4ccbpsa29flhg2dcv2a5p9bs7pnfbgs9w"; + name = "khotkeys-5.15.0.tar.xz"; }; }; kinfocenter = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kinfocenter-5.14.5.tar.xz"; - sha256 = "1z1i9g923cbdni5gfa6dpv46z1p2v40rfcvhy7i9h5nf49aw2rnc"; - name = "kinfocenter-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kinfocenter-5.15.0.tar.xz"; + sha256 = "1iinf500n7jbf7yz8g8bmfc24f113gsyp77d7n80sikzznggq8gk"; + name = "kinfocenter-5.15.0.tar.xz"; }; }; kmenuedit = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kmenuedit-5.14.5.tar.xz"; - sha256 = "1aa4a35s5h44fc88hmmfdpzy26zc47h9n448cd4vbm4bm411551d"; - name = "kmenuedit-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kmenuedit-5.15.0.tar.xz"; + sha256 = "0hzlhwbfzbz964v65n41ng0p72my46c8429xxhkamk82g99yywwq"; + name = "kmenuedit-5.15.0.tar.xz"; }; }; kscreen = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kscreen-5.14.5.tar.xz"; - sha256 = "1nb1ysgcx49galbf16mxbawybfik92bpr9vbwgg5ycsdx1f9q8yi"; - name = "kscreen-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kscreen-5.15.0.tar.xz"; + sha256 = "0xnj3gwqxcmdqkshm1qbmyiqqx84l5vc2cf3vx3xa1rvf3y77zac"; + name = "kscreen-5.15.0.tar.xz"; }; }; kscreenlocker = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kscreenlocker-5.14.5.tar.xz"; - sha256 = "16amr7pz0k6w5vkk1dwn2qi3s1mln0jypwmjazqq2lbwimn8k56m"; - name = "kscreenlocker-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kscreenlocker-5.15.0.tar.xz"; + sha256 = "1hgj2mzbbiqn52j3px2mzz6xzzpzr78q3bcai8ddc4gcl1xgs6yi"; + name = "kscreenlocker-5.15.0.tar.xz"; }; }; ksshaskpass = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/ksshaskpass-5.14.5.tar.xz"; - sha256 = "0skr247k4ky7lpbdwlmkrnr3mj1pa6pxl96pyxwsw7za784qg6dj"; - name = "ksshaskpass-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/ksshaskpass-5.15.0.tar.xz"; + sha256 = "0d6s11v3gk733zz4i1rccyq4g18023z64xj1wajyp8wg8kr7jd54"; + name = "ksshaskpass-5.15.0.tar.xz"; }; }; ksysguard = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/ksysguard-5.14.5.tar.xz"; - sha256 = "0ybxh6ll080rkrrr4b5ydl06x8zi97702661cajvbv00lhq4vp8b"; - name = "ksysguard-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/ksysguard-5.15.0.tar.xz"; + sha256 = "1aa4fw7zljw8a9dymwns1vmm687ixp8w71xc2gcgkkas0ankzpj1"; + name = "ksysguard-5.15.0.tar.xz"; }; }; kwallet-pam = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kwallet-pam-5.14.5.tar.xz"; - sha256 = "1mkjjc88kqf5x313nifla9pzrgzqm4v92150dbs1f89bsn673pk8"; - name = "kwallet-pam-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kwallet-pam-5.15.0.tar.xz"; + sha256 = "0vysmjmrsq9n5zls7sr64073164hbghgyxlmwmflm532lr9756fk"; + name = "kwallet-pam-5.15.0.tar.xz"; }; }; kwayland-integration = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kwayland-integration-5.14.5.tar.xz"; - sha256 = "0rd0xhb53iixv9i8x0gh3rr1082lj7zdymsqdmi7sfgb66g8c03l"; - name = "kwayland-integration-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kwayland-integration-5.15.0.tar.xz"; + sha256 = "0gpgmwy2z6avql4ljgr7278l0aqsp14rg1sfnj70dxwp1lai3kqj"; + name = "kwayland-integration-5.15.0.tar.xz"; }; }; kwin = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kwin-5.14.5.tar.xz"; - sha256 = "0ifdlnzw3ydrbidzk256vks66d1rxyilhqi09csygx17jqk7szj4"; - name = "kwin-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kwin-5.15.0.tar.xz"; + sha256 = "0f0pdxnyz8zckl3hnjvxb40cnrvi8jyfs9ckjjv17ald1nn3wc9w"; + name = "kwin-5.15.0.tar.xz"; }; }; kwrited = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kwrited-5.14.5.tar.xz"; - sha256 = "0115qscr8a54h7h8w4xw4fjzp7qipyw3d3jswhii7axnzp6q6qnh"; - name = "kwrited-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/kwrited-5.15.0.tar.xz"; + sha256 = "1zfhm7kljaxhc54d76ifd971qpd2mlaiaq2yxgd06lvlnhwi2lgc"; + name = "kwrited-5.15.0.tar.xz"; }; }; libkscreen = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/libkscreen-5.14.5.tar.xz"; - sha256 = "1vyaml5ap9siw9idiny92li2bykd0nwjsmwmg0c7ad912j4g1s7y"; - name = "libkscreen-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/libkscreen-5.15.0.tar.xz"; + sha256 = "1clw8966fmwih1fsjasvpgvfq7w728hlabl3i0zjz53r87hdw3mb"; + name = "libkscreen-5.15.0.tar.xz"; }; }; libksysguard = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/libksysguard-5.14.5.tar.xz"; - sha256 = "11nz0g7dqvpvgsv0a7sai445vgfsfi25plj7jb1i46n7zf8i8mya"; - name = "libksysguard-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/libksysguard-5.15.0.tar.xz"; + sha256 = "1aqkzbng2qq09rpb21r6drnn866b9y8yba3klhvhi0q5vg3p605d"; + name = "libksysguard-5.15.0.tar.xz"; }; }; milou = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/milou-5.14.5.tar.xz"; - sha256 = "1776441mhmwcvrzmdqg531md79azbkbhng51kyq6i9cvkhxyf583"; - name = "milou-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/milou-5.15.0.tar.xz"; + sha256 = "08fpfv8cmfjzn1rwgfxnl42nafnhzcxyv8jpzs182c8n37wgdy1p"; + name = "milou-5.15.0.tar.xz"; }; }; oxygen = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/oxygen-5.14.5.tar.xz"; - sha256 = "0h70k7af69zdky0g6napd1kdnvbxhnw3nrwr9jqv1fq5762xnkk8"; - name = "oxygen-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/oxygen-5.15.0.tar.xz"; + sha256 = "0w8j3v3cza1sy03d4wki09hr8w9a5pxrw7h3nlfnkj553svpn7rf"; + name = "oxygen-5.15.0.tar.xz"; }; }; plasma-browser-integration = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-browser-integration-5.14.5.tar.xz"; - sha256 = "1260h5sh0gkbkhcj17ss0n0y48i1pxh3f4p5dcbgbz775g1dhi2s"; - name = "plasma-browser-integration-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-browser-integration-5.15.0.tar.xz"; + sha256 = "0zp9cq8rd0bls73x0x6rgcmpi5amgp1xqaj3qc0w9k7zy93rqkb7"; + name = "plasma-browser-integration-5.15.0.tar.xz"; }; }; plasma-desktop = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-desktop-5.14.5.tar.xz"; - sha256 = "0pr07p36jrpvkk4fp14fb4minnwj5gnmvdg9jf7bi8sjjz6jpnnl"; - name = "plasma-desktop-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-desktop-5.15.0.tar.xz"; + sha256 = "0vp1xx89fwghr7chzhnv3faa41r4svnidjsx8izbihkzdqvhv7qh"; + name = "plasma-desktop-5.15.0.tar.xz"; }; }; plasma-integration = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-integration-5.14.5.tar.xz"; - sha256 = "15nhrliri4cjx712f1rxbq2f87lj4wxsqgbhw9p02z12h3n9z3ds"; - name = "plasma-integration-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-integration-5.15.0.tar.xz"; + sha256 = "0l8gpq1a10myjjv0ivwz6igdd6h3d0z3xc51nq5amajf5smhjk3i"; + name = "plasma-integration-5.15.0.tar.xz"; }; }; plasma-nm = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-nm-5.14.5.tar.xz"; - sha256 = "1hf98c9llcff0h2w4l45nw0vysxvnanf7hczhj93z4562qrafxm2"; - name = "plasma-nm-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-nm-5.15.0.tar.xz"; + sha256 = "1a018qs6dih1423nq6rfr961dr2w97r4hvn2ns627q0sh7sd4snn"; + name = "plasma-nm-5.15.0.tar.xz"; }; }; plasma-pa = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-pa-5.14.5.tar.xz"; - sha256 = "0z74qg7m4y1ifzni1877hiil3rn6ad3x4fvgv4bib4jhg7ckaiqg"; - name = "plasma-pa-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-pa-5.15.0.tar.xz"; + sha256 = "0kq72g7x660ybdqgvj0ngc5y749s5a5fkk9744470w12chnqs2hr"; + name = "plasma-pa-5.15.0.tar.xz"; }; }; plasma-sdk = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-sdk-5.14.5.tar.xz"; - sha256 = "0v90nk6yhrapdszh8sd3m0wffkjgnrhdy1sz1vl9s0ab5sdpmxr1"; - name = "plasma-sdk-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-sdk-5.15.0.tar.xz"; + sha256 = "04mq3qqr46l7mxyr7xih8rbb5xqfpi8v83hr2m5jndpdbmvi99d8"; + name = "plasma-sdk-5.15.0.tar.xz"; }; }; plasma-tests = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-tests-5.14.5.tar.xz"; - sha256 = "03h889xn6i067d1sdymn6fgj8xik3pa75lljl8kj3vl6bks24jyh"; - name = "plasma-tests-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-tests-5.15.0.tar.xz"; + sha256 = "0vaycdhmw98cilg8xsinybnk6ar1s102bzl6v8845ky30hn12bib"; + name = "plasma-tests-5.15.0.tar.xz"; }; }; plasma-vault = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-vault-5.14.5.tar.xz"; - sha256 = "17r44n0mkcwc2fkjf397ks8xv82m59gvnawbj9713c5l31ln5mi3"; - name = "plasma-vault-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-vault-5.15.0.tar.xz"; + sha256 = "0rj209xl1nrqgpv5x7z4c192jjnq0f2jx734qf47irll86s373q2"; + name = "plasma-vault-5.15.0.tar.xz"; }; }; plasma-workspace = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-5.14.5.tar.xz"; - sha256 = "14d3wnsm4bi1izx5qlpk0mnqmxwx18bqypa3wwmhn1535kfz8glh"; - name = "plasma-workspace-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-workspace-5.15.0.tar.xz"; + sha256 = "0rbvwx2df4k4z6l8qg3lgalnva1x2pm6i7vhaq1cjh30rfq9drn9"; + name = "plasma-workspace-5.15.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-wallpapers-5.14.5.tar.xz"; - sha256 = "17q0685i4267ihlrii3b8764ak458kzs0inqfcj9x25m338xz19q"; - name = "plasma-workspace-wallpapers-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plasma-workspace-wallpapers-5.15.0.tar.xz"; + sha256 = "1pb8ai38gl7z38kcf7cblh5ch1c9vwzkahp2zx4zb862wdkyqv8s"; + name = "plasma-workspace-wallpapers-5.15.0.tar.xz"; }; }; plymouth-kcm = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plymouth-kcm-5.14.5.tar.xz"; - sha256 = "1cwmkprhc4496x4a38l2x7hnifnp4daw8g1gic0ik2sm0a6xn77k"; - name = "plymouth-kcm-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/plymouth-kcm-5.15.0.tar.xz"; + sha256 = "1fddg5l27jn98prgq5417ypvngf2lkjg894vn48qkdi2kdrkbvns"; + name = "plymouth-kcm-5.15.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.14.5"; + version = "1-5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/polkit-kde-agent-1-5.14.5.tar.xz"; - sha256 = "1lzw4zq2ysnva5g1v85k9k6yck30wfgcy0sn1ncxy183vm36b2ag"; - name = "polkit-kde-agent-1-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/polkit-kde-agent-1-5.15.0.tar.xz"; + sha256 = "189s788f1iahrhg4i706g6rqiswvww48wx7m7pr8qc5hxvgrbwcb"; + name = "polkit-kde-agent-1-5.15.0.tar.xz"; }; }; powerdevil = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/powerdevil-5.14.5.tar.xz"; - sha256 = "0rdrj6k7bb1cisz1g8akxxn68c8rj0zddim1afvcq1iqr727wqj5"; - name = "powerdevil-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/powerdevil-5.15.0.tar.xz"; + sha256 = "04z49j18l27j4pv73zy0wpwjgy8vycakv7i1fpn78a5qv335vqqx"; + name = "powerdevil-5.15.0.tar.xz"; }; }; sddm-kcm = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/sddm-kcm-5.14.5.tar.xz"; - sha256 = "0aix2grc2h2w8qxcbdwxhvq09ispblnisl017bvb19apkvs0w8m1"; - name = "sddm-kcm-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/sddm-kcm-5.15.0.tar.xz"; + sha256 = "0ffk81lbv197mcyg477lkkj99qji745da06mngr2l4camhchjl5n"; + name = "sddm-kcm-5.15.0.tar.xz"; }; }; systemsettings = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/systemsettings-5.14.5.tar.xz"; - sha256 = "1q1ih74vkdhss64ayc3qmbrw4hhvfl3axlkhh63rky09qn83x9zw"; - name = "systemsettings-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/systemsettings-5.15.0.tar.xz"; + sha256 = "1g4j0xl75xr0cr98dr94cn184k93mbp0679pmwhmmxmc164vlx18"; + name = "systemsettings-5.15.0.tar.xz"; }; }; user-manager = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/user-manager-5.14.5.tar.xz"; - sha256 = "0aw2s029547rzx3xg9nib5w30d25978fpv7xyshxmp3z8rmzgcjv"; - name = "user-manager-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/user-manager-5.15.0.tar.xz"; + sha256 = "09ra1ixs7ybarcs59dzcbhnzvd0fk26i37wg49k95ln7i17zgd7z"; + name = "user-manager-5.15.0.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.14.5"; + version = "5.15.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/xdg-desktop-portal-kde-5.14.5.tar.xz"; - sha256 = "0h6hdk9fkf98jfjaza773k37369ayvwmwrgxn6al2pma6n07vddq"; - name = "xdg-desktop-portal-kde-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.0/xdg-desktop-portal-kde-5.15.0.tar.xz"; + sha256 = "1qljd6f4vxhsa6c8iw4pdc690g8s6a3nhrswg9r6nan5c0r2xr5k"; + name = "xdg-desktop-portal-kde-5.15.0.tar.xz"; }; }; } From 111e42e8a6437f47a96e64c0cbea0381ff65965f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Feb 2019 12:11:43 -0600 Subject: [PATCH 008/238] plasma-workspace.patch: rework for 5.15.0, bit rough --- .../plasma-workspace/plasma-workspace.patch | 143 ++++-------------- 1 file changed, 28 insertions(+), 115 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index dd5f7321f0e..4fac5645d1c 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -9,12 +9,12 @@ index 69d30705..52e91028 100644 -background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png +background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt -index cb75aeca..247db953 100644 +index 6a1a2121..f03fd349 100644 --- a/startkde/CMakeLists.txt +++ b/startkde/CMakeLists.txt -@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig) - add_subdirectory(ksyncdbusenv) +@@ -4,11 +4,6 @@ add_subdirectory(ksyncdbusenv) add_subdirectory(waitforname) + add_subdirectory(kcheckrunning) -#FIXME: reconsider, looks fishy -if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") @@ -36,7 +36,7 @@ index 493218ea..d507aa55 100644 + return system( NIXPKGS_KDOSTARTUPCONFIG5 ); } diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 714a9bf1..9733c612 100644 +index b68f0c68..a18efd96 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,22 +1,31 @@ @@ -81,7 +81,7 @@ index 714a9bf1..9733c612 100644 fi # Boot sequence: -@@ -33,61 +42,133 @@ fi +@@ -33,62 +42,134 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence @@ -176,6 +176,7 @@ index 714a9bf1..9733c612 100644 -ksplashrc KSplash Theme Breeze +ksplashrc KSplash Theme org.kde.breeze.desktop ksplashrc KSplash Engine KSplashQML + kdeglobals KScreen ScaleFactor '' kdeglobals KScreen ScreenScaleFactors '' kcmfonts General forceFontDPI 0 +kcmfonts General dontChangeAASettings true @@ -244,7 +245,7 @@ index 714a9bf1..9733c612 100644 #Do not sync any of this section with the wayland versions as there scale factors are #sent properly over wl_output -@@ -99,26 +180,33 @@ fi +@@ -104,26 +185,33 @@ fi #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us export QT_AUTO_SCREEN_SCALE_FACTOR=0 @@ -291,7 +292,7 @@ index 714a9bf1..9733c612 100644 Xft.dpi: $kcmfonts_general_forcefontdpi EOF fi -@@ -127,11 +215,11 @@ dl=$DESKTOP_LOCKED +@@ -132,11 +220,11 @@ dl=$DESKTOP_LOCKED unset DESKTOP_LOCKED # Don't want it in the environment ksplash_pid= @@ -305,7 +306,7 @@ index 714a9bf1..9733c612 100644 ;; None) ;; -@@ -140,69 +228,6 @@ if test -z "$dl"; then +@@ -145,27 +233,6 @@ if test -z "$dl"; then esac fi @@ -329,53 +330,11 @@ index 714a9bf1..9733c612 100644 - test -r "$file" && . "$file" || true - done -done -- --# Activate the kde font directories. --# --# There are 4 directories that may be used for supplying fonts for KDE. --# --# There are two system directories. These belong to the administrator. --# There are two user directories, where the user may add her own fonts. --# --# The 'override' versions are for fonts that should come first in the list, --# i.e. if you have a font in your 'override' directory, it will be used in --# preference to any other. --# --# The preference order looks like this: --# user override, system override, X, user, system --# --# Where X is the original font database that was set up before this script --# runs. -- --usr_odir=$HOME/.fonts/kde-override --usr_fdir=$HOME/.fonts -- --if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -- sys_odir=$kdedirs_first/share/fonts/override -- sys_fdir=$kdedirs_first/share/fonts --else -- sys_odir=$KDEDIR/share/fonts/override -- sys_fdir=$KDEDIR/share/fonts --fi -- --# We run mkfontdir on the user's font dirs (if we have permission) to pick --# up any new fonts they may have installed. If mkfontdir fails, we still --# add the user's dirs to the font path, as they might simply have been made --# read-only by the administrator, for whatever reason. -- --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -- --# Ask X11 to rebuild its font list. --xset fp rehash - # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is # especially necessary on slow machines, where starting KDE takes one or two -@@ -257,44 +282,65 @@ export XDG_DATA_DIRS +@@ -221,44 +288,65 @@ export XDG_DATA_DIRS # KDE_FULL_SESSION=true export KDE_FULL_SESSION @@ -454,7 +413,7 @@ index 714a9bf1..9733c612 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -306,12 +352,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@@ -270,12 +358,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. @@ -474,7 +433,7 @@ index 714a9bf1..9733c612 100644 if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 -@@ -322,36 +372,36 @@ fi +@@ -286,36 +378,36 @@ fi #Anything after here is logout #It is not called after shutdown/restart @@ -525,7 +484,7 @@ index 714a9bf1..9733c612 100644 echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index de98541c..39c0b521 100644 +index 1fe41c59..39c0b521 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,6 +1,6 @@ @@ -573,62 +532,14 @@ index de98541c..39c0b521 100644 ;; None) ;; -@@ -50,48 +48,6 @@ fi - #In wayland we want Plasma to use Qt's scaling - export PLASMA_USE_QT_SCALING=1 - --# Activate the kde font directories. --# --# There are 4 directories that may be used for supplying fonts for KDE. --# --# There are two system directories. These belong to the administrator. --# There are two user directories, where the user may add her own fonts. --# --# The 'override' versions are for fonts that should come first in the list, --# i.e. if you have a font in your 'override' directory, it will be used in --# preference to any other. --# --# The preference order looks like this: --# user override, system override, X, user, system --# --# Where X is the original font database that was set up before this script --# runs. -- --usr_odir=$HOME/.fonts/kde-override --usr_fdir=$HOME/.fonts -- --if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -- sys_odir=$kdedirs_first/share/fonts/override -- sys_fdir=$kdedirs_first/share/fonts --else -- sys_odir=$KDEDIR/share/fonts/override -- sys_fdir=$KDEDIR/share/fonts --fi -- --# We run mkfontdir on the user's font dirs (if we have permission) to pick --# up any new fonts they may have installed. If mkfontdir fails, we still --# add the user's dirs to the font path, as they might simply have been made --# read-only by the administrator, for whatever reason. -- --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -- --# Ask X11 to rebuild its font list. --xset fp rehash -- - # Set a left cursor instead of the standard X11 "X" cursor, since I've heard - # from some users that they're confused and don't know what to do. This is - # especially necessary on slow machines, where starting KDE takes one or two -@@ -100,22 +56,13 @@ xset fp rehash +@@ -58,23 +56,13 @@ export PLASMA_USE_QT_SCALING=1 # If the user has overwritten fonts, the cursor font may be different now # so don't move this up. # -xsetroot -cursor_name left_ptr - -# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap +-usr_fdir=$HOME/.fonts -if test -n "$GS_LIB" ; then - GS_LIB=$usr_fdir:$GS_LIB - export GS_LIB @@ -648,7 +559,7 @@ index de98541c..39c0b521 100644 # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then -@@ -131,16 +78,15 @@ fi +@@ -90,16 +78,15 @@ fi # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. @@ -667,7 +578,7 @@ index de98541c..39c0b521 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -166,19 +112,19 @@ fi +@@ -125,19 +112,19 @@ fi #Anything after here is logout #It is not called after shutdown/restart @@ -695,7 +606,7 @@ index de98541c..39c0b521 100644 done break fi -@@ -187,15 +133,17 @@ fi +@@ -146,15 +133,17 @@ fi echo 'startplasma: Shutting down...' 1>&2 # just in case @@ -718,7 +629,7 @@ index de98541c..39c0b521 100644 echo 'startplasma: Done.' 1>&2 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index dd9e304d..12132f9e 100644 +index dcb473a4..48dbf465 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake @@ -1,118 +1,165 @@ @@ -922,18 +833,18 @@ index dd9e304d..12132f9e 100644 #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output export QT_AUTO_SCREEN_SCALE_FACTOR=0 --# XCursor mouse theme needs to be applied here to work even for kded or ksmserver --if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then -- @EXPORT_XCURSOR_PATH@ +XCURSOR_PATH=~/.icons +IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" +for xdgDir in "${xdgDirs[@]}"; do + XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" +done +export XCURSOR_PATH - ++ + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver +-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then +- @EXPORT_XCURSOR_PATH@ +- - # TODO: is kapplymousetheme a core app? -+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver +if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" - if test $? -eq 10; then @@ -1018,7 +929,7 @@ index dd9e304d..12132f9e 100644 : # ok else echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 -@@ -212,26 +228,47 @@ export KDE_FULL_SESSION +@@ -212,7 +228,7 @@ export KDE_FULL_SESSION KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION @@ -1027,7 +938,9 @@ index dd9e304d..12132f9e 100644 export KDE_SESSION_UID XDG_CURRENT_DESKTOP=KDE - export XDG_CURRENT_DESKTOP +@@ -221,20 +237,41 @@ export XDG_CURRENT_DESKTOP + XDG_SESSION_TYPE=wayland + export XDG_SESSION_TYPE +# Source scripts found in /plasma-workspace/env/*.sh +# (where correspond to the system and user's configuration From 40da4fb9df2a032d14f9cef0604cea117783b064 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Feb 2019 12:50:53 -0600 Subject: [PATCH 009/238] breeze-gtk: add deps to fix build --- pkgs/desktops/plasma-5/breeze-gtk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index cc51c4b0471..1be3fe1c309 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, }: +{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, sassc, python3, breeze-qt5 }: let inherit (lib) getLib; in mkDerivation { name = "breeze-gtk"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules sassc python3 python3.pkgs.pycairo breeze-qt5 ]; buildInputs = [ qtbase ]; postPatch = '' sed -i cmake/FindGTKEngine.cmake \ From 33ef2829b663945d0d7ae702a6f5f5f342760401 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Mon, 18 Feb 2019 17:31:59 -0500 Subject: [PATCH 010/238] perlPackages.TermReadKey: add workarounds for cross compilation --- .../perl-modules/generic/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index a87e0c616fd..5b4d9ffa15c 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perl }: +{ lib, stdenv, perl, buildPackages }: { nativeBuildInputs ? [], name, ... } @ attrs: @@ -37,6 +37,6 @@ stdenv.mkDerivation ( name = "perl${perl.version}-${name}"; builder = ./builder.sh; nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; - inherit perl; + perl = buildPackages.perl; } ) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2866f6b6ca5..5b74b0a3ee2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5,7 +5,8 @@ for each package in a separate file: the call to the function would be almost as much code as the function itself. */ -{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}: +{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides, + buildPackages}: # cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.1 or above assert stdenv.lib.versionAtLeast perl.version "5.28.1"; @@ -14587,6 +14588,22 @@ let url = "mirror://cpan/authors/id/J/JS/JSTOWE/${name}.tar.gz"; sha256 = "0hdj5mldpj3pyprd4hbbalfx9yjgi5p59gg2ixk9808f5v7q74sa"; }; + cross = stdenv.hostPlatform != stdenv.buildPlatform; + + # use native libraries from the host when running build commands + postConfigure = if cross then let + host_perl = buildPackages.perl; + host_self = buildPackages.perlPackages.TermReadKey; + perl_lib = "${host_perl}/lib/perl5/${host_perl.version}"; + self_lib = "${host_self}/lib/perl5/site_perl/${host_perl.version}"; + in '' + sed -ie 's|"-I$(INST_ARCHLIB)"|"-I${perl_lib}" "-I${self_lib}"|g' Makefile + '' else null; + + # TermReadKey uses itself in the build process + nativeBuildInputs = if cross then [ + buildPackages.perlPackages.TermReadKey + ] else []; }; TermReadLineGnu = buildPerlPackage rec { From c5639650b83c556b3f017523475184aa6c42a2cf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 20:56:09 -0500 Subject: [PATCH 011/238] darwin.binutils: add myself as maintainer --- pkgs/os-specific/darwin/binutils/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index db33b78a4ab..5ba4371c3bb 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -52,4 +52,8 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; }; + + meta = { + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; } From a4fbfe4217bfbe3b8ed1ddad606e9e559ae3d2e9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:09:14 -0500 Subject: [PATCH 012/238] darwin.binutils: set low priority --- pkgs/os-specific/darwin/binutils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 5ba4371c3bb..3b5e8f1207a 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation { meta = { maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + priority = 10; }; } From 228f2ea6a75ffe3e383b5087d777428d72b99b6c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:09:47 -0500 Subject: [PATCH 013/238] unix-tools: set low priority --- pkgs/top-level/unix-tools.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 7d498606833..00edb7c0907 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -20,7 +20,10 @@ let bin = "${getBin provider}/bin/${cmd}"; manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz"; in runCommand "${cmd}-${version}" { - meta.platforms = map (n: { kernel.name = n; }) (attrNames providers); + meta = { + priority = 10; + platforms = map (n: { kernel.name = n; }) (attrNames providers); + }; passthru = { inherit provider; }; preferLocalBuild = true; } '' From 9f6f223c1821681f992a461ca97492189a2a5fd7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:10:12 -0500 Subject: [PATCH 014/238] bintools-wrapper: set low priority --- pkgs/build-support/bintools-wrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 4122af898de..03ba54525bf 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -326,6 +326,7 @@ stdenv.mkDerivation { { description = stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; + priority = 10; } // optionalAttrs useMacosReexportHack { platforms = stdenv.lib.platforms.darwin; }; From 83254ec1af301c1a1178942b106c2e89ecfde8a2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:11:16 -0500 Subject: [PATCH 015/238] gnutar: set low priority --- pkgs/tools/archivers/gnutar/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index a6f5052ad08..8ec34ce6730 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -62,5 +62,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.all; + + priority = 10; }; } From fce294caab31427f901a8723cee68dc91577f493 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:11:33 -0500 Subject: [PATCH 016/238] coreutils: set low priority --- pkgs/tools/misc/coreutils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 3a348650308..fabb58a33d6 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -122,6 +122,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix ++ platforms.windows; + priority = 10; + maintainers = [ maintainers.eelco ]; }; From 6fc5ce2c4f765ce8edb4368557884ba1d7e2c53e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 18 Feb 2019 21:16:30 -0500 Subject: [PATCH 017/238] nixos/system-path.nix: add 3 to every priority MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can’t use lowPrio here because it erases the differences in priority of the packages by setting it to a constant value. see this comment for info: https://github.com/NixOS/nixpkgs/issues/55886#issuecomment-464766877 --- nixos/modules/config/system-path.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 7a65e44e828..fae2fc74008 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -7,7 +7,7 @@ with lib; let - requiredPackages = map lib.lowPrio + requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg) [ config.nix.package pkgs.acl pkgs.attr From 42a3718e704f0488af2e942cf5d64250d8f74b97 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 21 Feb 2019 12:52:10 -0600 Subject: [PATCH 018/238] plasma-5: 5.15.0 -> 5.15.1 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++---------------- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index a94df11aa7e..c4b43cf2e4b 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.15.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 3139da18294..618f5423fc5 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/bluedevil-5.15.0.tar.xz"; - sha256 = "10ii06lzx0dldplcwmwba0aa18swip9v4rgyqzdy1idhphi2v9il"; - name = "bluedevil-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/bluedevil-5.15.1.tar.xz"; + sha256 = "1h67yj055s345vy9yjdndr43fw5wnhnnyrr5bwxp7c4cg1z3m82r"; + name = "bluedevil-5.15.1.tar.xz"; }; }; breeze = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/breeze-5.15.0.tar.xz"; - sha256 = "06vk7br3i0r1lp4li7wd3fywxgz08yyim2gnrimni1xxn7kbh3ln"; - name = "breeze-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/breeze-5.15.1.tar.xz"; + sha256 = "105d8031nks39p66mfxaw1xdq0q6giww2b381phrp590b69941fh"; + name = "breeze-5.15.1.tar.xz"; }; }; breeze-grub = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/breeze-grub-5.15.0.tar.xz"; - sha256 = "1na8n7l3brx3bg9b1va4kbihwaaw1j627ic0dn1pv4amx70rjzk2"; - name = "breeze-grub-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/breeze-grub-5.15.1.tar.xz"; + sha256 = "04xrvsgjw57vxs18d286amfbr8cwpknrl615yk7ws849c9jlyvlm"; + name = "breeze-grub-5.15.1.tar.xz"; }; }; breeze-gtk = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/breeze-gtk-5.15.0.tar.xz"; - sha256 = "0fvmiikg5bn9ps2qjlhr7ly7nb0rk9yvn56mj4ymx9s8cai62f5m"; - name = "breeze-gtk-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/breeze-gtk-5.15.1.tar.xz"; + sha256 = "1fjgabvgz4vkz3zyj9r95gr0f4m8dhbhagw0qjcw943ac85sbvmp"; + name = "breeze-gtk-5.15.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/breeze-plymouth-5.15.0.tar.xz"; - sha256 = "0mdjr3hdjwbazs7lnnl036rwiw0qcym1naf3x48awq2n1q7qryh8"; - name = "breeze-plymouth-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/breeze-plymouth-5.15.1.tar.xz"; + sha256 = "18yg9lhbz5m50w4f24fb9vdv70hhfd7y17bcrz90yl9fr4m6sf41"; + name = "breeze-plymouth-5.15.1.tar.xz"; }; }; discover = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/discover-5.15.0.tar.xz"; - sha256 = "048d2xims4ykl6142x7a1hrj3ycbsl4yvcynjsgi1jmxdxwl0xc9"; - name = "discover-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/discover-5.15.1.tar.xz"; + sha256 = "12j5jv54yl158x6w5xc07qdxpm9k5ljgh9yd0q2br0khkywkpmng"; + name = "discover-5.15.1.tar.xz"; }; }; drkonqi = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/drkonqi-5.15.0.tar.xz"; - sha256 = "1kili1ya44yps3mrn79rnjlp84qz4rnl3bpmwaaknng3qcs89ks9"; - name = "drkonqi-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/drkonqi-5.15.1.tar.xz"; + sha256 = "1bg4ih99p5rcxs0cq8xrbm7rkk19z4sif6zsbd71k6hymq2myjgy"; + name = "drkonqi-5.15.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kactivitymanagerd-5.15.0.tar.xz"; - sha256 = "1mnq620af7p5nazp4mafgb8a2wwacc6gvq2aax3lqg6pd6kl63qd"; - name = "kactivitymanagerd-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kactivitymanagerd-5.15.1.tar.xz"; + sha256 = "1cnvbplsw18fb6yq4hkcsngfy52p4r0c4qyygriwrla9dwpikr76"; + name = "kactivitymanagerd-5.15.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kde-cli-tools-5.15.0.tar.xz"; - sha256 = "1869lnigr6hiwjrrncvkak8vivjy6hff47yqbdv8v455p5sw39d0"; - name = "kde-cli-tools-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kde-cli-tools-5.15.1.tar.xz"; + sha256 = "0bj71nlmns5pr3bi7rxlr3wxw8y46x3rp8ax2n8v6v2la6hsmvyb"; + name = "kde-cli-tools-5.15.1.tar.xz"; }; }; kdecoration = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kdecoration-5.15.0.tar.xz"; - sha256 = "1pcyw6rrz0q7i2jnfvmjz2pixiw2aay19q3pxa1g3qvqydh3id5q"; - name = "kdecoration-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kdecoration-5.15.1.tar.xz"; + sha256 = "03lxnjbhlnyiw2znflp0f2w77a5pzv5yvsbngvwgp89ig9mansi1"; + name = "kdecoration-5.15.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kde-gtk-config-5.15.0.tar.xz"; - sha256 = "157jhcaxvslcpkc1l6r50wiq4jp5p2vvj8xpplmx24lgxv4c13ay"; - name = "kde-gtk-config-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kde-gtk-config-5.15.1.tar.xz"; + sha256 = "1cb78bg0w2slyi1jyclzd34rn055m86rfp6hi4fhbyglg5ci3arh"; + name = "kde-gtk-config-5.15.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kdeplasma-addons-5.15.0.tar.xz"; - sha256 = "0d467zypmcz6faj4499abww51pxylwh6s2ml5swpc7lcxhsi37i2"; - name = "kdeplasma-addons-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kdeplasma-addons-5.15.1.tar.xz"; + sha256 = "0477aaj6nynckm5zah09l6nfn320kwislgw0qrz7giygwyy0gxvy"; + name = "kdeplasma-addons-5.15.1.tar.xz"; }; }; kgamma5 = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kgamma5-5.15.0.tar.xz"; - sha256 = "1hnkfp11nmcyf6gnq04hri3x4i0n52nmadb6hhx0y5chgdrqf85z"; - name = "kgamma5-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kgamma5-5.15.1.tar.xz"; + sha256 = "1yvpg86jzkdw6al7a6xi5r15rnprj0d8vx7z1ip23pf5l9xcjs8w"; + name = "kgamma5-5.15.1.tar.xz"; }; }; khotkeys = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/khotkeys-5.15.0.tar.xz"; - sha256 = "00nbmmbwx7cvp1y3dgx4ccbpsa29flhg2dcv2a5p9bs7pnfbgs9w"; - name = "khotkeys-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/khotkeys-5.15.1.tar.xz"; + sha256 = "1v9cvlqgwyfq5jdvg3alvc63vjdvkvk60j8jba7ls0p1i5hq38xn"; + name = "khotkeys-5.15.1.tar.xz"; }; }; kinfocenter = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kinfocenter-5.15.0.tar.xz"; - sha256 = "1iinf500n7jbf7yz8g8bmfc24f113gsyp77d7n80sikzznggq8gk"; - name = "kinfocenter-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kinfocenter-5.15.1.tar.xz"; + sha256 = "1iscfi83fm2mpwi27ik0l5ll9cnpjfdxzqiqhwlcy12sjbhwk596"; + name = "kinfocenter-5.15.1.tar.xz"; }; }; kmenuedit = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kmenuedit-5.15.0.tar.xz"; - sha256 = "0hzlhwbfzbz964v65n41ng0p72my46c8429xxhkamk82g99yywwq"; - name = "kmenuedit-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kmenuedit-5.15.1.tar.xz"; + sha256 = "17vja6zxvfbng9gmminnvsr0ybs8rb0ivj8phac9b1vpjs18h7j2"; + name = "kmenuedit-5.15.1.tar.xz"; }; }; kscreen = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kscreen-5.15.0.tar.xz"; - sha256 = "0xnj3gwqxcmdqkshm1qbmyiqqx84l5vc2cf3vx3xa1rvf3y77zac"; - name = "kscreen-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kscreen-5.15.1.tar.xz"; + sha256 = "1bypz921clk4cmfz59vgczblbhbgc0wilrldjwnw8cxapkppk9zy"; + name = "kscreen-5.15.1.tar.xz"; }; }; kscreenlocker = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kscreenlocker-5.15.0.tar.xz"; - sha256 = "1hgj2mzbbiqn52j3px2mzz6xzzpzr78q3bcai8ddc4gcl1xgs6yi"; - name = "kscreenlocker-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kscreenlocker-5.15.1.tar.xz"; + sha256 = "1jp2z1wjsd99is31igkfnscs55h755cmp86ppkj596fcxv1krymq"; + name = "kscreenlocker-5.15.1.tar.xz"; }; }; ksshaskpass = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/ksshaskpass-5.15.0.tar.xz"; - sha256 = "0d6s11v3gk733zz4i1rccyq4g18023z64xj1wajyp8wg8kr7jd54"; - name = "ksshaskpass-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/ksshaskpass-5.15.1.tar.xz"; + sha256 = "04ln1vk4xifazc8ynxbpiy2wx8kya7i92rf3m873x1q10w5kgjqq"; + name = "ksshaskpass-5.15.1.tar.xz"; }; }; ksysguard = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/ksysguard-5.15.0.tar.xz"; - sha256 = "1aa4fw7zljw8a9dymwns1vmm687ixp8w71xc2gcgkkas0ankzpj1"; - name = "ksysguard-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/ksysguard-5.15.1.tar.xz"; + sha256 = "11h5dxl6fsgcmf8lhlgrjdhx31vn20z38aj6762zij3m61g5qjpy"; + name = "ksysguard-5.15.1.tar.xz"; }; }; kwallet-pam = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kwallet-pam-5.15.0.tar.xz"; - sha256 = "0vysmjmrsq9n5zls7sr64073164hbghgyxlmwmflm532lr9756fk"; - name = "kwallet-pam-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kwallet-pam-5.15.1.tar.xz"; + sha256 = "0r45sxx49q0190l75nm56g2k4w9n9ij96894lp2s6yl753cs0bq3"; + name = "kwallet-pam-5.15.1.tar.xz"; }; }; kwayland-integration = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kwayland-integration-5.15.0.tar.xz"; - sha256 = "0gpgmwy2z6avql4ljgr7278l0aqsp14rg1sfnj70dxwp1lai3kqj"; - name = "kwayland-integration-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kwayland-integration-5.15.1.tar.xz"; + sha256 = "1z4xncdd66zkvy9wbavyvyairmffv1qd1vza7cn919j40xzmz0nq"; + name = "kwayland-integration-5.15.1.tar.xz"; }; }; kwin = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kwin-5.15.0.tar.xz"; - sha256 = "0f0pdxnyz8zckl3hnjvxb40cnrvi8jyfs9ckjjv17ald1nn3wc9w"; - name = "kwin-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kwin-5.15.1.tar.xz"; + sha256 = "1h991mfz6qs30m06ppl76l61kp9g1s6bxhhlf66183b4pa1cj7pr"; + name = "kwin-5.15.1.tar.xz"; }; }; kwrited = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/kwrited-5.15.0.tar.xz"; - sha256 = "1zfhm7kljaxhc54d76ifd971qpd2mlaiaq2yxgd06lvlnhwi2lgc"; - name = "kwrited-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/kwrited-5.15.1.tar.xz"; + sha256 = "1l9da8srbp7cs56h8wsl91vzg8hww91vxic61grmc1qn37ag72a3"; + name = "kwrited-5.15.1.tar.xz"; }; }; libkscreen = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/libkscreen-5.15.0.tar.xz"; - sha256 = "1clw8966fmwih1fsjasvpgvfq7w728hlabl3i0zjz53r87hdw3mb"; - name = "libkscreen-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/libkscreen-5.15.1.tar.xz"; + sha256 = "1zpzqafrb576al10f5873nl1z135gscjza6gd3ickfzlvd9qmr18"; + name = "libkscreen-5.15.1.tar.xz"; }; }; libksysguard = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/libksysguard-5.15.0.tar.xz"; - sha256 = "1aqkzbng2qq09rpb21r6drnn866b9y8yba3klhvhi0q5vg3p605d"; - name = "libksysguard-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/libksysguard-5.15.1.tar.xz"; + sha256 = "0ml106yq4q9qagkrcaafgcky18wk76px5a1r6j36wfjqdd6wpzvs"; + name = "libksysguard-5.15.1.tar.xz"; }; }; milou = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/milou-5.15.0.tar.xz"; - sha256 = "08fpfv8cmfjzn1rwgfxnl42nafnhzcxyv8jpzs182c8n37wgdy1p"; - name = "milou-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/milou-5.15.1.tar.xz"; + sha256 = "1c7vjsnmn35psdmpi8iw9dkrzjqi3fr3p4i9m71anaqjnzdc1pwi"; + name = "milou-5.15.1.tar.xz"; }; }; oxygen = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/oxygen-5.15.0.tar.xz"; - sha256 = "0w8j3v3cza1sy03d4wki09hr8w9a5pxrw7h3nlfnkj553svpn7rf"; - name = "oxygen-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/oxygen-5.15.1.tar.xz"; + sha256 = "1vk4xqn7s608vc1j9zv2xkmcjhhm6g1xzyimk7d88pyvaaz44ydv"; + name = "oxygen-5.15.1.tar.xz"; }; }; plasma-browser-integration = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-browser-integration-5.15.0.tar.xz"; - sha256 = "0zp9cq8rd0bls73x0x6rgcmpi5amgp1xqaj3qc0w9k7zy93rqkb7"; - name = "plasma-browser-integration-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-browser-integration-5.15.1.tar.xz"; + sha256 = "1sqzxzl0y2rpamalazahi192b2qvzj5l1ahl1h7661h2ldncfrra"; + name = "plasma-browser-integration-5.15.1.tar.xz"; }; }; plasma-desktop = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-desktop-5.15.0.tar.xz"; - sha256 = "0vp1xx89fwghr7chzhnv3faa41r4svnidjsx8izbihkzdqvhv7qh"; - name = "plasma-desktop-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-desktop-5.15.1.tar.xz"; + sha256 = "13401nra145a7088yrrjgkwq21x4y4m4q0a5gqm0vx59nsd7cwpz"; + name = "plasma-desktop-5.15.1.tar.xz"; }; }; plasma-integration = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-integration-5.15.0.tar.xz"; - sha256 = "0l8gpq1a10myjjv0ivwz6igdd6h3d0z3xc51nq5amajf5smhjk3i"; - name = "plasma-integration-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-integration-5.15.1.tar.xz"; + sha256 = "0ksgsn4dlaz3b2ml98nm5bg43zpz03draibbh5whbsckwkp61nb9"; + name = "plasma-integration-5.15.1.tar.xz"; }; }; plasma-nm = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-nm-5.15.0.tar.xz"; - sha256 = "1a018qs6dih1423nq6rfr961dr2w97r4hvn2ns627q0sh7sd4snn"; - name = "plasma-nm-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-nm-5.15.1.tar.xz"; + sha256 = "0z3vk2z0mljyxdak2kxbwk4nbwry7lkdqz5cpfhc8hicd0ql051s"; + name = "plasma-nm-5.15.1.tar.xz"; }; }; plasma-pa = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-pa-5.15.0.tar.xz"; - sha256 = "0kq72g7x660ybdqgvj0ngc5y749s5a5fkk9744470w12chnqs2hr"; - name = "plasma-pa-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-pa-5.15.1.tar.xz"; + sha256 = "1p5i32h5abqrw19g5zzv01g36q8r0sf80yd3zig0m69ywc0p6si0"; + name = "plasma-pa-5.15.1.tar.xz"; }; }; plasma-sdk = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-sdk-5.15.0.tar.xz"; - sha256 = "04mq3qqr46l7mxyr7xih8rbb5xqfpi8v83hr2m5jndpdbmvi99d8"; - name = "plasma-sdk-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-sdk-5.15.1.tar.xz"; + sha256 = "0bvvfdd4i43zqrqcnikl6q9vd2z0nlgq0jl1b7b40f0av4ipyzpb"; + name = "plasma-sdk-5.15.1.tar.xz"; }; }; plasma-tests = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-tests-5.15.0.tar.xz"; - sha256 = "0vaycdhmw98cilg8xsinybnk6ar1s102bzl6v8845ky30hn12bib"; - name = "plasma-tests-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-tests-5.15.1.tar.xz"; + sha256 = "17cmxjrlziyndf70my4v6gv8kxqnqvfx4k34wawv7mqkxy5qrj2i"; + name = "plasma-tests-5.15.1.tar.xz"; }; }; plasma-vault = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-vault-5.15.0.tar.xz"; - sha256 = "0rj209xl1nrqgpv5x7z4c192jjnq0f2jx734qf47irll86s373q2"; - name = "plasma-vault-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-vault-5.15.1.tar.xz"; + sha256 = "072vij7jgmsm8z9wgcaw83n48z8bsh4hnhw0grdxxhcsrb7z4xdz"; + name = "plasma-vault-5.15.1.tar.xz"; }; }; plasma-workspace = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-workspace-5.15.0.tar.xz"; - sha256 = "0rbvwx2df4k4z6l8qg3lgalnva1x2pm6i7vhaq1cjh30rfq9drn9"; - name = "plasma-workspace-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-workspace-5.15.1.tar.xz"; + sha256 = "1dlskyjk2a6xagpsvn1mqal903ps3w82pk73vf0qbjdndkya526n"; + name = "plasma-workspace-5.15.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plasma-workspace-wallpapers-5.15.0.tar.xz"; - sha256 = "1pb8ai38gl7z38kcf7cblh5ch1c9vwzkahp2zx4zb862wdkyqv8s"; - name = "plasma-workspace-wallpapers-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plasma-workspace-wallpapers-5.15.1.tar.xz"; + sha256 = "1h4526kawc3r4blldk9zcx6nqhq7yzpamjhbqpwbd7lhmcv2y97a"; + name = "plasma-workspace-wallpapers-5.15.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/plymouth-kcm-5.15.0.tar.xz"; - sha256 = "1fddg5l27jn98prgq5417ypvngf2lkjg894vn48qkdi2kdrkbvns"; - name = "plymouth-kcm-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/plymouth-kcm-5.15.1.tar.xz"; + sha256 = "19dhfba54nm62lcgffx1q1131g3rm7h7ic0mx78avqsjm4yzq7q4"; + name = "plymouth-kcm-5.15.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.15.0"; + version = "1-5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/polkit-kde-agent-1-5.15.0.tar.xz"; - sha256 = "189s788f1iahrhg4i706g6rqiswvww48wx7m7pr8qc5hxvgrbwcb"; - name = "polkit-kde-agent-1-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/polkit-kde-agent-1-5.15.1.tar.xz"; + sha256 = "1bj6zq693fzv215npwh2swbqxy1zn8hsd4ka5yj6w89z4j7j8mz7"; + name = "polkit-kde-agent-1-5.15.1.tar.xz"; }; }; powerdevil = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/powerdevil-5.15.0.tar.xz"; - sha256 = "04z49j18l27j4pv73zy0wpwjgy8vycakv7i1fpn78a5qv335vqqx"; - name = "powerdevil-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/powerdevil-5.15.1.tar.xz"; + sha256 = "0qf6vz55cy76ann11glwanpwbv0la1rvwdy7sqy8qj2ldi7agqsh"; + name = "powerdevil-5.15.1.tar.xz"; }; }; sddm-kcm = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/sddm-kcm-5.15.0.tar.xz"; - sha256 = "0ffk81lbv197mcyg477lkkj99qji745da06mngr2l4camhchjl5n"; - name = "sddm-kcm-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/sddm-kcm-5.15.1.tar.xz"; + sha256 = "0lpz9a4qrraxss6avnghbf8ddlasg28c88pn8jdj12mzmqnamijf"; + name = "sddm-kcm-5.15.1.tar.xz"; }; }; systemsettings = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/systemsettings-5.15.0.tar.xz"; - sha256 = "1g4j0xl75xr0cr98dr94cn184k93mbp0679pmwhmmxmc164vlx18"; - name = "systemsettings-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/systemsettings-5.15.1.tar.xz"; + sha256 = "0522rmbp93li3zafw0ir5zck43pi55z54wf4p4zhfs61ifp1y0kh"; + name = "systemsettings-5.15.1.tar.xz"; }; }; user-manager = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/user-manager-5.15.0.tar.xz"; - sha256 = "09ra1ixs7ybarcs59dzcbhnzvd0fk26i37wg49k95ln7i17zgd7z"; - name = "user-manager-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/user-manager-5.15.1.tar.xz"; + sha256 = "0i4drbl3q9m09js7p1rgggps7w33mfr6lksflcw7743bcyfaqz7a"; + name = "user-manager-5.15.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.0/xdg-desktop-portal-kde-5.15.0.tar.xz"; - sha256 = "1qljd6f4vxhsa6c8iw4pdc690g8s6a3nhrswg9r6nan5c0r2xr5k"; - name = "xdg-desktop-portal-kde-5.15.0.tar.xz"; + url = "${mirror}/stable/plasma/5.15.1/xdg-desktop-portal-kde-5.15.1.tar.xz"; + sha256 = "1zsi2aa64zi4h53xkamiy6x622jy81qawfc66gv2gjdvapycbd3g"; + name = "xdg-desktop-portal-kde-5.15.1.tar.xz"; }; }; } From 5883ef9dc2420a0dc30aa7da443d2dc4b4414b6d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Feb 2019 01:38:03 -0600 Subject: [PATCH 019/238] krb5: 1.15.2 -> 1.15.5 https://web.mit.edu/kerberos/krb5-1.15/krb5-1.15.3.html https://web.mit.edu/kerberos/krb5-1.15/krb5-1.15.4.html https://web.mit.edu/kerberos/krb5-1.15/krb5-1.15.5.html --- pkgs/development/libraries/kerberos/krb5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 6ff6bb95591..990687e5aed 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -15,11 +15,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; majorVersion = "1.15"; - version = "${majorVersion}.2"; + version = "${majorVersion}.5"; src = fetchurl { - url = "${meta.homepage}dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; - sha256 = "0zn8s7anb10hw3nzwjz7vg10fgmmgvwnibn2zrn3nppjxn9f6f8n"; + url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; + sha256 = "1fiywc3daaqsvj09lymqd3qd5kz51w13krh60j93z18g78nix23q"; }; outputs = [ "out" "dev" ]; From 934c6bb7b9717dbd3258efb3d58eb0b54464ad17 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Feb 2019 01:40:04 -0600 Subject: [PATCH 020/238] krb5: 1.15.5 -> 1.17 https://web.mit.edu/kerberos/krb5-1.17/ https://web.mit.edu/kerberos/krb5-1.16/krb5-1.16.2.html https://web.mit.edu/kerberos/krb5-1.16/krb5-1.16.1.html https://web.mit.edu/kerberos/krb5-1.16/krb5-1.16.html --- pkgs/development/libraries/kerberos/krb5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 990687e5aed..a2b78231f74 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -14,12 +14,12 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - majorVersion = "1.15"; - version = "${majorVersion}.5"; + majorVersion = "1.17"; + version = "${majorVersion}"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; - sha256 = "1fiywc3daaqsvj09lymqd3qd5kz51w13krh60j93z18g78nix23q"; + sha256 = "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs"; }; outputs = [ "out" "dev" ]; From 148d8392c0b52f12d5152d27fb87f2ee6b94be98 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Feb 2019 14:39:12 -0600 Subject: [PATCH 021/238] sqlite{,-analyzer}: 3.26.0 -> 3.27.1 https://sqlite.org/releaselog/3_27_1.html https://sqlite.org/releaselog/3_27_0.html --- pkgs/development/libraries/sqlite/analyzer.nix | 6 +++--- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 0a63f5e778a..b8fa04c5192 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.26.0"; + version = "3.27.1"; src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0ysgi2jrl348amdfifsl3cx90d04bijm4pn4xnvivmi3m1dq4hp0"; + url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip"; + sha256 = "11jrr14ld9cs9l5pz3z83xds1mhsqwgg47vwdx8rq6p667dc9z7h"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 100f7fec06a..d45484f9de9 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.26.0"; + version = "3.27.1"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx"; + url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "1y7l225jm18fz6z3vyffrkl9k6qi964w1c5ri4giixizyy7jpaal"; }; outputs = [ "bin" "dev" "out" ]; From 0e9ca1bfc188007c811b2e544d30ba5f2cfa574f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 23 Feb 2019 09:18:19 +0000 Subject: [PATCH 022/238] glibc: fix cross-build glibc's buildsystem uses its own executables to generate locales. This does not work for cross-compilation so instead we use localedef from buildPackages. --- pkgs/development/libraries/glibc/default.nix | 23 +++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index e46985d3fca..561f8d255ce 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -2,6 +2,7 @@ , withLinuxHeaders ? true , profilingLibraries ? false , withGd ? false +, buildPackages }: callPackage ./common.nix { inherit stdenv; } { @@ -55,9 +56,29 @@ callPackage ./common.nix { inherit stdenv; } { fi ''; - postInstall = '' + postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales + '' else '' + # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html + # Instead of using their patch to build a build-native localedef, + # we simply use the one from buildPackages + pushd ../glibc-2*/localedata + export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata + mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale + ${stdenv.lib.getBin buildPackages.glibc}/bin/localedef \ + --alias-file=../intl/locale.alias \ + -i locales/C \ + -f charmaps/UTF-8 \ + --prefix $NIX_BUILD_TOP \ + ${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then + "--little-endian" + else + "--big-endian"} \ + C.UTF-8 + cp -r $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale $out/lib + popd + '') + '' test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache From e961a4001229e0f66fa629efc45068a1b4df9552 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Feb 2019 12:01:47 -0600 Subject: [PATCH 023/238] xorg: misc updates Announcements for each are on xorg-announce@, see: https://lists.x.org/archives/xorg-announce/2019-February/thread.html --- pkgs/servers/x11/xorg/default.nix | 48 ++++++++++++++--------------- pkgs/servers/x11/xorg/tarballs.list | 16 +++++----- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1cbea83b8ae..2bee5a41f09 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1106,11 +1106,11 @@ lib.makeScope newScope (self: with self; { }) {}; libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { - name = "libfontenc-1.1.3"; + name = "libfontenc-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; - sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; + url = mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2; + sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1535,11 +1535,11 @@ lib.makeScope newScope (self: with self; { }) {}; xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xclock-1.0.7"; + name = "xclock-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; - sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; + url = mirror://xorg/individual/app/xclock-1.0.8.tar.bz2; + sha256 = "0m92zhamh15my9f2rqa14q41d6k2cn468azm3g7g3w9n7942024k"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1652,11 +1652,11 @@ lib.makeScope newScope (self: with self; { }) {}; xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { - name = "xev-1.2.2"; + name = "xev-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; - sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; + url = mirror://xorg/individual/app/xev-1.2.3.tar.bz2; + sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2406,11 +2406,11 @@ lib.makeScope newScope (self: with self; { }) {}; xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xhost-1.0.7"; + name = "xhost-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; - sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; + url = mirror://xorg/individual/app/xhost-1.0.8.tar.bz2; + sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2536,11 +2536,11 @@ lib.makeScope newScope (self: with self; { }) {}; xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsatoms-1.1.2"; + name = "xlsatoms-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; - sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; + url = mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2; + sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2601,11 +2601,11 @@ lib.makeScope newScope (self: with self; { }) {}; xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xmodmap-1.0.9"; + name = "xmodmap-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; - sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; + url = mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2; + sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2718,11 +2718,11 @@ lib.makeScope newScope (self: with self; { }) {}; xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xrdb-1.1.1"; + name = "xrdb-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2; - sha256 = "1dqp486nd5sagbg572kl0k839nwvpqnb7jvppyb7jj5vrpkss8rd"; + url = mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2; + sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2809,11 +2809,11 @@ lib.makeScope newScope (self: with self; { }) {}; xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { - name = "xvinfo-1.1.3"; + name = "xvinfo-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; - sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; + url = mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2; + sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0392ba7895a..f1c51298619 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -30,7 +30,7 @@ mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2 -mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 +mirror://xorg/individual/app/xclock-1.0.8.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 @@ -38,13 +38,13 @@ mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 -mirror://xorg/individual/app/xev-1.2.2.tar.bz2 +mirror://xorg/individual/app/xev-1.2.3.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 -mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 +mirror://xorg/individual/app/xhost-1.0.8.tar.bz2 mirror://xorg/individual/app/xinit-1.4.0.tar.bz2 mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 @@ -53,22 +53,22 @@ mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/app/xkill-1.0.5.tar.bz2 mirror://xorg/individual/app/xload-1.1.3.tar.bz2 -mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 +mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2 mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 -mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 +mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 mirror://xorg/individual/app/xprop-1.2.3.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 -mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2 +mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 -mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 +mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 @@ -168,7 +168,7 @@ mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 From e063f54568d2f9cf6ea420c3b739315f29dd9e1d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Feb 2019 12:05:08 -0600 Subject: [PATCH 024/238] xorg.xf86inputlibinput: remove (?!) override of source This is the wrong place for this and is outdated anyway, so was forcing us to use this older version. --- pkgs/servers/x11/xorg/overrides.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bd529c178f4..c368fa8ea6e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -342,11 +342,6 @@ self: super: }); xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec { - name = "xf86-input-libinput-0.28.0"; - src = fetchurl { - url = "mirror://xorg/individual/driver/${name}.tar.bz2"; - sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691"; - }; outputs = [ "out" "dev" ]; buildInputs = attrs.buildInputs ++ [ libinput ]; installFlags = "sdkdir=\${dev}/include/xorg"; From 5fdd7ed59b2bc74615ce61e85ae3b232f0db1659 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Feb 2019 13:15:48 -0600 Subject: [PATCH 025/238] pixman: 0.36.0 -> 0.38.0 (#55602) --- pkgs/development/libraries/pixman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 61af6e7fdab..639d6266b5a 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pixman-${version}"; - version = "0.36.0"; + version = "0.38.0"; src = fetchurl { url = "mirror://xorg/individual/lib/${name}.tar.bz2"; - sha256 = "1p40fygy9lcn6ypkzh14azksi570brcpr3979bjpff8qk76c14px"; + sha256 = "1a1nnkjv0rqdj26847r0saly0kzckjfp4y3ly30bvpjxi7vy6s5p"; }; nativeBuildInputs = [ pkgconfig ]; From 0f493ebada9f529440b71421eb9fd230ef4930a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Feb 2019 15:39:06 -0800 Subject: [PATCH 026/238] securefs: 0.8.2 -> 0.8.3 (#54671) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/securefs/versions --- pkgs/tools/filesystems/securefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 37eb8b9aa72..a21aacb7e6b 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "securefs-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { - sha256 = "0m3nv748g31b5nzxbwqqqjvygmz41x9vmhrjh655086g26gzrfib"; + sha256 = "0nf0bd163gz844mikqab2mh7xjlj31ixa6hi85qxdifyjpfjv7y4"; rev = version; repo = "securefs"; owner = "netheril96"; From c39fb495dd04fea11a2d462c8ccccbf78206e05e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 23 Feb 2019 23:21:36 -0600 Subject: [PATCH 027/238] networkmanager: 1.14.4 -> 1.14.6 (#56253) https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.14.6/NEWS --- pkgs/tools/networking/network-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 48848c0ead7..f18e8ad9f5c 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ let pname = "NetworkManager"; in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.14.4"; + version = "1.14.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm"; + sha256 = "0p9s6b1z9bdmzdjw2gnjsar1671vvcyy9inb0rxg1izf2nnwsfv9"; }; outputs = [ "out" "dev" ]; From fb5bd7256dee9b6d5b2a5e28a2d139e458e11783 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 24 Feb 2019 04:12:39 -0500 Subject: [PATCH 028/238] libglvnd: fix darwin Unfortunately this had been broken for a while and i just realized it was broken. This adds a patch from upstream that fixes the issue (missing _u_execmem symbol). --- pkgs/development/libraries/libglvnd/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 15efdd4fd4e..c7b76497fa8 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -38,7 +38,11 @@ in stdenv.mkDerivation rec { url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch"; sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d"; }) - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://github.com/NVIDIA/libglvnd/commit/294ccb2f49107432567e116e13efac586580a4cc.patch"; + sha256 = "01339wg27cypv93221rhk3885vxbsg8kvbfyia77jmjdcnwrdwm2"; + }); outputs = [ "out" "dev" ]; passthru = { inherit driverLink; }; From 9953a68c804ae8c6e4a568584a348e9f7b528621 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 8 Feb 2019 20:47:20 -0500 Subject: [PATCH 029/238] waf: 2.0.13 -> 2.0.14 --- pkgs/development/tools/build-managers/waf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 1b884307273..05e11ad63a7 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = name; - sha256 = "1r4nyxpf07w98bx9zx0xii97rwsc27s6898xi9ph25p0n6hsdxxg"; + sha256 = "006a4wb9i569pahs8ji86hrv58g2hm8xikgchnll3bdqgxllhnrs"; }; buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; From ed508238beb1ce451cc02d9322dad6cdaf65f848 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Thu, 21 Feb 2019 20:06:14 +0100 Subject: [PATCH 030/238] xorg/xfsinfo: init at 1.0.6 (cherry picked from commit 4553b42de4b28af1a677182e271b138816ed4a6b) --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2bee5a41f09..0586f30d9ce 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2379,6 +2379,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xfsinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { + name = "xfsinfo-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2; + sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libFS xorgproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { name = "xgamma-1.0.6"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index f1c51298619..82ead024417 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -42,6 +42,7 @@ mirror://xorg/individual/app/xev-1.2.3.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 +mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.8.tar.bz2 From dffba878e135960d14f12392a52eb24194539dd7 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Thu, 21 Feb 2019 20:12:04 +0100 Subject: [PATCH 031/238] xorg/xstdcmap: init at 1.0.4 (cherry picked from commit 6a316df98800e41954fd820e87da8752d5fc48cb) --- pkgs/servers/x11/xorg/default.nix | 13 +++++++++++++ pkgs/servers/x11/xorg/tarballs.list | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0586f30d9ce..1e7e0f0bb6e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2795,6 +2795,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xstdcmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xstdcmap-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2; + sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xtrans-1.3.5"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 82ead024417..6a4e9c650c9 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -68,6 +68,7 @@ mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 +mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 From 498ad3e8c09245f956c557c10a8f583e89972c29 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 21 Feb 2019 00:57:23 -0500 Subject: [PATCH 032/238] apparmor: use stdenv.lib.getDev for headers --- pkgs/os-specific/linux/apparmor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 6cb0c123406..ccad9795301 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -82,8 +82,8 @@ let prePatch = prePatchCommon + '' substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site - substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" - substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" ''; inherit patches; From bfb45e96b946b85690d270df6a187d1ad4b39f7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 21 Feb 2019 21:02:59 -0500 Subject: [PATCH 033/238] mesa: armv7a-linux supports mesa --- lib/systems/doubles.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 58677c0bdd9..2cf06b6ac1c 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -47,5 +47,5 @@ in rec { unix = filterDoubles predicates.isUnix; windows = filterDoubles predicates.isWindows; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"]; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; } From be6d030b98934e906930187d2073b5c85450b242 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 21 Feb 2019 23:58:23 -0500 Subject: [PATCH 034/238] llvm6: remove enableTargets These are no longer used. We build all targets now. --- pkgs/development/compilers/llvm/6/llvm.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index f16f3f72137..049f58af06e 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -14,9 +14,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -# Mesa requires AMDGPU target -# BPF is used by bcc -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" "BPF" ] }: let From e36cd48b6e09863e2099a894ca28bedbbeefdf99 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 11 Feb 2019 19:32:11 -0500 Subject: [PATCH 035/238] =?UTF-8?q?llvm:=20don=E2=80=99t=20use=20targetPla?= =?UTF-8?q?tform?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LLVM should be target independent because it will work with all machine types. This is different from GCC where it needs to know what target to build ahead of time. --- pkgs/development/compilers/llvm/3.8/llvm.nix | 4 ++-- pkgs/development/compilers/llvm/3.9/llvm.nix | 4 ++-- pkgs/development/compilers/llvm/4/llvm.nix | 4 ++-- pkgs/development/compilers/llvm/6/llvm.nix | 2 +- pkgs/development/compilers/llvm/7/llvm.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index ca6723172d7..261a1d0f94c 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -79,8 +79,8 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 678ec759425..6c935fd88de 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index aac9c4275ad..5cd7901fe22 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -100,8 +100,8 @@ in stdenv.mkDerivation (rec { "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 049f58af06e..1d96513a0ec 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 5bb629931fd..32f4b7972e4 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ From 76474b2da7a4c5a3c2f28bbbb42ccea9339371de Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 31 Jan 2019 13:50:53 -0500 Subject: [PATCH 036/238] libpfm: use hostPlatform (cherry picked from commit 08f5b419b9efc77db044f8c1d725632552617966) --- pkgs/development/libraries/libpfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index d64591273bc..bf1d26cf90d 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "LDCONFIG=true" - "ARCH=${stdenv.targetPlatform.uname.processor}" - "SYS=${stdenv.targetPlatform.uname.system}" + "ARCH=${stdenv.hostPlatform.uname.processor}" + "SYS=${stdenv.hostPlatform.uname.system}" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; From d665b8ccf3781d56d3cd23b767af67286e11e5db Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 22 Feb 2019 10:36:48 -0500 Subject: [PATCH 037/238] SDL{,2}: support building for android This should be picking up the OpenGL ES headers provided by the NDK. More testing is needed. --- pkgs/development/libraries/SDL/default.nix | 16 +++++++------- pkgs/development/libraries/SDL2/default.nix | 21 ++++++++++--------- .../libraries/mesa-glu/default.nix | 1 + pkgs/top-level/all-packages.nix | 14 +++++++++---- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index e2ff66a4708..007cd02957b 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,8 +1,9 @@ { stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv , openglSupport ? libGLSupported, libGL, libGLU -, alsaSupport ? stdenv.isLinux, alsaLib -, x11Support ? !stdenv.isCygwin, libXext, libICE, libXrandr -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid +, libXext, libICE, libXrandr +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa , cf-private }: @@ -12,9 +13,6 @@ with stdenv.lib; -assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null); - stdenv.mkDerivation rec { name = "SDL-${version}"; version = "1.2.15"; @@ -30,18 +28,18 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ optional stdenv.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ optionals x11Support [ libXext libICE libXrandr ] - ++ optional stdenv.isLinux libcap ++ optionals openglSupport [ libGL libGLU ] ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; buildInputs = [ ] - ++ optional (!stdenv.hostPlatform.isMinGW) audiofile + ++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL # Needed for NSDefaultRunLoopMode symbols. diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d82b25fb892..8f1b7d93d00 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,12 +1,16 @@ { stdenv, config, libGLSupported, fetchurl, pkgconfig , openglSupport ? libGLSupported, libGL -, alsaSupport ? stdenv.isLinux, alsaLib -, x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr -, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols, libxkbcommon -, dbusSupport ? stdenv.isLinux, dbus +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid +, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor +, libXinerama, libXext, libXxf86vm, libXrandr +, waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, wayland, wayland-protocols, libxkbcommon +, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, dbus , udevSupport ? false, udev , ibusSupport ? false, ibus -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL , audiofile, cf-private, libiconv }: @@ -16,9 +20,6 @@ with stdenv.lib; -assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null); - stdenv.mkDerivation rec { name = "SDL2-${version}"; version = "2.0.9"; @@ -44,14 +45,14 @@ stdenv.mkDerivation rec { ++ optionals x11Support [ libX11 xorgproto ]; dlopenBuildInputs = [ ] - ++ optional alsaSupport alsaLib + ++ optionals alsaSupport [ alsaLib audiofile ] ++ optional dbusSupport dbus ++ optional pulseaudioSupport libpulseaudio ++ optional udevSupport udev ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]; - buildInputs = [ audiofile libiconv ] + buildInputs = [ libiconv ] ++ dlopenBuildInputs ++ optional ibusSupport ibus ++ optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 4e35d6ed24d..cb238a6a5ae 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = https://cgit.freedesktop.org/mesa/glu/; license = stdenv.lib.licenses.sgi-b-20; platforms = stdenv.lib.platforms.unix; + broken = stdenv.hostPlatform.isAndroid; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ca0101f309..9ce80e4640e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11650,8 +11650,11 @@ in ## libGL/libGLU/Mesa stuff - # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them - libGL = mesa_noglu.stubs; + # Default libGL implementation, should provide headers and + # libGL.so/libEGL.so/... to link agains them. Android NDK provides + # an OpenGL implementation, we can just use that. + libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv + else mesa_noglu.stubs; # Default libGLU libGLU = mesa_glu; @@ -12453,10 +12456,13 @@ in schroedinger = callPackage ../development/libraries/schroedinger { }; - SDL = callPackage ../development/libraries/SDL { + SDL = callPackage ../development/libraries/SDL ({ inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; - }; + } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { + # libGLU doesn’t work with Android’s SDL + libGLU = null; + }); SDL_sixel = callPackage ../development/libraries/SDL_sixel { }; From d1dd3a1f1af731d7b2a301a829f14be72b9654f8 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 25 Feb 2019 15:40:42 +0100 Subject: [PATCH 038/238] postgresql_9_4: 9.4.20 -> 9.4.21 See https://www.postgresql.org/about/news/1920/ for release information. --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 44559885850..a885310740c 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -157,9 +157,9 @@ let in self: { postgresql_9_4 = self.callPackage generic { - version = "9.4.20"; + version = "9.4.21"; psqlSchema = "9.4"; - sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf"; + sha256 = "01k0s3a7qy8639zsjp1bjbfnnymyl0rgyylrjbkm81m0779b8j80"; this = self.postgresql_9_4; inherit self; }; From 74c715e39cab6e558ccc170021154a3e6ea6e026 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 25 Feb 2019 15:42:10 +0100 Subject: [PATCH 039/238] postgresql_9_5: 9.5.15 -> 9.5.16 See https://www.postgresql.org/about/news/1920/ for release information. --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a885310740c..e9c456dff0d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -165,9 +165,9 @@ in self: { }; postgresql_9_5 = self.callPackage generic { - version = "9.5.15"; + version = "9.5.16"; psqlSchema = "9.5"; - sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv"; + sha256 = "0cg10ri0475vg1c8k1sb5qi4i64hiv9k7crmg15qvvnwsjanqmx4"; this = self.postgresql_9_5; inherit self; }; From 70a31c2e003e6d2a283a24e74ae0d2c82b8696a0 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 25 Feb 2019 15:42:46 +0100 Subject: [PATCH 040/238] postgresql_9_6: 9.6.11 -> 9.6.12 See https://www.postgresql.org/about/news/1920/ for release information. --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e9c456dff0d..5d780b55ffa 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -173,9 +173,9 @@ in self: { }; postgresql_9_6 = self.callPackage generic { - version = "9.6.11"; + version = "9.6.12"; psqlSchema = "9.6"; - sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"; + sha256 = "114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f"; this = self.postgresql_9_6; inherit self; }; From a90cf49fa99d8625beac67eabe236eef25704755 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 25 Feb 2019 15:43:07 +0100 Subject: [PATCH 041/238] postgresql_10: 10.6 -> 10.7 See https://www.postgresql.org/about/news/1920/ for release information. --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5d780b55ffa..955b6067884 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -181,9 +181,9 @@ in self: { }; postgresql_10 = self.callPackage generic { - version = "10.6"; + version = "10.7"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; + sha256 = "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz"; this = self.postgresql_10; inherit self; }; From fc917e5346eb7e8858a67dd683be2e43a165918a Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 25 Feb 2019 18:26:30 +0000 Subject: [PATCH 042/238] git: 2.19.2 -> 2.21.0 --- .../git-and-tools/git/default.nix | 4 +- .../git-and-tools/git/docbook2texi.patch | 7 +- .../git/git-send-email-honor-PATH.patch | 10 +- .../git-and-tools/git/git-sh-i18n.patch | 109 +++--------------- .../git-and-tools/git/installCheck-path.patch | 7 +- .../git-and-tools/git/ssh-path.patch | 10 +- 6 files changed, 40 insertions(+), 107 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 46e88b1e0fc..c76b82ffe6d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.19.2"; + version = "2.21.0"; svn = subversionClient.override { perlBindings = perlSupport; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw"; + sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch index ab5bb3c3a6c..f8f8ab86a9c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch +++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch @@ -3,9 +3,10 @@ and (2) make sure `gitman.info' isn't produced since it's broken (duplicate node names). diff --git a/Documentation/Makefile b/Documentation/Makefile +index 26a2342bea..ceccd67ebb 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile -@@ -122,7 +122,7 @@ +@@ -132,7 +132,7 @@ HTML_REPO = ../../git-htmldocs MAKEINFO = makeinfo INSTALL_INFO = install-info @@ -14,7 +15,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile DBLATEX = dblatex ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty -@@ -240,7 +240,7 @@ +@@ -250,7 +250,7 @@ man1: $(DOC_MAN1) man5: $(DOC_MAN5) man7: $(DOC_MAN7) @@ -23,7 +24,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile pdf: user-manual.pdf -@@ -256,10 +256,9 @@ +@@ -266,10 +266,9 @@ install-man: man install-info: info $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 6b93d061a3b..9603d8e27c5 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,7 +1,8 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt +index 1afe9fc858..05dd7c3a90 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'. +@@ -215,8 +215,7 @@ a password is obtained using 'git-credential'. specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the `sendemail.smtpServer` configuration @@ -9,14 +10,15 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt - `/usr/sbin`, `/usr/lib` and $PATH if such program is + option; the built-in default is to search in $PATH if such program is available, falling back to `localhost` otherwise. - + --smtp-server-port=:: diff --git a/git-send-email.perl b/git-send-email.perl +index 8eb63b5a2f..74a61d8213 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -944,8 +944,7 @@ if (defined $reply_to) { +@@ -956,8 +956,7 @@ sub expand_one_alias { } - + if (!defined $smtp_server) { - my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); - push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 216c0e56b44..721f2aa099c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -1,94 +1,23 @@ +diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh +index e1d917fd27..e90f8e1414 100644 --- a/git-sh-i18n.sh +++ b/git-sh-i18n.sh -@@ -15,87 +15,11 @@ - fi - export TEXTDOMAINDIR - --# First decide what scheme to use... --GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison --elif test -n "@@USE_GETTEXT_SCHEME@@" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" --elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" --then -- : no probing necessary +@@ -26,7 +26,7 @@ then + elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" + then + : no probing necessary -elif type gettext.sh >/dev/null 2>&1 --then -- # GNU libintl's gettext.sh -- GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu --elif test "$(gettext -h 2>&1)" = "-h" --then -- # gettext binary exists but no gettext.sh. likely to be a gettext -- # binary on a Solaris or something that is not GNU libintl and -- # lack eval_gettext. -- GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext --fi --export GIT_INTERNAL_GETTEXT_SH_SCHEME -- --# ... and then follow that decision. --case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in --gnu) -- # Use libintl's gettext.sh, or fall back to English if we can't. ++elif type @gettext@/bin/gettext.sh >/dev/null 2>&1 + then + # GNU libintl's gettext.sh + GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu +@@ -43,7 +43,8 @@ export GIT_INTERNAL_GETTEXT_SH_SCHEME + case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in + gnu) + # Use libintl's gettext.sh, or fall back to English if we can't. - . gettext.sh -- ;; --gettext_without_eval_gettext) -- # Solaris has a gettext(1) but no eval_gettext(1) -- eval_gettext () { -- gettext "$1" | ( -- export PATH $(git sh-i18n--envsubst --variables "$1"); -- git sh-i18n--envsubst "$1" -- ) -- } -- -- eval_ngettext () { -- ngettext "$1" "$2" "$3" | ( -- export PATH $(git sh-i18n--envsubst --variables "$2"); -- git sh-i18n--envsubst "$2" -- ) -- } -- ;; --poison) -- # Emit garbage so that tests that incorrectly rely on translatable -- # strings will fail. -- gettext () { -- printf "%s" "# GETTEXT POISON #" -- } -- -- eval_gettext () { -- printf "%s" "# GETTEXT POISON #" -- } -- -- eval_ngettext () { -- printf "%s" "# GETTEXT POISON #" -- } -- ;; --*) -- gettext () { -- printf "%s" "$1" -- } -- -- eval_gettext () { -- printf "%s" "$1" | ( -- export PATH $(git sh-i18n--envsubst --variables "$1"); -- git sh-i18n--envsubst "$1" -- ) -- } -+# GNU gettext -+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu -+export PATH=@gettext@/bin:$PATH - -- eval_ngettext () { -- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | ( -- export PATH $(git sh-i18n--envsubst --variables "$2"); -- git sh-i18n--envsubst "$2" -- ) -- } -- ;; --esac -+. @gettext@/bin/gettext.sh - - # Git-specific wrapper functions - gettextln () { ++ . @gettext@/bin/gettext.sh ++ export PATH=@gettext@/bin:$PATH + ;; + gettext_without_eval_gettext) + # Solaris has a gettext(1) but no eval_gettext(1) diff --git a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch index 8c68fb9f186..4b73d11744b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch +++ b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch @@ -1,12 +1,13 @@ diff --git a/t/test-lib.sh b/t/test-lib.sh +index 8665b0a9b6..8bb892b1af 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh -@@ -923,7 +923,7 @@ +@@ -1227,7 +1227,7 @@ elif test -n "$GIT_TEST_INSTALLED" then GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) || error "Cannot run git from $GIT_TEST_INSTALLED." -- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH +- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH + PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} else # normal case, use ../bin-wrappers only unless $with_dashes: - git_bin_dir="$GIT_BUILD_DIR/bin-wrappers" + if test -n "$no_bin_wrappers" diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch index addb1dbc5e0..71cdc694ac3 100644 --- a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch +++ b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch @@ -1,18 +1,18 @@ diff --git a/connect.c b/connect.c -index c3a014c5b..fbca3262b 100644 +index 4813f005ab..b3f12f3268 100644 --- a/connect.c +++ b/connect.c -@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, - +@@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, + ssh = getenv("GIT_SSH"); if (!ssh) - ssh = "ssh"; + ssh = "@ssh@"; variant = determine_ssh_variant(ssh, 0); } - + diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl -index 480a6b30d..781720424 100644 +index 480a6b30d0..7817204241 100644 --- a/git-gui/lib/remote_add.tcl +++ b/git-gui/lib/remote_add.tcl @@ -139,7 +139,7 @@ method _add {} { From f2f90f4cefbb3f8e9bda1acfc5df529d33a3ca9d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Feb 2019 21:47:10 -0600 Subject: [PATCH 043/238] sqlite: 3.27.1 -> 3.27.2 --- pkgs/development/libraries/sqlite/analyzer.nix | 4 ++-- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index b8fa04c5192..5c42f729469 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.27.1"; + version = "3.27.2"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip"; - sha256 = "11jrr14ld9cs9l5pz3z83xds1mhsqwgg47vwdx8rq6p667dc9z7h"; + sha256 = "02nz1y22wyb8101d9y6wfdrvp855wvch67js12p5y3riya345g8m"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index d45484f9de9..bacba396c25 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.27.1"; + version = "3.27.2"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1y7l225jm18fz6z3vyffrkl9k6qi964w1c5ri4giixizyy7jpaal"; + sha256 = "0vpgwszs19pwks2b4dhqwa0n6q5sx6pn1s7rngyyrd98xa2rxhsh"; }; outputs = [ "bin" "dev" "out" ]; From 295443bce5bd8bcd2e497852c9e41de87630b4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 26 Feb 2019 16:35:33 +0100 Subject: [PATCH 044/238] glib: 2.58.2 -> 2.58.3 (#56385) Drop patches that are now upstream. --- pkgs/development/libraries/glib/default.nix | 24 ++------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e0255be666e..7209bdb3df6 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -46,7 +46,7 @@ let ''; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; - version = "2.58.2"; + version = "2.58.3"; in stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0jrxfm4gn1qz3y1450z709v74ys2bkjr8yffkgy106kgagb4xcn7"; + sha256 = "10blprf5djbwxq8dqmjvcsdc9vqz63rl0ammfbd2b2p8cwbw6hwg"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -66,26 +66,6 @@ stdenv.mkDerivation rec { ./schema-override-variable.patch # Require substituteInPlace in postPatch ./fix-gio-launch-desktop-path.patch - # https://gitlab.gnome.org/GNOME/glib/issues/1626 - # https://gitlab.gnome.org/GNOME/glib/merge_requests/557 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch; - sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877"; - }) - # https://gitlab.gnome.org/GNOME/glib/issues/1645 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff; - sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w"; - }) - # https://gitlab.gnome.org/GNOME/glib/issues/1643 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/c792e5adaa8ae3a45e6ff3ff71168ad8d040a0d4.patch; - sha256 = "022x70qfn5wlv5gz3nlg0bwiwjxcd7l11j3qvbms2y8d1ffh5rfd"; - }) - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/30ccbc386026cecac6ef3a77d8fa4f3c24ac68d7.patch; - sha256 = "04y3pxgzlx92cppwibx4rlsyvwxb37aq52x2lr6ajfgykv2nzpr3"; - }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; From 9c94d7483681cf00bcffa15a6f47845d2be09b68 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 26 Feb 2019 16:30:39 +0000 Subject: [PATCH 045/238] openssl: 1.0.2q -> 1.0.2r --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0954e1b70bb..3e0202355ea 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -120,8 +120,8 @@ let in { openssl_1_0_2 = common { - version = "1.0.2q"; - sha256 = "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p"; + version = "1.0.2r"; + sha256 = "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf"; patches = [ ./1.0.2/nix-ssl-cert-file.patch From fed0926960235b465824005710c11602d3d165d8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 26 Feb 2019 16:31:01 +0000 Subject: [PATCH 046/238] openssl_1_1: 1.1.1a -> 1.1.1b --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 3e0202355ea..133e9ae8cb8 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -132,8 +132,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1a"; - sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w"; + version = "1.1.1b"; + sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw"; patches = [ ./1.1/nix-ssl-cert-file.patch From d82448f51143fd9653354dbb3220a18dbb8583ca Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 26 Feb 2019 11:26:41 -0600 Subject: [PATCH 047/238] plasma-5: 5.15.1 -> 5.15.2 https://kde.org/announcements/plasma-5.15.2.php --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++---------------- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index c4b43cf2e4b..510ebf69fff 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.15.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.2/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 618f5423fc5..0a0a9015de3 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/bluedevil-5.15.1.tar.xz"; - sha256 = "1h67yj055s345vy9yjdndr43fw5wnhnnyrr5bwxp7c4cg1z3m82r"; - name = "bluedevil-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/bluedevil-5.15.2.tar.xz"; + sha256 = "1d6dq7kgxni7hj5cdfqlb2ff3ddy30a82w80nxfwshzp1xbdljzw"; + name = "bluedevil-5.15.2.tar.xz"; }; }; breeze = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/breeze-5.15.1.tar.xz"; - sha256 = "105d8031nks39p66mfxaw1xdq0q6giww2b381phrp590b69941fh"; - name = "breeze-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/breeze-5.15.2.tar.xz"; + sha256 = "0m2fpcbi3fsj9a3j3ry7l7f38whm38mpprap86v40m4zcv3wcav8"; + name = "breeze-5.15.2.tar.xz"; }; }; breeze-grub = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/breeze-grub-5.15.1.tar.xz"; - sha256 = "04xrvsgjw57vxs18d286amfbr8cwpknrl615yk7ws849c9jlyvlm"; - name = "breeze-grub-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/breeze-grub-5.15.2.tar.xz"; + sha256 = "18rm4h395w8x3yrirl53402qiiz7yc4i3iw5ncmd0184jhl6n7z5"; + name = "breeze-grub-5.15.2.tar.xz"; }; }; breeze-gtk = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/breeze-gtk-5.15.1.tar.xz"; - sha256 = "1fjgabvgz4vkz3zyj9r95gr0f4m8dhbhagw0qjcw943ac85sbvmp"; - name = "breeze-gtk-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/breeze-gtk-5.15.2.tar.xz"; + sha256 = "0fbxfsjyxjk9shrjiz5w9x3v5jk3f4csw2rryk7kdk5q1m5ppfjw"; + name = "breeze-gtk-5.15.2.tar.xz"; }; }; breeze-plymouth = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/breeze-plymouth-5.15.1.tar.xz"; - sha256 = "18yg9lhbz5m50w4f24fb9vdv70hhfd7y17bcrz90yl9fr4m6sf41"; - name = "breeze-plymouth-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/breeze-plymouth-5.15.2.tar.xz"; + sha256 = "0n6pr4k9jc3ivi0dhrrfv9xhf0p4irxbpghx3m3b860jwmm5d4zh"; + name = "breeze-plymouth-5.15.2.tar.xz"; }; }; discover = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/discover-5.15.1.tar.xz"; - sha256 = "12j5jv54yl158x6w5xc07qdxpm9k5ljgh9yd0q2br0khkywkpmng"; - name = "discover-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/discover-5.15.2.tar.xz"; + sha256 = "0v9wnsgqxa4vbvgdsgpm54hnw8dsxahapl42vkf0xjfx101f3y62"; + name = "discover-5.15.2.tar.xz"; }; }; drkonqi = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/drkonqi-5.15.1.tar.xz"; - sha256 = "1bg4ih99p5rcxs0cq8xrbm7rkk19z4sif6zsbd71k6hymq2myjgy"; - name = "drkonqi-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/drkonqi-5.15.2.tar.xz"; + sha256 = "085dv4ga7gvycs470v594i5j8s55aygalx52fcbbncji8r1x0zdv"; + name = "drkonqi-5.15.2.tar.xz"; }; }; kactivitymanagerd = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kactivitymanagerd-5.15.1.tar.xz"; - sha256 = "1cnvbplsw18fb6yq4hkcsngfy52p4r0c4qyygriwrla9dwpikr76"; - name = "kactivitymanagerd-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kactivitymanagerd-5.15.2.tar.xz"; + sha256 = "1bldpay46gww1m0087bdrl64paw2466mnnr10w3qv1c2g3w4aiky"; + name = "kactivitymanagerd-5.15.2.tar.xz"; }; }; kde-cli-tools = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kde-cli-tools-5.15.1.tar.xz"; - sha256 = "0bj71nlmns5pr3bi7rxlr3wxw8y46x3rp8ax2n8v6v2la6hsmvyb"; - name = "kde-cli-tools-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kde-cli-tools-5.15.2.tar.xz"; + sha256 = "1b178szx0ansd9srkj1rzqcc1ijfvs92vg870plzqy4ygg94yc32"; + name = "kde-cli-tools-5.15.2.tar.xz"; }; }; kdecoration = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kdecoration-5.15.1.tar.xz"; - sha256 = "03lxnjbhlnyiw2znflp0f2w77a5pzv5yvsbngvwgp89ig9mansi1"; - name = "kdecoration-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kdecoration-5.15.2.tar.xz"; + sha256 = "1gyy55j0bs1adglqq8wjy284pdp3vm9bj51q7h7q7yz2khk8kc3r"; + name = "kdecoration-5.15.2.tar.xz"; }; }; kde-gtk-config = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kde-gtk-config-5.15.1.tar.xz"; - sha256 = "1cb78bg0w2slyi1jyclzd34rn055m86rfp6hi4fhbyglg5ci3arh"; - name = "kde-gtk-config-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kde-gtk-config-5.15.2.tar.xz"; + sha256 = "07ng7nynmfn23zssbawn4xjnj8sqkqsdv1nv29pkhda82bpji5a4"; + name = "kde-gtk-config-5.15.2.tar.xz"; }; }; kdeplasma-addons = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kdeplasma-addons-5.15.1.tar.xz"; - sha256 = "0477aaj6nynckm5zah09l6nfn320kwislgw0qrz7giygwyy0gxvy"; - name = "kdeplasma-addons-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kdeplasma-addons-5.15.2.tar.xz"; + sha256 = "0c1j9830n5vyqjmyclljkxhgmgyhhzm4ck9zm5cnjf1s5x9hqdly"; + name = "kdeplasma-addons-5.15.2.tar.xz"; }; }; kgamma5 = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kgamma5-5.15.1.tar.xz"; - sha256 = "1yvpg86jzkdw6al7a6xi5r15rnprj0d8vx7z1ip23pf5l9xcjs8w"; - name = "kgamma5-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kgamma5-5.15.2.tar.xz"; + sha256 = "06qp20dnvqg0bcf09iwhwcqbkyz85z27cp811vg72nq6vqpd98sy"; + name = "kgamma5-5.15.2.tar.xz"; }; }; khotkeys = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/khotkeys-5.15.1.tar.xz"; - sha256 = "1v9cvlqgwyfq5jdvg3alvc63vjdvkvk60j8jba7ls0p1i5hq38xn"; - name = "khotkeys-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/khotkeys-5.15.2.tar.xz"; + sha256 = "18hjlvvbnid6j77pnr515kglllsidx8dgrx5sbvy9myvsd47wlki"; + name = "khotkeys-5.15.2.tar.xz"; }; }; kinfocenter = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kinfocenter-5.15.1.tar.xz"; - sha256 = "1iscfi83fm2mpwi27ik0l5ll9cnpjfdxzqiqhwlcy12sjbhwk596"; - name = "kinfocenter-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kinfocenter-5.15.2.tar.xz"; + sha256 = "0wag0md22dvnz897s535qigsimmcis7i9fsngq1hbqz22rx7x5pw"; + name = "kinfocenter-5.15.2.tar.xz"; }; }; kmenuedit = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kmenuedit-5.15.1.tar.xz"; - sha256 = "17vja6zxvfbng9gmminnvsr0ybs8rb0ivj8phac9b1vpjs18h7j2"; - name = "kmenuedit-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kmenuedit-5.15.2.tar.xz"; + sha256 = "1xjnj40m86sdyna9xm5bj0m4mnmqrpkpg9gnhr1naqwqxaahvvyk"; + name = "kmenuedit-5.15.2.tar.xz"; }; }; kscreen = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kscreen-5.15.1.tar.xz"; - sha256 = "1bypz921clk4cmfz59vgczblbhbgc0wilrldjwnw8cxapkppk9zy"; - name = "kscreen-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kscreen-5.15.2.tar.xz"; + sha256 = "1vzp98cjhpbp565rfa1id1pcyir4hagmrz020jjn0gb2dfk6wrsv"; + name = "kscreen-5.15.2.tar.xz"; }; }; kscreenlocker = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kscreenlocker-5.15.1.tar.xz"; - sha256 = "1jp2z1wjsd99is31igkfnscs55h755cmp86ppkj596fcxv1krymq"; - name = "kscreenlocker-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kscreenlocker-5.15.2.tar.xz"; + sha256 = "09b3zb95psg3gwg1lcnqsrw6llg7bdlq97zsg373gs4ljlmdgwms"; + name = "kscreenlocker-5.15.2.tar.xz"; }; }; ksshaskpass = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/ksshaskpass-5.15.1.tar.xz"; - sha256 = "04ln1vk4xifazc8ynxbpiy2wx8kya7i92rf3m873x1q10w5kgjqq"; - name = "ksshaskpass-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/ksshaskpass-5.15.2.tar.xz"; + sha256 = "1nf8s8vdgbak8sys9fw53xfcjpy1hnq1jjyxfyw22fhz2qnx4a7p"; + name = "ksshaskpass-5.15.2.tar.xz"; }; }; ksysguard = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/ksysguard-5.15.1.tar.xz"; - sha256 = "11h5dxl6fsgcmf8lhlgrjdhx31vn20z38aj6762zij3m61g5qjpy"; - name = "ksysguard-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/ksysguard-5.15.2.tar.xz"; + sha256 = "1n38kc9m7jkimxrh0lqff9zz82jap0qv69l3490zsl70pgbhgwdn"; + name = "ksysguard-5.15.2.tar.xz"; }; }; kwallet-pam = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kwallet-pam-5.15.1.tar.xz"; - sha256 = "0r45sxx49q0190l75nm56g2k4w9n9ij96894lp2s6yl753cs0bq3"; - name = "kwallet-pam-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kwallet-pam-5.15.2.tar.xz"; + sha256 = "12hjg6cwgh4h85hfyw3mdpci9p6s6h6z7i6s2hhnsvfr2zm6nq6z"; + name = "kwallet-pam-5.15.2.tar.xz"; }; }; kwayland-integration = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kwayland-integration-5.15.1.tar.xz"; - sha256 = "1z4xncdd66zkvy9wbavyvyairmffv1qd1vza7cn919j40xzmz0nq"; - name = "kwayland-integration-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kwayland-integration-5.15.2.tar.xz"; + sha256 = "1j076lmkgm1m1ymrpkmzh7yq4sk8qv12ggrczb9ri2gimklghmav"; + name = "kwayland-integration-5.15.2.tar.xz"; }; }; kwin = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kwin-5.15.1.tar.xz"; - sha256 = "1h991mfz6qs30m06ppl76l61kp9g1s6bxhhlf66183b4pa1cj7pr"; - name = "kwin-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kwin-5.15.2.tar.xz"; + sha256 = "112xysqgffw718272praaym86kbbq01rwjf9w1sv3b8i1lbrfjfy"; + name = "kwin-5.15.2.tar.xz"; }; }; kwrited = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/kwrited-5.15.1.tar.xz"; - sha256 = "1l9da8srbp7cs56h8wsl91vzg8hww91vxic61grmc1qn37ag72a3"; - name = "kwrited-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kwrited-5.15.2.tar.xz"; + sha256 = "0inm1ry62p23ivad0k3p5cwk8hwirrk7incpx8znd755pr5905hy"; + name = "kwrited-5.15.2.tar.xz"; }; }; libkscreen = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/libkscreen-5.15.1.tar.xz"; - sha256 = "1zpzqafrb576al10f5873nl1z135gscjza6gd3ickfzlvd9qmr18"; - name = "libkscreen-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/libkscreen-5.15.2.tar.xz"; + sha256 = "051carpksbh3n25cvd6i504jjjzmqzh0dj9p5chqmyfcp7m0lvm4"; + name = "libkscreen-5.15.2.tar.xz"; }; }; libksysguard = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/libksysguard-5.15.1.tar.xz"; - sha256 = "0ml106yq4q9qagkrcaafgcky18wk76px5a1r6j36wfjqdd6wpzvs"; - name = "libksysguard-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/libksysguard-5.15.2.tar.xz"; + sha256 = "058yajija7d7zvyv9vfyxbmj2y5amrv96mkbypqcdmzx69x5ig4c"; + name = "libksysguard-5.15.2.tar.xz"; }; }; milou = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/milou-5.15.1.tar.xz"; - sha256 = "1c7vjsnmn35psdmpi8iw9dkrzjqi3fr3p4i9m71anaqjnzdc1pwi"; - name = "milou-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/milou-5.15.2.tar.xz"; + sha256 = "0y7dbjhwbk7gnjpxsn2rddp3i3a02hfwiyx9070lm6am3lvlj8r8"; + name = "milou-5.15.2.tar.xz"; }; }; oxygen = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/oxygen-5.15.1.tar.xz"; - sha256 = "1vk4xqn7s608vc1j9zv2xkmcjhhm6g1xzyimk7d88pyvaaz44ydv"; - name = "oxygen-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/oxygen-5.15.2.tar.xz"; + sha256 = "1vrcdj61ii391swqxjbsfccmv854vg8zsbvjxb78a6fp6k11wivj"; + name = "oxygen-5.15.2.tar.xz"; }; }; plasma-browser-integration = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-browser-integration-5.15.1.tar.xz"; - sha256 = "1sqzxzl0y2rpamalazahi192b2qvzj5l1ahl1h7661h2ldncfrra"; - name = "plasma-browser-integration-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-browser-integration-5.15.2.tar.xz"; + sha256 = "00mp7wwk0jz7wrkii5yq58amsw54dyjcprp3w58phvydam2d3n79"; + name = "plasma-browser-integration-5.15.2.tar.xz"; }; }; plasma-desktop = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-desktop-5.15.1.tar.xz"; - sha256 = "13401nra145a7088yrrjgkwq21x4y4m4q0a5gqm0vx59nsd7cwpz"; - name = "plasma-desktop-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-desktop-5.15.2.tar.xz"; + sha256 = "1axlkjmgf3chg9wl13j91vmfik0va8lngq45y0xr15lc88w6qms0"; + name = "plasma-desktop-5.15.2.tar.xz"; }; }; plasma-integration = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-integration-5.15.1.tar.xz"; - sha256 = "0ksgsn4dlaz3b2ml98nm5bg43zpz03draibbh5whbsckwkp61nb9"; - name = "plasma-integration-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-integration-5.15.2.tar.xz"; + sha256 = "0glj6gsah96xbgcdijqjfpn7dj0yh05dvpvjhk6wmrb30z63hykx"; + name = "plasma-integration-5.15.2.tar.xz"; }; }; plasma-nm = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-nm-5.15.1.tar.xz"; - sha256 = "0z3vk2z0mljyxdak2kxbwk4nbwry7lkdqz5cpfhc8hicd0ql051s"; - name = "plasma-nm-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-nm-5.15.2.tar.xz"; + sha256 = "12fahsqs54k8b5g9ipzisvaq1lmmgmyh3xbdixn1bxqdfdc50jax"; + name = "plasma-nm-5.15.2.tar.xz"; }; }; plasma-pa = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-pa-5.15.1.tar.xz"; - sha256 = "1p5i32h5abqrw19g5zzv01g36q8r0sf80yd3zig0m69ywc0p6si0"; - name = "plasma-pa-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-pa-5.15.2.tar.xz"; + sha256 = "1cw3c84spl2y6fzp0mn986xl7j60z28acga95x5zr2xiaig1p1q3"; + name = "plasma-pa-5.15.2.tar.xz"; }; }; plasma-sdk = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-sdk-5.15.1.tar.xz"; - sha256 = "0bvvfdd4i43zqrqcnikl6q9vd2z0nlgq0jl1b7b40f0av4ipyzpb"; - name = "plasma-sdk-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-sdk-5.15.2.tar.xz"; + sha256 = "0kq5h2zfg1f11cmfzmsn4vlfvj1jfkz1pnc67zgs7f70bap4k8zr"; + name = "plasma-sdk-5.15.2.tar.xz"; }; }; plasma-tests = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-tests-5.15.1.tar.xz"; - sha256 = "17cmxjrlziyndf70my4v6gv8kxqnqvfx4k34wawv7mqkxy5qrj2i"; - name = "plasma-tests-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-tests-5.15.2.tar.xz"; + sha256 = "1bsplrmvw73lsdiqwiznbxicyl36vf30mm34bfib8ii0rpx4cn2i"; + name = "plasma-tests-5.15.2.tar.xz"; }; }; plasma-vault = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-vault-5.15.1.tar.xz"; - sha256 = "072vij7jgmsm8z9wgcaw83n48z8bsh4hnhw0grdxxhcsrb7z4xdz"; - name = "plasma-vault-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-vault-5.15.2.tar.xz"; + sha256 = "0gmch0s9vy72qbxk0bshxd2hmx6dwdad0pk29glpq7l3av3nirlp"; + name = "plasma-vault-5.15.2.tar.xz"; }; }; plasma-workspace = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-workspace-5.15.1.tar.xz"; - sha256 = "1dlskyjk2a6xagpsvn1mqal903ps3w82pk73vf0qbjdndkya526n"; - name = "plasma-workspace-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-workspace-5.15.2.tar.xz"; + sha256 = "1ncd0mc3y8j3r8m9hrq3b07lmcccq7xz76b19rilba1a7qyd03az"; + name = "plasma-workspace-5.15.2.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plasma-workspace-wallpapers-5.15.1.tar.xz"; - sha256 = "1h4526kawc3r4blldk9zcx6nqhq7yzpamjhbqpwbd7lhmcv2y97a"; - name = "plasma-workspace-wallpapers-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-workspace-wallpapers-5.15.2.tar.xz"; + sha256 = "00c19b3clgcjcvafmiwb2mdkkzcq8dvwpaqaajr54c3xn9fa5vss"; + name = "plasma-workspace-wallpapers-5.15.2.tar.xz"; }; }; plymouth-kcm = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/plymouth-kcm-5.15.1.tar.xz"; - sha256 = "19dhfba54nm62lcgffx1q1131g3rm7h7ic0mx78avqsjm4yzq7q4"; - name = "plymouth-kcm-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plymouth-kcm-5.15.2.tar.xz"; + sha256 = "1bkrkym2kjj7knhqzzcd6qhd1nmzvwah45hqvvnaja8kd82vjlzi"; + name = "plymouth-kcm-5.15.2.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.15.1"; + version = "1-5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/polkit-kde-agent-1-5.15.1.tar.xz"; - sha256 = "1bj6zq693fzv215npwh2swbqxy1zn8hsd4ka5yj6w89z4j7j8mz7"; - name = "polkit-kde-agent-1-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/polkit-kde-agent-1-5.15.2.tar.xz"; + sha256 = "1i0hf77ms0k3q4r4cmfjcv2jnml5cig15biwfkh3jyafz8q8miha"; + name = "polkit-kde-agent-1-5.15.2.tar.xz"; }; }; powerdevil = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/powerdevil-5.15.1.tar.xz"; - sha256 = "0qf6vz55cy76ann11glwanpwbv0la1rvwdy7sqy8qj2ldi7agqsh"; - name = "powerdevil-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/powerdevil-5.15.2.tar.xz"; + sha256 = "0gl5wh8s7bmjprbv9gph83qhviv87pmdadrlrnbm5n1nwb1h7kd9"; + name = "powerdevil-5.15.2.tar.xz"; }; }; sddm-kcm = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/sddm-kcm-5.15.1.tar.xz"; - sha256 = "0lpz9a4qrraxss6avnghbf8ddlasg28c88pn8jdj12mzmqnamijf"; - name = "sddm-kcm-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/sddm-kcm-5.15.2.tar.xz"; + sha256 = "1l8ma0kpqq7hcg4addm2c47w33dc12q8inii0aw4yq0syhqgzq9s"; + name = "sddm-kcm-5.15.2.tar.xz"; }; }; systemsettings = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/systemsettings-5.15.1.tar.xz"; - sha256 = "0522rmbp93li3zafw0ir5zck43pi55z54wf4p4zhfs61ifp1y0kh"; - name = "systemsettings-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/systemsettings-5.15.2.tar.xz"; + sha256 = "0rx3av1by04551y88y5f1lm1rvvxkxqjdjw04fjdnpx7qipv0l6l"; + name = "systemsettings-5.15.2.tar.xz"; }; }; user-manager = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/user-manager-5.15.1.tar.xz"; - sha256 = "0i4drbl3q9m09js7p1rgggps7w33mfr6lksflcw7743bcyfaqz7a"; - name = "user-manager-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/user-manager-5.15.2.tar.xz"; + sha256 = "09xlnzdsk94p95s1zms8li0q0pv8z66hkla8ns27im21rrnrz6l0"; + name = "user-manager-5.15.2.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.15.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.1/xdg-desktop-portal-kde-5.15.1.tar.xz"; - sha256 = "1zsi2aa64zi4h53xkamiy6x622jy81qawfc66gv2gjdvapycbd3g"; - name = "xdg-desktop-portal-kde-5.15.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/xdg-desktop-portal-kde-5.15.2.tar.xz"; + sha256 = "1zzy01lgznc7z3hz9yhbspx3zg8lala7zzcsxsly4jwx4666ixp4"; + name = "xdg-desktop-portal-kde-5.15.2.tar.xz"; }; }; } From aab8c7ba437d240bd9780e09489e7358fee180e2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Jul 2018 12:29:02 -0400 Subject: [PATCH 048/238] netbsd: add cross target --- lib/systems/default.nix | 1 + lib/systems/examples.nix | 7 + .../bintools-wrapper/default.nix | 1 + pkgs/build-support/cc-wrapper/default.nix | 4 + pkgs/development/compilers/gcc/7/default.nix | 4 + .../gcc/libstdc++-netbsd-ctypes.patch | 141 ++++ pkgs/os-specific/bsd/netbsd/builder.sh | 122 +++ pkgs/os-specific/bsd/netbsd/default.nix | 772 ++++++++++-------- pkgs/top-level/all-packages.nix | 8 +- 9 files changed, 727 insertions(+), 333 deletions(-) create mode 100644 pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch create mode 100644 pkgs/os-specific/bsd/netbsd/builder.sh diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 77f20095295..6e83546ae8e 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -33,6 +33,7 @@ rec { else if final.isAndroid then "bionic" else if final.isLinux /* default */ then "glibc" else if final.isAvr then "avrlibc" + else if final.isNetBSD then "nblibc" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; extensions = { diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ac1633a1a15..0c9a3b4a63f 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -212,4 +212,11 @@ rec { libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; + + # BSDs + + amd64-netbsd = { + config = "x86_64-unknown-netbsd"; + libc = "nblibc"; + }; } diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 142f5255caa..7ec74a2a92a 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -53,6 +53,7 @@ let /**/ if libc == null then null else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" else if targetPlatform.libc == "bionic" then "/system/bin/linker" + else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 176df51cbd9..f05b9fb2255 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -291,6 +291,10 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector pic" '' + + optionalString targetPlatform.isNetBSD '' + hardening_unsupported_flags+=" stackprotector fortify" + '' + + optionalString (targetPlatform.libc == "newlib") '' hardening_unsupported_flags+=" stackprotector fortify pie pic" '' diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 956f357f84c..68c05d28978 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -48,6 +48,9 @@ let version = "7.4.0"; ./riscv-no-relax.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optionals targetPlatform.isNetBSD [ + ../libstdc++-netbsd-ctypes.patch + ] ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; @@ -302,6 +305,7 @@ stdenv.mkDerivation ({ "--disable-gnu-indirect-function" ] ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" + ++ optional targetPlatform.isNetBSD "--disable-libcilkrts" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; diff --git a/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch b/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch new file mode 100644 index 00000000000..28fff80b786 --- /dev/null +++ b/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch @@ -0,0 +1,141 @@ +diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +index ff3ec893974..21eccf9fde1 100644 +--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h ++++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +@@ -38,40 +38,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + /// @brief Base class for ctype. + struct ctype_base + { +- // Non-standard typedefs. +- typedef const unsigned char* __to_type; + + // NB: Offsets into ctype::_M_table force a particular size + // on the mask type. Because of this, we don't use an enum. +- typedef unsigned char mask; + + #ifndef _CTYPE_U +- static const mask upper = _U; +- static const mask lower = _L; +- static const mask alpha = _U | _L; +- static const mask digit = _N; +- static const mask xdigit = _N | _X; +- static const mask space = _S; +- static const mask print = _P | _U | _L | _N | _B; +- static const mask graph = _P | _U | _L | _N; +- static const mask cntrl = _C; +- static const mask punct = _P; +- static const mask alnum = _U | _L | _N; ++ // Non-standard typedefs. ++ typedef const unsigned char* __to_type; ++ ++ typedef unsigned char mask; ++ ++ static const mask upper = _U; ++ static const mask lower = _L; ++ static const mask alpha = _U | _L; ++ static const mask digit = _N; ++ static const mask xdigit = _N | _X; ++ static const mask space = _S; ++ static const mask print = _P | _U | _L | _N | _B; ++ static const mask graph = _P | _U | _L | _N; ++ static const mask cntrl = _C; ++ static const mask punct = _P; ++ static const mask alnum = _U | _L | _N; + #else +- static const mask upper = _CTYPE_U; +- static const mask lower = _CTYPE_L; +- static const mask alpha = _CTYPE_U | _CTYPE_L; +- static const mask digit = _CTYPE_N; +- static const mask xdigit = _CTYPE_N | _CTYPE_X; +- static const mask space = _CTYPE_S; +- static const mask print = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B; +- static const mask graph = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N; +- static const mask cntrl = _CTYPE_C; +- static const mask punct = _CTYPE_P; +- static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N; ++ typedef const unsigned short* __to_type; ++ ++ typedef unsigned short mask; ++ ++ static const mask upper = _CTYPE_U; ++ static const mask lower = _CTYPE_L; ++ static const mask alpha = _CTYPE_A; ++ static const mask digit = _CTYPE_D; ++ static const mask xdigit = _CTYPE_X; ++ static const mask space = _CTYPE_S; ++ static const mask print = _CTYPE_R; ++ static const mask graph = _CTYPE_G; ++ static const mask cntrl = _CTYPE_C; ++ static const mask punct = _CTYPE_P; ++ static const mask alnum = _CTYPE_A | _CTYPE_D; + #endif + #if __cplusplus >= 201103L +- static const mask blank = space; ++ static const mask blank = space; + #endif + }; + +diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc +index ed3b7cd0d6a..33358e8f5d8 100644 +--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc ++++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc +@@ -38,11 +38,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + // Information as gleaned from /usr/include/ctype.h + +- extern "C" const u_int8_t _C_ctype_[]; +- + const ctype_base::mask* + ctype::classic_table() throw() +- { return _C_ctype_ + 1; } ++ { return _C_ctype_tab_ + 1; } + + ctype::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) +@@ -69,14 +67,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + char + ctype::do_toupper(char __c) const +- { return ::toupper((int) __c); } ++ { return ::toupper((int)(unsigned char) __c); } + + const char* + ctype::do_toupper(char* __low, const char* __high) const + { + while (__low < __high) + { +- *__low = ::toupper((int) *__low); ++ *__low = ::toupper((int)(unsigned char) *__low); + ++__low; + } + return __high; +@@ -84,14 +82,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + char + ctype::do_tolower(char __c) const +- { return ::tolower((int) __c); } ++ { return ::tolower((int)(unsigned char) __c); } + + const char* + ctype::do_tolower(char* __low, const char* __high) const + { + while (__low < __high) + { +- *__low = ::tolower((int) *__low); ++ *__low = ::tolower((int)(unsigned char) *__low); + ++__low; + } + return __high; +diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h +index ace1120fba2..3234ce17c70 100644 +--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h ++++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h +@@ -48,7 +48,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + is(const char* __low, const char* __high, mask* __vec) const + { + while (__low < __high) +- *__vec++ = _M_table[*__low++]; ++ *__vec++ = _M_table[(unsigned char)*__low++]; + return __high; + } + diff --git a/pkgs/os-specific/bsd/netbsd/builder.sh b/pkgs/os-specific/bsd/netbsd/builder.sh new file mode 100644 index 00000000000..925001567f7 --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/builder.sh @@ -0,0 +1,122 @@ +source $stdenv/setup + +# NetBSD makefiles should be able to detect this +# but without they end up using gcc on Darwin stdenv +addMakeFlags() { + export setOutputFlags= + + export LIBCRT0= + export LIBCRTI= + export LIBCRTEND= + export LIBCRTBEGIN= + export LIBC= + export LIBUTIL= + export LIBSSL= + export LIBCRYPTO= + export LIBCRYPT= + export LIBCURSES= + export LIBTERMINFO= + export LIBM= + export LIBL= + + export _GCC_CRTBEGIN= + export _GCC_CRTBEGINS= + export _GCC_CRTEND= + export _GCC_CRTENDS= + export _GCC_LIBGCCDIR= + export _GCC_CRTI= + export _GCC_CRTN= + export _GCC_CRTDIR= + + # Definitions passed to share/mk/*.mk. Should be pretty simple - + # eventually maybe move it to a configure script. + export DESTDIR= + export USETOOLS=never + export NOCLANGERROR=yes + export NOGCCERROR=yes + export LEX=flex + export MKUNPRIVED=yes + export EXTERNAL_TOOLCHAIN=yes + + export INSTALL_FILE="install -U -c" + export INSTALL_DIR="xinstall -U -d" + export INSTALL_LINK="install -U -l h" + export INSTALL_SYMLINK="install -U -l s" + + makeFlags="MACHINE=$MACHINE $makeFlags" + makeFlags="MACHINE_ARCH=$MACHINE_ARCH $makeFlags" + makeFlags="AR=$AR $makeFlags" + makeFlags="CC=$CC $makeFlags" + makeFlags="CPP=$CPP $makeFlags" + makeFlags="CXX=$CXX $makeFlags" + makeFlags="LD=$LD $makeFlags" + makeFlags="STRIP=$STRIP $makeFlags" + + makeFlags="BINDIR=${!outputBin}/bin $makeFlags" + makeFlags="LIBDIR=${!outputLib}/lib $makeFlags" + makeFlags="SHLIBDIR=${!outputLib}/lib $makeFlags" + makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" + makeFlags="INFODIR=${!outputInfo}/share/info $makeFlags" + makeFlags="DOCDIR=${!outputDoc}/share/doc $makeFlags" + makeFlags="LOCALEDIR=${!outputLib}/share/locale $makeFlags" + + # Parallel building. Needs the space. + makeFlags="-j $NIX_BUILD_CORES $makeFlags" +} + +setNetBSDSourceDir() { + # merge together all extra paths + # there should be a better way to do this + sourceRoot=$PWD/$sourceRoot + export NETBSDSRCDIR=$sourceRoot + export BSDSRCDIR=$NETBSDSRCDIR + export _SRC_TOP_=$NETBSDSRCDIR + chmod -R u+w $sourceRoot + for path in $extraPaths; do + cd $path + find . -type d -exec mkdir -p $sourceRoot/\{} \; + find . -type f -exec cp -pr \{} $sourceRoot/\{} \; + chmod -R u+w $sourceRoot + done + + cd $sourceRoot + if [ -d "$NETBSD_PATH" ] + then sourceRoot=$sourceRoot/$NETBSD_PATH + fi +} + +includesPhase() { + if [ -z "${skipIncludesPhase:-}" ]; then + + local flagsArray=( + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + DESTDIR=${!outputInclude} includes + ) + + echoCmd 'includes flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + + moveUsrDir + + fi +} + +moveUsrDir() { + if [ -d $prefix ]; then + # Remove lingering /usr references + if [ -d $prefix/usr ]; then + cd $prefix/usr + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec mv \{} $out/\{} \; + fi + + find $prefix -type d -empty -delete + fi +} + +postUnpackHooks+=(setNetBSDSourceDir) +preConfigureHooks+=(addMakeFlags) +preInstallHooks+=(includesPhase) +fixupOutputHooks+=(moveUsrDir) + +genericBuild diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index d7f7c64fc2d..46bac37f4e8 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,272 +1,83 @@ -{ stdenv, fetchcvs, lib, groff, mandoc, zlib, buildPackages -, yacc, flex, libressl, bash, less, writeText }: +{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, yacc, flex, bash +, writeText, buildPackages, splicePackages, symlinkJoin }: let - inherit (lib) optionalString replaceStrings; - inherit (stdenv) hostPlatform; - fetchNetBSD = path: version: sha256: fetchcvs { cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; module = "src/${path}"; inherit sha256; - tag = "netbsd-${builtins.replaceStrings ["."] ["-"] version}-RELEASE"; + tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; }; - # Needed to support cross correctly. Splicing only happens when we - # do callPackage, but sense everything is here, it needs to be done - # by hand. All native build inputs should come from here. - nbBuildPackages = buildPackages.netbsd; + # Splice packages so we get the correct package when using + # nativeBuildInputs... + nbSplicedPackages = splicePackages { + pkgsBuildBuild = buildPackages.buildPackages.netbsd; + pkgsBuildHost = buildPackages.netbsd; + pkgsBuildTarget = {}; + pkgsHostHost = {}; + pkgsHostTarget = netbsd; + pkgsTargetTarget = {}; + }; - MACHINE_ARCH = { - "i686" = "i386"; - }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; + netbsd = with nbSplicedPackages; { - MACHINE = { - "x86_64" = "amd64"; - "aarch64" = "evbarm64"; - "i686" = "i386"; - }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; - - netBSDDerivation = attrs: stdenv.mkDerivation ((rec { - name = "netbsd-${attrs.pname or (baseNameOf attrs.path)}-${attrs.version}"; + mkDerivation = lib.makeOverridable (attrs: let + stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + in stdenv'.mkDerivation ({ + name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; - setOutputFlags = false; - nativeBuildInputs = [ yacc flex mandoc groff - nbBuildPackages.makeMinimal - nbBuildPackages.stat - nbBuildPackages.install - nbBuildPackages.tsort - nbBuildPackages.lorder ]; - buildInputs = [ nbPackages.compat ]; - installFlags = [ "includes" ]; - # TODO: eventually move this to a make.conf - makeFlags = [ - "MACHINE=${MACHINE}" - "MACHINE_ARCH=${MACHINE_ARCH}" + nativeBuildInputs = [ makeMinimal install tsort lorder mandoc groff stat ]; + buildInputs = [ compat ]; + # depsBuildBuild = [ buildPackages.stdenv.cc ]; - "AR=${stdenv.cc.targetPrefix}ar" - "CC=${stdenv.cc.targetPrefix}cc" - "CPP=${stdenv.cc.targetPrefix}cpp" - "CXX=${stdenv.cc.targetPrefix}c++" - "LD=${stdenv.cc.targetPrefix}ld" - "STRIP=${stdenv.cc.targetPrefix}strip" - ] ++ (attrs.makeFlags or []); - - # Definitions passed to share/mk/*.mk. Should be pretty simple - - # eventually maybe move it to a configure script. - # TODO: don’t rely on DESTDIR, instead use prefix - DESTDIR = "$(out)"; - TOOLDIR = "$(out)"; - USETOOLS = "never"; - NOCLANGERROR = "yes"; - NOGCCERROR = "yes"; - LEX = "flex"; - MKUNPRIVED = "yes"; - HOST_SH = "${buildPackages.bash}/bin/sh"; OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp"; + HOST_SH = "${buildPackages.bash}/bin/sh"; - MKPIC = if stdenv.isDarwin then "no" else "yes"; - MKRELRO = if stdenv.isDarwin then "no" else "yes"; + MACHINE_ARCH = { + "i686" = "i386"; + }.${stdenv'.hostPlatform.parsed.cpu.name} + or stdenv'.hostPlatform.parsed.cpu.name; - INSTALL_FILE = "install -U -c"; - INSTALL_DIR = "xinstall -U -d"; - INSTALL_LINK = "install -U -l h"; - INSTALL_SYMLINK = "install -U -l s"; + MACHINE = { + "x86_64" = "amd64"; + "aarch64" = "evbarm64"; + "i686" = "i386"; + }.${stdenv'.hostPlatform.parsed.cpu.name} + or stdenv'.hostPlatform.parsed.cpu.name; - HOST_CC = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; - HOST_CXX = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; + AR = "${stdenv'.cc.targetPrefix or ""}ar"; + CC = "${stdenv'.cc.targetPrefix or ""}cc"; + CPP = if (stdenv'.cc.isClang or false) then "clang-cpp" else "cpp"; + CXX = "${stdenv'.cc.targetPrefix or ""}c++"; + LD = "${stdenv'.cc.targetPrefix or ""}ld"; + STRIP = "${stdenv'.cc.targetPrefix or ""}strip"; - # libs will be provided by cc-wrapper - LIBCRT0 = ""; - LIBCRTI = ""; - LIBCRTEND = ""; - LIBCRTBEGIN = ""; - LIBC = ""; - LIBUTIL = ""; - LIBSSL = ""; - LIBCRYPTO = ""; - LIBCRYPT = ""; - LIBCURSES = ""; - LIBTERMINFO = ""; - LIBM = ""; - LIBL = ""; - _GCC_CRTBEGIN = ""; - _GCC_CRTBEGINS = ""; - _GCC_CRTEND = ""; - _GCC_CRTENDS = ""; - _GCC_LIBGCCDIR = ""; - _GCC_CRTI = ""; - _GCC_CRTDIR = ""; - _GCC_CRTN = ""; + NETBSD_PATH = attrs.path; - "LIBDO.terminfo" = "_external"; - "LIBDO.curses" = "_external"; - - # all dirs will be prefixed with DESTDIR - BINDIR = "/bin"; - LIBDIR = "/lib"; - SHLIBDIR = "/lib"; - INCSDIR = "/include"; - MANDIR = "/share/man"; - INFODIR = "/share/info"; - DOCDIR = "/share/doc"; - LOCALEDIR = "/share/locale"; - X11BINDIR = "/bin"; - X11USRLIBDIR = "/lib"; - X11MANDIR = "/share/man"; - - # NetBSD makefiles should be able to detect this - # but without they end up using gcc on Darwin stdenv - preConfigure = '' - export HAVE_${if stdenv.cc.isClang then "LLVM" else "GCC"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} - - # Parallel building. Needs the space. - export makeFlags+=" -j $NIX_BUILD_CORES" - ''; - - postUnpack = '' - # merge together all extra paths - # there should be a better way to do this - sourceRoot=$PWD/$sourceRoot - export NETBSDSRCDIR=$sourceRoot - export BSDSRCDIR=$NETBSDSRCDIR - export _SRC_TOP_=$NETBSDSRCDIR - chmod -R u+w $sourceRoot - for path in $extraPaths; do - cd $path - find . -type d -exec mkdir -p $sourceRoot/\{} \; - find . -type f -exec cp -pr \{} $sourceRoot/\{} \; - chmod -R u+w $sourceRoot - done - - cd $sourceRoot - if [ -d ${attrs.path} ] - then sourceRoot=$sourceRoot/${attrs.path} - fi - ''; - - preFixup = '' - # Remove lingering /usr references - if [ -d $out/usr ]; then - cd $out/usr - find . -type d -exec mkdir -p $out/\{} \; - find . -type f -exec mv \{} $out/\{} \; - fi - - find $out -type d -empty -delete - ''; + builder = ./builder.sh; meta = with lib; { maintainers = with maintainers; [matthewbauer]; platforms = platforms.unix; license = licenses.bsd2; }; - }) // (removeAttrs attrs ["makeFlags"])); - - libutil = netBSDDerivation { - path = "lib/libutil"; - version = "8.0"; - sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; - extraPaths = [ - (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") - ]; - }; - - libc = netBSDDerivation { - path = "lib/libc"; - version = "8.0"; - sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; - extraPaths = [ - (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8") - ]; - }; - - make = netBSDDerivation { - path = "usr.bin/make"; - sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; - version = "8.0"; - postPatch = '' - # make needs this to pick up our sys make files - export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ - --replace /bin/rm rm - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" \ - --replace '-Wl,--warn-shared-textrel' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ - --replace '-Wl,--whole-archive' "" \ - --replace '-Wl,--no-whole-archive' "" \ - --replace '-Wl,--warn-shared-textrel' "" \ - --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - ''; - postInstall = '' - make -C $NETBSDSRCDIR/share/mk FILESDIR=/share/mk install - ''; - extraPaths = [ - (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") - ]; - }; - - libcurses = netBSDDerivation { - path = "lib/libcurses"; - version = "8.0"; - sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; - buildInputs = [ nbPackages.libterminfo ]; - makeFlags = [ "INCSDIR=/include" ]; - NIX_CFLAGS_COMPILE = [ - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - "-D__warn_references(a,b)=" - ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; - propagatedBuildInputs = [ nbPackages.compat ]; - MKDOC = "no"; # missing vfontedpr - postPatch = '' - substituteInPlace printw.c \ - --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \ - --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' - substituteInPlace scanw.c \ - --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' - ''; - }; - - libedit = netBSDDerivation { - path = "lib/libedit"; - buildInputs = [ nbPackages.libterminfo libcurses ]; - propagatedBuildInputs = [ nbPackages.compat ]; - makeFlags = [ "INCSDIR=/include" ]; - postPatch = '' - sed -i '1i #undef bool_t' el.h - substituteInPlace config.h \ - --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" - ''; - NIX_CFLAGS_COMPILE = [ - "-D__noinline=" - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - ]; - version = "8.0"; - sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; - }; - - nbPackages = rec { + } // lib.optionalAttrs (stdenv'.cc.isClang or false) { + HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc)); + } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { + HAVE_GCC = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc)); + } // lib.optionalAttrs (attrs.headersOnly or false) { + installPhase = "includesPhase"; + dontBuild = true; + } // attrs)); ## - ## BOOTSTRAPPING + ## START BOOTSTRAPPING ## - makeMinimal = netBSDDerivation rec { + makeMinimal = mkDerivation rec { path = "tools/make"; sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1"; version = "8.0"; @@ -274,6 +85,8 @@ let buildInputs = []; nativeBuildInputs = []; + skipIncludesPhase = true; + postPatch = '' patchShebangs configure ${make.postPatch} @@ -298,7 +111,7 @@ let extraPaths = [ make.src ] ++ make.extraPaths; }; - compat = if hostPlatform.isNetBSD then null else netBSDDerivation rec { + compat = if stdenv.hostPlatform.isNetBSD then stdenv else mkDerivation rec { path = "tools/compat"; sha256 = "050449lq5gpxqsripdqip5ks49g5ypjga188nd3ss8dg1zf7ydz3"; version = "8.0"; @@ -309,13 +122,15 @@ let ]; # override defaults to prevent infinite recursion - nativeBuildInputs = [ nbBuildPackages.makeMinimal ]; + nativeBuildInputs = [ makeMinimal ]; buildInputs = [ zlib ]; # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = [ "INSTALL=${buildPackages.coreutils}/bin/install" ]; - installFlags = []; + makeFlags = [ + "INSTALL=${buildPackages.coreutils}/bin/install" + "TOOLDIR=$(out)" + ]; RENAME = "-D"; patches = [ ./compat.patch ]; @@ -352,15 +167,6 @@ let substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ --subst-var-by out $out \ --subst-var-by version ${version} - - # Remove lingering /usr references - if [ -d $out/usr ]; then - cd $out/usr - find . -type d -exec mkdir -p $out/\{} \; - find . -type f -exec mv \{} $out/\{} \; - fi - - find $out -type d -empty -delete ''; extraPaths = [ libc.src libutil.src (fetchNetBSD "include" "8.0" "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq") @@ -369,19 +175,20 @@ let ] ++ libutil.extraPaths ++ libc.extraPaths; }; - # HACK to ensure parent directories exist. This emulates GNU + # HACK: to ensure parent directories exist. This emulates GNU # install’s -D option. No alternative seems to exist in BSD install. install = let binstall = writeText "binstall" '' #!${stdenv.shell} for last in $@; do true; done mkdir -p $(dirname $last) xinstall "$@" - ''; in netBSDDerivation { + ''; in mkDerivation { path = "usr.bin/xinstall"; version = "8.0"; sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = [ mtree.src make.src ]; - nativeBuildInputs = [ nbBuildPackages.makeMinimal mandoc groff ]; + nativeBuildInputs = [ makeMinimal mandoc groff ]; + skipIncludesPhase = true; buildInputs = [ compat fts ]; installPhase = '' runHook preInstall @@ -395,7 +202,7 @@ let ''; }; - fts = netBSDDerivation { + fts = mkDerivation { pname = "fts"; path = "include/fts.h"; sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; @@ -407,6 +214,7 @@ let (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "1sjvh9nw3prnk4rmdwrfsxh6gdb9lmilkn46jcfh3q5c8glqzrd7") (fetchNetBSD "lib/libc/gen/fts.3" "8.0" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") ]; + skipIncludesPhase = true; buildPhase = '' cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ -o lib/libc/gen/fts.o @@ -428,119 +236,85 @@ let ]; }; - stat = netBSDDerivation { + stat = mkDerivation { path = "usr.bin/stat"; version = "8.0"; sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh"; - nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install - mandoc groff ]; + nativeBuildInputs = [ makeMinimal install mandoc groff ]; }; - tsort = netBSDDerivation { + tsort = mkDerivation { path = "usr.bin/tsort"; version = "8.0"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; - nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install - mandoc groff ]; + nativeBuildInputs = [ makeMinimal install mandoc groff ]; }; - lorder = netBSDDerivation { + lorder = mkDerivation { path = "usr.bin/lorder"; version = "8.0"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; - nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install - mandoc groff ]; + nativeBuildInputs = [ makeMinimal install mandoc groff ]; }; ## ## END BOOTSTRAPPING ## - mtree = netBSDDerivation { + ## + ## START COMMAND LINE TOOLS + ## + make = mkDerivation { + path = "usr.bin/make"; + sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; + version = "8.0"; + postPatch = '' + # make needs this to pick up our sys make files + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ + --replace /bin/rm rm + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" + ''; + postInstall = '' + make -C $NETBSDSRCDIR/share/mk FILESDIR=$out/share/mk install + ''; + extraPaths = [ + (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") + ]; + }; + + mtree = mkDerivation { path = "usr.sbin/mtree"; version = "8.0"; sha256 = "0hanmzm8bgwz2bhsinmsgfmgy6nbdhprwmgwbyjm6bl17vgn7vid"; extraPaths = [ mknod.src ]; }; - mknod = netBSDDerivation { + mknod = mkDerivation { path = "sbin/mknod"; version = "8.0"; sha256 = "0vq66v0hj0r4z2r2z2d3l3c5vh48pvcdmddc8bhm8hzq2civ5df2"; }; - getent = netBSDDerivation { + getent = mkDerivation { path = "usr.bin/getent"; sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz"; version = "8.0"; patches = [ ./getent.patch ]; }; - getconf = netBSDDerivation { + getconf = mkDerivation { path = "usr.bin/getconf"; sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; version = "8.0"; }; - dict = netBSDDerivation { - path = "share/dict"; - version = "8.0"; - sha256 = "1pk0y3xc5ihc2k89wjkh33qqx3w9q34k03k2qcffvbqh1l6wm36l"; - makeFlags = [ "BINDIR=/share" ]; - }; - - fingerd = netBSDDerivation { - path = "libexec/fingerd"; - sha256 = "0blcahhgyj1lm0mimrbvgmq3wkjvqk5wy85sdvbs99zxg7da1190"; - version = "8.0"; - }; - - libterminfo = netBSDDerivation { - path = "lib/libterminfo"; - version = "8.0"; - sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; - buildInputs = [ compat tic nbperf ]; - makeFlags = [ "INCSDIR=/include" ]; - postPatch = '' - substituteInPlace term.c --replace /usr/share $out/share - substituteInPlace setupterm.c --replace '#include ' 'void use_env(bool);' - - ''; - postInstall = '' - make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share - make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share install - ''; - extraPaths = [ - (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") - ]; - }; - - nbperf = netBSDDerivation { - path = "usr.bin/nbperf"; - version = "8.0"; - sha256 = "0gzm0zv2400lasnsswnjw9bwzyizhxzdbrcjwcl1k65aj86aqyqb"; - }; - - tic = netBSDDerivation { - path = "tools/tic"; - version = "8.0"; - sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; - HOSTPROG = "tic"; - buildInputs = [ compat nbperf ]; - extraPaths = [ - libterminfo.src - (fetchNetBSD "usr.bin/tic" "8.0" "0diirnzmdnpc5bixyb34c9rid9paw2a4zfczqrpqrfvjsf1nnljf") - (fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp") - ]; - }; - - misc = netBSDDerivation { - path = "share/misc"; - version = "8.0"; - sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch8"; - makeFlags = [ "BINDIR=/share" ]; - }; - - locale = netBSDDerivation { + locale = mkDerivation { path = "usr.bin/locale"; version = "8.0"; sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; @@ -548,12 +322,348 @@ let NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; }; - column = netBSDDerivation { + rpcgen = mkDerivation { + path = "usr.bin/rpcgen"; + version = "8.0"; + sha256 = "1kfgfx54jg98wbg0d95p0rvf4w0302v8fz724b0bdackdsrd4988"; + }; + + genassym = mkDerivation { + path = "usr.bin/genassym"; + version = "8.0"; + sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c"; + }; + + gencat = mkDerivation { + path = "usr.bin/gencat"; + version = "8.0"; + sha256 = "1696lgh2lhz93247lklvpvkd0f5asg6z27w2g4bmpfijlgw2h698"; + }; + + nbperf = mkDerivation { + path = "usr.bin/nbperf"; + version = "8.0"; + sha256 = "0gzm0zv2400lasnsswnjw9bwzyizhxzdbrcjwcl1k65aj86aqyqb"; + }; + + tic = mkDerivation { + path = "tools/tic"; + version = "8.0"; + sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; + HOSTPROG = "tic"; + buildInputs = [ compat ]; + nativeBuildInputs = [ makeMinimal install mandoc groff nbperf ]; + makeFlags = [ "TOOLDIR=$(out)" ]; + extraPaths = [ + libterminfo.src + (fetchNetBSD "usr.bin/tic" "8.0" "0diirnzmdnpc5bixyb34c9rid9paw2a4zfczqrpqrfvjsf1nnljf") + (fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp") + ]; + }; + ## + ## END COMMAND LINE TOOLS + ## + + ## + ## START HEADERS + ## + include = mkDerivation { + path = "include"; + version = "8.0"; + sha256 = "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq"; + nativeBuildInputs = [ makeMinimal install mandoc groff nbperf rpcgen ]; + extraPaths = [ common.src ]; + headersOnly = true; + noCC = true; + # meta.platforms = lib.platforms.netbsd; + makeFlags = [ "RPCGEN_CPP=${buildPackages.gcc-unwrapped}/bin/cpp" ]; + }; + + common = mkDerivation { + path = "common"; + version = "8.0"; + sha256 = "1fsm2b7p7zkhiz523jw75088cq2h39iknp0fp3di9a64bikwbhi1"; + }; + + # The full kernel + sys = mkDerivation { + path = "sys"; + version = "8.0"; + sha256 = "123ilg8fqmp69bw6bs6nh98fpi1v2n9lamrzar61p27ji6sj7g0w"; + propagatedBuildInputs = [ include ]; + #meta.platforms = lib.platforms.netbsd; + extraPaths = [ common.src ]; + MKKMOD = "no"; + }; + + headers = symlinkJoin { + name = "netbsd-headers-8.0"; + paths = [ include ] ++ map (pkg: pkg.override (_: { + installPhase = "includesPhase"; + dontBuild = true; + noCC = true; + meta.platforms = lib.platforms.all; + })) [ sys libpthread ]; + }; + ## + ## END HEADERS + ## + + ## + ## START LIBRARIES + ## + libutil = mkDerivation { + path = "lib/libutil"; + version = "8.0"; + sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; + extraPaths = [ common.src ]; + }; + + libedit = mkDerivation { + path = "lib/libedit"; + version = "8.0"; + sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; + buildInputs = [ libterminfo libcurses ]; + propagatedBuildInputs = [ compat ]; + postPatch = '' + sed -i '1i #undef bool_t' el.h + substituteInPlace config.h \ + --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" + substituteInPlace readline/Makefile --replace /usr/include "$out/include" + ''; + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + ]; + }; + + libterminfo = mkDerivation { + path = "lib/libterminfo"; + version = "8.0"; + sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; + buildInputs = [ compat ]; + postPatch = '' + substituteInPlace term.c --replace /usr/share $out/share + substituteInPlace setupterm.c \ + --replace '#include ' 'void use_env(bool);' + ''; + postInstall = '' + make -C $NETBSDSRCDIR/share/terminfo BINDIR=$out/share install + ''; + extraPaths = [ + (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") + ]; + }; + + libcurses = mkDerivation { + path = "lib/libcurses"; + version = "8.0"; + sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; + buildInputs = [ libterminfo ]; + NIX_CFLAGS_COMPILE = [ + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-D__warn_references(a,b)=" + ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; + propagatedBuildInputs = [ compat ]; + MKDOC = "no"; # missing vfontedpr + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace printw.c \ + --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ + --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' + substituteInPlace scanw.c \ + --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' + ''; + }; + + libkern = mkDerivation { + path = "lib/libkern"; + version = "8.0"; + sha256 = "1wirqr9bms69n4b5sr32g1b1k41hcamm7c9n7i8c440m73r92yv4"; + meta.platforms = lib.platforms.netbsd; + }; + + column = mkDerivation { path = "usr.bin/column"; version = "8.0"; sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; }; + libossaudio = mkDerivation { + path = "lib/libossaudio"; + version = "8.0"; + sha256 = "03azp5anavhjr15sinjlik9792lyf7w4zmkcihlkksrywhs05axh"; + meta.platforms = lib.platforms.netbsd; + postPatch = '' + substituteInPlace rpc/Makefile --replace /usr $out + ''; }; -in nbPackages + librpcsvc = mkDerivation { + path = "lib/librpcsvc"; + version = "8.0"; + sha256 = "14ri9w6gdhsm4id5ck133syyvbmkbknfa8w0xkklm726nskhfkj7"; + makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; + meta.platforms = lib.platforms.netbsd; + }; + + librt = mkDerivation { + path = "lib/librt"; + version = "8.0"; + sha256 = "078qsi4mg1hyyxr1awvjs9b0c2gicg3zw4vl603g1m9vm8gfxw9l"; + meta.platforms = lib.platforms.netbsd; + }; + + libcrypt = mkDerivation { + path = "lib/libcrypt"; + version = "8.0"; + sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; + meta.platforms = lib.platforms.netbsd; + }; + + libpthread = mkDerivation { + path = "lib/libpthread"; + version = "8.0"; + sha256 = "0pcz61klc3ijf5z2zf8s78nj7bwjfblzjllx7vr4z5qv3m0sdb3j"; + meta.platforms = lib.platforms.netbsd; + }; + + libresolv = mkDerivation { + path = "lib/libresolv"; + version = "8.0"; + sha256 = "11vpb3p2343wyrhw4v9gwz7i0lcpb9ysmfs9gsx56b5gkgipdy4v"; + meta.platforms = lib.platforms.netbsd; + }; + + libm = mkDerivation { + path = "lib/libm"; + version = "8.0"; + sha256 = "0i22603cgj6n00gn2m446v4kn1pk109qs1g6ylrslmihfmiy2h1d"; + meta.platforms = lib.platforms.netbsd; + }; + + i18n_module = mkDerivation { + path = "lib/i18n_module"; + version = "8.0"; + sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; + meta.platforms = lib.platforms.netbsd; + }; + + csu = mkDerivation { + path = "lib/csu"; + version = "8.0"; + sha256 = "0630lbvz6v4ic13bfg8ccwfhqkgcv76bfdw9f36rfsnwfgpxqsmq"; + meta.platforms = lib.platforms.netbsd; + nativeBuildInputs = [ makeMinimal install mandoc groff flex + yacc genassym gencat lorder tsort stat ]; + extraPaths = [ sys.src ld_elf_so.src ]; + }; + + ld_elf_so = mkDerivation { + path = "libexec/ld.elf_so"; + version = "8.0"; + sha256 = "1jmqpi0kg2daiqnvpwdyfy8rpnszxsm70sxizz0r7wn53xjr5hva"; + meta.platforms = lib.platforms.netbsd; + USE_FORT = "yes"; + extraPaths = [ libc.src ] ++ libc.extraPaths; + }; + + libc = mkDerivation { + path = "lib/libc"; + version = "8.0"; + sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; + USE_FORT = "yes"; + MKPROFILE = "no"; + extraPaths = [ common.src i18n_module.src sys.src + ld_elf_so.src libpthread.src libm.src libresolv.src + librpcsvc.src libutil.src librt.src libcrypt.src ]; + buildInputs = [ buildPackages.netbsd.headers csu ]; + nativeBuildInputs = [ makeMinimal install mandoc groff flex + yacc genassym gencat lorder tsort stat ]; + NIX_CFLAGS_COMPILE = "-B${csu}/lib"; + meta.platforms = lib.platforms.netbsd; + SHLIBINSTALLDIR = "$(out)/lib"; + NLSDIR = "$(out)/share/nls"; + makeFlags = [ "FILESDIR=$(out)/var/db"]; + postInstall = '' + pushd ${buildPackages.netbsd.headers} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd + + pushd ${csu} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd + + NIX_CFLAGS_COMPILE+=" -B$out/lib" + NIX_CFLAGS_COMPILE+=" -I$out/include" + NIX_LDFLAGS+=" -L$out/lib" + + make -C $NETBSDSRCDIR/lib/libpthread $makeFlags + make -C $NETBSDSRCDIR/lib/libpthread $makeFlags install + + make -C $NETBSDSRCDIR/lib/libm $makeFlags + make -C $NETBSDSRCDIR/lib/libm $makeFlags install + + make -C $NETBSDSRCDIR/lib/libresolv $makeFlags + make -C $NETBSDSRCDIR/lib/libresolv $makeFlags install + + make -C $NETBSDSRCDIR/lib/librpcsv $makeFlags + make -C $NETBSDSRCDIR/lib/librpcsv $makeFlags install + + make -C $NETBSDSRCDIR/lib/i18n_module $makeFlags + make -C $NETBSDSRCDIR/lib/i18n_module $makeFlags install + + make -C $NETBSDSRCDIR/lib/libutil $makeFlags + make -C $NETBSDSRCDIR/lib/libutil $makeFlags install + + make -C $NETBSDSRCDIR/lib/librt $makeFlags + make -C $NETBSDSRCDIR/lib/librt $makeFlags install + + make -C $NETBSDSRCDIR/lib/libcrypt $makeFlags + make -C $NETBSDSRCDIR/lib/libcrypt $makeFlags install + ''; + postPatch = '' + substituteInPlace sys/Makefile.inc \ + --replace /usr/include/sys/syscall.h ${buildPackages.netbsd.headers}/include/sys/syscall.h + ''; + }; + # + # END LIBRARIES + # + + # + # START MISCELLANEOUS + # + dict = mkDerivation { + path = "share/dict"; + noCC = true; + version = "8.0"; + sha256 = "1pk0y3xc5ihc2k89wjkh33qqx3w9q34k03k2qcffvbqh1l6wm36l"; + makeFlags = [ "BINDIR=$(out)/share" ]; + }; + + misc = mkDerivation { + path = "share/misc"; + noCC = true; + version = "8.0"; + sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch8"; + makeFlags = [ "BINDIR=$(out)/share" ]; + }; + + man = mkDerivation { + path = "share/man"; + noCC = true; + version = "8.0"; + sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch0"; + makeFlags = [ "FILESDIR=$(out)/share" ]; + }; + # + # END MISCELLANEOUS + # + + }; + +in netbsd diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cc75294008..9b56127be89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6838,6 +6838,7 @@ in libcCross1 = if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode + else if stdenv.targetPlatform.libc == "nblibc" then netbsd.headers else null; binutils1 = wrapBintoolsWith { bintools = binutils-unwrapped; @@ -10025,6 +10026,7 @@ in else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode + else if name == "nblibc" then targetPackages.netbsdCross.libc else throw "Unknown libc"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; @@ -23258,8 +23260,10 @@ in fts = if stdenv.hostPlatform.isMusl then netbsd.fts else null; - inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) - netbsd; + netbsd = callPackages ../os-specific/bsd/netbsd {}; + netbsdCross = callPackages ../os-specific/bsd/netbsd { + stdenv = crossLibcStdenv; + }; yrd = callPackage ../tools/networking/yrd { }; From 85536e892b329d2c164d9776e2dcee114bd7ed79 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 5 Feb 2019 10:24:00 -0500 Subject: [PATCH 049/238] bintools-wrapper: fix unknown emulation error message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the + operator with throw doesn’t seems to work properly. You need to use antiquotes here to get the targetPlatform config included. --- pkgs/build-support/bintools-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 7ec74a2a92a..fca79636384 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation { else if targetPlatform.isSparc then "sparc" else if targetPlatform.isAvr then "avr" else if targetPlatform.isAlpha then "alpha" - else throw "unknown emulation for platform: " + targetPlatform.config; + else throw "unknown emulation for platform: ${targetPlatform.config}"; in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); strictDeps = true; From 7aea4cc094cb9be95738dd5735624b9a15a869fd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 27 Feb 2019 16:45:48 -0600 Subject: [PATCH 050/238] Revert "Merge #56170: Revert "file: 5.35 -> 5.36" (staging)" Try this again, seems to work now. Motivated by new version possibly fixing security issues described here: https://github.com/NixOS/nixpkgs/issues/56360 This reverts commit 7d47102bbccb28cb3417dc949ad9df24e9d59686, reversing changes made to 2ed8187107c8efa3cf77311ef58cf3783e3dd749. --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index cefddbd65ef..ed31d01f09d 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.35"; + version = "5.36"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h"; + sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; From 392473f385da2c4998a91b589364e3bddc8cb651 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 28 Feb 2019 13:15:21 -0600 Subject: [PATCH 051/238] libvdpau: 1.1.1 -> 1.2 https://lists.x.org/archives/xorg-announce/2019-February/002958.html --- pkgs/development/libraries/libvdpau/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 52359a3a4cd..a61b3c3f2ac 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libvdpau-${version}"; - version = "1.1.1"; + version = "1.2"; src = fetchurl { - url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; - sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; + url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2"; + sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06"; }; outputs = [ "out" "dev" ]; From 9866979c230e7777278cce3c3cb56fcbd953874f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 28 Feb 2019 16:11:36 -0600 Subject: [PATCH 052/238] gdk-pixbuf: 2.38.0 -> 2.38.1 https://gitlab.gnome.org/GNOME/gdk-pixbuf/tags/2.38.1 --- pkgs/development/libraries/gdk-pixbuf/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 20f05d28bfe..d98d9e8107e 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -4,28 +4,18 @@ let pname = "gdk-pixbuf"; - version = "2.38.0"; + version = "2.38.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x"; + sha256 = "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi"; }; patches = [ - # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which requires access to shared-mime-info files during runtime. - # For now, we are patching the build script to avoid the dependency. - ./no-mime-sniffing.patch - # Move installed tests to a separate output ./installed-tests-path.patch - - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch; - sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92"; - }) ]; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; @@ -48,6 +38,7 @@ in stdenv.mkDerivation rec { "-Djasper=true" "-Dx11=true" "-Dgir=${if gobject-introspection != null then "true" else "false"}" + "-Dgio_sniffing=false" ]; postPatch = '' From 466f1d85d21f79237123d74598a3d7f073513685 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Fri, 1 Mar 2019 00:09:37 +0100 Subject: [PATCH 053/238] lndir: get rid of xorgproto dependency --- pkgs/servers/x11/xorg/overrides.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c368fa8ea6e..d62d61b429e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -598,8 +598,16 @@ self: super: })); lndir = super.lndir.overrideAttrs (attrs: { + buildInputs = []; preConfigure = '' + export XPROTO_CFLAGS=" " + export XPROTO_LIBS=" " substituteInPlace lndir.c \ + --replace '' '' \ + --replace '' '' \ + --replace '_X_ATTRIBUTE_PRINTF(1,2)' '__attribute__((__format__(__printf__,1,2)))' \ + --replace '_X_ATTRIBUTE_PRINTF(2,3)' '__attribute__((__format__(__printf__,2,3)))' \ + --replace '_X_NORETURN' '__attribute__((noreturn))' \ --replace 'n_dirs--;' "" ''; }); From 5937a19a061800a39af1b404e9654714f4380fc0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 28 Feb 2019 21:04:28 -0600 Subject: [PATCH 054/238] qtbase: let build use gold linker if it wants, maybe works now --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index f5f5c69455f..92ac8a24201 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -301,7 +301,6 @@ stdenv.mkDerivation { then [ "-platform macx-clang" - "-no-use-gold-linker" "-no-fontconfig" "-qt-freetype" "-qt-libpng" @@ -329,9 +328,6 @@ stdenv.mkDerivation { "-glib" "-system-libjpeg" "-system-libpng" - # gold linker of binutils 2.28 generates duplicate symbols - # TODO: remove for newer version of binutils - "-no-use-gold-linker" ] ++ lib.optional withGtk3 "-gtk" ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify" From 8d3e91077ba074e2c947a152ee8ab7be885c42ab Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Fri, 1 Mar 2019 07:55:55 +0000 Subject: [PATCH 055/238] rust: 1.32.0 -> 1.33.0 --- pkgs/development/compilers/rust/bootstrap.nix | 16 +++++----- pkgs/development/compilers/rust/default.nix | 6 ++-- .../rust/patches/net-tcp-disable-tests.patch | 32 +++++++------------ 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index ddef4adf0a0..b44c7815e90 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.31.1"; + version = "1.32.0"; - # fetch hashes by running `print-hashes.sh 1.31.1` + # fetch hashes by running `print-hashes.sh 1.32.0` hashes = { - i686-unknown-linux-gnu = "1e77e5e8c745320faad9ce6f319a77b4a2e75d972eb68a195acd081ad910ab6d"; - x86_64-unknown-linux-gnu = "a64685535d0c457f49a8712a096a5c21564cd66fd2f7da739487f028192ebe3c"; - armv7-unknown-linux-gnueabihf = "11c717b781a7af5bdc829894139f8f45d4c12a061f7f9e39481f21426a04eb21"; - aarch64-unknown-linux-gnu = "29a7c6eb536fefd0ca459e48dfaea006aa8bff8a87aa82a9b7d483487033632a"; - i686-apple-darwin = "46566dc25fcbd8badc9950b8c9f9b0faeca065b5a09cd96258e4f4b10d686aed"; - x86_64-apple-darwin = "8398b1b303bdf0e7605d08b87070a514a4f588797c6fb3593718cb9cec233ad6"; + i686-unknown-linux-gnu = "4ce3a6a656669fa86606074b43fadeac7465ef48394249407e21106ed714c8db"; + x86_64-unknown-linux-gnu = "e024698320d76b74daf0e6e71be3681a1e7923122e3ebd03673fcac3ecc23810"; + armv7-unknown-linux-gnueabihf = "d7b69f60689d2905d8d3c2829b0f1cd0f86265a255ff88ea0deb601aebac6428"; + aarch64-unknown-linux-gnu = "60def40961728212da4b3a9767d5a2ddb748400e150a5f8a6d5aa0e1b8ba1cee"; + i686-apple-darwin = "76cc1280f6b61bf7cf1fddd5202cc236db7573ee05f39fc8cd12ddda8f39a7c3"; + x86_64-apple-darwin = "f0dfba507192f9b5c330b5984ba71d57d434475f3d62bd44a39201e36fa76304"; }; platform = diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 9640cd9b577..df64fff04dd 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.32.0"; - cargoVersion = "1.32.0"; + version = "1.33.0"; + cargoVersion = "1.33.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"; + sha256 = "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as"; }; in rec { rustc = callPackage ./rustc.nix { diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch index 10713b6b7aa..1bb9a98f7b6 100644 --- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch +++ b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch @@ -1,8 +1,8 @@ diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs -index 0f60b5b3e..9b08415e7 100644 +index 86ecb10edf..626be0a52d 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs -@@ -962,6 +962,7 @@ mod tests { +@@ -955,6 +955,7 @@ mod tests { } } @@ -10,7 +10,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn listen_localhost() { let socket_addr = next_test_ip4(); -@@ -1020,6 +1021,7 @@ mod tests { +@@ -1013,6 +1014,7 @@ mod tests { }) } @@ -18,7 +18,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn read_eof() { each_ip(&mut |addr| { -@@ -1039,6 +1041,7 @@ mod tests { +@@ -1032,6 +1034,7 @@ mod tests { }) } @@ -26,7 +26,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn write_close() { each_ip(&mut |addr| { -@@ -1065,6 +1068,7 @@ mod tests { +@@ -1058,6 +1061,7 @@ mod tests { }) } @@ -34,7 +34,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn multiple_connect_serial() { each_ip(&mut |addr| { -@@ -1087,6 +1091,7 @@ mod tests { +@@ -1080,6 +1084,7 @@ mod tests { }) } @@ -42,7 +42,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn multiple_connect_interleaved_greedy_schedule() { const MAX: usize = 10; -@@ -1123,6 +1128,7 @@ mod tests { +@@ -1116,6 +1121,7 @@ mod tests { } #[test] @@ -50,7 +50,7 @@ index 0f60b5b3e..9b08415e7 100644 fn multiple_connect_interleaved_lazy_schedule() { const MAX: usize = 10; each_ip(&mut |addr| { -@@ -1401,6 +1407,7 @@ mod tests { +@@ -1394,6 +1400,7 @@ mod tests { } #[test] @@ -58,7 +58,7 @@ index 0f60b5b3e..9b08415e7 100644 fn clone_while_reading() { each_ip(&mut |addr| { let accept = t!(TcpListener::bind(&addr)); -@@ -1421,7 +1422,10 @@ mod tests { +@@ -1504,7 +1511,10 @@ mod tests { // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code // no longer has rounding errors. @@ -70,7 +70,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn timeouts() { let addr = next_test_ip4(); -@@ -1596,6 +1603,7 @@ mod tests { +@@ -1591,6 +1601,7 @@ mod tests { drop(listener); } @@ -78,7 +78,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn nodelay() { let addr = next_test_ip4(); -@@ -1610,6 +1618,7 @@ mod tests { +@@ -1605,6 +1616,7 @@ mod tests { assert_eq!(false, t!(stream.nodelay())); } @@ -86,7 +86,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn ttl() { let ttl = 100; -@@ -1647,6 +1656,7 @@ mod tests { +@@ -1642,6 +1654,7 @@ mod tests { } } @@ -94,11 +94,3 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn peek() { each_ip(&mut |addr| { -@@ -1679,6 +1689,7 @@ mod tests { - } - - #[test] -+ #[cfg_attr(any(target_os = "linux", target_os = "macos"), ignore)] - fn connect_timeout_unroutable() { - // this IP is unroutable, so connections should always time out, - // provided the network is reachable to begin with. From e94519aae2de874bb687e2b323fda58c14c5cd62 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 27 Feb 2019 13:15:07 -0600 Subject: [PATCH 056/238] numpy: 1.16.1 -> 1.16.2 https://github.com/numpy/numpy/releases/tag/v1.16.2 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 291a80a521b..b74bbf581d8 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.16.1"; + version = "1.16.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288"; + sha256 = "1c4inssky16p6ab63n1gass6dik1dzxrp3y7kmxbdq6xg4w2wsbc"; }; disabled = isPyPy; From 1d4efdc109f4a3ad4bca398d4dc6b68b1e26014f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 2 Mar 2019 02:17:21 -0500 Subject: [PATCH 057/238] cairo: use buildInputs for libraries --- pkgs/development/libraries/cairo/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 845b09053ad..a761b8bd3f2 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -40,6 +40,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig + ]; + + buildInputs = [ libiconv libintl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ From 1eab40211ef313848cd3cd7d17cd8c4917e7df39 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Mar 2019 00:15:39 +0100 Subject: [PATCH 058/238] python3Packages.pyqt5: fix building dbus support module --- pkgs/development/python-modules/pyqt/5.x.nix | 14 ++-- .../pyqt5-fix-dbus-mainloop-support.patch | 70 +++++++++++++++++++ 2 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 47a789000b1..46de94cd0c6 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -27,24 +27,26 @@ in buildPythonPackage rec { buildInputs = [ dbus sip ]; - propagatedBuildInputs = [ qtbase qtsvg qtwebengine ] + propagatedBuildInputs = [ qtbase qtsvg qtwebengine dbus-python ] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets; + patches = [ + # Fix some wrong assumptions by ./configure.py + # TODO: figure out how to send this upstream + ./pyqt5-fix-dbus-mainloop-support.patch + ]; + configurePhase = '' runHook preConfigure - mkdir -p $out - lndir ${dbus-python} $out - rm -rf "$out/nix-support" - export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} ${python.executable} configure.py -w \ --confirm-license \ - --dbus=${dbus.dev}/include/dbus-1.0 \ + --dbus-moduledir=$out/${python.sitePackages}/dbus/mainloop \ --no-qml-plugin \ --bindir=$out/bin \ --destdir=$out/${python.sitePackages} \ diff --git a/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch b/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch new file mode 100644 index 00000000000..faa36fa1913 --- /dev/null +++ b/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch @@ -0,0 +1,70 @@ +From 944d5467e1655aac20a14325631df6daccaf5804 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Sun, 3 Mar 2019 01:13:46 +0100 +Subject: [PATCH] Fix building on Nix + +./configure.py tries to find dbus-python header in dbus-1 includedir +obtained from pkg-config or from --dbus flag. Unfortunately, when supplied, +it also uses the flag for locating dbus-1 headers. This fails on Nix, +since every package is installed into its own immutable tree so we cannot +use a single directory for both dbus-python and dbus-1. We can fix this by +using pkg-config for finding dbus-python headers too. + +Additionally, the build system also tries to install the dbus support module +to dbus-python tree. Often, it is possible to handle this in pkgconfig as well [1] +but unfortunately, dbus-python does not export the moduledir in its pc file +so I have decided to solve this with an extra configure flag. + +[1]: https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ +--- + configure.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/configure.py b/configure.py +index a3450ca3..440d90a2 100644 +--- a/configure.py ++++ b/configure.py +@@ -905,6 +905,9 @@ class TargetConfiguration: + if opts.pydbusincdir is not None: + self.pydbus_inc_dir = opts.pydbusincdir + ++ if opts.pydbusmoduledir is not None: ++ self.pydbus_module_dir = opts.pydbusmoduledir ++ + if opts.pyuicinterpreter is not None: + self.pyuic_interpreter = opts.pyuicinterpreter + +@@ -1184,6 +1187,11 @@ def create_optparser(target_config): + metavar="DIR", + help="the directory containing the dbus/dbus-python.h header is " + "DIR [default: supplied by pkg-config]") ++ g.add_option("--dbus-moduledir", dest='pydbusmoduledir', type='string', ++ default=None, action='callback', callback=store_abspath, ++ metavar="DIR", ++ help="the directory where dbus support module will be installed to" ++ "DIR [default: obtained from dbus.mainloop python module]") + p.add_option_group(g) + + # Installation. +@@ -2149,7 +2157,7 @@ def check_dbus(target_config, verbose): + + inform("Checking to see if the dbus support module should be built...") + +- cmd = 'pkg-config --cflags-only-I --libs dbus-1' ++ cmd = 'pkg-config --cflags-only-I --libs dbus-1 dbus-python' + + if verbose: + sys.stdout.write(cmd + "\n") +@@ -2178,7 +2186,8 @@ def check_dbus(target_config, verbose): + inform("The Python dbus module doesn't seem to be installed.") + return + +- target_config.pydbus_module_dir = dbus.mainloop.__path__[0] ++ if target_config.pydbus_module_dir == '': ++ target_config.pydbus_module_dir = dbus.mainloop.__path__[0] + + # Try and find dbus-python.h. We don't use pkg-config because it is broken + # for dbus-python (at least for versions up to and including v0.81.0). +-- +2.18.0 + From c28848a3b3b15417290fbfa7f3ea950b43920fad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Mar 2019 02:34:08 +0100 Subject: [PATCH 059/238] pythonPackages.dbus-python: fix includedir in pkg-config --- pkgs/development/python-modules/dbus/default.nix | 6 +++++- pkgs/development/python-modules/dbus/fix-includedir.patch | 8 ++++++++ pkgs/development/python-modules/python-efl/default.nix | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/dbus/fix-includedir.patch diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 13465f1af2c..f686f067e7a 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -6,12 +6,16 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa version = "1.2.4"; format = "other"; + outputs = [ "out" "dev" "doc" ]; + src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz"; sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2"; }; - postPatch = "patchShebangs ."; + patches = [ + ./fix-includedir.patch + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus dbus-glib ] diff --git a/pkgs/development/python-modules/dbus/fix-includedir.patch b/pkgs/development/python-modules/dbus/fix-includedir.patch new file mode 100644 index 00000000000..e3bb0682b5c --- /dev/null +++ b/pkgs/development/python-modules/dbus/fix-includedir.patch @@ -0,0 +1,8 @@ +--- a/dbus-python.pc.in ++++ b/dbus-python.pc.in +@@ -9,4 +9,4 @@ + Description: Python bindings for D-Bus + Requires: dbus-1 >= 1.0 + Version: @VERSION@ +-Cflags: -I${includedir} ++Cflags: -I${includedir}/dbus-1.0 diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 8e3e9d9a584..48dbc9b710a 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -18,9 +18,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ python.pkgs.dbus-python ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" ''; - + preBuild = "${python.interpreter} setup.py build_ext"; installPhase= "${python.interpreter} setup.py install --prefix=$out"; From 9c3a5661634a45f6a37afad965989dc5d4036d00 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 2 Mar 2019 18:05:52 -0600 Subject: [PATCH 060/238] boehmgc: 8.0.2 -> 8.0.4 https://github.com/ivmai/bdwgc/releases/tag/v8.0.4 --- pkgs/development/libraries/boehm-gc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 1a2c75ecf91..2618d35ff79 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "boehm-gc-${version}"; - version = "8.0.2"; + version = "8.0.4"; src = fetchurl { urls = [ "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" ]; - sha256 = "1jsixcpdwy5cgq5s9fi3bdlid9zh46vakymf3nbjffianyss932f"; + sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"; }; buildInputs = [ libatomic_ops ]; From 8b1816ec5ab6b2ef5eb9c218322ff4742d5d0e99 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Mar 2019 02:45:04 +0100 Subject: [PATCH 061/238] =?UTF-8?q?ffado:=202.4.0=20=E2=86=92=202.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update, switch to Python 3, Qt 5, libxmlxx3, and clean up the expression. --- pkgs/os-specific/linux/ffado/default.nix | 64 +++++++++----------- pkgs/os-specific/linux/ffado/fix-build.patch | 26 ++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 57 insertions(+), 37 deletions(-) create mode 100644 pkgs/os-specific/linux/ffado/fix-build.patch diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 027706c25b7..3b3d5605248 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,61 +1,57 @@ -{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python -, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx +{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python3 +, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx3 , glibmm , alsaLib, dbus, dbus_cplusplus -, pyqt4, dbus-python }: -stdenv.mkDerivation rec { - name = "ffado-${version}"; - version = "2.4.0"; +let + inherit (python3.pkgs) pyqt5 dbus-python; + python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]); +in stdenv.mkDerivation rec { + pname = "ffado"; + version = "2.4.1"; src = fetchurl { url = "http://www.ffado.org/files/libffado-${version}.tgz"; - sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f"; + sha256 = "0byr3kv58d1ryy60vr69fd868zlfkvl2gq9hl94dqdn485l9pq9y"; }; + patches = [ + # fix installing metainfo file + ./fix-build.patch + ]; + outputs = [ "out" "bin" "dev" ]; - nativeBuildInputs = [ scons pkgconfig which makeWrapper python ]; + nativeBuildInputs = [ scons pkgconfig which makeWrapper python pyqt5 ]; prefixKey = "PREFIX="; sconsFlags = [ "DEBUG=False" "ENABLE_ALL=True" - "SERIALIZE_USE_EXPAT=True" "BUILD_TESTS=False" "WILL_DEAL_WITH_XDG_MYSELF=True" "BUILD_MIXER=True" + "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" + "PYPKGDIR=${placeholder "out"}/${python3.sitePackages}" + "BINDIR=${placeholder "bin"}/bin" + "INCLUDEDIR=${placeholder "dev"}/include" + "PYTHON_INTERPRETER=${python.interpreter}" ]; - configurePhase = '' - mkdir -p $out/lib/udev/rules.d $bin/bin $dev/include \ - $out/lib/${python.libPrefix}/site-packages - sconsFlagsArray+=(UDEVDIR=$out/lib/udev/rules.d) - sconsFlagsArray+=(PYPKGDIR=$out/lib/${python.libPrefix}/site-packages) - sconsFlagsArray+=(BINDIR=$bin/bin) - sconsFlagsArray+=(INCLUDEDIR=$dev/include) - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)" - ''; - buildInputs = [ - expat libraw1394 libconfig libavc1394 libiec61883 dbus dbus_cplusplus - libxmlxx pyqt4 dbus-python glibmm + libraw1394 + libconfig + libavc1394 + libiec61883 + dbus + dbus_cplusplus + libxmlxx3 + python + glibmm ]; - postPatch = '' - sed '1iimport sys' -i SConstruct - ''; - - postInstall = '' - for exe in $bin/bin/ffado-mixer $bin/bin/ffado-diag; do - wrapProgram $exe \ - --prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages \ - --prefix PYTHONPATH : $out/share/libffado/python \ - --prefix PYTHONPATH : ${pyqt4}/lib/${python.libPrefix}/site-packages \ - --prefix PYTHONPATH : ${dbus-python}/lib/${python.libPrefix}/site-packages - done - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.ffado.org; diff --git a/pkgs/os-specific/linux/ffado/fix-build.patch b/pkgs/os-specific/linux/ffado/fix-build.patch new file mode 100644 index 00000000000..7e360932613 --- /dev/null +++ b/pkgs/os-specific/linux/ffado/fix-build.patch @@ -0,0 +1,26 @@ +From b0f2b20b23780dd2e67a01c15462070dd86c4ac1 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Sun, 3 Mar 2019 11:50:27 +0100 +Subject: [PATCH] Fix build on Nix + +We do not have global /usr. +--- + SConstruct | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index 05755e4b..3fbdc1d8 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -537,7 +537,7 @@ env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env ) + env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env ) + env['udevdir'] = Template( env.destdir + env['UDEVDIR'] ).safe_substitute( env ) + env['PYPKGDIR'] = Template( env['PYPKGDIR'] ).safe_substitute( env ) +-env['metainfodir'] = Template( env.destdir + "/usr/share/metainfo" ).safe_substitute( env ) ++env['metainfodir'] = Template( env.destdir + env['SHAREDIR'] + "/metainfo" ).safe_substitute( env ) + + env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) ) + +-- +2.19.2 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d08ee2c26e0..bc5b7399597 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14432,9 +14432,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = callPackage ../os-specific/linux/ffado { - inherit (python2Packages) python pyqt4 dbus-python; - }; + ffado = callPackage ../os-specific/linux/ffado { }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; From 2cba3d0803b2c42187d12d2eec1d1936300f1438 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 1 Mar 2019 22:21:46 -0800 Subject: [PATCH 062/238] fluidsynth: 2.0.3 -> 2.0.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fluidsynth/versions --- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index f0fbc0bbe5c..192670280cc 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -11,8 +11,8 @@ let sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; }; "2" = { - fluidsynthVersion = "2.0.3"; - sha256 = "00f6bhw4ddrinb5flvg5y53rcvnf4km23a6nbvnswmpq13568v78"; + fluidsynthVersion = "2.0.4"; + sha256 = "1v2vji02fbrjgypwb4fw2r90hnfwfbfh3d24j8vjwlbqxhxp16s0"; }; }; in From 5bb035ac5cbb722c4f4fe06b04f8d8db9d259d3f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Mar 2019 16:57:41 -0600 Subject: [PATCH 063/238] w3m: pname/version --- pkgs/applications/networking/browsers/w3m/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index c1fa364a2d2..d4a8a44dd23 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -25,12 +25,13 @@ let ''; }; in stdenv.mkDerivation rec { - name = "w3m-0.5.3+git20180125"; + pname = "w3m"; + version = "0.5.3+git20180125"; src = fetchFromGitHub { owner = "tats"; - repo = "w3m"; - rev = "v0.5.3+git20180125"; + repo = pname; + rev = "v${version}"; sha256 = "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90"; }; From 050584c78c6f91847eb8dc55bd713dda125a04f5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Mar 2019 17:02:04 -0600 Subject: [PATCH 064/238] w3m: 0.5.3+git20180125 -> 0.5.3+git20190105 https://github.com/tats/w3m/blob/v0.5.3%2Bgit20190105/NEWS --- pkgs/applications/networking/browsers/w3m/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index d4a8a44dd23..136c14d34d4 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -26,13 +26,13 @@ let }; in stdenv.mkDerivation rec { pname = "w3m"; - version = "0.5.3+git20180125"; + version = "0.5.3+git20190105"; src = fetchFromGitHub { owner = "tats"; repo = pname; rev = "v${version}"; - sha256 = "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90"; + sha256 = "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i"; }; NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl"; From 28f801d1024d3adfd0bc7986a8c579ba0b78d91d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:08 +0000 Subject: [PATCH 065/238] [cpan2nix] perlPackages.JSON: 4.00 -> 4.02 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 681650b7000..39b6e7aa0cf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8007,10 +8007,10 @@ let }; JSON = buildPerlPackage { - name = "JSON-4.00"; + name = "JSON-4.02"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.00.tar.gz; - sha256 = "0s0h3a1y74851fgvrhq3qv8kw1z1ccwzz1ghn6vh91l7fl81znn4"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz; + sha256 = "0z32x2lijij28c9fhmzgxc41i9nw24fyvd2a8ajs5zw9b9sqhjj4"; }; # Do not abort cross-compilation on failure to load native JSON module into host perl preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' From 50fc74db26fc1372ec3c215764a097112c4f7500 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:09 +0000 Subject: [PATCH 066/238] [cpan2nix] perlPackages.AppFatPacker: 0.010007 -> 0.010008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 39b6e7aa0cf..30cdd8c5e79 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -353,10 +353,10 @@ let }; AppFatPacker = buildPerlPackage rec { - name = "App-FatPacker-0.010007"; + name = "App-FatPacker-0.010008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010007.tar.gz; - sha256 = "1g9nff9fdg7dvja0ix2yv32w5xcj963ybcf7x22j61g6r81845fi"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz; + sha256 = "1kzcbpsf1p7ww45d9fl2w0nfn5jj5pz0r0c649c1lrj5r1nv778j"; }; meta = { description = "pack your dependencies onto your script file"; From deab6199b5d4f8ee6da6000fbebff434448d23ed Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:12 +0000 Subject: [PATCH 067/238] [cpan2nix] perlPackages.BKeywords: 1.19 -> 1.20 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30cdd8c5e79..b65a4d9e422 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -819,10 +819,10 @@ let }; BKeywords = buildPerlPackage rec { - name = "B-Keywords-1.19"; + name = "B-Keywords-1.20"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "1kdzhdksnqrmij98bnifv2p2125zvpf0rmzxjiav65ipydi4rsw9"; + sha256 = "12jvx5gnypqxal4valkf9lidba9nz7kjk2wvm07q3hkmdqxw1zk0"; }; meta = { description = "Lists of reserved barewords and symbol names"; From 846a544a0055bd8ce916dd24a4a744fb438d7b18 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:15 +0000 Subject: [PATCH 068/238] [cpan2nix] perlPackages.CPANPerlReleases: 3.86 -> 3.90 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b65a4d9e422..6aac978a187 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2756,10 +2756,10 @@ let }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.86"; + name = "CPAN-Perl-Releases-3.90"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0g90xm43pydfjq794ay4dvgvhjdr4xrjgmravj8wb2kqc65pm2za"; + sha256 = "19pjq3x9nb76m4a5g37miw1js5mmfqhv1z2gyya3kjc8wbjb1qjc"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; From a3de09c0cde47d289c33a481365357a8f4df56b6 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:27 +0000 Subject: [PATCH 069/238] [cpan2nix] perlPackages.CompressRawBzip2: 2.081 -> 2.084 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6aac978a187..2a6d23887de 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2327,10 +2327,10 @@ let }; CompressRawBzip2 = buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.081"; + name = "Compress-Raw-Bzip2-2.084"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "081mpkjy688lg48997fqh3d7ja12vazmz02fw84495civg4vb4l6"; + sha256 = "0kwjrsl519bv48b7698a9anj6l0n3z1vrd1a7im2r1pbffxxw5kx"; }; # Don't build a private copy of bzip2. From 8a5005b8314ab79505589d8cc77f87f582a81d27 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:29 +0000 Subject: [PATCH 070/238] [cpan2nix] perlPackages.CpanelJSONXS: 4.08 -> 4.09 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2a6d23887de..5035d65f630 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2695,10 +2695,10 @@ let }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.08"; + name = "Cpanel-JSON-XS-4.09"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "2bc1475b698b5a419bb55127b07732794b495e2a6e0f4ed39bdcbd39a64e7c2d"; + sha256 = "99c0155e554222b0cb24b032ced9a4f7bdfd2b3c98d07657ac020fbe5c3495a3"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; From eacc22452fe2ad21ade95f74e53d6dc16585c6e1 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:40 +0000 Subject: [PATCH 071/238] [cpan2nix] perlPackages.DataUUID: 1.221 -> 1.224 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5035d65f630..23fe158b4fa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3480,10 +3480,10 @@ let }; DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.221"; + name = "Data-UUID-1.224"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz; - sha256 = "0rw60wib0mj5z0v909mplh750y40hzyzf4z0b6h4ajxplyiv5irw"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz; + sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69"; }; }; From d2d8a16f3a494da965554dd87b77203c262ef8fc Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:42 +0000 Subject: [PATCH 072/238] [cpan2nix] perlPackages.DevelPPPort: 3.43 -> 3.44 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23fe158b4fa..9b0460c6ec2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3977,10 +3977,10 @@ let }; DevelPPPort = buildPerlPackage rec { - name = "Devel-PPPort-3.43"; + name = "Devel-PPPort-3.44"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.43.tar.gz; - sha256 = "90fd98fb24e1d7252011ff181244e04c8c8135933e67eab93c57ed6a61ed86f4"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.44.tar.gz; + sha256 = "06561decc76f0aaba8e77f72b74624e19e2ad448a654c489c61bc786660832c5"; }; meta = { description = "Perl/Pollution/Portability"; From 7440531fb20dd89c65602b70fe6f10183d6e34c8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:46 +0000 Subject: [PATCH 073/238] [cpan2nix] perlPackages.EmailAddress: 1.911 -> 1.912 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9b0460c6ec2..91257258aa3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4823,10 +4823,10 @@ let }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.911"; + name = "Email-Address-1.912"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.911.tar.gz; - sha256 = "10qfc2va6dhshjgw6xvxk88cd88s44kbxp47xmixx297wv3l69zl"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz; + sha256 = "1vzr0vx4zsw4zbc9xdffc31wnkc1raqmyfiyws06fbyck197i8qg"; }; meta = { description = "RFC 2822 Address Parsing"; From 76a8d8805b4d86d0fe5012c2ab2e441dcd4f6c6d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:48 +0000 Subject: [PATCH 074/238] [cpan2nix] perlPackages.Encode: 2.98 -> 3.00 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 91257258aa3..485cae4714f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5037,10 +5037,10 @@ let }; Encode = buildPerlPackage rec { - name = "Encode-2.98"; + name = "Encode-3.00"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; - sha256 = "303d396477c94c43c2f83da1a8025d68de76bd7e52c2cc35fbdf5c59b4c2cffa"; + sha256 = "4b538b47459cf5747b7395ccc8c8c9b3b661cc016c50b8a67e10fe19590fea5e"; }; meta = { description = "Character encodings in Perl"; From bba2eb9993470886576bdeb125d42cd65a1f31a9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:03 +0000 Subject: [PATCH 075/238] [cpan2nix] perlPackages.FileSlurp: 9999.25 -> 9999.26 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 485cae4714f..7856e846759 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6000,12 +6000,12 @@ let }; FileSlurp = buildPerlPackage { - name = "File-Slurp-9999.25"; + name = "File-Slurp-9999.26"; # WARNING: check on next update if deprecation warning is gone patches = [ ../development/perl-modules/File-Slurp/silence-deprecation.patch ]; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.25.tar.gz; - sha256 = "1hg3bhf5m78d77p4174cnldd75ppyrvr5rkc8w289ihvwsx9gsn7"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.26.tar.gz; + sha256 = "0c09ivl50sg9j75si6cahfp1wgvhqawakb6h5j6hlca6vwjqs9qy"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; From 1eef41609ac2e8e020f8db5e3137af64eb2984e9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:03 +0000 Subject: [PATCH 076/238] [cpan2nix] perlPackages.FileTemp: 0.2308 -> 0.2309 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7856e846759..98838f79277 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6052,10 +6052,10 @@ let }; FileTemp = buildPerlPackage { - name = "File-Temp-0.2308"; + name = "File-Temp-0.2309"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2308.tar.gz; - sha256 = "1m6iz26znn85r7pnnwlqsda0x5mm2c8qcz5ickl945dbw8icp88w"; + url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz; + sha256 = "0pr3wrxrk93wy7dz9gsb1sgl77icrs8rh2mah6wms5cdi2ll5ch1"; }; meta = { description = "return name and handle of a temporary file safely"; From 78784634858bf031c3a08878b7b05b2044fef4e9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:04 +0000 Subject: [PATCH 077/238] [cpan2nix] perlPackages.FileWhich: 1.22 -> 1.23 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 98838f79277..bea7a7ee27d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6105,10 +6105,10 @@ let }; FileWhich = buildPerlPackage rec { - name = "File-Which-1.22"; + name = "File-Which-1.23"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "e8a8ffcf96868c6879e82645db4ff9ef00c2d8a286fed21971e7280f52cf0dd4"; + sha256 = "b79dc2244b2d97b6f27167fc3b7799ef61a179040f3abd76ce1e0a3b0bc4e078"; }; meta = { homepage = http://perl.wdlabs.com/File-Which; From c1d12dfe7fbb4a7801c176530e10f50952c30790 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:23 +0000 Subject: [PATCH 078/238] [cpan2nix] perlPackages.Imager: 1.007 -> 1.010 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bea7a7ee27d..f50e1521cd6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7437,10 +7437,10 @@ let }; Imager = buildPerlPackage rec { - name = "Imager-1.007"; + name = "Imager-1.010"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TONYC/${name}.tar.gz"; - sha256 = "adc12651e53e9226eb05482bf5f6faf77703af036fb922bc8c3f077f25b98d63"; + sha256 = "fc22e3e302f139d74a98d8068ccddfd92166141ddd4ca5c40f102070bcd7a3c7"; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; From 57fc8aee83d36ecc21b25116583c18330744db40 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:24 +0000 Subject: [PATCH 079/238] [cpan2nix] perlPackages.JSONPP: 4.00 -> 4.02 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f50e1521cd6..4e4a60b5f02 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8049,10 +8049,10 @@ let }; JSONPP = buildPerlPackage rec { - name = "JSON-PP-4.00"; + name = "JSON-PP-4.02"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.00.tar.gz; - sha256 = "0g0g6qxcic5p34n51dlpq2s9f23qzlxxqsgprv7x962k894qxx5y"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.02.tar.gz; + sha256 = "11wlh4clq0cddiamh1ipps3fh9ly01j4pcdh8f4nw7912bw7pimc"; }; meta = { description = "JSON::XS compatible pure-Perl module"; From 64f379e97303c964cf512b2a5af3325956bbcdf3 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:32 +0000 Subject: [PATCH 080/238] [cpan2nix] perlPackages.LocaleCodes: 3.59 -> 3.60 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4e4a60b5f02..414128a9020 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8496,10 +8496,10 @@ let }; LocaleCodes = buildPerlPackage { - name = "Locale-Codes-3.59"; + name = "Locale-Codes-3.60"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.59.tar.gz; - sha256 = "388dea3d088aa0513f21091e0fe4a9c61ab2c173c83052b3120a52b103592c03"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.60.tar.gz; + sha256 = "32829bc49d927335de6994f3cfd55c5e693881602564c2aa966fe86740371194"; }; meta = { description = "A distribution of modules to handle locale codes"; From 6ceb51835e5f15ae69c1273652d47ee7cffb4641 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:36 +0000 Subject: [PATCH 081/238] [cpan2nix] perlPackages.MCE: 1.837 -> 1.838 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 414128a9020..060e003aa13 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8761,10 +8761,10 @@ let }; MCE = buildPerlPackage rec { - name = "MCE-1.837"; + name = "MCE-1.838"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.837.tar.gz; - sha256 = "0si12wv02i8cn2xw6lk0m2apqrd88awcli1yadmvikq5rnfhcypa"; + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.838.tar.gz; + sha256 = "1xg63kd2la5zh7cvapv1l1wsxjallj4xv5l15bdp8jl3vvffwdhi"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; From 761cfac1aca852a4b7ce22f6e54f2ceddf43a749 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:45 +0000 Subject: [PATCH 082/238] [cpan2nix] perlPackages.ModuleCoreList: 5.20181218 -> 5.20190220 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 060e003aa13..1e665049041 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9713,10 +9713,10 @@ let }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20181218"; + name = "Module-CoreList-5.20190220"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20181218.tar.gz; - sha256 = "1rq8i4wsd9k38djv18j6rpyiya7d6z67ac8gwvsp2yqs1hqqvpfi"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20190220.tar.gz; + sha256 = "0v5yavg3ggal8aj00426wkjw38yrji449lkaaxs0ynwjqhnq01i7"; }; meta = { homepage = http://dev.perl.org/; From 0e2c52dee8dc219f3b91f0f07d8d5026bfd51db1 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:48 +0000 Subject: [PATCH 083/238] [cpan2nix] perlPackages.Mojolicious: 8.10 -> 8.12 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e665049041..d8c10c744a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9988,10 +9988,10 @@ let }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-8.10"; + name = "Mojolicious-8.12"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "0rfzfc2iy42qnxlzv6rndc3vwfm2nlqdipqfmbpjr42wrf4x3g4v"; + sha256 = "1sc9bdac4p9ha6xfmi3xj2dzip4bhxxzn5zvzyxqgbyvvr52k2dw"; }; meta = { homepage = https://mojolicious.org; From 378daa7c8e87cf6ae7eb3a674d8c3beb0d876ec0 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:53:51 +0000 Subject: [PATCH 084/238] [cpan2nix] perlPackages.NetSFTPForeign: 1.89 -> 1.90 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d8c10c744a5..0769e20b5ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11326,10 +11326,10 @@ let }; NetSFTPForeign = buildPerlPackage rec { - name = "Net-SFTP-Foreign-1.89"; + name = "Net-SFTP-Foreign-1.90"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; - sha256 = "9bd33e130581c1fc3eb6108eaf9056c1507428cace04a572f7afe816d83b08a7"; + sha256 = "d1eafb34f669ab6de675058292778ba2e0e42ecafd59abb1128ba31d62a0419d"; }; propagatedBuildInputs = [ pkgs.openssl ]; patchPhase = '' From e60059809d423c9cb076a16664c181229f498eac Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:54:11 +0000 Subject: [PATCH 085/238] [cpan2nix] perlPackages.ProcProcessTable: 0.55 -> 0.56 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0769e20b5ff..a2cfc1d3660 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12583,10 +12583,10 @@ let }; ProcProcessTable = buildPerlPackage { - name = "Proc-ProcessTable-0.55"; + name = "Proc-ProcessTable-0.56"; src = fetchurl { - url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.55.tar.gz; - sha256 = "3b9660d940a0c016c5e48108fa9dbf9f30492b505aa0a26d22b09554f05714f5"; + url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.56.tar.gz; + sha256 = "99fb8fd11e4e438399dd362d95b5b2073f1f340e9b3a7f04e76b6c7428170660"; }; meta = { description = "Perl extension to access the unix process table"; From 1abfeed54ca951a4e3538b74a6efdfa6c63c62f8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:54:30 +0000 Subject: [PATCH 086/238] [cpan2nix] perlPackages.TAPParserSourceHandlerpgTAP: 3.34 -> 3.35 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a2cfc1d3660..29587be4b56 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14360,10 +14360,10 @@ let }; TAPParserSourceHandlerpgTAP = buildPerlModule rec { - name = "TAP-Parser-SourceHandler-pgTAP-3.34"; + name = "TAP-Parser-SourceHandler-pgTAP-3.35"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "1q9h5h3m31vfch17djjacnjqvfkyw0b8ndwv1kk8a09bp8sbsh8v"; + sha256 = "1655337l1cyd7q62007wrk87q2gbbwfq9xjy1wgx3hyflxpkkvl4"; }; meta = { description = "Stream TAP from pgTAP test scripts"; From bd7c0524ef97bbf16e9226346792e6f0127ee339 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:54:32 +0000 Subject: [PATCH 087/238] [cpan2nix] perlPackages.TermReadKey: 2.37 -> 2.38 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 29587be4b56..dcc2eab5c43 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14594,10 +14594,10 @@ let TermReadKey = buildPerlPackage rec { name = "TermReadKey-${version}"; - version = "2.37"; + version = "2.38"; src = fetchurl { url = "mirror://cpan/authors/id/J/JS/JSTOWE/${name}.tar.gz"; - sha256 = "0hdj5mldpj3pyprd4hbbalfx9yjgi5p59gg2ixk9808f5v7q74sa"; + sha256 = "143jlibah1g14bym7sj3gphvqkpj1w4vn7sqc4vc62jpviw5hr2s"; }; }; From bcfb54c75483d51ecfff83e15d74adddc88a2165 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:54:32 +0000 Subject: [PATCH 088/238] [cpan2nix] perlPackages.TermReadLineGnu: 1.35 -> 1.36 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcc2eab5c43..0d21536529b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14602,10 +14602,10 @@ let }; TermReadLineGnu = buildPerlPackage rec { - name = "Term-ReadLine-Gnu-1.35"; + name = "Term-ReadLine-Gnu-1.36"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAYASHI/${name}.tar.gz"; - sha256 = "575d32d4ab67cd656f314e8d0ee3d45d2491078f3b2421e520c4273e92eb9125"; + sha256 = "9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925"; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lreadline -lncursesw"; From a4353d73450c6ba886cafbbcf7dbecf6226cdcb1 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:54:42 +0000 Subject: [PATCH 089/238] [cpan2nix] perlPackages.TestPortabilityFiles: 0.09 -> 0.10 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d21536529b..1b62a476c50 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15515,10 +15515,10 @@ let }; TestPortabilityFiles = buildPerlPackage { - name = "Test-Portability-Files-0.09"; + name = "Test-Portability-Files-0.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.09.tar.gz; - sha256 = "16d31fa941af1a79faec0192e09880cb19225cde649c03d2e3ceda9b455a621c"; + url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.10.tar.gz; + sha256 = "08e4b432492dc1b44b55d5db57952eb76379c7f434ee8f16aca64d491f401a16"; }; meta = { description = "Check file names portability"; From f699fce6304c62abbae91d90be6c876f3fc8a254 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:54:44 +0000 Subject: [PATCH 090/238] [cpan2nix] perlPackages.TestSimple13: 1.302141 -> 1.302162 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1b62a476c50..b485af3279a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15726,10 +15726,10 @@ let }; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302141"; + name = "Test-Simple-1.302162"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302141.tar.gz; - sha256 = "d7045bc814cba0426684a32c44d90ced5b83075659f0fcefed88c32f8fd395b7"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302162.tar.gz; + sha256 = "73a0197c3d735e060881da509f4c5fa76c4cbf7dbabd4297d3cf5f5feed31fc4"; }; meta = { description = "Basic utilities for writing tests"; From a3135460cc82ff64835a3c6fee731af11acff292 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:54:48 +0000 Subject: [PATCH 091/238] [cpan2nix] perlPackages.TextCSV: 1.97 -> 1.99 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b485af3279a..cec53c47adb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16061,10 +16061,10 @@ let }; TextCSV = buildPerlPackage rec { - name = "Text-CSV-1.97"; + name = "Text-CSV-1.99"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.97.tar.gz; - sha256 = "cc350462efa8d39d5c8a1da5f205bc31620cd52d9865a769c8e3ed1b41640fd5"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.99.tar.gz; + sha256 = "e74ec039b12cc51d346bf1d814af7db8a05cb0a98340e7547a21646da8668cd2"; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; From 03fabb94fee4ea09590b4aafcb4d42d288b2b72e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:54:49 +0000 Subject: [PATCH 092/238] [cpan2nix] perlPackages.TextCSV_XS: 1.37 -> 1.38 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cec53c47adb..c75dd0c7479 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16086,10 +16086,10 @@ let }; TextCSV_XS = buildPerlPackage rec { - name = "Text-CSV_XS-1.37"; + name = "Text-CSV_XS-1.38"; src = fetchurl { url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz"; - sha256 = "20e16da9c38b0938f308c01d954f49d2c6922bac0d2d979bf2ad483fe7476ba2"; + sha256 = "d6317ae0ed0658e00037ecedaa3da2ff8565c86b0516ef8a93322b959de313dd"; }; meta = { description = "Comma-Separated Values manipulation routines"; From 410c20fa3fb8e22941233947bfe8626a35a71b97 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:55:07 +0000 Subject: [PATCH 093/238] [cpan2nix] perlPackages.YAMLLibYAML: 0.75 -> 0.76 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c75dd0c7479..7792ca6f3d8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17692,10 +17692,10 @@ let }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.75"; + name = "YAML-LibYAML-0.76"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.75.tar.gz; - sha256 = "1jlj6yrh3kv6f6q2x253lds664916fgps0praih5gwxagnld9k32"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.76.tar.gz; + sha256 = "1m94g36sl9rasjlvlsf65xcal5hvkc3gbzd7l68h17az75269kyy"; }; }; From cc49f52152f7a1ce5744cfbecf8d17f90d6cbc26 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:55:16 +0000 Subject: [PATCH 094/238] [cpan2nix] perlPackages.AnyEvent: 7.14 -> 7.15 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7792ca6f3d8..fddcbbc9330 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -181,10 +181,10 @@ let }; AnyEvent = buildPerlPackage rec { - name = "AnyEvent-7.14"; + name = "AnyEvent-7.15"; src = fetchurl { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; - sha256 = "539358d225bad34b4a64f5217f8c2a707b15e3a28c74120c9dd2270c7cca7d2a"; + sha256 = "111db2335c71f789edaec271126b3810356691eb1214dd3f67b527a88ec9e354"; }; buildInputs = [ CanaryStability ]; meta = { From b1f12db2119efa886a01d38cd6767e7fee78ede2 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:55:18 +0000 Subject: [PATCH 095/238] [cpan2nix] perlPackages.BusinessHours: 0.12 -> 0.13 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fddcbbc9330..fbc72bda80b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -885,10 +885,10 @@ let }; BusinessHours = buildPerlPackage rec { - name = "Business-Hours-0.12"; + name = "Business-Hours-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz; - sha256 = "15c5g278m1x121blspf4bymxp89vysizr3z6s1g3sbpfdkrn4gyv"; + url = mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz; + sha256 = "1hiybixagj3i1hsnfr134jgs9wv4azkwq6kijr9zlkxqzczzw1x8"; }; propagatedBuildInputs = [ SetIntSpan ]; meta = { From 15ff43f02938e1a0ecc83607bf6693df8fe384c4 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:55:22 +0000 Subject: [PATCH 096/238] [cpan2nix] perlPackages.ConfigIniFiles: 3.000000 -> 3.000001 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fbc72bda80b..83eedf3a543 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2448,10 +2448,10 @@ let }; ConfigIniFiles = buildPerlModule rec { - name = "Config-IniFiles-3.000000"; + name = "Config-IniFiles-3.000001"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "cd92f6b7f1aa3e03abf6251f1e6129dab8a2b835e8b17c7c4cc3e8305c1c9b29"; + sha256 = "48ada0a6c6a5b6cbe1bfb261fe56e3bf8492ff9420f7321b6a972924416659ea"; }; propagatedBuildInputs = [ IOStringy ]; meta = { From 039870631c97a981427e0967268798d93c1eed96 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:55:31 +0000 Subject: [PATCH 097/238] [cpan2nix] perlPackages.DateManip: 6.75 -> 6.76 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 83eedf3a543..20d910dc3b0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3573,10 +3573,10 @@ let }; DateManip = buildPerlPackage rec { - name = "Date-Manip-6.75"; + name = "Date-Manip-6.76"; src = fetchurl { url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; - sha256 = "0zdnrdm7bj4qwnmd2r3gj80dm1brr63px04iy5blxa5i5azczyy1"; + sha256 = "1a33mpkx7qqb9nqxyh2kkb596d8xq6jw0ljrd4xrwiz30f6cg1qw"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' From 28054a3751d25c37c295b6eb90158f48c69a5bf6 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:55:40 +0000 Subject: [PATCH 098/238] [cpan2nix] perlPackages.IOSocketSSL: 2.060 -> 2.064 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 20d910dc3b0..71c71ca9283 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7712,12 +7712,12 @@ let }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.060"; + name = "IO-Socket-SSL-2.064"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c"; + sha256 = "5827c6459ed2dce1da0ba6f442d198fa2c81554e045930e32b92c6d39e3ac3f5"; }; - propagatedBuildInputs = [ MozillaCA NetSSLeay ]; + propagatedBuildInputs = [ NetSSLeay ]; # Fix path to default certificate store. postPatch = '' substituteInPlace lib/IO/Socket/SSL.pm \ From a8d32491e03080c1ac6c5e586d8b03d637b427d8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:55:45 +0000 Subject: [PATCH 099/238] [cpan2nix] perlPackages.MailIMAPClient: 3.40 -> 3.42 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 71c71ca9283..dac2e214c5a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9030,10 +9030,10 @@ let }; MailIMAPClient = buildPerlPackage { - name = "Mail-IMAPClient-3.40"; + name = "Mail-IMAPClient-3.42"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.40.tar.gz; - sha256 = "1n8fq6j8nxs85v5qwmrr3ain900rvj9i8n7in4r5bw7kiihdv3xz"; + url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz; + sha256 = "0znf035ikaxyfishv507qq6g691xvbnziqlcwfikkj2l1kan88hw"; }; propagatedBuildInputs = [ ParseRecDescent ]; }; From 2335b0446906e5f120903a334fd07ff0275d1a6d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:55:49 +0000 Subject: [PATCH 100/238] [cpan2nix] perlPackages.ModuleScanDeps: 1.26 -> 1.27 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dac2e214c5a..91b405a8a43 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9912,11 +9912,11 @@ let }; }; - ModuleScanDeps = let version = "1.26"; in buildPerlPackage { + ModuleScanDeps = let version = "1.27"; in buildPerlPackage { name = "Module-ScanDeps-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz"; - sha256 = "1awin0lfliskrw86mhks6qszxrwbwhr66fc79cv00598mrjzn223"; + sha256 = "0j6r9r99x5p0i6fv06i44wpsvjxj32amjkiqf6pmqpj80jff2k7f"; }; buildInputs = [ TestRequires ]; meta = { From a2da7c51656c50cb79e9c7f65062c7ba78fc1c02 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:01 +0000 Subject: [PATCH 101/238] [cpan2nix] perlPackages.TypeTiny: 1.004002 -> 1.004004 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 91b405a8a43..81a36424952 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16799,10 +16799,10 @@ let }; TypeTiny = buildPerlPackage { - name = "Type-Tiny-1.004002"; + name = "Type-Tiny-1.004004"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004002.tar.gz; - sha256 = "e52c7e9593052aed157a15d473b5c25a1dbb3454bf3cd6913df94cc9bb2be707"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004004.tar.gz; + sha256 = "081281ea004cdd89003d938aa52c1398e24411dd8f7163b14d0977a13f7062be"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { From d496e1277447cb992649ab3d277fb53ea7cd403b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:02 +0000 Subject: [PATCH 102/238] [cpan2nix] perlPackages.URI: 1.74 -> 1.76 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 81a36424952..9ecfb67e0bd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16910,10 +16910,10 @@ let }; URI = buildPerlPackage rec { - name = "URI-1.74"; + name = "URI-1.76"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d"; + url = mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz; + sha256 = "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e"; }; buildInputs = [ TestNeeds ]; meta = { From 1e580d48b521c0ca50214057a447d7e689715aeb Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:02 +0000 Subject: [PATCH 103/238] [cpan2nix] perlPackages.UnicodeLineBreak: 2018.003 -> 2019.001 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9ecfb67e0bd..0e6523d3b69 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16881,10 +16881,10 @@ let }; UnicodeLineBreak = buildPerlPackage rec { - name = "Unicode-LineBreak-2018.003"; + name = "Unicode-LineBreak-2019.001"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEZUMI/${name}.tar.gz"; - sha256 = "1cbilpy7ypr26rjr6cmrbkxhsm1l6yx7s1p7lcf0l3vi7vzr4346"; + sha256 = "12iinva5gqc9g7qzxrvmh45n714z0ad9g7wq2dxwgp6drbj64rs8"; }; propagatedBuildInputs = [ MIMECharset ]; meta = { From 57d3245d2f11f99cd2dd6ff1db8bc3f69316130d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:08 +0000 Subject: [PATCH 104/238] [cpan2nix] perlPackages.IOCompress: 2.081 -> 2.084 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e6523d3b69..28b8c0190ac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7591,10 +7591,10 @@ let }; IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.081"; + name = "IO-Compress-2.084"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "5211c775544dc8c511af08edfb1c0c22734daa2789149c2a88d68e17b43546d9"; + sha256 = "1dbd503eda643aa58d1ef9b4d44c57889243d0ce6c54d5b45babceb860d76db5"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { From ae12897a39c17fd0fbcb5dbd78dca5b17634d0d4 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:13 +0000 Subject: [PATCH 105/238] [cpan2nix] perlPackages.ExtUtilsMakeMakerCPANfile: 0.08 -> 0.09 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 28b8c0190ac..30b39bcaf4e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5404,10 +5404,10 @@ let }; ExtUtilsMakeMakerCPANfile = buildPerlPackage rec { - name = "ExtUtils-MakeMaker-CPANfile-0.08"; + name = "ExtUtils-MakeMaker-CPANfile-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.08.tar.gz; - sha256 = "0yg2z4six807lraqh8ncsq6l62vj7zi0a38ha9nvmhd6lbipmsql"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz; + sha256 = "0xg2z100vjhcndwaz9m3mmi90rb8h5pggpvlj1b0i8dhsh3pc1rc"; }; propagatedBuildInputs = [ ModuleCPANfile ]; meta = { From a166cacaabd4e6c9dd07f030faff32f0d90f49f2 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:17 +0000 Subject: [PATCH 106/238] [cpan2nix] perlPackages.GD: 2.69 -> 2.71 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 30b39bcaf4e..d0101fd8c3f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6228,10 +6228,10 @@ let }; GD = buildPerlPackage rec { - name = "GD-2.69"; + name = "GD-2.71"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.69.tar.gz; - sha256 = "0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x"; + url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz; + sha256 = "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5"; }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ]; From d063ab69a080a01be7ae12815dd518ac37e8c63d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:17 +0000 Subject: [PATCH 107/238] [cpan2nix] perlPackages.Glib: 1.328 -> 1.329 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d0101fd8c3f..f7d458c2dee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6378,10 +6378,10 @@ let }; Glib = buildPerlPackage rec { - name = "Glib-1.328"; + name = "Glib-1.329"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "1mb40h76kk1wfcl0dqd1r8wfsn4ik29jln3mcsjhmadasynw5725"; + sha256 = "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v"; }; buildInputs = [ pkgs.glib ]; meta = { From 65caf9eebc88a476627f0ff08f9bd7fea8ff0205 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:19 +0000 Subject: [PATCH 108/238] [cpan2nix] perlPackages.Inline: 0.80 -> 0.81 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f7d458c2dee..dd7266eca96 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7904,10 +7904,10 @@ let }; Inline = buildPerlPackage rec { - name = "Inline-0.80"; + name = "Inline-0.81"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6"; + url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.81.tar.gz; + sha256 = "1f973868dcca56a3a99b25d253fa18bf2d53670f8bbfa498261267647707b1e3"; }; buildInputs = [ TestWarn ]; meta = { From d6f32f9b6bcab47ab4079368d7c8dd217e5ef933 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:39 +0000 Subject: [PATCH 109/238] [cpan2nix] perlPackages.DevelPatchPerl: 1.52 -> 1.56 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dd7266eca96..12ba59967f6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3950,10 +3950,10 @@ let }; DevelPatchPerl = buildPerlPackage rec { - name = "Devel-PatchPerl-1.52"; + name = "Devel-PatchPerl-1.56"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0iynq3sgxyidr8d6x0gb1yk5nvzr7xmyslk2bs8hkp9sbxpznsaf"; + sha256 = "1b97a6b82qh1dsv13rgxyiv4lffp360crgc9wiq3pyj0zr13nfc2"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { From 1d24c8078d9f1433847cdd5242b3dd5ae3abe8ff Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:40 +0000 Subject: [PATCH 110/238] [cpan2nix] perlPackages.EmailAddressList: 0.05 -> 0.06 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 12ba59967f6..3b2b91e1f6b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4835,10 +4835,10 @@ let }; EmailAddressList = buildPerlPackage { - name = "Email-Address-List-0.05"; + name = "Email-Address-List-0.06"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Email-Address-List-0.05.tar.gz; - sha256 = "705c23fc2163c2347ba0aea998450259f7b10577a368c6d310bd4e98b427a033"; + url = mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz; + sha256 = "305b94c778011cee70d9f21514d92e985fa9dccbb84c64798f0c1f0b24eb870e"; }; buildInputs = [ JSON ]; propagatedBuildInputs = [ EmailAddress ]; From 0a205c31be63fbaf0b623d7a37cabdee58352dcf Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:41 +0000 Subject: [PATCH 111/238] [cpan2nix] perlPackages.GlibObjectIntrospection: 0.046 -> 0.047 --- pkgs/top-level/perl-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3b2b91e1f6b..f574f65b217 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6393,13 +6393,12 @@ let }; GlibObjectIntrospection = buildPerlPackage rec { - name = "Glib-Object-Introspection-0.046"; + name = "Glib-Object-Introspection-0.047"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "1d3gl943p27gd42kxc1i9sp5z55gpgcslz1jvx7cxd6mflhdlck6"; + sha256 = "1sk32pcv4ik3sniqbjrz8nlw7f2a76l87wx1rwdjypv6h9pjnrnk"; }; - buildInputs = [ Glib ExtUtilsDepends ExtUtilsPkgConfig ]; - propagatedBuildInputs = [ pkgs.gobject-introspection ]; + propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; meta = { description = "Dynamically create Perl language bindings"; license = stdenv.lib.licenses.lgpl2Plus; From 8b5f07b4cb9c7da4b67a1a25cee2fc58d310132d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:42 +0000 Subject: [PATCH 112/238] [cpan2nix] perlPackages.JSONXS: 4.0 -> 4.01 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f574f65b217..08e98653c76 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8087,10 +8087,10 @@ let }; JSONXS = buildPerlPackage { - name = "JSON-XS-4.0"; + name = "JSON-XS-4.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.0.tar.gz; - sha256 = "0118yrzagwlcfj5yldn3h23zzqs2rx282jlm068nf7fjlvy4m7s7"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.01.tar.gz; + sha256 = "0p1yjwwrq3x1f831jhwxlb76h92px01a316zv65zzmhzkbin446c"; }; propagatedBuildInputs = [ TypesSerialiser ]; buildInputs = [ CanaryStability ]; From 36d514b5be303be8e2fa70f5a26222e4d387a828 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:48 +0000 Subject: [PATCH 113/238] [cpan2nix] perlPackages.TestDifferences: 0.64 -> 0.66 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 08e98653c76..f04966af3ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14991,11 +14991,11 @@ let }; }; - TestDifferences = buildPerlModule { - name = "Test-Differences-0.64"; + TestDifferences = buildPerlPackage { + name = "Test-Differences-0.66"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz; - sha256 = "9f459dd9c2302a0a73e2f5528a0ce7d09d6766f073187ae2c69e603adf2eb276"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.66.tar.gz; + sha256 = "83633a171e83ff03a0eb1f5a699f05b506a34190bcf8726979bbfd9dc16c223a"; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { From ba9776f5cb3490259b95bb7271b2d75e181a9fd0 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:51 +0000 Subject: [PATCH 114/238] [cpan2nix] perlPackages.XMLLibXML: 2.0132 -> 2.0134 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f04966af3ab..ecd4523743e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17394,10 +17394,10 @@ let }; XMLLibXML = buildPerlPackage rec { - name = "XML-LibXML-2.0132"; + name = "XML-LibXML-2.0134"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "0xnl281hb590i287fxpl947f1s4zl9dnvc4ajvsqi89w23im453j"; + sha256 = "1ks69xymv6zkj7hvaymjvb78ch81abri7kg4zrwxhdfsqb8a9g7h"; }; SKIP_SAX_INSTALL = 1; buildInputs = [ pkgs.libxml2 ]; From 964c3ef99845b027460f27810e2249abbcce811b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:56:52 +0000 Subject: [PATCH 115/238] [cpan2nix] perlPackages.CairoGObject: cleanup --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ecd4523743e..d187e64814a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1029,11 +1029,12 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "1m896j0xdfhldsx8abf10cc16ll1fm9wbav42dpzal9fh07d9f9v"; }; - buildInputs = [ pkgs.cairo Cairo Glib ExtUtilsDepends ExtUtilsPkgConfig ]; + buildInputs = [ pkgs.cairo ]; meta = { description = "Integrate Cairo into the Glib type system"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ Cairo Glib ]; }; cam_pdf = buildPerlModule rec { From 681473719fb5ef2fe3b15335284a7e6fb843b404 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:03 +0000 Subject: [PATCH 116/238] [cpan2nix] perlPackages.TextTemplate: 1.53 -> 1.55 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d187e64814a..b9b835c4363 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16350,10 +16350,10 @@ let }; TextTemplate = buildPerlPackage { - name = "Text-Template-1.53"; + name = "Text-Template-1.55"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.53.tar.gz; - sha256 = "ae221cbba2b27967a12bda3f531547e897eb38ae0a92c084607fd5a6a8085bc4"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.55.tar.gz; + sha256 = "a4948be945250c17f9f0aaee56cc79b3195dcebcb75215b55d6ed1ca2b02f18b"; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; }; From 42c686d1bd2c48915c56f309958187cb72f3861f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:10 +0000 Subject: [PATCH 117/238] [cpan2nix] perlPackages.PodMarkdownGithub: 0.03 -> 0.04 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b9b835c4363..2ae3f273e5b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12937,10 +12937,10 @@ let }; PodMarkdownGithub = buildPerlPackage rec { - name = "Pod-Markdown-Github-0.03"; + name = "Pod-Markdown-Github-0.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.03.tar.gz; - sha256 = "0y555pb78j0lz24kdgiwkmk1vcv4lg3a3mvnw9vm2qqnkp7p0nag"; + url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz; + sha256 = "04y67c50hpf1vb9cwsza3fbj4rshdqa47vi3zcj4kkjckh02yzmk"; }; propagatedBuildInputs = [ PodMarkdown ]; buildInputs = [ TestDifferences ]; From 4570e01413929ad576704beef5b6a6119a679c71 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:21 +0000 Subject: [PATCH 118/238] [cpan2nix] perlPackages.Gtk3: cleanup --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2ae3f273e5b..ee3034f82f7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6699,8 +6699,7 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "0baxyhlzdf7avka40h1niiir8vz4nilqkiwh876i0hv0f8xj3nqa"; }; - buildInputs = [ Cairo CairoGObject Glib GlibObjectIntrospection ]; - propagatedBuildInputs = [ pkgs.gtk3 ]; + propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { description = "Perl interface to the 3.x series of the gtk+ toolkit"; license = stdenv.lib.licenses.lgpl21Plus; From ba108ec2d42c77eeed59f05c9646bdd7660f6b92 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:24 +0000 Subject: [PATCH 119/238] [cpan2nix] perlPackages.PackageStashXS: 0.28 -> 0.29 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee3034f82f7..fb76e383d5a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11748,10 +11748,10 @@ let }; PackageStashXS = buildPerlPackage { - name = "Package-Stash-XS-0.28"; + name = "Package-Stash-XS-0.29"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz; - sha256 = "11nl69n8i56p91pd0ia44ip0vpv2cxwpbfakrv01vvv8az1cbn13"; + url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz; + sha256 = "1akqk10qxwk798qppajqbczwmhy4cs9g0lg961m3vq218slnnryk"; }; buildInputs = [ TestFatal TestRequires ]; meta = { From d68e2f07e20fa273331d94ceeefb976c4028e07a Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:30 +0000 Subject: [PATCH 120/238] [cpan2nix] perlPackages.GooCanvas2: cleanup --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fb76e383d5a..2697c2833b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6517,8 +6517,8 @@ let url = "mirror://cpan/authors/id/P/PE/PERLMAX/${name}.tar.gz"; sha256 = "0l1vsvyv9hjxhsxrahq4h64axh7qmk50kiz2spa3s1hr7s3qfk72"; }; - buildInputs = [ pkgs.gtk3 GlibObjectIntrospection Glib ]; - propagatedBuildInputs = [ pkgs.goocanvas2 ]; + buildInputs = [ pkgs.gtk3 ]; + propagatedBuildInputs = [ pkgs.goocanvas2 Gtk3 ]; meta = { description = "Perl binding for GooCanvas2 widget using Glib::Object::Introspection"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 374ee875d6a203dd7467637eaadceda3fa65ddb5 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:31 +0000 Subject: [PATCH 121/238] [cpan2nix] perlPackages.Gtk3SimpleList: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2697c2833b1..abe682ce616 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6712,11 +6712,11 @@ let url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/${name}.tar.gz"; sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp"; }; - buildInputs = [ Gtk3 Glib GlibObjectIntrospection Cairo CairoGObject ]; meta = { description = "A simple interface to Gtk3's complex MVC list widget"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ Gtk3 ]; }; Guard = buildPerlPackage rec { From ccae095c99e451552ed7f9bfd5c1a875f5403c1a Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:32 +0000 Subject: [PATCH 122/238] [cpan2nix] perlPackages.MailMessage: 3.007 -> 3.008 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index abe682ce616..38a060a46ac 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9005,10 +9005,10 @@ let }; MailMessage = buildPerlPackage rec { - name = "Mail-Message-3.007"; + name = "Mail-Message-3.008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.007.tar.gz; - sha256 = "1hpf68i5w20dxcibqj5w5h8mx9qa6vjhr34bicrvdh7d3dfxq0bn"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz; + sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f"; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; meta = { From 4015cdb24a7b1a6a851f657b9233c7b19cf24baf Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:37 +0000 Subject: [PATCH 123/238] [cpan2nix] perlPackages.Test2Suite: 0.000117 -> 0.000118 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 38a060a46ac..2edba4dd9f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14750,10 +14750,10 @@ let }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000117"; + name = "Test2-Suite-0.000118"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "e8877a90655ace2e8302104e0de27faf777397194738b085b209749c091ef154"; + sha256 = "e9225132b585d6730d3de6b0caa2648b9c67995732c0a081efcfcad37b8af227"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { From 1d6194f079d10760eb6c8be1bd89db1be3168e73 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:48 +0000 Subject: [PATCH 124/238] [cpan2nix] perlPackages.Clipboard: 0.13 -> 0.19 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2edba4dd9f0..f1554caa86e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2221,11 +2221,11 @@ let }; }; - Clipboard = buildPerlPackage { - name = "Clipboard-0.13"; + Clipboard = buildPerlModule { + name = "Clipboard-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/K/KI/KING/Clipboard-0.13.tar.gz; - sha256 = "eebf1c9cb2484be850abdae017147967cf47f8ccd99293771517674b0046ec8a"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.19.tar.gz; + sha256 = "34b9dccac5d559b2b2769e5e315205c8292be2ff9f6e5333112a2377c69abbb3"; }; meta = { description = "Clipboard - Copy and Paste with any OS"; @@ -2237,6 +2237,7 @@ let # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. # Ssh sessions and cron jobs can not create the requisite pasteboard handles, giving coreFoundationUnknownErr (-4960)' doCheck = !stdenv.isDarwin; + propagatedBuildInputs = [ CGI URI ]; }; From 8bdb006247fcdcfaf4916ffceae298a9b371812e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:53 +0000 Subject: [PATCH 125/238] [cpan2nix] perlPackages.PackageStash: 0.37 -> 0.38 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f1554caa86e..7559a6d3928 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11735,10 +11735,10 @@ let }; PackageStash = buildPerlPackage { - name = "Package-Stash-0.37"; + name = "Package-Stash-0.38"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz; - sha256 = "06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c"; + url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz; + sha256 = "c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; From 87cc050e69c7168d36e1338f4c6b726d9285f486 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:57:57 +0000 Subject: [PATCH 126/238] [cpan2nix] perlPackages.FileBOM: 0.15 -> 0.16 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7559a6d3928..26ce98c00bb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5592,10 +5592,10 @@ let }; FileBOM = buildPerlModule rec { - name = "File-BOM-0.15"; + name = "File-BOM-0.16"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATTLAW/${name}.tar.gz"; - sha256 = "431c8b39397fd5ad5b1a1100d3647a06e9f94304d46db44ffc0a0e5c5c06a1c1"; + sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Readonly ]; From 5c97b75b34c912644bdde067e73d55af4ca64d20 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:58:17 +0000 Subject: [PATCH 127/238] [cpan2nix] perlPackages.MailBox: 3.005 -> 3.006 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 26ce98c00bb..4643673b79e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8977,11 +8977,11 @@ let }; MailBox = buildPerlPackage rec { - version = "3.005"; + version = "3.006"; name = "Mail-Box-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "103v5jiv5mlckss1yardjvil506sx60f3g2ph2kgx9x6sy1sd93m"; + sha256 = "1fm17z13jq7ff2f4ynnajdzzdqa4sb0kx5nfy9fvb0nzw49qd502"; }; doCheck = false; From c84f39818b0d5e2ccebbdb1761d2647a623a9c20 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:58:28 +0000 Subject: [PATCH 128/238] [cpan2nix] perlPackages.AlienBuild: 1.49 -> 1.60 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4643673b79e..413d517a661 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -109,10 +109,10 @@ let }; AlienBuild = buildPerlPackage { - name = "Alien-Build-1.49"; + name = "Alien-Build-1.60"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.49.tar.gz; - sha256 = "1wsg794pbqgywyfqdrwrsjcj5qgas3h72j4w2iph9ir6b93rb11p"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.60.tar.gz; + sha256 = "0wzwi5l71sn0wrbjsikjlh2y7yn68m3hal8s9v43rc6w20q3z877"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny ]; buildInputs = [ DevelHide PkgConfig Test2Suite ]; From a752bba6bf1c28150ef4f2dc9dd7f66ff7d441f5 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:58:58 +0000 Subject: [PATCH 129/238] [cpan2nix] perlPackages.LWPProtocolHttps: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 413d517a661..a9604c7e6b6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8893,7 +8893,7 @@ let sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; - propagatedBuildInputs = [ IOSocketSSL LWP ]; + propagatedBuildInputs = [ IOSocketSSL LWP MozillaCA ]; doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; From 15eccf1a142886836787115d1dc8bc6b97f8d1da Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:08 +0000 Subject: [PATCH 130/238] [cpan2nix] perlPackages.FileChangeNotify: 0.29 -> 0.31 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a9604c7e6b6..3d82ddae0fe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5555,12 +5555,12 @@ let }; FileChangeNotify = buildPerlPackage { - name = "File-ChangeNotify-0.29"; + name = "File-ChangeNotify-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.29.tar.gz; - sha256 = "438d4295ef5f854ace61037a11726ef65dc0bf73e296bd12fc7e2108602a444b"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.31.tar.gz; + sha256 = "192bdb1ce76266c6a694a8e962d039e3adeeb829b6ac1e23f5057f2b506392bd"; }; - buildInputs = [ TestException TestRequires TestWithoutModule ]; + buildInputs = [ Test2Suite TestRequires TestWithoutModule ]; propagatedBuildInputs = [ ModulePluggable Moo TypeTiny namespaceautoclean ]; meta = with stdenv.lib; { description = "Watch for changes to files, cross-platform style"; From 16da093e0d8193ddbc53d1044d55e16d77fba1a8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:10 +0000 Subject: [PATCH 131/238] [cpan2nix] perlPackages.WWWMechanize: 1.90 -> 1.91 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3d82ddae0fe..84212a5b4d0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17146,10 +17146,10 @@ let }; WWWMechanize = buildPerlPackage { - name = "WWW-Mechanize-1.90"; + name = "WWW-Mechanize-1.91"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.90.tar.gz; - sha256 = "038i9nh643cmi4y4r8fsp0xvzz4zfh5srh8sw3w5kzxjq126pr44"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.91.tar.gz; + sha256 = "0cb14m1vhaf0mgn2fqwi5hm72xhfi77hpq2g57swgy0w83x7m27b"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; @@ -17158,7 +17158,7 @@ let description = "Handy web browsing in a Perl object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ CGI HTTPServerSimple PerlCritic PerlTidy TestDeep TestFatal TestOutput TestWarnings ]; + buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ]; }; WWWMechanizeCGI = buildPerlPackage { From 731ac4050201fc560404d17d7380e23bfb5f4a9b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:15 +0000 Subject: [PATCH 132/238] [cpan2nix] perlPackages.ModuleCPANTSAnalyse: 0.96 -> 1.00 dependencies: perlPackages.DataBinary: init at 0.01 perlPackages.PerlPrereqScannerNotQuiteLite: init at 0.9904 perlPackages.RegexpTrie: init at 0.02 --- pkgs/top-level/perl-packages.nix | 44 +++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 84212a5b4d0..a62a795a36d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4227,6 +4227,18 @@ let }; }; + DataBinary = buildPerlPackage { + name = "Data-Binary-0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SN/SNKWATT/Data-Binary-0.01.tar.gz; + sha256 = "0wwdrgkz4yqpzdmfvid63v5v10b9hwdsg15jvks0hwdc23ga48a8"; + }; + meta = { + description = "Simple detection of binary versus text in strings"; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + DBIxIntrospector = buildPerlPackage rec { name = "DBIx-Introspector-0.001005"; src = fetchurl { @@ -9684,12 +9696,12 @@ let }; ModuleCPANTSAnalyse = buildPerlPackage rec { - name = "Module-CPANTS-Analyse-0.96"; + name = "Module-CPANTS-Analyse-1.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-0.96.tar.gz; - sha256 = "1c38fnbx9w1s841am1i5h33lcqr9bwc9bni21n907nmyp41wr297"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.00.tar.gz; + sha256 = "0r77g2h0d3p81scf294x5qkvi76hzwvbfji0m86abidjav5jk6a2"; }; - propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo FileFindObject IOCapture JSONMaybeXS ModuleExtractUse ModulePluggable SetScalar SoftwareLicenseCCpack ]; + propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; meta = { description = "Generate Kwalitee ratings for a distribution"; @@ -12720,6 +12732,20 @@ let }; }; + PerlPrereqScannerNotQuiteLite = buildPerlPackage { + name = "Perl-PrereqScanner-NotQuiteLite-0.9904"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9904.tar.gz; + sha256 = "1qf6x49sjswazh7bicpm7wnwpdnx245ws02s53dvbxcbw2c66hsn"; + }; + propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; + meta = { + description = "a tool to scan your Perl code for its prerequisites"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PerlVersion = buildPerlPackage rec { name = "Perl-Version-1.013"; src = fetchurl { @@ -13173,6 +13199,16 @@ let }; }; + RegexpTrie = buildPerlPackage { + name = "Regexp-Trie-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Regexp-Trie-0.02.tar.gz; + sha256 = "1yn5l6x3xyic9jxw9jggqsbggcv7rc8ggj4zbnlz9hfvv17gjazv"; + }; + meta = { + }; + }; + RESTClient = buildPerlPackage rec { name = "REST-Client-273"; src = fetchurl { From 72423e3be14d9f5deb7fd76a2b48199dd02d0e49 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:18 +0000 Subject: [PATCH 133/238] [cpan2nix] perlPackages.TestKwalitee: 1.27 -> 1.28 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a62a795a36d..7ca356d566c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15215,10 +15215,10 @@ let }; TestKwalitee = buildPerlPackage rec { - name = "Test-Kwalitee-1.27"; + name = "Test-Kwalitee-1.28"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.27.tar.gz; - sha256 = "095kpj2011jk1mpnb07fs7yi190hmqh85mj662gx0dkpl9ic7a5w"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz; + sha256 = "18s3c8qfr3kmmyxmsn5la2zgbdsgpnkmscnl68i7fnavfpfnqlxl"; }; propagatedBuildInputs = [ ModuleCPANTSAnalyse ]; buildInputs = [ CPANMetaCheck TestDeep TestWarnings ]; From 05775159a0e85ca6d88a19a890f214e794293b87 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:22 +0000 Subject: [PATCH 134/238] [cpan2nix] perlPackages.DateTimeTimeZone: 2.21 -> 2.23 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7ca356d566c..3e779176fa7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3852,10 +3852,10 @@ let }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-2.21"; + name = "DateTime-TimeZone-2.23"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "54d685f79df1033c259502cd9c22b1a9d37b627bf815faecebaa27f8e1079e1e"; + sha256 = "6ae40286031853a4319c5b34516f1c09e429d5caa5f782165cc27175c89fe54f"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; From b4ae1d7a3f0af16adf373149cb1b139925cda3ce Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:23 +0000 Subject: [PATCH 135/238] [cpan2nix] perlPackages.Appperlbrew: 0.85 -> 0.86 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3e779176fa7..4ee199121dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -378,10 +378,10 @@ let }; Appperlbrew = buildPerlModule rec { - name = "App-perlbrew-0.85"; + name = "App-perlbrew-0.86"; src = fetchurl { url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; - sha256 = "0i3d2csihn5x27lfykwgjpq60ij21s19fzbjsacqq93x46qyim9y"; + sha256 = "11qh94am7fghizmjaf5c7w868svjbv9g4ffirykj8qa6q40zdspp"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; From a965e44ee372deb49de43281fecdf80bee31c781 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:30 +0000 Subject: [PATCH 136/238] [cpan2nix] perlPackages.DateTimeFormatStrptime: 1.75 -> 1.76 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4ee199121dc..f49aa01a32c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3785,13 +3785,13 @@ let }; DateTimeFormatStrptime = buildPerlPackage rec { - name = "DateTime-Format-Strptime-1.75"; + name = "DateTime-Format-Strptime-1.76"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "4fcfb2ac4f79d7ff2855a405f39050d2ea691ee098ce54ede8af79c8d6ab3c19"; + sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d"; }; buildInputs = [ TestFatal TestWarnings ]; - propagatedBuildInputs = [ DateTime PackageDeprecationManager ]; + propagatedBuildInputs = [ DateTime ]; meta = { description = "Parse and format strp and strf time patterns"; license = stdenv.lib.licenses.artistic2; From 3b8855b840850c33ffd6a6a856bba0afa6a9a45c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:32 +0000 Subject: [PATCH 137/238] [cpan2nix] perlPackages.DateTimeFormatBuilder: 0.81 -> 0.82 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f49aa01a32c..d7c96af5f09 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3652,12 +3652,12 @@ let }; DateTimeFormatBuilder = buildPerlPackage { - name = "DateTime-Format-Builder-0.81"; + name = "DateTime-Format-Builder-0.82"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz; - sha256 = "7cd58a8cb53bf698407cc992f89e4d49bf3dc55baf4f3f00f1def63a0fff33ef"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz; + sha256 = "383faeb22b992c77ca65a5257992dd2f6db91a7db73ea4601c512e1c6c2e1ca3"; }; - propagatedBuildInputs = [ ClassFactoryUtil DateTimeFormatStrptime ParamsValidate ]; + propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; license = stdenv.lib.licenses.artistic2; From de7ce182d0e8a669a16ea392a136172aac3fe2f5 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:35 +0000 Subject: [PATCH 138/238] [cpan2nix] perlPackages.CodeTidyAll: 0.72 -> 0.73 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d7c96af5f09..a00f3c0dfcd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2278,10 +2278,10 @@ let }; CodeTidyAll = buildPerlPackage rec { - name = "Code-TidyAll-0.72"; + name = "Code-TidyAll-0.73"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.72.tar.gz; - sha256 = "0py9z3f7ld93a7qibrc917qkwjh7pcl0r9khzg7dlr4rra0xq9fn"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.73.tar.gz; + sha256 = "1fvw73q5vj5b12y9jj9mmwl0dipdjlvpsw5rzvldr4csicrpiz6q"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; From ad770da2fae58c2b743ddb0426a6a59a163f223b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:38 +0000 Subject: [PATCH 139/238] [cpan2nix] perlPackages.CPAN: 2.22 -> 2.25 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a00f3c0dfcd..6e759cda89c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2684,12 +2684,12 @@ let }; CPAN = buildPerlPackage rec { - name = "CPAN-2.22"; + name = "CPAN-2.25"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "c6f2a44cd95ef5989ef0abc83dca38ae645bd5ea09de67461251f2d782989990"; + sha256 = "b4cbef12b872f34e29c3cdcd511c5ed004c4486939001b60e493dc25956552a9"; }; - propagatedBuildInputs = [ ArchiveZip CPANChecksums Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; + propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From badedc68fc3c13f73a268d9306d2e7f1b4ca5741 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:59:59 +0000 Subject: [PATCH 140/238] [cpan2nix] perlPackages.ArrayFIFO: 0.12 -> 0.13 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6e759cda89c..ec8a6e70b15 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -487,10 +487,10 @@ let }; ArrayFIFO = buildPerlPackage rec { - name = "Array-FIFO-0.12"; + name = "Array-FIFO-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz"; - sha256 = "806a931d5a953255a0416978c39987a75e5cbe592a88d44a7b909f4f86888d5d"; + sha256 = "be2aeb5f5a9af1a96f0033508a569ca93ad19ad15dc7c6b998e6d7bc740c66f7"; }; buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; From 0af45b1e6b4c2ac2d24d328ef456c7e479cf9103 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 04:00:01 +0000 Subject: [PATCH 141/238] [cpan2nix] perlPackages.MooseXGetopt: 0.72 -> 0.74 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ec8a6e70b15..2db17941969 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10464,10 +10464,10 @@ let }; MooseXGetopt = buildPerlModule rec { - name = "MooseX-Getopt-0.72"; + name = "MooseX-Getopt-0.74"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "a378411a061ed239554d2b7f86b2b82bf55f600901243a6ec3fd29557d171b2e"; + sha256 = "1de0df3b431ebe9f3563bdf4569eacd7e07e865a8397f2a990d0cb57d4cb2c24"; }; buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ]; propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; From f20661e01ac50dd18ea89261aa32d567e6bfe5be Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 04:00:04 +0000 Subject: [PATCH 142/238] [cpan2nix] perlPackages.MouseXGetopt: 0.37 -> 0.38 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2db17941969..029c2c55bd4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10371,10 +10371,10 @@ let }; MouseXGetopt = buildPerlModule rec { - name = "MouseX-Getopt-0.37"; + name = "MouseX-Getopt-0.38"; src = fetchurl { url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; - sha256 = "a6221043e7be3217ce56d2a6425a413d9cd28e2f52053995a6ceb118e8e963bc"; + sha256 = "de3ea8ef452dd9501ea8c4eda8744b7224602602b04692607edd7d62b79f038f"; }; buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; From 27fdc8a45888be61194bc4590ac2bd28161f8369 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 04:00:04 +0000 Subject: [PATCH 143/238] [cpan2nix] perlPackages.MaxMindDBReaderXS: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 029c2c55bd4..b1e46facef6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9386,7 +9386,7 @@ let url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000007.tar.gz; sha256 = "1wg1x1pqamapfhn6rbffqipncgs15k99q34agdamv76i6782ny8r"; }; - propagatedBuildInputs = [ MathInt128 MaxMindDBReader pkgs.libmaxminddb ]; + propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ]; buildInputs = [ NetWorks PathClass TestFatal TestNumberDelta TestRequires ]; meta = { description = "Fast XS implementation of MaxMind DB reader"; From 85a0f1406a0b98f1fa5932ee55313056e2e6e6b0 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 04:00:14 +0000 Subject: [PATCH 144/238] [cpan2nix] perlPackages.AppSqitch: 0.9998 -> 0.9999 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1e46facef6..0ba27c9eb62 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -413,14 +413,14 @@ let }; AppSqitch = buildPerlModule rec { - version = "0.9998"; + version = "0.9999"; name = "App-Sqitch-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "5539f15c0e26ad3595e658e2c21481b0748cc89f6dca0a6ded1fdc62f88c8a5a"; + sha256 = "f5bfa80206738ab8a70358a3b0557661c7459e11ec07dece23ecafa1f34372b3"; }; - buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings ]; - propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; + buildInputs = [ CaptureTiny IOPager TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; + propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { homepage = https://sqitch.org/; From 5eedd2f772ba9937b6675b67e261d97b44828cc2 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 04:00:20 +0000 Subject: [PATCH 145/238] [cpan2nix] perlPackages.PlackMiddlewareReverseProxy: 0.15 -> 0.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0ba27c9eb62..5f85a1e14c8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12402,10 +12402,10 @@ let }; PlackMiddlewareReverseProxy = buildPerlPackage { - name = "Plack-Middleware-ReverseProxy-0.15"; + name = "Plack-Middleware-ReverseProxy-0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.15.tar.gz; - sha256 = "1zmsccdy6wr5hxzj07r1nsmaymyibk87p95z0wzknjw10lwmqs9f"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.16.tar.gz; + sha256 = "0a512n62pnk5ayj3zdzyj50iy1qi8nwh6ygks2h7nrh7gp9k2jc7"; }; propagatedBuildInputs = [ Plack ]; meta = { From 84b6ae67b6f654af52962571b9bd50dea7a8cfb0 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 04:00:23 +0000 Subject: [PATCH 146/238] [cpan2nix] perlPackages.PlackMiddlewareSession: 0.30 -> 0.32 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5f85a1e14c8..25050995434 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12415,10 +12415,10 @@ let }; PlackMiddlewareSession = buildPerlModule rec { - name = "Plack-Middleware-Session-0.30"; + name = "Plack-Middleware-Session-0.32"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.30.tar.gz; - sha256 = "0cwlhfj1644jq8axv4cghsqqjsx2y7hj7g0y5l179fcgmbp2ndzf"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.32.tar.gz; + sha256 = "00jnyclvggb4g7q6489x4x1sxfpxy9xyxrqkg2aqpn05fcqwfznp"; }; propagatedBuildInputs = [ DigestHMAC DigestSHA1 Plack ]; buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ]; From 0ca8c7f2ee21cea7a0445f5d70eef5a4fc0909cf Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 04:00:33 +0000 Subject: [PATCH 147/238] [cpan2nix] perlPackages.CatalystRuntime: 5.90123 -> 5.90124 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25050995434..7bbbb1aef65 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1300,10 +1300,10 @@ let }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90123"; + name = "Catalyst-Runtime-5.90124"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90123.tar.gz; - sha256 = "f4484409ee2f7e9dddf148e7509e7a3eaf4df0c22b97a94dddc2171909485f3b"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90124.tar.gz; + sha256 = "2a60cbe7c1f6fec25f0e7fd3f66273386d73edb625748cc0d8c4f20e62983e00"; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; From fff3cb9d7267266f42c164a36fd42f804b4a81d7 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 04:00:52 +0000 Subject: [PATCH 148/238] [cpan2nix] perlPackages.TestWWWMechanizeCatalyst: 0.60 -> 0.62 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7bbbb1aef65..54d1d3352a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15951,10 +15951,10 @@ let }; TestWWWMechanizeCatalyst = buildPerlPackage rec { - name = "Test-WWW-Mechanize-Catalyst-0.60"; + name = "Test-WWW-Mechanize-Catalyst-0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "0nhhfrrai3ndziz873vpa1j0vljjnib4wqafd6yyvkf58ad7v0lv"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Test-WWW-Mechanize-Catalyst-0.62.tar.gz; + sha256 = "1cdc2q16vs6fb335pzaislz2rx1ph9acaxyp7v5hv9xbwwddwfqq"; }; doCheck = false; # listens on an external port propagatedBuildInputs = [ CatalystRuntime WWWMechanize ]; From ae3622df60fd37b383bd8f7d69b7b664b612800b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 19 Feb 2019 01:50:28 +0000 Subject: [PATCH 149/238] perlPackages.Clipboard: fix build --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 54d1d3352a5..e409895e8da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2231,13 +2231,12 @@ let description = "Clipboard - Copy and Paste with any OS"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin MacPasteboard; + propagatedBuildInputs = [ CGI URI ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard; # Disable test on darwin because MacPasteboard fails when not logged in interactively. # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3. # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. # Ssh sessions and cron jobs can not create the requisite pasteboard handles, giving coreFoundationUnknownErr (-4960)' doCheck = !stdenv.isDarwin; - propagatedBuildInputs = [ CGI URI ]; }; From 347680df964c6024c795918365c33284da9ad472 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 4 Mar 2019 08:56:15 +0100 Subject: [PATCH 150/238] python: 2.7.15 -> 2.7.16 --- .../python/cpython/2.7/default.nix | 14 ----- .../python/cpython/2.7/type_getattro.patch | 62 ------------------- .../interpreters/python/default.nix | 6 +- 3 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 249c4ac9cf7..505929df8ef 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -79,20 +79,6 @@ let sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; }) - # "`type_getattro()` calls `tp_descr_get(self, obj, type)` without actually owning a reference to "self". - # In very rare cases, this can cause a segmentation fault if "self" is deleted by the descriptor." - # https://github.com/python/cpython/pull/6118 - (fetchpatch { - name = "type_getattro.patch"; - url = "file://${./type_getattro.patch}"; - sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd"; - }) - - (fetchpatch { - name = "CVE-2018-1000802.patch"; - url = "https://github.com/python/cpython/pull/8985.patch"; - sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97"; - }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch b/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch deleted file mode 100644 index c69c86b642b..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/Objects/typeobject.c -+++ b/Objects/typeobject.c -@@ -3137,6 +3137,7 @@ - PyTypeObject *metatype = Py_TYPE(type); - PyObject *meta_attribute, *attribute; - descrgetfunc meta_get; -+ PyObject* res; - - if (!PyUnicode_Check(name)) { - PyErr_Format(PyExc_TypeError, -@@ -3158,6 +3159,7 @@ - meta_attribute = _PyType_Lookup(metatype, name); - - if (meta_attribute != NULL) { -+ Py_INCREF(meta_attribute); - meta_get = Py_TYPE(meta_attribute)->tp_descr_get; - - if (meta_get != NULL && PyDescr_IsData(meta_attribute)) { -@@ -3165,10 +3167,11 @@ - * writes. Assume the attribute is not overridden in - * type's tp_dict (and bases): call the descriptor now. - */ -- return meta_get(meta_attribute, (PyObject *)type, -- (PyObject *)metatype); -+ res = meta_get(meta_attribute, (PyObject *)type, -+ (PyObject *)metatype); -+ Py_DECREF(meta_attribute); -+ return res; - } -- Py_INCREF(meta_attribute); - } - - /* No data descriptor found on metatype. Look in tp_dict of this -@@ -3176,6 +3179,7 @@ - attribute = _PyType_Lookup(type, name); - if (attribute != NULL) { - /* Implement descriptor functionality, if any */ -+ Py_INCREF(attribute); - descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get; - - Py_XDECREF(meta_attribute); -@@ -3183,11 +3187,12 @@ - if (local_get != NULL) { - /* NULL 2nd argument indicates the descriptor was - * found on the target object itself (or a base) */ -- return local_get(attribute, (PyObject *)NULL, -- (PyObject *)type); -+ res = local_get(attribute, (PyObject *)NULL, -+ (PyObject *)type); -+ Py_DECREF(attribute); -+ return res; - } - -- Py_INCREF(attribute); - return attribute; - } - ---- /dev/null -+++ b/Misc/NEWS.d/next/Core and Builtins/2018-03-14-21-42-17.bpo-25750.lxgkQz.rst -@@ -0,0 +1,2 @@ -+Fix rare Python crash due to bad refcounting in ``type_getattro()`` if a -+descriptor deletes itself from the class. diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f1461d784be..5e5877032fe 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -50,10 +50,10 @@ in { sourceVersion = { major = "2"; minor = "7"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92"; + sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -153,4 +153,4 @@ in { ncurses = ncurses5; }; -}) \ No newline at end of file +}) From 89da25fecbd7760eebad7ee87391d945db2a45db Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 16:08:58 -0800 Subject: [PATCH 151/238] buildGoPackage: update Go to version 1.12 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91f9aaf23b3..b71d7cad4ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13327,8 +13327,11 @@ in buildGo111Package = callPackage ../development/go-modules/generic { go = buildPackages.go_1_11; }; + buildGo112Package = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_12; + }; - buildGoPackage = buildGo111Package; + buildGoPackage = buildGo112Package; go2nix = callPackage ../development/tools/go2nix { }; From 2e86ada82388a0f819a748c7fcdce18328dc052b Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 17:09:05 -0800 Subject: [PATCH 152/238] bettercap: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b71d7cad4ce..0e478aba8b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1790,7 +1790,11 @@ in bepasty = callPackage ../tools/misc/bepasty { }; - bettercap = callPackage ../tools/security/bettercap { }; + bettercap = callPackage ../tools/security/bettercap { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; From 3a6ba8959eef78d1ea80ea6724a56b92bb81d4d1 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 17:23:11 -0800 Subject: [PATCH 153/238] deepin: remove the temporary go_1_11 assignment to go --- pkgs/desktops/deepin/default.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4c0e44f6b72..4fe787bc5d4 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,19 +1,13 @@ -{ pkgs, makeScope, libsForQt5, go_1_11 }: +{ pkgs, makeScope, libsForQt5 }: let packages = self: with self; { updateScript = callPackage ./update.nix { }; dbus-factory = callPackage ./dbus-factory { }; - dde-api = callPackage ./dde-api { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; - dde-daemon = callPackage ./dde-daemon { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + dde-daemon = callPackage ./dde-daemon { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e478aba8b8..fe6d51b09c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21313,7 +21313,7 @@ in clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; deepin = recurseIntoAttrs (import ../desktops/deepin { - inherit pkgs libsForQt5 go_1_11; + inherit pkgs libsForQt5; inherit (lib) makeScope; }); From c64eda961acb99fba2cb8fee2c6b78d7df0d438e Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 17:30:01 -0800 Subject: [PATCH 154/238] singularity: remove the temporary go_1_11 assignment to go --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe6d51b09c0..c304d8443d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17684,10 +17684,7 @@ in slack-term = callPackage ../applications/networking/instant-messengers/slack-term { }; - singularity = callPackage ../applications/virtualization/singularity { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + singularity = callPackage ../applications/virtualization/singularity { }; spectmorph = callPackage ../applications/audio/spectmorph { }; From ee81ceb5cfc2346f75d88dd0820eadd52cf9df66 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 18:38:19 -0800 Subject: [PATCH 155/238] mirrorbits: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c304d8443d1..c5888e53f31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4261,7 +4261,11 @@ in miredo = callPackage ../tools/networking/miredo { }; - mirrorbits = callPackage ../servers/mirrorbits { }; + mirrorbits = callPackage ../servers/mirrorbits { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; mitmproxy = callPackage ../tools/networking/mitmproxy { }; From 340a3dbd6584947a4f937f2c5b0db9dd2c9b78cb Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 18:50:14 -0800 Subject: [PATCH 156/238] miniflux: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5888e53f31..51033dc7f2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13910,7 +13910,10 @@ in mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; - miniflux = callPackage ../servers/miniflux { }; + miniflux = callPackage ../servers/miniflux { + # XXX: bettercap is failing with Go 1.12. + buildGoPackage = buildGo111Package; + }; nagios = callPackage ../servers/monitoring/nagios { }; From 889f2fc990ff3fdcb808f7a1f29b59d4fa96f35b Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 18:57:54 -0800 Subject: [PATCH 157/238] mongodb-tools: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51033dc7f2e..760e7a15373 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1711,7 +1711,11 @@ in mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + mongodb-tools = callPackage ../tools/misc/mongodb-tools { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; mozlz4a = callPackage ../tools/compression/mozlz4a { }; From 985ce237342239034623ce7a0ff8b8d2e6c45be5 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 19:08:31 -0800 Subject: [PATCH 158/238] packetbeat5: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 760e7a15373..c324d5ca1d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -936,7 +936,11 @@ in metricbeat = metricbeat6; packetbeat = packetbeat6; - inherit (callPackages ../misc/logging/beats/5.x.nix { }) + inherit (callPackages ../misc/logging/beats/5.x.nix { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }) filebeat5 heartbeat5 metricbeat5 From 3c8caeb64e93f920566288042baa9304618c92f7 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 22:27:29 -0800 Subject: [PATCH 159/238] packetbeat6: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c324d5ca1d9..972592b829a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -924,7 +924,11 @@ in bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/6.x.nix { }) + inherit (callPackages ../misc/logging/beats/6.x.nix { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }) filebeat6 heartbeat6 metricbeat6 From 205ccb42a79b437c551ad965f0610facbf622cdc Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 22:30:38 -0800 Subject: [PATCH 160/238] coackroachdb: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 972592b829a..9893571611c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14389,7 +14389,11 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; From c2194113908fdfa30e4618990e6392663015457b Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Wed, 6 Mar 2019 10:03:04 -0800 Subject: [PATCH 161/238] skydive: build with Go 1.11 --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9893571611c..4d0cea1c020 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12611,7 +12611,11 @@ in sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; }; - skydive = callPackage ../tools/networking/skydive { }; + skydive = callPackage ../tools/networking/skydive { + # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; slang = callPackage ../development/libraries/slang { }; From 885d1dfe6011885d43b556a4e307a45da97aa8a4 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 7 Mar 2019 08:25:52 -0500 Subject: [PATCH 162/238] nspr: make reproducible --- ...OURCE_DATE_EPOCH-for-reproducibility.patch | 84 +++++++++++++++++++ pkgs/development/libraries/nspr/default.nix | 4 + 2 files changed, 88 insertions(+) create mode 100644 pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch diff --git a/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch b/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch new file mode 100644 index 00000000000..d7fec73910f --- /dev/null +++ b/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch @@ -0,0 +1,84 @@ +From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001 +From: Graham Christensen +Date: Thu, 7 Mar 2019 08:11:32 -0500 +Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility + +--- + nspr/lib/ds/Makefile.in | 4 ++-- + nspr/lib/libc/src/Makefile.in | 4 ++-- + nspr/lib/prstreams/Makefile.in | 4 ++-- + nspr/pr/src/Makefile.in | 6 +++--- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in +index e737791..d56b0a7 100644 +--- a/nspr/lib/ds/Makefile.in ++++ b/nspr/lib/ds/Makefile.in +@@ -101,8 +101,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in +index e8a6d9f..0485737 100644 +--- a/nspr/lib/libc/src/Makefile.in ++++ b/nspr/lib/libc/src/Makefile.in +@@ -103,8 +103,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in +index aeb2944..83ae423 100644 +--- a/nspr/lib/prstreams/Makefile.in ++++ b/nspr/lib/prstreams/Makefile.in +@@ -105,8 +105,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(OS_ARCH), WINNT) + SUF = i64 +diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in +index 19c5a69..989cc8c 100644 +--- a/nspr/pr/src/Makefile.in ++++ b/nspr/pr/src/Makefile.in +@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE) + endif + # + # In Solaris 2.6 or earlier, -lrt is called -lposix4. +-# ++# + LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE))) + ifeq (5.7, $(LIBRT_TEST)) + LIBRT=-lrt +@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY)) + endif + + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +-- +2.19.2 + diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 56804d54667..9dfb3d3851f 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation { sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c"; }; + patches = [ + ./0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; From e0cc49c21948eb48935b1254602e1c2eb1d1d8ce Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 8 Mar 2019 23:51:53 +0100 Subject: [PATCH 163/238] gtk3: Fix for missing symbols (again) Was removed again in f9a62dbace5b0f7924f59ade45c750479a6ab0ab, but it was still needed after all, see https://github.com/NixOS/nixpkgs/issues/55692#issuecomment-469058386 --- pkgs/development/libraries/gtk+/3.x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 579fca06ffb..19abca1cabb 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -40,6 +40,13 @@ stdenv.mkDerivation rec { url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch; sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr"; }) + (fetchpatch { + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged + # but isn't in 3.24.5 + name = "export-missing-symbols.patch"; + url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch; + sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl"; + }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it From 91f0c848f4961ae8d0e50039fb712dd4ae6a02b7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 21 Feb 2019 20:21:31 -0500 Subject: [PATCH 164/238] cmake: set BUILD_TESTING=OFF when doCheck is false This means we can avoid building test suites that will never be run. --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index c21e10bb061..8c6b11bd73e 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -71,6 +71,11 @@ cmakeConfigurePhase() { cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags" cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags" + # Don’t build tests when doCheck = false + if [ -z "$doCheck" ]; then + cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags" + fi + # Avoid cmake resetting the rpath of binaries, on make install # And build always Release, to ensure optimisation flags cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" From 493403e5ddba8118c2ada8f822b97cccc2069587 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 9 Mar 2019 19:24:12 -0600 Subject: [PATCH 165/238] kdeFrameworks: 5.55 -> 5.56 https://kde.org/announcements/kde-frameworks-5.56.0.php --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 632 +++++++++--------- 2 files changed, 317 insertions(+), 317 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 8946c697c24..f6c2e79956b 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.55/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.56/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 6c0b80807cc..14db306012e 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/attica-5.55.0.tar.xz"; - sha256 = "0bsn9mi3nj23k2r3mfgjm9i1mp8qnwf08xn9x757wk3xas0cx98v"; - name = "attica-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/attica-5.56.0.tar.xz"; + sha256 = "1ib68yg7dgfyh2kq72abw5bh8h0m85z3hcada3b3axq2xkcfxfmb"; + name = "attica-5.56.0.tar.xz"; }; }; baloo = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/baloo-5.55.0.tar.xz"; - sha256 = "068ms071639pskhjz37cszylvfzzqhp7x1rmwdfn5nlvzrv6lrxh"; - name = "baloo-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/baloo-5.56.0.tar.xz"; + sha256 = "04hjlhlgw26l2pl4b5jk76xfs7366my71zp1xgiws5aq620bmmcy"; + name = "baloo-5.56.0.tar.xz"; }; }; bluez-qt = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/bluez-qt-5.55.0.tar.xz"; - sha256 = "1ixad1ya3c339c675w8nwmbga8ydq16db9fk2az3gjm68z3dch8a"; - name = "bluez-qt-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/bluez-qt-5.56.0.tar.xz"; + sha256 = "1phph0rjms8n2qpkh9bk1n1n1cd75znsqj9r8njs1siasm6vi4nm"; + name = "bluez-qt-5.56.0.tar.xz"; }; }; breeze-icons = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/breeze-icons-5.55.0.tar.xz"; - sha256 = "03mb7x8mc2h6cjb4mrifrbkbpj3lv9c0mg4m619rqiydg0p1yf49"; - name = "breeze-icons-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/breeze-icons-5.56.0.tar.xz"; + sha256 = "0n6gizmzay98q1vi9ac60p0xq9hpaj9q0gcf8vbmvk4m0yzdd63x"; + name = "breeze-icons-5.56.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/extra-cmake-modules-5.55.0.tar.xz"; - sha256 = "1x868hs9jiqzkqx7gld4mdm5dzfxc5kann22y15a4f7g5a957534"; - name = "extra-cmake-modules-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/extra-cmake-modules-5.56.0.tar.xz"; + sha256 = "0a5mxk805rlmpgbxwa9qkn515jqpcifsrk8ydxc3anjcsq6ffg4i"; + name = "extra-cmake-modules-5.56.0.tar.xz"; }; }; frameworkintegration = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/frameworkintegration-5.55.0.tar.xz"; - sha256 = "0pfpk268x06pjwciv4jr5v259kjck0sf4xzsgn29ifkmsk74wwmi"; - name = "frameworkintegration-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/frameworkintegration-5.56.0.tar.xz"; + sha256 = "1xc0vdvpjzhb6y1pz27c7x36qjjhcf4bll0fm3yljpm956v4d3gf"; + name = "frameworkintegration-5.56.0.tar.xz"; }; }; kactivities = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kactivities-5.55.0.tar.xz"; - sha256 = "0dp9vx2nl9fnawzcz04fqa731s3bk2izxrqbvn71aqyrs7fymabg"; - name = "kactivities-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kactivities-5.56.0.tar.xz"; + sha256 = "0l0p966b5rs6xjc61mpzmrkj7qqjvlzi6fwc7lky4z3fr924ssp7"; + name = "kactivities-5.56.0.tar.xz"; }; }; kactivities-stats = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kactivities-stats-5.55.0.tar.xz"; - sha256 = "12n178244ysfak0x9qm9a2k814qi56w8xpkg03na7hlsz2l4y9v6"; - name = "kactivities-stats-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kactivities-stats-5.56.0.tar.xz"; + sha256 = "1v3pf9drb22qv7039grx4k7q3a1jxd2a7sf818mxpqyys4fzkl3f"; + name = "kactivities-stats-5.56.0.tar.xz"; }; }; kapidox = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kapidox-5.55.0.tar.xz"; - sha256 = "0x41adp3rnvr6njc57ffdyh6d5i5aw13xcjdr4p6kacw9pk63ajf"; - name = "kapidox-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kapidox-5.56.0.tar.xz"; + sha256 = "0rhqqsv4zf13idk426x84jykw6lc74bz7pk606llbmyw4775c7wp"; + name = "kapidox-5.56.0.tar.xz"; }; }; karchive = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/karchive-5.55.0.tar.xz"; - sha256 = "1llznxc5wjjnmbjx8iwi3a93gc2z0z344viknsgls1fwdjjfyxc4"; - name = "karchive-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/karchive-5.56.0.tar.xz"; + sha256 = "1mnavc5baa4qw90baw5b95760lk61m2rx0vfa3w5d7fid3m6q6i8"; + name = "karchive-5.56.0.tar.xz"; }; }; kauth = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kauth-5.55.0.tar.xz"; - sha256 = "1w6bp2kbp1sn4cl76fgl2pqrg660ix99qq4h65g090kc934np3zc"; - name = "kauth-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kauth-5.56.0.tar.xz"; + sha256 = "0gb1yh2na2kfphln7arscv5n7llagkkv2y0zdprdy4michqa3k6b"; + name = "kauth-5.56.0.tar.xz"; }; }; kbookmarks = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kbookmarks-5.55.0.tar.xz"; - sha256 = "0vsn98znzdbiy8clbl9p3kiag3zvxgc9701gwg2ig8mpv3ci9lkg"; - name = "kbookmarks-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kbookmarks-5.56.0.tar.xz"; + sha256 = "0fwmq70ajyjqcva1n2vnf522gwl44aqsi6s9vf8zxsar14vil082"; + name = "kbookmarks-5.56.0.tar.xz"; }; }; kcmutils = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kcmutils-5.55.0.tar.xz"; - sha256 = "1f49864xpxrbj77n7l474wkn3rw4zy8vkl3psdya7ccdk7ac2s0k"; - name = "kcmutils-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcmutils-5.56.0.tar.xz"; + sha256 = "1f1sccwyk6fzqd9ywnhkrsyaklmxi0w0w5jqhp1m4n3l30caixkw"; + name = "kcmutils-5.56.0.tar.xz"; }; }; kcodecs = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kcodecs-5.55.0.tar.xz"; - sha256 = "0491j6l28jwfpgaqs2816qpyggnra2df33iw3fgvb0wd4r4gvmjb"; - name = "kcodecs-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcodecs-5.56.0.tar.xz"; + sha256 = "10lw85im4rd3nfdnw2p48cjwq0d47pa2s9v6vmhzmm3hxbflq8z7"; + name = "kcodecs-5.56.0.tar.xz"; }; }; kcompletion = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kcompletion-5.55.0.tar.xz"; - sha256 = "08ym79fqk7vshsf3jk37d6jvg7ys63kwflcn5dff5ci18jan2ir2"; - name = "kcompletion-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcompletion-5.56.0.tar.xz"; + sha256 = "1yxsrl0f24ps8xsilh2iqnl88yvw39iw2ch0yk7lwwk47jkgvns9"; + name = "kcompletion-5.56.0.tar.xz"; }; }; kconfig = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kconfig-5.55.0.tar.xz"; - sha256 = "06gscipc3914gwiswhp1xx4sy74bpy645ykq2i6r1sb6sm16hmja"; - name = "kconfig-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kconfig-5.56.0.tar.xz"; + sha256 = "0wii6pn5dq899s1r7p4q5vmm01jk11zwg2ky6760xf8nv8rhg5ra"; + name = "kconfig-5.56.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kconfigwidgets-5.55.0.tar.xz"; - sha256 = "0npfp6z5lc2h8y6slmz3sbymyyv9k2w73rpsjzl5zswqhzlvrb5k"; - name = "kconfigwidgets-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kconfigwidgets-5.56.0.tar.xz"; + sha256 = "00x5cxgxqza81znzm5rzxzr6scv3s5wbwbhsq61ksmjnlf5wvky5"; + name = "kconfigwidgets-5.56.0.tar.xz"; }; }; kcoreaddons = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kcoreaddons-5.55.0.tar.xz"; - sha256 = "1j7bc5fhak8db3vdfslbjdffbdclakhfwsni2a855d08yfrl1n1w"; - name = "kcoreaddons-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcoreaddons-5.56.0.tar.xz"; + sha256 = "17kvndaab9l6r79rh0pyjgw4yqh99xfyksc4yxzhhlyl3fgh6hcz"; + name = "kcoreaddons-5.56.0.tar.xz"; }; }; kcrash = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kcrash-5.55.0.tar.xz"; - sha256 = "08a8c5mbj6ll0d1ivhcjx5ga1jfbnwxsk618wcfpwwi6mkxrc3f9"; - name = "kcrash-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcrash-5.56.0.tar.xz"; + sha256 = "1q5iyqi1qgk5ngc9fdilrc5mjxy2mb0xbdnlx234hn1a44aq47jq"; + name = "kcrash-5.56.0.tar.xz"; }; }; kdbusaddons = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kdbusaddons-5.55.0.tar.xz"; - sha256 = "1sj3cycgci3ih65bkh7bsvbzyp7r654ppcryj4azpcsxqhy5gc7l"; - name = "kdbusaddons-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdbusaddons-5.56.0.tar.xz"; + sha256 = "0wmrcz92k27j0s2iyzd9ldynv4p52x70sxzby2m807ffrs692c5r"; + name = "kdbusaddons-5.56.0.tar.xz"; }; }; kdeclarative = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kdeclarative-5.55.0.tar.xz"; - sha256 = "043jl7rn9yawh04fwgaxb8iwksn3z8qb4yfc4s6v1znwcs7ajlda"; - name = "kdeclarative-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdeclarative-5.56.0.tar.xz"; + sha256 = "0slhxqzbrj23vw7f017cx3brpqkw3933jj7z8kc2bgfzjypj373r"; + name = "kdeclarative-5.56.0.tar.xz"; }; }; kded = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kded-5.55.0.tar.xz"; - sha256 = "0kn9kzzji257mppd12jzwiibha8127ajxvng2ls765lylv9nad7q"; - name = "kded-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kded-5.56.0.tar.xz"; + sha256 = "0fdzpsrigjqssqw25gxz5d1i0j8g3hc8xpv4v74mp0pcv9g10apz"; + name = "kded-5.56.0.tar.xz"; }; }; kdelibs4support = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/portingAids/kdelibs4support-5.55.0.tar.xz"; - sha256 = "1l1gjv06yp9jdiapiypwscbb6y0rfgrnw9rdsl7kkxh9ps8b8j39"; - name = "kdelibs4support-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kdelibs4support-5.56.0.tar.xz"; + sha256 = "1yhfnvzgwmnivm99gkq67gnx0ar02j043mq3fg2lgwlrarqi9k7d"; + name = "kdelibs4support-5.56.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kdesignerplugin-5.55.0.tar.xz"; - sha256 = "114035wil0p5z6h0li8wjzivsdxhqbih54kn4nvhn43b71xnzs3y"; - name = "kdesignerplugin-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdesignerplugin-5.56.0.tar.xz"; + sha256 = "05nqayzafn2zz74lx8zj7hi7knclcip7zbqmpk1g3nriysc39x4v"; + name = "kdesignerplugin-5.56.0.tar.xz"; }; }; kdesu = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kdesu-5.55.0.tar.xz"; - sha256 = "1x2gjnmgpcaxvfav2pm92zfgxbn60awpvmn9ycs68rq47p6h9x0f"; - name = "kdesu-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdesu-5.56.0.tar.xz"; + sha256 = "0fc77rbkd1m7rv4rq56g0fg4vg0siamdm5g788816ig9gn1j76ll"; + name = "kdesu-5.56.0.tar.xz"; }; }; kdewebkit = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kdewebkit-5.55.0.tar.xz"; - sha256 = "1mnbdsiih94hlwwff9fs9gnzl3y7ayf1pskmz1rajgjmqd6rm7mm"; - name = "kdewebkit-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdewebkit-5.56.0.tar.xz"; + sha256 = "1c1mxs30182ilxybp0xwaljrjg5y9j1ri79169hn8664xs3wcbc2"; + name = "kdewebkit-5.56.0.tar.xz"; }; }; kdnssd = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kdnssd-5.55.0.tar.xz"; - sha256 = "0lljj7mxmqm60kfzr37zb7z58mfyfh7zgykf7a5is1k0lxpgk6zc"; - name = "kdnssd-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdnssd-5.56.0.tar.xz"; + sha256 = "1gskwc8sbj6cicblmrxh7qnh1gap0qivs8k5zf5qs94p1xc864vy"; + name = "kdnssd-5.56.0.tar.xz"; }; }; kdoctools = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kdoctools-5.55.0.tar.xz"; - sha256 = "0dlal0vkxf5yh1hbfhrcrxqqi1w43q7bvv8ws8pb18jjgimzr46l"; - name = "kdoctools-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdoctools-5.56.0.tar.xz"; + sha256 = "01y06rf1nhw2p8s0j60anr2qvssrqfimddvp2mqqkvx9xkx3py74"; + name = "kdoctools-5.56.0.tar.xz"; }; }; kemoticons = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kemoticons-5.55.0.tar.xz"; - sha256 = "03vx22f9mjd10qm61f6ihr283w2sarrhg0rssxp7g7wahvshcvmh"; - name = "kemoticons-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kemoticons-5.56.0.tar.xz"; + sha256 = "00hbd09gnwyfszdwa9yf5m8wpbbapc4kwhs3qxhbvvmll0jv9vl2"; + name = "kemoticons-5.56.0.tar.xz"; }; }; kfilemetadata = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kfilemetadata-5.55.0.tar.xz"; - sha256 = "0fqj266f9f66rfjzg0rl35fac5rn5n3npyfb4gsla3mdc8fjz9mi"; - name = "kfilemetadata-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kfilemetadata-5.56.0.tar.xz"; + sha256 = "04pmd2f77zxi14l3rhw4dyrh9dafchxqw1xjyv60j97gmm1b9796"; + name = "kfilemetadata-5.56.0.tar.xz"; }; }; kglobalaccel = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kglobalaccel-5.55.0.tar.xz"; - sha256 = "1c6dxp6jvbw8l74n1mv0v62yr34b9447szhvd61y4sxmmfjimhz4"; - name = "kglobalaccel-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kglobalaccel-5.56.0.tar.xz"; + sha256 = "0pmgvizc2dwrwr7m49125ybcpsc95r9riwxnihf37napyaacd9y3"; + name = "kglobalaccel-5.56.0.tar.xz"; }; }; kguiaddons = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kguiaddons-5.55.0.tar.xz"; - sha256 = "190jwhvq2fi8g03saszlaslzxmcbqrbwli9f9vm6h5j9nnc0z6h3"; - name = "kguiaddons-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kguiaddons-5.56.0.tar.xz"; + sha256 = "0gp2i29y1vws8i3q8s1bhyxksa42l6q55m459yczddcvcw0vd45i"; + name = "kguiaddons-5.56.0.tar.xz"; }; }; kholidays = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kholidays-5.55.0.tar.xz"; - sha256 = "0y44alimywggd4xvis9lz49j0fhgwkggzwpp7bnmcxjnbj9z0vd9"; - name = "kholidays-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kholidays-5.56.0.tar.xz"; + sha256 = "0lm2ls3a15qbsfhamh2ldzvr62wi9nrhxd83rhyk3ifsgac4mg18"; + name = "kholidays-5.56.0.tar.xz"; }; }; khtml = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/portingAids/khtml-5.55.0.tar.xz"; - sha256 = "0wh9z5xm0gaf1c2s7cq7763jfyv83d58x80nwsvb0ayd6y8id1bq"; - name = "khtml-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/khtml-5.56.0.tar.xz"; + sha256 = "1wmcqc4546mqagqpgb97h3yd7nxaq4si2484li5hnw8mglm1qf3x"; + name = "khtml-5.56.0.tar.xz"; }; }; ki18n = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/ki18n-5.55.0.tar.xz"; - sha256 = "0kvwjzqibby9fawyfb8bd81abjhsjlyi8xy9mcapnih5x2gx3z92"; - name = "ki18n-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/ki18n-5.56.0.tar.xz"; + sha256 = "0hdfad9vmyzfni9ln0dc9p26gpjksk754z28v35hww6z9kgbr1dq"; + name = "ki18n-5.56.0.tar.xz"; }; }; kiconthemes = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kiconthemes-5.55.0.tar.xz"; - sha256 = "1rgbfklb7xxg7z2zyrsmaxf883ixgfbkqilps3npwk3xac2f66rw"; - name = "kiconthemes-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kiconthemes-5.56.0.tar.xz"; + sha256 = "0rdpvbqsb2wqi3glmggilm1mhpy6nc80am5hl4c34269mxd55q8a"; + name = "kiconthemes-5.56.0.tar.xz"; }; }; kidletime = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kidletime-5.55.0.tar.xz"; - sha256 = "1kq6zh6cjhzffjhxnc7l1pw6g38swxyspp8xl8c860zdhc9xfd1g"; - name = "kidletime-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kidletime-5.56.0.tar.xz"; + sha256 = "09184bi8fvq34hwkldyibji7r79wd2wvhxk1i4kzkjg177dnaa95"; + name = "kidletime-5.56.0.tar.xz"; }; }; kimageformats = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kimageformats-5.55.0.tar.xz"; - sha256 = "0hhxv8m5993vlpi5yf7w3fadzckficn16flshdkby7bwq8agrbz1"; - name = "kimageformats-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kimageformats-5.56.0.tar.xz"; + sha256 = "1cgh32jkg0ybfp8z6qwn7y6yr9mb0fiqly4pb0qc1lcm6awdx3d5"; + name = "kimageformats-5.56.0.tar.xz"; }; }; kinit = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kinit-5.55.0.tar.xz"; - sha256 = "11xwiny5sfqbdls249vnq6ssp5pzw1w9wg4ql9nkwwygl4ml8b9y"; - name = "kinit-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kinit-5.56.0.tar.xz"; + sha256 = "1ihrannyaj33wsir20qy363vdjafhlsmj45qzl3xkl4rbyl6ngs7"; + name = "kinit-5.56.0.tar.xz"; }; }; kio = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kio-5.55.0.tar.xz"; - sha256 = "1k3cn7hvp5z9nirss29v164hahrlvlqivxlk64c8w9ynjx699ira"; - name = "kio-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kio-5.56.0.tar.xz"; + sha256 = "1m2c3a5isj966snmzs97i9kyhwnbzlwf61lqw5yxck25x7d0pyyn"; + name = "kio-5.56.0.tar.xz"; }; }; kirigami2 = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kirigami2-5.55.0.tar.xz"; - sha256 = "11djxli5cq7pn19lmjz2y7z39mhlr98jskasfzyax546j47v973k"; - name = "kirigami2-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kirigami2-5.56.0.tar.xz"; + sha256 = "0pbyr50anbzrqmw1rzf46dck9gsrfs7zxw5jlcax98bpsajix87y"; + name = "kirigami2-5.56.0.tar.xz"; }; }; kitemmodels = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kitemmodels-5.55.0.tar.xz"; - sha256 = "13609avkqrfi79zyr737662nr8bwcfdya9dxc6gzyqx5i0l2nbw6"; - name = "kitemmodels-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kitemmodels-5.56.0.tar.xz"; + sha256 = "13m1bvhljyc1jb9hdlz5v009kmkz7q0qf06l5zkck5k0fq41rkrg"; + name = "kitemmodels-5.56.0.tar.xz"; }; }; kitemviews = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kitemviews-5.55.0.tar.xz"; - sha256 = "1mgh7z5xcbhc7a2qq8mqfp7j4amk93hypkpy2zc3rdhc60ps94ad"; - name = "kitemviews-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kitemviews-5.56.0.tar.xz"; + sha256 = "1ar492jpyprxvzcgnq0gnbyxlndb3rd0z32drk7xsx19vpk3ch58"; + name = "kitemviews-5.56.0.tar.xz"; }; }; kjobwidgets = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kjobwidgets-5.55.0.tar.xz"; - sha256 = "1pbx974jpn8n2080gblmbh8q0yb5wxb9xblpm100rbhpg20sc2by"; - name = "kjobwidgets-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kjobwidgets-5.56.0.tar.xz"; + sha256 = "1dh4ilry575k6z0glqb60ldjfkwpnkvijdzfyrc22bn84hbh19iy"; + name = "kjobwidgets-5.56.0.tar.xz"; }; }; kjs = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/portingAids/kjs-5.55.0.tar.xz"; - sha256 = "0c1wyxsgn70jvw7zcjjpw12w9sg9xxvyslgnqlnnyh8sx7rrp70c"; - name = "kjs-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kjs-5.56.0.tar.xz"; + sha256 = "1b3l76ipf0fr8bvp3f4njimmg5yw9ciwzzgvb34ds65aycplagln"; + name = "kjs-5.56.0.tar.xz"; }; }; kjsembed = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/portingAids/kjsembed-5.55.0.tar.xz"; - sha256 = "0dh9012y9bqj48jp50lrsmd28bbvf4jd93l34vfzmza252yvyw3l"; - name = "kjsembed-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kjsembed-5.56.0.tar.xz"; + sha256 = "0lkfq7099yiwvlycrix3s0dbk860rqfnix5fiw5vmi855is7mpkv"; + name = "kjsembed-5.56.0.tar.xz"; }; }; kmediaplayer = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/portingAids/kmediaplayer-5.55.0.tar.xz"; - sha256 = "0gpfrhgk2l63lyz0bz93cg7mc5g7mjvrkfvpyndmi1v7vhndp5zq"; - name = "kmediaplayer-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kmediaplayer-5.56.0.tar.xz"; + sha256 = "0blqbi40l1pk8qf9054ha4a8r7cb4pddbqydsqlsscl4gm8530jh"; + name = "kmediaplayer-5.56.0.tar.xz"; }; }; knewstuff = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/knewstuff-5.55.0.tar.xz"; - sha256 = "0a2d9wrhjsjl0klsrn501sp9681v7qmq6hmalw061arjv165dzw2"; - name = "knewstuff-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/knewstuff-5.56.0.tar.xz"; + sha256 = "0r0ia0521vfri7mc6wpg3ihryqj48s3krgmliwbh635rfd3lcj9j"; + name = "knewstuff-5.56.0.tar.xz"; }; }; knotifications = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/knotifications-5.55.0.tar.xz"; - sha256 = "1dbrk9r3w8pmg15bhrb8qdk4fiqvc9qggb67zvk1n7ddlfkyarz6"; - name = "knotifications-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/knotifications-5.56.0.tar.xz"; + sha256 = "05nf2870fq9cwacgyy8iky5v37fq4jrsh4hl9xy9928d19qnmb24"; + name = "knotifications-5.56.0.tar.xz"; }; }; knotifyconfig = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/knotifyconfig-5.55.0.tar.xz"; - sha256 = "01hxj6s2sq5k5j6j1y4c5gxyl1886j7ghh0hdc95b7n4gdjwwbci"; - name = "knotifyconfig-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/knotifyconfig-5.56.0.tar.xz"; + sha256 = "0zwq0p779482sxxjg62z1rkpiiyn6b3r47l450dm6hm56vkf7vxl"; + name = "knotifyconfig-5.56.0.tar.xz"; }; }; kpackage = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kpackage-5.55.0.tar.xz"; - sha256 = "175b0lj4qybddjpc25b1p60lr8f9220i9ymk3wk3y3vf4893v833"; - name = "kpackage-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kpackage-5.56.0.tar.xz"; + sha256 = "037r0ldp70q0yafld1ddff1d4wipb5ras88r72qazjcfqfg9rzjr"; + name = "kpackage-5.56.0.tar.xz"; }; }; kparts = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kparts-5.55.0.tar.xz"; - sha256 = "0gqkgnvkdai8hbg1n32jq4a3yzlkarmw8a7hxlfr0ykgysanjh65"; - name = "kparts-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kparts-5.56.0.tar.xz"; + sha256 = "1vj5ard5ff0wzpjqzrkd2kb31dkjly1cf4ww1ljrrwi7qgzxgw0z"; + name = "kparts-5.56.0.tar.xz"; }; }; kpeople = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kpeople-5.55.0.tar.xz"; - sha256 = "0vbgi4l14g4f0klbxqbkjcag6yi0ghhpxn5nik5sssmcx8qyk885"; - name = "kpeople-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kpeople-5.56.0.tar.xz"; + sha256 = "0h456kjhx4ylbkiv3706g8ccdq55aamrhj5rgiql2gaw3d5dbrkr"; + name = "kpeople-5.56.0.tar.xz"; }; }; kplotting = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kplotting-5.55.0.tar.xz"; - sha256 = "0nn2v1yvvpzpi1y1pm47zvmwsa942c7d9n8iqymqihnp0fqjr8y7"; - name = "kplotting-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kplotting-5.56.0.tar.xz"; + sha256 = "1hrk3iv77s46lcs6c5mfiyzr80vpg9261mlixc3qwps0mww43r1r"; + name = "kplotting-5.56.0.tar.xz"; }; }; kpty = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kpty-5.55.0.tar.xz"; - sha256 = "0r5080xl7x13qmjnjssb0d1pk626anaa4xahb7fi869fndr4xhzn"; - name = "kpty-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kpty-5.56.0.tar.xz"; + sha256 = "1dzp4a6rz6hsp1y8m5l73i8v2a3bpwkv4rrypkd00051ajcch47k"; + name = "kpty-5.56.0.tar.xz"; }; }; kross = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/portingAids/kross-5.55.0.tar.xz"; - sha256 = "0p3q36gka6m62nryc3l11d30mlhiqjpghvfcyq6wikiqlv2kqvjs"; - name = "kross-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kross-5.56.0.tar.xz"; + sha256 = "0ry6fpl0rb8z5r08bzh6kj14mp7l94calvdk3vrnc89cpm5gxymv"; + name = "kross-5.56.0.tar.xz"; }; }; krunner = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/krunner-5.55.0.tar.xz"; - sha256 = "0yw2jh9dailhcwkkjl2qggg5k90bwbfsn88a3hzwyj2ng2haypis"; - name = "krunner-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/krunner-5.56.0.tar.xz"; + sha256 = "1gs0fr78zbhxl8c08zj4s98zshc42zxzwv7p9l7rmq8h21spc8ga"; + name = "krunner-5.56.0.tar.xz"; }; }; kservice = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kservice-5.55.0.tar.xz"; - sha256 = "0k8xksmw2ai7m0js7l98rv5v6ykifmnqiyy2yc1xhgn40lf1r89j"; - name = "kservice-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kservice-5.56.0.tar.xz"; + sha256 = "1hsc8pagigwspyv9ipl3l2b9mf8amfksk8a2k3iic9nw1hmpxinv"; + name = "kservice-5.56.0.tar.xz"; }; }; ktexteditor = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/ktexteditor-5.55.0.tar.xz"; - sha256 = "0b5zqhm5aw7jj7dj600xa674ik11gwyzamhyz5962xhvsg5pyjwx"; - name = "ktexteditor-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/ktexteditor-5.56.0.tar.xz"; + sha256 = "1a2r97v3xwh61q688jvwkk99bphfd0v0ldqms5d73q3m6w1x122c"; + name = "ktexteditor-5.56.0.tar.xz"; }; }; ktextwidgets = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/ktextwidgets-5.55.0.tar.xz"; - sha256 = "1ymqmb5z4flzrns3wdjagxbzbpighbincwbhy29a0mqg4zcm82xk"; - name = "ktextwidgets-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/ktextwidgets-5.56.0.tar.xz"; + sha256 = "1km19z577y29di8zp6amlccqdavxk4f4sg1dblj6gp64zkw9dbqp"; + name = "ktextwidgets-5.56.0.tar.xz"; }; }; kunitconversion = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kunitconversion-5.55.0.tar.xz"; - sha256 = "1v5cfxk5v76w1f1qvrpilrs111wvp8bn2p3bswhqp4lg0qxync0q"; - name = "kunitconversion-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kunitconversion-5.56.0.tar.xz"; + sha256 = "1kf5dc6p77mkx2i23ppfs0k3laybmx5vqq7aq1bxnkxj1ws75144"; + name = "kunitconversion-5.56.0.tar.xz"; }; }; kwallet = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kwallet-5.55.0.tar.xz"; - sha256 = "1dp072h5r6yd81i69759pj8klfsikrg25za44sry2kh6fxvwmngm"; - name = "kwallet-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kwallet-5.56.0.tar.xz"; + sha256 = "02i6xkq9ki6sybjvcxkznf5v8b34pqxysg9pi5v4z6jkw2jpr5fj"; + name = "kwallet-5.56.0.tar.xz"; }; }; kwayland = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kwayland-5.55.0.tar.xz"; - sha256 = "0m9q13qzgvp03jrsyc59l6pp7jf0dvhx768p21drs46qxw6wla7l"; - name = "kwayland-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kwayland-5.56.0.tar.xz"; + sha256 = "1779in51z63sv6607xd7y30wprs9vs8nnqa28fxg1q4nicwnvrxv"; + name = "kwayland-5.56.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kwidgetsaddons-5.55.0.tar.xz"; - sha256 = "0kpbvvmjrhxxjqc0cb63zlq06a3xspq43xv3wdingcn28zypynzc"; - name = "kwidgetsaddons-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kwidgetsaddons-5.56.0.tar.xz"; + sha256 = "0flmw1wfzs49dmmlbbimizjwj09wp4qwr9znxn3h5yfn0mxfc1lv"; + name = "kwidgetsaddons-5.56.0.tar.xz"; }; }; kwindowsystem = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kwindowsystem-5.55.0.tar.xz"; - sha256 = "10zdxm08d758zbwlrbsn0ghxjpf39ids2s5pnca072gbrbrxv656"; - name = "kwindowsystem-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kwindowsystem-5.56.0.tar.xz"; + sha256 = "0dk9ymlpdpvra2zm1f2rcx2dwnn9qc49n2y7p6iw094fwk5rzczc"; + name = "kwindowsystem-5.56.0.tar.xz"; }; }; kxmlgui = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kxmlgui-5.55.0.tar.xz"; - sha256 = "0ph67zarf1sccvp7882brrihv4dsmxq0nggan0rnk54qg0zdhgcn"; - name = "kxmlgui-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kxmlgui-5.56.0.tar.xz"; + sha256 = "1ipa0qnkh6gs3f6ygvb7cf0yv1m89m3cdl1z23br4fn14d5mxbrl"; + name = "kxmlgui-5.56.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/kxmlrpcclient-5.55.0.tar.xz"; - sha256 = "1573wnv2fbjjzgx3f1qm7y8wlj22bz45mny0rxci90i76nnh4538"; - name = "kxmlrpcclient-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kxmlrpcclient-5.56.0.tar.xz"; + sha256 = "1bjnpl4521gv35zghaanz6v5bap2b9n2kz7b0rif1bf6iak018ql"; + name = "kxmlrpcclient-5.56.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/modemmanager-qt-5.55.0.tar.xz"; - sha256 = "10pkgm4dzsrfnjsf78pssd1wp0y27d1y834chd267hx9vgrv8axm"; - name = "modemmanager-qt-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/modemmanager-qt-5.56.0.tar.xz"; + sha256 = "1xwx6yybij8nlaqfpz76pindfxshcyg9p21nqm6ddpgyzh74klbc"; + name = "modemmanager-qt-5.56.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/networkmanager-qt-5.55.0.tar.xz"; - sha256 = "0j8l4k13vsqh0a8mw8dw5bc78xvxhz2rh7bb870as04i32bvw772"; - name = "networkmanager-qt-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/networkmanager-qt-5.56.0.tar.xz"; + sha256 = "0p0b3rq7s1yzy6zspd6xnzjc0hza9d7fixm8pw369kn5k3pi5lk1"; + name = "networkmanager-qt-5.56.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/oxygen-icons5-5.55.0.tar.xz"; - sha256 = "0fvm9bq1573xkha4a577s1iik8nwzks8xhrli5mm6rbh53s12wp4"; - name = "oxygen-icons5-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/oxygen-icons5-5.56.0.tar.xz"; + sha256 = "17cjcfmc8vywh8n2ck0s3b0i88ilamdah0gipicn7vj65l4wc1qb"; + name = "oxygen-icons5-5.56.0.tar.xz"; }; }; plasma-framework = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/plasma-framework-5.55.0.tar.xz"; - sha256 = "1pvxxw52s03i11p5byd2sh8sbvlk6h8q6briq9d4qvjy6c0pmbq4"; - name = "plasma-framework-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/plasma-framework-5.56.0.tar.xz"; + sha256 = "0hw90975c00v5v4xhs18w5gnklwhnygk6jls3n132xflilgc5k0a"; + name = "plasma-framework-5.56.0.tar.xz"; }; }; prison = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/prison-5.55.0.tar.xz"; - sha256 = "1xadc2fq6csml78czg5p572cwvmqmn334a5dxjnd7k1pdx50gi07"; - name = "prison-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/prison-5.56.0.tar.xz"; + sha256 = "05hy6fz05snpgjz6bnm3qcr7smg65a0m6rdmyv7avrpbs4qpbghx"; + name = "prison-5.56.0.tar.xz"; }; }; purpose = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/purpose-5.55.0.tar.xz"; - sha256 = "1krgjcfjrwvr7widz3rmcbbag4l0940gyzfpxni1p47c76kcb13b"; - name = "purpose-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/purpose-5.56.0.tar.xz"; + sha256 = "0rvywfkhqbmd39g950mpnn35i3kg7j63ylvdy2px2d71am6acal8"; + name = "purpose-5.56.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/qqc2-desktop-style-5.55.0.tar.xz"; - sha256 = "0aj37ldc3ywqap3sz73j54kbzycn529imr15jgl252k04rqpjya5"; - name = "qqc2-desktop-style-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/qqc2-desktop-style-5.56.0.tar.xz"; + sha256 = "08afy1gsy0lvpzqmv5azzfiy5x9lvffsf6qvzxxab4v5ch8fn00b"; + name = "qqc2-desktop-style-5.56.0.tar.xz"; }; }; solid = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/solid-5.55.0.tar.xz"; - sha256 = "18dw55g41q34m2qzvybvpsas1dnyryqxnlf2md0xc4r36ib9p2pn"; - name = "solid-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/solid-5.56.0.tar.xz"; + sha256 = "17kfwj0y41pkd0kxj2fj9m9qs7bq05vka9ngfr022lfwdhs907c4"; + name = "solid-5.56.0.tar.xz"; }; }; sonnet = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/sonnet-5.55.0.tar.xz"; - sha256 = "13bb1s2f4kfaikcga297j2fqlyr4qxdcq4v1b3zs1gas4z1wpcg6"; - name = "sonnet-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/sonnet-5.56.0.tar.xz"; + sha256 = "0r8bsf7a9rjvv4jirycwf3xvkqa9iax23p93m301x82hdvmkjr9w"; + name = "sonnet-5.56.0.tar.xz"; }; }; syndication = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/syndication-5.55.0.tar.xz"; - sha256 = "1p9xwbzlrw4bh5is5i6fq3yalmpsf099rzf6d2qc3a0sc21hxs63"; - name = "syndication-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/syndication-5.56.0.tar.xz"; + sha256 = "0wnrhfp5b4wgmigqh39c0f2qfblgmc3x6018b4wcayfs8gb4m1q9"; + name = "syndication-5.56.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/syntax-highlighting-5.55.0.tar.xz"; - sha256 = "00w5nmz9l70znv8q7q1zw3f7gngwfgf41iwbs53zqcv1z7wmrz6m"; - name = "syntax-highlighting-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/syntax-highlighting-5.56.0.tar.xz"; + sha256 = "0gl0v1bscqd6xhl3644wix8ix04lax0h1zzr1v65704c4qp87h8l"; + name = "syntax-highlighting-5.56.0.tar.xz"; }; }; threadweaver = { - version = "5.55.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.55/threadweaver-5.55.0.tar.xz"; - sha256 = "0r0ml5pz7h0vmydcg4gqqkl21lp6c5gqdwyfsnyad02dcjkh4hql"; - name = "threadweaver-5.55.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/threadweaver-5.56.0.tar.xz"; + sha256 = "1gyvj0v1zhfk8shi31pivvf5rwxkgv9bjmy2vippk2vxvkh0qc5x"; + name = "threadweaver-5.56.0.tar.xz"; }; }; } From 2206a3ebadbea29de6f1760687ff6cb6f77b66fc Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 9 Mar 2019 17:30:23 +0100 Subject: [PATCH 166/238] Merge #57095: gtk3: Fix for missing symbols (again) (cherry picked from commit 3ea5f97ac4c44b427fcd1a39f50c430116600677) Forward-picking from staging to staging-next. It seems quite an important fix with little risk of breakage, and it isn't such a huge rebuild, especially considering the unfinished amount on staging-next ATM. --- pkgs/development/libraries/gtk+/3.x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 579fca06ffb..19abca1cabb 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -40,6 +40,13 @@ stdenv.mkDerivation rec { url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch; sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr"; }) + (fetchpatch { + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged + # but isn't in 3.24.5 + name = "export-missing-symbols.patch"; + url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch; + sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl"; + }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it From 5767c18d99a035aa642286d1390698ff40d5d231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 10 Mar 2019 09:52:14 +0100 Subject: [PATCH 167/238] libarchive: apply upstream CVE patches Fixes #57150. --- pkgs/development/libraries/libarchive/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 029be971ac1..f2a1c500a8b 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,21 @@ stdenv.mkDerivation rec { sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms"; }; + patches = [ + (fetchpatch { + # details: https://github.com/libarchive/libarchive/pull/1105 + name = "cve-2018-1000877.diff"; # CVE-2018-1000877..80 + url = "https://github.com/libarchive/libarchive/pull/1105.diff"; + sha256 = "0mxcawfdy9m40mykzwhkl39a6vnh4ypgy0ipcz74qm4bi72x0gyf"; + }) + (fetchpatch { + # details: https://github.com/libarchive/libarchive/pull/1120 + name = "cve-2019-1000019_cve-2019-1000020.diff"; + url = "https://github.com/libarchive/libarchive/pull/1120.diff"; + sha256 = "1mgx92v8hm7hw9j34nbfriqfkxshh3cy25rhavr7kl7lz4x5a6g4"; + }) + ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ]; From b531c198063c4e5a1d71616ced308ac167fd4cdc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 10 Mar 2019 03:53:25 -0500 Subject: [PATCH 168/238] e2fsprogs: 1.44.5 -> 1.45.0 Changes: * https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.44.6.txt?h=v1.44.6 * https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.45.0.txt?h=v1.45.0 Also: * remove 'hack' for installing pc files * fixup location of `e2scrub_all_cron` to avoid reference cycle in outputs, promote to $bin/bin for now. --- pkgs/tools/filesystems/e2fsprogs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 80646949390..10b7344bc7a 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,12 @@ { stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.44.5"; + pname = "e2fsprogs"; + version = "1.45.0"; src = fetchurl { - url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; @@ -36,10 +37,9 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails - # hacky way to make it install *.pc postInstall = '' - make install-libs - rm "$out"/lib/*.a + # avoid cycle between outputs + mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/ ''; enableParallelBuilding = true; From 0cc47511e029934cc2314d71625c097708104631 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 9 Mar 2019 19:36:48 -0600 Subject: [PATCH 169/238] kfilemetadata: add missing/new dep to fix build --- .../libraries/kde-frameworks/kfilemetadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index ac209216828..c72cb5b71a4 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, copyPathsToStore, extra-cmake-modules, - attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, qtmultimedia, taglib + attr, ebook_tools, exiv2, ffmpeg, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib }: mkDerivation { @@ -9,7 +9,7 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase qtmultimedia + attr ebook_tools exiv2 ffmpeg karchive kcoreaddons ki18n poppler qtbase qtmultimedia taglib ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); From 8add9b7c2126c7be6736daf86bcc436821851112 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 10 Mar 2019 04:03:52 -0500 Subject: [PATCH 170/238] e2fsprogs: enable tests (previously explicitly disabled) --- pkgs/tools/filesystems/e2fsprogs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 10b7344bc7a..15346dcc30e 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; checkInputs = [ perl ]; - doCheck = false; # fails + doCheck = true; postInstall = '' # avoid cycle between outputs From 3c8e8f1443d7351b416fd91b0a28f5004fc3eb42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 Mar 2019 11:31:11 -0700 Subject: [PATCH 171/238] libatomic_ops: 7.6.8 -> 7.6.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libatomic_ops/versions --- pkgs/development/libraries/libatomic_ops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index ea1df23182d..0df8ed0f969 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "libatomic_ops-${version}"; - version = "7.6.8"; + version = "7.6.10"; src = fetchurl { urls = [ "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" ]; - sha256 = "0rgni7056gnbn105lln629gwd6s51779yb5ds9s7wxl1vyg2fshx"; + sha256 = "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq"; }; outputs = [ "out" "dev" "doc" ]; From 0ca4bc68fba8657fc8cf923b86cdacbcb1ddb0e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 Mar 2019 12:28:28 -0700 Subject: [PATCH 172/238] libheif: 1.3.2 -> 1.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libheif/versions --- pkgs/development/libraries/libheif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 25cee4ef8da..581a579cbe2 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }: stdenv.mkDerivation rec { - version = "1.3.2"; + version = "1.4.0"; name = "libheif-${version}"; src = fetchFromGitHub { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w"; + sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 2f7bf95f51ab7e612efc67dde9131bb3e33c4959 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Mar 2019 00:30:01 -0500 Subject: [PATCH 173/238] coreutils: 8.30 -> 8.31, touchups Release notes: https://savannah.gnu.org/forum/forum.php?forum_id=9394 Touchups: * enable tests w/musl (disable 2 gnulib tests) * improve tests we modify: use exit code 77 to indicate test skipped (causing it to be reportd as SKIP) Note: Not yet on mirrors, but can be (manually) fetched from primary --- pkgs/tools/misc/coreutils/default.nix | 30 +++++++++++++++------------ 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index ce1d4dc0ba8..9cc48f44646 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -16,37 +16,41 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.30"; + pname = "coreutils"; + version = "8.31"; src = fetchurl { - url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; }; patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; postPatch = '' # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. - sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh - sed '2i echo Skipping du threshold test && exit 0' -i ./tests/du/threshold.sh - sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh - sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh - sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh + sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh + sed '2i echo Skipping du threshold test && exit 77' -i ./tests/du/threshold.sh + sed '2i echo Skipping cp sparse test && exit 77' -i ./tests/cp/sparse.sh + sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh + sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh # sandbox does not allow setgid - sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh + sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh substituteInPlace ./tests/install/install-C.sh \ --replace 'mode3=2755' 'mode3=1755' - sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl + sed '2i print "Skipping env -S test"; exit 77;' -i ./tests/misc/env-S.pl # these tests fail in the unprivileged nix sandbox (without nix-daemon) as we break posix assumptions for f in ./tests/chgrp/{basic.sh,recurse.sh,default-no-deref.sh,no-x.sh,posix-H.sh}; do - sed '2i echo Skipping chgrp && exit 0' -i "$f" + sed '2i echo Skipping chgrp && exit 77' -i "$f" done for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do - echo "int main() { return 0; }" > "$f" + echo "int main() { return 77; }" > "$f" done + '' + optionalString (stdenv.hostPlatform.libc == "musl") '' + echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c + echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c ''; outputs = [ "out" "info" ]; @@ -80,7 +84,7 @@ stdenv.mkDerivation rec { # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.hostPlatform.libc == "glibc" + && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) && builtins.storeDir == "/nix/store"; # Prevents attempts of running 'help2man' on cross-built binaries. From 310ff410472a0b04bab9bfaa0484c8e983312521 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 Mar 2019 04:37:44 -0700 Subject: [PATCH 174/238] poppler_utils: 0.73.0 -> 0.74.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/poppler-utils/versions --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index f1b6c002488..28408cb91f8 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.73.0"; + version = "0.74.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "00yv7011y40jc5iw9b7zjyg8ij5wsfbjm32kli5qha1ij11majz4"; + sha256 = "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j"; }; outputs = [ "out" "dev" ]; From 6ed49262f50691b77919fd867a5d142e407caf14 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 21 Feb 2019 20:51:58 -0500 Subject: [PATCH 175/238] treewide: remove BUILD_TESTING flag This is now set by CMake --- pkgs/applications/editors/kdevelop5/kdev-php.nix | 4 ---- pkgs/applications/editors/kdevelop5/kdev-python.nix | 1 - pkgs/applications/graphics/seg3d/default.nix | 1 - pkgs/applications/science/biology/ants/default.nix | 4 +--- pkgs/applications/science/biology/mni_autoreg/default.nix | 3 +-- pkgs/development/libraries/arguments/default.nix | 2 +- pkgs/development/libraries/catch2/default.nix | 4 +--- pkgs/development/libraries/google-gflags/default.nix | 1 - pkgs/development/libraries/itk/default.nix | 1 - pkgs/development/libraries/libminc/default.nix | 3 +-- pkgs/development/libraries/qt-5/mkDerivation.nix | 1 - pkgs/development/libraries/science/biology/bicpl/default.nix | 2 +- pkgs/development/libraries/science/biology/mirtk/default.nix | 2 +- pkgs/development/libraries/vtk/default.nix | 3 +-- pkgs/development/libraries/vxl/default.nix | 2 +- pkgs/development/python-modules/hoomd-blue/default.nix | 2 -- pkgs/tools/filesystems/cryfs/default.nix | 1 - pkgs/tools/misc/hdf4/default.nix | 1 - pkgs/tools/package-management/appimagekit/default.nix | 1 - 19 files changed, 9 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 532bb99e7d8..ea0514066e9 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation rec { sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl"; }; - cmakeFlags = [ - "-DBUILD_TESTING=OFF" - ]; - nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index be27e10f42a..1c311539dd7 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DBUILD_TESTING=OFF" "-DPYTHON_EXECUTABLE=${python}/bin/python" ]; diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index bca88cc7013..58cec2ec170 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation { "-DBUILD_BIOMESH3D=1" "-DWITH_TETGEN=1" "-DBUILD_TYPE=Release" - "-DBUILD_TESTING=0" "-DWITH_WXWIDGETS=ON" "-DITK_DIR=${itk}/lib/InsightToolkit" "-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a" diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index f54bd9af028..d1a990a5eb2 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ itk vtk ]; - cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" - # as cmake otherwise tries to download test data: - "-DBUILD_TESTING=FALSE" ]; + cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix index 5901b696d64..ab22fb7232f 100644 --- a/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libminc ]; propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc postFixup = '' @@ -33,4 +33,3 @@ stdenv.mkDerivation rec { license = licenses.free; }; } - diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index ebef604e1be..cb0c65e97e3 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ ]; - #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" "-DBUILD_TESTING=FALSE" ]; + #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ]; doCheck = false; # internal_volume_io.h: No such file or directory diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 54f1c459212..ffe027c8961 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-H.." - "-DBUILD_TESTING=OFF"]; + cmakeFlags = [ "-H.." ]; meta = with stdenv.lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix index a6f062b8126..fefc3a8b4b8 100644 --- a/pkgs/development/libraries/google-gflags/default.nix +++ b/pkgs/development/libraries/google-gflags/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=ON" - "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" ]; doCheck = false; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index df016d9fcac..878c8221542 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" "-DModule_ITKMINC=ON" diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix index 1e13f323822..aea7a5959fa 100644 --- a/pkgs/development/libraries/libminc/default.nix +++ b/pkgs/development/libraries/libminc/default.nix @@ -22,13 +22,12 @@ stdenv.mkDerivation rec { buildInputs = [ zlib netcdf nifticlib hdf5 ]; cmakeFlags = [ - "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" "-DLIBMINC_MINC1_SUPPORT=ON" "-DLIBMINC_BUILD_SHARED_LIBS=ON" "-DLIBMINC_USE_SYSTEM_NIFTI=ON" ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; checkPhase = '' export LD_LIBRARY_PATH="$(pwd)" # see #22060 ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 96014cfbc77..d4e2143d564 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -19,7 +19,6 @@ let cmakeFlags = (args.cmakeFlags or []) ++ [ - "-DBUILD_TESTING=OFF" ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release")) ]; diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix index f763e8a4fcc..0c634c0f265 100644 --- a/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libminc netpbm ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBUILD_TESTING=FALSE" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" ]; doCheck = false; # internal_volume_io.h: No such file or directory diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index ce2050e82e6..51beba898f6 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON"; + cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON"; doCheck = true; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index dee363f23b6..9843b1289cf 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { # objects. cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] - ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF" - "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; + ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 777b8bb1f40..9651e9a5f80 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # BUILD_OUL wants old linux headers for videodev.h, not available # in stdenv linux headers # BUILD_BRL fails to find open() - cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF " + cmakeFlags = "-DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF " + (if stdenv.hostPlatform.system == "x86_64-linux" then "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" else diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index 3463f471c5e..ad25b8977c0 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -10,7 +10,6 @@ let components = { hpmc = true; md = true; metal = true; - testing = false; }; onOffBool = b: if b then "ON" else "OFF"; withMPI = (mpi != null); @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { "-DBUILD_HPMC=${onOffBool components.hpmc}" "-DBUILD_MD=${onOffBool components.md}" "-DBUILD_METAL=${onOffBool components.metal}" - "-DBUILD_TESTING=${onOffBool components.testing}" ]; preConfigure = '' diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 4e2f8eaf5c9..71e27c94dbd 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS=OFF" "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive - "-DBUILD_TESTING=ON" ]; doCheck = true; diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index ef3839f67de..eb57cc45f6a 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON" "-DHDF4_BUILD_TOOLS=ON" "-DHDF4_BUILD_UTILS=ON" "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 2c389c144b1..b9454e64ccf 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -87,7 +87,6 @@ in stdenv.mkDerivation rec { "-DUSE_SYSTEM_LIBARCHIVE=ON" "-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_MKSQUASHFS=ON" - "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" ]; checkInputs = [ gtest ]; From c13a29e398a5edae05f1c5dda2a8b5242b9fd978 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Mar 2019 12:31:24 -0500 Subject: [PATCH 176/238] kmod: 25 -> 26 https://lwn.net/Articles/779249/ --- pkgs/os-specific/linux/kmod/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 8a09d7fea09..09cb4e11b57 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -6,12 +6,12 @@ let modulesDirs = lib.concatMapStringsSep ":" (x: "${x}/lib/modules") systems; in stdenv.mkDerivation rec { - name = "kmod-${version}"; - version = "25"; + pname = "kmod"; + version = "26"; src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "1kgixs4m3jvwk7fb3d18n6j77qhgi9qfv4csj35rs5ancr4ycrbi"; + url = "mirror://kernel/linux/utils/kernel/${pname}/${pname}-${version}.tar.xz"; + sha256 = "17dvrls70nr3b3x1wm8pwbqy4r8a5c20m0dhys8mjhsnpg425fsp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; From 2c7b8769f3525548b3c53b2279a8e3e4a1b87940 Mon Sep 17 00:00:00 2001 From: Ben Hipple Date: Mon, 11 Mar 2019 20:11:12 +0000 Subject: [PATCH 177/238] db: enable parallel building Appears to work without issue and speeds up builds --- pkgs/development/libraries/db/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index c3ca9aa442b..bb501fb9c68 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation (rec { rm -rf $out/docs ''; + enableParallelBuilding = true; + doCheck = true; checkPhase = '' From bcf2250fd2dfcd72ff03f7d22c94537756f9d300 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Mar 2019 09:11:04 -0500 Subject: [PATCH 178/238] plasma-5: 5.15.2 -> 5.15.3 https://kde.org/announcements/plasma-5.15.3.php --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++---------------- 2 files changed, 181 insertions(+), 181 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 510ebf69fff..79c29726cf5 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.15.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 0a0a9015de3..602cfeea2d8 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/bluedevil-5.15.2.tar.xz"; - sha256 = "1d6dq7kgxni7hj5cdfqlb2ff3ddy30a82w80nxfwshzp1xbdljzw"; - name = "bluedevil-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/bluedevil-5.15.3.tar.xz"; + sha256 = "1vdij1ydrwj51nsf3ysmql3wy3y7ayipzrqgxwa52r9n49zckva0"; + name = "bluedevil-5.15.3.tar.xz"; }; }; breeze = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/breeze-5.15.2.tar.xz"; - sha256 = "0m2fpcbi3fsj9a3j3ry7l7f38whm38mpprap86v40m4zcv3wcav8"; - name = "breeze-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/breeze-5.15.3.tar.xz"; + sha256 = "0l7yngc32af7gdi8p68c8267bbzhfvpynqclq3il4fvaxc6vbq2b"; + name = "breeze-5.15.3.tar.xz"; }; }; breeze-grub = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/breeze-grub-5.15.2.tar.xz"; - sha256 = "18rm4h395w8x3yrirl53402qiiz7yc4i3iw5ncmd0184jhl6n7z5"; - name = "breeze-grub-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/breeze-grub-5.15.3.tar.xz"; + sha256 = "0ccx8yfxhc5r3kv7snv80wpz7h5a9l762iz1cx5sfjpmmq2jhi64"; + name = "breeze-grub-5.15.3.tar.xz"; }; }; breeze-gtk = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/breeze-gtk-5.15.2.tar.xz"; - sha256 = "0fbxfsjyxjk9shrjiz5w9x3v5jk3f4csw2rryk7kdk5q1m5ppfjw"; - name = "breeze-gtk-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/breeze-gtk-5.15.3.tar.xz"; + sha256 = "1rg323fyq0q07k00xi63csi0f3bwzi1cbm6srshqih0cnfgq69j4"; + name = "breeze-gtk-5.15.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/breeze-plymouth-5.15.2.tar.xz"; - sha256 = "0n6pr4k9jc3ivi0dhrrfv9xhf0p4irxbpghx3m3b860jwmm5d4zh"; - name = "breeze-plymouth-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/breeze-plymouth-5.15.3.tar.xz"; + sha256 = "0f654kys4xw2c84iblz2q2x53z4mb2javgngb1dr3jkafysr0h37"; + name = "breeze-plymouth-5.15.3.tar.xz"; }; }; discover = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/discover-5.15.2.tar.xz"; - sha256 = "0v9wnsgqxa4vbvgdsgpm54hnw8dsxahapl42vkf0xjfx101f3y62"; - name = "discover-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/discover-5.15.3.tar.xz"; + sha256 = "1b6mc81xr4wl29bjw95jm8k72j3hhn1ps8a5dvzanbslfx31hf1b"; + name = "discover-5.15.3.tar.xz"; }; }; drkonqi = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/drkonqi-5.15.2.tar.xz"; - sha256 = "085dv4ga7gvycs470v594i5j8s55aygalx52fcbbncji8r1x0zdv"; - name = "drkonqi-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/drkonqi-5.15.3.tar.xz"; + sha256 = "0y4bkrv7bx69hm4kbbd2jfjnccj99686s0k5lm4ldv3wvf66k4sx"; + name = "drkonqi-5.15.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kactivitymanagerd-5.15.2.tar.xz"; - sha256 = "1bldpay46gww1m0087bdrl64paw2466mnnr10w3qv1c2g3w4aiky"; - name = "kactivitymanagerd-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kactivitymanagerd-5.15.3.tar.xz"; + sha256 = "1lz3mm0bli2w8xwr3n06ss7qqzm4clvs3d9hfydyf7xq03mszrym"; + name = "kactivitymanagerd-5.15.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kde-cli-tools-5.15.2.tar.xz"; - sha256 = "1b178szx0ansd9srkj1rzqcc1ijfvs92vg870plzqy4ygg94yc32"; - name = "kde-cli-tools-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kde-cli-tools-5.15.3.tar.xz"; + sha256 = "1praysa894m67kwy4xaqh354c0shwfyyrqf4n9wrfwwrchdw6ypg"; + name = "kde-cli-tools-5.15.3.tar.xz"; }; }; kdecoration = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kdecoration-5.15.2.tar.xz"; - sha256 = "1gyy55j0bs1adglqq8wjy284pdp3vm9bj51q7h7q7yz2khk8kc3r"; - name = "kdecoration-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kdecoration-5.15.3.tar.xz"; + sha256 = "1ymp6szphpnfvdnhg8n1wan76z1s5xw68xsmwm21zrjf8lmrwkdh"; + name = "kdecoration-5.15.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kde-gtk-config-5.15.2.tar.xz"; - sha256 = "07ng7nynmfn23zssbawn4xjnj8sqkqsdv1nv29pkhda82bpji5a4"; - name = "kde-gtk-config-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kde-gtk-config-5.15.3.tar.xz"; + sha256 = "1ysw26sfx2wyd79bkknvvcmg5s4b154iyds9c6wp8brmcn6ng3s8"; + name = "kde-gtk-config-5.15.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kdeplasma-addons-5.15.2.tar.xz"; - sha256 = "0c1j9830n5vyqjmyclljkxhgmgyhhzm4ck9zm5cnjf1s5x9hqdly"; - name = "kdeplasma-addons-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kdeplasma-addons-5.15.3.tar.xz"; + sha256 = "071wnwxgywg6bqqgwmjyswai3k0n4c15lq8mspcy92kym3msqkrn"; + name = "kdeplasma-addons-5.15.3.tar.xz"; }; }; kgamma5 = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kgamma5-5.15.2.tar.xz"; - sha256 = "06qp20dnvqg0bcf09iwhwcqbkyz85z27cp811vg72nq6vqpd98sy"; - name = "kgamma5-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kgamma5-5.15.3.tar.xz"; + sha256 = "12cnrnmr2wp14afg6x438gm502514pk61mfr26cypvcd6azpc2my"; + name = "kgamma5-5.15.3.tar.xz"; }; }; khotkeys = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/khotkeys-5.15.2.tar.xz"; - sha256 = "18hjlvvbnid6j77pnr515kglllsidx8dgrx5sbvy9myvsd47wlki"; - name = "khotkeys-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/khotkeys-5.15.3.tar.xz"; + sha256 = "0gnkdl6kki8xph3787bacggapm4vbakj39y9kcjqvqrqxifp1ml5"; + name = "khotkeys-5.15.3.tar.xz"; }; }; kinfocenter = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kinfocenter-5.15.2.tar.xz"; - sha256 = "0wag0md22dvnz897s535qigsimmcis7i9fsngq1hbqz22rx7x5pw"; - name = "kinfocenter-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kinfocenter-5.15.3.tar.xz"; + sha256 = "0rhhrsp0fmgfsmrfv468l4xinyfyghf6921s1581sgg5fk9qhrwr"; + name = "kinfocenter-5.15.3.tar.xz"; }; }; kmenuedit = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kmenuedit-5.15.2.tar.xz"; - sha256 = "1xjnj40m86sdyna9xm5bj0m4mnmqrpkpg9gnhr1naqwqxaahvvyk"; - name = "kmenuedit-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kmenuedit-5.15.3.tar.xz"; + sha256 = "1s7bhpxiapmx496f3y3klmc9i2347fs25yhd2brg92jziw73jpab"; + name = "kmenuedit-5.15.3.tar.xz"; }; }; kscreen = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kscreen-5.15.2.tar.xz"; - sha256 = "1vzp98cjhpbp565rfa1id1pcyir4hagmrz020jjn0gb2dfk6wrsv"; - name = "kscreen-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kscreen-5.15.3.tar.xz"; + sha256 = "1izq1anl0r9ysmsdnc2ny7cx73xc190qbad59nrnlqcxrsplb68f"; + name = "kscreen-5.15.3.tar.xz"; }; }; kscreenlocker = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kscreenlocker-5.15.2.tar.xz"; - sha256 = "09b3zb95psg3gwg1lcnqsrw6llg7bdlq97zsg373gs4ljlmdgwms"; - name = "kscreenlocker-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kscreenlocker-5.15.3.tar.xz"; + sha256 = "0bglpgibrc8l6yi24pj4kja33mc02clgi1vbdvw1qpp65ixhpzna"; + name = "kscreenlocker-5.15.3.tar.xz"; }; }; ksshaskpass = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/ksshaskpass-5.15.2.tar.xz"; - sha256 = "1nf8s8vdgbak8sys9fw53xfcjpy1hnq1jjyxfyw22fhz2qnx4a7p"; - name = "ksshaskpass-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/ksshaskpass-5.15.3.tar.xz"; + sha256 = "1zrjc74srb4jp8sw6pi0ik2i4yxffvgv037d50yk1fif1xyvnf9s"; + name = "ksshaskpass-5.15.3.tar.xz"; }; }; ksysguard = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/ksysguard-5.15.2.tar.xz"; - sha256 = "1n38kc9m7jkimxrh0lqff9zz82jap0qv69l3490zsl70pgbhgwdn"; - name = "ksysguard-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/ksysguard-5.15.3.tar.xz"; + sha256 = "1nxgadymq45yn92cs08gfmv5krc2ylwgbn5qcc2aq6ryrrhrw89q"; + name = "ksysguard-5.15.3.tar.xz"; }; }; kwallet-pam = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kwallet-pam-5.15.2.tar.xz"; - sha256 = "12hjg6cwgh4h85hfyw3mdpci9p6s6h6z7i6s2hhnsvfr2zm6nq6z"; - name = "kwallet-pam-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwallet-pam-5.15.3.tar.xz"; + sha256 = "1w3vf92k3k2084cflv4fwav16czc4vqg62gi8x1alri38ziyb793"; + name = "kwallet-pam-5.15.3.tar.xz"; }; }; kwayland-integration = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kwayland-integration-5.15.2.tar.xz"; - sha256 = "1j076lmkgm1m1ymrpkmzh7yq4sk8qv12ggrczb9ri2gimklghmav"; - name = "kwayland-integration-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwayland-integration-5.15.3.tar.xz"; + sha256 = "0grb9fnk7pfgwzj3c9d11zl1j9jy9k6d4pw2n2fdrs02g3yg603h"; + name = "kwayland-integration-5.15.3.tar.xz"; }; }; kwin = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kwin-5.15.2.tar.xz"; - sha256 = "112xysqgffw718272praaym86kbbq01rwjf9w1sv3b8i1lbrfjfy"; - name = "kwin-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.tar.xz"; + sha256 = "1zfjf0jf77r3knlznzcpi73wbsfvixfr3m2b8vbracmjm0s7v0gn"; + name = "kwin-5.15.3.tar.xz"; }; }; kwrited = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/kwrited-5.15.2.tar.xz"; - sha256 = "0inm1ry62p23ivad0k3p5cwk8hwirrk7incpx8znd755pr5905hy"; - name = "kwrited-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwrited-5.15.3.tar.xz"; + sha256 = "0xhdmnfkpr35sks7k66s5cbq220yrmbn8ixcsdqwsgpji2sx4g7v"; + name = "kwrited-5.15.3.tar.xz"; }; }; libkscreen = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/libkscreen-5.15.2.tar.xz"; - sha256 = "051carpksbh3n25cvd6i504jjjzmqzh0dj9p5chqmyfcp7m0lvm4"; - name = "libkscreen-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/libkscreen-5.15.3.tar.xz"; + sha256 = "0fzfk8ga5qinsmag61l29cf92r7qm4nlb8hrhddyff7d7c7kr3vj"; + name = "libkscreen-5.15.3.tar.xz"; }; }; libksysguard = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/libksysguard-5.15.2.tar.xz"; - sha256 = "058yajija7d7zvyv9vfyxbmj2y5amrv96mkbypqcdmzx69x5ig4c"; - name = "libksysguard-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/libksysguard-5.15.3.tar.xz"; + sha256 = "05cfb51xcmxb8k2k14n2i5ysj47aism9yq7lk2rw216bsdp2mqnj"; + name = "libksysguard-5.15.3.tar.xz"; }; }; milou = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/milou-5.15.2.tar.xz"; - sha256 = "0y7dbjhwbk7gnjpxsn2rddp3i3a02hfwiyx9070lm6am3lvlj8r8"; - name = "milou-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/milou-5.15.3.tar.xz"; + sha256 = "1prq9mdrysz8ckf7n6sjfn3qc87135nj69v2jcayn9irb0k8wz01"; + name = "milou-5.15.3.tar.xz"; }; }; oxygen = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/oxygen-5.15.2.tar.xz"; - sha256 = "1vrcdj61ii391swqxjbsfccmv854vg8zsbvjxb78a6fp6k11wivj"; - name = "oxygen-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/oxygen-5.15.3.tar.xz"; + sha256 = "0a069imvw0khkbcih8zvx0i0ks99jkwis6p73n4846qz544f3dvb"; + name = "oxygen-5.15.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-browser-integration-5.15.2.tar.xz"; - sha256 = "00mp7wwk0jz7wrkii5yq58amsw54dyjcprp3w58phvydam2d3n79"; - name = "plasma-browser-integration-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-browser-integration-5.15.3.tar.xz"; + sha256 = "1mhaa5z63gyd8j7zplmyicnibqsv1xhd9mxip6clhj5bfk8q9jar"; + name = "plasma-browser-integration-5.15.3.tar.xz"; }; }; plasma-desktop = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-desktop-5.15.2.tar.xz"; - sha256 = "1axlkjmgf3chg9wl13j91vmfik0va8lngq45y0xr15lc88w6qms0"; - name = "plasma-desktop-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.tar.xz"; + sha256 = "1k1xx9kwrwzy440748xf9xfkldyyrqk5mld1pzabgzfivsxssbrg"; + name = "plasma-desktop-5.15.3.tar.xz"; }; }; plasma-integration = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-integration-5.15.2.tar.xz"; - sha256 = "0glj6gsah96xbgcdijqjfpn7dj0yh05dvpvjhk6wmrb30z63hykx"; - name = "plasma-integration-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-integration-5.15.3.tar.xz"; + sha256 = "08qw2ibl0j2nhsplc3b117vdc00bd2gn1q48nx0xy349bf64m735"; + name = "plasma-integration-5.15.3.tar.xz"; }; }; plasma-nm = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-nm-5.15.2.tar.xz"; - sha256 = "12fahsqs54k8b5g9ipzisvaq1lmmgmyh3xbdixn1bxqdfdc50jax"; - name = "plasma-nm-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-nm-5.15.3.tar.xz"; + sha256 = "1l9wh4hs2v0b9hdagcgl67z0w4amffakxczwy0nwymqzv0mxgqvz"; + name = "plasma-nm-5.15.3.tar.xz"; }; }; plasma-pa = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-pa-5.15.2.tar.xz"; - sha256 = "1cw3c84spl2y6fzp0mn986xl7j60z28acga95x5zr2xiaig1p1q3"; - name = "plasma-pa-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-pa-5.15.3.tar.xz"; + sha256 = "1lkhidd5b4mjn23mxcp2vfmxf7dwbk7y14svc4wy6xc1xg1pc125"; + name = "plasma-pa-5.15.3.tar.xz"; }; }; plasma-sdk = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-sdk-5.15.2.tar.xz"; - sha256 = "0kq5h2zfg1f11cmfzmsn4vlfvj1jfkz1pnc67zgs7f70bap4k8zr"; - name = "plasma-sdk-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-sdk-5.15.3.tar.xz"; + sha256 = "1qzh0yy4zql7a50ql9ghhvlfxjnbckflbgbzdyd7i9x3ml7s5saw"; + name = "plasma-sdk-5.15.3.tar.xz"; }; }; plasma-tests = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-tests-5.15.2.tar.xz"; - sha256 = "1bsplrmvw73lsdiqwiznbxicyl36vf30mm34bfib8ii0rpx4cn2i"; - name = "plasma-tests-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-tests-5.15.3.tar.xz"; + sha256 = "1z5vhw1dy1qks6w161yamn2fawrgkggv9mvvgpmljmy07qpafgkg"; + name = "plasma-tests-5.15.3.tar.xz"; }; }; plasma-vault = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-vault-5.15.2.tar.xz"; - sha256 = "0gmch0s9vy72qbxk0bshxd2hmx6dwdad0pk29glpq7l3av3nirlp"; - name = "plasma-vault-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-vault-5.15.3.tar.xz"; + sha256 = "1my9dnqz11frn07fk505pfi2nkf2d642jfgjklh5zfngjxy589jy"; + name = "plasma-vault-5.15.3.tar.xz"; }; }; plasma-workspace = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-workspace-5.15.2.tar.xz"; - sha256 = "1ncd0mc3y8j3r8m9hrq3b07lmcccq7xz76b19rilba1a7qyd03az"; - name = "plasma-workspace-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-5.15.3.tar.xz"; + sha256 = "08irdg8divr45z53kr6b1mv4s2jakmq3r79g7df6ja9rb6py5f59"; + name = "plasma-workspace-5.15.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plasma-workspace-wallpapers-5.15.2.tar.xz"; - sha256 = "00c19b3clgcjcvafmiwb2mdkkzcq8dvwpaqaajr54c3xn9fa5vss"; - name = "plasma-workspace-wallpapers-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-wallpapers-5.15.3.tar.xz"; + sha256 = "0xgssv66ksljv8xkj20v2x1bppkyn8z17wa3hynwlcqxh2g4afq4"; + name = "plasma-workspace-wallpapers-5.15.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/plymouth-kcm-5.15.2.tar.xz"; - sha256 = "1bkrkym2kjj7knhqzzcd6qhd1nmzvwah45hqvvnaja8kd82vjlzi"; - name = "plymouth-kcm-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plymouth-kcm-5.15.3.tar.xz"; + sha256 = "0fbr9nf263pc9inakhp901r58mlsm1jgw0xqp9fj08c9lj25z190"; + name = "plymouth-kcm-5.15.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.15.2"; + version = "1-5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/polkit-kde-agent-1-5.15.2.tar.xz"; - sha256 = "1i0hf77ms0k3q4r4cmfjcv2jnml5cig15biwfkh3jyafz8q8miha"; - name = "polkit-kde-agent-1-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/polkit-kde-agent-1-5.15.3.tar.xz"; + sha256 = "07gl57h9zmagbw7v2sfksbcbqrfdhr8isfmpcw10rc4k2awlsysy"; + name = "polkit-kde-agent-1-5.15.3.tar.xz"; }; }; powerdevil = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/powerdevil-5.15.2.tar.xz"; - sha256 = "0gl5wh8s7bmjprbv9gph83qhviv87pmdadrlrnbm5n1nwb1h7kd9"; - name = "powerdevil-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/powerdevil-5.15.3.tar.xz"; + sha256 = "1f7ik3lh30irqzf0pgy59kkrsn4fkl8xwam1bikfm34bwzrsxb14"; + name = "powerdevil-5.15.3.tar.xz"; }; }; sddm-kcm = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/sddm-kcm-5.15.2.tar.xz"; - sha256 = "1l8ma0kpqq7hcg4addm2c47w33dc12q8inii0aw4yq0syhqgzq9s"; - name = "sddm-kcm-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/sddm-kcm-5.15.3.tar.xz"; + sha256 = "1mvp8p1k9csmn6h6iyk29yj1j4b4dfyd6j4v0v2ha1vdfjwjlsh2"; + name = "sddm-kcm-5.15.3.tar.xz"; }; }; systemsettings = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/systemsettings-5.15.2.tar.xz"; - sha256 = "0rx3av1by04551y88y5f1lm1rvvxkxqjdjw04fjdnpx7qipv0l6l"; - name = "systemsettings-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.tar.xz"; + sha256 = "0qa0qz6286byjky4f0nx1y9raa8d56lfryyvfnx3fdzz9xypvwxj"; + name = "systemsettings-5.15.3.tar.xz"; }; }; user-manager = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/user-manager-5.15.2.tar.xz"; - sha256 = "09xlnzdsk94p95s1zms8li0q0pv8z66hkla8ns27im21rrnrz6l0"; - name = "user-manager-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/user-manager-5.15.3.tar.xz"; + sha256 = "18acg3xjcdhcwk3irsf1hgkwma9mn6msl6qwmf0slz1lydlrljs4"; + name = "user-manager-5.15.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.15.2"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.2/xdg-desktop-portal-kde-5.15.2.tar.xz"; - sha256 = "1zzy01lgznc7z3hz9yhbspx3zg8lala7zzcsxsly4jwx4666ixp4"; - name = "xdg-desktop-portal-kde-5.15.2.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/xdg-desktop-portal-kde-5.15.3.tar.xz"; + sha256 = "10cmy4j54nkwrgibxdpx6d30g596ikvb1dqqmp1gvmzr570gmbi7"; + name = "xdg-desktop-portal-kde-5.15.3.tar.xz"; }; }; } From f58c599bcb02baa2365cd67c99c70216e043f1fd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Mar 2019 15:41:46 -0500 Subject: [PATCH 179/238] nghttp2: 1.36.0 -> 1.37.0 https://nghttp2.org/blog/2019/03/08/nghttp2-v1-37-0/ --- pkgs/development/libraries/nghttp2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 971c70c4f2c..277ef7923e6 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -17,12 +17,12 @@ assert enableJemalloc -> jemalloc != null; let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "nghttp2-${version}"; - version = "1.36.0"; + pname = "nghttp2"; + version = "1.37.0"; src = fetchurl { - url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "1sqwwwhlrbp3wcikf9v07k5j4xvflwy297lq4cg92qj087bk99qn"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; + sha256 = "1bi3aw096kd51abazvv6ilplz6gjbm84yr3mzxklbhysv38y6xl2"; }; outputs = [ "bin" "out" "dev" "lib" ]; From bf072fcfb18dfa81f853b4adc96e6c45694230e9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Mar 2019 15:49:12 -0500 Subject: [PATCH 180/238] gtk3: 3.24.5 -> 3.24.7 http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.24/gtk+-3.24.6.news http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.24/gtk+-3.24.7.news Export symbols patch "actually" seems to no longer be required, drop it. --- pkgs/development/libraries/gtk+/3.x.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 19abca1cabb..1a01c28aeb4 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,14 +13,14 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.5"; + version = "3.24.7"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b"; + sha256 = "080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj"; }; outputs = [ "out" "dev" ]; @@ -35,18 +35,6 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - (fetchpatch { - name = "fix-fribidi-linking.patch"; - url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch; - sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr"; - }) - (fetchpatch { - # https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged - # but isn't in 3.24.5 - name = "export-missing-symbols.patch"; - url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch; - sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl"; - }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it From ffb2be15f107b0effab0963d0b05a8332ea2d263 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 12 Mar 2019 18:53:38 -0500 Subject: [PATCH 181/238] plasma5: grab the 5.15.3.1 updates (3 of them) https://mail.kde.org/pipermail/kde-announce/2019-March/000021.html --- pkgs/desktops/plasma-5/srcs.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 602cfeea2d8..fd8a9fb7632 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -179,11 +179,11 @@ }; }; kwin = { - version = "5.15.3"; + version = "5.15.3.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.tar.xz"; - sha256 = "1zfjf0jf77r3knlznzcpi73wbsfvixfr3m2b8vbracmjm0s7v0gn"; - name = "kwin-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.1.tar.xz"; + sha256 = "0v7qmbwn7j7la10g7cy4hmqdh5wahnv203xrbklfb158p73pn5yr"; + name = "kwin-5.15.3.1.tar.xz"; }; }; kwrited = { @@ -235,11 +235,11 @@ }; }; plasma-desktop = { - version = "5.15.3"; + version = "5.15.3.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.tar.xz"; - sha256 = "1k1xx9kwrwzy440748xf9xfkldyyrqk5mld1pzabgzfivsxssbrg"; - name = "plasma-desktop-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.1.tar.xz"; + sha256 = "0mrn729zcwx8k6xqkaxrs80kmd263h2n12gyy1f7lik3gydpcwk9"; + name = "plasma-desktop-5.15.3.1.tar.xz"; }; }; plasma-integration = { @@ -339,11 +339,11 @@ }; }; systemsettings = { - version = "5.15.3"; + version = "5.15.3.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.tar.xz"; - sha256 = "0qa0qz6286byjky4f0nx1y9raa8d56lfryyvfnx3fdzz9xypvwxj"; - name = "systemsettings-5.15.3.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.1.tar.xz"; + sha256 = "1ll5mkil5f8byi6zc55ars4sw720fkcd1jckfa19jqa2axmjfkn5"; + name = "systemsettings-5.15.3.1.tar.xz"; }; }; user-manager = { From b23fd8f680b1e2dd749660a9c3af55e328396755 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 13 Mar 2019 10:57:08 -0500 Subject: [PATCH 182/238] plasma5: 5.15.3.2 fixups --- pkgs/desktops/plasma-5/srcs.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index fd8a9fb7632..cfafc4d1321 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -179,11 +179,11 @@ }; }; kwin = { - version = "5.15.3.1"; + version = "5.15.3.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.1.tar.xz"; - sha256 = "0v7qmbwn7j7la10g7cy4hmqdh5wahnv203xrbklfb158p73pn5yr"; - name = "kwin-5.15.3.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.2.tar.xz"; + sha256 = "0iri6993zsxmrm7qnf76py7ihc27x9y741ar7g9fry8c8knmqyrw"; + name = "kwin-5.15.3.2.tar.xz"; }; }; kwrited = { @@ -235,11 +235,11 @@ }; }; plasma-desktop = { - version = "5.15.3.1"; + version = "5.15.3.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.1.tar.xz"; - sha256 = "0mrn729zcwx8k6xqkaxrs80kmd263h2n12gyy1f7lik3gydpcwk9"; - name = "plasma-desktop-5.15.3.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.2.tar.xz"; + sha256 = "12pz0bin3j2f98k88nwmb271lr6v6w3l28li0iri2x8pk144vr91"; + name = "plasma-desktop-5.15.3.2.tar.xz"; }; }; plasma-integration = { @@ -339,11 +339,11 @@ }; }; systemsettings = { - version = "5.15.3.1"; + version = "5.15.3.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.1.tar.xz"; - sha256 = "1ll5mkil5f8byi6zc55ars4sw720fkcd1jckfa19jqa2axmjfkn5"; - name = "systemsettings-5.15.3.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.2.tar.xz"; + sha256 = "0bqhff2s2qyz1x8nhrphnkyja0mhr7msf58cwdkscsl6lyamn2a2"; + name = "systemsettings-5.15.3.2.tar.xz"; }; }; user-manager = { From 2092c75413108c02cbfa62671b76f95c03566fa1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 13 Mar 2019 15:46:14 -0500 Subject: [PATCH 183/238] kdeFrameworks: update kirigami2 and plasma-framework to 5.56.1 They're special and get point releases, apparently :) --- .../libraries/kde-frameworks/srcs.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 14db306012e..80431100b1c 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -323,11 +323,11 @@ }; }; kirigami2 = { - version = "5.56.0"; + version = "5.56.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.56/kirigami2-5.56.0.tar.xz"; - sha256 = "0pbyr50anbzrqmw1rzf46dck9gsrfs7zxw5jlcax98bpsajix87y"; - name = "kirigami2-5.56.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kirigami2-5.56.1.tar.xz"; + sha256 = "0npq65kslwkdsylmv5hgcqsa5i9386dmnx8ig79rlf3409awn2f8"; + name = "kirigami2-5.56.1.tar.xz"; }; }; kitemmodels = { @@ -563,11 +563,11 @@ }; }; plasma-framework = { - version = "5.56.0"; + version = "5.56.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.56/plasma-framework-5.56.0.tar.xz"; - sha256 = "0hw90975c00v5v4xhs18w5gnklwhnygk6jls3n132xflilgc5k0a"; - name = "plasma-framework-5.56.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/plasma-framework-5.56.1.tar.xz"; + sha256 = "0wn7q2cfrgzcprzgqj1d4calc0mmrrn615698fish7x9s1n7ag6w"; + name = "plasma-framework-5.56.1.tar.xz"; }; }; prison = { From 0ea220b9bde0a8c1090f729a56517780980aac92 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Mar 2019 22:51:11 +0100 Subject: [PATCH 184/238] =?UTF-8?q?wrapGAppsHook:=20add=20package=E2=80=99?= =?UTF-8?q?s=20own=20modules=20to=20GIO=5FEXTRA=5FMODULES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a package provides both executables and gio modules, it is quite probable the executables will need those modules. wrapGAppsHook wraps executables with GIO_EXTRA_MODULES picked up from dependencies but forgets about the package being built. Let’s add to consideration. Closes: https://github.com/NixOS/nixpkgs/issues/50254 --- pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index b5ceb4a13d8..906b1db9d10 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -30,6 +30,10 @@ wrapGAppsHook() { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share") fi + if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then + gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules") + fi + for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do eval local dummy="\$$v" gappsWrapperArgs+=(--prefix $v : "$dummy") From 10a84188ff3b7638c6378edc076f9cf4a715f4f2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 14 Mar 2019 10:42:23 -0500 Subject: [PATCH 185/238] e2fsprogs: use buildPackages.perl to avoid cycle in llvm-based stdenv --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 15346dcc30e..e601a12e6e6 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: +{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { pname = "e2fsprogs"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "--enable-libuuid --disable-e2initrd-helper" ]; - checkInputs = [ perl ]; + checkInputs = [ buildPackages.perl ]; doCheck = true; postInstall = '' From 862ea070aa9091c96c5755aeef59680ea8c231f4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 14 Mar 2019 16:22:27 -0500 Subject: [PATCH 186/238] libseccomp: 2.3.3 -> 2.4.0 https://github.com/seccomp/libseccomp/releases/tag/v2.4.0 --- pkgs/development/libraries/libseccomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 1f188f98f03..0571cc5b3ac 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz"; + sha256 = "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f"; }; outputs = [ "out" "lib" "dev" "man" ]; From 96e93d6fa0d5c2a1fdb269e705c5f1791c3ebb3d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 15 Mar 2019 11:57:32 +0100 Subject: [PATCH 187/238] japser: 2.0.14 -> 2.0.16 --- pkgs/development/libraries/jasper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index eb928227432..946bc17e764 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jasper-${version}"; - version = "2.0.14"; + version = "2.0.16"; src = fetchFromGitHub { repo = "jasper"; owner = "mdadams"; rev = "version-${version}"; - sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f"; + sha256 = "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6"; }; patches = [ From dd48bd53cf458e0cffec28f7ef3ab763cb22b6e7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 15 Mar 2019 07:58:29 -0500 Subject: [PATCH 188/238] freetype2: 2.9.1 -> 2.10.0 http://lists.nongnu.org/archive/html/freetype-announce/2019-03/msg00000.html --- pkgs/development/libraries/freetype/default.nix | 8 ++++---- .../freetype/enable-subpixel-rendering.patch | 17 ++++++++--------- .../freetype/enable-table-validation.patch | 12 +++++------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 76df9514cf4..4658ac049df 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -13,8 +13,8 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "freetype-${version}"; - version = "2.9.1"; + pname = "freetype"; + version = "2.10.0"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype diff --git a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch index 4f908343e8c..6b3577eb4f0 100644 --- a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch +++ b/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch @@ -1,13 +1,12 @@ -Index: freetype-2.7.1/include/freetype/config/ftoption.h -=================================================================== ---- freetype-2.7.1.orig/include/freetype/config/ftoption.h -+++ freetype-2.7.1/include/freetype/config/ftoption.h -@@ -122,7 +122,7 @@ FT_BEGIN_HEADER - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ +Index: freetype-2.10.0/include/freetype/config/ftoption.h +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -126,7 +126,7 @@ FT_BEGIN_HEADER + * macro is not defined, FreeType offers alternative LCD rendering + * technology that produces excellent output without LCD filtering. + */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - /*************************************************************************/ + /************************************************************************** diff --git a/pkgs/development/libraries/freetype/enable-table-validation.patch b/pkgs/development/libraries/freetype/enable-table-validation.patch index 37419f14f40..bd964c3342d 100644 --- a/pkgs/development/libraries/freetype/enable-table-validation.patch +++ b/pkgs/development/libraries/freetype/enable-table-validation.patch @@ -1,20 +1,18 @@ -Index: freetype-2.7.1/modules.cfg +Index: freetype-2.10.0/modules.cfg =================================================================== ---- freetype-2.7.1.orig/modules.cfg -+++ freetype-2.7.1/modules.cfg -@@ -120,7 +120,7 @@ AUX_MODULES += cache +--- freetype-2.10.0.orig/modules.cfg ++++ freetype-2.10.0/modules.cfg +@@ -120,6 +120,6 @@ AUX_MODULES += cache # TrueType GX/AAT table validation. Needs ftgxval.c below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += gxvalid +AUX_MODULES += gxvalid # Support for streams compressed with gzip (files with suffix .gz). # -@@ -143,7 +143,7 @@ AUX_MODULES += bzip2 +@@ -143,6 +143,6 @@ AUX_MODULES += bzip2 # OpenType table validation. Needs ftotval.c below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += otvalid +AUX_MODULES += otvalid From 680012bd220e3321aa6b9426f4ca957f5b1723cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Mar 2019 10:23:44 -0700 Subject: [PATCH 189/238] atk: 2.30.0 -> 2.32.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/atk/versions --- pkgs/development/libraries/atk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index b56c84f57bd..0a076442b42 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -4,7 +4,7 @@ let pname = "atk"; - version = "2.30.0"; + version = "2.32.0"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0yq25iisnf0rmlg2x5ghzqk9vhf2jramb2khxqghqakz47a90kfx"; + sha256 = "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb"; }; outputs = [ "out" "dev" ]; From 005c3cffc15c1f15bb72d9bef25002f8027ca1c8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Mar 2019 07:20:27 -0400 Subject: [PATCH 190/238] libmbim: 1.16.2 -> 1.18.0 --- .../development/libraries/libmbim/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 17632c678c4..021cfbb1bb4 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,24 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: +{ stdenv, fetchurl, pkgconfig, glib, python3, systemd, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.16.2"; + pname = "libmbim"; + version = "1.18.0"; src = fetchurl { - url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb"; + url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; + sha256 = "10mjjy860aakfd3h1yaj9l1jw816amrpwmyqlx37j21xv0l03x3c"; }; outputs = [ "out" "dev" "man" ]; - preConfigure = '' - patchShebangs . - ''; + configureFlags = [ + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib udev libgudev python ]; + nativeBuildInputs = [ + pkgconfig + python3 + ]; + + buildInputs = [ + glib + libgudev + systemd + ]; + + doCheck = true; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/software/libmbim/; + homepage = https://www.freedesktop.org/wiki/Software/libmbim/; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; license = licenses.gpl2; From fd5c74c25c7cf7f1ac0a898c95940db3e29c7f2e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Mar 2019 07:28:12 -0400 Subject: [PATCH 191/238] libqmi: 1.20.2 -> 1.22.2 Drop --enable-mbim-qmux because we have libmbim >= 1.14.0 [0] [0]: https://gitlab.freedesktop.org/mobile-broadband/libqmi/blob/1.16.0/NEWS#L5 --- pkgs/development/libraries/libqmi/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 99383fe6450..083b5c8bc85 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,26 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }: +{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }: stdenv.mkDerivation rec { - name = "libqmi-1.20.2"; + pname = "libqmi"; + version = "1.22.2"; src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67"; + url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; + sha256 = "09w20dsgr16bgbqw5ds7r6j2s6ihwyalh9zpbjhcn7cvm0afbwgi"; }; outputs = [ "out" "dev" "devdoc" ]; - preBuild = '' - patchShebangs . - ''; + configureFlags = [ + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib python libgudev libmbim ]; + nativeBuildInputs = [ + pkgconfig + python3 + ]; - configureFlags = ["--enable-mbim-qmux" ]; + buildInputs = [ + glib + libgudev + libmbim + ]; + + doCheck = true; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/libqmi/; + homepage = https://www.freedesktop.org/wiki/Software/libqmi/; description = "Modem protocol helper library"; platforms = platforms.linux; license = licenses.gpl2; From cb962e829cc91b3ad04c837cd4a4e71b4713475e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Mar 2019 13:15:24 -0400 Subject: [PATCH 192/238] modemmanager: 1.7.990 -> 1.10.0 * Add flags for systemd [0] * Enable tests Though I actually didn't look to see how they're performed, only effort done was to get a success- ful build. * Enable vala bindings [0]: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/blob/1.8.0/NEWS#L21 --- .../networking/modem-manager/default.nix | 42 +++++++------------ 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 15ec2ef41cd..cb63b2be152 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,52 +1,40 @@ { stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig -, libmbim, libqmi, systemd, fetchpatch }: +, libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: stdenv.mkDerivation rec { - name = "modem-manager-${version}"; - version = "1.7.990"; + pname = "modem-manager"; + version = "1.10.0"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; + sha256 = "1qkfnxqvaraz1npahqvm5xc73mbxxic8msnsjmlwkni5c2ckj3zx"; }; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; - patches = [ - # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt) - (fetchpatch { - url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609"; - sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j"; - }) - ]; - configureFlags = [ "--with-polkit" - "--with-udev-base-dir=$(out)/lib/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d" + "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" "--sysconfdir=/etc" "--localstatedir=/var" - "--with-suspend-resume=systemd" + "--with-systemd-suspend-resume" + "--with-systemd-journal" ]; - installFlags = [ "DESTDIR=\${out}" ]; - - preInstall = '' - mkdir -p $out/etc/systemd/system + preCheck = '' + export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" ''; + doCheck = true; + postInstall = '' # rename to modem-manager to be in style - mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service - rm -rf $out/$out/etc - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done + mv $out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. From 542908cc354f7e8c68bb83083471182ad259cf4c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 16 Mar 2019 21:01:26 -0500 Subject: [PATCH 193/238] xorg: batch of updates, bump luit Announcements with details of changes can be found on the mailing list, and since IIRC these are all from this month they all are listed here: https://lists.x.org/archives/xorg-announce/2019-March/thread.html ----- Grab luit from mirror because our fetcher's default behavior doesn't get along with invisible-island's FTP server apparently (?). Or perhaps server is problematic, not sure. Example URL: ftp://ftp.invisible-island.net/luit/luit-20190106.tgz * Using curl or wget: "Server denied you to change to the given directory" (or so) * Using curl with `--ftp-mode nocwd`: success curl's manpage suggests this is less-compliant behavior used for speed, offering a third option that's more likely to work but not quite as fast. So it seems like the more compliant behavior is rejected but the fast behavior is accepted. Dunno, hopefully it'll be on a content-addressed server soon enough so it doesn't matter as much :). Hash used here matches manually-fetched from official URL as well as from the mirror. --- pkgs/servers/x11/xorg/default.nix | 130 ++++++++++++++-------------- pkgs/servers/x11/xorg/tarballs.list | 42 ++++----- 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d51b4eeb427..71d50495034 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -625,11 +625,11 @@ lib.makeScope newScope (self: with self; { }) {}; imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "imake-1.0.7"; + name = "imake-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; - sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; + url = mirror://xorg/individual/util/imake-1.0.8.tar.bz2; + sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -651,11 +651,11 @@ lib.makeScope newScope (self: with self; { }) {}; libFS = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libFS-1.0.7"; + name = "libFS-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2; - sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"; + url = mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2; + sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -768,11 +768,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXcomposite-0.4.4"; + name = "libXcomposite-0.4.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2; - sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"; + url = mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2; + sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -781,11 +781,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { - name = "libXcursor-1.1.15"; + name = "libXcursor-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2; - sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9"; + url = mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2; + sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -794,11 +794,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXdamage-1.1.4"; + name = "libXdamage-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2; - sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw"; + url = mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2; + sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -807,11 +807,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXdmcp-1.1.2"; + name = "libXdmcp-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2; - sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1"; + url = mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2; + sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -820,11 +820,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "libXext-1.3.3"; + name = "libXext-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; - sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; + url = mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2; + sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -872,11 +872,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { - name = "libXft-2.3.2"; + name = "libXft-2.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2; - sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm"; + url = mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2; + sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -911,11 +911,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { - name = "libXmu-1.1.2"; + name = "libXmu-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2; - sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm"; + url = mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2; + sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -963,11 +963,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { - name = "libXrandr-1.5.1"; + name = "libXrandr-1.5.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2; - sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z"; + url = mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2; + sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1041,11 +1041,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { - name = "libXvMC-1.0.10"; + name = "libXvMC-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2; - sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"; + url = mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2; + sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86dga-1.1.4"; + name = "libXxf86dga-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; - sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; + url = mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2; + sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; { }) {}; libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libxkbfile-1.0.9"; + name = "libxkbfile-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2; - sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"; + url = mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2; + sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1210,11 +1210,11 @@ lib.makeScope newScope (self: with self; { }) {}; luit = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "luit-20181211"; + name = "luit-20190106"; builder = ./builder.sh; src = fetchurl { - url = ftp://ftp.invisible-island.net/luit/luit-20181211.tgz; - sha256 = "18mf3savxjs29hf4xhhc5h278qy0bbj9ddssx44w0bnlg107jhp1"; + url = https://invisible-mirror.net/archives/luit/luit-20190106.tgz; + sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1223,11 +1223,11 @@ lib.makeScope newScope (self: with self; { }) {}; makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "makedepend-1.0.5"; + name = "makedepend-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2; - sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"; + url = mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2; + sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1249,11 +1249,11 @@ lib.makeScope newScope (self: with self; { }) {}; mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { - name = "mkfontscale-1.1.3"; + name = "mkfontscale-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2; - sha256 = "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y"; + url = mirror://xorg/individual/app/mkfontscale-1.2.0.tar.bz2; + sha256 = "1gn423m0v1w98df7ni74zrj2rkhsapnqfzr8139l638kkyz7far8"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1366,11 +1366,11 @@ lib.makeScope newScope (self: with self; { }) {}; x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { - name = "x11perf-1.6.0"; + name = "x11perf-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2; - sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"; + url = mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2; + sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1782,11 +1782,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-amdgpu-18.1.0"; + name = "xf86-video-amdgpu-19.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2; - sha256 = "0wlnb929l3yqj4hdkzyxyhbaph13ac4villajgmbh66pa6xja7z1"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.0.tar.bz2; + sha256 = "0lag9jxd752ja7m7ngz3dmqffb5wbx4crdwjw74qx42m8xyi8dl8"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1833,16 +1833,16 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ati-18.0.1"; + xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-ati-19.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2; - sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj"; + url = mirror://xorg/individual/driver/xf86-video-ati-19.0.0.tar.bz2; + sha256 = "0mzl7yp3qkvankh22758sgpaw9mg6jxsfbg6wy0nxfw4i0qpv46x"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; + buildInputs = [ xorgproto mesa_noglu libGL libdrm udev libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2705,11 +2705,11 @@ lib.makeScope newScope (self: with self; { }) {}; xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xprop-1.2.3"; + name = "xprop-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xprop-1.2.3.tar.bz2; - sha256 = "06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj"; + url = mirror://xorg/individual/app/xprop-1.2.4.tar.bz2; + sha256 = "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2809,11 +2809,11 @@ lib.makeScope newScope (self: with self; { }) {}; xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xtrans-1.3.5"; + name = "xtrans-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2; - sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd"; + url = mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2; + sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 854063dd307..60d4b567856 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,4 +1,4 @@ -ftp://ftp.invisible-island.net/luit/luit-20181211.tgz +https://invisible-mirror.net/archives/luit/luit-20190106.tgz https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 @@ -18,7 +18,7 @@ mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/listres-1.0.4.tar.bz2 mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2 +mirror://xorg/individual/app/mkfontscale-1.2.0.tar.bz2 mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 @@ -26,7 +26,7 @@ mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/transset-1.0.2.tar.bz2 mirror://xorg/individual/app/twm-1.0.10.tar.bz2 mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 -mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 +mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2 @@ -61,7 +61,7 @@ mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 -mirror://xorg/individual/app/xprop-1.2.3.tar.bz2 +mirror://xorg/individual/app/xprop-1.2.4.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 @@ -87,11 +87,11 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-19.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 @@ -171,7 +171,7 @@ mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 +mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 @@ -180,23 +180,23 @@ mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 -mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 -mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2 -mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 -mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 +mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2 +mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2 +mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2 +mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2 -mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 +mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 +mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2 mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 -mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 +mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2 @@ -204,16 +204,16 @@ mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 -mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2 -mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 +mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2 +mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 -mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2 +mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2 mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 -mirror://xorg/individual/util/imake-1.0.7.tar.bz2 +mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 -mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 +mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2 From 49551b6febb1234257753860da75f670efaee545 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 17 Mar 2019 08:28:56 -0400 Subject: [PATCH 194/238] llvm: mark as big-parallel Big parallel jobs get many more (45) aarch64 cores than standard builds. --- pkgs/development/compilers/llvm/5/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 9e181a1202b..41dc20ec4fe 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -131,6 +131,7 @@ in stdenv.mkDerivation (rec { passthru.src = src; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; From a92396afdc66931275aeca989586bbaf49fa0c37 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 13 Mar 2019 23:14:52 -0400 Subject: [PATCH 195/238] vala_0_36: 0.36.17 -> 0.36.18 https://gitlab.gnome.org/GNOME/vala/raw/0.36.18/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index d94437b6a16..947c3be0eb7 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -95,8 +95,8 @@ let in rec { vala_0_36 = generic { major = "0.36"; - minor = "17"; - sha256 = "1f6qg40zd6jzhbwr3dy4fb66k4qs1xlk2whdyqh64zxxjw0k9pv7"; + minor = "18"; + sha256 = "0csb9skgy663y05kl813dsarzjbfcdsmx5fvz13p8gas3hycciq9"; }; vala_0_38 = generic { From 05475515fafafe1c55cd47a9891c6242aa27e9dd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 13 Mar 2019 23:20:42 -0400 Subject: [PATCH 196/238] vala_0_40: 0.40.12 -> 0.40.14 https://gitlab.gnome.org/GNOME/vala/blob/0.40.13/NEWS https://gitlab.gnome.org/GNOME/vala/blob/0.40.14/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 947c3be0eb7..832dbec8e7a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -108,8 +108,8 @@ in rec { vala_0_40 = generic { major = "0.40"; - minor = "12"; - sha256 = "1nhk45w5iwg97q3cfybn0i4qz5w9qvk423ndpg6mq6cnna076snx"; + minor = "14"; + sha256 = "0llid9b9cgjcrcclc0pw2skkssb7br7b2clq9cql3p14dl94gki0"; }; vala_0_42 = generic { From 19697dd7943385076aed979f9235926d0c354a78 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 17 Mar 2019 22:59:58 -0400 Subject: [PATCH 197/238] vala_0_42: 0.42.4 -> 0.42.6 Fetch graphviz patch now. https://gitlab.gnome.org/GNOME/vala/blob/0.42.5/NEWS https://gitlab.gnome.org/GNOME/vala/blob/0.42.6/NEWS --- pkgs/development/compilers/vala/default.nix | 14 +- .../vala/disable-graphviz-0.42.4.patch | 208 ------------------ 2 files changed, 8 insertions(+), 214 deletions(-) delete mode 100644 pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 832dbec8e7a..7aa503d809b 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -30,12 +30,14 @@ let }; # NOTE: the openembedded-core project doesn't have a patch for 0.40.12 - # or 0.42.4 just yet; we've fixed the single merge conflict in the - # patches below and checked them in here. + # We've fixed the single merge conflict in the following patch. # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch - # 0.42.4: https://github.com/openembedded/openembedded-core/raw/dfbbff39cfd413510abbd60930232a9c6b35d765/meta/recipes-devtools/vala/vala/disable-graphviz.patch "0.40" = ./disable-graphviz-0.40.12.patch; - "0.42" = ./disable-graphviz-0.42.4.patch; + + "0.42" = fp { + commit = "f2b4f9ec6f44dced7f88df849cca68961419eeb8"; + sha256 = "112qhdzix0d7lfpfcam1cxprzmfzpwypb1226m5ma1vq9qy0sn7g"; + }; }.${major} or (throw "no graphviz patch for this version of vala"); @@ -114,8 +116,8 @@ in rec { vala_0_42 = generic { major = "0.42"; - minor = "4"; - sha256 = "07jgkx812y7wq4cswwfsf1f4k3lq9hcjra45682bdi8a11nr0a5m"; + minor = "6"; + sha256 = "14024gvs23q323fmd62hqd8jiypaxbjjvamyd782ixbhxmpz8x1p"; }; vala = vala_0_42; diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch b/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch deleted file mode 100644 index 77e7d6272af..00000000000 --- a/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff --git i/configure.ac w/configure.ac -index 730c72d7b..af8198637 100644 ---- i/configure.ac -+++ w/configure.ac -@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) - AC_SUBST(GMODULE_CFLAGS) - AC_SUBST(GMODULE_LIBS) - --PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) --AC_MSG_CHECKING([for CGRAPH]) --cgraph_tmp_LIBADD="$LIBADD" --cgraph_tmp_CFLAGS="$CFLAGS" --LIBADD="$LIBADD $LIBGVC_LIBS" --CFLAGS="$CFLAGS $LIBGVC_CFLAGS" --AC_RUN_IFELSE( -- [AC_LANG_SOURCE([ -- #include -- -- int main(void) { -- #ifdef WITH_CGRAPH -- return 0; -- #else -- return -1; -- #endif -- } -- ])], [ -- AC_MSG_RESULT([yes]) -- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" -- have_cgraph=yes -- ], [ -- AC_MSG_RESULT([no]) -- have_cgraph=no -- ] --) --LIBADD="$cgraph_tmp_LIBADD" --CFLAGS="$cgraph_tmp_CFLAGS" -+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) -+if test x$enable_graphviz = xyes; then -+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) -+ AC_MSG_CHECKING([for CGRAPH]) -+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" -+ cgraph_tmp_LIBADD="$LIBADD" -+ cgraph_tmp_CFLAGS="$CFLAGS" -+ LIBADD="$LIBADD $LIBGVC_LIBS" -+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS" -+ AC_RUN_IFELSE( -+ [AC_LANG_SOURCE([ -+ #include -+ int main(void) { -+ #ifdef WITH_CGRAPH -+ return 0; -+ #else -+ return -1; -+ #endif -+ } -+ ])], [ -+ AC_MSG_RESULT([yes]) -+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" -+ have_cgraph=yes -+ ], [ -+ AC_MSG_RESULT([no]) -+ have_cgraph=no -+ ] -+ ) -+ LIBADD="$cgraph_tmp_LIBADD" -+ CFLAGS="$cgraph_tmp_CFLAGS" -+fi -+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) - AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") - - AC_PATH_PROG([XSLTPROC], [xsltproc], :) -diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am -index f3f790e76..3c5dc4c80 100644 ---- i/libvaladoc/Makefile.am -+++ w/libvaladoc/Makefile.am -@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ - content/tablerow.vala \ - content/taglet.vala \ - content/text.vala \ -- charts/chart.vala \ -- charts/chartfactory.vala \ -- charts/hierarchychart.vala \ -- charts/simplechartfactory.vala \ - parser/manyrule.vala \ - parser/oneofrule.vala \ - parser/optionalrule.vala \ -@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ - highlighter/codetoken.vala \ - highlighter/highlighter.vala \ - html/basicdoclet.vala \ -- html/htmlchartfactory.vala \ - html/linkhelper.vala \ - html/cssclassresolver.vala \ - html/htmlmarkupwriter.vala \ - html/htmlrenderer.vala \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc_la_VALASOURCES += \ -+ charts/chart.vala \ -+ charts/chartfactory.vala \ -+ charts/hierarchychart.vala \ -+ charts/simplechartfactory.vala \ -+ html/htmlchartfactory.vala \ -+ $(NULL) -+ -+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc -+endif -+ - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - --library valadoc \ - --vapi valadoc@PACKAGE_SUFFIX@.vapi \ - --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ -- --vapidir $(top_srcdir)/vapi --pkg libgvc \ - --vapidir $(top_srcdir)/gee --pkg gee \ - --vapidir $(top_srcdir)/vala --pkg vala \ - --vapidir $(top_srcdir)/ccode --pkg ccode \ - --vapidir $(top_srcdir)/codegen --pkg codegen \ -+ $(LIBGVC_PKG) \ - --pkg config \ - $(filter %.vala %.c,$^) - touch $@ -@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc - - valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc //g" $@ -+endif - - vapidir = $(datadir)/vala/vapi - dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi -@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps - - valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc//g" $@ -+endif - - EXTRA_DIST = \ - $(libvaladoc_la_VALASOURCES) \ -diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala -index 192e488cd..ec0960222 100644 ---- i/libvaladoc/html/basicdoclet.vala -+++ w/libvaladoc/html/basicdoclet.vala -@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - protected HtmlRenderer _renderer; - protected Html.MarkupWriter writer; - protected Html.CssClassResolver cssresolver; -+#if HAVE_GRAPHVIZ - protected Charts.Factory image_factory; -+#else -+ protected void* image_factory; -+#endif - protected ErrorReporter reporter; - protected string package_list_link = "../index.html"; - -@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.linker = new LinkHelper (); - - _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); -+#if HAVE_GRAPHVIZ - this.image_factory = new SimpleChartFactory (settings, linker); -+#endif - } - - -@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - } - - protected void write_image_block (Api.Node element) { -+#if HAVE_GRAPHVIZ - if (element is Class || element is Interface || element is Struct) { - unowned string format = (settings.use_svg_images ? "svg" : "png"); - var chart = new Charts.Hierarchy (image_factory, element); -@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.get_img_path_html (element, format)}); - writer.add_usemap (chart); - } -+#endif - } - - public void write_namespace_content (Namespace node, Api.Node? parent) { -diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala -index 5aa4afdea..e79b0b8f5 100644 ---- i/libvaladoc/html/htmlmarkupwriter.vala -+++ w/libvaladoc/html/htmlmarkupwriter.vala -@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { - } - } - -+#if HAVE_GRAPHVIZ - public unowned MarkupWriter add_usemap (Charts.Chart chart) { - string? buf = (string?) chart.write_buffer ("cmapx"); - if (buf != null) { - raw_text ("\n"); - raw_text ((!) buf); - } -+#else -+ public unowned MarkupWriter add_usemap (void* chart) { -+#endif - - return this; - } From a6fb15c853b1d2bc8a813f705995bd3c2eba023d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 13 Mar 2019 23:47:23 -0400 Subject: [PATCH 198/238] vala_0_44: init at 0.44.1 --- pkgs/desktops/gnome-3/default.nix | 2 +- pkgs/development/compilers/vala/default.nix | 14 +- .../vala/disable-graphviz-0.44.1.patch | 261 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 276 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 41b0ccf6268..092406b188f 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -54,7 +54,7 @@ lib.makeScope pkgs.newScope (self: with self; { libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; - vala = pkgs.vala_0_42; + vala = pkgs.vala_0_44; gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; }; # ISO installer diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 7aa503d809b..0d339e7693f 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -39,6 +39,12 @@ let sha256 = "112qhdzix0d7lfpfcam1cxprzmfzpwypb1226m5ma1vq9qy0sn7g"; }; + # NOTE: the openembedded-core project doesn't have a patch for 0.44.1 + # We've reverted the addition of the "--disable-valadoc" option + # and then applied the following patch. + # 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch + "0.44" = ./disable-graphviz-0.44.1.patch; + }.${major} or (throw "no graphviz patch for this version of vala"); disableGraphviz = atLeast "0.38" && !withGraphviz; @@ -120,5 +126,11 @@ in rec { sha256 = "14024gvs23q323fmd62hqd8jiypaxbjjvamyd782ixbhxmpz8x1p"; }; - vala = vala_0_42; + vala_0_44 = generic { + major = "0.44"; + minor = "1"; + sha256 = "1qiglkgymws6a3m8xz1v8b3na165ywx2dbipp3bdg134bi0w3a4n"; + }; + + vala = vala_0_44; } diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch b/pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch new file mode 100644 index 00000000000..2752aa1e205 --- /dev/null +++ b/pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch @@ -0,0 +1,261 @@ +diff --git a/Makefile.am b/Makefile.am +index f70234759..b3d6c3833 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,19 +13,9 @@ SUBDIRS = \ + doc \ + gobject-introspection \ + vapigen \ +- $(NULL) +- +-if ENABLE_VALADOC +-SUBDIRS += \ + libvaladoc \ + valadoc \ + $(NULL) +-endif +- +-DISTCHECK_CONFIGURE_FLAGS = \ +- --enable-valadoc \ +- --enable-unversioned \ +- $(NULL) + + if ENABLE_UNVERSIONED + aclocaldir = $(datadir)/aclocal +diff --git a/configure.ac b/configure.ac +index 16ebd1f81..cf23db4b8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -156,10 +156,11 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) + AC_SUBST(GMODULE_CFLAGS) + AC_SUBST(GMODULE_LIBS) + +-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) +-if test x$enable_valadoc = xyes; then ++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) ++if test x$enable_graphviz = xyes; then + PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) + AC_MSG_CHECKING([for CGRAPH]) ++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" + cgraph_tmp_LIBADD="$LIBADD" + cgraph_tmp_CFLAGS="$CFLAGS" + LIBADD="$LIBADD $LIBGVC_LIBS" +@@ -186,8 +187,8 @@ if test x$enable_valadoc = xyes; then + LIBADD="$cgraph_tmp_LIBADD" + CFLAGS="$cgraph_tmp_CFLAGS" + fi ++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") +-AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes) + + AC_PATH_PROG([XSLTPROC], [xsltproc], :) + AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :) +diff --git a/doc/Makefile.am b/doc/Makefile.am +index d2684a0e0..b343c7c10 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -6,16 +6,11 @@ SUBDIRS = \ + + dist_man_MANS = \ + valac.1 \ ++ valadoc.1 \ + vala-gen-introspect.1 \ + vapigen.1 \ + $(NULL) + +-if ENABLE_VALADOC +-dist_man_MANS += \ +- valadoc.1 \ +- $(NULL) +-endif +- + EXTRA_DIST = \ + valac.h2m \ + valadoc.h2m \ +@@ -24,11 +19,7 @@ EXTRA_DIST = \ + $(NULL) + + if HAVE_HELP2MAN +-if ENABLE_VALADOC + manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1 +-else +-manpages: valac.1 vala-gen-introspect.1 vapigen.1 +-endif + @rm $^ + $(MAKE) $(AM_MAKEFLAGS) $^ + +@@ -37,13 +28,11 @@ valac.1: + --include $(srcdir)/valac.h2m \ + --libtool --no-info \ + --output=$@ +-if ENABLE_VALADOC + valadoc.1: + $(HELP2MAN) $(top_builddir)/valadoc/valadoc \ + --include $(srcdir)/valadoc.h2m \ + --libtool --no-info \ + --output=$@ +-endif + vala-gen-introspect.1: + $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \ + --include $(srcdir)/vala-gen-introspect.h2m \ +@@ -60,15 +49,12 @@ endif + if ENABLE_UNVERSIONED + install-data-hook: + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1 +-if ENABLE_VALADOC + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1 +-endif + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1 + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1 + endif + + +-if ENABLE_VALADOC + COMMON_VALADOCFLAGS = \ + --force \ + --verbose \ +@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen + @touch $@ + + internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc +-endif + + clean-local: + rm -rf $(builddir)/internal-apis +diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am +index 7456fb836..107338e91 100644 +--- a/libvaladoc/Makefile.am ++++ b/libvaladoc/Makefile.am +@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \ + content/tablerow.vala \ + content/taglet.vala \ + content/text.vala \ +- charts/chart.vala \ +- charts/chartfactory.vala \ +- charts/hierarchychart.vala \ +- charts/simplechartfactory.vala \ + parser/manyrule.vala \ + parser/oneofrule.vala \ + parser/optionalrule.vala \ +@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \ + highlighter/codetoken.vala \ + highlighter/highlighter.vala \ + html/basicdoclet.vala \ +- html/htmlchartfactory.vala \ + html/linkhelper.vala \ + html/cssclassresolver.vala \ + html/htmlmarkupwriter.vala \ + html/htmlrenderer.vala \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc_la_VALASOURCES += \ ++ charts/chart.vala \ ++ charts/chartfactory.vala \ ++ charts/hierarchychart.vala \ ++ charts/simplechartfactory.vala \ ++ html/htmlchartfactory.vala \ ++ $(NULL) ++ ++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc ++endif ++ + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + --library valadoc \ + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ +- --vapidir $(top_srcdir)/vapi --pkg libgvc \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ + --vapidir $(top_srcdir)/codegen --pkg codegen \ ++ $(LIBGVC_PKG) \ + --pkg config \ + $(filter %.vala %.c,$^) + touch $@ +@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc + + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc //g" $@ ++endif + + vapidir = $(datadir)/vala/vapi + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi +@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps + + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc//g" $@ ++endif + + EXTRA_DIST = \ + $(libvaladoc_la_VALASOURCES) \ +diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala +index 46578c28f..f6ce7097c 100644 +--- a/libvaladoc/html/basicdoclet.vala ++++ b/libvaladoc/html/basicdoclet.vala +@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + protected HtmlRenderer _renderer; + protected Html.MarkupWriter writer; + protected Html.CssClassResolver cssresolver; ++#if HAVE_GRAPHVIZ + protected Charts.Factory image_factory; ++#else ++ protected void* image_factory; ++#endif + protected ErrorReporter reporter; + protected string package_list_link = "../index.html"; + +@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.linker = new LinkHelper (); + + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); ++#if HAVE_GRAPHVIZ + this.image_factory = new SimpleChartFactory (settings, linker); ++#endif + } + + +@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + } + + protected void write_image_block (Api.Node element) { ++#if HAVE_GRAPHVIZ + if (element is Class || element is Interface || element is Struct) { + unowned string format = (settings.use_svg_images ? "svg" : "png"); + var chart = new Charts.Hierarchy (image_factory, element); +@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.get_img_path_html (element, format)}); + writer.add_usemap (chart); + } ++#endif + } + + public void write_namespace_content (Namespace node, Api.Node? parent) { +diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala +index 5aa4afdea..e79b0b8f5 100644 +--- a/libvaladoc/html/htmlmarkupwriter.vala ++++ b/libvaladoc/html/htmlmarkupwriter.vala +@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { + } + } + ++#if HAVE_GRAPHVIZ + public unowned MarkupWriter add_usemap (Charts.Chart chart) { + string? buf = (string?) chart.write_buffer ("cmapx"); + if (buf != null) { + raw_text ("\n"); + raw_text ((!) buf); + } ++#else ++ public unowned MarkupWriter add_usemap (void* chart) { ++#endif + + return this; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 407cb376533..b735c25f91e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7688,6 +7688,7 @@ in vala_0_38 vala_0_40 vala_0_42 + vala_0_44 vala; valadoc = callPackage ../development/tools/valadoc { }; From 2c352ad4d8cb8e5dabc6b307422fcec56ddb34ba Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Mar 2019 13:44:35 -0400 Subject: [PATCH 199/238] vala: add worldofpeace to maintainers --- pkgs/development/compilers/vala/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 0d339e7693f..dfd40c92ecf 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -96,7 +96,7 @@ let homepage = https://wiki.gnome.org/Projects/Vala; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ]; + maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ]; }; }); From 225bf9f38fde9ec3699259ca509218ec1913e9b2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 14 Mar 2019 00:03:42 -0400 Subject: [PATCH 200/238] libdbusmenu: use latest vala, use placeholder --- pkgs/development/libraries/libdbusmenu/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 8fbbae43f61..e064084f695 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, intltool , glib, dbus-glib, json-glib -, gobject-introspection, vala_0_38, gnome-doc-utils +, gobject-introspection, vala, gnome-doc-utils , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: with lib; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ vala pkgconfig intltool ]; buildInputs = [ glib dbus-glib json-glib - gobject-introspection vala_0_38 gnome-doc-utils + gobject-introspection gnome-doc-utils ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { doCheck = false; # generates shebangs in check phase, too lazy to fix installFlags = [ - "sysconfdir=\${out}/etc" + "sysconfdir=${placeholder ''out''}/etc" "localstatedir=\${TMPDIR}" - "typelibdir=\${out}/lib/girepository-1.0" + "typelibdir=${placeholder ''out''}/lib/girepository-1.0" ]; meta = { From 9a42d2d3c551905dc4fa60d5cfbde24e835b8b52 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 14 Mar 2019 00:11:54 -0400 Subject: [PATCH 201/238] synapse: use latest vala --- pkgs/applications/misc/synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index ebae6fd7cfe..3e7983c667f 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobject-introspection +, keybinder3, json-glib, zeitgeist, vala, hicolor-icon-theme, gobject-introspection }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig gettext vala_0_38 + pkgconfig gettext vala # For setup hook gobject-introspection ]; From 81b5a5cf148f1f1dc3fb1a1196254cdeb161db8d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 14 Mar 2019 00:18:41 -0400 Subject: [PATCH 202/238] packagekit: use latest vala --- pkgs/tools/package-management/packagekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 5b787220040..90893c8b7d9 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite -, gobject-introspection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive +, gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x"; }; - buildInputs = [ glib polkit python gobject-introspection vala_0_38 ] + buildInputs = [ glib polkit python gobject-introspection vala ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; From 1727324fae4833360ae27a64d7f8de10d7a93aff Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 17 Mar 2019 22:00:47 -0400 Subject: [PATCH 203/238] libhttpseverywhere: build with latest vala --- .../libraries/libhttpseverywhere/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index c1ec533ba5b..cf5c80c9b21 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala_0_40 -, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch +, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection, valadoc }: let pname = "libhttpseverywhere"; @@ -12,10 +12,17 @@ in stdenv.mkDerivation rec { sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; }; - # Broken with newest Vala https://gitlab.gnome.org/GNOME/libhttpseverywhere/issues/1 - nativeBuildInputs = [ vala_0_40 gobject-introspection meson ninja pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ]; buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; + # Fixes build with vala >=0.42 + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch"; + sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f"; + }) + ]; + mesonFlags = [ "-Denable_valadoc=true" ]; doCheck = true; From 0e44d14dff3232bc102278f248f5f9a1efab6151 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 20:14:39 -0500 Subject: [PATCH 204/238] xorg.mkfontdir: replace with mkfontscale, which now includes mkfontdir See: https://lists.x.org/archives/xorg-announce/2019-March/002960.html --- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 8 ++++---- pkgs/servers/x11/xorg/overrides.nix | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 938b0b7b2f9..0d39cb98b6e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -26,7 +26,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; @@ -157,7 +157,7 @@ while (<>) { } if ($file =~ /AC_PATH_PROG\(MKFONTDIR/) { - push @requires, "mkfontdir"; + push @requires, "mkfontscale"; } if ($file =~ /AM_PATH_PYTHON/) { @@ -173,12 +173,12 @@ while (<>) { my $isFont; if ($file =~ /XORG_FONT_BDF_UTILS/) { - push @requires, "bdftopcf", "mkfontdir"; + push @requires, "bdftopcf", "mkfontscale"; $isFont = 1; } if ($file =~ /XORG_FONT_SCALED_UTILS/) { - push @requires, "mkfontscale", "mkfontdir"; + push @requires, "mkfontscale"; $isFont = 1; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 886de897db8..f9c8506a25c 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -75,8 +75,10 @@ self: super: inherit tradcpp; }); - mkfontdir = super.mkfontdir.overrideAttrs (attrs: { - preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin"; + mkfontdir = self.mkfontscale; + + mkfontscale = super.mkfontscale.overrideAttrs (attrs: { + preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${placeholder "out"}/bin"; }); libxcb = super.libxcb.overrideAttrs (attrs: { From 79592e99a6b91655344270895051b576e662e8db Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 20:27:33 -0500 Subject: [PATCH 205/238] xorg/tarballs.list: +{xfd,xmore} -mkfontdir --- pkgs/servers/x11/xorg/tarballs.list | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 60d4b567856..4f1b65cbc51 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -17,7 +17,6 @@ mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/listres-1.0.4.tar.bz2 -mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2 mirror://xorg/individual/app/mkfontscale-1.2.0.tar.bz2 mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 @@ -40,6 +39,7 @@ mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xev-1.2.3.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 +mirror://xorg/individual/app/xfd-1.1.3.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2 @@ -60,6 +60,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 +mirror://xorg/individual/app/xmore-1.0.3.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 mirror://xorg/individual/app/xprop-1.2.4.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 From c01c821f485db1580173b4a0ef8198d4d1b14e71 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 20:59:12 -0500 Subject: [PATCH 206/238] generate-exprs-from-tarballs.pl: support few more deps automatically --- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0d39cb98b6e..0edffb89ac3 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -26,7 +26,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo" ); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; From 061f6562f0f284f423bc793eb48eec808e38ca3e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 20:43:49 -0500 Subject: [PATCH 207/238] xorg/default.nix: regen! --- pkgs/servers/x11/xorg/default.nix | 211 ++++++++++++++++-------------- 1 file changed, 112 insertions(+), 99 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 71d50495034..a050b7b80af 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -70,7 +70,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -79,12 +79,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -93,12 +93,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -107,12 +107,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -121,12 +121,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -135,7 +135,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + buildInputs = [ mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -153,7 +153,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -162,12 +162,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -176,12 +176,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -190,12 +190,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -204,12 +204,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -218,12 +218,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -232,12 +232,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + buildInputs = [ mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -246,12 +246,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + buildInputs = [ mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -260,12 +260,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -274,12 +274,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -288,12 +288,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + buildInputs = [ mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -302,12 +302,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -316,12 +316,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -330,12 +330,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -344,12 +344,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -358,12 +358,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + buildInputs = [ mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -372,12 +372,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -386,12 +386,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -400,12 +400,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -414,12 +414,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -428,12 +428,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + buildInputs = [ mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -442,12 +442,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + buildInputs = [ mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -456,12 +456,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -470,12 +470,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -484,12 +484,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + buildInputs = [ bdftopcf fontutil mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -498,12 +498,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -512,12 +512,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -526,7 +526,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -557,7 +557,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -566,12 +566,12 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + buildInputs = [ bdftopcf mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -580,7 +580,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + buildInputs = [ mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1235,19 +1235,6 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - mkfontdir = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "mkfontdir-1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2; - sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { name = "mkfontscale-1.2.0"; builder = ./builder.sh; @@ -1443,7 +1430,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1452,11 +1439,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1465,11 +1452,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil ]; + buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xorgproto }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { @@ -1478,7 +1465,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbproto ]; + buildInputs = [ gperf m4 libxcb xcbproto xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1508,7 +1495,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { @@ -1517,11 +1504,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1530,7 +1517,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1677,7 +1664,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { + xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-evdev-2.10.6"; builder = ./builder.sh; src = fetchurl { @@ -1686,7 +1673,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto udev xorgserver ]; + buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1716,7 +1703,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { name = "xf86-input-libinput-0.28.2"; builder = ./builder.sh; src = fetchurl { @@ -1725,7 +1712,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto xorgserver ]; + buildInputs = [ xorgproto libinput xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1742,7 +1729,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { + xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { name = "xf86-input-synaptics-1.9.1"; builder = ./builder.sh; src = fetchurl { @@ -1751,7 +1738,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto libX11 libXi xorgserver libXtst ]; + buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1963,7 +1950,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { @@ -1972,7 +1959,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; + buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2353,6 +2340,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xfd = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + name = "xfd-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xfd-1.1.3.tar.bz2; + sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xfontsel = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xfontsel-1.0.6"; builder = ./builder.sh; @@ -2626,6 +2626,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xmore = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + name = "xmore-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xmore-1.0.3.tar.bz2; + sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; From 29f4526a5a67ea6c9a8f3f7b841ce536a4c0a038 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 21:34:15 -0500 Subject: [PATCH 208/238] xorg: detect deps on libxkbfile from ${XKBMODULE} --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a050b7b80af..9bf1674b87c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1248,7 +1248,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { + oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { name = "oclock-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1257,7 +1257,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext libXmu libXt ]; + buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2340,7 +2340,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xfd = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { name = "xfd-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2349,7 +2349,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; + buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2860,7 +2860,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { name = "xwd-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -2869,7 +2869,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xorgproto ]; + buildInputs = [ libxkbfile libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0edffb89ac3..599a7843c2f 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -40,6 +40,7 @@ $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; $pcMap{"\$DRI2PROTO"} = "xorgproto"; +$pcMap{"\${XKBMODULE}"} = "libxkbfile"; my $downloadCache = "./download-cache"; From 9e39ab6753b6b6fafc73ebc8e70967084c507c17 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 22:22:17 -0500 Subject: [PATCH 209/238] generate-expr-from-tarballs.pl: more detection, detect gettext usage --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9bf1674b87c..40ef6c0d59e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -936,7 +936,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { + libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "libXpm-3.5.12"; builder = ./builder.sh; src = fetchurl { @@ -944,7 +944,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2340,7 +2340,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { + xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { name = "xfd-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2348,7 +2348,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2535,7 +2535,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "xload-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2543,7 +2543,7 @@ lib.makeScope newScope (self: with self; { sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 599a7843c2f..58083d2701f 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -26,7 +26,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo" ); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" ); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; @@ -214,6 +214,7 @@ while (<>) { #process \@requires, $1 while $file =~ /PKG_CHECK_MODULES\([^,]*,\s*[\[]?([^\)\[]*)/g; process \@requires, $1 while $file =~ /PKG_CHECK_MODULES\([^,]*,([^\)\,]*)/g; + process \@requires, $1 while $file =~ /AC_SEARCH_LIBS\([^,]*,([^\)\,]*)/g; process \@requires, $1 while $file =~ /MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /REQUIRED_LIBS=\"(.*)\"/g; process \@requires, $1 while $file =~ /REQUIRED_MODULES=\"(.*)\"/g; @@ -225,6 +226,7 @@ while (<>) { process \@requires, $1 while $file =~ /ivo_requires=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; + push @nativeRequires, "gettext" if $file =~ /USE_GETTEXT/; push @requires, "libxslt" if $pkg =~ /libxcb/; push @requires, "gperf", "m4", "xorgproto" if $pkg =~ /xcbutil/; From 108ab954edb67736c67413ba8c3bcc3ada0015ae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 23:02:09 -0500 Subject: [PATCH 210/238] xorg: font utilities should be nativeBuildInputs They provide programs executed by the builder. --- pkgs/servers/x11/xorg/default.nix | 136 +++++++++--------- .../x11/xorg/generate-expr-from-tarballs.pl | 12 +- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 40ef6c0d59e..7c488ca429b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -78,8 +78,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -92,8 +92,8 @@ lib.makeScope newScope (self: with self; { sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -106,8 +106,8 @@ lib.makeScope newScope (self: with self; { sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -120,8 +120,8 @@ lib.makeScope newScope (self: with self; { sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -134,8 +134,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -161,8 +161,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -175,8 +175,8 @@ lib.makeScope newScope (self: with self; { sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -189,8 +189,8 @@ lib.makeScope newScope (self: with self; { sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -203,8 +203,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -217,8 +217,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -231,8 +231,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -245,8 +245,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -259,8 +259,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -273,8 +273,8 @@ lib.makeScope newScope (self: with self; { sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -287,8 +287,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -301,8 +301,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -315,8 +315,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -329,8 +329,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -343,8 +343,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -357,8 +357,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -371,8 +371,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -385,8 +385,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -399,8 +399,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -413,8 +413,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -427,8 +427,8 @@ lib.makeScope newScope (self: with self; { sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -441,8 +441,8 @@ lib.makeScope newScope (self: with self; { sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -455,8 +455,8 @@ lib.makeScope newScope (self: with self; { sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -469,8 +469,8 @@ lib.makeScope newScope (self: with self; { sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -483,8 +483,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -497,8 +497,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -511,8 +511,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -525,8 +525,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -565,8 +565,8 @@ lib.makeScope newScope (self: with self; { sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -579,8 +579,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 58083d2701f..dbbdca8493b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -150,15 +150,15 @@ while (<>) { } if ($file =~ /AC_PATH_PROG\(BDFTOPCF/) { - push @requires, "bdftopcf"; + push @nativeRequires, "bdftopcf"; } if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/) { - push @requires, "mkfontscale"; + push @nativeRequires, "mkfontscale"; } if ($file =~ /AC_PATH_PROG\(MKFONTDIR/) { - push @requires, "mkfontscale"; + push @nativeRequires, "mkfontscale"; } if ($file =~ /AM_PATH_PYTHON/) { @@ -174,17 +174,17 @@ while (<>) { my $isFont; if ($file =~ /XORG_FONT_BDF_UTILS/) { - push @requires, "bdftopcf", "mkfontscale"; + push @nativeRequires, "bdftopcf", "mkfontscale"; $isFont = 1; } if ($file =~ /XORG_FONT_SCALED_UTILS/) { - push @requires, "mkfontscale"; + push @nativeRequires, "mkfontscale"; $isFont = 1; } if ($file =~ /XORG_FONT_UCS2ANY/) { - push @requires, "fontutil", "mkfontscale"; + push @nativeRequires, "fontutil", "mkfontscale"; $isFont = 1; } From 8d3188864844199f29f9c4e525b4d842e81d4395 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 23:40:37 -0500 Subject: [PATCH 211/238] xorg: simplify overrides now handled automatically, GL -> libGL --- pkgs/servers/x11/xorg/default.nix | 4 ++-- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 1 + pkgs/servers/x11/xorg/overrides.nix | 12 +----------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7c488ca429b..0405b54abcc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1625,7 +1625,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { name = "xdriinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1634,7 +1634,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto libX11 ]; + buildInputs = [ libGL xorgproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index dbbdca8493b..bb0d1b59551 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -35,6 +35,7 @@ $pcMap{"dbus-1"} = "dbus"; $pcMap{"uuid"} = "libuuid"; $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "libGL"; +$pcMap{"GL"} = "libGL"; $pcMap{"gbm"} = "mesa_noglu"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f9c8506a25c..15a072249eb 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -50,10 +50,6 @@ self: super: meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; }; }); - fontcursormisc = super.fontcursormisc.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.mkfontscale ]; - }); - fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: { postInstall = '' @@ -291,10 +287,6 @@ self: super: meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; }; }); - oclock = super.oclock.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.libxkbfile ]; - }); - setxkbmap = super.setxkbmap.overrideAttrs (attrs: { postInstall = '' @@ -340,7 +332,6 @@ self: super: outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; installFlags = "sdkdir=\${out}/include/xorg"; - buildInputs = attrs.buildInputs ++ [ mtdev libevdev ]; }); xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: { @@ -353,7 +344,6 @@ self: super: xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec { outputs = [ "out" "dev" ]; - buildInputs = attrs.buildInputs ++ [ libinput ]; installFlags = "sdkdir=\${dev}/include/xorg"; }); @@ -692,7 +682,7 @@ self: super: }); xwd = super.xwd.overrideAttrs (attrs: { - buildInputs = with self; attrs.buildInputs ++ [libXt libxkbfile]; + buildInputs = with self; attrs.buildInputs ++ [libXt]; }); xrdb = super.xrdb.overrideAttrs (attrs: { From 1be6087b1f4323a82644382179c936212ea03a5c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 18 Mar 2019 23:48:07 -0500 Subject: [PATCH 212/238] xf86inputsynaptics: deps handled now And drop `mtdev`, which appears to have been added unnecessarily. --- pkgs/servers/x11/xorg/overrides.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 15a072249eb..58b7c7f3e6d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -349,7 +349,6 @@ self: super: xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev - buildInputs = attrs.buildInputs ++ [mtdev libevdev]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; }); From 3f9ac24d531090a6b49afd212b5cf2b78c825b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 2 Dec 2018 12:19:30 +0000 Subject: [PATCH 213/238] Revert "modemmanager: rename ModemManager.service to modem-manager.service" This reverts commit c6882b2cf9fa13579f64d5c33cbc071fa5d5e884. --- pkgs/tools/networking/modem-manager/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index cb63b2be152..6f0732b8cfd 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -33,12 +33,9 @@ stdenv.mkDerivation rec { doCheck = true; postInstall = '' - # rename to modem-manager to be in style - mv $out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service - # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. - ln -s $out/etc/systemd/system/modem-manager.service \ + ln -s $out/etc/systemd/system/ModemManager.service \ $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service ''; From b488c60cdb0a9fb913d8b463f17fe89b45b4d50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 2 Dec 2018 12:11:44 +0000 Subject: [PATCH 214/238] network-manager: rename systemd service back to match upstream Compatibility with other distributions/software and expectation of users coming from other systems should have higher priority over consistency. In particular this fixes #51375, where the NetworkManager-wait-online.service broke as a result of this. --- nixos/doc/manual/installation/installing.xml | 2 +- nixos/doc/manual/release-notes/rl-1903.xml | 7 +++++++ nixos/modules/services/networking/networkmanager.nix | 8 ++++---- pkgs/tools/networking/network-manager/default.nix | 5 +---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f4f8d470f80..9687c21a01e 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -54,7 +54,7 @@ To manually configure the network on the graphical installer, first disable - network-manager with systemctl stop network-manager. + network-manager with systemctl stop NetworkManager. diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index a82724d7fb5..931c3be5913 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -216,6 +216,13 @@ []. + + + The NetworkManager systemd unit was renamed back from network-manager.service to + NetworkManager.service for better compatibility with other applications expecting this name. + The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. + + Package rabbitmq_server is renamed to diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index d372dfd8f41..5e554447181 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -466,7 +466,7 @@ in { systemd.packages = cfg.packages; - systemd.services."network-manager" = { + systemd.services."NetworkManager" = { wantedBy = [ "network.target" ]; restartTriggers = [ configFile ]; @@ -478,9 +478,9 @@ in { }; systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled { - wantedBy = [ "network-manager.service" ]; - before = [ "network-manager.service" ]; - partOf = [ "network-manager.service" ]; + wantedBy = [ "NetworkManager.service" ]; + before = [ "NetworkManager.service" ]; + partOf = [ "NetworkManager.service" ]; script = concatStrings (mapAttrsToList (n: d: '' mkdir -p "/run/NetworkManager/hostsdirs/${n}" chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}" diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f18e8ad9f5c..58fdd1f45b6 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -88,13 +88,10 @@ in stdenv.mkDerivation rec { # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' - # rename to network-manager to be in style - mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service - # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ''; passthru = { From 69cd72b3e178a21b0974f5d9b9c151be9f85f2a7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 19 Mar 2019 01:54:27 +0100 Subject: [PATCH 215/238] network-manager: add legacy service name as fallback This prevents NetworkManager from not starting back up while switching configurations. This can be removed once 19.10 is released. --- pkgs/tools/networking/network-manager/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 58fdd1f45b6..2ead22a550a 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -92,6 +92,11 @@ in stdenv.mkDerivation rec { # aliases ourselves. ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + + # Add the legacy service name from before #51382 to prevent NetworkManager + # from not starting back up: + # TODO: remove this once 19.10 is released + ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service ''; passthru = { From 84fb329ec1898d1e5386842212d5256b86903af6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 19 Mar 2019 20:20:31 -0500 Subject: [PATCH 216/238] xorg.xf86video{ati,amdgpu}: 19.0.0 -> 19.0.1 https://lists.x.org/archives/xorg-announce/2019-March/002986.html https://lists.x.org/archives/xorg-announce/2019-March/002987.html --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/tarballs.list | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0405b54abcc..2658e4009cd 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1769,11 +1769,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-amdgpu-19.0.0"; + name = "xf86-video-amdgpu-19.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.0.tar.bz2; - sha256 = "0lag9jxd752ja7m7ngz3dmqffb5wbx4crdwjw74qx42m8xyi8dl8"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2; + sha256 = "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1821,11 +1821,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ati-19.0.0"; + name = "xf86-video-ati-19.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-19.0.0.tar.bz2; - sha256 = "0mzl7yp3qkvankh22758sgpaw9mg6jxsfbg6wy0nxfw4i0qpv46x"; + url = mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2; + sha256 = "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 4f1b65cbc51..8608f801120 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -88,11 +88,11 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-19.0.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 From a54e41a673c309b7d8d88a899a1f71a3428a0930 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 20 Mar 2019 03:06:39 +0100 Subject: [PATCH 217/238] network-manager: move para about service rename to 19.09 changelog --- nixos/doc/manual/release-notes/rl-1903.xml | 7 ------- nixos/doc/manual/release-notes/rl-1909.xml | 23 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 931c3be5913..a82724d7fb5 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -216,13 +216,6 @@ []. - - - The NetworkManager systemd unit was renamed back from network-manager.service to - NetworkManager.service for better compatibility with other applications expecting this name. - The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. - - Package rabbitmq_server is renamed to diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index f54592b6bf6..925dadcb03d 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -42,6 +42,29 @@ +
+ Backward Incompatibilities + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + + + + The NetworkManager systemd unit was renamed back from network-manager.service to + NetworkManager.service for better compatibility with other applications expecting this name. + The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. + + + +
+
Date: Thu, 21 Mar 2019 06:23:40 +0000 Subject: [PATCH 218/238] glibcLocales: also build C.UTF-8 Previously we only build C.UTF-8 as part of the locale-archive that comes with the glibc core package. However for consistent use of LANG=C.UTF-8 we also want support in our glibcLocales as well. fixes https://github.com/NixOS/nixpkgs/issues/57974 --- pkgs/development/libraries/glibc/locales.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 2b20c17d450..0dc19197415 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -26,6 +26,8 @@ callPackage ./common.nix { inherit stdenv; } { '' mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale" + echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED + # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile '' From c489789f61b4ace99778ac5e9d1113d9a7552148 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 21 Mar 2019 06:50:18 -0500 Subject: [PATCH 219/238] xorg.mkfontscale: 1.2.0 -> 1.2.1 https://lists.x.org/archives/xorg-announce/2019-March/002988.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 4 ---- pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2658e4009cd..bdb7f2f5738 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1236,11 +1236,11 @@ lib.makeScope newScope (self: with self; { }) {}; mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { - name = "mkfontscale-1.2.0"; + name = "mkfontscale-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.2.0.tar.bz2; - sha256 = "1gn423m0v1w98df7ni74zrj2rkhsapnqfzr8139l638kkyz7far8"; + url = mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2; + sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 58b7c7f3e6d..d0d4c339af4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -73,10 +73,6 @@ self: super: mkfontdir = self.mkfontscale; - mkfontscale = super.mkfontscale.overrideAttrs (attrs: { - preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${placeholder "out"}/bin"; - }); - libxcb = super.libxcb.overrideAttrs (attrs: { configureFlags = [ "--enable-xkb" "--enable-xinput" ]; outputs = [ "out" "dev" "man" "doc" ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8608f801120..5a5d87cd804 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -17,7 +17,7 @@ mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/listres-1.0.4.tar.bz2 -mirror://xorg/individual/app/mkfontscale-1.2.0.tar.bz2 +mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2 mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 From 4696ddf4b5d02b675375954b38627304409f6f6f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 21 Mar 2019 15:57:53 -0500 Subject: [PATCH 220/238] libgpgerror: 1.34 -> 1.36 https://github.com/gpg/libgpg-error/blob/libgpg-error-1.36/NEWS (1.35 news included, minor) --- pkgs/development/libraries/libgpg-error/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 5038547f5b8..dc221156f46 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -16,12 +16,12 @@ outputBin = "out"; }; in stdenv.mkDerivation (rec { - name = "libgpg-error-${version}"; - version = "1.34"; + pname = "libgpg-error"; + version = "1.36"; src = fetchurl { - url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "10cc76y7zi6wsdmpy1abf3i0q17bj59q5ysy8cpnpf3ixsfpk006"; + url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds"; }; postPatch = '' From 55f527f202fc32a2f0e7cdffaf6c6de8de90996f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 21 Mar 2019 15:51:08 -0500 Subject: [PATCH 221/238] libassuan: 2.5.2 -> 2.5.3 https://github.com/gpg/libassuan/blob/libassuan-2.5.3/NEWS https://dev.gnupg.org/T4361 --- pkgs/development/libraries/libassuan/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 540aef9edf2..3c78b6265bf 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,12 @@ { fetchurl, stdenv, gettext, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.5.2"; + pname = "libassuan"; + version = "2.5.3"; src = fetchurl { - url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "1rw8nw6fx6ppxga6m4cqcp898lnlzf7vn3s5c2lzfxg3fzr1nswq"; + url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i"; }; outputs = [ "out" "dev" "info" ]; From 480293b6f61aa1783ab42bc45b62391c224fe500 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 20 Mar 2019 22:09:21 -0500 Subject: [PATCH 222/238] wayland: 1.16.0 -> 1.17.0 https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html https://lists.freedesktop.org/archives/wayland-devel/2019-March/040291.html --- pkgs/development/libraries/wayland/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 8a5a5dc070e..60d240552d4 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -7,12 +7,12 @@ assert expat != null; stdenv.mkDerivation rec { - name = "wayland-${version}"; - version = "1.16.0"; + pname = "wayland"; + version = "1.17.0"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; + sha256 = "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj"; }; separateDebugInfo = true; From 043255c63929bf06a70912bc995082074e4df8ee Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 21 Mar 2019 22:04:29 -0700 Subject: [PATCH 223/238] buildGo112Package: fix the function (#58105) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 965477dcf78..f9a9699af00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13417,7 +13417,7 @@ in buildGo111Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_11; }; - buildGo112Package = callPackage ../development/go-modules/generic { + buildGo112Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_12; }; From 1f460d05c12503593611e732e133e4ed0f93b175 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 21 Mar 2019 22:33:16 -0700 Subject: [PATCH 224/238] miniflux: do not send buildGoPackage, it is using buildGoModule now (#58110) --- pkgs/top-level/all-packages.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9a9699af00..1326f92c3cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -937,7 +937,7 @@ in bchunk = callPackage ../tools/cd-dvd/bchunk { }; inherit (callPackages ../misc/logging/beats/6.x.nix { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }) @@ -953,7 +953,7 @@ in packetbeat = packetbeat6; inherit (callPackages ../misc/logging/beats/5.x.nix { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }) @@ -1742,7 +1742,7 @@ in mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; mongodb-tools = callPackage ../tools/misc/mongodb-tools { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }; @@ -1829,7 +1829,7 @@ in bepasty = callPackage ../tools/misc/bepasty { }; bettercap = callPackage ../tools/security/bettercap { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }; @@ -4319,7 +4319,7 @@ in miredo = callPackage ../tools/networking/miredo { }; mirrorbits = callPackage ../servers/mirrorbits { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }; @@ -12678,7 +12678,7 @@ in }; skydive = callPackage ../tools/networking/skydive { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }; @@ -14002,10 +14002,7 @@ in mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; - miniflux = callPackage ../servers/miniflux { - # XXX: bettercap is failing with Go 1.12. - buildGoPackage = buildGo111Package; - }; + miniflux = callPackage ../servers/miniflux { }; nagios = callPackage ../servers/monitoring/nagios { }; @@ -14471,7 +14468,7 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; cockroachdb = callPackage ../servers/sql/cockroachdb { - # XXX: bettercap is failing with Go 1.12. Error is related to cgo, an + # XXX: this is failing with Go 1.12. Error is related to cgo, an # update to this package might fix it. buildGoPackage = buildGo111Package; }; From 2d9d054bcef0ef60ecefa100acb149530ecbe570 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Fri, 15 Mar 2019 11:42:41 -0700 Subject: [PATCH 225/238] go_1_11: 1.11.5 -> 1.11.6 --- pkgs/development/compilers/go/1.11.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index db3731c2fca..e65ad265a8b 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin +{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation , mailcap, runtimeShell , buildPackages, targetPackages }: @@ -29,13 +29,11 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.11.5"; + version = "1.11.6"; - src = fetchFromGitHub { - owner = "golang"; - repo = "go"; - rev = "go${version}"; - sha256 = "0d45057rc0bngq0nja847cagxji42qmlywr68f0dkg51im8nyr9y"; + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "0cz1sdhxf9283p1p4jxb020pym0ncd0qlfh36r3hkv6bbm1a2vd9"; }; # perl is used for testing go vet @@ -125,7 +123,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.11.patch - ./ssl-cert-file-1.9.patch + ./ssl-cert-file-1.12.1.patch ./remove-test-pie.patch ./creds-test.patch ./go-1.9-skip-flaky-19608.patch From 276d8c97bb1a3de52a4eabf696cfdf708d334e85 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Fri, 15 Mar 2019 11:42:05 -0700 Subject: [PATCH 226/238] go_1_12: 1.12 -> 1.12.1 --- pkgs/development/compilers/go/1.12.nix | 5 +- .../compilers/go/ssl-cert-file-1.12.1.patch | 59 +++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index d7bbd4eaf0f..0b8eb2dc19d 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -29,11 +29,11 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.12"; + version = "1.12.1"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1wl8kq21fbzmv4plnaza5acz8dhbaaq6smjzk3r6cf3l6qrkvi09"; + sha256 = "12l12mmgqvy3nbscy7sz83qj4m6iz5a322aq9sk45f7l9ml2gq8b"; }; # perl is used for testing go vet @@ -127,6 +127,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.11.patch + ./ssl-cert-file-1.12.1.patch ./remove-test-pie.patch ./creds-test.patch ./go-1.9-skip-flaky-19608.patch diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch b/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch new file mode 100644 index 00000000000..aa3116d76c1 --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch @@ -0,0 +1,59 @@ +diff -Naur a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +--- a/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:33:55.920232337 -0700 ++++ b/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:34:53.323180897 -0700 +@@ -270,11 +270,20 @@ + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + var data C.CFDataRef = 0 + var untrustedData C.CFDataRef = 0 +diff -Naur a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +--- a/src/crypto/x509/root_darwin.go 2019-03-15 11:33:55.920232337 -0700 ++++ b/src/crypto/x509/root_darwin.go 2019-03-15 11:36:21.205123541 -0700 +@@ -92,6 +92,14 @@ + verifyCh = make(chan rootCandidate) + ) + ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ + // Using 4 goroutines to pipe into verify-cert seems to be + // about the best we can do. The verify-cert binary seems to + // just RPC to another server with coarse locking anyway, so +diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +--- a/src/crypto/x509/root_unix.go 2019-03-15 11:33:55.920232337 -0700 ++++ b/src/crypto/x509/root_unix.go 2019-03-15 11:37:15.737326340 -0700 +@@ -38,6 +38,13 @@ + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { From 29fde98ed35cc5f16d5aafc141674f6c627e4c7c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Mar 2019 14:07:17 -0500 Subject: [PATCH 227/238] iproute2: 4.20.0 -> 5.0.0 --- pkgs/os-specific/linux/iproute/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 4d8591a845c..87f27a2db07 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf }: stdenv.mkDerivation rec { - name = "iproute2-${version}"; - version = "4.20.0"; + pname = "iproute2"; + version = "5.0.0"; src = fetchurl { - url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "1a7xyvqjxfnm7rk21amm0xgxa38clg7q7cmc4dmlg27q81mambf8"; + url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1fi03lb8dqr8hq633gcqsf6228vsvysxms075j1yyl4nlc17616z"; }; preConfigure = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "SBINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "BASH_COMPDIR=$(out)/share/bash-completion/completions" - "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs + "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs "HDRDIR=$(dev)/include/iproute2" ]; From 255756e7da959e63f9519c0f75f1b167434dfc5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 23 Mar 2019 15:15:19 -0700 Subject: [PATCH 228/238] help2man: 1.47.8 -> 1.47.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/help2man/versions --- pkgs/development/tools/misc/help2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 29ed23117fb..f544f48e57c 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, gettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.8"; + name = "help2man-1.47.9"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1p5830h88cx0zn0snwaj0vpph81xicpsirfwlxmcgjrlmn0nm3sj"; + sha256 = "1li3b6vifhysc2ckx0d7krwrqb8bk0kzn3k18ff1963hjc1qp7nz"; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; From f1c7bb9d29bf25e67e472576101da534d973f961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Mar 2019 09:36:24 +0100 Subject: [PATCH 229/238] python.pkgs.hypothesis: 3.88.3 -> 4.7.3 (#58169) It looks like in 89f91cf06b64e278d8b019bf4238baabfcbbe13a the hash from 4.7.3 was used and the wrong version specified. --- pkgs/development/python-modules/hypothesis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 3575ee03963..d1fadad00d0 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.88.3"; + version = "4.7.3"; pname = "hypothesis"; # Use github tarballs that includes tests From a194f8855ba5095c5c8ca974d0597ce79f2d6af8 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Fri, 22 Mar 2019 19:59:30 +0100 Subject: [PATCH 230/238] perlPackages.FileSlurp: remove obsolete patch (#58135) FileSlurp no longer uses syswrite. --- pkgs/top-level/perl-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d4f86dd0218..196b0694fed 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6031,8 +6031,6 @@ let FileSlurp = buildPerlPackage { name = "File-Slurp-9999.26"; - # WARNING: check on next update if deprecation warning is gone - patches = [ ../development/perl-modules/File-Slurp/silence-deprecation.patch ]; src = fetchurl { url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.26.tar.gz; sha256 = "0c09ivl50sg9j75si6cahfp1wgvhqawakb6h5j6hlca6vwjqs9qy"; From f23c89a25f8830a20378ae4e9e84aa5afdbe8ea3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Dec 2018 22:59:28 -0600 Subject: [PATCH 231/238] libedit: 20180525 -> 20181209 --- pkgs/development/libraries/libedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index c68e171084b..602f5a78ccf 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "libedit-20180525-3.1"; + name = "libedit-20181209-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4"; + sha256 = "0r0hc4lg71xnn0vrrk2g7is42i0k0dra7cbw3fljq3q01c6df498"; }; outputs = [ "out" "dev" ]; From 784a506d94272935859bcc8b1b51e05e57515243 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Mar 2019 18:38:26 -0500 Subject: [PATCH 232/238] libedit: 20181209 -> 20190324 --- pkgs/development/libraries/libedit/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 602f5a78ccf..3e290e63999 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "libedit-20181209-3.1"; + pname = "libedit"; + version = "20190324-3.1"; src = fetchurl { - url = "https://thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "0r0hc4lg71xnn0vrrk2g7is42i0k0dra7cbw3fljq3q01c6df498"; + url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; + sha256 = "1bhvp8xkkgrg89k4ci1k8vjl3nhb6szd4ghy9lp4jrfgq58hz3xc"; }; outputs = [ "out" "dev" ]; From c9551505bc8e77b63051fe260050f9a27e0ee617 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Mar 2019 20:01:42 -0500 Subject: [PATCH 233/238] libedit: No need to specify `--enable-widec` anymore --- pkgs/development/libraries/libedit/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 3e290e63999..e46a7ec33c4 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses ]; - configureFlags = [ "--enable-widec" ]; - postInstall = '' find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g' From 16d5cb1b00e15138d7ddabebb6789b326723acbc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Mar 2019 21:36:26 -0500 Subject: [PATCH 234/238] xcompmgr: 1.1.7 -> 1.1.8 https://lists.x.org/archives/xorg-announce/2019-March/002989.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bdb7f2f5738..42df8f62ef5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1548,11 +1548,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { - name = "xcompmgr-1.1.7"; + name = "xcompmgr-1.1.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2; - sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168"; + url = mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2; + sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 5a5d87cd804..c1ffd610eb1 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -31,7 +31,7 @@ mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2 mirror://xorg/individual/app/xclock-1.0.8.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 -mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 +mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.12.tar.bz2 From a1a4ff747128ec73975a933c67ecec2e5169ff30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 26 Mar 2019 15:32:21 +0100 Subject: [PATCH 235/238] python.pkgs.pylint: pytestrunner belongs in nativeBuildInputs because it's in `setup_requires`. Noticed when building with `doCheck = false;`. --- pkgs/development/python-modules/pylint/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 67066c85f05..86730bc4330 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -12,7 +12,9 @@ buildPythonPackage rec { sha256 = "689de29ae747642ab230c6d37be2b969bf75663176658851f456619aacf27492"; }; - checkInputs = [ pytest pytestrunner pyenchant ]; + nativeBuildInputs = [ pytestrunner ]; + + checkInputs = [ pytest pyenchant ]; propagatedBuildInputs = [ astroid isort mccabe ]; From 0ddae82e6a6388466a825000139f9fb986b50418 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 26 Mar 2019 16:24:04 +0100 Subject: [PATCH 236/238] python3: 3.7.2 -> 3.7.3 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index eac6fe8fb60..15af58be6fc 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -89,10 +89,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "2"; + patch = "3"; suffix = ""; }; - sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq"; + sha256 = "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s"; inherit (darwin) CF configd; inherit passthruFun; }; From 5c280ce1e4634b690aea9c7af26f7b68054eca6d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 26 Mar 2019 13:09:17 -0500 Subject: [PATCH 237/238] gpgme: 1.12.0 -> 1.13.0 https://lists.gnupg.org/pipermail/gnupg-announce/2019q1/000437.html Drop autoreconfHook and git, otherwise version contains `-unknown` which is unfortunate but also breaks build w/seahorse. --- pkgs/development/libraries/gpgme/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ed2c3e6b800..98a42aac72a 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which, ncurses -, autoreconfHook, fetchpatch -, git , texinfo , buildPackages , qtbase ? null @@ -15,11 +13,11 @@ in stdenv.mkDerivation rec { name = "gpgme-${version}"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l"; + sha256 = "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl"; }; outputs = [ "out" "dev" "info" ]; @@ -29,19 +27,11 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] + nativeBuildInputs = [ file pkgconfig gnupg texinfo ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - patches = [ - (fetchpatch { - name = "fix-key-expiry.patch"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60"; - sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02"; - }) - ]; - postPatch ='' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file ''; From 75514175920e1613c8eaf8026b367b48f8b77027 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 Mar 2019 22:03:37 -0700 Subject: [PATCH 238/238] srt: 1.3.1 -> 1.3.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/srt/versions --- pkgs/development/libraries/srt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index b1882ff030b..bb66174c884 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "0cv73j9c8024p6pg16c4hiryiv4jpgrfj2xhfdaprsikmkdnygmz"; + sha256 = "1h1kim9vvqnwx95yd9768ds30h731yg27jz63r90kjxm7b5kmja4"; }; nativeBuildInputs = [ cmake ];