Skip to content

Commit

Permalink
update for nixos-18.03
Browse files Browse the repository at this point in the history 
commit faa8440d60ef36ef24d0d70c99608b276a88e954
Author: Jeffrey David Johnson <[email protected]>
Date:   Wed Apr 4 21:30:34 2018 -0700

    got nixos-18.03 working

commit 0d2209c4a5717288782e3187729e76cbdb31e3ad
Merge: 63588cf0bd9 b6ddb9913f2
Author: Jeffrey David Johnson <[email protected]>
Date:   Wed Mar 28 01:56:48 2018 -0700

    Merge remote-tracking branch 'channels/nixos-18.03' into master-merge-18.03

commit b6ddb9913f2b8206837e0f137db907bdefb9275e
Author: Daiderd Jordan <[email protected]>
Date:   Sun Mar 25 16:36:22 2018 +0200

    swftools: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit 3301258190101c6b771c70490b1e66db3e758cd3)

commit 4403f338602a31782d5e4f910c0d036453a8a8e7
Author: Tuomas Tynkkynen <[email protected]>
Date:   Sun Mar 25 16:39:10 2018 +0300

    llvm_34, llvm_35: Disable on aarch64

    https://hydra.nixos.org/build/71176565
    https://hydra.nixos.org/build/71167754
    (cherry picked from commit bec461a35ac10a4c8bc796df840722b785db3a44)

commit 7a752aa8f8fd90b739b9ff9a4f096d4983e7fe7a
Author: Gabriel Ebner <[email protected]>
Date:   Sun Mar 25 16:13:37 2018 +0200

    gogs: 0.11.29 -> 0.11.34

    There were security fixes in the 0.11.33 release.

    (cherry picked from commit 19fa3a5e53156dc4a2e6502430dc9ebc99787d76)

commit 12deb60a67f7b5768d23773b27bf6d69ae1bb8b6
Author: Daiderd Jordan <[email protected]>
Date:   Sun Mar 25 15:33:36 2018 +0200

    shairplay: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit 3ca8b20328ca6aebe15e6356be2c2249c2a5a67f)

commit 642a86ba8405aea4af750c4228ec77e603994301
Author: Daiderd Jordan <[email protected]>
Date:   Sun Mar 25 15:23:49 2018 +0200

    scowl: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit e52250b33c85ab3eb30325b0141ca16ed2cdbc5a)

commit 22ad26e23db8a812b203a696c76ff8829ce79c71
Author: Daiderd Jordan <[email protected]>
Date:   Sun Mar 25 15:03:05 2018 +0200

    runit: mark linux only

    /cc ZHF #36454

    (cherry picked from commit 713ff855e074c300c7921fcf01757ffc38e9e01a)

commit 2224dd159935dce43452fb4f8c9d6a726d1af974
Author: Daiderd Jordan <[email protected]>
Date:   Sun Mar 25 14:39:31 2018 +0200

    ragel: fix clang build

    /cc ZHF #36454

    (cherry picked from commit 319c61c893f896279d3ad2e8ef26d0026909b191)

commit 91b09422cf6f8e44d3d06274761053d9e21d6fa2
Author: Tuomas Tynkkynen <[email protected]>
Date:   Sat Mar 24 16:07:50 2018 +0200

    U-Boot: Disable parallel build

    https://hydra.nixos.org/build/71880710
    (cherry picked from commit 50dc85ed6283bb17684597cbf95f9405d5637fea)

commit c4597d2568d94fc8d2422bfa86326d4370a93cd8
Author: Tuomas Tynkkynen <[email protected]>
Date:   Fri Mar 23 19:03:26 2018 +0200

    armTrustedFirmware: Disable parallel build

    I think https://hydra.nixos.org/build/71541345 is parallel build
    related.

    (cherry picked from commit bab5a0664cfc982bf4915ccb214f4a11a5310cea)

commit f2c9a2557b2700b21b277f2b274abdf906deb932
Author: Tuomas Tynkkynen <[email protected]>
Date:   Fri Mar 23 19:03:04 2018 +0200

    armTrustedFirmwareQemu: 1.4 -> 1.5, fixes build with GCC7

    (cherry picked from commit 107eaa8780d651bebfe922d15c3519765dc5a5c9)

commit 298ea40d398726a3187da4ad513477da19576b08
Author: Tuomas Tynkkynen <[email protected]>
Date:   Tue Mar 20 02:31:31 2018 +0200

    armTrustedFirmware: Remove targetPlatforms like was done in U-Boot

    Should also fix Hydra attempting to build this stuff on x86, like
    https://hydra.nixos.org/build/71533289

    (cherry picked from commit a2d8a9aad70d76e965ff33c8722604b068ca4bc8)

commit a68e60f450b5be76d40627066b2c34a0e2360fab
Author: Tuomas Tynkkynen <[email protected]>
Date:   Fri Mar 16 19:27:01 2018 +0200

    U-Boot: Make ubootJetsonTK1 install even more files

    (cherry picked from commit 4fe75d11b2efdd3325ee8eaa4347626f1a950dbd)

commit 1896fcff609d7b99b4be1781a5c9523193c33e4f
Author: Tuomas Tynkkynen <[email protected]>
Date:   Fri Jan 19 22:14:00 2018 +0200

    U-Boot: Add Pine64 build

    (cherry picked from commit 4b77663edfba2c4e15db46c1ba900fa9819e4325)

