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: 84be644f8749
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: ea32c785994d
Choose a head ref
  • 16 commits
  • 15 files changed
  • 10 contributors

Commits on Feb 8, 2019

  1. nixos/manual: add dummy ids to silence warnings

    @layus
    layus committed Feb 8, 2019
    Copy the full SHA
    473a3ef View commit details
    Browse the repository at this point in the history

  2. nixos/manual: error out on missing IDs

    @layus
    layus committed Feb 8, 2019
    Copy the full SHA
    a65974c View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2019

  1. digikam: add ffmpeg to buildInputs 

    Since version 6.0.0, media playback in Digikam requires ffmpeg.
    @callahad
    callahad committed Feb 21, 2019
    Copy the full SHA
    9e1a3b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2019

  1. pantheon.elementary-redacted-script: init at 2016-06-03

    @worldofpeace
    worldofpeace committed Mar 4, 2019
    Copy the full SHA
    86f4bad View commit details
    Browse the repository at this point in the history

  2. nixos/pantheon: add elementary-redacted-script to fonts 

    Needed by elementary-screenshot-tool to conceal text.
    @worldofpeace
    worldofpeace committed Mar 4, 2019
    Copy the full SHA
    59f4708 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2019

  1. calibre: 3.39.1 -> 3.40.1

    @pSub
    pSub committed Mar 9, 2019
    Copy the full SHA
    7c1ad76 View commit details
    Browse the repository at this point in the history

  2. aide: 0.16 -> 0.16.1

    @pSub
    pSub committed Mar 9, 2019
    Copy the full SHA
    2e1217f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #56144 from callahad/digikam-media-player 

    digikam: fix media playback by adding ffmpeg to buildInputs
    @markuskowa
    markuskowa committed Mar 9, 2019
    Copy the full SHA
    2debad9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #55436 from layus/warn-manual-ids 

    Nixos manual: error out on missing IDs
    @grahamc
    grahamc committed Mar 9, 2019
    Copy the full SHA
    777e94d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #57111 from NixOS/update-calibre 

    calibre: 3.39.1 -> 3.40.1
    @ryantm
    ryantm committed Mar 9, 2019
    Copy the full SHA
    32e9296 View commit details
    Browse the repository at this point in the history

  6. Fix locally created database (#56889) 

    * zoneminder: fix initial database creation

Move initialDatabases directive from the 'ensureUsers' scope to the correct outer 'mysql' one.

* zoneminder: Fix mysql username to match unix username

When database.createLocally is used, a mysql user is created with the ensureUsers directive.
It ensures that the unix user with the name provided exists and can connect to MySQL through socket.
Thus, the MySQL username used by php/perl scripts must match the unix user owning the server PID.

This patch sets the default mysql user to 'zoneminder' instead of 'zmuser'.
    @amazari @danbst
    amazari authored and danbst committed Mar 9, 2019
    Copy the full SHA
    d7f6cde View commit details
    Browse the repository at this point in the history

  7. Merge pull request #56552 from worldofpeace/elementary-screenshot-too… 

    …l/fix-conceal-text

pantheon.elementary-screenshot-tool: fix conceal text
    @worldofpeace
    worldofpeace committed Mar 9, 2019
    Copy the full SHA
    fa64c63 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #57115 from NixOS/update-aide 

    aide: 0.16 -> 0.16.1
    @pSub
    pSub committed Mar 9, 2019
    Copy the full SHA
    ca436d9 View commit details
    Browse the repository at this point in the history

  9. mhddfs: fix build (see #53716)

    @pSub
    pSub committed Mar 9, 2019
    Copy the full SHA
    bbfd2be View commit details
    Browse the repository at this point in the history

  10. zonminder: Fix database name and username 

    PR #56889 messed up db and use naming while fixing the scope of the initialDatabases property.
This patch fixes the issue.
    @amazari
    amazari committed Mar 9, 2019
    Copy the full SHA
    56aa491 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #57125 from amazari/fix-zoneminder-local-db2 

    zoneminder: Fix database name and username
    @7c6f434c
    7c6f434c committed Mar 9, 2019
    Copy the full SHA
    ea32c78 View commit details
    Browse the repository at this point in the history