Skip to content
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
base: 2dc7d6197ec0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2ff7fa55c176
Choose a head ref
  • 18 commits
  • 21 files changed
  • 12 contributors

Commits on Oct 17, 2019

  1. Copy the full SHA
    ab9fd67 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2019

  1. gitlab: Get rid of most 'already initialized constant'-warnings

    On start, unicorn, sidekiq and other parts running ruby code emits
    quite a few warnings similar to
    
    /var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS
    /nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here
    /var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL
    /nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here
    
    This seems to be caused by the same ruby files being evaluated
    multiple times due to the paths being different - sometimes they're
    loaded using the direct path and sometimes through a symlink, due to
    our split between config and package data. To fix this, we make sure
    that the offending files in the state directory always reference the
    store path, regardless of that being the real file or a symlink.
    talyz committed Oct 19, 2019
    Copy the full SHA
    ed4a09c View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2019

  1. xzoom: fix version

    davidak committed Oct 21, 2019
    Copy the full SHA
    49945b9 View commit details
    Browse the repository at this point in the history
  2. drawio: 11.3.0 -> 12.1.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/drawio/versions
    r-ryantm committed Oct 21, 2019
    Copy the full SHA
    6f8c6d2 View commit details
    Browse the repository at this point in the history
  3. libcutl: fix regex

    Attempt to fix #71544
    c0bw3b committed Oct 21, 2019
    Copy the full SHA
    8e5de3a View commit details
    Browse the repository at this point in the history
  4. Merge pull request #71540 from r-ryantm/auto-update/drawio

    drawio: 11.3.0 -> 12.1.0
    ryantm committed Oct 21, 2019
    Copy the full SHA
    dd8b06c View commit details
    Browse the repository at this point in the history
  5. pythonPackages.mesa: init at 0.8.6

    dpaetzel authored and Jon committed Oct 21, 2019
    Copy the full SHA
    6a2a395 View commit details
    Browse the repository at this point in the history
  6. pythonPackages.pyside: inherit mesa from pkgs

    dpaetzel authored and Jon committed Oct 21, 2019
    Copy the full SHA
    3db3c78 View commit details
    Browse the repository at this point in the history
  7. golly: 3.2 -> 3.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/golly/versions
    r-ryantm committed Oct 21, 2019
    Copy the full SHA
    b73b939 View commit details
    Browse the repository at this point in the history
  8. ffmpegthumbnailer: 2.2.1 -> 2.2.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/ffmpegthumbnailer/versions
    r-ryantm authored and FRidh committed Oct 21, 2019
    Copy the full SHA
    5955b96 View commit details
    Browse the repository at this point in the history
  9. iosevka-bin: 2.3.0 -> 2.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/iosevka-bin/versions
    r-ryantm committed Oct 21, 2019
    Copy the full SHA
    417834e View commit details
    Browse the repository at this point in the history
  10. Merge pull request #71428 from talyz/gitlab-already-initialized-constant

    gitlab: Get rid of most 'already initialized constant'-warnings
    flokli committed Oct 21, 2019
    Copy the full SHA
    1125fb0 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #71292 from doronbehar/awesome-luajit

    awesome: Make sure it compiles with luajit
    rasendubi committed Oct 21, 2019
    Copy the full SHA
    2695914 View commit details
    Browse the repository at this point in the history
  12. Elm: 0.19.0 -> 0.19.1

    domenkozar committed Oct 21, 2019
    Copy the full SHA
    5235b19 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #71528 from davidak/xzoom

    xzoom: fix version
    7c6f434c committed Oct 21, 2019
    Copy the full SHA
    a2f854b View commit details
    Browse the repository at this point in the history
  14. Merge pull request #71566 from r-ryantm/auto-update/golly

    golly: 3.2 -> 3.3
    7c6f434c committed Oct 21, 2019
    Copy the full SHA
    a35022a View commit details
    Browse the repository at this point in the history
  15. Merge pull request #71538 from NixOS/elm-19.1

    Elm 0.19.1
    domenkozar committed Oct 21, 2019
    Copy the full SHA
    99f2e88 View commit details
    Browse the repository at this point in the history
  16. iosevka-bin: 2.3.0 -> 2.3.2 (#71570)

    iosevka-bin: 2.3.0 -> 2.3.2
    dywedir committed Oct 21, 2019
    Copy the full SHA
    2ff7fa5 View commit details
    Browse the repository at this point in the history