commit 176d151f4d98d54adf293ee58427da649f28452c
Author: Samuel Dionne-Riel <[email protected]>
Date:   Sun Dec 10 20:56:36 2017 -0500

    U-Boot: Add SOPINE Baseboard build

    This build is compatible with PINE A64-LTS.

    [dezgeg changed the original device tree patch to v4 of the patch series
    "sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
    upstream mailing list by Andre Przywara. Also install the
    u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
    since it's now being built by the upstream build system.]

    (cherry picked from commit 2ff31f71ae1f10b3d1779b876ac94bf2a9998bd9)

commit cf87889431d74ef38b45881e7dc7ac1f9f880ef3
Author: Samuel Dionne-Riel <[email protected]>
Date:   Sun Dec 10 20:54:11 2017 -0500

    arm-trusted-firmware: Inits at various versions

    For qemu, at 1.4 from upstream.

    For Sopine / Pine A64-LTS, at 1.0 from fork.

    (cherry picked from commit f2175e1bd47038759a5f6621f6ead97e4680c48e)

commit eff6d9628c9e0bae2096251f8e97789c0b9afe6f
Author: Tuomas Tynkkynen <[email protected]>
Date:   Thu Mar 15 09:03:39 2018 +0200

    U-Boot: Add AArch64 QEMU build

    See

    https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

    on how to use it.

    (cherry picked from commit 6b069c656abf9704662317dc0173f18cdf4dfc91)

commit 4c669db598aba04b9a6dd3ecaf0811329d80a072
Author: Ben Wolsieffer <[email protected]>
Date:   Tue Mar 6 00:04:10 2018 -0500

    uboot: fix cross-build of ubootTools

    (cherry picked from commit 28fd7d9594fa0ed1a1b80a9652b5ab065a29e077)

commit 48ade50d8ece09d3ff732b07f0facdcd78084ac3
Author: Ben Wolsieffer <[email protected]>
Date:   Fri Feb 23 23:47:27 2018 -0500

    uboot: sheevplug and guruplug: use mainline U-Boot

    These derivations have not seen any updates since they were created in 2010,
    and some of their sources have disappeared. There are upstream configs for
    these boards, so these are now used, and they build correctly. I have no way
    of testing them, and I don't if anyone even uses either board with Nix anymore.

    (cherry picked from commit 01020b3263629be5a8697aa781dcb267df8de0a0)

commit b0abe78b5c14e969fd3b37879416ccd704157c83
Author: Ben Wolsieffer <[email protected]>
Date:   Sat Mar 3 21:18:05 2018 -0500

    uboot: rock64: use binary blob for TPL

    This stops the kernel from crashing immediately after boot.

    (cherry picked from commit ba3e470651cbfeff1ad28fae1d1d5dcad6fb020b)

commit 828fdd61b9b5ae0d3c9253309f3d115210348096
Author: Ben Wolsieffer <[email protected]>
Date:   Sat Mar 3 21:17:13 2018 -0500

    uboot: add patch to increase maximum path length in extlinux.conf

    This fixes problems with cross compiled kernels failing to boot.

    (cherry picked from commit 1f4bb8c61d71f2ac12f1cc6cf50aaa590df40a45)

commit 94c403fb9257f4ca410a2f87963c61753b3f1c3a
Author: Ben Wolsieffer <[email protected]>
Date:   Fri Feb 23 21:46:39 2018 -0500

    arm-trusted-firmware: init

    ARM trusted firmware is required as part of the boot process on some ARMv8-A
    boards. Currently, only the RK3328 is supported in nixpkgs.

    This makes the Rock64 u-boot image bootable.

    (cherry picked from commit 0ab76c5a4ed28baba3e0bfcdf25a89b78c44e0d8)

commit e794f9abbf09a817cffc211de9ebffa169286ff8
Author: Ben Wolsieffer <[email protected]>
Date:   Fri Feb 23 21:27:11 2018 -0500

    maintainers: add lopsided98

    (cherry picked from commit 0264c9bb4785b283f888418a53be223696c844fa)

commit dc01b66eef65b275cf671f46ed9683ac4c341229
Author: Ben Wolsieffer <[email protected]>
Date:   Fri Feb 23 20:29:24 2018 -0500

    uboot: add Rock64 support

    The bootloader is currently non-functional because it lacks the ARM Trusted
    Firmware image (bl31.elf).

    (cherry picked from commit 6f5a0bded2ae20759003d8be9548b5358c8aefcd)

commit 7c46833b047710f220971d7d7d3b1dbe6fed805b
Author: Ben Wolsieffer <[email protected]>
Date:   Fri Feb 23 17:50:24 2018 -0500

    uboot: 2017.11 -> 2018.03, cross fixes

    (cherry picked from commit 5804547243010ec8e341e98e8acbc5c96263682e)

commit 1da25dd10457937f62612892bcb941f978775d59
Author: Kai Harries <[email protected]>
Date:   Sun Mar 25 09:00:31 2018 +0200

    debian-devscripts: add dpkg in PATH

    The script uscan was complaining about missing dpkg, therefore I have
    added it to the PATH.

    (cherry picked from commit 404c80791f0c7a7eaf21a8f0b6209008508071c3)

commit d843d7f21a66ba0a2f6517428815dc298ab14cb1
Author: Tim Steinbach <[email protected]>
Date:   Sun Mar 25 00:49:02 2018 -0400

    minikube: 0.25.0 -> 0.25.2

    (cherry picked from commit 040a9ab240fba0b0dae5b48692fff7be50d3281c)

commit ccabf39f5cc52a5bba5f6b4259a7699b7478ebd6
Author: Tim Steinbach <[email protected]>
Date:   Sun Mar 25 00:41:17 2018 -0400

    zulu: 9.0.4 -> 10

    (cherry picked from commit 351688f53e5407f3c7cab9ef3769334858f4a50c)

commit 35a6799b1713831676084b0aa78404d50dc2be62
Author: Tim Steinbach <[email protected]>
Date:   Sun Mar 25 00:34:50 2018 -0400

    openjdk: Add JDK 10

    (cherry picked from commit f00db926c6f05dae081695521cb2da8f57203239)

commit e2b87329803449cd25b0c26a928d4b042ace9439
Author: Tim Steinbach <[email protected]>
Date:   Wed Mar 7 18:08:24 2018 -0500

    vault: Fix test

    (cherry picked from commit 3aa3738bb2582f9142675c952f7e6e3621081c1e)

commit bdac630c1dcc5d407bf031e0e2b8902a191fd3b2
Author: Robin Gloster <[email protected]>
Date:   Sat Mar 24 19:36:06 2018 +0100

    grpcio: use protobuf3_5

    (cherry picked from commit c71bcb2744c4a78dccf96716789602e3c41a0fac)

commit 85d5fdce26a6219c191dd13ce9be87b8780ddb71
Author: Robin Gloster <[email protected]>
Date:   Sat Mar 24 19:41:38 2018 +0100

    protobuf3_5: init at 3.5.1.1

    partly cherry-picked from 4bbd6900f8f74dac9e4b3ebd9eb4dc52767f2279

commit a903faf1d557e094a35adad0af49dc6c7767ba9e
Author: Jon Banafato <[email protected]>
Date:   Sat Mar 24 15:28:13 2018 -0400

    keybase-gui: Enable desktop notifications (#37711)

    Add `libnotify` as a build input to make message notifications work.

    (cherry picked from commit 8ac272f98d7d32594f38e7824b8c630e40663736)

commit a978eee06fd55607048e02803fd58642f264e1c5
Author: Josef Kemetmüller <[email protected]>
Date:   Sat Mar 24 17:58:06 2018 +0100

    libcdio-paranoia: fix darwin build

    (cherry picked from commit 285ef9be090dbe5779e0439d2dfa949a5a829acf)

commit e32dee886fe21297cde77c11137f9cc12fc3eb85
Author: Josef Kemetmüller <[email protected]>
Date:   Sat Mar 24 19:04:56 2018 +0100

    glyr: enable darwin build

    (cherry picked from commit ad3eb5d8fc6233eb2e71440d6b0fa412890d5c7a)

commit 6f384b77d243373dc421bcc1f51b49ffb1463887
Author: volth <[email protected]>
Date:   Sat Mar 24 17:23:55 2018 +0000

    babelstone-han: 10.0.2 -> 11.0.0

    new font version; old link answers with 404

    (cherry picked from commit 64c756d50d5d838a6b5cdcec73b8ef090048aeb1)

commit 898cddd75637fb18d6af60876e93015e0edaa03b
Author: Pascal Wittmann <[email protected]>
Date:   Sat Mar 24 19:34:46 2018 +0100

    autossh: 1.4e -> 1.4f

commit e789f6f6e54a1c37917ad276bd55bc58ff13d494
Author: Tuomas Tynkkynen <[email protected]>
Date:   Sat Mar 24 16:10:22 2018 +0200

    ghc: Disable on AArch64

    For some reason compiling the proper GHC from the binary one eventually
    segfaults at some point.

    Since it has never worked, just disable it and investigate later.

    (cherry picked from commit a6425fc66dbbcdd8dc23c8c721e15d6ed6126325)

commit be44525d041227f18eba3968fc370b0161a5f65d
Author: Tuomas Tynkkynen <[email protected]>
Date:   Fri Mar 23 19:27:31 2018 +0200

    nixos/tests/installer: Give eval failure on unsupported boot methods

    (cherry picked from commit 3131daace1eed2b642ab56c5843fd2057fbbfde3)

commit 9d8c6c71c065495e2e967caa5220de1846cc2616
Author: Tim Steinbach <[email protected]>
Date:   Fri Mar 23 17:37:30 2018 -0400

    docker: 18.02 -> 18.03

    (cherry picked from commit b072dcffaeba82364aa8bff7c8db63d47876deec)

commit 15e3aad1a2941300bbd30e203db2cd1eee32097b
Author: Franz Pletz <[email protected]>
Date:   Sat Mar 24 17:09:55 2018 +0100

    openra: 20180218 -> 20180307

    (cherry picked from commit 204a029101b028e479cdbd4e12fa4f74c1155ae5)

commit 4e67f8974aa0f4ae31df17c6ffe51c665de4a3ec
Author: Franz Pletz <[email protected]>
Date:   Sat Mar 24 17:08:21 2018 +0100

    browserpass: 2.0.13 -> 2.0.17

    (cherry picked from commit 8df9cf585aa48e408837102d072bac71b3acbee4)

commit 86508d4ea471c13a4d18c80311d41cfb92e36ca4
Author: Tad Fisher <[email protected]>
Date:   Mon Mar 19 12:01:08 2018 -0700

    browserpass: 2.0.11 -> 2.0.13

    (cherry picked from commit 82f2c19d9812bab4e6af3969560d9125ef883630)

commit f45bc2b3e4c872bd3e84641795ae80f9f5aac91e
Author: Tuomas Tynkkynen <[email protected]>
Date:   Wed Mar 14 20:36:35 2018 +0200

    nixos/tests: Make simpleUefiGrub test work on AArch64

    Needs more refactoring for the AArch64 '-enable-kvm' stuff some day...

    (cherry picked from commit e58624a877342d1fea39b02a5d6528cd53eefefe)

commit ad57d1ec63f31ecff7ffb906fb48832d5f572006
Author: Tuomas Tynkkynen <[email protected]>
Date:   Wed Mar 14 17:37:49 2018 +0200

    edk2, OVMF: Build on aarch64

    And also build in parallel.

    I don't understand why we manually tediously link every single directory
    from the source, but I don't want to investigate too much.

    (cherry picked from commit f59eab75d2bb20e44aff84ccadf65e4024db6eb4)

commit 75276115bf5947349b046d500730a62c0dbd586a
Author: Tuomas Tynkkynen <[email protected]>
Date:   Wed Mar 14 15:52:32 2018 +0200

    OVMF: Reformat a bit for readability

    - Use 'somePkg == null' instead of 'somePkg == false' which is more
      conventional in rest of Nixpkgs
    - Use lib.optionalString where applicable

    (cherry picked from commit 164501198375091b89e38ce3adba21f0466d61d1)

commit 7a79af0b8d64ded3f8749dc9dde1e42876fcc719
Author: Tuomas Tynkkynen <[email protected]>
Date:   Wed Mar 14 15:47:09 2018 +0200

    edk2: Reformat a bit for readability

    - Have only one sed expression per line
    - Put the important stuff closer to the command and not hidden in some
    continuation line. That is, don't do:

    sed \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <IMPORTANT STUFF>

    but:

    sed <IMPORTANT STUFF> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff> \
        <boring stuff>

    (cherry picked from commit 1d854b479c74f0eb5e47a4241384a0146d268300)

commit 0d20e7db5ba8f563db35752da51976c8181be1df
Author: Vladimír Čunát <[email protected]>
Date:   Sat Mar 24 15:07:30 2018 +0100

    Merge #37702: telepathy-gabble: fix source URL

    (cherry picked from commit 902b3a161c6fcce873bd4e6a745119d7f6af6bf9)

commit a3be411dbd0a54f49808f3a8bd6a28b1af47c6d4
Author: Vladimír Čunát <[email protected]>
Date:   Sat Mar 24 15:02:37 2018 +0100

    Merge #37262: snabb: 2016.04 -> 2018.01.2

    (cherry picked from commit 7110d4a63b33513d9b700c874c9eee1ae1bb52a0)
    It didn't build before this commit.

commit 2a57fc65b0f21c10184095a1ae251b1e882dfc5b
Author: Daiderd Jordan <[email protected]>
Date:   Sat Mar 24 14:26:30 2018 +0100

    qscreenshot: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit b5b77a688683441a36edf18df2278fba160e17e0)

commit d4f3c16982185571b4bc235f9c8c54ed0b964c9f
Author: Robin Gloster <[email protected]>
Date:   Sat Mar 24 14:02:04 2018 +0100

    jsduck: fix build

    json 1.8.3 is broken with ruby 2.4

    (cherry picked from commit f59a544bf1db7141c9686bc65edc201582388d37)

commit f61244da2e4fd836d6fe08330a794e0685221fe3
Author: Matthew Justin Bauer <[email protected]>
Date:   Mon Mar 19 12:40:03 2018 -0500

    Merge #33685: amdgpu-pro: 17.10 -> 17.40

    (cherry picked from commit ce01740daeaf1288cc973942d80ed8bf69e9d1d1)
    > It's definitely less broken than 17.10.

commit f4770f20306f98fddb19e87d13fbf306155557e2
Author: Robin Gloster <[email protected]>
Date:   Sat Mar 24 12:08:06 2018 +0100

    qgroundcontrol: 3.2.7 -> 3.3.0

    (cherry picked from commit 1b27260a0b9f7ef8ca8e75743ec5d6117f029e30)

commit 1febd196e780548f227df72d27b8ba45200b4c39
Author: Robin Gloster <[email protected]>
Date:   Sat Mar 24 12:07:52 2018 +0100

    libsForQt5.qtspeech: enable

    (cherry picked from commit 8a244db9f37920fc48ec259c3f4fd2a5ae51a452)

commit 9c85d196a9ec420106999814d14cf8726a0b1b7d
Author: Vladimír Čunát <[email protected]>
Date:   Sat Mar 24 10:38:23 2018 +0100

    Merge #37724:thunderbird*: 52.6.0 -> 52.7.0 (security)

    (cherry picked from commit 56fb68dcef494b7cdb3e09362d67836b8137019c)

commit 0058e51c8cbff3256bc0f55ca800a427780d1cca
Author: Robin Gloster <[email protected]>
Date:   Sat Mar 24 10:35:37 2018 +0100

    python.pkgs.logster: 7475c53822 -> 1.0.1

    (cherry picked from commit 2e6aacb056207879630d1b8bb2fb333d28bcf202)

commit 4a34e749f7fcb35216d6d8be17b7b200594498af
Author: Robin Gloster <[email protected]>
Date:   Sat Mar 24 10:34:57 2018 +0100

    python.pkgs.pygtail: init at 0.8.0

    (cherry picked from commit 6a286fcba7f4244cfd175efffe5977da3b2c6c13)

commit 3976ff79e86ed4c07bbae2b106aebabdfd2bf2cb
Author: Daiderd Jordan <[email protected]>
Date:   Sat Mar 24 02:10:54 2018 +0100

    picosat: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit 23d0c1713064cfc7e9ba703e7515057c6c30d6dd)

commit f6c0edb3ecab45d46eb72b2636ddc464f48ce013
Author: Daiderd Jordan <[email protected]>
Date:   Sat Mar 24 00:06:46 2018 +0100

    openexrid-unstable: fix clang build

    /cc ZHF #36454

    (cherry picked from commit f16db1961013464eb93c43b66b12df5469bcf4f0)

commit 08101d052da7ca53ac763d117e36bea3261523e7
Merge: ba2a04f656d fb4847ebdd5
Author: Jörg Thalheim <[email protected]>
Date:   Fri Mar 23 22:58:21 2018 +0000

    Merge pull request #37714 from flokli/nuke-networkmanager-pptp-18.03

    networkmanager-pptp: remove package (18.03)

