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: f3ea31e4d1fa
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2f668e324828
Choose a head ref
  • 8 commits
  • 12 files changed
  • 2 contributors

Commits on Oct 22, 2018

  1. ckb-next: 0.2.9 -> 0.3.2 

    In this update:

* binaries `ckb` and `ckb-daemon` are renamed to `ckb-next` and `ckb-next-daemon`
* build system changed from qmake to cmake
* the directory searched for animation plugins no longer needs to be patched, as a result of the build system change
* modprobe patch has been bumped, since the source repository layout has changed
* the cmake scripts are quite FHS-centric and require patching to fix install locations
    @kierdavis
    kierdavis committed Oct 22, 2018
    Copy the full SHA
    85526bc View commit details
    Browse the repository at this point in the history

  2. ckb module: update systemd service parameters to match upstream 

    This changes the description and restart mode to the values present
in lib/systemd/system/ckb.service within the ckb package.
    @kierdavis
    kierdavis committed Oct 22, 2018
    Copy the full SHA
    8069b09 View commit details
    Browse the repository at this point in the history

  3. ckb, ckb module: rename to ckb-next 

    The upstream package has officially changed its name to ckb-next.
    @kierdavis
    kierdavis committed Oct 22, 2018
    Copy the full SHA
    8117878 View commit details
    Browse the repository at this point in the history

  4. ckb module: use exec when starting the daemon process 

    This avoids leaving the parent shell process (the one executing the
unit script) lying around.
    @kierdavis
    kierdavis committed Oct 22, 2018
    Copy the full SHA
    dfdaf39 View commit details
    Browse the repository at this point in the history

  5. ckb-next: rename ckb-modprobe.patch to modprobe.patch 

    This keeps the naming consistent with the other two patches in
this directory.
    @kierdavis
    kierdavis committed Oct 22, 2018
    Copy the full SHA
    7a0d849 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2018

  1. Merge branch 'master' into ckb-update-and-cleanup

    @kierdavis
    kierdavis committed Nov 6, 2018
    Copy the full SHA
    3b7984d View commit details
    Browse the repository at this point in the history

  2. ckb-next: move option renames to nixos/modules/rename.nix for consist… 

    …ency
    @kierdavis
    kierdavis committed Nov 6, 2018
    Copy the full SHA
    de00913 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2018

  1. Merge pull request #40043 from kierdavis/ckb-update-and-cleanup 

    ckb/ckb-next: 0.2.9 -> 0.3.2, and cleanup
    @samueldr
    samueldr committed Nov 9, 2018
    Copy the full SHA
    2f668e3 View commit details
    Browse the repository at this point in the history