Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
base: ffcfb80781fc
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 5f594c6a7c5e
Choose a head ref
  • 11 commits
  • 7 files changed
  • 7 contributors

Commits on Jan 18, 2020

  1. pypi2nix: 2.0.2 -> 2.0.3

    @seppeljordan
    seppeljordan committed Jan 18, 2020
    Copy the full SHA
    5adcd5c View commit details
    Browse the repository at this point in the history

  2. rage: init at 0.2.0

    @marsam
    marsam committed Jan 18, 2020
    Copy the full SHA
    2d0a680 View commit details
    Browse the repository at this point in the history

  3. nebula: 1.0.0 -> 1.1.0

    @Br1ght0ne
    Br1ght0ne committed Jan 18, 2020
    Copy the full SHA
    ae3ba80 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #77976 from filalex77/nebula-1.1.0 

    nebula: 1.0.0 -> 1.1.0
    @marsam
    marsam committed Jan 18, 2020
    Copy the full SHA
    e517c52 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #77958 from seppeljordan/bump-pypi2nix-to-2.0.3 

    pypi2nix: 2.0.2 -> 2.0.3
    @marsam
    marsam committed Jan 18, 2020
    Copy the full SHA
    9e9095c View commit details
    Browse the repository at this point in the history

  6. zoneminder: Fix installation location for cgi-bin (#76855) 

    Before this change, the build would duplicate the prefix in the
installation location for cgi-bin stuff:
-- Installing: /nix/store/skg6b81hikd3fvvdf62xbkm6gsbid41a-zoneminder-1.32.3/nix/store/skg6b81hikd3fvvdf62xbkm6gsbid41a-zoneminder-1.32.3/libexec/zoneminder/cgi-bin/zms
    @danielfullmer @veprbl
    danielfullmer authored and veprbl committed Jan 18, 2020
    Copy the full SHA
    5d1fda3 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #77974 from marsam/init-rage 

    rage: init at 0.2.0
    @mmahut
    mmahut committed Jan 18, 2020
    Copy the full SHA
    d5f9a98 View commit details
    Browse the repository at this point in the history

  8. tdesktop: 1.8.15 -> 1.9.3 

    The GYP build is now deprecated [0].
This results in a large number of changes and many custom Nix patches
aren't required anymore (and probably haven't been required for quite
some time now, the derivation got a bit outdated...).

A lot of the changes in this commit are based on the changes of the
Arch package [1][2] (which our package is based upon).

Rough overview of the changes:
- gcc9 -> ninja (optional but let's follow Arch here)
- Dropped GYP, only CMake now
  - But: Python is still required
- fetchFromGitHub -> fetchurl (optional?)
- Apply all Arch patches and remove old patches
  - Requires one new patch for range-v3
- New dependencies: enchant2, lz4, xxHash
  - TODO: Plus a few new dependencies that shouldn't be required
- Cleanup: Irrelevant flags (e.g. GYP_DEFINES) and patches (e.g. sed)
  - Simplifies quite a few things :)
- Some additional documentation and TODOs

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>

[0]: telegramdesktop/tdesktop#7001
[1]: https://git.archlinux.org/svntogit/community.git/commit/?id=23eff2b1ef7435441e93120618ca899f0b0e7e61
[2]: https://git.archlinux.org/svntogit/community.git/commit/?id=6a19e949724b2e2bfcdcf2081111ecd46108e449
    @primeos
    primeos committed Jan 18, 2020
    Copy the full SHA
    1835ac1 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #77453 from primeos/tdesktop 

    tdesktop: 1.8.15 -> 1.9.3
    @primeos
    primeos committed Jan 18, 2020
    Copy the full SHA
    f430ac7 View commit details
    Browse the repository at this point in the history

  10. dive: 0.9.0 -> 0.9.1

    @zowoq
    zowoq committed Jan 18, 2020
    Copy the full SHA
    bbc144a View commit details
    Browse the repository at this point in the history

  11. Merge pull request #78000 from zowoq/dive 

    dive: 0.9.0 -> 0.9.1
    @marsam
    marsam committed Jan 18, 2020
    Copy the full SHA
    5f594c6 View commit details
    Browse the repository at this point in the history