commit fb4847ebdd572c2d47a2fab58812bbe734f84c33
Author: Florian Klink <[email protected]>
Date:   Fri Mar 23 22:17:32 2018 +0100

    networkmanager-pptp: remove package

    backport of #37712

    Currently broken on NixOS due to hardcoded modprobe binary path (see
    bug #30756 from Oct 2017), no activity on a proposed fix for months.
    As the protocol is terribly broken anyways, let's better remove it
    completely, and not talk about anymore ;-)

    Closes #30756.

    (cherry picked from commit 6ac74d60ad5c8f535ab535a13d8c365dddc6c401)

commit ba2a04f656d170306d587657359927acc9c51808
Author: Tuomas Tynkkynen <[email protected]>
Date:   Fri Mar 23 21:03:59 2018 +0200

    glslviewer: 1.2 -> 2018-01-31, fixes build

    (cherry picked from commit a8eb2c9ef9e6fcd1f8bbc2ca6dcab7b613ef615a)

commit af6cc8e7046565a428ac72c1cd6816d41c54ab3a
Author: Tuomas Tynkkynen <[email protected]>
Date:   Fri Mar 23 20:05:00 2018 +0200

    riscv-pk: Set correct platforms

    https://hydra.nixos.org/build/70691103

    (cherry picked from commit a2c37c0700cdc014c95cdd588e672e9944c8d163)

commit 296c09a35553fbab5c42cdc20d0a743125b7c1c4
Author: xeji <[email protected]>
Date:   Thu Mar 22 22:04:22 2018 +0100

    t: 2.9.0 -> 3.1.0

    2.9.0 didn't build anymore

    (cherry picked from commit 8cd005b6fbf09fe03dc60d45a6f823a283de4499)

commit 48856a91c02b456c80c37c863d8610090b38707a
Author: Nikolay Amiantov <[email protected]>
Date:   Fri Mar 23 12:44:10 2018 +0300

    systemd: use stable tree

    This fixes a bug with changed qemu network interface names and also generally
    should be preferred to using a release tag.

    (cherry picked from commit 6b9771e4a78808c82cc800e61232ce20d58a1bef)

commit cdb97353df39074e5ef747c426062c0a138d95f2
Author: Albert Safin <[email protected]>
Date:   Fri Nov 24 05:38:13 2017 +0700

    wine: disable bindnow hardening

    (cherry picked from commit ba960ac38370aab6297a5a07ba3784f7311db7dc)

commit 9e804ba5bfa245c2b3ecff96161ca806d91c5d2b
Author: Shea Levy <[email protected]>
Date:   Fri Mar 23 10:06:58 2018 -0400

    Remove HIE package set until automation can be put in place.

    (cherry picked from commit ead2ba88097c58f60cdd0ae5475c64192c7c21d3)

commit 3cf448faf2ef0320dd59570ca10ecbe9fff211c0
Author: Jörg Thalheim <[email protected]>
Date:   Fri Mar 23 07:58:34 2018 +0000

    vis: patch shebang to use system bash

    (cherry picked from commit 0203a6281cbaff4ea8ab29578f626c48e3e3cf70)

commit 01204cf872fa199d92a303f64e2b39731e314473
Author: Andrew Childs <[email protected]>
Date:   Fri Mar 23 00:59:06 2018 +0900

    avrdude: add darwin platform

    (cherry picked from commit b4888489e344f7ad77d9f6d14e6aa4084160f982)

commit eef14cb30569f2ca0d4bbb13f3d468bfb11271dc
Author: Andrew Childs <[email protected]>
Date:   Fri Mar 23 01:05:48 2018 +0900

    libftdi1: add darwin platform

    (cherry picked from commit d0df0078438347866bbe5e96b82ce5f104a8071b)

commit 31ba589e50e92e1785346309b9be3b0e4ca24e3c
Author: Daiderd Jordan <[email protected]>
Date:   Thu Mar 22 23:16:19 2018 +0100

    ntbtls: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit 366bf3a309b5c5896f9ce7de787009c1d29dc9a8)

commit 2d2ab94cd2c74fe4d06391cb1ebd165439ee3d6d
Author: Nikolay Amiantov <[email protected]>
Date:   Thu Mar 22 22:16:30 2018 +0300

    systemd: 237 -> 238

    (cherry picked from commit 0ccab4946d5d0405ebced50a7b7f847730d502a9)

commit 01cce78ec487e5acadd819f288604fc3d478a315
Author: Nikolay Amiantov <[email protected]>
Date:   Thu Mar 22 22:15:35 2018 +0300

    kernel: enable CGROUP_NET_PRIO

    It's required by systemd 238 because of a bug, otherwise systemd aborts.

    (cherry picked from commit e31c3f8b9f6e4d550b39744be7d26ec532be7169)

commit 361bd591ea4a17ef2558ac1b741f13d0ebe6f10c
Author: Josef Kemetmüller <[email protected]>
Date:   Thu Mar 22 19:05:53 2018 +0100

    streamripper: Don't use included libmad

    streamripper ships its own version of libmad, which does not compile on
    clang, due to the usage of incompatible compiler flags. We can get the
    build working by using the already packaged libmad, which includes
    patches for clang.

    (cherry picked from commit e77071289e339f4a8512aa87fb72f388531ca263)

commit a614f9f4c1ba72a9f0dedb3332aeec480c3c46c8
Author: Robin Gloster <[email protected]>
Date:   Thu Mar 22 17:14:34 2018 +0100

    openpts: remove

    Broken, dead prject that only was a PoC implementation.

    (cherry picked from commit 678211bb37821597a8c4426664cbe3bc821ac70e)

commit b828d00ffdae51ee44e04f2104d18eeee75344a0
Author: WilliButz <[email protected]>
Date:   Wed Mar 14 15:59:28 2018 +0100

    nixos/prometheus-exporters: add postfix exporter & documentation

    (cherry picked from commit c54aa1f2939afeb5d8e32a6f1bba387f6b79ffc2)

commit 135e13f8fcfe83ac6c35b0f8a71ede416783f908
Author: WilliButz <[email protected]>
Date:   Mon Mar 12 18:40:37 2018 +0100

    release notes: add information about prometheus exporters

    (cherry picked from commit 8a1310122679b1d646a2c753e869f448f6b99796)

commit 55e97a2ebb3c745b57401863ae168e96f4b7e1a1
Author: WilliButz <[email protected]>
Date:   Fri Mar 9 21:33:09 2018 +0100

    nixos/prometheus-exporters: rewrite and restructure

    - prometheus exporters are now configured with
      `services.prometheus.exporters.<name>`
    - the exporters are now defined by attribute sets
      from which the options for each exporter are generated
    - most of the exporter definitions are used unchanged,
      except for some changes that should't have any impact
      on the functionality.

    (cherry picked from commit f4d03b5c9cf2b694792dec88e3ca805cf7b43e3c)

commit 510fd552ebe964ea15db0cb6cf22cfa12ea7e186
Author: Sander van der Burg <[email protected]>
Date:   Thu Mar 22 15:02:09 2018 +0100

    xcodeenv: publish xcarchive directory in the output store path if requested

    (cherry picked from commit 112ebed491c7f805cd10eb443dee85d2a02581c0)

commit d200e2cfde1b3903469e745b2fea30a518cecc1f
Author: Sander van der Burg <[email protected]>
Date:   Thu Mar 22 14:33:15 2018 +0100

    xcodeenv: replace deprecated package application procedure by the new export archive operation

    (cherry picked from commit f2bd9d4745041fe0c0a49803094dd625ebd27342)

commit ba11500aa81ca86502d297f2e083b5a309bb6265
Author: Robin Gloster <[email protected]>
Date:   Thu Mar 22 03:46:02 2018 +0100

    prosody: add test to release.nix

    (cherry picked from commit faaf32a0ee3ed3693e87def1fabd6b8a89e29a41)

commit 766a80ec845efad42a2959bfe349fd1dee69d4d2
Author: Robin Gloster <[email protected]>
Date:   Thu Mar 22 03:40:46 2018 +0100

    prosody: improve module handling

    (cherry picked from commit 0a80f2c0f4284428235b0f54e228f6e76f1673a7)

commit b9084d0160f5413776bacd8c24b2e4c2519272f2
Author: Florian Jacob <[email protected]>
Date:   Wed Mar 21 14:27:20 2018 +0100

    nixos/prosody: add a basic test

    (cherry picked from commit 88f06c5ce9800d661fa85c019838fe67635aa64f)

commit 05f206c3c15c4c429c477d93e2ac982aa6cc3d3d
Author: Florian Jacob <[email protected]>
Date:   Fri Dec 22 01:20:01 2017 +0100

    prosody: update community modules

    (cherry picked from commit 2c0b230330b3292e31f1de2392a293db6bede69e)

commit 7ef13f58b6b5c292bef1ab23ba3dd8de365c9fe6
Author: Florian Jacob <[email protected]>
Date:   Fri Dec 22 01:17:48 2017 +0100

    prosody: 0.9.12 -> 0.10.0
    updating config options, removing luazlib as mod_compression was removed
    for security reasons.

    (cherry picked from commit 226965da67c25bbad0c6c0cc6d21b64a647beed8)

commit 64301d0a3234189db5cb03f0f936eaee2f17145d
Author: Florian Jacob <[email protected]>
Date:   Fri Dec 22 01:14:47 2017 +0100

    luaevent: 0.4.3 -> 0.4.4

    (cherry picked from commit 0c74665bad3699cb3b2f4c0121101b94aa6fed49)

commit d01e4430b370c5d554e4826ccab0b3c439334d11
Author: Tim Steinbach <[email protected]>
Date:   Thu Mar 22 09:16:39 2018 -0400

    linux: 4.9.88 -> 4.9.89

    (cherry picked from commit d9e21f3270a3dcc2a67b6e20248a3f83e98dada3)

commit bbde130fd7823db52be787bd510800c6a3bbc5d3
Author: Tim Steinbach <[email protected]>
Date:   Thu Mar 22 09:16:26 2018 -0400

    linux: 4.4.122 -> 4.4.123

    (cherry picked from commit 8b18ed859285127c40a2cf90c0ad8b172b532732)

commit d011c7bd022f5de0c6c48d0e8413b23999896b8d
Author: Tim Steinbach <[email protected]>
Date:   Thu Mar 22 09:16:01 2018 -0400

    linux-copperhead: 4.15.11.a -> 4.15.12.a

    (cherry picked from commit b7dff1f41fec299eb4b7e09813bfd09aa52a5c5e)

commit ef716bb5cf0c36aa5c3646fc86f512d15815c7cd
Author: Michael Brantley <[email protected]>
Date:   Wed Mar 21 13:42:37 2018 -0400

    perlPackages.GSSAPI: depend on krb5Full, fix misspelling

    (cherry picked from commit 0d6fdac8e2f9ad0327bbf4203ebdc2e0c929253f)

commit 13958f4a365a5d70cf9bab1c2c6da55ab12e6ec2
Merge: 0e735393c7f 72314d37e8a
Author: adisbladis <[email protected]>
Date:   Thu Mar 22 17:35:21 2018 +0800

    Merge pull request #37614 from clefru/cherry-18.03

    pycurl: 7.19.5.1 -> 7.43.0.1

