From 9b7742eefc70b94c85c5942f2e4dc52a5b5f5cef Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 19 Jan 2019 22:05:58 +0100 Subject: [PATCH 001/399] 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 002/399] 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 003/399] 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 004/399] 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 33ef2829b663945d0d7ae702a6f5f5f342760401 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Mon, 18 Feb 2019 17:31:59 -0500 Subject: [PATCH 005/399] 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 006/399] 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 007/399] 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 008/399] 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 009/399] 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 010/399] 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 011/399] 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 012/399] 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 5883ef9dc2420a0dc30aa7da443d2dc4b4414b6d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Feb 2019 01:38:03 -0600 Subject: [PATCH 013/399] 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 014/399] 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 d1dd3a1f1af731d7b2a301a829f14be72b9654f8 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 25 Feb 2019 15:40:42 +0100 Subject: [PATCH 015/399] 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 016/399] 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 017/399] 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 018/399] 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 019/399] 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 9866979c230e7777278cce3c3cb56fcbd953874f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 28 Feb 2019 16:11:36 -0600 Subject: [PATCH 020/399] 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 1eab40211ef313848cd3cd7d17cd8c4917e7df39 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Mar 2019 00:15:39 +0100 Subject: [PATCH 021/399] 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 022/399] 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 023/399] 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 024/399] =?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 025/399] 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 026/399] 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 027/399] 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 a3eccfd5b0a77f1ea040bb125d28743475c2c595 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Mar 2019 22:37:13 -0600 Subject: [PATCH 028/399] cracklib: 2.9.6 -> 2.9.7 https://github.com/cracklib/cracklib/releases/tag/v2.9.7 I haven't looked into the details but notes mention: > apply patch to fix CVE-2016-6318 Stack-based buffer overflow when parsing large GECOS field > fix a buffer overflow processing long words --- pkgs/development/libraries/cracklib/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index b75f03fab7c..a2670bff6b7 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, zlib, gettext }: stdenv.mkDerivation rec { - name = "cracklib-2.9.6"; + pname = "cracklib"; + version = "2.9.7"; src = fetchurl { - url = "https://github.com/cracklib/cracklib/releases/download/${name}/${name}.tar.gz"; - sha256 = "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; + sha256 = "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py"; }; buildInputs = [ zlib gettext ]; From 8867dfd0161a084657275946e67fb80586d4ea01 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Mar 2019 23:17:20 -0600 Subject: [PATCH 029/399] cracklib: build default dictionary, run test --- pkgs/development/libraries/cracklib/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index a2670bff6b7..a761582f1c2 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, zlib, gettext }: +# TODO: wordlist? https://github.com/cracklib/cracklib/releases/download/v2.9.7/cracklib-words-2.9.7.gz is a start! stdenv.mkDerivation rec { pname = "cracklib"; version = "2.9.7"; @@ -11,6 +12,17 @@ stdenv.mkDerivation rec { buildInputs = [ zlib gettext ]; + postPatch = '' + chmod +x util/cracklib-format + patchShebangs util + ''; + + postInstall = '' + make dict + ''; + doInstallCheck = true; + installCheckTarget = "test"; + meta = with stdenv.lib; { homepage = https://github.com/cracklib/cracklib; description = "A library for checking the strength of passwords"; From 66dae3b1f048b5fd0a769c0b0d315b9f1a3409cd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 3 Mar 2019 23:50:37 -0600 Subject: [PATCH 030/399] cracklib: add wordlist from upstream, generate default dict with it --- pkgs/development/libraries/cracklib/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index a761582f1c2..d335a286c87 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,9 +1,14 @@ -{ stdenv, fetchurl, zlib, gettext }: +let version = "2.9.7"; in +{ stdenv, fetchurl, zlib, gettext +, wordlists ? [ (fetchurl { + url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; + sha256 = "12fk8w06q628v754l357cf8kfjna98wj09qybpqr892az3x4a33z"; +}) ] +}: -# TODO: wordlist? https://github.com/cracklib/cracklib/releases/download/v2.9.7/cracklib-words-2.9.7.gz is a start! stdenv.mkDerivation rec { pname = "cracklib"; - version = "2.9.7"; + inherit version; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; @@ -15,6 +20,8 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x util/cracklib-format patchShebangs util + + ln -vs ${toString wordlists} dicts/ ''; postInstall = '' From 28f801d1024d3adfd0bc7986a8c579ba0b78d91d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 5 Mar 2019 03:52:08 +0000 Subject: [PATCH 031/399] [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 032/399] [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 033/399] [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 034/399] [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 035/399] [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 036/399] [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 037/399] [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 038/399] [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 039/399] [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 040/399] [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 041/399] [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 042/399] [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 043/399] [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 044/399] [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 045/399] [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 046/399] [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 047/399] [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 048/399] [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 049/399] [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 050/399] [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 051/399] [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 052/399] [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 053/399] [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 054/399] [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 055/399] [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 056/399] [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 057/399] [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 058/399] [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 059/399] [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 060/399] [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 061/399] [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 062/399] [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 063/399] [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 064/399] [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 065/399] [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 066/399] [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 067/399] [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 068/399] [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 069/399] [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 070/399] [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 071/399] [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 072/399] [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 073/399] [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 074/399] [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 075/399] [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 076/399] [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 077/399] [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 078/399] [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 079/399] [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 080/399] [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 081/399] [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 082/399] [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 083/399] [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 084/399] [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 085/399] [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 086/399] [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 087/399] [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 088/399] [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 089/399] [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 090/399] [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 091/399] [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 092/399] [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 093/399] [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 094/399] [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 095/399] [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 096/399] [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 097/399] [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 098/399] [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 099/399] [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 100/399] [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 101/399] [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 102/399] [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 103/399] [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 104/399] [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 105/399] [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 106/399] [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 107/399] [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 108/399] [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 109/399] [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 110/399] [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 111/399] [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 112/399] [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 113/399] [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 114/399] [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 115/399] 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 116/399] 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 117/399] 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 118/399] 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 119/399] 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 120/399] 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 121/399] 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 122/399] 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 123/399] 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 124/399] 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 125/399] 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 126/399] 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 127/399] 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 128/399] 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 129/399] 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 130/399] 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 131/399] 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 b531c198063c4e5a1d71616ced308ac167fd4cdc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 10 Mar 2019 03:53:25 -0500 Subject: [PATCH 132/399] 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 133/399] 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 134/399] 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 135/399] 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 136/399] 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 137/399] 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 138/399] 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 139/399] 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 140/399] 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 141/399] 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 142/399] 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 143/399] 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 144/399] 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 145/399] 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 146/399] 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 147/399] 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 148/399] =?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 149/399] 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 150/399] 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 151/399] 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 152/399] 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 153/399] 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 154/399] 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 155/399] 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 156/399] 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 157/399] 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 158/399] 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 159/399] 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 160/399] 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 161/399] 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 162/399] 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 163/399] 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 164/399] 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 165/399] 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 166/399] 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 167/399] 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 168/399] 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 169/399] 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 170/399] 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 171/399] 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 172/399] 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 173/399] 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 174/399] 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 175/399] 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 176/399] 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 177/399] 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 178/399] 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 179/399] 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 180/399] 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 181/399] 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 182/399] 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 183/399] 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 184/399] 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 185/399] 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 186/399] 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 187/399] 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 188/399] 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 189/399] 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 190/399] 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 191/399] 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 192/399] 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 193/399] 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 194/399] 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 195/399] 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 196/399] 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 197/399] 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 198/399] 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 199/399] 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 200/399] 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 201/399] 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 7f6de09751d24b8af1787dfd67423a8dbb6ce1e5 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Tue, 26 Feb 2019 22:24:42 -0500 Subject: [PATCH 202/399] rust: Fix grammar in comment --- pkgs/development/compilers/rust/rustc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1f43832716b..8cddb9ea228 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ??? ''; - # rustc unfortunately need cmake for compiling llvm-rt but doesn't + # rustc unfortunately needs cmake to compile llvm-rt but doesn't # use it for the normal build. This disables cmake in Nix. dontUseCmakeConfigure = true; From 3c930188c8dff22327c1c12bb8b3baa49a011dda Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Mon, 11 Mar 2019 21:19:48 -0400 Subject: [PATCH 203/399] cargo: No need to skip space around = at Nix level --- pkgs/development/compilers/rust/cargo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index a7e2a40597b..65aa4ea9292 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; - LIBGIT2_SYS_USE_PKG_CONFIG=1; + LIBGIT2_SYS_USE_PKG_CONFIG = 1; # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel - RUSTC_BOOTSTRAP=1; + RUSTC_BOOTSTRAP = 1; # FIXME: Use impure version of CoreFoundation because of missing symbols. # CFURLSetResourcePropertyForKey is defined in the headers but there's no From 912dca193aee9da77a4d429285db53729d81aa3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 21 Nov 2018 01:47:45 +0000 Subject: [PATCH 204/399] rust: fix cross-compilation --- pkgs/build-support/rust/default.nix | 61 +++++++-- .../build-support/rust/make-rust-platform.nix | 18 --- pkgs/development/compilers/rust/cargo.nix | 12 +- pkgs/development/compilers/rust/default.nix | 98 +++++++++------ pkgs/development/compilers/rust/rustc.nix | 118 ++++++++++++------ pkgs/top-level/all-packages.nix | 15 +-- 6 files changed, 196 insertions(+), 126 deletions(-) delete mode 100644 pkgs/build-support/rust/make-rust-platform.nix diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index c69832a89b9..7130dde388b 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3 }: +{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3, buildPackages }: { name ? "${args.pname}-${args.version}" , cargoSha256 ? "unset" @@ -9,6 +9,7 @@ , sourceRoot ? null , logLevel ? "" , buildInputs ? [] +, nativeBuildInputs ? [] , cargoUpdateHook ? "" , cargoDepsHook ? "" , cargoBuildFlags ? [] @@ -37,21 +38,22 @@ let cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; + ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; + cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; + ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; + releaseDir = "target/${stdenv.hostPlatform.config}/release"; + in stdenv.mkDerivation (args // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; - buildInputs = [ cacert git cargo rustc ] ++ buildInputs; + nativeBuildInputs = [ cargo rustc git cacert ] ++ nativeBuildInputs; + inherit buildInputs; patches = cargoPatches ++ patches; - configurePhase = args.configurePhase or '' - runHook preConfigure - # noop - runHook postConfigure - ''; - postUnpack = '' eval "$cargoDepsHook" @@ -63,17 +65,40 @@ in stdenv.mkDerivation (args // { config=${./fetchcargo-default-config.toml}; fi; substitute $config .cargo/config \ - --subst-var-by vendor "$(pwd)/$cargoDepsCopy" + --subst-var-by vendor "$(pwd)/$cargoDepsCopy" unset cargoDepsCopy export RUST_LOG=${logLevel} '' + (args.postUnpack or ""); + configurePhase = args.configurePhase or '' + runHook preConfigure + mkdir -p .cargo + cat >> .cargo/config <<'EOF' + [target."${stdenv.buildPlatform.config}"] + "linker" = "${ccForBuild}" + ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' + [target."${stdenv.hostPlatform.config}"] + "linker" = "${ccForHost}" + ''} + EOF + cat .cargo/config + runHook postConfigure + ''; + buildPhase = with builtins; args.buildPhase or '' runHook preBuild - echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}" - cargo build --release --frozen ${concatStringsSep " " cargoBuildFlags} + echo "Running cargo build --target ${stdenv.hostPlatform.config} --release ${concatStringsSep " " cargoBuildFlags}" + env \ + "CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \ + "CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \ + "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \ + "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ + cargo build \ + --release \ + --target ${stdenv.hostPlatform.config} \ + --frozen ${concatStringsSep " " cargoBuildFlags} runHook postBuild ''; @@ -86,11 +111,21 @@ in stdenv.mkDerivation (args // { doCheck = args.doCheck or true; + inherit releaseDir; + installPhase = args.installPhase or '' runHook preInstall mkdir -p $out/bin $out/lib - find target/release -maxdepth 1 -type f -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin - find target/release -maxdepth 1 -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib + + find $releaseDir \ + -maxdepth 1 \ + -type f \ + -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) \ + -print0 | xargs -r -0 cp -t $out/bin + find $releaseDir \ + -maxdepth 1 \ + -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \ + -print0 | xargs -r -0 cp -t $out/lib rmdir --ignore-fail-on-non-empty $out/lib $out/bin runHook postInstall ''; diff --git a/pkgs/build-support/rust/make-rust-platform.nix b/pkgs/build-support/rust/make-rust-platform.nix deleted file mode 100644 index afbc56865ff..00000000000 --- a/pkgs/build-support/rust/make-rust-platform.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ callPackage }: -{ rustc, cargo, ... }: { - rust = { - inherit rustc cargo; - }; - - buildRustPackage = callPackage ./default.nix { - inherit rustc cargo; - - fetchcargo = callPackage ./fetchcargo.nix { - inherit cargo; - }; - }; - - rustcSrc = callPackage ../../development/compilers/rust/rust-src.nix { - inherit rustc; - }; -} diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 65aa4ea9292..9f576042787 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,13 +1,11 @@ { stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 , CoreFoundation, Security -, version -, patches ? [] -, src }: +}: rustPlatform.buildRustPackage rec { - name = "cargo-${version}"; - inherit version src patches; + name = "cargo-${rustc.version}"; + inherit (rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again cargoVendorDir = "vendor"; @@ -19,8 +17,8 @@ rustPlatform.buildRustPackage rec { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] + nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; + buildInputs = [ cacert file curl python openssl zlib libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG = 1; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 9640cd9b577..3a6ce5821d9 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,47 +1,67 @@ -{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +{ stdenv, lib, overrideCC +, buildPackages +, newScope, callPackage , CoreFoundation, Security -, targets ? [] -, targetToolchains ? [] -, targetPatches ? [] -}: +, gcc6 +}: rec { + makeRustPlatform = { rustc, cargo, ... }: { + rust = { + inherit rustc cargo; + }; -let - rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.32.0"; - cargoVersion = "1.32.0"; - src = fetchurl { - url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"; - }; -in rec { - rustc = callPackage ./rustc.nix { - inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src; + buildRustPackage = callPackage ../../../build-support/rust { + inherit rustc cargo; - patches = [ - ./patches/net-tcp-disable-tests.patch + fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix { + inherit cargo; + }; + }; - # Re-evaluate if this we need to disable this one - #./patches/stdsimd-disable-doctest.patch - ]; - - withBundledLLVM = false; - - configureFlags = [ "--release-channel=stable" ]; - - # 1. Upstream is not running tests on aarch64: - # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 - # So we do the same. - # 2. Tests run out of memory for i686 - #doCheck = !stdenv.isAarch64 && !stdenv.isi686; - - # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598. - doCheck = false; + rustcSrc = callPackage ./rust-src.nix { + inherit rustc; + }; }; - cargo = callPackage ./cargo.nix rec { - version = cargoVersion; - inherit src stdenv CoreFoundation Security; - inherit rustc; # the rustc that will be wrapped by cargo - inherit rustPlatform; # used to build cargo + # This just contains tools for now. But it would conceivably contain + # libraries too, say if we picked some default/recommended versions from + # `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for + # all vendored Carnix-generated nix. + # + # In the end game, rustc, the rust standard library (`core`, `std`, etc.), + # and cargo would themselves be built with `buildRustCreate` like + # everything else. Tools and `build.rs` and procedural macro dependencies + # would be taken from `buildRustPackages` (and `bootstrapRustPackages` for + # anything provided prebuilt or their build-time dependencies to break + # cycles / purify builds). In this way, nixpkgs would be in control of all + # bootstrapping. + packages = { + prebuilt = callPackage ./bootstrap.nix {}; + stable = lib.makeScope newScope (self: let + # Like `buildRustPackages`, but may also contain prebuilt binaries to + # break cycle. Just like `bootstrapTools` for nixpkgs as a whole, + # nothing in the final package set should refer to this. + bootstrapRustPackages = self.buildRustPackages.overrideScope' (_: _: + lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) + buildPackages.rust.packages.prebuilt); + bootRustPlatform = makeRustPlatform bootstrapRustPackages; + in { + # Packages suitable for build-time, e.g. `build.rs`-type stuff. + buildRustPackages = buildPackages.rust.packages.stable; + # Analogous to stdenv + rustPlatform = makeRustPlatform self.buildRustPackages; + rustc = self.callPackage ./rustc.nix ({ + # Use boot package set to break cycle + rustPlatform = bootRustPlatform; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); + cargo = self.callPackage ./cargo.nix ({ + # Use boot package set to break cycle + rustPlatform = bootRustPlatform; + inherit CoreFoundation Security; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); + }); }; } diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 8cddb9ea228..631c20d16c6 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,33 +1,28 @@ -{ stdenv, targetPackages, removeReferencesTo +{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps -, llvm, ncurses, darwin, rustPlatform, git, cmake, curl +, llvm_7, ncurses, darwin, git, cmake, curl, rustPlatform , which, libffi, gdb -, version , withBundledLLVM ? false -, src -, configureFlags ? [] -, patches -, targets -, targetPatches -, targetToolchains -, doCheck ? true -, broken ? false }: let inherit (stdenv.lib) optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - llvmShared = llvm.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; }; - target = builtins.replaceStrings [" "] [","] (builtins.toString targets); -in + # For use at runtime + llvmShared = llvm_7.override { enableSharedLibraries = true; }; +in stdenv.mkDerivation rec { + pname = "rustc"; + version = "1.32.0"; -stdenv.mkDerivation { - name = "rustc-${version}"; - inherit version; - - inherit src; + src = fetchurl { + url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; + sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"; + }; __darwinAllowLocalNetworking = true; @@ -40,11 +35,12 @@ stdenv.mkDerivation { # See https://github.com/NixOS/nixpkgs/pull/34227 stripDebugList = if stdenv.isDarwin then [ "bin" ] else null; + NIX_LDFLAGS = # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" - ++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib"; + ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"; # Enable nightly features in stable compiles (used for # bootstrapping, see https://github.com/rust-lang/rust/pull/37265). @@ -57,27 +53,67 @@ stdenv.mkDerivation { # We need rust to build rust. If we don't provide it, configure will try to download it. # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py - configureFlags = configureFlags - ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" - "--enable-vendor" - "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] - ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ] - ++ optional (targets != []) "--target=${target}"; + configureFlags = let + setBuild = "--set=target.${stdenv.buildPlatform.config}"; + setHost = "--set=target.${stdenv.hostPlatform.config}"; + setTarget = "--set=target.${stdenv.targetPlatform.config}"; + ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc"; + cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++"; + ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc"; + cxxForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}c++"; + ccForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc"; + cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++"; + in [ + "--release-channel=stable" + "--set=build.rustc=${rustPlatform.rust.rustc}/bin/rustc" + "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" + "--enable-rpath" + "--enable-vendor" + "--build=${stdenv.buildPlatform.config}" + "--host=${stdenv.hostPlatform.config}" + "--target=${stdenv.targetPlatform.config}" + + "${setBuild}.cc=${ccForBuild}" + "${setHost}.cc=${ccForHost}" + "${setTarget}.cc=${ccForTarget}" + + "${setBuild}.linker=${ccForBuild}" + "${setHost}.linker=${ccForHost}" + "${setTarget}.linker=${ccForTarget}" + + "${setBuild}.cxx=${cxxForBuild}" + "${setHost}.cxx=${cxxForHost}" + "${setTarget}.cxx=${cxxForTarget}" + ] ++ optional (!withBundledLLVM) [ + "--enable-llvm-link-shared" + "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config" + "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config" + "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" + ]; # The bootstrap.py will generated a Makefile that then executes the build. # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass # to the bootstrap builder. postConfigure = '' - substituteInPlace Makefile --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)' + substituteInPlace Makefile \ + --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)' ''; - patches = patches ++ targetPatches; + patches = [ + ./patches/net-tcp-disable-tests.patch + + # Re-evaluate if this we need to disable this one + #./patches/stdsimd-disable-doctest.patch + + # Fails on hydra - not locally; the exact reason is unknown. + # Comments in the test suggest that some non-reproducible environment + # variables such $RANDOM can make it fail. + # ./patches/disable-test-inherit-env.patch + ]; # the rust build system complains that nix alters the checksums dontFixLibtool = true; - passthru.target = target; - postPatch = '' patchShebangs src/etc @@ -120,15 +156,13 @@ stdenv.mkDerivation { dontUseCmakeConfigure = true; # ps is needed for one of the test cases - nativeBuildInputs = - [ file python2 ps rustPlatform.rust.rustc git cmake - which libffi removeReferencesTo - ] - # Only needed for the debuginfo tests + nativeBuildInputs = [ + file python2 ps rustPlatform.rust.rustc git cmake + which libffi removeReferencesTo + ] # Only needed for the debuginfo tests ++ optional (!stdenv.isDarwin) gdb; - buildInputs = targetToolchains - ++ optional stdenv.isDarwin Security + buildInputs = optional stdenv.isDarwin Security ++ optional (!withBundledLLVM) llvmShared; outputs = [ "out" "man" "doc" ]; @@ -148,7 +182,14 @@ stdenv.mkDerivation { sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs ''; - inherit doCheck; + # 1. Upstream is not running tests on aarch64: + # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 + # So we do the same. + # 2. Tests run out of memory for i686 + #doCheck = !stdenv.isAarch64 && !stdenv.isi686; + + # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598. + doCheck = false; # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so # and thus a transitive dependency on ncurses @@ -170,6 +211,5 @@ stdenv.mkDerivation { maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; - broken = broken; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 690169095f9..632fd18bf46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7615,14 +7615,12 @@ in inherit (darwin) apple_sdk; }; - # For beta and nightly releases use the nixpkgs-mozilla overlay - rust = callPackage ../development/compilers/rust ({ + rust = callPackage ../development/compilers/rust { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvm = llvm_7; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); - inherit (rust) cargo rustc; + }; + rustPackages = rust.packages.stable; + inherit (rustPackages) cargo rustc rustPlatform; + inherit (rust) makeRustPlatform; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; @@ -7638,9 +7636,6 @@ in defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; - makeRustPlatform = callPackage ../build-support/rust/make-rust-platform.nix {}; - rustPlatform = recurseIntoAttrs (makeRustPlatform rust); - cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-release = callPackage ../tools/package-management/cargo-release { From 60761e65ba38280ce19e1d7e3c4ffd883212a96c Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Fri, 22 Feb 2019 01:16:20 -0500 Subject: [PATCH 205/399] rust: move releaseDir to target/release in the buildPhase --- pkgs/build-support/rust/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 7130dde388b..ad8488494e4 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -89,7 +89,9 @@ in stdenv.mkDerivation (args // { buildPhase = with builtins; args.buildPhase or '' runHook preBuild - echo "Running cargo build --target ${stdenv.hostPlatform.config} --release ${concatStringsSep " " cargoBuildFlags}" + + ( + set -x env \ "CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \ "CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \ @@ -99,6 +101,15 @@ in stdenv.mkDerivation (args // { --release \ --target ${stdenv.hostPlatform.config} \ --frozen ${concatStringsSep " " cargoBuildFlags} + ) + + # rename the output dir to a architecture independent one + mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$') + for target in "''${targets[@]}"; do + rm -rf "$target/../../release" + ln -srf "$target" "$target/../../" + done + runHook postBuild ''; From bdd3c3fdcb11416d2e2ef459c2e28caa2235f0f3 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Tue, 26 Feb 2019 00:52:01 -0500 Subject: [PATCH 206/399] rust: allow building in debug or release modes --- pkgs/build-support/rust/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ad8488494e4..028390640d1 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -13,11 +13,13 @@ , cargoUpdateHook ? "" , cargoDepsHook ? "" , cargoBuildFlags ? [] +, buildType ? "release" , cargoVendorDir ? null , ... } @ args: assert cargoVendorDir == null -> cargoSha256 != "unset"; +assert buildType == "release" || buildType == "debug"; let cargoDeps = if cargoVendorDir == null @@ -42,7 +44,7 @@ let cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - releaseDir = "target/${stdenv.hostPlatform.config}/release"; + releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}"; in stdenv.mkDerivation (args // { inherit cargoDeps; @@ -98,7 +100,7 @@ in stdenv.mkDerivation (args // { "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \ "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ cargo build \ - --release \ + --${buildType} \ --target ${stdenv.hostPlatform.config} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) @@ -106,7 +108,7 @@ in stdenv.mkDerivation (args // { # rename the output dir to a architecture independent one mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$') for target in "''${targets[@]}"; do - rm -rf "$target/../../release" + rm -rf "$target/../../${buildType}" ln -srf "$target" "$target/../../" done From f93470d7a318d91740120e45f8cc6455bc7c56ef Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Tue, 12 Mar 2019 09:07:36 -0400 Subject: [PATCH 207/399] rust: set PKG_CONFIG_ALLOW_CROSS conditionally in buildRustPackage --- pkgs/build-support/rust/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 028390640d1..2579c97b99e 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -56,6 +56,9 @@ in stdenv.mkDerivation (args // { patches = cargoPatches ++ patches; + PKG_CONFIG_ALLOW_CROSS = + if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0; + postUnpack = '' eval "$cargoDepsHook" From 54e908237550b95080d262143c121f064dbd6ff0 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Mon, 11 Mar 2019 21:19:48 -0400 Subject: [PATCH 208/399] rust: Don't force gcc6 --- pkgs/development/compilers/rust/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 3a6ce5821d9..47df7e716dc 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -2,7 +2,6 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security -, gcc6 }: rec { makeRustPlatform = { rustc, cargo, ... }: { rust = { @@ -49,19 +48,15 @@ buildRustPackages = buildPackages.rust.packages.stable; # Analogous to stdenv rustPlatform = makeRustPlatform self.buildRustPackages; - rustc = self.callPackage ./rustc.nix ({ + rustc = self.callPackage ./rustc.nix { # Use boot package set to break cycle rustPlatform = bootRustPlatform; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); - cargo = self.callPackage ./cargo.nix ({ + }; + cargo = self.callPackage ./cargo.nix { # Use boot package set to break cycle rustPlatform = bootRustPlatform; inherit CoreFoundation Security; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); + }; }); }; } From 839152809645ad3a40c033d6ae3e754fd8a44aa2 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Wed, 13 Mar 2019 12:52:01 -0400 Subject: [PATCH 209/399] rust: disable stripping to prevent bad cross rlibs --- pkgs/development/compilers/rust/rustc.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 631c20d16c6..48ac4698a14 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -33,7 +33,10 @@ in stdenv.mkDerivation rec { # .rlib files in "lib/". # # See https://github.com/NixOS/nixpkgs/pull/34227 - stripDebugList = if stdenv.isDarwin then [ "bin" ] else null; + # + # Running `strip -S` when cross compiling can harm the cross rlibs. + # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656 + stripDebugList = [ "bin" ]; NIX_LDFLAGS = From a891ae51303f428aa065c2d917179f299e2b564f Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Tue, 12 Mar 2019 10:05:31 -0400 Subject: [PATCH 210/399] synapse-bt: openssl should be build input --- pkgs/applications/networking/p2p/synapse-bt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 8622b374100..554fe9f8ea0 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1sc8c0w2dbvcdv16idw02y35x0jx5ff6ddzij09pmqjx55zgsjf7"; - buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; cargoBuildFlags = [ "--all" ]; From 3bcede8f5c4b7837468850679b55cc494ec017d1 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Fri, 8 Mar 2019 23:55:02 -0500 Subject: [PATCH 211/399] librsvg: make-fonts-conf: update with correct native deps --- pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 3 ++- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index 3cd4a894b37..b18d72e0a22 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -2,7 +2,8 @@ runCommand "fonts.conf" { - buildInputs = [ libxslt fontconfig ]; + nativeBuildInputs = [ libxslt ]; + buildInputs = [ fontconfig ]; # Add a default font for non-nixos systems, <1MB and in nixos defaults. fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ]; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 9cd68cacfe7..c575cee752f 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintl, darwin, rust, gnome3 +, bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3 , withGTK ? false, gtk3 ? null , vala, gobject-introspection }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; - nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobject-introspection ] + nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); From 75514175920e1613c8eaf8026b367b48f8b77027 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 Mar 2019 22:03:37 -0700 Subject: [PATCH 212/399] 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 ]; From c3d1012f0206ba5f843cca76ee2e8add8d9e49f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 31 Mar 2019 07:54:23 -0700 Subject: [PATCH 213/399] apacheHttpd: 2.4.38 -> 2.4.39 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apache-httpd/versions --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 64e57f64236..5933a71e515 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.38"; + version = "2.4.39"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0jiriyyf3pm6axf4mrz6c2z08yhs21hb4d23viq87jclm5bmiikx"; + sha256 = "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml"; }; # FIXME: -dev depends on -doc From 0f3bf7de698dbf380c3cadaf2beea4f1aa3ef7a8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 3 Apr 2019 16:52:28 -0400 Subject: [PATCH 214/399] packagekit: make vala nativeBuildInputs --- 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 90893c8b7d9..2e9f93177e4 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x"; }; - buildInputs = [ glib polkit python gobject-introspection vala ] + buildInputs = [ glib polkit python gobject-introspection ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; + nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' gtkdocize From e7bc21bacd453811fe1c44df5d4abd5d864d0f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 17:33:22 +0100 Subject: [PATCH 215/399] glib: 2.58.3 -> 2.60.0 - `install_dir : bin` fix is now upstream - We now need to pass `nls=enabled` to install po/Makefile.in.in --- pkgs/development/libraries/glib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e7d0e9ec423..05a52dce0f9 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.3"; + version = "2.60.0"; 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 = "10blprf5djbwxq8dqmjvcsdc9vqz63rl0ammfbd2b2p8cwbw6hwg"; + sha256 = "0ls3njqknb345ni5i8hn9nr1n70kn6s8bi0g6kcqj3c4js5mv1i0"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -96,15 +96,15 @@ stdenv.mkDerivation rec { # Avoid the need for gobject introspection binaries in PATH in cross-compiling case. # Instead we just copy them over from the native output. "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}" + "-Dnls=enabled" ]; LC_ALL = "en_US.UTF-8"; - NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP"; + NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP") + ++ [ "-Wno-error=nonnull" ]; postPatch = '' - substituteInPlace meson.build --replace "install_dir : 'bin'," "install_dir : glib_bindir," - # substitute fix-gio-launch-desktop-path.patch substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin" From f3911d3ff2fa03cc092d7b14a075ee18812b59b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 17:43:16 +0100 Subject: [PATCH 216/399] gobject-introspection: 1.58.3 -> 1.60.0 --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index c00b5eca300..816d4e5e17d 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -9,7 +9,7 @@ let pname = "gobject-introspection"; - version = "1.58.3"; + version = "1.60.0"; in with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1j63rll0s608s0v4kqxkjapkpf46l069mlahzh8wykclplmn6nq2"; + sha256 = "0pgk9lcvz3i79m6g2ynlp00ghws7g0p0d5qyf0k72warrf841zly"; }; outputs = [ "out" "dev" "man" ]; From 60a8244b355ccde21b99d49e39686012f1a08f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 18:23:57 +0100 Subject: [PATCH 217/399] gsettings-desktop-schemas: 3.28.1 -> 3.32.0 --- .../gsettings-desktop-schemas/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index dad0c8850b2..c1bdcd6956e 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -1,23 +1,29 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection +, meson +, ninja +, python3 # just for passthru , gnome3 }: stdenv.mkDerivation rec { name = "gsettings-desktop-schemas-${version}"; - version = "3.28.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq"; + sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; }; + # meson installs the schemas to share/glib-2.0/schemas + # We add the override file there too so it will be compiled and later moved by + # glib's setup hook. preInstall = '' - mkdir -p $out/share/gsettings-schemas/${name}/glib-2.0/schemas - cat - > $out/share/gsettings-schemas/${name}/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF + mkdir -p $out/share/glib-2.0/schemas + cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF [org.gnome.desktop.background] picture-uri=''' @@ -26,9 +32,14 @@ stdenv.mkDerivation rec { EOF ''; + postPatch = '' + chmod +x build-aux/meson/post-install.py + patchShebangs build-aux/meson/post-install.py + ''; + buildInputs = [ glib gobject-introspection ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig python3 meson ninja ]; meta = with stdenv.lib; { maintainers = gnome3.maintainers; From f95d5f08cf9af2754d640b5ad512324a9a2f2e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 18:35:28 +0100 Subject: [PATCH 218/399] glib-networking: 2.58.0 -> 2.60.1 https://gitlab.gnome.org/GNOME/glib-networking/blob/2.60.1/NEWS * fixes the telepathy-idle CPU load issue --- pkgs/development/libraries/glib-networking/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index e8105ef0823..ab5826bc796 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -3,14 +3,14 @@ let pname = "glib-networking"; - version = "2.58.0"; + version = "2.60.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx"; + sha256 = "14jx8ca7plgh196629ghj41gsaha0aza222g64093hjsm8pnn76p"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ]; + mesonFlags = [ + # Default auto detection doesn't work + "-Dgnutls=enabled" + ]; + doCheck = false; # tests need to access the certificates (among other things) passthru = { From 3335779cc0a388b2824f951a1486508b3a8f3ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 18:57:36 +0100 Subject: [PATCH 219/399] vte: 0.54.3 -> 0.56.0 --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 97bb961c4bc..38e96570f27 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.54.3"; + version = "0.56.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9"; + sha256 = "1w5p26p7gadvh49g28m2yiihpmhhxlsc7ad1qvgvfnwxdgk51asz"; }; passthru = { From 7b7b4f37c13756e6c760b3234a4191dcb09eec45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 18:58:06 +0100 Subject: [PATCH 220/399] libsoup: 2.64.2 -> 2.66.0 --- pkgs/development/libraries/libsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index e59282553fb..d0023a3d4f3 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libsoup"; - version = "2.64.2"; + version = "2.66.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm"; + sha256 = "08c9kkdhzy504gv23pfdm4sq3dd3j20sikwz6gv0qrwcdjnw5bai"; }; postPatch = '' From 43f21c58eafd62d20138f9a6a8286f54d3db8d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 18:59:00 +0100 Subject: [PATCH 221/399] librsvg: 2.44.12 -> 2.45.5 --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index c575cee752f..21eeb1848d9 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -5,14 +5,14 @@ let pname = "librsvg"; - version = "2.44.12"; + version = "2.45.5"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6"; + sha256 = "001phhq3dd9i6mkbjnmw468vjlqvs1330nwdzldy1rcgc3f74230"; }; outputs = [ "out" "dev" "installedTests" ]; From f2cb37162be12d21d5677db23b1c74ce654f0a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:00:11 +0100 Subject: [PATCH 222/399] libgweather: 3.28.2 -> 3.32.0 --- pkgs/development/libraries/libgweather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index b5fda25a8c5..5c29a41d856 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.28.2"; + version = "3.32.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708"; + sha256 = "04qxm5jgj5fzjb06ghwqx3c2qsc502arrfw0xl9f09wb58wjp6ny"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; From ea541eec9a0b9ff4ecc8ee6863269bdf06cd4422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:02:04 +0100 Subject: [PATCH 223/399] libgtop: 2.38.0 -> 2.40.0 --- .../development/libraries/libgtop/default.nix | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index fcc76938b3e..fe7986bf21a 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,30 +1,34 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobject-introspection, libtool, gnome3, gtk-doc }: -let - pname = "libgtop"; - version = "2.38.0"; -in +{ stdenv +, fetchurl +, glib +, pkgconfig +, perl +, gettext +, gobject-introspection +, gnome3 +, gtk-doc +}: + stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "libgtop"; + version = "2.40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"; }; - patches = [ - # Fix darwin build - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/libgtop/commit/42b049f338363f92c1e93b4549fc944098eae674.patch; - sha256 = "0kf9ihgb0wqji6dcvg36s6igkh7b79k6y1n7w7wzsxya84x3hhyn"; - }) + nativeBuildInputs = [ + pkgconfig + gtk-doc + perl + gettext + gobject-introspection ]; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobject-introspection ]; - - preConfigure = '' - ./autogen.sh - ''; + propagatedBuildInputs = [ + glib + ]; passthru = { updateScript = gnome3.updateScript { From 491e27a0df0baa3e02da327e09b485a80e19c043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:02:40 +0100 Subject: [PATCH 224/399] libdazzle: 3.30.2 -> 3.32.0 --- pkgs/development/libraries/libdazzle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index bef7a161dd3..8102838113b 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }: let - version = "3.30.2"; + version = "3.32.0"; pname = "libdazzle"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq"; + sha256 = "1mi87c10wa8d9bz2c8lil7gs2m76i51hq7i8ixm839zqrq5xi7ll"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ]; From f6e018a3ed0de6bde45fa2c862dc694febc41899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:05:17 +0100 Subject: [PATCH 225/399] gvfs: 1.38.1 -> 1.40.0 `codegen.py` no longer exists --- pkgs/development/libraries/gvfs/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f7fda1a382f..c1d46524093 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -9,20 +9,19 @@ let pname = "gvfs"; - version = "1.38.1"; + version = "1.40.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd"; + sha256 = "1wp266dx3v2nwrf46cb4vpmv5d4qaag5yb5gkw7rynn9g55xcf9p"; }; postPatch = '' # patchShebangs requires executable file - chmod +x codegen.py meson_post_install.py + chmod +x meson_post_install.py patchShebangs meson_post_install.py - patchShebangs codegen.py patchShebangs test test-driver ''; From 43c905acd1aa7295c467ac2cd13d8cd7faaecc51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:05:40 +0100 Subject: [PATCH 226/399] gexiv2: 0.10.10 -> 0.12.0 --- pkgs/development/libraries/gexiv2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 350f38d8703..7203f8531c2 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.10.10"; + version = "0.12.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx"; + sha256 = "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq"; }; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ exiv2 ]; mesonFlags = [ - "-Denable-gtk-doc=true" # TODO: change to gtk_doc in a next release + "-Dgtk_doc=true" ]; doCheck = true; From fb5b2ad53fe359750d3fb4f219a15abfdf1dc8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:08:17 +0100 Subject: [PATCH 227/399] gnome3.tracker: 2.1.6 -> 2.2.1 - move patch to file - turn on docs (they're turned off by default now) --- .../desktops/gnome-3/core/tracker/default.nix | 27 +++++++------------ .../gnome-3/core/tracker/fix-paths.patch | 12 +++++++++ 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/tracker/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index d744fc6c87c..4b450c17477 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python2 +{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python3 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer -, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: +, gnome3, icu, libuuid, networkmanager, libsoup, json-glib +, substituteAll}: let pname = "tracker"; - version = "2.1.6"; + version = "2.2.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,13 +14,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "143zapq50lggj3mpqg2y4rh1hgnkbn9vgvzpqxr7waiawsmx0awq"; + sha256 = "1zx2mlnsv6clgh0j50f0b94b7cf1al1j7bkcz8cr31a0fkkgkkhc"; }; nativeBuildInputs = [ meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales - python2 # for data-generators + python3 # for data-generators ]; buildInputs = [ @@ -33,27 +34,19 @@ in stdenv.mkDerivation rec { "-Dsystemd_user_services=lib/systemd/user" # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas "-Dfunctional_tests=false" + "-Ddocs=true" ]; patches = [ - # Always generate tracker-sparql.h in time - (fetchurl { - url = https://gitlab.gnome.org/GNOME/tracker/commit/3cbfaa5b374e615098e60eb4430f108b642ebe76.diff; - sha256 = "0smavzvsglpghggrcl8sjflki13nh7pr0jl2yv6ymbf5hr1c4dws"; + (substituteAll { + src = ./fix-paths.patch; + glib_dev = glib.dev; }) ]; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate - - # make .desktop Exec absolute - patch -p0 < Date: Sun, 3 Mar 2019 19:10:34 +0100 Subject: [PATCH 228/399] gnome3.tracker-miners: 2.1.5 -> 2.2.1 - update patch: meson.build now get stuff correctly from pkgconfig --- .../gnome-3/core/tracker-miners/default.nix | 4 ++-- .../core/tracker-miners/fix-paths.patch | 22 ------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 85bb32972f4..1f5e2fcca5c 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -8,11 +8,11 @@ let pname = "tracker-miners"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2.1.5"; + version = "2.2.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1kdq7fk9c80ngg65p31pjdk4za0fq7nfhblqsma9alvkam5kvzgm"; + sha256 = "1xbjbd994jxhdan7227kzdnmiblfy0f1vnsws5l809ydgk58f0qr"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch index 47ad114eb0b..724c51cb56f 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -1,25 +1,3 @@ ---- a/meson.build -+++ b/meson.build -@@ -25,15 +25,15 @@ - # - # This check acts as a guard to make sure we are being configured with the - # right prefix, among other things. -- tracker_store = find_program(join_paths(get_option('prefix'), get_option('libexecdir'), 'tracker-store')) -+ tracker_store = find_program(join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'libexec', 'tracker-store')) - tracker_store_path = tracker_store.path() - - # If we are building against an installed version of tracker core rather than - # having it as a subproject, these 'uninstalled' locations point to the actual - # installed locations. -- tracker_uninstalled_domain_rule = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'domain-ontologies', 'default.rule') -- tracker_uninstalled_nepomuk_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'ontologies', 'nepomuk') -- tracker_uninstalled_stop_words_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'stop-words', 'default.rule') -+ tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule') -+ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk') -+ tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule') - else - tracker_subproject = subproject('tracker', - default_options: [ --- a/src/libtracker-miners-common/tracker-domain-ontology.c +++ b/src/libtracker-miners-common/tracker-domain-ontology.c @@ -323,7 +323,7 @@ From 714dd8bf8b8804cbc313f414c67c2f0c13117f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:11:28 +0100 Subject: [PATCH 229/399] gnome3.gjs: 1.54.3 -> 1.56.0 --- pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index ac3a25b7dc7..b8dd9543bf9 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.54.3"; + version = "1.56.0"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cd65d4nq5xxlyjz1b83hm5zklyry6lillzf782nr0z97k60vcvn"; + sha256 = "06pcfpscpdv9nir0hrcfglbkq0whlv7sncmlmdgi1c5daiasv9v4"; }; passthru = { From 9e5ac89a778fcf6466105287302e9ecec5d00d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:13:12 +0100 Subject: [PATCH 230/399] evolution-data-server: 3.30.5 -> 3.32.0 --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 62ed7aaa3d8..81252c9e504 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.30.5"; + version = "3.32.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli"; + sha256 = "1pnxf0jcbmh86ahkjgn3l2521yvgypgmfz590wp350z4fi4vh44f"; }; patches = [ From 037e1e8ea8ea233108f75996e19f5485166e4a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:13:49 +0100 Subject: [PATCH 231/399] gnome3.evolution: 3.30.5 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index fa406e6f4db..a8cdef1c1f1 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -7,13 +7,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.30.5"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h"; + sha256 = "1skwhg3fbyg3acivknnpm7hs5xy0zwlvnyf5cxs59kxh1l41xmnc"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; From 0405df7535b3f51d62e07178bc241179a470557a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:16:37 +0100 Subject: [PATCH 232/399] gnome3.epiphany: 3.30.3 -> 3.32.1.2 - unit_tests is now a feature not a bool https://gitlab.gnome.org/GNOME/epiphany/blob/3.32.1.2/NEWS --- pkgs/desktops/gnome-3/core/epiphany/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 37cdce40f34..9abfd31b37d 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -2,19 +2,19 @@ , wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit , sqlite, gcr, isocodes, desktop-file-utils, python3 -, gdk_pixbuf, gst_all_1, json-glib, libdazzle }: +, gdk_pixbuf, gst_all_1, json-glib, libdazzle, libhandy }: stdenv.mkDerivation rec { name = "epiphany-${version}"; - version = "3.30.3"; + version = "3.32.1.2"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "05qdzx18ld1m3xiajpz6y6snfj56bgyjsgm7f4rqrnpjdbdvikbn"; + sha256 = "1gi6g519i0dldwa8bmp047j9mdf8k0asr3ja2m593dy8pfwlya58"; }; # Tests need an X display - mesonFlags = [ "-Dunit_tests=false" ]; + mesonFlags = [ "-Dunit_tests=disabled" ]; nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify - sqlite isocodes p11-kit icu + sqlite isocodes p11-kit icu libhandy gdk_pixbuf gnome3.adwaita-icon-theme gcr glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly From 94d4cbd619d45e49afe35d27521c9fb7a90b723d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:17:23 +0100 Subject: [PATCH 233/399] evince: 3.30.2 -> 3.32.0 - pruneLibtoolFiles is now on by default - build now require appstream to generate some data - upstream has switched from intltool to gettext - clean up - recentListSize no longer applicable --- pkgs/desktops/gnome-3/core/evince/default.nix | 86 +++++++++++++------ 1 file changed, 61 insertions(+), 25 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index c27e380470a..80a8700ab6a 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,35 +1,72 @@ -{ fetchurl, stdenv, pkgconfig, intltool, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook -, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas +{ fetchurl +, stdenv +, autoreconfHook +, pkgconfig +, gettext +, libxml2 +, appstream +, glib +, gtk3 +, pango +, atk +, gdk_pixbuf +, shared-mime-info +, itstool +, gnome3 +, poppler +, ghostscriptX +, djvulibre +, libspectre +, libarchive +, libsecret +, wrapGAppsHook +, librsvg +, gobject-introspection +, yelp-tools +, gspell +, adwaita-icon-theme +, gsettings-desktop-schemas , libgxps -, recentListSize ? null # 5 is not enough, allow passing a different number -, supportXPS ? false # Open XML Paper Specification via libgxps -, autoreconfHook, pruneLibtoolFiles +, supportXPS ? false # Open XML Paper Specification via libgxps }: stdenv.mkDerivation rec { - name = "evince-${version}"; - version = "3.30.2"; + pname = "evince"; + version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "evince"; }; + url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0h2c6b2h6g3zy0gnycrjk1y7rp0kf7ppci76dmd2zvb6chhpgngh"; }; nativeBuildInputs = [ - pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook pruneLibtoolFiles + autoreconfHook + pkgconfig + gobject-introspection + gettext + itstool + yelp-tools + appstream + wrapGAppsHook ]; buildInputs = [ - glib gtk3 pango atk gdk_pixbuf libxml2 + glib + gtk3 + pango + atk + gdk_pixbuf + libxml2 gsettings-desktop-schemas - poppler ghostscriptX djvulibre libspectre libarchive - libsecret librsvg adwaita-icon-theme gspell + poppler + ghostscriptX + djvulibre + libspectre + libarchive + libsecret + librsvg + adwaita-icon-theme + gspell ] ++ stdenv.lib.optional supportXPS libgxps; configureFlags = [ @@ -41,16 +78,15 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - preConfigure = stdenv.lib.optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; - preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Evince; From 958767c53095be39aaa6aac1d17edee95aa1abec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:18:10 +0100 Subject: [PATCH 234/399] gnome3.adwaita-icon-theme: 3.30.1 -> 3.32.0 --- pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index b091395ab37..0f88372d9cf 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1kp1lis3dr16jmlgycz1b29jsr6ir8wmqj6laqwlhs663cmjlxbd"; + sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9"; }; # For convenience, we can specify adwaita-icon-theme only in packages From aae7a6c4c12c2c1c5e1ec2db0aa1c5ad35f00421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:18:45 +0100 Subject: [PATCH 235/399] baobab: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/core/baobab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index cf73524a0ca..4734a0e96b8 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -4,13 +4,13 @@ let pname = "baobab"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0kx721s1hhw1g0nvbqhb93g8iq6f852imyhfhl02zcqy4ipx0kay"; + sha256 = "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; From e671e003138642a33e82ca10d112c1dda45a4c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:19:17 +0100 Subject: [PATCH 236/399] gnome3.dconf: 0.30.1 -> 0.32.0 --- pkgs/desktops/gnome-3/core/dconf/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 1f55071c83d..41f1c931b59 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "0.30.1"; + version = "0.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl"; + sha256 = "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38"; }; patches = [ @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - chmod +x meson_post_install.py + chmod +x meson_post_install.py tests/test-dconf.py patchShebangs meson_post_install.py + patchShebangs tests/test-dconf.py ''; outputs = [ "out" "lib" "dev" "devdoc" ]; From 1344ef2ce9431b22db2b78af6bb3561fbc5cf610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:19:49 +0100 Subject: [PATCH 237/399] gnome3.dconf-editor: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 0d583dccf76..3862d822a7b 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -3,13 +3,13 @@ let pname = "dconf-editor"; - version = "3.30.2"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia"; + sha256 = "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi"; }; nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobject-introspection python3 ]; From 11c90c3c43b15328dc871c416000da43242bf08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:20:14 +0100 Subject: [PATCH 238/399] gnome3.eog: 3.28.4 -> 3.32.0 --- pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 5b6281869cc..80f73e41362 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.28.4"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55"; + sha256 = "005cjq0i4281yw9wa6dyp5ymbx1yiprx1k5lgvfdd37qpbkk017z"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; From ed208c5b31284d3527248758b4b53df130e5a1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:20:47 +0100 Subject: [PATCH 239/399] gnome3.gdm: 3.30.3 -> 3.32.0 --- pkgs/desktops/gnome-3/core/gdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index c985d01a5e6..83134381173 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gdm-${version}"; - version = "3.30.3"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak"; + sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4"; }; # Only needed to make it build From 21a5dbf2a480f98675c0c8a1df46c00b3f81bd40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:21:34 +0100 Subject: [PATCH 240/399] gnome3.gnome-backgrounds: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index a938a59f7a0..1e332502db5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-backgrounds-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1179jrl16bp9gqabqhw7nnfp8qzf5y1vf9fi45bni6rfmwm3mrpc"; + sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz"; }; passthru = { From a0293afece98a6bf97ba86c054fc612be940f306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:22:03 +0100 Subject: [PATCH 241/399] gnome3.gnome-bluetooth: 3.28.2 -> 3.32.1 https://gitlab.gnome.org/GNOME/gnome-bluetooth/blob/GNOMEBT_V_3_32_1/NEWS --- pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index e09d0b4e6f9..ebea0922406 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -6,14 +6,14 @@ let pname = "gnome-bluetooth"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.28.2"; + version = "3.32.1"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z"; + sha256 = "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4"; }; nativeBuildInputs = [ From 6d7b4c0f79dae421390a28c22a23101c9b437279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:22:25 +0100 Subject: [PATCH 242/399] gnome3.gnome-calculator: 3.30.1 -> 3.32.0 Now require `gtksourceview4` instead of 3. --- pkgs/desktops/gnome-3/core/gnome-calculator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 037509b9c54..e316f627da9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,14 +1,14 @@ { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 -, gtk3, glib, gtksourceview3, wrapGAppsHook, gobject-introspection, python3 +, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 , gnome3, mpfr, gmp, libsoup, libmpc }: stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc"; + sha256 = "0m4g7ml6ch9cc4wdchlyspakz3a9ak1rka26j08nvhhvllkdkqlw"; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 glib libxml2 gtksourceview3 mpfr gmp + gtk3 glib libxml2 gtksourceview4 mpfr gmp gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libsoup libmpc ]; From 0bac188b599c790f34eb2897306e26108fc72e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:22:49 +0100 Subject: [PATCH 243/399] gnome3.gnome-contacts: 3.30.2 -> 3.32.0 - enable telepathy again - fix build with libsoup, pulled in through folks_eds. Probably caused by libsoup version bump, but not sure. --- .../gnome-3/core/gnome-contacts/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 253bbc4e196..b287cf35194 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -2,16 +2,16 @@ , pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts , wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib -, vala, meson, ninja }: +, vala, meson, ninja, libhandy }: let - version = "3.30.2"; + version = "3.32"; in stdenv.mkDerivation rec { name = "gnome-contacts-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h"; + sha256 = "12vr75d5akhs0fzmjg6j21jrrlr8njdrf9dwhw94k8p73y1gjjgw"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; @@ -22,14 +22,18 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas - folks gnome-desktop telepathy-glib + folks gnome-desktop telepathy-glib libhandy libxml2 gnome-online-accounts cheese gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib ]; + mesonFlags = [ + "-Dtelepathy=true" + ]; + postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py ''; # In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0: From f18aaa1c9f0df75b0a5776a0ba51e694e302cab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:23:25 +0100 Subject: [PATCH 244/399] gnome3.gnome-control-center: 3.30.3 -> 3.32.1 - update patch - add new depeendencies: udisks2, gsound - add system libhandy - Remove unnecessary dependencies Hardcode paths to * nm-connection-editor * passwd /run/wrappers/bin/passwd * lib/cups/backend/snmp Only thing left unpatched was something for the printing panel. It prefers a path from CUPS_DATADIR [0] which after investigation is unset globally, and I'm not familar with cups to see if that should be set to a store path or a linked system path. [0]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/3.32.0.1/panels/printers/pp-options-dialog.c#L888 https://gitlab.gnome.org/GNOME/gnome-control-center/blob/3.32.1/NEWS --- .../core/gnome-control-center/default.nix | 27 +++--- .../core/gnome-control-center/paths.patch | 94 +++++++++++++++++-- 2 files changed, 99 insertions(+), 22 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 5e90998b539..57924dce5b0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,28 +1,27 @@ { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook , libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio -, gdk_pixbuf, librsvg, libnotify, libgudev, libsecret, gnome-color-manager +, gdk_pixbuf, librsvg, libgudev, libsecret, gnome-color-manager , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc -, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd +, libkrb5, networkmanagerapplet, networkmanager, glibc +, libwacom, samba, shared-mime-info, tzdata, libgnomekbd , docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session , fontconfig, sound-theme-freedesktop, grilo, python3 , gtk3, glib, glib-networking, gsettings-desktop-schemas , gnome-desktop, gnome-settings-daemon, gnome-online-accounts -, vino, gnome-bluetooth, tracker, adwaita-icon-theme }: +, vino, gnome-bluetooth, tracker, adwaita-icon-theme +, udisks2, gsound, libhandy, cups }: -let +stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.30.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l"; }; nativeBuildInputs = [ - meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl + meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xsl shared-mime-info python3 ]; @@ -30,10 +29,11 @@ in stdenv.mkDerivation rec { ibus gtk3 glib glib-networking upower gsettings-desktop-schemas libxml2 gnome-desktop gnome-settings-daemon polkit libgtop gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk - accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify - grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret + accountsservice libkrb5 networkmanagerapplet libwacom samba + grilo libpwquality vino libcanberra-gtk3 libgudev libsecret gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese networkmanager modemmanager gnome-bluetooth tracker + udisks2 gsound libhandy ]; patches = [ @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { src = ./paths.patch; gcm = gnome-color-manager; inherit glibc libgnomekbd tzdata; + inherit cups networkmanagerapplet; }) ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch index 0c11a7626e4..589461d8040 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch @@ -1,6 +1,8 @@ +diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c +index 49ca35220..adefb87b9 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c -@@ -599,7 +599,7 @@ +@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs) /* run with modal set */ argv = g_ptr_array_new_with_free_func (g_free); @@ -9,7 +11,7 @@ g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1038,7 +1038,7 @@ +@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); @@ -18,7 +20,7 @@ g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1288,15 +1288,12 @@ +@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) { @@ -35,6 +37,8 @@ gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE); else gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); +diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h +index 96b25140c..1ad704d4a 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ @@ -50,24 +54,96 @@ typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; ---- a/panels/region/cc-region-panel.c -+++ b/panels/region/cc-region-panel.c -@@ -1265,10 +1265,10 @@ +diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c +index 9390a3308..d30b4a68e 100644 +--- a/panels/network/connection-editor/net-connection-editor.c ++++ b/panels/network/connection-editor/net-connection-editor.c +@@ -247,9 +247,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *editor, const gchar *typ + GError *error = NULL; + + if (editor->is_new_connection) { +- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); + } else { +- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", + nm_connection_get_uuid (editor->connection)); } - if (variant && variant[0]) +diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c +index 360fbfc72..870157a11 100644 +--- a/panels/network/net-device-wifi.c ++++ b/panels/network/net-device-wifi.c +@@ -1385,7 +1385,7 @@ device_wifi_edit (NetObject *object) + return; + } + uuid = nm_connection_get_uuid (NM_CONNECTION (connection)); +- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); + g_debug ("Launching '%s'\n", cmdline); + if (!g_spawn_command_line_async (cmdline, &error)) { + g_warning ("Failed to launch nm-connection-editor: %s", error->message); +diff --git a/panels/network/net-device.c b/panels/network/net-device.c +index d73b537b9..e2ee54294 100644 +--- a/panels/network/net-device.c ++++ b/panels/network/net-device.c +@@ -197,7 +197,7 @@ net_device_edit (NetObject *object) + + connection = net_device_get_find_connection (device); + uuid = nm_connection_get_uuid (connection); +- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); + g_debug ("Launching '%s'\n", cmdline); + if (!g_spawn_command_line_async (cmdline, &error)) { + g_warning ("Failed to launch nm-connection-editor: %s", error->message); +diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c +index f53ba217e..d24bcaeb9 100644 +--- a/panels/printers/pp-host.c ++++ b/panels/printers/pp-host.c +@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, + devices = g_new0 (PpDevicesList, 1); + + argv = g_new0 (gchar *, 3); +- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); ++ argv[0] = g_strdup ("@cups@/lib/cups/backend/snmp"); + argv[1] = g_strdup (priv->hostname); + + /* Use SNMP to get printer's informations */ +diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c +index 35859526d..21486c917 100644 +--- a/panels/region/cc-region-panel.c ++++ b/panels/region/cc-region-panel.c +@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self, + layout_variant = cc_input_source_get_layout_variant (source); + + if (layout_variant && layout_variant[0]) - commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", + commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", - layout, variant); + layout, layout_variant); else - commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", + commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout); g_spawn_command_line_async (commandline, NULL); +diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c +index 00239ce0f..617c98870 100644 +--- a/panels/user-accounts/run-passwd.c ++++ b/panels/user-accounts/run-passwd.c +@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) + gchar **envp; + gint my_stdin, my_stdout, my_stderr; + +- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ ++ argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ + argv[1] = NULL; + + envp = g_get_environ (); +diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c +index 9cb92007a..84d2f0fa3 100644 --- a/tests/datetime/test-endianess.c +++ b/tests/datetime/test-endianess.c -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ test_endianess (void) g_autoptr(GDir) dir = NULL; const char *name; From 0081f3ac4828cb4db7b8d7d826fc3ba0d7b03a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:23:52 +0100 Subject: [PATCH 245/399] gnome3.gnome-desktop: 3.30.2.1 -> 3.32.0 --- .../gnome-3/core/gnome-desktop/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index bac8504eeec..c0be013fbfe 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch +{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib +, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch , libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.30.2.1"; + version = "3.32.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v"; + sha256 = "0m3vs3rhhykr4xnwzi18h4bb1l05l8ykpiw4mi90dz19zk2ksfd6"; }; enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig which itstool gettext libxslt libxml2 gobject-introspection + pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection gtk-doc docbook_xsl ]; buildInputs = [ @@ -32,15 +32,11 @@ stdenv.mkDerivation rec { bubblewrap_bin = "${bubblewrap}/bin/bwrap"; inherit (builtins) storeDir; }) - (fetchpatch { - name = "fix-missing-font-cache"; - url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch; - sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb"; - }) ]; - configureFlags = [ - "--enable-gtk-doc" + mesonFlags = [ + "-Dgtk_doc=true" + "-Ddesktop_docs=false" ]; passthru = { From 8ae8d345fca2e030553517815cf332b3b56c6e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:24:29 +0100 Subject: [PATCH 246/399] gnome3.gnome-disk-utility: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 629dfe0421b..f0cc94147a4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-disk-utility-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi"; + sha256 = "1prnmfxll1hskqqbhd8lyz2zafbrj2dv04fn817rn3266dr94kpq"; }; nativeBuildInputs = [ From c52ad3559c998cda091d578a85fe217a4e803c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:24:54 +0100 Subject: [PATCH 247/399] gnome3.gnome-keyring: 3.28.2 -> 3.31.91 --- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index a72efc61e2f..9702087ca0d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-keyring-${version}"; - version = "3.28.2"; + version = "3.31.91"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1"; + sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4"; }; outputs = [ "out" "dev" ]; From 4d867a3b470e50678d751cc586dc1788700a22f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:25:30 +0100 Subject: [PATCH 248/399] gnome3.gnome-online-accounts: 3.30.2 -> 3.32.0 https://gitlab.gnome.org/GNOME/gnome-online-accounts/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index d12e558c276..8ea6b3ae7e3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -6,13 +6,13 @@ let pname = "gnome-online-accounts"; - version = "3.30.2"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5"; + sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w"; }; outputs = [ "out" "man" "dev" "devdoc" ]; From fba45f7599f4002f1cac6ff6d2ac57988a78d1c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:25:58 +0100 Subject: [PATCH 249/399] gnome3.gnome-session: 3.30.1 -> 3.32.0 --- pkgs/desktops/gnome-3/core/gnome-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 34921d46b4c..38adf7137f7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-session-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fbpq103md4g9gi67rxnwvha21629nxx7qazddy6q6494sbqbzpa"; + sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v"; }; patches = [ From 64c5b662900ac26efcae433a7fb7eac88695e80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:26:35 +0100 Subject: [PATCH 250/399] gnome3.gnome-settings-daemon: 3.30.2 -> 3.32.0 clean up dependencies --- .../core/gnome-settings-daemon/default.nix | 91 ++++++++++++++++--- 1 file changed, 76 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 7a2271e128d..f51270bcbd2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,15 +1,48 @@ -{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas -, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager -, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: +{ stdenv +, substituteAll +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, perl +, gettext +, gtk3 +, glib +, libnotify +, libgnomekbd +, lcms2 +, libpulseaudio +, alsaLib +, libcanberra-gtk3 +, upower +, colord +, libgweather +, polkit +, gsettings-desktop-schemas +, geoclue2 +, systemd +, libgudev +, libwacom +, libxslt +, libxml2 +, networkmanager +, gnome-desktop +, geocode-glib +, docbook_xsl +, wrapGAppsHook +, python3 +, tzdata +, nss +}: stdenv.mkDerivation rec { - name = "gnome-settings-daemon-${version}"; - version = "3.30.2"; + pname = "gnome-settings-daemon"; + version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; + url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63"; }; patches = [ @@ -19,13 +52,41 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + perl + gettext + libxml2 + libxslt + docbook_xsl + wrapGAppsHook + python3 + ]; buildInputs = [ - ibus gtk3 glib gsettings-desktop-schemas networkmanager - libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib - libcanberra-gtk3 upower colord libgweather xkeyboard_config nss - polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom + gtk3 + glib + gsettings-desktop-schemas + networkmanager + libnotify + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + gnome-desktop + lcms2 + libpulseaudio + alsaLib + libcanberra-gtk3 + upower + colord + libgweather + nss + polkit + geocode-glib + geoclue2 + systemd + libgudev + libwacom ]; mesonFlags = [ @@ -41,8 +102,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "gnome-settings-daemon"; - attrPath = "gnome3.gnome-settings-daemon"; + packageName = pname; + attrPath = "gnome3.${pname}"; }; }; From f9224ac84d3c75d89e143c0370225a22e381000a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:27:18 +0100 Subject: [PATCH 251/399] gnome3.gnome-shell: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 693a3bec486..fb92d55c799 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { name = "gnome-shell-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0kacd4w9lc5finsvs170i7827qkxwd1ddj0g2giizwffpjdjqqr2"; + sha256 = "1djkswsv3fhb3lf2w77bbl6z2kvji29cfxbwh5gqvyykwwx87y92"; }; LANG = "en_US.UTF-8"; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch index 32a0cc476da..3207af11088 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch @@ -11,12 +11,12 @@ null); --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js -@@ -1019,7 +1019,7 @@ +@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button { + let description = xkbLayout; if (xkbVariant.length > 0) description = description + '\t' + xkbVariant; - Util.spawn(['gkbd-keyboard-display', '-l', description]); + Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); - }, - - _containerGetPreferredWidth: function(container, for_height, alloc) { + } + }); From b857b7170db3b6cfacb71797d46c7f1c1ecf3c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:27:47 +0100 Subject: [PATCH 252/399] gnome3.gnome-shell-extensions: 3.30.1 -> 3.32.0 --- .../core/gnome-shell-extensions/default.nix | 4 ++-- .../gnome-shell-extensions/fix_gmenu.patch | 23 ++++--------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index ec6d1af015a..5e4182afb10 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-shell-extensions-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1grxn4f5x754r172wmnf0h0xpy69afmj359zsj1rwgqlzw4i4c5p"; + sha256 = "0wzrivhp6vs4754yldza38gkhkhah35rdncb3c3hxhhyv9fr3pl5"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch index c384826de61..555664e8ae2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch @@ -1,24 +1,11 @@ -From f72924a59d4a30daefccf84526bd854ebbe65ac8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= -Date: Tue, 3 Apr 2018 14:13:12 +0200 -Subject: [PATCH] Fix gmenu typelib path - ---- - extensions/apps-menu/extension.js | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js -index 5b38213..d706f64 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js -@@ -1,5 +1,7 @@ +@@ -1,6 +1,8 @@ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ + /* exported init enable disable */ +imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); + - const Atk = imports.gi.Atk; - const DND = imports.ui.dnd; - const GMenu = imports.gi.GMenu; --- -2.16.2 - + const { + Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St + } = imports.gi; From 76b8e4e43bb95f072e9b008f87093aa9d59cd19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:28:15 +0100 Subject: [PATCH 253/399] gnome3.gnome-software: 3.30.6 -> 3.32.0 Add new dependencies libxmlb and gnome-online-accounts --- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index cab777f4feb..5682c34031f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd -, gtk3, gsettings-desktop-schemas, gnome-desktop +, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.30.6"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00lh1ifgcs888i0774qdz2pzd5vnzcc5kvx20lcmgk37vvf0qqsl"; + sha256 = "19hrvkyavrfrhs19ii4ky5bpzsijiyq2vcxb5s4xk13xv8ys2151"; }; patches = [ @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree polkit flatpak fwupd + libxmlb gnome-online-accounts ]; mesonFlags = [ From df566ba054958f175bfc52bb346b2826c321e2ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:28:40 +0100 Subject: [PATCH 254/399] gnome3.gnome-system-monitor: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 4b02411b486..34fd83f03a6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-system-monitor-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0g0y565bjs6bdszrnxsz1f7hcm1x59i3mfvplysirh7nz3hpz888"; + sha256 = "1qvpibyhdcmscyja5a5i5nc206vmqw8xp3p8mgcignyi5njc805g"; }; doCheck = true; From 04c4bd30171aeabeec3d0f8580f85a4a904ddb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:29:15 +0100 Subject: [PATCH 255/399] gnome3.gnome-terminal: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 6bde15ba762..5a41c2c1f11 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb"; + sha256 = "1p4m2k63caprxmwf8d5ycpzkv3yj7146hhvnbjnr9dkl95bl41r4"; }; buildInputs = [ From 890e029e8cce9db8b2642c5ccc439b1284c278a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:29:44 +0100 Subject: [PATCH 256/399] gnome3.gnome-user-docs: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 7062dbafce8..7b9360f10cb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1pgsrvd79rqxa183wsmzh422y2zsg7fl5hskgc0s87jsc8b57fkg"; + sha256 = "0lqbhhihxkflwckm3b8dgq62rjljkzdghcc4k4ym7n2hyc304vxy"; }; passthru = { From 24657133c12193a643d3fc3c19b26e1a4a292683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:30:10 +0100 Subject: [PATCH 257/399] gnome3.mutter: 3.30.2 -> 3.32.0 - port to meson - the new meson build doesn't compile schemas - use wrapGAppsHook --- pkgs/desktops/gnome-3/core/mutter/default.nix | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 518b0ec1c48..7d8105abbcd 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,39 +1,25 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo +{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 -, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput +, ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , gsettings-desktop-schemas, glib, gtk3, gnome-desktop -, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, geocode-glib, pipewire, libgudev, libwacom, xwayland, meson +, gnome-settings-daemon +, xorgserver +, python3 +, wrapGAppsHook +}: stdenv.mkDerivation rec { name = "mutter-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z"; + sha256 = "068zir5c1awmzb31gx94zjykv6c3xb1p5pch7860y3xlihha4s3n"; }; - patches = [ - # https://gitlab.gnome.org/GNOME/mutter/issues/270 - # Fixes direction of the desktop switching animation when using workspace - # grid extension with desktops arranged horizontally. - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/mutter/commit/92cccf53dfe9e077f1d61ac4f896fd391f8cb689.patch; - sha256 = "11vmypypjss50xg7hhdbqrxvgqlxx4lnwy59089qsfl3akg4kk2i"; - }) - ]; - - configureFlags = [ - "--with-x" - "--disable-static" - "--enable-remote-desktop" - "--enable-shape" - "--enable-sm" - "--enable-startup-notification" - "--enable-xsync" - "--enable-verbose-mode" - "--with-libcanberra" - "--with-xwayland-path=${xwayland}/bin/Xwayland" + mesonFlags = [ + "-Dxwayland-path=${xwayland}/bin/Xwayland" ]; propagatedBuildInputs = [ @@ -41,19 +27,32 @@ stdenv.mkDerivation rec { libXtst ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; + nativeBuildInputs = [ + meson + pkgconfig + gettext + ninja + python3 + # for cvt command + xorgserver + wrapGAppsHook + ]; buildInputs = [ glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon pipewire + libxkbcommon pipewire xwayland + gnome-settings-daemon ]; - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" ''; enableParallelBuilding = true; From 9fa52d0032eb16a987157854ef915dbf1258a5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:30:33 +0100 Subject: [PATCH 258/399] gnome3.nautilus: 3.30.5 -> 3.32.0 - update thumbnail patch, similar to gnome-desktop, but no font cache issue - Requires gst_all_1.gst-plugins-base --- .../gnome-3/core/nautilus/bubblewrap-paths.patch | 15 +++++---------- pkgs/desktops/gnome-3/core/nautilus/default.nix | 8 ++++---- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch index e3ad75b869c..37358c8432c 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch @@ -1,20 +1,15 @@ --- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c +++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -514,14 +514,11 @@ add_bwrap (GPtrArray *array, +@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/lib", "/lib", -- "--ro-bind", "/lib64", "/lib64", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", + "@bubblewrap_bin@", + "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "/run/current-system", "/run/current-system", - "--proc", "/proc", - "--dev", "/dev", -- "--symlink", "usr/bin", "/bin", -- "--symlink", "usr/sbin", "/sbin", - "--chdir", "/", - "--setenv", "GIO_USE_VFS", "local", - "--unshare-all", + NULL); + + /* These directories might be symlinks into /usr/... */ diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 715686460a3..6dea270f6c0 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -2,18 +2,18 @@ , desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf -, substituteAll, bubblewrap +, substituteAll, bubblewrap, gst_all_1 }: let pname = "nautilus"; - version = "3.30.5"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv"; + sha256 = "1pnh32fal7dkwadga5savg1nv0zqnbakhk0hxr5726087i6y6ii2"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux - tracker tracker-miners gexiv2 libseccomp bubblewrap + tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; From b571bb26bca4ff643fbda63a7b3433308ce7e29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:31:28 +0100 Subject: [PATCH 259/399] simple-scan: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 742819e0ba1..ad4012e57f0 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0dknvdjlnxrp9nxd3yr8wyjc4kv94nwglss8pr6rfvl4hnlly53i"; + sha256 = "1b1nspiwzgxan2b11n96ax0c2q93dz17m67z1krdsrzdkyhh4hnh"; }; buildInputs = [ From e026e259f36ab5ad0e2b32a349ff4e7f959d5a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:32:00 +0100 Subject: [PATCH 260/399] gnome3.sushi: 3.30.0 -> 3.32.0 - port to meson - replace intltool with gettext - remove no longer leaky dependencies --- pkgs/desktops/gnome-3/core/sushi/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 77c216e7376..478aac8c173 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gobject-introspection, glib -, clutter-gtk, clutter-gst, gnome3, aspell, hspell, gtksourceview, gjs +{ stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib +, clutter-gtk, clutter-gst, gnome3, gtksourceview, gjs , webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1 -, gdk_pixbuf, librsvg, gtk3, harfbuzz }: +, gdk_pixbuf, librsvg, gtk3, harfbuzz, ninja }: stdenv.mkDerivation rec { name = "sushi-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zpaiw5r734fky3zq95a6szwn7srbkpixajqg2xvdivhhx4mbnnj"; + sha256 = "0f1i8qp39gq749h90f7nwgrj4q6y55jnyh62n1v8hxvlk0b2wqnx"; }; - nativeBuildInputs = [ pkgconfig file intltool gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig meson ninja gettext gobject-introspection wrapGAppsHook + ]; buildInputs = [ glib gtk3 gnome3.evince icu harfbuzz clutter-gtk clutter-gst gjs gtksourceview gdk_pixbuf librsvg libmusicbrainz5 webkitgtk gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - # cannot find -laspell, -lhspell - aspell hspell ]; enableParallelBuilding = true; From b6183023e3bf9b329fb69ead8ec12661c9628f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:32:28 +0100 Subject: [PATCH 261/399] gnome3.totem: 3.30.0 -> 3.32.0 - tests now require DISPLAY access --- pkgs/desktops/gnome-3/core/totem/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index d4a66b6c493..d3319c4522e 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1 +{ stdenv, fetchurl, meson, ninja, gettext, gst_all_1 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser , wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins , libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas -, gdk_pixbuf, tracker, nautilus }: +, gdk_pixbuf, tracker, nautilus, xvfb_run }: stdenv.mkDerivation rec { name = "totem-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0"; + sha256 = "12iykwslvnpgmrm4bcchx5rzn2g4rl5r9s86n2001djn58yw6m6r"; }; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja vala pkgconfig gettext python3Packages.python itstool gobject-introspection wrapGAppsHook ]; buildInputs = [ gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad @@ -41,6 +39,13 @@ stdenv.mkDerivation rec { "-Denable-vala=no" ]; + checkInputs = [ xvfb_run ]; + + checkPhase = '' + xvfb-run -s '-screen 0 800x600x24' \ + ninja test + ''; + wrapPrefixVariables = [ "PYTHONPATH" ]; passthru = { From 67708fc4579078d3265390960942a7284f866afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:32:55 +0100 Subject: [PATCH 262/399] gnome3.yelp-tools: 3.28.0 -> 3.32.0 --- pkgs/desktops/gnome-3/core/yelp-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index 6f487eacf97..41120a74b08 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yelp-tools-${version}"; - version = "3.28.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2"; + sha256 = "037fd6xpy3zab7j5p7c0vfc6c3nk6qs0prvz1hbilzc31p8l1pdz"; }; passthru = { From e5e5460f5650f01f5bcf1328afa8555b2bbac143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:33:30 +0100 Subject: [PATCH 263/399] gnome3.yelp-xsl: 3.30.1 -> 3.32.1 --- pkgs/desktops/gnome-3/core/yelp-xsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 7e98012998d..f1a39311728 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "yelp-xsl-${version}"; - version = "3.30.1"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw"; + sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya"; }; passthru = { From 14b34cc9ea0116aaab13a28d784dab8ff3966d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:33:59 +0100 Subject: [PATCH 264/399] yelp: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/core/yelp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 644c2793831..c5ea5e9b420 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,18 +1,18 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +{ stdenv, gettext, fetchurl, webkitgtk, pkgconfig, gtk3, glib , gnome3, sqlite , itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { name = "yelp-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "060a902j15k76fyhk8xfl38ipvrrcc0qd7nm2mcck4ifb45b0zv4"; + sha256 = "090klk2mhd87y5w228gd1ia1lvvxaj913lkvxzcb1apz8n0i8mm7"; }; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; buildInputs = [ gtk3 glib webkitgtk sqlite libxml2 libxslt gnome3.yelp-xsl From d055618a8fd127055ba6fc944f79eda3dc3e3d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:34:31 +0100 Subject: [PATCH 265/399] rhythmbox: 3.4.2 -> 3.4.3 --- pkgs/applications/audio/rhythmbox/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 2162ddd7981..24b342a26a9 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -17,24 +17,15 @@ }: let pname = "rhythmbox"; - version = "3.4.2"; + version = "3.4.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2"; + sha256 = "1yx3n7p9vmv23jsv98fxwq95n78awdxqm8idhyhxx2d6vk4w1hgx"; }; - patches = [ - # build with GStreamer 1.14 https://bugzilla.gnome.org/show_bug.cgi?id=788706 - (fetchurl { - name = "fmradio-Fix-build-with-GStreamer-master.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=361178; - sha256 = "1h09mimlglj9hcmc3pfp0d6c277mqh2khwv9fryk43pkv3904d2w"; - }) - ]; - nativeBuildInputs = [ pkgconfig intltool perl perlPackages.XMLParser From ab6d14f772e647d842886edb231c22e547012218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:35:07 +0100 Subject: [PATCH 266/399] orca: 3.30.2 -> 3.32.0 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index e8843c1bd6f..b2022759057 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.30.2"; + version = "3.32.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53"; + sha256 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i"; }; patches = [ From 2426447d3c554198c1236368c81a7368d6909d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:35:30 +0100 Subject: [PATCH 267/399] gnome3.accerciser: 3.22.0 -> 3.32.0 https://gitlab.gnome.org/GNOME/accerciser/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 4815103893f..4bd2348cb4c 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection , itstool, libxml2, python3Packages, at-spi2-core -, dbus, intltool, libwnck3 }: +, dbus, gettext, libwnck3 }: stdenv.mkDerivation rec { name = "accerciser-${version}"; - version = "3.22.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; + sha256 = "1j7wlks6j77kfjrw6lx1g0apsy2wwca63jsm5994av5l6xs8xd5m"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook itstool intltool + pkgconfig wrapGAppsHook itstool gettext gobject-introspection # For setup hook ]; buildInputs = [ From 49fa47cba589d30b24de36199a8358e4badfc2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:36:01 +0100 Subject: [PATCH 268/399] gnome3.cheese: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/cheese/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index ea2091524c9..38000a70f17 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "cheese-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zz2bgjaf2lsmfs3zn24925vbjb0rycr39i288brlbzixrpcyljr"; + sha256 = "0ahkfs6v9qraz607k2sr4qw9a59lg2m8kiw5nxhc65qql110sjsl"; }; passthru = { From 2cf79a45611a28490bd1796c10e58ef768999f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:36:27 +0100 Subject: [PATCH 269/399] gnome3.file-roller: 3.30.1 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/file-roller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 5ee26eba6b7..0e09cc8c388 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "file-roller-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1"; + sha256 = "1id7f6qbgdxfixxyqjypgwy04mf1w1rbczklqmgpqx5ry4kk0a03"; }; LANG = "en_US.UTF-8"; # postinstall.py From 96da79305ec2cc50e3f159bf1273744957851905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:37:06 +0100 Subject: [PATCH 270/399] gnome3.gedit: 3.30.2 -> 3.32.0 - port to meson - now require perl at build time - now require itstool - parallal building fails --- pkgs/desktops/gnome-3/apps/gedit/default.nix | 33 ++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 8310f426be6..f767e309a65 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,28 +1,43 @@ -{ stdenv, intltool, fetchurl +{ stdenv, meson, fetchurl, python3 , pkgconfig, gtk3, glib, adwaita-icon-theme -, libpeas, gtksourceview, gsettings-desktop-schemas -, wrapGAppsHook, itstool, libsoup, libxml2 -, gnome3, gspell }: +, libpeas, gtksourceview4, gsettings-desktop-schemas +, wrapGAppsHook, ninja, libsoup, libxml2 +, gnome3, gspell, perl, itstool, desktop-file-utils }: stdenv.mkDerivation rec { name = "gedit-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza"; + sha256 = "1lray9vvbcrnhjv5cr5fc4bqfd68km2x79cj50byyqn9cnlf5qn9"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook meson ninja libxml2 + python3 perl itstool desktop-file-utils + ]; buildInputs = [ gtk3 glib adwaita-icon-theme libsoup - libpeas gtksourceview + libpeas gtksourceview4 gsettings-desktop-schemas gspell ]; - enableParallelBuilding = true; + postPatch = '' + chmod +x build-aux/meson/post_install.py + chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl + patchShebangs build-aux/meson/post_install.py + patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl + ''; + + mesonFlags = [ + "--buildtype=plain" # don't require git + ]; + + # Reliably fails to generate gedit-file-browser-enum-types.h in time + enableParallelBuilding = false; passthru = { updateScript = gnome3.updateScript { From 69aa1b069f118003d34467719fc5fb4d140ca3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:37:26 +0100 Subject: [PATCH 271/399] gnome3.gnome-boxes: 3.30.3 -> 3.32.0.2 - add required vte dependency - require new libosinfo et.al. https://gitlab.gnome.org/GNOME/gnome-boxes/blob/v3.32.0.2/NEWS --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 21690287245..a983c59d192 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -3,19 +3,19 @@ , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret -, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk +, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte }: # TODO: ovirt (optional) let - version = "3.30.3"; + version = "3.32.0.2"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0a9ljwhkanszzyzl0bhad8vmzk7v4wafl9b1zn09pf57znyymf3s"; + sha256 = "1239x1bbkn0gxxq82zpvjjr7srla2d5ghi5rqwxnhsab0c2ypswk"; }; doCheck = true; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive gnome3.adwaita-icon-theme librsvg acl libgudev libsecret - libcap_ng numactl xen libapparmor + libcap_ng numactl xen libapparmor vte ]; preFixup = '' From 3af6c18f433df325c8c5b3be8aa1bf8f0bc4a328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:38:02 +0100 Subject: [PATCH 272/399] gnome3.gnome-calendar: 3.30.1 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 9b48e323191..a22f2166f1e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.30.1"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1avi7a29y8d8kzwslp51nwy6s692alms7917454j0xpfc6hnw62s"; + sha256 = "0fyy1slcvc32nz37clps7lz3w40i30fj93fc5m0rqk664w682ys4"; }; passthru = { From 4351ff8ef1e754e6de6300b4dc24118d4bcfab00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:51:14 +0100 Subject: [PATCH 273/399] gnome3.gnome-clocks: 3.30.1 -> 3.31.2 --- pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index c614dc6486c..bf20c7670ef 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "gnome-clocks-${version}"; - version = "3.30.1"; + version = "3.31.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "009fr6zwv37wryi0c0syi4i7pxpdbn3gliws68l99cjsbn2qd6pc"; + sha256 = "0f0ak4b4vxh3b2c4wkg76c210ivffw2j8pcg78zkhm9i7l5aiv09"; }; passthru = { From 8bdf2a2a87b8f155b531e8ae9a3ca705319c5028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:51:44 +0100 Subject: [PATCH 274/399] gnome3.gnome-getting-started-docs: 3.30.0 -> 3.32.0 --- .../gnome-3/apps/gnome-getting-started-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index e7a1954c892..e1349dd4514 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-getting-started-docs-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "10vihv6n8703rapf915waz1vzr7axk43bjlhmm3hb7kwm32rc61k"; + sha256 = "1nzba7l33dgijwvfs777kcyy29xp7bmyrjk9nrwvm5zww4l35gai"; }; passthru = { From 38e121cc97bfdbcbc582436683a29d9df64c5635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:52:27 +0100 Subject: [PATCH 275/399] gnome3.gnome-logs: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 89f4cc01e50..e8f434cf19c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-logs-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rsk2whps7rwl01mmjmhwwww4iv09fsszils9zmgqd79y7l3fmyh"; + sha256 = "1cn0ms24y9sg1kvhmk4mj7v9fi0n6ylyf11jjh4k81wfjsaah7w4"; }; mesonFlags = [ From c8c3840facbc0daa0140f902c6c1352873b038c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:52:46 +0100 Subject: [PATCH 276/399] gnome3.gnome-maps: 3.30.3 -> 3.32.1 https://gitlab.gnome.org/GNOME/gnome-maps/blob/v3.32.1/NEWS --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index d7df923339a..be5008a51fe 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.30.3"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0s1k6v1yzchbv6big09fdhmm0rzyjdh2y7qg6fsp7d0x4qnch9nq"; + sha256 = "1q15qsp0ca67y4l0x31518cfakrj85x9g0cbcm0wysnbddi1aik0"; }; doCheck = true; From 4819ceb5e5759ab0494be446ed82a33573e79388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:53:08 +0100 Subject: [PATCH 277/399] gnome3.gnome-music: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 98d3cfb5539..6aaad41ee57 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.30.2"; + version = "3.32.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d9gd9rqy71hibfrz4zglimvgv6yn1pw22cnrn7pbdz6k4yq209d"; + sha256 = "075q8y4i66nh6wjga6vwdcivsm1dfbwv54hfvk4q8mbws7zfzky7"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; From e385cc7025041380a5f379ad700a91d3e0390d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:53:52 +0100 Subject: [PATCH 278/399] gnome3.gnome-notes: 3.30.3 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 78c39651ad6..94a36e39c1c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2 }: let - version = "3.30.3"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "gnome-notes-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "1mkpi2i9nqpip5l15ihjcscyiri113s0705sjgh6b89164ahyn5k"; + sha256 = "09l98yvgrfjw427wn271ap5v6hbwdf9liyrkp34bl0k3hv2d6dv3"; }; doCheck = true; From 508d5cb998c11fc876bcda7f199419285b317efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:54:28 +0100 Subject: [PATCH 279/399] gnome3.gnome-photos: 3.30.1 -> 3.32.0 Port to meson --- .../gnome-3/apps/gnome-photos/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 8c0c216965d..99b1cd3adf9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -4,22 +4,25 @@ , grilo, gnome-online-accounts , desktop-file-utils, wrapGAppsHook , gnome3, gdk_pixbuf, gexiv2, geocode-glib -, dleyna-renderer }: +, dleyna-renderer, dbus, meson, ninja, python3 }: let pname = "gnome-photos"; - version = "3.30.1"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1mf1887x0pk46h6l51rfkpn29fwp3yvmqkk99kr1iwpz0lakyx6f"; + sha256 = "160vqmcqvyzby27wd2lzwzgbfl6jxxk7phhnqh9498r3clr73haj"; }; # doCheck = true; - nativeBuildInputs = [ pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig gettext itstool meson ninja libxml2 + desktop-file-utils wrapGAppsHook python3 + ]; buildInputs = [ gtk3 glib gegl babl libgdata libdazzle gnome3.gsettings-desktop-schemas @@ -28,8 +31,17 @@ in stdenv.mkDerivation rec { gnome-online-accounts tracker gexiv2 geocode-glib dleyna-renderer tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema + dbus ]; + mesonFlags = [ + "--buildtype=plain" # don't do any git commands + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; passthru = { updateScript = gnome3.updateScript { From 088c613c4265708bd9b7560abd3b915c56839434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:54:54 +0100 Subject: [PATCH 280/399] gnome3.gnome-sound-recorder: 3.28.2 -> 3.32.0 - port to meson --- .../apps/gnome-sound-recorder/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 1f902dc9c80..c9e6356aac6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 +, meson, ninja, python3, hicolor-icon-theme, desktop-file-utils }: stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.28.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1k63xr3d16qbzi88md913ndaf2mzwmhmi6hipj0123sm7nsz1p94"; + sha256 = "0rchzap5mg9ach3jcf4sci5v2h5pgpdjafjfllfd09w9yg3brspp"; }; - patches = [ - # Fix crash when trying to play recordings - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-sound-recorder/commit/2b311ef67909bc20d0e87f334fe37bf5c4e9f29f.patch; - sha256 = "0hqmk846bxma0p66cqp94zd02zc1if836ywjq3sv5dsfwnz7jv3f"; - }) + nativeBuildInputs = [ + pkgconfig gettext meson ninja gobject-introspection + wrapGAppsHook python3 hicolor-icon-theme desktop-file-utils ]; - - nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ]; buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + # TODO: fix this in gstreamer # TODO: make stdenv.lib.getBin respect outputBin PKG_CONFIG_GSTREAMER_1_0_TOOLSDIR = "${gst_all_1.gstreamer.dev}/bin"; From c53f331a78cf1370ebc1f47c70ff0fa06aa51e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:56:08 +0100 Subject: [PATCH 281/399] gnome3.gnome-weather: 3.26.0 -> 3.32.0 - port to meson - service files are now build correctly upstream --- .../gnome-3/apps/gnome-weather/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 5ae279f57f0..2cee50a8f09 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,29 +1,32 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection -, libgweather, intltool, itstool, geoclue2, gnome-desktop }: +, libgweather, meson, ninja, geoclue2, gnome-desktop, python3 }: stdenv.mkDerivation rec { name = "gnome-weather-${version}"; - version = "3.26.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; + sha256 = "0b7cqd3wfrgm0hps0cb8vhjz0bpjw955hbc4r82l626g8l3hf86w"; }; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas ]; - # The .service file isn't wrapped with the correct environment - # so misses GIR files when started. By re-pointing from the gjs - # entry point to the wrapped binary we get back to a wrapped - # binary. - preConfigure = '' - substituteInPlace "data/org.gnome.Weather.Application.service.in" \ - --replace "Exec=@pkgdatadir@/@PACKAGE_NAME@.Application" \ + postPatch = '' + # The .service file is not wrapped with the correct environment + # so misses GIR files when started. By re-pointing from the gjs + # entry point to the wrapped binary we get back to a wrapped + # binary. + substituteInPlace "data/org.gnome.Weather.service.in" \ + --replace "Exec=@DATA_DIR@/@APP_ID@" \ "Exec=$out/bin/gnome-weather" + + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; passthru = { From 868bf99929500b75d088af595fe39f9ba2c62725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:56:32 +0100 Subject: [PATCH 282/399] gnome3.polari: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/polari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 080fa664b0d..d48c59b093d 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.30.2"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "02wxkdq5s5ami9wj9vpqhs6n8qxr299bpmvpvd89mn49x73lq2w2"; + sha256 = "1jq1xvk9a05x37g9w349f5q069cvg5lfbhxj88gpbnf4fyndnr70"; }; propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; From eaeb640cfa136f3fb43ded79454cc21242d2db34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:56:59 +0100 Subject: [PATCH 283/399] gnome3.seahorse: 3.30.1.1 -> 3.32.0 Add new required dependency libpwquality --- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 84f7b519d1e..4b286a9a7c6 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala, meson, ninja +{ stdenv, fetchurl, vala, meson, ninja, libpwquality , pkgconfig, gtk3, glib, gobject-introspection , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, gpgme, python3, openldap, gcr @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.30.1.1"; + version = "3.32"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12x7xmwh62yl0ax90v8nkx3jqzviaz9hz2g56yml78wzww20gawy"; + sha256 = "1wxcxq6ahlwab8dr83gqml67y95mnk56hsgw19d4h0xjvyz2ym52"; }; doCheck = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gnome3.gsettings-desktop-schemas gnupg gnome3.adwaita-icon-theme gpgme libsecret avahi libsoup p11-kit - openssh openldap + openssh openldap libpwquality ]; postPatch = '' From 144526f6fe5443fa3d46c514939e3d5fac290d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 Mar 2019 19:57:40 +0100 Subject: [PATCH 284/399] gnome3.gnome-tweaks: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index 47de1de59ca..bf0ef7d34a0 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-tweaks"; - version = "3.30.2"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z"; + sha256 = "037r35cw34ifcs676fq9n2v4mh1nkqx0qk474bznf18mr6r62h55"; }; nativeBuildInputs = [ From 34d172ec1a3e653c0366786f7c9e4f25f3e98189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 5 Mar 2019 16:25:27 +0100 Subject: [PATCH 285/399] gnome3.gpaste: fix build for 3.32 mutter --- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index fd71f1f2a23..54b64ab2355 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter +{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter, fetchpatch , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobject-introspection }: stdenv.mkDerivation rec { @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { patches = [ ./fix-paths.patch + (fetchpatch { + url = https://github.com/Keruspe/GPaste/commit/eacd9ecbcf6db260a2bdc22275c7a855cad66424.patch; + sha256 = "1668xcmx90gpjlgv2iyp6yqbxq3r5sw5cxds0dmzlyvbqdmc3py2"; + }) ]; # TODO: switch to substituteAll with placeholder From f2bc6531eadabdce0016361186467d937a2fbb59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 6 Mar 2019 01:29:53 +0100 Subject: [PATCH 286/399] gnome3.gnome-documents: 3.30.0 -> 3.32.0 --- .../gnome-3/apps/gnome-documents/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 186f3a14d27..a2cba36b88d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -8,16 +8,19 @@ stdenv.mkDerivation rec { name = "gnome-documents-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zchkjpc9algmxrpj0f9i2lc4h1yp8z0h76vn32xa9jr46x4lsh6"; + sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c"; }; doCheck = true; - mesonFlags = [ "-Dgetting-started=true" ]; + mesonFlags = [ + "-Dgetting-started=true" + "--buildtype=plain" + ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3 @@ -31,14 +34,6 @@ stdenv.mkDerivation rec { gnome-desktop libzapojit libgepub ]; - patches = [ - # fix RPATH to libgd - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/d18a92e0a940073ac766f609937539e4fc6cdbb7.patch"; - sha256 = "0s3mk8vrl1gzk93yvgqbnz44i27qw1d9yvvmnck3fv23phrxkzk9"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py From 36e34b2126b7dabc4a380350fcc11ea2e546f0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 15:53:53 +0100 Subject: [PATCH 287/399] folks: cleanup --- pkgs/development/libraries/folks/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 2ce50a92ea3..57edbaef298 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib libgee sqlite ]; - # dbus_daemon needed for tests + buildInputs = [ - dbus-glib telepathy-glib evolution-data-server dbus + dbus-glib telepathy-glib evolution-data-server libsecret libxml2 libsoup nspr nss db ]; + + checkInputs = [ dbus ]; + nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; configureFlags = [ "--disable-fatal-warnings" ]; - NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" - "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"]; - enableParallelBuilding = true; postBuild = "rm -rf $out/share/gtk-doc"; From 25c99e15fb8ec4b1913093227051d8964e97c84f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 6 Mar 2019 22:28:48 -0500 Subject: [PATCH 288/399] gnome3.gnome-books: init at 3.32.0 --- .../gnome-3/apps/gnome-books/default.nix | 52 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/desktops/gnome-3/apps/gnome-books/default.nix diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix new file mode 100644 index 00000000000..b9fb2dc05a0 --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -0,0 +1,52 @@ +{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs +, pkgconfig, gtk3, glib, tracker, tracker-miners, libxslt +, webkitgtk, gnome-desktop, libgepub, gnome3, gdk_pixbuf +, gsettings-desktop-schemas, adwaita-icon-theme, docbook_xsl +, docbook_xml_dtd_42, desktop-file-utils, python3 +, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "gnome-books"; + version = "3.32.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4"; + }; + + mesonFlags = [ + "--buildtype=plain" + ]; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext libxslt desktop-file-utils + docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3 + ]; + + buildInputs = [ + gtk3 glib gsettings-desktop-schemas + gdk_pixbuf adwaita-icon-theme evince + webkitgtk gjs gobject-introspection tracker + tracker-miners gnome-desktop libgepub + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-books"; + attrPath = "gnome3.gnome-books"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Books; + description = "An e-book manager application for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 092406b188f..b120b693d65 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -229,6 +229,8 @@ lib.makeScope pkgs.newScope (self: with self; { glade = callPackage ./apps/glade { }; + gnome-books = callPackage ./apps/gnome-books { }; + gnome-boxes = callPackage ./apps/gnome-boxes { }; gnome-calendar = callPackage ./apps/gnome-calendar { }; From e6255808ca9d2417480b579476eba9f6fbf03482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 16:35:21 +0100 Subject: [PATCH 289/399] gnome3.gnome-user-share: 3.28.0 -> 3.32.0.1 cleanup --- .../gnome-3/core/gnome-user-share/default.nix | 72 ++++++++++++------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 134ba41d653..65f9fb0db80 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,25 +1,30 @@ -{ stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme -, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: +{ stdenv +, gettext +, fetchurl +, apacheHttpd +, nautilus +, pkgconfig +, gtk3 +, glib +, libxml2 +, systemd +, wrapGAppsHook +, itstool +, libnotify +, mod_dnssd +, gnome3 +, libcanberra-gtk3 +}: stdenv.mkDerivation rec { - name = "gnome-user-share-${version}"; - version = "3.28.0"; + pname = "gnome-user-share"; + version = "3.32.0.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-user-share"; attrPath = "gnome3.gnome-user-share"; }; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ @@ -29,22 +34,35 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" + "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" + "--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0" + ]; + + nativeBuildInputs = [ + pkgconfig + gettext + itstool + libxml2 + wrapGAppsHook ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 glib intltool itstool libxml2 libtool - wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg - nautilus libnotify libcanberra-gtk3 systemd + gtk3 + glib + nautilus + libnotify + libcanberra-gtk3 + systemd ]; - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - glib-compile-schemas "$out/share/gsettings-schemas/$name/glib-2.0/schemas" - ''; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-user-share/3.8; From 850555edfb18d05a622620f949f6cb78ff574b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 21:05:36 +0100 Subject: [PATCH 290/399] at-spi2-atk: 2.30.1 -> 2.32.0 https://gitlab.gnome.org/GNOME/at-spi2-atk/blob/AT_SPI2_ATK_2_32_0/NEWS --- pkgs/development/libraries/at-spi2-atk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 84340a25bb1..6c3f3aa9fa2 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "at-spi2-atk"; - version = "2.30.1"; + version = "2.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rxqp9kgf8mcyg84b9pq2kpqr1ws81ijn9nfdis2w0ixy9cbjfyr"; + sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b"; }; nativeBuildInputs = [ meson ninja pkgconfig ] From 43d0b425b80fd232340b193056e1954f571b7432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 21:09:51 +0100 Subject: [PATCH 291/399] at-spi-core: 2.30.1 -> 2.32.0 https://gitlab.gnome.org/GNOME/at-spi2-core/blob/AT_SPI2_CORE_2_32_0/NEWS --- pkgs/development/libraries/at-spi2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 759666c827e..0fc50f2c641 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "at-spi2-core"; - version = "2.30.1"; + version = "2.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0j6aa071lnhpgv9h8l0pqimk8pc152gqpcbmq8djlj7h3f7iyvw5"; + sha256 = "083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923"; }; outputs = [ "out" "dev" ]; From 99d4472db23d4577d1ffb00c30565a98da8dac9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 16:44:02 +0100 Subject: [PATCH 292/399] networkmanager: 1.14.4 -> 1.16.0 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.16.0/NEWS --- pkgs/tools/networking/network-manager/default.nix | 4 ++-- pkgs/tools/networking/network-manager/fix-paths.patch | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 2ead22a550a..1695e23514a 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.6"; + version = "1.16.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p9s6b1z9bdmzdjw2gnjsar1671vvcyy9inb0rxg1izf2nnwsfv9"; + sha256 = "0b2x9hrg41cd17psqi0vacwj733v99hxczn53gdfs0yanqrji5lf"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch index 94960809552..adf70421ed8 100644 --- a/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/pkgs/tools/networking/network-manager/fix-paths.patch @@ -43,7 +43,7 @@ + ping_binary = "@inetutils@/bin/ping"; log_domain = LOGD_IP4; } - } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) { + } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) { gw = nm_ip6_config_best_default_route_get (priv->ip_config_6); if (gw) { nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); @@ -54,12 +54,13 @@ } --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c -@@ -421,7 +421,7 @@ +@@ -421,8 +421,8 @@ /* construct the argument list */ argv = g_ptr_array_sized_new (4); - g_ptr_array_add (argv, "/sbin/modprobe"); + g_ptr_array_add (argv, "@kmod@/bin/modprobe"); + g_ptr_array_add (argv, "--use-blacklist"); g_ptr_array_add (argv, (char *) arg1); va_start (ap, arg1); From d2c37618f5f447ebcc7303ea0c0ef90cc0c25ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 16:46:31 +0100 Subject: [PATCH 293/399] pythonPackages.pyatspi: 2.30.0 -> 2.32.0 https://gitlab.gnome.org/GNOME/pyatspi2/blob/PYATSPI_2_32_0/NEWS --- pkgs/development/python-modules/pyatspi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 853b316a929..20b39131135 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.30.0"; + version = "2.32.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11g7dx21brfmi5vrq289cw983rydalx0cy91afv5gigyadsmyam2"; + sha256 = "0jfmm5684sfb035ihvla75gxz4cls5d2vnf0s02y6dw7s12zbb8a"; }; nativeBuildInputs = [ pkgconfig ]; From d206f597b6c87e24bfae30ab5e14e2ee7e0da5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 16:48:05 +0100 Subject: [PATCH 294/399] gnome-builder: 3.30.3 -> 3.32.0 Co-Authored-By: Jan Tojnar --- .../editors/gnome-builder/default.nix | 45 +++++++++++++------ 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 38606bc4c29..63568bef6f7 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ gcc8Stdenv , ctags +, appstream-glib , desktop-file-utils , docbook_xsl , docbook_xml_dtd_43 , fetchurl , flatpak -, glibcLocales , gnome3 , libgit2-glib , gobject-introspection @@ -31,28 +31,33 @@ , vte , webkitgtk , wrapGAppsHook +, dbus +, xvfb_run }: + let - version = "3.30.3"; + # Does not build with GCC 7 + # https://gitlab.gnome.org/GNOME/gnome-builder/issues/868 + stdenv = gcc8Stdenv; +in +stdenv.mkDerivation rec { pname = "gnome-builder"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11h6apjyah91djf77m8xkl5rvdz7mwpp3bjc4yzzs9lm3pag764r"; + sha256 = "00l7sshpndk995aw98mjmsc3mxhxzynlp7il551iwwjjdbc70qp4"; }; nativeBuildInputs = [ - #appstream-glib # tests fail if these tools are available + appstream-glib desktop-file-utils docbook_xsl docbook_xml_dtd_43 - glibcLocales # for Meson's gtkdochelper gobject-introspection gtk-doc hicolor-icon-theme - meson + (meson.override ({ inherit stdenv; })) ninja pkgconfig python3 @@ -64,6 +69,7 @@ in stdenv.mkDerivation { ctags flatpak gnome3.devhelp + gnome3.glade libgit2-glib libpeas vte @@ -83,6 +89,11 @@ in stdenv.mkDerivation { webkitgtk ]; + checkInputs = [ + dbus + xvfb_run + ]; + outputs = [ "out" "devdoc" ]; prePatch = '' @@ -91,19 +102,25 @@ in stdenv.mkDerivation { mesonFlags = [ "-Dpython_libprefix=${python3.libPrefix}" - "-Dwith_docs=true" + "-Ddocs=true" # Making the build system correctly detect clang header and library paths # is difficult. Somebody should look into fixing this. - "-Dwith_clang=false" + "-Dplugin_clang=false" + + # Do not try to check if appstream images exist + "-Dnetwork_tests=false" ]; # Some tests fail due to being unable to find the Vte typelib, and I don't # understand why. Somebody should look into fixing this. - doCheck = false; + doCheck = true; - preInstall = '' - export LC_ALL="en_US.utf-8" + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs ''; pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ]; From 93c0842af249f44374ff0ef70fbe880af9b9082d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 16:48:51 +0100 Subject: [PATCH 295/399] jsonrpc-glib: 3.30.1 -> 3.32.0 https://gitlab.gnome.org/GNOME/jsonrpc-glib/blob/3.32.0/NEWS --- pkgs/development/libraries/jsonrpc-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 2324f1280a5..8012c6b3b14 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.30.1"; + version = "3.32.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1iqxfdymsspsn1xr5bv7xllw73yhqq6k9bfixsggrf2g85pwwxdn"; + sha256 = "1sx6xvzzdm9k0vfmpgg07abz7a9kar20h1a9ml0wgjdxr0valq5w"; }; mesonFlags = [ From 67b97b615c1fcadd3362b01bd6cf28618f0b89e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 16:49:59 +0100 Subject: [PATCH 296/399] chrome-gnome-shell: 10 -> 10.1 --- .../gnome-3/extensions/chrome-gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 3064b62f2a4..755c8e1b02f 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: let - version = "10"; + version = "10.1"; inherit (python3.pkgs) python pygobject3 requests; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; - sha256 = "1wp6qvcp758yfj8xlj15sk1d3jsb1p8136y8xxwpi9wfdjpzjs8j"; + sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; }; nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; From c85d2489cf134b51231cde7ff0b22e7184ef6cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 16:50:37 +0100 Subject: [PATCH 297/399] template-glib: 3.30.0 -> 3.32.0 https://gitlab.gnome.org/GNOME/template-glib/blob/3.32.0/NEWS --- pkgs/development/libraries/template-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 2b63bab0ead..4314abd2548 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let - version = "3.30.0"; + version = "3.32.0"; pname = "template-glib"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j9ndswl3fc0ymbqd6kk7yw3sniij3dgczc665p06wgw3cwhssfg"; + sha256 = "1g0zx0sxpw8kqp7p3sgl9kngaqrg9xl6cir24nrahks0vgsk98rr"; }; buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; From b73f4b65b5a3e202d60ccf7c10922b55b99cecbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 16:51:18 +0100 Subject: [PATCH 298/399] pythonPackages.pygobject3: 3.30.4 -> 3.32.0 --- pkgs/development/python-modules/pygobject/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 43cb77e5831..399fc6c7e3c 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { pname = "pygobject"; - version = "3.30.4"; + version = "3.32.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hscyvr6hh8l90fyz97b9d03506g3r8s5hl1bgk5aadq8jja3h9d"; + sha256 = "0agg8nxgqp96wyw4qnjjpiczf0j8aw454plwsfqccsyykzjxgx43"; }; outputs = [ "out" "dev" ]; From f79bf2c3c03211c467605b07041d1f9909e2c59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 16:52:35 +0100 Subject: [PATCH 299/399] sysprof: 3.30.2 -> 3.32.0 https://gitlab.gnome.org/GNOME/sysprof/blob/sysprof-3.32.0/NEWS --- pkgs/development/tools/profiling/sysprof/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 296d45723b2..720544f4b6c 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.30.2"; + version = "3.32.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02xsr3cxyws3cnbhvbxgcc9sn22mri3iv9d7f38pkg89lpjph279"; + sha256 = "0kamsnnig56lzs4ziwcxm3b1xyis4z361s9nj3nca0c78sgac8pw"; }; nativeBuildInputs = [ From 902d38e9b3473d08850cff8362ef87c6678b895c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 7 Mar 2019 19:23:48 +0100 Subject: [PATCH 300/399] pango: 1.42.4 -> 1.43.0 New meson build didn't specify gobject as a required dependency, pull in upstream patch to fix. Also move harfbuzz and fribid to buildInputs as those are actually private deps. --- pkgs/development/libraries/pango/default.nix | 29 ++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 7b1d69ed42b..6fbae1fa3c3 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,30 +1,49 @@ { stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz , libintl, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf +, meson, ninja, glib }: with stdenv.lib; let pname = "pango"; - version = "1.42.4"; + version = "1.43.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"; + sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j"; }; outputs = [ "bin" "dev" "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + nativeBuildInputs = [ + meson ninja + pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ + harfbuzz fribidi + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices Carbon CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ]; + propagatedBuildInputs = [ cairo glib libXft libintl ]; + + patches = [ + (fetchurl { + # Add gobject-2 to .pc file + url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch"; + sha256 = "034na38cq98vk8gggn3yfr65jmv3jgig8d25zg89wydrandp14yr"; + }) + ]; + + mesonFlags = [ + "-Denable_docs=true" + ]; enableParallelBuilding = true; From a31bdd64aff34e8ee84e16a98c86c989fb312d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 8 Mar 2019 00:36:19 +0100 Subject: [PATCH 301/399] shared-mime-info: 1.10 -> 1.12 --- pkgs/data/misc/shared-mime-info/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index f82ae5f1f9f..6d29d876073 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool , libxml2, glib}: -let version = "1.10"; in +let version = "1.12"; in stdenv.mkDerivation rec { name = "shared-mime-info-${version}"; src = fetchurl { - url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6"; + url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz"; + sha256 = "0gj0pp36qpsr9w6v4nywnjpcisadwkndapqsjn0ny3gd0zzg1chq"; }; nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]); From a17abbe7f5f76992f1ca1d942f4bf1d4cc1aaf1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 8 Mar 2019 20:49:54 +0100 Subject: [PATCH 302/399] gnome3.gnome-power-manager: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 2d9c313e641..fd47f54eb89 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -14,13 +14,13 @@ let pname = "gnome-power-manager"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0m15x6i279wrfimz9ma2gfjv7jlkca2qbl2wcnxgx1pb3hzrwggm"; + sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"; }; passthru = { From 46400d82402421f32d3f4e56a2914d7ed049bb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 8 Mar 2019 20:51:47 +0100 Subject: [PATCH 303/399] gnome3.gnome-color-manager: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 782a77499f9..b79651ea4bc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -2,13 +2,13 @@ let pname = "gnome-color-manager"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "105bqqq3yvdn5lx94mkl0d450f0l8lmwfjjcwyls1pycmj0vifwh"; + sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ]; From 66d5ead20adff436545567c3c4355cd141213827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 8 Mar 2019 20:54:23 +0100 Subject: [PATCH 304/399] gnome3.gnome-packagekit: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index 3cdab30ce8d..30e393b918a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1i1hf6833psnq174xm0gjlz5rbrkl8i512y47w7nk8mrrrc31b35"; + sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd"; }; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; From 0f2a2b325871d8422d4cd2f19e3e913364f7f8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 8 Mar 2019 23:33:51 +0100 Subject: [PATCH 305/399] libgdata: remove obsolete cflags fix --- pkgs/development/libraries/libgdata/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 3f20236d17f..59e19750715 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45"; }; - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gcr}/include/gcr-3 -I${gcr}/include/gck-1"; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ]; From 2fad222eecd91f1120c01a1ec88bc5e4440b9306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 9 Mar 2019 02:40:30 +0100 Subject: [PATCH 306/399] gnome3.gnome-font-viewer: add required harfbuzz dependency --- pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 3e8f7d3617f..affecf1441f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,6 +1,6 @@ { stdenv, meson, ninja, gettext, fetchurl , pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme -, wrapGAppsHook, gnome3 }: +, wrapGAppsHook, gnome3, harfbuzz }: stdenv.mkDerivation rec { name = "gnome-font-viewer-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; From a0b5ada01c1a268e92c4400c1026ff7878b1a8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 10 Mar 2019 02:10:28 +0100 Subject: [PATCH 307/399] gnomeExtensions.gsconnect: 20 -> 21 --- .../gnome-3/extensions/gsconnect/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 9c2f72cce66..75c34b4b99d 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, substituteAll, python3, openssl +{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, folks, gsound , meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook , glib, gtk3, at-spi2-core, upower, openssh, gnome3 }: stdenv.mkDerivation rec { name = "gnome-shell-gsconnect-${version}"; - version = "20"; + version = "21"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "1x5lrb4hdw482hr5dh4ki0p1651w1s0ijs96vs65vrh15cd60h02"; + sha256 = "0ikkb2rly3h4qglswn15vs8f2kl727gpri5c9x3jiy27ylag7yav"; }; patches = [ @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { glib # libgobject gtk3 at-spi2-core # atspi - gnome3.folks # libfolks + folks # libfolks gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension gnome3.nautilus-python - gnome3.gsound + gsound upower gnome3.caribou gnome3.gjs # for running daemon @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { preFixup = '' # TODO: figure out why folks GIR does not contain shared-library attribute # https://github.com/NixOS/nixpkgs/issues/47226 - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.folks ]}") + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ folks ]}") ''; postFixup = '' From 789da0b05a0c0d283bbffd47755a0638cb3479b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 10 Mar 2019 02:34:37 +0100 Subject: [PATCH 308/399] gnomeExtensions.dash-to-panel: 16 -> 19 --- pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index de442d912b3..0d48b8359c9 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-dash-to-panel-${version}"; - version = "16"; + version = "19"; src = fetchFromGitHub { - owner = "jderose9"; + owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "1gi2qfinafihax0j0rbs1k5nf6msdv86gzl2vfkc8s6gfkncv9bp"; + sha256 = "0r26ph6zq87kvglydv00rf24mshz7l4r38zf9niyp3mxyzz6rwys"; }; buildInputs = [ From 51e7d0bda881687293cdba23e280d0bddb08bbba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 10 Mar 2019 02:39:03 +0100 Subject: [PATCH 309/399] gnomeExtensions.appindicator: 22 -> 23.1 --- pkgs/desktops/gnome-3/extensions/appindicator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index c576112d57b..834cc7e0283 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-appindicator-${version}"; - version = "22"; + version = "23.1"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "1gqw54d55hxjj2hh04p0dx2j40bhi4ck9hgwlz8f7j4v7r37z0qw"; + sha256 = "1v10jdncb9d5f5i0yzir20km4zvsb6ql7p8mv8w9ihw318rzh3qv"; }; # This package has a Makefile, but it's used for building a zip for From b6589686c48613208571a9f2ae97f4954b3fb174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 10 Mar 2019 02:44:20 +0100 Subject: [PATCH 310/399] gnomeExtensions.remove-dropdown-arrows: 9 -> 11 --- .../gnome-3/extensions/remove-dropdown-arrows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index 42cd6d217de..5faa55652d8 100644 --- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-remove-dropdown-arrows-${version}"; - version = "9"; + version = "11"; src = fetchFromGitHub { owner = "mpdeimos"; repo = "gnome-shell-remove-dropdown-arrows"; rev = "version/${version}"; - sha256 = "1z9icxr75rd3cas28xjlmsbbd3j3sm1qvj6mp95jhfaqj821q665"; + sha256 = "1g99r9bpjdhab3xj74wkl40gdnaf2w51kswcr8mi6bq72n4wjxwh"; }; # This package has a Makefile, but it's used for publishing and linting, not From 63b04a8263080116b45b200bdc0a41bec197b3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 10 Mar 2019 02:46:12 +0100 Subject: [PATCH 311/399] gnomeExtensions.sound-output-device-chooser: 2018-12-30 -> 2019-03-10 --- .../extensions/sound-output-device-chooser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index a1cc96d8b7b..a3a351e4a65 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "unstable-2018-12-30"; + version = "unstable-2019-03-10"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; - rev = "3ec8aded413034e7943eb36ee509405873ccc575"; - sha256 = "1svc3d3pr2j7fr0660a0zj2n320vld8zkkddf5iphbdwivmkrh3n"; + rev = "26c66da6795104802f3240bd9f5741f64367c8e7"; + sha256 = "153cdd0pip4nbpc2a9y1v3y7qivafv3wk296zqdamcjrd0p94nqz"; }; dontBuild = true; From 32b565b6098e5a34daa2a7a6c0a7f749616dde9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 10 Mar 2019 15:44:26 +0100 Subject: [PATCH 312/399] gnome3.devhelp: 3.30.1 -> 3.32.0 --- pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 4a634de9447..80a3770b703 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "devhelp-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a"; + sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ]; From 837e601dc596137adfc1fd2d1a0f932efc3e47b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 10 Mar 2019 15:44:57 +0100 Subject: [PATCH 313/399] gnome3.gnome-clocks: 3.31.2 -> 3.32.0 --- pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index bf20c7670ef..f29f324f2ee 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "gnome-clocks-${version}"; - version = "3.31.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f0ak4b4vxh3b2c4wkg76c210ivffw2j8pcg78zkhm9i7l5aiv09"; + sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc"; }; passthru = { From c99a666aac8f613095a9ef582419d67bd17c3f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 10 Mar 2019 20:19:28 +0100 Subject: [PATCH 314/399] nixos/gnome3: add new default fonts - source-code-pro is now the default monospace font - source-sans-pro seems to be used somewhere too: https://wiki.gnome.org/Engagement/BrandGuidelines --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index ea01749349d..71ab8b6f49a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -160,7 +160,11 @@ in { # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; - fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; + fonts.fonts = [ + pkgs.dejavu_fonts pkgs.cantarell-fonts + pkgs.source-sans-pro + pkgs.source-code-pro # Default monospace font in 3.32 + ]; services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ] ++ map From 8fc87063765f28b2aacf6c11811669c97bbf4983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:23:21 +0100 Subject: [PATCH 315/399] gnome3.atomix: 3.30.0.1 -> 3.32.0 --- pkgs/desktops/gnome-3/games/atomix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index 33980f2d035..45373999699 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -3,13 +3,13 @@ let pname = "atomix"; - version = "3.30.0.1"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0hvr36m8ixa172zblv29fga1cn9yb84zqbisb21msfkwia2pabw3"; + sha256 = "0qxmdrmqsxpfv6w0l557jsjbd7cpdf3jni5mdhnsr4h2n8knf7m0"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ]; From d2c1227601afff6951dd02c88705a39f2baf166c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:36:26 +0100 Subject: [PATCH 316/399] gnome3.four-in-a-row: 3.28.0 -> 3.32.0 --- .../gnome-3/games/four-in-a-row/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 8955bcbc498..94428d6640d 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,18 +1,27 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, gettext, itstool, libcanberra-gtk3, librsvg, libxml2 }: +, gettext, meson, libcanberra-gtk3, librsvg, itstool, vala +, python3, ninja, desktop-file-utils }: stdenv.mkDerivation rec { name = "four-in-a-row-${version}"; - version = "3.28.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k"; + sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook gettext meson itstool vala + ninja python3 desktop-file-utils + ]; buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ]; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "four-in-a-row"; From 5e9c8960bfb6a211eaad4cd996a5210235e363a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:36:53 +0100 Subject: [PATCH 317/399] gnome3.gnome-chess: 3.30.1 -> 3.32.0 --- pkgs/desktops/gnome-3/games/gnome-chess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index 5812f16d296..c6c24be4be8 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-chess-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1gzdm6z54kxx06lh616g33klrp4dby2a68wxvjpsavdll28kgwgl"; + sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; From d682cba1f667ffd12b37685269af5ddc316181fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:37:20 +0100 Subject: [PATCH 318/399] gnome3.gnome-klotski: 3.22.3 -> 3.32.0 --- .../gnome-3/games/gnome-klotski/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index ab1a54c0575..c913a9e8729 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -1,19 +1,30 @@ { stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils -, glib, librsvg, libxml2, intltool, itstool, libgee, libgnome-games-support }: +, glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support +, meson, ninja, python3 +}: let pname = "gnome-klotski"; - version = "3.22.3"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f"; + sha256 = "1p4s15gxj6gasix22z9vlx2yrx196fvcxr6v6qrl569idfgjbi72"; }; - nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ]; - buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [ + pkgconfig vala meson ninja python3 wrapGAppsHook + gettext itstool libxml2 appstream-glib desktop-file-utils + gnome3.adwaita-icon-theme + ]; + buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; passthru = { updateScript = gnome3.updateScript { From 01b40d98df592c48533c9826b57e74c75927b0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:37:48 +0100 Subject: [PATCH 319/399] gnome3.gnome-mahjongg: 3.22.0 -> 3.32.0 --- .../gnome-3/games/gnome-mahjongg/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index c64ee968f19..ee55b5a65a5 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -1,24 +1,35 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: +, librsvg, gettext, itstool, libxml2 +, meson, ninja, python3, vala, desktop-file-utils +}: stdenv.mkDerivation rec { name = "gnome-mahjongg-${version}"; - version = "3.22.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218"; + sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.adwaita-icon-theme + nativeBuildInputs = [ + meson ninja vala python3 desktop-file-utils + pkgconfig gnome3.adwaita-icon-theme + libxml2 itstool gettext wrapGAppsHook ]; + buildInputs = [ + gtk3 librsvg + ]; + + postPatch = '' + chmod +x data/meson_post_install.py + patchShebangs data/meson_post_install.py + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Mahjongg; From 7aefffff6be29e1dbcbcc5c62876246028dac57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:38:20 +0100 Subject: [PATCH 320/399] gnome3.gnome-robots: 3.22.3 -> 3.32.0 --- .../gnome-3/games/gnome-robots/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index b881dbbf800..2b40548d37c 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,25 +1,33 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgnome-games-support -, libgee}: +, librsvg, libcanberra-gtk3, gettext, itstool, libxml2, libgnome-games-support +, libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { name = "gnome-robots-${version}"; - version = "3.22.3"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk"; + sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 - libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee + nativeBuildInputs = [ + pkgconfig meson ninja python3 + libxml2 wrapGAppsHook gettext itstool desktop-file-utils + hicolor-icon-theme # For setup-hook ]; + buildInputs = [ + gtk3 librsvg libcanberra-gtk3 libgnome-games-support libgee adwaita-icon-theme + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Robots; From 050110a7a3c28a472089579ba63cd9ec332e2563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:38:45 +0100 Subject: [PATCH 321/399] gnome3.gnome-sudoku: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 0996b9bf10b..5c3fafd3d02 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { name = "gnome-sudoku-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1xy986s51jnrcqwan2hy4bjdg6797yr9s7gxx2z2q4j4gkx3qa1f"; + sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; buildInputs = [ gtk3 libgee json-glib qqwing ]; postPatch = '' - chmod +x post_install.py # patchShebangs requires executable file - patchShebangs post_install.py + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py ''; passthru = { From 65fd3af43a60e605eecbbf247e6973a8750d5fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:47:52 +0100 Subject: [PATCH 322/399] gnome3.gnome-tetravex: 3.22.0 -> 3.32.0 --- .../gnome-3/games/gnome-tetravex/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index f3f1fdbc415..ab0f0f0faf2 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -1,23 +1,33 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: +, libxml2, gettext, itstool, meson, ninja, python3 +, vala, desktop-file-utils +}: stdenv.mkDerivation rec { name = "gnome-tetravex-${version}"; - version = "3.22.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d"; + sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme + nativeBuildInputs = [ + wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme + pkgconfig gettext meson ninja python3 vala desktop-file-utils ]; + buildInputs = [ + gtk3 + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Tetravex; From 8a4866a931dbdf9bfbf0295acefc133977a63c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:51:47 +0100 Subject: [PATCH 323/399] gnome3.quadrapassel: 3.22.0 -> 3.32.0 --- .../gnome-3/games/quadrapassel/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index d3ddcea77f7..712f984cbf9 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,21 +1,27 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, libcanberra-gtk3 -, intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }: +, librsvg, libcanberra-gtk3, libmanette +, gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook +, meson, ninja, python3, vala, desktop-file-utils +}: let pname = "quadrapassel"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.22.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; + sha256 = "1zhi1957knz9dm98drn2dh95mr33sdch590yddh1f8r6bzsfjvpy"; }; - nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; + nativeBuildInputs = [ + meson ninja python3 vala desktop-file-utils + pkgconfig gnome3.adwaita-icon-theme + libxml2 itstool gettext wrapGAppsHook + ]; buildInputs = [ - gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg + gtk3 gdk_pixbuf librsvg libmanette libcanberra-gtk3 clutter libxml2 clutter-gtk ]; From 1981b731b5a4858cc6706c88bc8ce3331848553e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 18:52:39 +0100 Subject: [PATCH 324/399] gnome3.tali: 3.22.0 -> 3.32.0 --- pkgs/desktops/gnome-3/games/tali/default.nix | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index 399562c0d99..5ec29554b36 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -1,24 +1,32 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, intltool, itstool, libxml2, wrapGAppsHook }: +, librsvg, gettext, itstool, libxml2, wrapGAppsHook +, meson, ninja, python3, desktop-file-utils +}: stdenv.mkDerivation rec { name = "tali-${version}"; - version = "3.22.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b"; + sha256 = "0s5clkn0qm298mvphx1xdymg67w1p8vvgvypvs97k6lfjqijkx3v"; }; passthru = { updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg - libxml2 itstool intltool wrapGAppsHook ]; + nativeBuildInputs = [ + meson ninja python3 desktop-file-utils + pkgconfig gnome3.adwaita-icon-theme + libxml2 itstool gettext wrapGAppsHook + ]; + buildInputs = [ gtk3 gdk_pixbuf librsvg ]; - enableParallelBuilding = true; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Tali; From 72424f0f22c0cc263592d2d8c19a5182e41d8cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 19:38:39 +0100 Subject: [PATCH 325/399] libmanette: 0.2.1 -> 0.2.2 --- pkgs/development/libraries/libmanette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 258fbc2657b..70123875051 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -2,7 +2,7 @@ , glib, libgudev, libevdev, gnome3 }: let - version = "0.2.1"; + version = "0.2.2"; pname = "libmanette"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "14vqz30p4693yy3yxs0gj858x25sl2kawib1g9lj8g5frgl0hd82"; + sha256 = "1lpprk2qz1lsqf9xj6kj2ciyc1zmjhj5lwd584qkh7jgz2x9y6wb"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection ]; From 61f3a2d5fc9a8744f0b12efd6cef97d845650bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 19:39:25 +0100 Subject: [PATCH 326/399] gnome3.five-or-more: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/games/five-or-more/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index a3bb2df918a..21f089b324e 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3 }: +, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { name = "five-or-more-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00d729p251kh96624i7qg2370r5mxwafs016i6hy01vsr71jzb9x"; + sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook + vala + ]; buildInputs = [ gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme ]; From 4ffd950f1d0fb76d1a368f73bc7537fac9af1e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 19:39:52 +0100 Subject: [PATCH 327/399] gnome3.gnome-mines: 3.30.1.1 -> 3.32.0 --- .../gnome-3/games/gnome-mines/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 6ec18e55cf0..9ceb65f8308 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,22 +1,25 @@ { stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee }: +, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-mines-${version}"; - version = "3.30.1.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "08ddk400sg1g3q26gnm5mgv81vdqyix0yl7pd47p50vkc1w6f33z"; + sha256 = "13ia8a7bmdnp1281lwp8nvdqqkclvg1n3pw4bbr2dgsrsswfkscj"; }; # gobject-introspection for finding vapi files - nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ + meson ninja vala gobject-introspection pkgconfig gettext itstool python3 + libxml2 wrapGAppsHook desktop-file-utils + ]; buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' - chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file - patchShebangs data/meson_compile_gschema.py + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py ''; passthru = { From 216ac5f9583e4af7ed2a977e40383df6b0fa5011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 19:40:26 +0100 Subject: [PATCH 328/399] gnome3.lightsoff: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/games/lightsoff/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index bbc65f3e5ba..18c6f43b3b3 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -4,25 +4,24 @@ stdenv.mkDerivation rec { name = "lightsoff-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cv5pkw0n8k5wb98ihx0z1z615w1wc09y884wk608wy40bgq46wp"; + sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f"; }; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py - ''; - nativeBuildInputs = [ vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ]; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "lightsoff"; From 0e67b392fd121ac6c653f3ae0fe2c95a0dee60b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 19:40:53 +0100 Subject: [PATCH 329/399] gnome3.iagno: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/games/iagno/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index b1996e0fd59..8ef4b2f3075 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -1,16 +1,21 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, libcanberra-gtk3, libxml2, dconf }: +, intltool, itstool, libcanberra-gtk3, libxml2 +, meson, ninja, python3, vala, desktop-file-utils +}: stdenv.mkDerivation rec { name = "iagno-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "15skh7186gp0k1lvzpv0l7dsr7mhb57njc3wjbgjwixym67h2d1z"; + sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ]; + nativeBuildInputs = [ + meson ninja python3 vala desktop-file-utils + pkgconfig wrapGAppsHook itstool libxml2 + ]; buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ]; enableParallelBuilding = true; From bb3c07dab984bd9963a9924d1bfaf482dd66a714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 19:41:23 +0100 Subject: [PATCH 330/399] gnome3.swell-foop: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/games/swell-foop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 3c017d71382..a944e0c568a 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -3,13 +3,13 @@ let pname = "swell-foop"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00h795clcyzch1sgcxflslv2q03vsz2j5xyy4ghbg6a6dgg8a0ax"; + sha256 = "0jpci3c1wyzbvsq86j30rcl166skhi2wf12001amfgh0dmmwipci"; }; passthru = { From daf1d9c36073de0421339aa4178e5639b26c5dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 11 Mar 2019 20:26:37 +0100 Subject: [PATCH 331/399] gnome3.gnome-devel-docs: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 534c23da82c..7886054addb 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-devel-docs-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1sssxagf0aaiyld8731247qq74bnrnq4arr7mpjrg0j6gwdfgxia"; + sha256 = "0kxa74ijsahipvpm57cpkvgllyg1qqap3lkxxqn6rbys474c5371"; }; passthru = { From 1a290ef8d5946f9c115f944a9092fec0bdc71216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 12 Mar 2019 16:42:04 +0100 Subject: [PATCH 332/399] gnome3.gnome-taquin: 3.30.0 -> 3.32.0 --- .../gnome-3/games/gnome-taquin/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 583072d8470..06914d9817c 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,23 +1,28 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra-gtk3, intltool, itstool, libxml2 }: +, librsvg, libcanberra-gtk3, gettext, itstool, libxml2 +, meson, ninja, vala, python3, desktop-file-utils +}: stdenv.mkDerivation rec { name = "gnome-taquin-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qijv7wyrjlj56m79la4k7m00712v2m1m994vfx43x3v4isxidgp"; + sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook meson ninja python3 + gettext itstool libxml2 vala desktop-file-utils + ]; buildInputs = [ - gtk3 wrapGAppsHook librsvg libcanberra-gtk3 - intltool itstool libxml2 gnome3.adwaita-icon-theme + gtk3 librsvg libcanberra-gtk3 + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { From e1094c3408096d0b22d2e33c423c560942dccc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 12 Mar 2019 17:39:12 +0100 Subject: [PATCH 333/399] gnome3.gpaste: 3.30.2 -> 3.32.0 --- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 8 +--- .../gnome-3/misc/gpaste/fix-paths.patch | 46 ++++++------------- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 54b64ab2355..3da7031b511 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -2,20 +2,16 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobject-introspection }: stdenv.mkDerivation rec { - version = "3.30.2"; + version = "3.32.0"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "0vlbvv6rjxq7h9cl3ilndjk7d51ac1x7agj8k6a7bwjx8h1fr62x"; + sha256 = "1fvpl9vqmrr1w22hm0ybabn9pjfii5qj9ghnc2jzihgrn2h486v6"; }; patches = [ ./fix-paths.patch - (fetchpatch { - url = https://github.com/Keruspe/GPaste/commit/eacd9ecbcf6db260a2bdc22275c7a855cad66424.patch; - sha256 = "1668xcmx90gpjlgv2iyp6yqbxq3r5sw5cxds0dmzlyvbqdmc3py2"; - }) ]; # TODO: switch to substituteAll with placeholder diff --git a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch b/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch index ca6b9a5b22e..c8a3fad2272 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch +++ b/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch @@ -1,6 +1,6 @@ --- a/src/gnome-shell/extension.js +++ b/src/gnome-shell/extension.js -@@ -7,6 +7,8 @@ +@@ -6,6 +6,8 @@ const Config = imports.misc.config; @@ -11,45 +11,27 @@ imports.gi.versions.GPaste = '1.0'; --- a/src/gnome-shell/prefs.js +++ b/src/gnome-shell/prefs.js -@@ -7,6 +7,8 @@ +@@ -6,6 +6,8 @@ const Gettext = imports.gettext; +imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); + - const GPaste = imports.gi.GPaste; + const { GPaste } = imports.gi; const ExtensionUtils = imports.misc.extensionUtils; --- a/src/libgpaste/settings/gpaste-settings.c +++ b/src/libgpaste/settings/gpaste-settings.c -@@ -22,6 +22,8 @@ - - typedef struct - { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; - GSettings *settings; - GSettings *shell_settings; - -@@ -919,6 +921,8 @@ - { - g_signal_handler_disconnect (settings, priv->c_signals[C_CHANGED]); - g_clear_object (&priv->settings); -+ g_settings_schema_unref (priv->schema); -+ g_settings_schema_source_unref (priv->schema_source); +@@ -1013,7 +1013,11 @@ } + else + { +- return g_settings_new (G_PASTE_SETTINGS_NAME); ++ // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library ++ GSettingsSchemaSource *schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL); ++ g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE); ++ g_settings_schema_source_unref (schema_source); ++ return g_settings_new_full (schema, NULL, NULL); + } + } - if (shell_settings) -@@ -1000,7 +1004,11 @@ - g_paste_settings_init (GPasteSettings *self) - { - GPasteSettingsPrivate *priv = g_paste_settings_get_instance_private (self); -- GSettings *settings = priv->settings = g_settings_new (G_PASTE_SETTINGS_NAME); -+ -+ // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library -+ GSettingsSchemaSource *schema_source = priv->schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL); -+ priv->schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE); -+ GSettings *settings = priv->settings = g_settings_new_full (priv->schema, NULL, NULL); - - priv->history_name = NULL; - priv->launch_ui = NULL; From 24da40189881413c49e8270e11354f06938e456d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 12 Mar 2019 16:14:21 -0400 Subject: [PATCH 334/399] gnome3.gnome-menus: 3.31.4 -> 3.32.0 --- pkgs/development/libraries/gnome-menus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index 171c6d40fac..9bfc638634b 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection }: stdenv.mkDerivation rec { pname = "gnome-menus"; - version = "3.31.4"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1iihxcibjg22jxsw3s1cxzcq0rhn1rdmx4xg7qjqij981afs8dr7"; + sha256 = "0x2blzqrapmbsbfzxjcdcpa3vkw9hq5k96h9kvjmy9kl415wcl68"; }; makeFlags = [ @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ glib gobject-introspection ]; meta = { From d1240bed54fa47663837dce85d91a8eacffdc9b9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 7 Mar 2019 18:07:36 -0600 Subject: [PATCH 335/399] gucharmap: 11.0.3 -> 12.0.1, unicode 12 --- pkgs/desktops/gnome-3/core/gucharmap/default.nix | 10 +++++----- .../gnome-3/core/gucharmap/unicode-data.nix | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 2b7794a9a8e..3d32a1c2436 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -7,17 +7,17 @@ let unicode-data = callPackage ./unicode-data.nix {}; in stdenv.mkDerivation rec { - name = "gucharmap-${version}"; - version = "11.0.3"; + pname = "gucharmap"; + version = "12.0.1"; outputs = [ "out" "lib" "dev" "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; - repo = "gucharmap"; + repo = pname; rev = version; - sha256 = "1a590nxy8jdf6zxh6jdsyvhxyaz94ixx3aa1pj7gicf1aqp26vnh"; + sha256 = "0si3ymyfzc5v7ly0dmcs3qgw2wp8cyasycq5hmcr8frl09lr6gkw"; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "gucharmap"; + packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix index 6bf2fd39a2d..cfdda920e27 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -1,31 +1,31 @@ { fetchurl, stdenv, gnome3 }: stdenv.mkDerivation rec { name = "unicode-data-${version}"; - version = "11.0.0"; + version = "12.0.0"; srcs = [ (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/Blocks.txt"; - sha256 = "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b"; + sha256 = "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/DerivedAge.txt"; - sha256 = "0rlqqd0b1sqbzvrj29dwdizx8lyvrbfirsnn8za9lb53x5fml4gb"; + sha256 = "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/NamesList.txt"; - sha256 = "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8"; + sha256 = "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/Scripts.txt"; - sha256 = "1mbnvf97nwa3pvyzx9nd2wa94f8s0npg9740kic2p2ag7jmc1wz9"; + sha256 = "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/UnicodeData.txt"; - sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; + sha256 = "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/Unihan.zip"; - sha256 = "0cy8gxb17ksi5h4ysypk4c09z61am1svjrvg97hm5m5ccjfrs1vj"; + sha256 = "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf"; }) ]; phases = "installPhase"; From cef4340283abeeadf00160167e695d91b67a84df Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 13 Mar 2019 16:30:27 -0400 Subject: [PATCH 336/399] gnome3.aisleriot: 3.22.7 -> 2.22.8 https://gitlab.gnome.org/GNOME/aisleriot/compare/3.22.7...3.22.8 --- pkgs/desktops/gnome-3/games/aisleriot/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index d77439b30c5..3e274c35cdd 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -3,12 +3,12 @@ , guile_2_0, libcanberra-gtk3 }: stdenv.mkDerivation rec { - name = "aisleriot-${version}"; - version = "3.22.7"; + pname = "aisleriot"; + version = "3.22.8"; src = fetchurl { - url = "mirror://gnome/sources/aisleriot/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ysljnrlvzssgbhxcgb28n9k3l0rybxi5lkrm8pg6a4nspaw5mc4"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815"; }; configureFlags = [ @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "aisleriot"; - attrPath = "gnome3.aisleriot"; + packageName = pname; + attrPath = "gnome3.${pname}"; }; }; From 71ae84bc0cf16e3efe83c7293961ecb7765f5159 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 11 Mar 2019 09:07:13 -0500 Subject: [PATCH 337/399] gnome3.geary: 0.13.2 -> 3.32.0 * make geary-attach executable --- pkgs/desktops/gnome-3/misc/geary/default.nix | 29 ++++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 154ebb04a4b..134cd376bb8 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,27 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja +{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja , desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext , sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3 -, xvfb_run, dbus, shared-mime-info, libunwind, glib-networking }: +, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking }: stdenv.mkDerivation rec { pname = "geary"; - version = "0.13.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fp3zzgpkm1l4d0g5194wnriz2spxa9kgrgy98kvvffl7ac860kk"; + sha256 = "1mxlzkmwzg1fyf4r1izwnskm5z681c6hiby48n606n89gjcq565j"; }; - patches = [ - # gobject-introspection is not needed - # https://gitlab.gnome.org/GNOME/geary/merge_requests/138 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch; - sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk"; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig vala wrapGAppsHook python3 @@ -31,7 +22,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3 libgee libnotify libsecret sqlite webkitgtk glib-networking - libunwind + libunwind folks ]; checkInputs = [ xvfb_run dbus ]; @@ -43,11 +34,8 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py - ''; - preFixup = '' - # Add geary to path for geary-attach - gappsWrapperArgs+=(--prefix PATH : "$out/bin") + chmod +x desktop/geary-attach ''; doCheck = true; @@ -60,6 +48,11 @@ stdenv.mkDerivation rec { meson test -v --no-stdsplit ''; + preFixup = '' + # Add geary to path for geary-attach + gappsWrapperArgs+=(--prefix PATH : "$out/bin") + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; From 523e00c610e1859b81ea434c32035f837de8f51f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 Mar 2019 18:35:06 +0100 Subject: [PATCH 338/399] =?UTF-8?q?gnome3.gnome-characters:=203.30.0=20?= =?UTF-8?q?=E2=86=92=203.32.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/blob/v3.32.0/NEWS --- pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 101b9f4a62e..8f2a2d1624c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-characters-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "08cwz39iwgsyyb2wqhb8vfbmh1cwfkgfiy7adp08w7rwqi99x3dp"; + sha256 = "1cwazk9x9fs4lf89jqxdian15dk8zfsnpypgl1kknnw8r9mv0bzd"; }; postPatch = '' From 488460fef6c429208e822d93d761cfb0f54645ff Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 Mar 2019 18:35:56 +0100 Subject: [PATCH 339/399] =?UTF-8?q?gnome3.gnome-font-viewer:=203.30.0=20?= =?UTF-8?q?=E2=86=92=203.32.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-font-viewer/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index affecf1441f..317c7e91584 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-font-viewer-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5"; + sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3"; }; doCheck = true; From e121533123590050ba21bc1460575999d37723a8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 Mar 2019 18:38:47 +0100 Subject: [PATCH 340/399] =?UTF-8?q?gnome3.gnome-screenshot:=203.30.0=20?= =?UTF-8?q?=E2=86=92=203.32.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-screenshot/blob/3.32.0/NEWS --- pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 3ce2a4433ac..f5cc430472d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-screenshot"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06dx3svxq6sar4913mrz5lzb7hmc66wck138vmyxj8x8iv1iw0w8"; + sha256 = "09ha7dizjm5ymqpjyrqd10ijfb3xlqc1mwg9ajkrbfry11q9yq4b"; }; doCheck = true; From e18bb0ae2aea0f8f1007e460a41f7a1ad8310b28 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 Mar 2019 18:39:52 +0100 Subject: [PATCH 341/399] =?UTF-8?q?gnome3.gnome-nibbles:=203.24.1=20?= =?UTF-8?q?=E2=86=92=203.31.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-nibbles/blob/3.31.3/NEWS --- pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index ad522c4f56a..cbac95c8f41 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-nibbles-${version}"; - version = "3.24.1"; + version = "3.31.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "19g44cnrb191v50bdvy2qkrfhvyfsahd0kx9hz95x9gkjfn2nn35"; + sha256 = "0wg0l3aghkxcwp74liw115qjzy6w18hn80mhsz4lrjpnbpaivi18"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; From 2273d2ba2ce13d57a704742acbc00d0308e55f85 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 Mar 2019 18:43:04 +0100 Subject: [PATCH 342/399] =?UTF-8?q?gnome3.hitori:=203.22.4=20=E2=86=92=203?= =?UTF-8?q?.31.92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/hitori/blob/3.31.92/NEWS --- .../desktops/gnome-3/games/hitori/default.nix | 62 +++++++++++++++---- 1 file changed, 49 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index ebbbe9d1cee..72cce760b03 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -1,25 +1,61 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, glib +, gtk3 +, cairo +, wrapGAppsHook +, libxml2 +, python3 +, gettext +, itstool +, desktop-file-utils +, adwaita-icon-theme +}: stdenv.mkDerivation rec { - name = "hitori-${version}"; - version = "3.22.4"; + pname = "hitori"; + version = "3.31.92"; src = fetchurl { - url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3"; + url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0m2w3zz6v1bsd1fn78ab79d72ywd9vq60rziazsblxsi4qy9dva5"; }; + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + itstool + desktop-file-utils + libxml2 + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + cairo + adwaita-icon-theme + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + passthru = { - updateScript = gnome3.updateScript { packageName = "hitori"; attrPath = "gnome3.hitori"; }; + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 - gnome3.adwaita-icon-theme - ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Hitori; description = "GTK+ application to generate and let you play games of Hitori"; From 06f059f908da7ddf844200076beb8885bfca0fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 15 Mar 2019 00:17:11 +0100 Subject: [PATCH 343/399] gnome3.tracker-miners: install systemd user services The build checks for systemd and won't install them by default if not found. --- pkgs/desktops/gnome-3/core/tracker-miners/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 1f5e2fcca5c..3f8f5cf8c88 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -64,6 +64,7 @@ in stdenv.mkDerivation rec { # TODO: tests do not like our sandbox "-Dfunctional_tests=false" "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" ]; patches = [ From 5d52ba8e61a6c74cc84a105cfee62fe9aa1dfa3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 15 Mar 2019 16:01:17 +0100 Subject: [PATCH 344/399] gnome3.dconf: disable tests on arch64 --- pkgs/desktops/gnome-3/core/dconf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 41f1c931b59..e20804d9e62 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - doCheck = true; + doCheck = !stdenv.isAarch64; passthru = { updateScript = gnome3.updateScript { From cd9aaebb789f1d0205b8af2056346e44cb2e718d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 15 Mar 2019 16:04:16 +0100 Subject: [PATCH 345/399] gobject-introspection: disable tests on aarch64 --- pkgs/development/libraries/gobject-introspection/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 816d4e5e17d..e6978d0955f 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cairoLib = "${getLib cairo}/lib"; }); - doCheck = true; + doCheck = !stdenv.isAarch64; passthru = { updateScript = gnome3.updateScript { From cf14ffdb245a2f764771a3727d677cd10e8eecd3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 Mar 2019 06:56:57 +0100 Subject: [PATCH 346/399] gnome3.gnome-todo: fix build --- .../gnome-3/apps/gnome-todo/default.nix | 67 +++++++++++++++---- 1 file changed, 53 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index 23b671ebfc0..4ae3b629af9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -1,28 +1,67 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook -, gettext, gnome3, glib, gtk3, libpeas -, gnome-online-accounts, gsettings-desktop-schemas -, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, python3 +, wrapGAppsHook +, gettext +, gnome3 +, glib +, gtk3 +, libpeas +, gnome-online-accounts +, gsettings-desktop-schemas +, adwaita-icon-theme +, evolution-data-server +, libxml2 +, libsoup +, libical +, librest +, json-glib +}: -let +stdenv.mkDerivation rec { pname = "gnome-todo"; version = "3.28.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7"; }; - nativeBuildInputs = [ - meson ninja pkgconfig gettext python3 wrapGAppsHook + patches = [ + # fix build with e-d-s 3.32 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch; + sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy"; + }) ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + python3 + wrapGAppsHook + ]; + buildInputs = [ - glib gtk3 libpeas gnome-online-accounts - gsettings-desktop-schemas gnome3.adwaita-icon-theme + glib + gtk3 + libpeas + gnome-online-accounts + gsettings-desktop-schemas + gnome3.adwaita-icon-theme # Plug-ins - evolution-data-server libxml2 libsoup libical - librest json-glib + evolution-data-server + libxml2 + libsoup + libical + librest + json-glib ]; postPatch = '' From b3143f1755199e4e418416a02ee2d17d3b7b8ae1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 Mar 2019 07:01:17 +0100 Subject: [PATCH 347/399] shotwell: 0.30.2 -> 0.31.0 --- .../graphics/shotwell/default.nix | 90 +++++++++++++++---- 1 file changed, 74 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 354e9725a43..f31b6d32399 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,31 +1,89 @@ -{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib, gcr -, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook -, gobject-introspection, itstool, libgdata, python3 }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, gtk3 +, libexif +, libgphoto2 +, libwebp +, libsoup +, libxml2 +, vala +, sqlite +, webkitgtk +, pkgconfig +, gnome3 +, gst_all_1 +, libgudev +, libraw +, glib +, json-glib +, gcr +, libgee +, gexiv2 +, librest +, gettext +, desktop-file-utils +, gdk_pixbuf +, librsvg +, wrapGAppsHook +, gobject-introspection +, itstool +, libgdata +, libchamplain +, python3 +}: # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling -let +stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.31.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0pam0si110vkc65kh59lrmgkv91f9zxmf1gpfm99ixjgw25rfi8r"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1pwq953wl7h9cvw7rvlr6pcbq9w28kkr7ddb8x2si81ngp0imwyx"; }; nativeBuildInputs = [ - meson ninja vala pkgconfig itstool gettext desktop-file-utils python3 wrapGAppsHook gobject-introspection + meson + ninja + vala + pkgconfig + itstool + gettext + desktop-file-utils + python3 + wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gtk3 libexif libgphoto2 libsoup libxml2 sqlite webkitgtk - gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee - libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas - libraw json-glib glib gdk_pixbuf librsvg gnome3.rest - gcr gnome3.adwaita-icon-theme libgdata + gtk3 + libexif + libgphoto2 + libwebp + libsoup + libxml2 + sqlite + webkitgtk + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libgee + libgudev + gexiv2 + gnome3.gsettings-desktop-schemas + libraw + json-glib + glib + gdk_pixbuf + librsvg + librest + gcr + gnome3.adwaita-icon-theme + libgdata + libchamplain ]; postPatch = '' From e0bdf84eafd6e55cc4e2ed5e5b13df3ce71bc2dd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 16 Mar 2019 17:33:52 -0400 Subject: [PATCH 348/399] pantheon.elementary-photos: fix build --- .../pantheon/apps/elementary-photos/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 21d5b9f1db4..644841354e5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils -, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2 +, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2, fetchpatch , granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3 , scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }: @@ -66,6 +66,14 @@ stdenv.mkDerivation rec { "-Dplugins=false" ]; + patches = [ + # Fix build against gexiv2 0.12 + (fetchpatch { + url = "https://github.com/elementary/photos/commit/86df00ced674abb2ee430ea24422079cfabb314c.patch"; + sha256 = "0836fzja93w36jf7ldqypsmnqn46mwsl93q41m104zn8qm0wrkmy"; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py From ef9bb8dc4b22a2b38055c9029b3ff99958ef853b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Mar 2019 01:48:01 +0100 Subject: [PATCH 349/399] =?UTF-8?q?geocode-glib:=203.26.0=20=E2=86=92=203.?= =?UTF-8?q?26.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/geocode-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index ebb9b354ff1..c1d0d7e8a4f 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geocode-glib"; - version = "3.26.0"; + version = "3.26.1"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"; + sha256 = "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; From 85ea09bc992a848679d894b870d6e6ca17a5d60b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Mar 2019 02:16:18 +0100 Subject: [PATCH 350/399] =?UTF-8?q?valadoc:=200.36.1=20=E2=86=92=200.36.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/valadoc/commits/0.36.2 --- pkgs/development/tools/valadoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix index a36e251a4a2..ebeb81c90ec 100644 --- a/pkgs/development/tools/valadoc/default.nix +++ b/pkgs/development/tools/valadoc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}: stdenv.mkDerivation rec { - version = "0.36.1"; + version = "0.36.2"; name = "valadoc-${version}"; src = fetchurl { url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "07501k2j9c016bd7rfr6xzaxdplq7j9sd18b5ixbqdbipvn6whnv"; + sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h"; }; nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobject-introspection ]; From c46913309845bfc8621966775b3991fe818c6b81 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Mar 2019 02:32:24 +0100 Subject: [PATCH 351/399] =?UTF-8?q?gnome-latex:=203.30.2=20=E2=86=92=203.3?= =?UTF-8?q?2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-latex/blob/3.32.0/NEWS --- pkgs/applications/editors/gnome-latex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index ff6439c8654..cfd3a428990 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let - version = "3.30.2"; + version = "3.32.0"; pname = "gnome-latex"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fn3vy6w714wy0bz3y11zpdprpwxbv5xfiyyxjwp2nix9mbvv2sm"; + sha256 = "1jdca9yhm7mm1aijd1a5amphgn15142kngky3id2am379ixrq1hg"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; From 51d80c240476746ecfa8cf38a4f5249aceee5b8c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Mar 2019 02:47:09 +0100 Subject: [PATCH 352/399] =?UTF-8?q?gtksourceview4:=204.0.3=20=E2=86=92=204?= =?UTF-8?q?.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/blob/4.2.0/NEWS --- pkgs/development/libraries/gtksourceview/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index acfd2c48081..3f0d2332519 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtksourceview-${version}"; - version = "4.0.3"; + version = "4.2.0"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0wwxgw43dmmaz07lzdzpladir26l2bly3lnf2ks6pna152wafm9x"; + sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4"; }; propagatedBuildInputs = [ From 103bf0cf1d0d8a28b7198230241d0d7c8e3eb63a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Mar 2019 03:07:06 +0100 Subject: [PATCH 353/399] =?UTF-8?q?meson:=200.49.1=20=E2=86=92=200.49.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 3651884253a..92a0ae3eb85 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: python3Packages.buildPythonApplication rec { - version = "0.49.1"; + version = "0.49.2"; pname = "meson"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "05wr4kn88aqq2cbzqx59zj56410c9d42wracb4cjs70mvq0lp50s"; + sha256 = "0ckkzq0kbnnk4rwv20lggm9a4fb5054jbv99i9pwjhid23qy7059"; }; postFixup = '' From 873528026f7b7c99f23d85b36dfd1394c125711a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 19 Mar 2019 19:39:55 -0400 Subject: [PATCH 354/399] gtksourceview3: use latest vala --- pkgs/development/libraries/gtksourceview/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index f979be547fe..9201f0f60d9 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40 +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala , libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala_0_40 ]; + nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; From 88837700be10371a694fae8cd850084552ee5278 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 19 Mar 2019 19:40:22 -0400 Subject: [PATCH 355/399] gtksourceview4: use latest vala --- pkgs/development/libraries/gtksourceview/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 3f0d2332519..553e9fd9cbb 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40 +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala_0_40 ]; + nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; From 02394286c22b7b0f8fb852776b98a39dadad26eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 21 Mar 2019 23:56:31 +0100 Subject: [PATCH 356/399] gnomeExtensions.dash-to-dock: 65 -> 66 3.32 support --- pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 4e94f07692b..06e7d27c544 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-dash-to-dock-${version}"; - version = "65"; + version = "66"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-v" + version; - sha256 = "0ln49l9s0yfl30pi77pz7xlmh63l9vjppi863kry5lay10dsvz47"; + sha256 = "04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh"; }; nativeBuildInputs = [ From 3486f5357e18fcc29a34c7dcf6cd3fd9ee5942b5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 22 Mar 2019 00:46:33 +0100 Subject: [PATCH 357/399] =?UTF-8?q?networkmanager-fortisslvpn:=201.2.8=20?= =?UTF-8?q?=E2=86=92=201.2.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/blob/1.2.10/NEWS --- .../networking/network-manager/fortisslvpn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 1fcbce28cc4..f4ffe620e74 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3, +{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3, networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let pname = "NetworkManager-fortisslvpn"; - version = "1.2.8"; + version = "1.2.10"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w"; + sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s"; }; patches = [ @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { buildInputs = [ openfortivpn networkmanager ppp ] ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig file ]; configureFlags = [ "--without-libnm-glib" From d0841f28847b0e37b0ce88cb22d00a7a036f6dac Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 20 Mar 2019 15:13:04 -0500 Subject: [PATCH 358/399] gtkmm3: 3.24.0 -> 3.24.1 --- pkgs/development/libraries/gtkmm/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index ba20af1caf5..1a5b0fe6287 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.0"; + version = "3.24.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hxaq4x9jqj8vvnv3sb6nwapz83v8lclbm887qqci0g50llcjpyg"; + sha256 = "1zfj89spr8ianib5y10wcw63ybdmyjy58a15vqs0m8jq4knl5znx"; }; outputs = [ "out" "dev" ]; From 62d03089821f6deac3edb5d395865d9a5dc7fd7d Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Fri, 22 Mar 2019 00:14:02 -0400 Subject: [PATCH 359/399] gnomeExtensions.nohotcorner: 18.0 -> 19.0 v19.0 declares support for gnome 3.32 and includes no other changes. The full change set can be found at https://github.com/HROMANO/nohotcorner/compare/v18.0...v19.0. --- pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix index 07622e07a72..21ff70140be 100644 --- a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix +++ b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-nohotcorner-${version}"; - version = "18.0"; + version = "19.0"; src = fetchFromGitHub { owner = "HROMANO"; repo = "nohotcorner"; rev = "v${version}"; - sha256 = "0vajiys93gs7fs9v6brgf8fplkmh28j103in3wq04l34cx5sqkks"; + sha256 = "059n4gyz7d686hknaifyjax8gygrda1xab5m15a09p98jdrdfdhi"; }; # Taken from the extension download link at From cc3fe4e569f638737155951a2c4635e72e5ef8c4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Mar 2019 10:08:19 -0400 Subject: [PATCH 360/399] gnome3.dconf-editor: add hicolor-icon-theme for setup-hook --- pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 3862d822a7b..8a6ecc5d5e1 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3 -, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: +, libxml2, gettext, docbook_xsl, hicolor-icon-theme, wrapGAppsHook, gobject-introspection }: let pname = "dconf-editor"; @@ -12,7 +12,11 @@ in stdenv.mkDerivation rec { sha256 = "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi"; }; - nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobject-introspection python3 ]; + nativeBuildInputs = [ + meson ninja vala libxslt pkgconfig wrapGAppsHook + gettext docbook_xsl libxml2 gobject-introspection python3 + hicolor-icon-theme # for setup-hook + ]; buildInputs = [ glib gtk3 gnome3.dconf ]; From e096cb7a0ef57eb83ebf7963a3a51ae0186b758d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Mar 2019 10:08:58 -0400 Subject: [PATCH 361/399] gnome3.gnome-software: add hicolor-icon-theme for setup-hook --- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 5682c34031f..0cd8267f521 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd -, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts +, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts, hicolor-icon-theme , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection + hicolor-icon-theme # for setup-hook ]; buildInputs = [ From ce6269c34bdf28be5e7b4fd3790ec6c33a362268 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Mar 2019 10:10:10 -0400 Subject: [PATCH 362/399] gnome3.gnome-online-accounts: add hicolor-icon-theme for setup-hook --- pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 8ea6b3ae7e3..9ae4a572d93 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook , webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection -, gettext, icu, glib-networking +, gettext, icu, glib-networking, hicolor-icon-theme , libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos }: @@ -31,6 +31,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gobject-introspection vala gettext wrapGAppsHook libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc + hicolor-icon-theme # for setup-hook ]; buildInputs = [ glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup From 3b3072e80794a4a321d831c5c41e1257564dc179 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Mar 2019 10:12:00 -0400 Subject: [PATCH 363/399] gnome3.gnome-packagekit: add hicolor-icon-theme for setup-hook --- pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index 30e393b918a..d819961d281 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit -, gtk3, systemd, wrapGAppsHook, desktop-file-utils }: +, gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd"; }; - nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; + nativeBuildInputs = [ + pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils + hicolor-icon-theme # for setup-hook + ]; + buildInputs = [ gtk3 packagekit systemd polkit ]; postPatch = '' From 24f670fa12f6f3d3655f75a0285214b5c6a55516 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Mar 2019 10:29:44 -0400 Subject: [PATCH 364/399] gnome3.gnome-usage: 3.30.0 -> 3.32.0 * uses libdazzle https://gitlab.gnome.org/GNOME/gnome-usage/blob/v3.32.0/NEWS --- .../applications/misc/gnome-usage/default.nix | 50 ++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index 724707d0be5..eecf9bbd88f 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -1,21 +1,47 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gettext -, libxml2, desktop-file-utils, wrapGAppsHook -, glib, gtk3, libgtop, gnome3 }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, vala +, gettext +, libxml2 +, desktop-file-utils +, wrapGAppsHook +, glib +, gtk3 +, libgtop +, libdazzle +, gnome3 +}: -let +stdenv.mkDerivation rec { pname = "gnome-usage"; - version = "3.30.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f1vccw916az8hzsqmx6f57jvl68s3sbd3qk4rpwn42ks1v7nmsh"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ + desktop-file-utils + gettext + libxml2 + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; - buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ]; + buildInputs = [ + glib + gnome3.adwaita-icon-theme + gtk3 + libdazzle + libgtop + ]; postPatch = '' chmod +x build-aux/meson/postinstall.sh @@ -29,7 +55,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = ""; + description = "A nice way to view information about use of system resources, like memory and disk space"; license = licenses.gpl3; platforms = platforms.linux; maintainers = gnome3.maintainers; From 510afdf4764d11b1618d4c5695847fc1f9ad2196 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 24 Mar 2019 10:35:56 -0400 Subject: [PATCH 365/399] gnome3.zenity: 3.30.0 -> 3.32.0 --- pkgs/desktops/gnome-3/core/zenity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index a347c8f2f9d..89d0fd7a3b9 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "zenity-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr"; + sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; }; preBuild = '' From f3110db864031e85100fecc32ff56359aadf2125 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 25 Mar 2019 23:18:19 +0100 Subject: [PATCH 366/399] uim: fix build --- pkgs/tools/inputmethods/uim/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index b8510b102cb..984eecf9e9d 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, shared-mime-info , autoconf, automake, intltool, libtool, pkgconfig, cmake , ruby, librsvg , ncurses, m17n_lib, m17n_db, expat @@ -127,6 +127,12 @@ stdenv.mkDerivation rec { #--with-sj3 Use SJ3 [default=no] #--with-osx-dcs Build with OS X Dictionary Services [default=no] + # TODO: fix this in librsvg/glib later + # https://github.com/NixOS/nixpkgs/pull/57027#issuecomment-475461733 + preBuild = '' + export XDG_DATA_DIRS="${shared-mime-info}/share" + ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { From 6d2201aecfd7e66ce3ba0a144f8c9e55f6991718 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 25 Mar 2019 23:21:01 +0100 Subject: [PATCH 367/399] mate.libmatekbd: fix build --- pkgs/desktops/mate/libmatekbd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 15b81a62886..395d69c28e6 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, libxklavier }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk3, mate, libxklavier }: stdenv.mkDerivation rec { name = "libmatekbd-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1l1zbphs4snswf4bkrwkk6gsmb44bdhymcfgaaspzbrcmw3y7hr1"; }; + patches = [ + # Fix build with glib 2.60 (TODO: remove after 1.22.0 update) + (fetchpatch { + url = https://github.com/mate-desktop/libmatekbd/commit/dc04e969dd61a2b1f82beae2d3c8ad105447812d.patch; + sha256 = "1ps6mbj6hrm9djn4riya049w2cb0dknghysny8pafmvpkaqvckrb"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gtk3 libxklavier ]; From 1c928f438709251e2ffd42e7d5669e4d21f8313e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 25 Mar 2019 23:23:25 +0100 Subject: [PATCH 368/399] arc-theme: fix build --- pkgs/misc/themes/arc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index adbee8a09f6..5b660908238 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + # TODO: remove this after update + ln -s 3.30 common/gnome-shell/3.32 ''; preBuild = '' From 5cc6b9b474f8c8b41d5e2b1a74e24be350dae56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 25 Mar 2019 15:01:44 +0100 Subject: [PATCH 369/399] gtksourceview: disable failing tests --- pkgs/development/libraries/gtksourceview/3.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 9201f0f60d9..ae90293b5f8 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = stdenv.isLinux; + doCheck = false; # FAIL: test-language checkPhase = '' NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ From 521f07c9683f37c2fede0ddbc2da61d6a1c8d49f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Mar 2019 00:08:29 +0100 Subject: [PATCH 370/399] =?UTF-8?q?perlPackages.Glib:=201.328=20=E2=86=92?= =?UTF-8?q?=201.329?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update, disable tests failing with glib 2.60: https://rt.cpan.org/Public/Bug/Display.html?id=128165 --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 54f8114034b..0d6e1c7bfc6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6426,6 +6426,7 @@ let sha256 = "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v"; }; buildInputs = [ pkgs.glib ]; + doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl wrappers for the GLib utility and Object libraries"; From aa1ecb352b236e99d811cf899f0b8685f6267294 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Mar 2019 00:38:58 +0100 Subject: [PATCH 371/399] mikutter: mark as broken --- .../networking/instant-messengers/mikutter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 42888da842c..3cb254122d7 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; description = "An extensible Twitter client"; homepage = https://mikutter.hachune.net; platforms = ruby.meta.platforms; From 59739bd92861315092db47f2cbe96c7e63b0400d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Mar 2019 00:50:07 +0100 Subject: [PATCH 372/399] ntrack: try to fix build --- pkgs/development/libraries/ntrack/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index a2361b0188e..c0a73fa984e 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python ]; + # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; # Remove this patch after version 016 From 3388f833d7264a3aed4f012a5b772e258d86bbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 26 Mar 2019 14:58:29 +0100 Subject: [PATCH 373/399] handbrake: add required harfbuzz dependency This was previously propagated by pango. --- pkgs/applications/video/handbrake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 77ee2bc10f8..aa2407134f3 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -11,7 +11,7 @@ # Codecs, audio libopus, lame, libvorbis, a52dec, speex, libsamplerate, # Text processing - libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, + libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz, # Optical media libdvdread, libdvdnav, libdvdcss, libbluray, useGtk ? true, wrapGAppsHook ? null, @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg-full libogg libtheora x264 x265 libvpx libopus lame libvorbis a52dec speex libsamplerate - libiconv fribidi fontconfig freetype libass jansson libxml2 + libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz libdvdread libdvdnav libdvdcss libbluray ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify From b8e655ad6e60178b5b36902040c5b02d2f38b1ad Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 31 Mar 2019 19:31:17 -0400 Subject: [PATCH 374/399] gnome3.mutter: hardcode path to zenity --- pkgs/desktops/gnome-3/core/mutter/default.nix | 9 ++++++++- pkgs/desktops/gnome-3/core/mutter/fix-paths.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/core/mutter/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 7d8105abbcd..4d3e72e7ff0 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo +{ fetchurl, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , gsettings-desktop-schemas, glib, gtk3, gnome-desktop @@ -47,6 +47,13 @@ stdenv.mkDerivation rec { gnome-settings-daemon ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + postPatch = '' patchShebangs src/backends/native/gen-default-modes.py ''; diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch b/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch new file mode 100644 index 00000000000..6ac0a431f61 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 57b73747d..f424cc81c 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) From 916f0936d706f2f6f9451dd2caa2192c4c069b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 28 Mar 2019 01:17:46 +0100 Subject: [PATCH 375/399] gitg: disable tests for now --- pkgs/desktops/gnome-3/misc/gitg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 9f24d04337c..5a691b89bc0 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" ''; - doCheck = true; + doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed enableParallelBuilding = true; From 469c3d7ec3d8033f0675c4dd58596b08d1b04116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 2 Apr 2019 21:37:25 +0200 Subject: [PATCH 376/399] pango: disable docs on darwin for now see https://github.com/mesonbuild/meson/issues/5202 --- pkgs/development/libraries/pango/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 6fbae1fa3c3..ef60b331fc6 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -17,7 +17,8 @@ in stdenv.mkDerivation rec { sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j"; }; - outputs = [ "bin" "dev" "out" "devdoc" ]; + # FIXME: docs fail on darwin + outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc"; nativeBuildInputs = [ meson ninja @@ -42,7 +43,7 @@ in stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Denable_docs=true" + "-Denable_docs=${if stdenv.isDarwin then "false" else "true"}" ]; enableParallelBuilding = true; From b22b5a2874a98b37425d2b4846ef47df69ce0f45 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 2 Apr 2019 16:37:00 -0400 Subject: [PATCH 377/399] meld: 3.20.0 > 3.20.1 https://gitlab.gnome.org/GNOME/meld/tags/3.20.1 --- pkgs/applications/version-management/meld/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index fd70dafe7f0..168827c3548 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, itstool, python3, intltool, wrapGAppsHook , libxml2, gobject-introspection, gtk3, gtksourceview, gnome3 -, dbus, xvfb_run +, gsettings-desktop-schemas, dbus, xvfb_run }: python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.20.0"; + version = "3.20.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11khi1sg02k3b9qdag3r939cwi27cql4kjim7jhxf9ckfhpzwh6b"; + sha256 = "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55"; }; nativeBuildInputs = [ intltool itstool libxml2 gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme + gtk3 gtksourceview gsettings-desktop-schemas gnome3.adwaita-icon-theme gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; From 8f2e57d9183dc7f0f591cbb2cfaab80f131c0155 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 2 Apr 2019 16:49:03 -0400 Subject: [PATCH 378/399] gnomeExtensions.battery-status: mark as broken --- pkgs/desktops/gnome-3/extensions/battery-status/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix index e1fe15c19d8..afedd5f98e1 100644 --- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configurable lightweight battery charge indicator and autohider"; license = licenses.gpl2; + broken = true; # not compatable with latest GNOME maintainers = with maintainers; [ jonafato ]; homepage = https://github.com/milliburn/gnome-shell-extension-battery_status; }; From 974fefea4df359e8472872a175f6c541867894e8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 2 Apr 2019 16:55:31 -0400 Subject: [PATCH 379/399] gnomeExtensions.caffeine: 2018-09-25 -> 2019-04-02 --- pkgs/desktops/gnome-3/extensions/caffeine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index 1de85ab36d2..e627bec8b93 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-caffeine-${version}"; - version = "unstable-2018-09-25"; + version = "unstable-2019-04-02"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "gnome-shell-extension-caffeine"; - rev = "71b6392c53e063563602c3d919c0ec6a4c5c9733"; - sha256 = "170zyxa41hvyi463as650nw3ygr297901inr3xslrhvjq1qacxri"; + rev = "a6b37dee108cddf50a0f0a19f0101854a75bf173"; + sha256 = "1j3q12j36v97551sjb0c8qc8zr7a7gmxibygczryfdfmwjzp6icl"; }; uuid = "caffeine@patapon.info"; From 98bf715f8a885457622a5133888c51b3ba4a14af Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 2 Apr 2019 17:04:05 -0400 Subject: [PATCH 380/399] gnomeExtensions.mediaplayer: 3.5 -> 2019-03-21 * GNOME 3.32 support [0] Also note this extension is being retired [1] [0]: https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/commit/c2483c18d8910cdc36b44eb01422032ab6048ba9 [1]: https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/issues/478 --- pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix index 6038443944f..686d7be91a4 100644 --- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extensions-mediaplayer-${version}"; - version = "3.5"; + version = "unstable-2019-03-21"; src = fetchFromGitHub { owner = "JasonLG1979"; repo = "gnome-shell-extensions-mediaplayer"; - rev = version; - sha256 = "0b8smid9vdybgs0601q9chlbgfm1rzrj3vmd3i6p2a5d1n4fyvsc"; + rev = "b382c98481fa421501684e2ff3eafc53971ef22b"; + sha256 = "01z2dml8dvl5sljw62g7x19mz02dz1g4gkmyp0h5bx49djcw1nnh"; }; nativeBuildInputs = [ From 5d10529e535825ab753c5521d25c25a36c6fb5bf Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 2 Apr 2019 17:05:27 -0400 Subject: [PATCH 381/399] gnomeExtensions.no-title-bar: mark as broken See: https://github.com/franglais125/no-title-bar/issues/114 --- pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index e1dedd2a88b..8c075a11bdc 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { description = "Integrates maximized windows with the top panel"; homepage = https://github.com/franglais125/no-title-bar; license = licenses.gpl2; + broken = true; # https://github.com/franglais125/no-title-bar/issues/114 maintainers = with maintainers; [ jonafato svsdep ]; platforms = platforms.linux; }; From 76ccc74076ad68b6ac2ebfe118e4aa752462b45b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 2 Apr 2019 17:17:06 -0400 Subject: [PATCH 382/399] gnomeExtensions.timepp: 2019.03.17 -> 2019-03-30 * GNOME 3.32 support [0] [0]: https://github.com/zagortenay333/timepp__gnome/commit/28191b781b4da0756923c2fae55415e0986ae0c6 --- pkgs/desktops/gnome-3/extensions/timepp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index dcc018d1883..604b7433ccb 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-timepp-${version}"; - version = "2018.03.17"; + version = "unstable-2019-03-30"; src = fetchFromGitHub { owner = "zagortenay333"; repo = "timepp__gnome"; - rev = "440cf85dc68d9e6ba876793f13910ee6239622cf"; - sha256 = "0idsqsii5rvynvj78w2j7xiiz9rrl3384m5mj6bf6rg8vprpfi8v"; + rev = "f90fb5573b37ac89fb57bf62e07d6d3bdb6a2c63"; + sha256 = "0p6rsbm6lf61vzly775qkwc2rcjjl38bkqdxnv4sccqmw2wwclnp"; }; uuid = "timepp@zagortenay333"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = " A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; + description = "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; homepage = https://github.com/zagortenay333/timepp__gnome; license = licenses.gpl3; maintainers = with maintainers; [ svsdep ]; From 294c1a65a78889a34a11af998bf2c90adfa8ce25 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 2 Apr 2019 17:39:30 -0400 Subject: [PATCH 383/399] gnomeExtensions.icon-hider: mark as broken --- pkgs/desktops/gnome-3/extensions/icon-hider/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index bc397dc7122..f5069b8753b 100644 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icon Hider is a GNOME Shell extension for managing status area items"; license = licenses.bsd3; + broken = true; # not compatable with latest GNOME maintainers = with maintainers; [ jonafato ]; platforms = platforms.linux; homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider; From 46874a7c45ed1fa23558e89876144de484c4d1c6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 2 Apr 2019 17:43:48 -0400 Subject: [PATCH 384/399] gnomeExtensions.system-monitor: mark as broken * Not yet compatable with GNOME 3.32 [0] [1] [0]: https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/510 [1]: https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/issues/511 --- pkgs/desktops/gnome-3/extensions/system-monitor/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 8bafbd003d5..7046e673726 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; + broken = true; # GNOME 3.32 support WIP: https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/510 maintainers = with maintainers; [ aneeshusa tiramiseb ]; homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; }; From 87d1ff41fdc5c8b2b887ac51d77fa5e8b9125446 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 2 Apr 2019 18:13:02 -0400 Subject: [PATCH 385/399] gnomeExtensions.taskwhisperer: 11 -> 12 * has a proper Makefile * resync patch Changes: https://github.com/cinatic/taskwhisperer/compare/v11...v12 --- .../extensions/taskwhisperer/default.nix | 29 ++++--- .../extensions/taskwhisperer/fix-paths.patch | 76 ++++++++++++------- 2 files changed, 61 insertions(+), 44 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index fcaa868c06f..c72d72cce12 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -1,36 +1,35 @@ -{ stdenv, substituteAll, fetchFromGitHub, taskwarrior }: +{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }: stdenv.mkDerivation rec { name = "gnome-shell-extension-taskwhisperer-${version}"; - version = "11"; + version = "12"; src = fetchFromGitHub { owner = "cinatic"; repo = "taskwhisperer"; rev = "v${version}"; - sha256 = "1g1301rwnfg5jci78bjpmgxrn78ra80m1zp2inhfsm8jssr1i426"; + sha256 = "187p6p498dd258avsfqqsm322g58y75pc2wbhb4jpmm9insqm1bj"; }; - buildInputs = [ taskwarrior ]; + nativeBuildInputs = [ + gettext + ]; + + buildInputs = [ + taskwarrior + ]; uuid = "taskwhisperer-extension@infinicode.de"; - installPhase = '' - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp *.js $out/share/gnome-shell/extensions/${uuid} - cp -r extra $out/share/gnome-shell/extensions/${uuid} - cp -r icons $out/share/gnome-shell/extensions/${uuid} - cp -r locale $out/share/gnome-shell/extensions/${uuid} - cp -r schemas $out/share/gnome-shell/extensions/${uuid} - cp metadata.json $out/share/gnome-shell/extensions/${uuid} - cp settings.ui $out/share/gnome-shell/extensions/${uuid} - cp stylesheet.css $out/share/gnome-shell/extensions/${uuid} - ''; + makeFlags = [ + "INSTALLBASE=${placeholder ''out''}/share/gnome-shell/extensions" + ]; patches = [ (substituteAll { src = ./fix-paths.patch; task = "${taskwarrior}/bin/task"; + shell = "${runtimeShell}"; }) ]; diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch index 310d6ea1b30..2ea54f4b089 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch @@ -1,22 +1,22 @@ -diff --git a/extra/create.sh b/extra/create.sh +diff --git a/taskwhisperer-extension@infinicode.de/extra/create.sh b/taskwhisperer-extension@infinicode.de/extra/create.sh index a69e369..35d5ea1 100755 ---- a/extra/create.sh -+++ b/extra/create.sh +--- a/taskwhisperer-extension@infinicode.de/extra/create.sh ++++ b/taskwhisperer-extension@infinicode.de/extra/create.sh @@ -1 +1 @@ -bash -c "task add $1" +bash -c "@task@ add $1" -diff --git a/extra/modify.sh b/extra/modify.sh +diff --git a/taskwhisperer-extension@infinicode.de/extra/modify.sh b/taskwhisperer-extension@infinicode.de/extra/modify.sh index 7964a26..8edd21b 100755 ---- a/extra/modify.sh -+++ b/extra/modify.sh +--- a/taskwhisperer-extension@infinicode.de/extra/modify.sh ++++ b/taskwhisperer-extension@infinicode.de/extra/modify.sh @@ -1 +1 @@ -bash -c "task $1 modify $2" +bash -c "@task@ $1 modify $2" -diff --git a/taskService.js b/taskService.js -index dea40d8..ff35a80 100644 ---- a/taskService.js -+++ b/taskService.js -@@ -186,7 +186,7 @@ const TaskService = new Lang.Class({ +diff --git a/taskwhisperer-extension@infinicode.de/taskService.js b/taskwhisperer-extension@infinicode.de/taskService.js +index ead7a12..aa36db4 100644 +--- a/taskwhisperer-extension@infinicode.de/taskService.js ++++ b/taskwhisperer-extension@infinicode.de/taskService.js +@@ -182,7 +182,7 @@ const TaskService = class TaskService { let project = projectName ? "project:" + projectName : ""; @@ -25,57 +25,75 @@ index dea40d8..ff35a80 100644 let reader = new SpawnReader.SpawnReader(); let buffer = ""; -@@ -227,7 +227,7 @@ const TaskService = new Lang.Class({ +@@ -220,7 +220,7 @@ const TaskService = class TaskService { break; } - let shellProc = Gio.Subprocess.new(['task', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; -@@ -274,7 +274,7 @@ const TaskService = new Lang.Class({ +@@ -261,7 +261,7 @@ const TaskService = class TaskService { return; } - let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; -@@ -307,7 +307,7 @@ const TaskService = new Lang.Class({ +@@ -290,7 +290,7 @@ const TaskService = class TaskService { return; } - let shellProc = Gio.Subprocess.new(['task', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; -@@ -339,7 +339,7 @@ const TaskService = new Lang.Class({ - { +@@ -318,7 +318,7 @@ const TaskService = class TaskService { + if (!taskID) { return; } - let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; shellProc.wait_finish(result); -@@ -369,7 +369,7 @@ const TaskService = new Lang.Class({ - { +@@ -344,7 +344,7 @@ const TaskService = class TaskService { + if (!taskID) { return; } - let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; shellProc.wait_finish(result); -@@ -468,7 +468,7 @@ const TaskService = new Lang.Class({ +@@ -374,7 +374,7 @@ const TaskService = class TaskService { + // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the + // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) + // bypassing problem with own shell script +- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); ++ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); - try - { + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; +@@ -403,7 +403,7 @@ const TaskService = class TaskService { + // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the + // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) + // bypassing problem with own shell script +- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); ++ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); + + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; +@@ -432,7 +432,7 @@ const TaskService = class TaskService { + let shellProc; + + try { - shellProc = Gio.Subprocess.new(['task', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); + shellProc = Gio.Subprocess.new(['@task@', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); - } - catch(err) - { + } catch (err) { + onError(err); + return; From a2c1f97a11b6df799dbe99be0acbd4a794d1ff58 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 15 Mar 2019 16:30:00 -0400 Subject: [PATCH 386/399] pantheon.elementary-settings-daemon: 3.30.2 -> 3.32.0 - sync patches [0] - clean up deps - use gnome3.updateScript [0]: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon/commit/?id=bab64774ef3a8f17b6fa29bb1d7aa1cb7c964341 --- pkgs/desktops/pantheon/default.nix | 4 +- .../elementary-settings-daemon/default.nix | 76 ++++++++++++++----- 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 8271abc1506..039d75beb4f 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -133,9 +133,7 @@ lib.makeScope pkgs.newScope (self: with self; { # We're using ubuntu and elementary's patchset due to reasons # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 # Take note of "I am holding off on "fixing" this bug for as long as possible." - elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { - inherit (gnome3) libgweather; - }; + elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 3829cf551f7..1dfa64ae373 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,23 +1,59 @@ -{ fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit -, geocode-glib, gtk3 -, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager -, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }: +{ accountsservice +, alsaLib +, colord +, docbook_xsl +, fetchgit +, fetchurl +, geoclue2 +, geocode-glib +, gettext +, glib +, gnome3 +, gsettings-desktop-schemas +, gtk3 +, lcms2 +, libcanberra-gtk3 +, libgnomekbd +, libgudev +, libgweather +, libnotify +, libpulseaudio +, libwacom +, libxml2 +, libxslt +, meson +, networkmanager +, ninja +, nss +, pantheon +, perl +, pkgconfig +, polkit +, python3 +, substituteAll +, systemd +, tzdata +, upower +, wrapGAppsHook +, stdenv +}: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.30.2"; + version = "3.32.0"; + + projectName = "gnome-settings-daemon"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/gnome-settings-daemon-${version}.tar.xz"; - sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; + url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz"; + sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63"; }; # Source for ubuntu's patchset src2 = fetchgit { - url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon"; + url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}"; rev = "refs/tags/ubuntu/${version}-1ubuntu1"; - sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c"; + sha256 = "0ayd50mr0pv2h4j1r1haf8y2hj8jv59vypa7lx8jis0llrm7s3yn"; }; # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. @@ -33,7 +69,6 @@ stdenv.mkDerivation rec { "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" "${patchPath}/correct_logout_action.patch" "${patchPath}/ubuntu-lid-close-suspend.patch" - "${patchPath}/revert-wacom-migration.patch" "${patchPath}/revert-gsettings-removals.patch" "${patchPath}/revert-mediakeys-dbus-interface-drop.patch" "${patchPath}/ubuntu_ibus_configs.patch" @@ -60,6 +95,7 @@ stdenv.mkDerivation rec { done # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 + # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop ''; @@ -84,32 +120,34 @@ stdenv.mkDerivation rec { geocode-glib glib gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas gtk3 - ibus lcms2 - libXtst libcanberra-gtk3 + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema libgudev libgweather libnotify libpulseaudio - librsvg libwacom - libxkbfile networkmanager nss polkit - udev + systemd upower - xf86_input_wacom - xkeyboard_config ]; mesonFlags = [ "-Dudev_dir=${placeholder "out"}/lib/udev" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = projectName; + attrPath = "pantheon.${pname}"; + }; + }; + meta = with stdenv.lib; { license = licenses.gpl2Plus; maintainers = pantheon.maintainers; From e0a90a5fc182d8bfe40e3e4ab65bb9de030aa1e9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 25 Mar 2019 18:16:52 +0100 Subject: [PATCH 387/399] evince: meson, enable DVI, XPS, and PDF multimedia support --- pkgs/desktops/gnome-3/core/evince/default.nix | 50 ++++++++++++++----- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 80a8700ab6a..4b0ae91d78f 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,6 +1,7 @@ -{ fetchurl +{ fetchFromGitLab , stdenv -, autoreconfHook +, meson +, ninja , pkgconfig , gettext , libxml2 @@ -26,21 +27,37 @@ , gspell , adwaita-icon-theme , gsettings-desktop-schemas +, gnome-desktop +, dbus +, python3 +, texlive +, t1lib +, gst_all_1 +, supportMultimedia ? true # PDF multimedia , libgxps -, supportXPS ? false # Open XML Paper Specification via libgxps +, supportXPS ? true # Open XML Paper Specification via libgxps }: stdenv.mkDerivation rec { pname = "evince"; version = "3.32.0"; - src = fetchurl { - url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0h2c6b2h6g3zy0gnycrjk1y7rp0kf7ppci76dmd2zvb6chhpgngh"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = version; + sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r"; }; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + nativeBuildInputs = [ - autoreconfHook + meson + ninja pkgconfig gobject-introspection gettext @@ -48,6 +65,7 @@ stdenv.mkDerivation rec { yelp-tools appstream wrapGAppsHook + python3 ]; buildInputs = [ @@ -67,13 +85,19 @@ stdenv.mkDerivation rec { librsvg adwaita-icon-theme gspell - ] ++ stdenv.lib.optional supportXPS libgxps; + gnome-desktop + dbus # only needed to find the service directory + texlive.bin.core # kpathsea for DVI support + t1lib + ] ++ stdenv.lib.optional supportXPS libgxps + ++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); - configureFlags = [ - "--disable-nautilus" # Do not build nautilus plugin - "--enable-ps" - "--enable-introspection" - (if supportXPS then "--enable-xps" else "--disable-xps") + mesonFlags = [ + "-Dauto_features=enabled" + "-Dnautilus=false" + "-Dps=enabled" + "-Dgtk_doc=false" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; From ad5cabf57524c776f6bb051df532f75df9c65cec Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 26 Mar 2019 12:08:58 +0100 Subject: [PATCH 388/399] nixos/evince: init --- nixos/modules/module-list.nix | 1 + .../services/desktops/gnome3/evince.nix | 35 +++++++++++++++++++ .../services/x11/desktop-managers/gnome3.nix | 1 + 3 files changed, 37 insertions(+) create mode 100644 nixos/modules/services/desktops/gnome3/evince.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 03e5f537c22..ed6de399ca8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -265,6 +265,7 @@ ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix + ./services/desktops/gnome3/evince.nix ./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/file-roller.nix ./services/desktops/gnome3/gnome-disks.nix diff --git a/nixos/modules/services/desktops/gnome3/evince.nix b/nixos/modules/services/desktops/gnome3/evince.nix new file mode 100644 index 00000000000..5f040a16f06 --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/evince.nix @@ -0,0 +1,35 @@ +# Evince. + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.gnome3.evince = { + + enable = mkEnableOption + "systemd and dbus services for Evince, the GNOME document viewer"; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.gnome3.evince.enable { + + environment.systemPackages = [ pkgs.evince ]; + + services.dbus.packages = [ pkgs.evince ]; + + systemd.packages = [ pkgs.evince ]; + + }; + +} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 71ab8b6f49a..121ef07c00d 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -126,6 +126,7 @@ in { services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; + services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; services.gnome3.file-roller.enable = mkDefault true; services.gnome3.gnome-disks.enable = mkDefault true; From 1279016787f72d004c09b1fb562a0f6946bfdc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 5 Apr 2019 21:03:59 +0200 Subject: [PATCH 389/399] Re-Revert "Merge #58997 gettext: apply patch for CVE 2018-1875" This reverts commit 742416addbb5665f39c98337a921eb52f37adf85. Moved to staging. --- .../development/libraries/gettext/default.nix | 13 ++++-- .../tools/misc/automake/automake-1.15.x.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/misc/automake/automake-1.15.x.nix diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 8ed898813ae..1dae2c443c8 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libiconv, xz }: +{ stdenv, lib, fetchurl, libiconv, xz, bison, automake115x, autoconf }: stdenv.mkDerivation rec { name = "gettext-${version}"; @@ -8,7 +8,14 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gettext/${name}.tar.gz"; sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z"; }; - patches = [ ./absolute-paths.diff ]; + patches = [ + ./absolute-paths.diff + (fetchurl { + name = "CVE-2018-18751.patch"; + url = "https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=patch;h=dce3a16e5e9368245735e29bf498dcd5e3e474a4"; + sha256 = "1lpjwwcjr1sb879faj0xyzw02kma0ivab6xwn3qciy13qy6fq5xn"; + }) + ]; outputs = [ "out" "man" "doc" "info" ]; @@ -40,7 +47,7 @@ stdenv.mkDerivation rec { sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in ''; - nativeBuildInputs = [ xz xz.bin ]; + nativeBuildInputs = [ xz xz.bin bison automake115x autoconf]; # HACK, see #10874 (and 14664) buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix new file mode 100644 index 00000000000..e1aeb025c30 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, perl, autoconf }: + +stdenv.mkDerivation rec { + name = "automake-1.15"; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r"; + }; + + nativeBuildInputs = [ autoconf perl ]; + buildInputs = [ autoconf ]; + + setupHook = ./setup-hook.sh; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths + doInstallCheck = false; # runs the same thing, fails the same tests + + # The test suite can run in parallel. + enableParallelBuilding = true; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + branch = "1.15"; + homepage = https://www.gnu.org/software/automake/; + description = "GNU standard-compliant makefile generator"; + license = stdenv.lib.licenses.gpl2Plus; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd5ce3a4f53..06682fc4dc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8537,6 +8537,8 @@ in automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; + automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { }; + automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { }; automoc4 = callPackage ../development/tools/misc/automoc4 { }; From c689a3bad9b67f91eb5e10f77fe07a5561b871a4 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 6 Apr 2019 14:35:12 +0200 Subject: [PATCH 390/399] xkeyboard-config: intltool should be a nativeBuildInput (#59048) --- pkgs/servers/x11/xorg/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 876b5861a05..068130f9c76 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -408,7 +408,7 @@ self: super: }); xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [intltool]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [intltool]; #TODO: resurrect patches for US_intl? patches = [ ./xkeyboard-config-eo.patch ]; From 44a40a02cbb62331c6ac82bc046624f1d1cd6e20 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 6 Apr 2019 17:09:43 -0400 Subject: [PATCH 391/399] gnome3.gitg: cleanup --- pkgs/desktops/gnome-3/misc/gitg/default.nix | 66 ++++++++++++++++----- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 5a691b89bc0..803465f62bb 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,22 +1,42 @@ -{ stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib -, json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection -, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme -, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret -, meson, ninja, python3 - }: +{ stdenv +, fetchurl +, fetchpatch +, vala +, intltool +, pkgconfig +, gtk3 +, glib +, json-glib +, wrapGAppsHook +, libpeas +, bash +, gobject-introspection +, libsoup +, gtksourceview +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome3 +, gtkspell3 +, shared-mime-info +, libgee +, libgit2-glib +, libsecret +, meson +, ninja +, python3 +}: -let +stdenv.mkDerivation rec { pname = "gitg"; version = "3.30.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss"; }; patches = [ + # Fix build with latest libgit2-glib (fetchpatch { url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch; sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw"; @@ -36,12 +56,30 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - gtk3 glib json-glib libgee libpeas libsoup - libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas - libsecret gobject-introspection adwaita-icon-theme + adwaita-icon-theme + glib + gsettings-desktop-schemas + gtk3 + gtksourceview + gtkspell3 + json-glib + libgee + libgit2-glib + libpeas + libsecret + libsoup ]; - nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ]; + nativeBuildInputs = [ + gobject-introspection + intltool + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; preFixup = '' gappsWrapperArgs+=( From 1fa452535ed7cb1906fd2136541917e6b19d8175 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 6 Apr 2019 17:14:23 -0400 Subject: [PATCH 392/399] gnome3.gitg: fix build using vala_0_42 This is fixed in master but it's too much to patch in. --- pkgs/desktops/gnome-3/misc/gitg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 803465f62bb..cb4c5c05cb0 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl , fetchpatch -, vala +, vala_0_42 , intltool , pkgconfig , gtk3 @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala + vala_0_42 # fails build with 0.44, drop in >3.30.1 wrapGAppsHook ]; From f3ac8d3dcaf87502180277fb2ab509c09d275269 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 6 Apr 2019 17:41:01 -0400 Subject: [PATCH 393/399] vte-ng: fix build --- pkgs/development/libraries/vte/ng.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix index 6231b8315cd..c00be4c008f 100644 --- a/pkgs/development/libraries/vte/ng.nix +++ b/pkgs/development/libraries/vte/ng.nix @@ -1,4 +1,4 @@ -{ vte, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: +{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf }: vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; @@ -11,6 +11,15 @@ vte.overrideAttrs (oldAttrs: rec { sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags"; }; + patches = [ + # Fix build with vala 0.44 + # See: https://github.com/thestinger/vte-ng/issues/32 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/vte/commit/53690d5cee51bdb7c3f7680d3c22b316b1086f2c.patch"; + sha256 = "1jrpqsx5hqa01g7cfqrsns6vz51mwyqwdp43ifcpkhz3wlp5dy66"; + }) + ]; + preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] From b1298b38df4ebcd6622fa858f8e8b14072bc533d Mon Sep 17 00:00:00 2001 From: Ben Harper Date: Wed, 3 Apr 2019 22:20:00 +1100 Subject: [PATCH 394/399] ibus 1.5.17 -> 1.5.20 --- pkgs/tools/inputmethods/ibus/default.nix | 37 +++++++++++++++--------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index e1cd8ad09fb..8948f1abbb3 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig +{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null @@ -50,6 +50,24 @@ let }; nativeBuildInputs = [ autoreconfHook ]; }; + ucdSrcs = { + NamesList = fetchurl { + url = "https://www.unicode.org/Public/UNIDATA/NamesList.txt"; + sha256 = "c17c7726f562bd9ef869096807f0297e1edef9a58fdae1fbae487378fa43586f"; + }; + Blocks = fetchurl { + url = "https://www.unicode.org/Public/UNIDATA/Blocks.txt"; + sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10"; + }; + }; + ucd = stdenv.mkDerivation rec { + name = "ucd-12.0.0"; + unpackPhase = ":"; + installPhase = '' + mkdir $out + ${builtins.toString (flip mapAttrsToList ucdSrcs (k: v: "cp ${v} $out/${k}.txt;"))} + ''; + }; python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); python3BuildEnv = python3.buildEnv.override { # ImportError: No module named site @@ -59,24 +77,17 @@ let makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH ''; }; - - # stop gconf from leaking into environment - # can be removed in ibus 1.6 which will not use gconf anymore - gsettings-schema-convert = runCommand "name" {} '' - mkdir -p $out/bin - ln -s ${gconf}/bin/gsettings-schema-convert $out/bin - ''; in stdenv.mkDerivation rec { name = "ibus-${version}"; - version = "1.5.17"; + version = "1.5.20"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "09mrj9d8qpl9cbylg1zx8c3ymc5gdy4jrf6zs125wjz0b574g5av"; + sha256 = "1npavb896qrp6qbqayb0va4mpsi68wybcnlbjknzgssqyw2ylh9r"; }; postPatch = '' @@ -88,10 +99,8 @@ stdenv.mkDerivation rec { ''; preAutoreconf = "touch ChangeLog"; - preConfigure = "intltoolize"; configureFlags = [ - "--disable-gconf" "--disable-memconf" (enableFeature (dconf != null) "dconf") (enableFeature (libnotify != null) "libnotify") @@ -100,13 +109,13 @@ stdenv.mkDerivation rec { (enableFeature enableUI "ui") "--with-unicode-emoji-dir=${emojiData}" "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations" + "--with-ucd-dir=${ucd}" ]; nativeBuildInputs = [ autoreconfHook - gsettings-schema-convert gtk-doc - intltool + gettext makeWrapper pkgconfig python3BuildEnv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3c444f924d..0b1c053ba30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2065,7 +2065,6 @@ in libkkc = callPackage ../tools/inputmethods/libkkc { }; ibus = callPackage ../tools/inputmethods/ibus { - gconf = gnome2.GConf; inherit (gnome3) dconf; }; From acedc516fe6a561ff740976db3c1836a0aae9616 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 8 Apr 2019 16:40:54 -0400 Subject: [PATCH 395/399] nixos/pantheon: use evince module --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index d0278271409..b557f5faafb 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -116,6 +116,7 @@ in # pantheon has pantheon-agent-geoclue2 services.geoclue2.enableDemoAgent = false; services.gnome3.at-spi2-core.enable = true; + services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; services.gnome3.file-roller.enable = mkDefault true; # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully @@ -162,7 +163,6 @@ in gnome3.geary gnome3.epiphany gnome3.gnome-font-viewer - evince ] ++ pantheon.apps) config.environment.pantheon.excludePackages) ++ (with pkgs; [ From 9ddf85d1d2dd1b897c673be4a8e708037b2dea26 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Tue, 9 Apr 2019 20:43:24 -0400 Subject: [PATCH 396/399] gnomeExtensions.appindicator: 23.1 -> 28 Update the GNOME appindicator support extension to the latest version. See the GitHub page for the full changelog: https://github.com/ubuntu/gnome-shell-extension-appindicator/compare/v23...v28 --- pkgs/desktops/gnome-3/extensions/appindicator/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 834cc7e0283..d8180096d2f 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { name = "gnome-shell-extension-appindicator-${version}"; - version = "23.1"; + version = "28"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "1v10jdncb9d5f5i0yzir20km4zvsb6ql7p8mv8w9ihw318rzh3qv"; + sha256 = "03sgb2xkb4lzp8pbb7g56q29y1r764qzpc0j4d4m1gi0sb39sxrl"; }; # This package has a Makefile, but it's used for building a zip for @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato ]; + platforms = gnome3.gnome-shell.meta.platforms; homepage = https://github.com/Ubuntu/gnome-shell-extension-appindicator; }; } From b528e0aecfc9307306ecccd7c1b43cc6cf019412 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 11 Apr 2019 01:32:21 -0400 Subject: [PATCH 397/399] font-manager: 0.7.4.3 -> 0.7.5, fix build Has fixes for type-argument mismatches in lastest vala etc. Note that there isn't an offical 0.7.5 release yet (not tagged). Patching the fixes would have been nicer, but all the changes touched the translations. --- pkgs/applications/misc/font-manager/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 2ffa784360f..f8a02d2f78c 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, +{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch, pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.4.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; - rev = version; - sha256 = "0v6zn25vxsn3ng31zgsgkb2wwrl0kdv4ikw4ij4yqv49aid3qjd5"; + rev = "cc057f3e93f5b1033b04decee03cdb44177e48b3"; + sha256 = "1xg80bi2465p5r8zfmb34iga9yqs3is1k4f13hw0ligvhb58gas0"; }; nativeBuildInputs = [ @@ -38,7 +38,9 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme ]; - patches = [ ./correct-post-install.patch ]; + patches = [ + ./correct-post-install.patch + ]; mesonFlags = [ "-Ddisable_pycompile=true" From 932f1086a9a66885d57c7428540fc6731af58c61 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 11 Apr 2019 01:45:06 -0400 Subject: [PATCH 398/399] plasma5.plasma-workspace: fix patch --- pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 21adba7359d..55a4518021e 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -595,7 +595,6 @@ index 1fe41c5..11757df 100644 +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) -if test x"$wait_drkonqi"x = x"true"x ; then ->>>>>>> upstream/master +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` From d85c466936e505a0925ad8e6dc3c4117e3dc9f29 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 11 Apr 2019 03:36:15 -0400 Subject: [PATCH 399/399] plasma5.xdg-desktop-portal-kde: fix build Was missing KIO --- pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index ae1ee50a121..1e04eb1e2b0 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -2,14 +2,14 @@ mkDerivation, extra-cmake-modules, gettext, kdoctools, python, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - cups, pcre, pipewire + cups, pcre, pipewire, kio }: mkDerivation { name = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ - cups pcre pipewire + cups pcre pipewire kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem ]; }