commit 72314d37e8a84061cd3684b4fa45aeb5b61323f7
Author: Will Dietz <[email protected]>
Date:   Wed Mar 14 17:50:25 2018 -0500

    pycurl: 7.19.5.1 -> 7.43.0.1

    (cherry picked from commit 99131b4fc20f1256bdfc4c5237392434c157d234)

commit 0e735393c7faeee741a768e2d17e08d6fc8402c3
Author: giraffito <[email protected]>
Date:   Wed Mar 21 19:57:52 2018 +0000

    python.md: fix grammar around bdist_wheel FAQ

    (cherry picked from commit 319866ae11eddac6fa872429a739e9aec304bb0e)

commit 103e2c4efb1ba163f30e0cf04a16398630ff4b9f
Author: Robin Gloster <[email protected]>
Date:   Mon Mar 19 21:55:52 2018 +0100

    graylog: use jre_headless

    (cherry picked from commit fa347164b607df52768fd952d56bd42a90fc9a6a)

commit eb80bdc402802f2a856278797868cad79edbeb27
Author: Franz Pletz <[email protected]>
Date:   Thu Sep 7 21:20:41 2017 +0200

    gitlab service: use recommended unicorn config

    (cherry picked from commit e5a854e740ba2963af85a242229a8a8f3c250136)

commit 07d1b17941305cb8fd3b70dc8f665e9c43cb8bab
Author: Robin Gloster <[email protected]>
Date:   Thu Mar 22 02:08:49 2018 +0100

    gitlab: 10.5.4 -> 10.5.6

    (cherry picked from commit 08946efdc80b3c1670d3093b06d60fab7b73011a)

commit d6595b4d5bcde5a7285c3eaa4382b3b5e65e9347
Author: Simon Lackerbauer <[email protected]>
Date:   Wed Mar 14 14:14:03 2018 +0100

    gitlab: 10.3.4 -> 10.5.4

    (cherry picked from commit 1b559058064992e5d8cd951f42232793aa99d960)

commit ca3bf23f5fe906bd3acfca25f78383596e52c45c
Author: Robin Gloster <[email protected]>
Date:   Mon Mar 19 13:35:58 2018 +0100

    gitaly: 0.59.2 -> 0.81.0

    (cherry picked from commit 73a7f984d64f1c3f3ad8bd4677cb64d4f3d70055)

commit 96809029491bbbac22a696b3ea4bca0c0ddbdaaa
Author: Simon Lackerbauer <[email protected]>
Date:   Wed Mar 14 14:13:43 2018 +0100

    gitlab-workhorse: 3.3.1 -> 3.6.0

    (cherry picked from commit 9ccd01021766348ec1811ff60236cc3e72fa48cb)

commit 5445bb1583eefa89a88296974268ba663e8f5b6d
Author: Simon Lackerbauer <[email protected]>
Date:   Wed Mar 14 14:04:39 2018 +0100

    gitlab-shell: 5.10.2 -> 6.0.3

    (cherry picked from commit 08bf87420f0a680f6a3765bcb99a97e5edc57bfb)

commit 75842fe98c6fe23f080fbb4308a3ea2cfb5fe11e
Author: Robin Gloster <[email protected]>
Date:   Mon Mar 19 21:52:36 2018 +0100

    gitlab-shell: fix config path finding

    and remove TimeoutSec for gitlab

    (cherry picked from commit 31d77fd4f3d009631e0dc4361bfc0648fadcce4a)

commit 8c3cb029e0f4b771676d1e291f1316353ec9a0eb
Author: Franz Pletz <[email protected]>
Date:   Wed Mar 21 18:56:24 2018 +0100

    zfs, spl: 0.7.6 -> 0.7.7

    Remove spl patch that was introduced for grsecurity which we don't support
    anymore. ZFS now needs perl for some scripts that are call in the configure
    script.

    (cherry picked from commit f744f83072b28a7db8d94f83a60b46d4ae16ebb4)

commit b8673bc3e0566de864ab6e47038c3798a9f56de8
Author: Franz Pletz <[email protected]>
Date:   Wed Mar 21 17:05:40 2018 +0100

    altcoins.masari: init at 0.1.4.0

    (cherry picked from commit ab5f98a77e14c1245033cd7df36b78318f8c7702)

commit 2b397bfa757560748dace35e1fe1fe1e40123dd6
Author: Franz Pletz <[email protected]>
Date:   Wed Mar 21 17:04:46 2018 +0100

    nmap: 7.60 -> 7.70

    (cherry picked from commit f2fea9042e3777adfd42dc98c8d27cba53c38713)

commit 0782536e49a4ea449974aaa8a04ced2960718bb6
Author: Franz Pletz <[email protected]>
Date:   Thu Mar 15 05:31:15 2018 +0100

    squid4: 4.0.23 -> 4.0.24

    (cherry picked from commit 1e15d08cac3068f9396f737dc531989b5339f405)

commit 8b578b862bc26a822e14d6b76298a72948d34304
Author: Franz Pletz <[email protected]>
Date:   Thu Mar 15 05:30:49 2018 +0100

    matterircd: 0.12.0 -> 0.16.5

    (cherry picked from commit 7dee8ab568a48fa912d32d64353488e2968e05d9)

commit 5150a7ef507674b2c9701f8dfb75d7423db217f9
Author: Franz Pletz <[email protected]>
Date:   Tue Mar 13 20:28:15 2018 +0100

    prometheus-node-exporter: 0.15.0 -> 0.15.2

    (cherry picked from commit 9152ef910bfdbc3aa15e17c6761c1f76fe212e6f)

commit a6146ec8bb59c4438eeb96785fd78209dfb6e6cf
Author: Franz Pletz <[email protected]>
Date:   Tue Mar 13 19:55:22 2018 +0100

    clamav: 0.99.3 -> 0.99.4 for multiple CVEs

    Fixes CVE-2012-6706, CVE-2017-6419, CVE-2017-11423, CVE-2018-0202,
    CVE-2018-1000085.

    (cherry picked from commit 5050d056566e5a8fdf94b9262ff37c66d123c3f3)

commit 96c97c51cb6babc83311b76c71bbd4deedb1847e
Author: Franz Pletz <[email protected]>
Date:   Tue Mar 13 19:50:20 2018 +0100

    prometheus-blackbox-exporter: 0.11.0 -> 0.12.0

    (cherry picked from commit 1497815543b7689645d433866f4d60ebbab4e918)

commit ad06aec8b584b79245e2aeb37f770dec037367df
Author: Tim Steinbach <[email protected]>
Date:   Wed Mar 21 20:44:01 2018 -0400

    linux: 4.15.11 -> 4.15.12

    (cherry picked from commit 55b96a4a3c26b1a8dd19b661f2790619bb7bc772)

commit 80c6cd1a9ec7550f95d88c762b17678b5f1c8817
Author: Tim Steinbach <[email protected]>
Date:   Wed Mar 21 20:42:33 2018 -0400

    linux: 4.14.28 -> 4.14.29

    (cherry picked from commit deb9ff164f1bf451377a3222f03000ea58bbace2)

commit 9914060dfbb39f7e4fdf4c3256c821239d8c713a
Author: Daiderd Jordan <[email protected]>
Date:   Thu Mar 22 00:09:26 2018 +0100

    nullmailer: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit 0477af8a09da7eeca751542f4293b5b6f95366cb)

commit d49e4f607ff3a4f124a936926faf16857fdac73e
Author: Daiderd Jordan <[email protected]>
Date:   Wed Mar 21 23:54:35 2018 +0100

    mysocketw: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit 18474c1842d80a5049fbec63befd6bb44ef076b2)

commit beea3c9d36518f673b88f40df8e5a41b1a1b041f
Author: Daiderd Jordan <[email protected]>
Date:   Wed Mar 21 22:41:26 2018 +0100

    monero: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit 5d4d4df8c0899af2342bfbb4f5c898c2cd3241ce)

commit 5995e9c21712a61e6e4a11dae8d79d123f62ac6a
Author: xeji <[email protected]>
Date:   Wed Mar 21 11:02:37 2018 +0100

    libhttpseverywhere: fix build

    run tests in correct directory

    (cherry picked from commit fa50e903cfec03c325766f032833f92b700199a3)

commit c0b813ed174a845ff319e592dcb1f8bbb0114b4a
Author: Daiderd Jordan <[email protected]>
Date:   Wed Mar 21 21:42:06 2018 +0100

    masscan: fix build

    (cherry picked from commit 38323015e2011ee2ed9af0a516b5f2c804627d5f)

commit da20f8dd2284c067307369991ed8dde5c88d7eb3
Author: Nikolay Amiantov <[email protected]>
Date:   Wed Mar 21 23:07:05 2018 +0300

    pyqt5: propagate Qt dependencies

    This is so that Qt user environment packages are also propagated. Fixes
    Electrum environment installations when no other Qt applications are installed.

    Added `dev` output so that closure size won't explode.

    (cherry picked from commit b1b4c6c4eb92e59dcd664645f74b1c57b08204d0)

commit d775a130a3bd2903e43b1931bd131bb0fda7554f
Author: Daiderd Jordan <[email protected]>
Date:   Wed Mar 21 21:25:54 2018 +0100

    lxtask: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit 9b5669b5a6947e8f5230df521d859a66346a9b90)

commit 9a81f1ba5bd35fd2f5e94cca26f67223744c8e74
Author: Daiderd Jordan <[email protected]>
Date:   Wed Mar 21 21:13:33 2018 +0100

    luaffi: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit fe37684525d39a3342a25f7123e632f5058bccf3)

commit 79378daa0ee1aa52584ff7162d7b61818c82866c
Author: Daiderd Jordan <[email protected]>
Date:   Wed Mar 21 20:46:21 2018 +0100

    libqglviewer: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit c2ca5c057de6a5576cecd2b05381328a63629375)

commit c6603050bac605bcce0338c773faf57132122f32
Author: Daiderd Jordan <[email protected]>
Date:   Wed Mar 21 20:40:39 2018 +0100

    libnfs: fix clang build

    /cc ZHF #36454

    (cherry picked from commit 9a054d7cd65716b99c0e5ab037e7032db7a9582e)

commit 11f1cb7819c3eb62476e8aa85df0e1588204e1ba
Author: Hendrik Schaeidt <[email protected]>
Date:   Wed Mar 14 16:38:06 2018 +0100

    add hschaeidt to maintainer list

    (cherry picked from commit 86ff559f8282cdffd108933f48f9d3b13539ab74)

commit 555ac8418c2b552fb45413eab9157ee03199fac2
Author: Hendrik Schaeidt <[email protected]>
Date:   Tue Mar 13 15:49:34 2018 +0100

    stabber: init at 2016-11-09

    (cherry picked from commit 6634049f220ac0cde10cf9c3725c7f41d21e020a)

commit dc70be405fd2612fee187fdcdc432dfd56be71a7
Author: Hendrik Schaeidt <[email protected]>
Date:   Tue Mar 13 16:17:30 2018 +0100

    profanity: refactor build to build from source

    * fix osx build
    * fix undefined macros in configure.ac
    * activate the check phase to run the test suite

    (cherry picked from commit 501b6d0e13aeabddabc66886b2c71385ac5c8d06)

commit 0f743154566b1498e34ddc65e8fad8887b38fb46
Author: Sander van der Burg <[email protected]>
Date:   Wed Mar 21 16:08:56 2018 +0100

    titaniumenv: fix renaming strategy

    (cherry picked from commit 479ec3d888849a0b9c3ad471231135c9704fc550)

commit 6297c190d0b1795a4a6f4455733b2129988cc8b8
Author: Sander van der Burg <[email protected]>
Date:   Wed Mar 21 15:50:44 2018 +0100

    titaniumenv: update example app

    (cherry picked from commit 603556085bc8cca64202a1d930f4546789955b25)

commit 7fa2f865b8966d1b5467c7d377422b268de864d2
Author: Sander van der Burg <[email protected]>
Date:   Wed Mar 21 14:57:57 2018 +0100

    titaniumenv: fix Android signing on darwin

    (cherry picked from commit 4beb695eceea1aa00201e7f0ee5165fc948e9eb3)

commit ea9f3fca6587494f25ef470397b32904e2325e23
Merge: cc25915367e c0cd5eeab8d
Author: Michael Raskin <[email protected]>
Date:   Wed Mar 21 13:25:25 2018 +0000

    Merge pull request #37559 from dylex/release-18.03

    julia: update rmath-julia hash for 0.1

commit c0cd5eeab8d3aa80f44cbedae7e7aa822200876b
Author: Dylan Simon <[email protected]>
Date:   Wed Mar 21 08:30:58 2018 -0400

    julia: update rmath-julia hash for 0.1

commit cc25915367e7f69f00e5bfeeb5a31760eccb355a
Author: Lancelot SIX <[email protected]>
Date:   Tue Mar 20 15:12:19 2018 +0100

    octave: 4.2.1 -> 4.2.2

    See http://lists.gnu.org/archive/html/info-gnu/2018-03/msg00006.html
    for release announcement

    (cherry picked from commit 3a7854032afc792e42e0a724919969ade3a5b694)

commit 5df02d9783e0d4f74e59895ab2582d26432a88b9
Author: Antoine Eiche <[email protected]>
Date:   Mon Mar 12 18:26:15 2018 +0100

    dockerTools: add --sort=name options on all tar calls

    This is to go to a reproducible image build.
    Note without this options image are identical from the Docker point of
    view but generated docker archives could have different hashes.

    (cherry picked from commit ac0c491836a835c43641989ccb4b95a172749806)

commit e28a58fb095f169affc707ef3b727eb49028509e
Author: Antoine Eiche <[email protected]>
Date:   Mon Mar 12 17:06:21 2018 +0100

    dockerTools: dereference hard links in tar archives

    This is to improve image creation reproducibility. Since the nar
    format doesn't support hard link, the tar stream of a layer can be
    different if a dependency of a layer has been built locally or if it
    has been fetched from a binary cache.

    If the dependency has been build locally, it can contain hard links
    which are encoded in the tar stream. If the dependency has been
    fetched from a binary cache, the tar stream doesn't contain any hard
    link. So even if the content is the same, tar streams are different.

    (cherry picked from commit 346996ceecc421577be638b9aac4917925329130)

commit 032a3286fd88df8e073dad17f9424c06057c3079
Author: Florian Klink <[email protected]>
Date:   Sun Mar 18 23:28:34 2018 +0100

    sqldeveloper: 17.4.0.355.2349 -> 17.4.1.054.0712

    (cherry picked from commit f9dda86b39bb40da707c50191ba11f537ff68149)

commit 9cd1122df53cc58fe8017e79e81d0743319828ef
Author: Johannes Frankenau <[email protected]>
Date:   Thu Mar 8 22:54:24 2018 +0100

    masterpdfeditor: 4.3.61 -> 4.3.82

    (cherry picked from commit 77b205b9fd661f235dddcf3ffc078d2defa02cf9)

commit 97a2621dae7cd2df5f5d0580f8b8a4aab84d1b9e
Author: Nikolay Amiantov <[email protected]>
Date:   Tue Mar 20 22:15:56 2018 +0300

    xdg_utils: fix xdg-screensaver

    (cherry picked from commit ab67f36e7376e6e5d09f5bdfb00944ef2f7abaf0)

commit 69e8d7ddd85d9eb2b1fcc1eca955e18b06ad6a61
Author: Nikolay Amiantov <[email protected]>
Date:   Tue Mar 20 22:06:14 2018 +0300

    steam: add dependencies for Surviving Mars

    (cherry picked from commit 792161895fbdf29e58bdf5ec168317d4174885f3)

commit 77c052d908088d6096262c6b3af095db98d2f4a2
Author: Andrew Kelley <[email protected]>
Date:   Sun Mar 18 20:13:46 2018 -0400

    zig: 0.1.1 -> 0.2.0

    (cherry picked from commit dc3b791854589d7c1c6d210f070a1e82315798f6)

commit fa78cd4d6843c332b0a5320149fe9db4d7c70f46
Author: Will Dietz <[email protected]>
Date:   Mon Mar 5 17:41:11 2018 -0600

    brotli: 1.0.2 -> 1.0.3

    https://github.com/google/brotli/releases/tag/v1.0.3
    (cherry picked from commit c1c502e93bd17bdee729099b5507d967be1b1629)

commit 9fd4a62b644dc778c2de0f06fe0b8a726c742ff4
Author: Will Dietz <[email protected]>
Date:   Wed Mar 14 12:48:43 2018 -0500

    llvm6: patch to enable sanitizers w/musl

    (cherry picked from commit 60bf299e6affada1aec05e6bcbbb44652e417a5d)

commit 043ee6c65dc930c58415a3e701aafdc63b7ad462
Author: Will Dietz <[email protected]>
Date:   Wed Mar 14 10:40:24 2018 -0500

    llvm_5: patch sanitizers to enable w/musl

    https://gitweb.gentoo.org/proj/musl.git/plain/sys-libs/compiler-rt-sanitizers/files/compiler-rt-sanitizers-5.0.0-musl-patches.patch
    (cherry picked from commit a8824ab4fb67e414daa820dd1c9e36ee37dec276)

commit 67cdc01ba86fc2eeb2a17745f70073d516b3c9fc
Author: Will Dietz <[email protected]>
Date:   Wed Mar 14 11:24:28 2018 -0500

    llvm4: same treatment

    (cherry picked from commit b2e6952f378e2ed17d0d30b4986c6632a652d867)

commit 828d15e9d382760de289b8185905e4ddd9440585
Author: Will Dietz <[email protected]>
Date:   Tue Mar 20 08:10:08 2018 -0500

    python*: set thread stack size on musl

    Ensure recursion limit is reached before stack overflow.

    Python does this for OSX and BSD:
    https://github.com/python/cpython/blob/13ff24582c99dfb439b1af7295b401415e7eb05b/Python/thread_pthread.h#L22

    Size of 1MB chosen to match value in Alpine:
    https://git.alpinelinux.org/cgit/aports/commit/main/python2/APKBUILD?id=2f35283fec8ec451fe5fb477dd32ffdcc0776e89

    Manual testing via Alpine's test-stacksize.py crashes on these
    previously, and works with these changes.

    (cherry picked from commit 9aa22191cf38df2c99ef79c505f6e7d85a16adb8)

commit 7b9ca7b7c5ff0b3186d03909d7331cc2686d143b
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 16:33:08 2018 +0100

    pythonPackages.altair: fix build

    (cherry picked from commit 43d822178bc933bc5dce38d4ff71b50dab081758)

commit f638751bb28c2394c87df74e8b2d394b011624af
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 16:13:38 2018 +0100

    pythonPackages.WSME: 0.8.0 -> 0.9.2

    (cherry picked from commit 2773b76f33549f68ca53e4d9f0457314ce87f9e3)

commit 7098c05b5941edcff02d8e1e2d35e5d5405c914a
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 15:40:43 2018 +0100

    pythonPackages.WSME: move expression

    (cherry picked from commit 9f54b031fdbda6ebf71fb92222537786039abc75)

commit c6eac40de4f77392f54ec774d5f07b5abd377847
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 14:30:01 2018 +0100

    pythonPackages.astropy: disable for python 2

    (cherry picked from commit 3d989e3d7a27c0c01f97ee5817f5dd1223f13f93)

commit c8ac1a217606e08cf6087d9b41aed729b26cce3a
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 13:04:04 2018 +0100

    pythonPackages.klein: 15.3.1 -> 17.10.0

    (cherry picked from commit b34af91889356f815156adf9dd13263ded5ab773)

commit c7b7779ee2bd4efb57d3e3c8c163c40391ac048a
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 12:55:22 2018 +0100

    pythonPackages.klein: move expression

    (cherry picked from commit 86e007bd31391c4bddf6c1610aa3fb2538896861)

commit 19e7212940c2d11fb49a82adae33869b1f4f2692
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 12:44:08 2018 +0100

    pythonPackages.deform: 2.0.a2 -> 2.0.5

    (cherry picked from commit 86f21360acb0319509536164046da918d0002dff)

commit 718527844765a4cc2f42a376408a2d9863ad80e2
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 12:38:29 2018 +0100

    pythonPackages.deform: move expression

    (cherry picked from commit a1b9cc79386a0c41789e4bbb6af8ee9ac1472bd4)

commit 6d2fd84beb681e505caa7047f4691e5f3ab92370
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 12:22:32 2018 +0100

    pythonPackages.zope_copy: 4.0.2 -> 4.1.0

    (cherry picked from commit 12695be641abb28ba4abb42b331431b143938a9f)

commit 9fd7e2eee205b122175d28d4c7de76c2e415287a
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 12:06:31 2018 +0100

    pythonPackages.stem: run unit tests

    (cherry picked from commit 685dd8d21db16ffb3d8888f4f9cd5e6d5dd3c6c6)

commit 15d741b62b1bce55c3590f357e08fae6b5006a3e
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 11:38:02 2018 +0100

    pythonPackages.stem: move expression

    (cherry picked from commit 061e79806e35b6477d67a9c9ba6b3ed997b4572b)

commit b87bafdffdb2e28e2a4471476a980aacec99eb1a
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 11:20:13 2018 +0100

    pythonPackages.{reviewboard,djblets}: uninit

    Djblets is unmaintained: has not been updated since 2015, but had many releases.
    Dependency django_pipeline_1_3 is broken and should anyway be removed from pythonPackages because we want to have a consistent package set.
    Because the reviewboard package also hasn't been updated since 2015 and depends on djblets, it is removed as well.

    (cherry picked from commit fbff08f2f213c8cb09f845f8c4d8bfd40eff2699)

commit 0aafdaecee5882d53737bd9d38965e4478f0cbd6
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 11:04:43 2018 +0100

    pythonPackages.django_pipeline: 1.5.1 -> 1.6.14

    (cherry picked from commit 6e78005ef1de6dca89abc6df4877722cc3ed841a)

commit 99ac0883ccfec982e862a8f175e4096e6747d05f
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 10:31:35 2018 +0100

    pythonPackages.slimit: init at 0.8.1

    (cherry picked from commit 127045d8e0a9481084649567c1520468582e3f33)

commit f6c66f6cb1b77f69e6c291216ff16a73585ca975
Author: Robert Schütz <[email protected]>
Date:   Tue Mar 20 09:58:15 2018 +0100

    pythonPackages.django_pipeline: move expression

    (cherry picked from commit ba74cf4d5ceb3aa516af2a10d2ee86b79ff75ac1)

commit 5a777d237ca87bec9c39e6eef551507e09189646
Author: Sander van der Burg <[email protected]>
Date:   Tue Mar 20 17:39:45 2018 +0100

    titaniumenv: remove obsolete java fix wrapper on darwin

    (cherry picked from commit 5532cc1641c0d2f2dae2893e5980861bb4fd8062)

commit 09382774683f456e699c1a25cca97068c84b6682
Author: Sander van der Burg <[email protected]>
Date:   Tue Mar 20 17:22:32 2018 +0100

    titaniumenv: add 7.1 SDK and make it the default

    (cherry picked from commit e8e7e78d9fbc5eb8cfb49d51d796123a79a08799)

commit d2bb15442105cf260d03591ed5b19d3e0d184422
Author: zimbatm <[email protected]>
Date:   Tue Mar 20 16:40:35 2018 +0000

    nix-serve: patch for nix 2.0 (#37459)

    Fixes incompatible secret file handling. See https://github.com/edolstra/nix-serve/pull/8

    (cherry picked from commit 8add42f90c5457a256225469d4a6d865e967b87d)

commit f086e3ebde69e2f3ecbbfc1804da97bc304c52ab
Author: Tim Steinbach <[email protected]>
Date:   Tue Mar 20 09:37:59 2018 -0400

    scala: 2.12.4 -> 2.12.5

    (cherry picked from commit a429ae273ab752c61ed0c5dc955331617b9e7364)

commit 225eac1f3786cf9f4bfe66fc438ae5ea8f8a0dce
Author: Robert Schütz <[email protected]>
Date:   Sat Mar 17 15:42:09 2018 +0100

    pythonPackages.bleach: 2.1.2 -> 2.1.3

    (cherry picked from commit 9f276ccd3887c03523fe6655670bad50ac373929)

commit 8337d1ddca456ab68dd05bdc1616a857752f2c9b
Author: Matthieu Coudron <[email protected]>
Date:   Tue Mar 20 11:45:36 2018 +0900

    pythonPackages.neovim: 0.2.3 -> 0.2.4

    required to work with latest deoplete for instance

    (cherry picked from commit 366c79e17f212e581d16a17ca67eb186fd005c61)

commit 8d24d4fac91c7a1cb4d8e36f79db0a95ce1b7bff
Author: Frederik Rietdijk <[email protected]>
Date:   Sat Mar 3 11:58:41 2018 +0100

    python: neovim: 0.2.1 -> 0.2.3

    (cherry picked from commit 7ce85c014e9ceda9d680b67a133c138c857a3555)

commit 14cbca54dad4e1b44a7e0508c7e3079537625450
Merge: e530ee1af5e 9553628c229
Author: Peter Hoeg <[email protected]>
Date:   Tue Mar 20 13:24:05 2018 +0800

    Merge pull request #37402 from badi/unifi

    unifi: 5.6.30 -> 5.6.36

commit e530ee1af5ee16bcc72cd4065c3b2b71d2093a97
Author: Tim Steinbach <[email protected]>
Date:   Mon Mar 19 22:32:33 2018 -0400

    linux-copperhead: 4.15.10.a -> 4.15.11.a

    (cherry picked from commit bb2c260a231154b743d4c7ba6c43bd14da9d0284)

commit 9553628c229a92f128edcb3f2b830e40d3f3c0e5
Author: Badi Abdul-Wahid <[email protected]>
Date:   Sun Mar 18 19:17:44 2018 -0400

    unifi: 5.6.30 -> 5.6.36

    [Release Notes](https://community.ubnt.com/t5/UniFi-Updates-Blog/UniFi-5-6-36-LTS-Stable-has-been-released/ba-p/2277323)

    (cherry picked from commit 754911847e2a5ab3bebb252facd222ae4f87c3c9)

commit c2a0eeeb1aed43ea830982f9140664af9878933f
Author: Andrew Childs <[email protected]>
Date:   Fri Mar 16 00:51:20 2018 +0900

    Chromium: fix skia build on aarch64

    Patch imported from Arch Linux ARM

    (cherry picked from commit 3928fd90814fb8d7ef0bab19f40b6a619c7cd8c4)

commit 5abaf2a959dcedf218a8da8d22e00e0aef1820c6
Author: Yuriy Taraday <[email protected]>
Date:   Thu Mar 15 10:34:30 2018 +0400

    chromium: 65.0.3325.146 -> 65.0.3325.162

    Also bump dev branch to ensure that next beta will work.

    (cherry picked from commit 6b0732a9561849047fbc85bb221dad0da5105512)

commit 607fc823d00440d6b3b5f27f387430428c2a4631
Author: Tuomas Tynkkynen <[email protected]>
Date:   Mon Mar 19 05:11:01 2018 +0200

    nss: Fix aarch64 build

    (cherry picked from commit 8254d2cfb0edaa6d80da4e0f512c9201666c96ea)

commit 63e3251637d44463b750c9d6cd97732258ecd82d
Author: gnidorah <[email protected]>
Date:   Mon Mar 19 21:42:25 2018 +0300

    cgit: wrap python scripts

    (cherry picked from commit 55f1bbe6234cd10f44e3fd3447c80aaa3fba56ec)

commit 42e2ed652077b23c45f30efdd54bc7ab6e02dfbb
Author: Josef Kemetmüller <[email protected]>
Date:   Mon Mar 19 01:02:14 2018 +0100

    pythonPackages.notebook: fix darwin build

    The send2trash library, which is now included in the notebook doesn't
    succeed during build, even though it works.

    (cherry picked from commit 8aaa17c52a1b07874a0cf4fb03d2ac3ca9e8c2ea)

commit a3983d6d0534e3d7180682648977f1a9839e110a
Author: Daiderd Jordan <[email protected]>
Date:   Tue Mar 20 00:01:52 2018 +0100

    libftdi: mark linux only

    (cherry picked from commit 3f964978d867b7555a23d8dbc722ce79a170d052)

commit a2b75703d55c2a3f33ec9f5957b0641240d371b1
Author: Daiderd Jordan <[email protected]>
Date:   Mon Mar 19 23:55:59 2018 +0100

    kore: fix clang build

    /cc ZHF #36454

    (cherry picked from commit 031492cbfe2f2768c9b271c194c74e3f75e7316c)

commit 9ba0bf3e52044aee5031e23c958ce4138a4e88fa
Author: Daiderd Jordan <[email protected]>
Date:   Mon Mar 19 22:57:31 2018 +0100

    iniparser: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit 5873a3418b0fdd0df60931403023fd2b9f73e461)

commit 517d8261d1cadff7256d2ab7b6a0079011ad5b4d
Author: Daiderd Jordan <[email protected]>
Date:   Mon Mar 19 22:33:57 2018 +0100

    imatix_gsl: fix clang build

    /cc ZHF #36454

    (cherry picked from commit e616725ba0756720c4990cf441f289666a4cc735)

commit ed8c29fa65c1be5f828e5c17bf80eabb30ac2676
Author: Daiderd Jordan <[email protected]>
Date:   Mon Mar 19 22:24:42 2018 +0100

    ii: fix darwin build

    /cc ZHF #36454

    (cherry picked from commit d7856d3c2ae5720844b8cfcb68736308cd844b50)

commit 7e39d256004495e1c668d66ca1a5017c0be3ae20
Author: Josef Kemetmüller <[email protected]>
Date:   Sun Mar 18 23:37:12 2018 +0100

    python3Packages.pycurl: fix darwin build

    (cherry picked from commit bd836b7761a495e6c48979b728fa279a42241a03)

commit 084993f3450247490a9b324327e543e57ba9759e
Author: xeji <[email protected]>
Date:   Mon Mar 19 22:59:59 2018 +0100

    altermime: fix build

    (cherry picked from commit f9ed23d2716a2561efec68840b188341e5724fd4)

commit 7a5c7c181817748729b1d2ae961bffbbba327c6f
Author: Robert Schütz <[email protected]>
Date:   Mon Mar 12 20:20:24 2018 +0100

    nixos/borgbackup: init

    (cherry picked from commit fdf0f037be55c5c14e24667b1ad7eeedf2057295)

commit 280d76233862a3c626fd2a7ae5915cd93e1748c4
Author: WilliButz <[email protected]>
Date:   Mon Mar 19 17:04:39 2018 +0100

    grafana: 5.0.1 -> 5.0.3, fix headless phantomjs

    (cherry picked from commit ca7b29050fed6283c701148e8135b01d61328379)

commit f6779e0f4565a2de780416b485d3628a2c86ec95
Author: Ryan Mulligan <[email protected]>
Date:   Thu Mar 8 14:47:43 2018 -0800

    graylog: 2.4.1 -> 2.4.3

    Semi-automatic update. These checks were done:

    - built on NixOS
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -h` got 0 exit code
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl --help` got 0 exit code
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl help` got 0 exit code
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -V` and found version 2.4.3
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -v` and found version 2.4.3
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl --version` and found version 2.4.3
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl version` and found version 2.4.3
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -h` and found version 2.4.3
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl --help` and found version 2.4.3
    - ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl help` and found version 2.4.3
    - found 2.4.3 with grep in /nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3
    - found 2.4.3 in filename of file in /nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3

    (cherry picked from commit e716a11026c0ee74b7519474bb1aa13a80fd7f89)

commit b8b740808c88525db456577212e2f0090b81477e
Merge: ddbff03f0f7 f87594f3ca6
Author: Andreas Rammhold <[email protected]>
Date:   Mon Mar 19 19:29:52 2018 +0100

    Merge pull request #37309 from andir/18.03/firefox

    [18.03] firefox updates (59.0 -> 59.0.1, firefox-esr: 52.7.1esr -> 52.7.2esr)

commit f87594f3ca632f1a111b53c66559dd8ccc6e1a8f
Author: Andreas Rammhold <[email protected]>
Date:   Sun Mar 18 22:22:16 2018 +0100

    firefox-esr: add CVE-2018-5147 patch for ARM platforms

    The patch was missing in the release tag and must be added manually.
    Read [1] for further details.

    [1] http://seclists.org/oss-sec/2018/q1/242

commit a8cdcc52d89d7d7e69019ebd7fc70e5145653662
Author: taku0 <[email protected]>
Date:   Sat Mar 17 10:56:22 2018 +0900

    firefox-bin: 59.0 -> 59.0.1

    (cherry picked from commit 3d28c329214abf581bf38fbeca71b7f7743d5a67)

commit 89ed0cfde67b0471c1b005d04f3bf75b7e3fd585
Author: taku0 <[email protected]>
Date:   Sat Mar 17 11:00:48 2018 +0900

    firefox: 58.0.2 -> 59.0.1

    (cherry picked from commit 9aae5d7c80514c2548c3cbeaeee232e561886cce & 8170c05afc580db5fbdf7907e4e9666b611b1767)

commit ddbff03f0f7a95ccec2feea013925fd0dac42107
Author: Robert Schütz <[email protected]>
Date:   Mon Mar 19 17:16:24 2018 +0100

    asciidoc: add enableJava option

    fixes https://github.com/NixOS/nixpkgs/issues/37045

    (cherry picked from commit 9ede31bfbe54adad7a464416c767af4884f5aa7e)

commit 5bbfe48355a09ac08d8fe5ef4286a8048e65b3d5
Author: Tim Steinbach <[email protected]>
Date:   Mon Mar 19 09:00:10 2018 -0400

    linux: 4.15.10 -> 4.15.11

    (cherry picked from commit 80d0ccaaabf2bc093fdd71d0b35d415f04bcbf87)

commit 19daa8ca0dfb5767fb30133152204c7ae8daaa55
Author: Tim Steinbach <[email protected]>
Date:   Mon Mar 19 08:59:56 2018 -0400

    linux: 4.14.27 -> 4.14.28

    (cherry picked from commit e9ce4c019b480d83f53ffa96e525fc24cbe9d223)

commit 6c3638cff5995ee6331649311f7c3f02b1c9eb0a
Author: Tim Steinbach <[email protected]>
Date:   Mon Mar 19 08:59:40 2018 -0400

    linux: 4.9.87 -> 4.9.88

    (cherry picked from commit c4963d395d3bc5b29387e38ab1d59e6175c44fc3)

commit 10c404acd25c84a779f08e8b81dbe1b48da1ab7a
Author: Tim Steinbach <[email protected]>
Date:   Mon Mar 19 08:59:22 2018 -0400

    linux: 4.4.121 -> 4.4.122

    (cherry picked from commit 04f11faa687026eb6798412e30b9f6d2a7911570)

commit e8f7e1e76cc0463ace2fdf05293e2c82e6e3c1ab
Author: Vaibhav Sagar <[email protected]>
Date:   Mon Mar 19 15:49:28 2018 +0800

    pythonPackages.thumbor: mark as broken under Python 3

commit 27994f8cdf81d8a409d443f913a9302a75ffee61
Author: Vladimír Čunát <[email protected]>
Date:   Sun Mar 18 23:09:31 2018 +0100

    Merge #37335: wideland: fix build and .desktop

    (cherry picked from commit 940fab424a9859945e8c48315d9287075d79fcf4)

commit b964be2410e5b70829e17bc384599930154b0d21
Author: Josef Kemetmüller <[email protected]>
Date:   Thu Mar 15 19:49:09 2018 +0100

    pythonPackages.tkinter: fix darwin build

    (cherry picked from commit af0f9fa26b02fd8c5808d89a3781d3777f8c0d1f)

commit 3b1e354a2cdb7912b29e0eb9a4d4564a47bdc40d
Author: Daiderd Jordan <[email protected]>
Date:   Sun Mar 18 22:27:13 2018 +0100

    guile-lint: disable tests on darwin

    (cherry picked from commit 4e1ab9d44c02cbbff452d5c60288d764542e72a3)

commit 6759a03179d5252ceee63ffecb109e0d2346b375
Author: Pascal Wittmann <[email protected]>
Date:   Sun Mar 18 20:49:32 2018 +0100

    homebank: 5.1.7 -> 5.1.8

commit 0b0bd0c8cc157356f5b9a61c9f4805872cbc47b7
Author: Pascal Wittmann <[email protected]>
Date:   Sun Mar 18 20:43:54 2018 +0100

    icmake: 9.02.06 -> 9.02.07

commit ac2378d8121c93c0ee86c33efcefaac1a17cad0a
Author: taku0 <[email protected]>
Date:   Sat Mar 17 11:00:50 2018 +0900

    firefox-esr: 52.6.0esr -> 52.7.2esr

    (cherry picked from commit d947db7e3cad7f4423c1679890f3d5f314bfaf9b)

commit 548044350aeb0110f99c824035222d5047f388fb
Author: taku0 <[email protected]>
Date:   Wed Mar 14 23:21:52 2018 +0900

    nss: 3.34.1 -> 3.35; cacert.certdata2pem: 20160104 -> 20170717

    (cherry picked from commit 16ee6b5ed97ac55955c3c67cb7ad6cf1079bded9)

commit 6924132355315f5c47f8da3c4828cebf253ddbdb
Author: Ryan Mulligan <[email protected]>
Date:   Sun Mar 18 11:19:14 2018 -0700

    spaceFM: 1.0.5 -> 1.0.6

    Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

    - built on NixOS
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-wrapped -h` got 0 exit code
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-wrapped --help` got 0 exit code
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-wrapped --version` and found version 1.0.6
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm -h` got 0 exit code
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm --help` got 0 exit code
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm --version` and found version 1.0.6
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-installer-wrapped --help` got 0 exit code
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-installer-wrapped help` got 0 exit code
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm-installer --help` got 0 exit code
    - ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm-installer help` got 0 exit code
    - found 1.0.6 with grep in /nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6
    - directory tree listing: https://gist.github.com/1af4e8f53a36978c67e557c6c4c22b8d

    (cherry picked from commit bb165a9d6f6535fb291f668d007c271844e8638b)

commit b506cdbf90192faa804e01badab944d1e1033b69
Author: Maximilian Bode <[email protected]>
Date:   Fri Mar 16 12:45:29 2018 +0100

    spass: make gcc dependency explicit

    (cherry picked from commit 9dc0f229ad2b1e4f54006a4b04468111cecdf7c5)

commit dda33d697d66f85e70469f0fbf755634df358104
Author: Maximilian Bode <[email protected]>
Date:   Fri Mar 16 18:31:31 2018 +0100

    samtools: make gcc dependency explicit

    (cherry picked from commit 92c5097c6d4ba50e5e1b3fc23c8b5be34a197564)

commit 715338b4bb2c4edfd82952fc36cd74621390c177
Author: Daiderd Jordan <[email protected]>
Date:   Sun Mar 18 18:02:14 2018 +0100

    gnu-apl: fix clang build

    /cc ZHF #36454

    (cherry picked from commit ec15ef011a4488a4eb77b114bc3d03797dff43d3)

commit 0184e3f8cce49b05731dd4f653b1c07a765bf56b
Author: Pascal Wittmann <[email protected]>
Date:   Sun Mar 18 18:08:11 2018 +0100

    zim: 0.67 -> 0.68

commit 6baf97fe6159f2f23607834910c5e0b6611948ca
Author: Maximilian Bosch <[email protected]>
Date:   Thu Mar 15 22:34:10 2018 +0100

    pythonPackages.thumbor: 6.3.2 -> 6.4.2; fix build

    Origianlly the package was broken as bumping `pythonPackages.pillow` to
    5.x broke `thumbor`. The latest upstream version `6.4.2` solved this
    issue, so a simple package bump was sufficient.

    Furthermore the following changes were made:

    - moved the expression into its own file
    - added myself as maintainer in case of any further breackage
    - re-enabled python3 build: 6.4.2 is fine with python3, however the
      `futures` dependency can't be satisfied anymore as it's part of
      Python3. Therefore a patch for `setup.py` will be applied for Python3
      buildsto drop the dependency

    Note: the testsuite is disabled for now as several impure tests are done
    and our testing environment seems to be unable to work the with the
    natively compiled python modules properly.

    Therefore I tested the module using the following expression:

    ``` nix
    with import ./. {};

    stdenv.mkDerivation {
      name = "thumbor-test";
      src = null;
      buildInputs = [ python pythonPackages.thumbor ];
    }
    ```

    Inside this nix shell `thumbor` works fine and the native modules can be
    imported.

    See https://hydra.nixos.org/build/71062729/log
    See ticket #36453

    (cherry picked from commit 23e6689578d8d4dbc498d70874546512df7c656c)

commit 747a426ce631feed64b6c9e784b7cb87cd5a4573
Author: Robert Schütz <[email protected]>
Date:   Sun Mar 18 16:12:48 2018 +0100

    pythonPackages.flake8-debugger: fix build

    (cherry picked from commit 5c897bdd59ad1bc117cdee4b9c39cb8f43bcd64e)

commit 1287bc21b275ec7ecc9db9c1626445f5f5acb60a
Author: Robert Schütz <[email protected]>
Date:   Sun Mar 18 16:04:52 2018 +0100

    pythonPackages.dlib: fix build

    (cherry picked from commit 4779989c4e2a577d1a3af3b4152bdb073e1a8df5)

commit c310c64d71ba718ae7fe2cebe95e4a27ff9ea4b2
Author: Robert Schütz <[email protected]>
Date:   Sun Mar 18 15:47:52 2018 +0100

    pythonPackages.colander: 1.0 -> 1.4

    (cherry picked from commit 93b10cd879f41ff2913acf20c969e450384b3582)

commit b34d370eb7fd1882c8b132841e6644e502de65f6
Author: Robert Schütz <[email protected]>
Date:   Sun Mar 18 15:47:04 2018 +0100

    pythonPackages.colander: move expression

    (cherry picked from commit a6cbdeaef3b29c3d83c5524c1143b92c998f6927)

commit 18221dde69bc6d398b242a8eda1bc5e641fd4160
Author: Robert Schütz <[email protected]>
Date:   Sun Mar 18 13:19:44 2018 +0100

    pythonPackages.robomachine: fix build

    (cherry picked from commit edc94294c89d1f3f1188e7192578e83efbbda8eb)

commit eecc7517164ad4e45982939655b8c783eeb98689
Author: Robert Schütz <[email protected]>
Date:   Sun Mar 18 13:17:58 2018 +0100

    pythonPackages.allpairspy: init at 2.4.0

    (cherry picked from commit bd7a7bd817367b3c77f7184ca9fbca6e437d321e)

commit ce032734c7f64d38f0e7054fa756201ec832dd9f
Author: Robert Schütz <[email protected]>
Date:   Sun Mar 18 13:03:29 2018 +0100

    pythonPackages.pyshphere: uninit

    Build is broken and project is unmaintained since 2013.

    (cherry picked from commit 097dd635facf9be587edba59ae63ad0b37a2ad3c)

commit f999bc180b1d168525e0afed59979869955304a1
Author: Robert Schütz <[email protected]>
Date:   Sun Mar 18 12:55:27 2018 +0100

    pythonPackages.pyhomematic: disable tests because of unreliable timimg

    (cherry picked from commit 97e54c4f758c3032c9da94cdca45981127a042f6)

commit f1f0134dbd1ac12f366c2423e75b1db2341c596e
Author: Robert Schütz <[email protected]>
Date:   Sun Mar 18 12:53:48 2018 +0100

    pythonPackages.credstash: fix build

    This applies https://github.com/fugue/credstash/pull/178.

    (cherry picked from commit 14ed0f5fe0953c990d080abb97611bd0bf8cabf7)

commit 7a85df0ecda803e9f73348188e8a1a01b06c3765
Author: Robert Schütz <robert.schuetz@stud…
  • Loading branch information
@jefdaj
jefdaj committed Apr 5, 2018
1 parent 63588cf commit e88fdaa
Show file tree
Hide file tree
Showing 10,520 changed files with 341,240 additions and 270,735 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
93 changes: 93 additions & 0 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
# CODEOWNERS file
#
# This file is used to describe who owns what in this repository. This file does not
# replace `meta.maintainers` but is instead used for other things than derivations
# and modules, like documentation, package sets, and other assets.
#
# For documentation on this file, see https://help.github.com/articles/about-codeowners/
# Mentioned users will get code review requests.

# This file
/.github/CODEOWNERS @edolstra

# Libraries
/lib @edolstra @nbp
/lib/systems @nbp @ericson2314

# Nixpkgs Internals
/default.nix @nbp
/pkgs/top-level/default.nix @nbp @Ericson2314
/pkgs/top-level/impure.nix @nbp @Ericson2314
/pkgs/top-level/stage.nix @nbp @Ericson2314
/pkgs/stdenv
/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
/pkgs/build-support/setup-hooks @Ericson2314

# NixOS Internals
/nixos/default.nix @nbp
/nixos/lib/from-env.nix @nbp
/nixos/lib/eval-config.nix @nbp
/nixos/doc/manual/configuration/abstractions.xml @nbp
/nixos/doc/manual/configuration/config-file.xml @nbp
/nixos/doc/manual/configuration/config-syntax.xml @nbp
/nixos/doc/manual/configuration/modularity.xml @nbp
/nixos/doc/manual/development/assertions.xml @nbp
/nixos/doc/manual/development/meta-attributes.xml @nbp
/nixos/doc/manual/development/option-declarations.xml @nbp
/nixos/doc/manual/development/option-def.xml @nbp
/nixos/doc/manual/development/option-types.xml @nbp
/nixos/doc/manual/development/replace-modules.xml @nbp
/nixos/doc/manual/development/writing-modules.xml @nbp
/nixos/doc/manual/man-nixos-option.xml @nbp
/nixos/modules/installer/tools/nixos-option.sh @nbp

# Python-related code and docs
/pkgs/top-level/python-packages.nix @FRidh
/pkgs/development/interpreters/python @FRidh
/pkgs/development/python-modules @FRidh
/doc/languages-frameworks/python.md @FRidh

# Haskell
/pkgs/development/compilers/ghc @peti
/pkgs/development/haskell-modules @peti
/pkgs/development/haskell-modules/default.nix @peti
/pkgs/development/haskell-modules/generic-builder.nix @peti
/pkgs/development/haskell-modules/hoogle.nix @peti

# R
/pkgs/applications/science/math/R @peti
/pkgs/development/r-modules @peti

# Ruby
/pkgs/development/interpreters/ruby @zimbatm
/pkgs/development/ruby-modules @zimbatm

# Darwin-related
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
/pkgs/os-specific/darwin @NixOS/darwin-maintainers

# Beam-related (Erlang, Elixir, LFE, etc)
/pkgs/development/beam-modules @gleber
/pkgs/development/interpreters/erlang @gleber
/pkgs/development/interpreters/lfe @gleber
/pkgs/development/interpreters/elixir @gleber
/pkgs/development/tools/build-managers/rebar @gleber
/pkgs/development/tools/build-managers/rebar3 @gleber
/pkgs/development/tools/erlang @gleber

# Jetbrains
/pkgs/applications/editors/jetbrains @edwtjo

# Eclipse
/pkgs/applications/editors/eclipse @rycee

# https://github.com/NixOS/nixpkgs/issues/31401
/lib/maintainers.nix @ghost
/lib/licenses.nix @ghost

# Qt / KDE
/pkgs/applications/kde @ttuegel
/pkgs/desktops/plasma-5 @ttuegel
/pkgs/development/libraries/kde-frameworks @ttuegel
/pkgs/development/libraries/qt-5 @ttuegel
23 changes: 13 additions & 10 deletions .github/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,34 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.

## Submitting changes

* Format the commits in the following way:
* Format the commit messages in the following way:

```
(pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
(Motivation for change. Additional information.)
```

Examples:

* nginx: init at 2.0.1
* firefox: 3.0 -> 3.1.1
* firefox: 54.0.1 -> 55.0
* nixos/hydra: add bazBaz option

Dual baz behavior is needed to do foo.
* nixos/nginx: refactor config generation

The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).

* `meta.description` should:
* Be capitalized
* Not start with the package name
* Not have a dot at the end

See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
* Be capitalized.
* Not start with the package name.
* Not have a period at the end.
* `meta.license` must be set and fit the upstream license.
* If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
* `meta.maintainers` must be set.

See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).

## Writing good commit messages

Expand Down
6 changes: 2 additions & 4 deletions .github/ISSUE_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@

## Technical details

* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...)
* Nix version: (run `nix-env --version`)
* Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)
* Sandboxing enabled: (run `grep build-use-sandbox /etc/nix/nix.conf`)
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the
results.
9 changes: 3 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@

###### Things done

Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.
<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->

- [ ] Tested using sandboxing
([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,
or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file)
on non-NixOS)
- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS)
- Built on platform(s)
- [ ] NixOS
- [ ] macOS
- [ ] Linux
- [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
Expand Down
14 changes: 0 additions & 14 deletions .mention-bot
View file

This file was deleted.

29 changes: 0 additions & 29 deletions .travis.yml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion .version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.09
18.03
6 changes: 2 additions & 4 deletions COPYING
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors
Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand All @@ -23,9 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: the license above does not apply to the packages built by the
Nix Packages collection, merely to the package descriptions (i.e., Nix
expressions, build scripts, etc.). Also, the license does not apply
to some of the binaries used for bootstrapping Nixpkgs (e.g.,
pkgs/stdenv/linux/tools/bash). It also might not apply to patches
expressions, build scripts, etc.). It also might not apply to patches
included in Nixpkgs, which may be derivative works of the packages to
which they apply. The aforementioned artifacts are all covered by the
licenses of the respective packages.
62 changes: 43 additions & 19 deletions doc/coding-conventions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
tab settings so it’s asking for trouble.</para></listitem>

<listitem><para>Use <literal>lowerCamelCase</literal> for variable
names, not <literal>UpperCamelCase</literal>. TODO: naming of
attributes in
<filename>all-packages.nix</filename>?</para></listitem>
names, not <literal>UpperCamelCase</literal>. Note, this rule does
not apply to package attribute names, which instead follow the rules
in <xref linkend="sec-package-naming"/>.</para></listitem>

<listitem><para>Function calls with attribute set arguments are
written as
Expand Down Expand Up @@ -220,9 +220,10 @@ args.stdenv.mkDerivation (args // {

<listitem><para>The variable name used for the instantiated package
in <filename>all-packages.nix</filename>, and when passing it as a
dependency to other functions. This is what Nix expression authors
see. It can also be used when installing using <command>nix-env
-iA</command>.</para></listitem>
dependency to other functions. Typically this is called the
<emphasis>package attribute name</emphasis>. This is what Nix
expression authors see. It can also be used when installing using
<command>nix-env -iA</command>.</para></listitem>

<listitem><para>The filename for (the directory containing) the Nix
expression.</para></listitem>
Expand Down Expand Up @@ -254,17 +255,17 @@ bound to the variable name <varname>e2fsprogs</varname> in
dash) — e.g., <literal>"hello-0.3.1rc2"</literal>.</para></listitem>

<listitem><para>If a package is not a release but a commit from a repository, then
the version part of the name <emphasis>must</emphasis> be the date of that
the version part of the name <emphasis>must</emphasis> be the date of that
(fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal> format.
Also append <literal>"unstable"</literal> to the name - e.g.,
<literal>"pkgname-unstable-2014-09-23"</literal>.</para></listitem>

<listitem><para>Dashes in the package name should be preserved
in new variable names, rather than converted to underscores
(which was convention up to around 2013 and most names
still have underscores instead of dashes) — e.g.,
<varname>http-parser</varname> instead of
<varname>http_parser</varname>.</para></listitem>
<listitem><para>Dashes in the package name should be preserved in
new variable names, rather than converted to underscores or camel
cased — e.g., <varname>http-parser</varname> instead of
<varname>http_parser</varname> or <varname>httpParser</varname>. The
hyphenated style is preferred in all three package
names.</para></listitem>

<listitem><para>If there are multiple versions of a package, this
should be reflected in the variable names in
Expand Down Expand Up @@ -365,7 +366,7 @@ splitting up an existing category.</para>
<varlistentry>
<term>If it’s a (set of) <emphasis>tool(s)</emphasis>:</term>
<listitem>
<para>(A tool is a relatively small program, especially one intented
<para>(A tool is a relatively small program, especially one intended
to be used non-interactively.)</para>
<variablelist>
<varlistentry>
Expand Down Expand Up @@ -456,7 +457,7 @@ splitting up an existing category.</para>
<varlistentry>
<term>If it’s a <emphasis>window manager</emphasis>:</term>
<listitem>
<para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>compiz</filename>, <filename>stumpwm</filename>)</para>
<para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>stumpwm</filename>)</para>
</listitem>
</varlistentry>
<varlistentry>
Expand Down Expand Up @@ -608,7 +609,7 @@ evaluate correctly.</para>
</section>
<section xml:id="sec-sources"><title>Fetching Sources</title>
<para>There are multiple ways to fetch a package source in nixpkgs. The
general guidline is that you should package sources with a high degree of
general guideline is that you should package sources with a high degree of
availability. Right now there is only one fetcher which has mirroring
support and that is <literal>fetchurl</literal>. Note that you should also
prefer protocols which have a corresponding proxy environment variable.
Expand Down Expand Up @@ -661,9 +662,7 @@ src = fetchFromGitHub {
</section>

<section xml:id="sec-patches"><title>Patches</title>
<para>Only patches that are unique to <literal>nixpkgs</literal> should be
included in <literal>nixpkgs</literal> source.</para>
<para>Patches available online should be retrieved using
<para>Patches available online should be retrieved using
<literal>fetchpatch</literal>.</para>
<para>
<programlisting>
Expand All @@ -676,5 +675,30 @@ patches = [
];
</programlisting>
</para>
<para>Otherwise, you can add a <literal>.patch</literal> file to the
<literal>nixpkgs</literal> repository. In the interest of keeping our
maintenance burden to a minimum, only patches that are unique
to <literal>nixpkgs</literal> should be added in this way.</para>
<para><programlisting>
patches = [ ./0001-changes.patch ];
</programlisting></para>
<para>If you do need to do create this sort of patch file,
one way to do so is with git:
<orderedlist>
<listitem><para>Move to the root directory of the source code
you're patching.<screen>
$ cd the/program/source</screen></para></listitem>
<listitem><para>If a git repository is not already present,
create one and stage all of the source files.<screen>
$ git init
$ git add .</screen></para></listitem>
<listitem><para>Edit some files to make whatever changes need
to be included in the patch.</para></listitem>
<listitem><para>Use git to create a diff, and pipe the output
to a patch file:<screen>
$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch</screen>
</para></listitem>
</orderedlist></para>
</section>

</chapter>
4 changes: 4 additions & 0 deletions doc/configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ configuration file located at
</programlisting>
</para>

<para>Note that we are not able to test or build unfree software on Hydra
due to policy. Most unfree licenses prohibit us from either executing or
distributing the software.</para>

<section xml:id="sec-allow-broken">
<title>Installing broken packages</title>

Expand Down
Loading

0 comments on commit e88fdaa

Please sign in to comment.