Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4756e6ff3b80
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db0da282c374
Choose a head ref
  • 15 commits
  • 12 files changed
  • 11 contributors

Commits on Jun 13, 2018

  1. flent: enable man by default

    teto committed Jun 13, 2018
    Copy the full SHA
    e96ce01 View commit details
  2. http-getter: init at 20180606

    Used by flent
    teto committed Jun 13, 2018
    Copy the full SHA
    0080fe9 View commit details

Commits on Jun 19, 2018

  1. dhall-json_1_2_0: fix dependencies

    dhall-json 1.2.0 requires dhall's version to be at least 1.14.0 and less
    than 1.15.0.  The package wasn't building for me because `dhall` is at
    version 1.11.1; pinning to `dhall_1_14_0` fixed it.
    philandstuff committed Jun 19, 2018
    Copy the full SHA
    5a2e2db View commit details

Commits on Jun 21, 2018

  1. yabar: fix build

    The stable build for `yabar` is currently broken: https://hydra.nixos.org/build/75989172
    
    Main reason is that the inline function `ya_setup_prefix_suffix` is
    supposed to be an inline function, but was insufficiently declared as
    such which broke the compiler recently with the following message:
    
    ```
    gcc -std=c99 -Iinclude -pedantic -Wall -Os `pkg-config --cflags pango pangocairo libconfig` -DVERSION=\"0.4.0\" -D_POSIX_C_SOURCE=199309L -DYA_INTERNAL -DYA_DYN_COL -DYA_ENV_VARS -DYA_INTERNAL_EWMH  -c -o src/intern_blks/ya_intern.o src/intern_blks/ya_intern.c
    gcc -o yabar src/ya_main.o src/ya_draw.o src/ya_exec.o src/ya_parse.o src/intern_blks/ya_intern.o -lxcb -lpthread -lxcb-randr -lxcb-ewmh `pkg-config --libs pango pangocairo libconfig`
    src/intern_blks/ya_intern.o: In function `ya_int_date':
    ya_intern.c:(.text+0x49): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o: In function `ya_int_uptime':
    ya_intern.c:(.text+0xf4): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o: In function `ya_int_brightness':
    ya_intern.c:(.text+0x1d8): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o: In function `ya_int_bandwidth':
    ya_intern.c:(.text+0x377): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o: In function `ya_int_cpu':
    ya_intern.c:(.text+0x6de): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o:ya_intern.c:(.text+0x924): more undefined references to `ya_setup_prefix_suffix' follow
    collect2: error: ld returned 1 exit status
    make: *** [Makefile:18: yabar] Error 1
    ```
    
    This issue has been fixed on master (see
    geokb/yabar@9779a5e)
    which is why `nixos.yabar-unstable` remained functional.
    Ma27 committed Jun 21, 2018
    Copy the full SHA
    2ae3292 View commit details
  2. Copy the full SHA
    dc7a913 View commit details
  3. nixos/thefuck: move init scripts to programs.*.interactiveShellInit

    `fuck` should only be used for interactive sessions, but nothing more
    (so init files like `/etc/zshenv` become even more lightweight).
    Ma27 committed Jun 21, 2018
    Copy the full SHA
    6c66e15 View commit details
  4. git: remove object file from closure

    This file pulls in some big dependencies that are unneeded (like
    clang).
    matthewbauer committed Jun 21, 2018
    Copy the full SHA
    fc04807 View commit details

Commits on Jun 22, 2018

  1. Merge pull request #41614 from teto/flent_wrap

    [RFC/RDY] flent: add manpage + init http-getter
    matthewbauer authored Jun 22, 2018
    Copy the full SHA
    9185df5 View commit details
  2. jdupes: 1.9 -> 1.10.2

    peterhoeg committed Jun 22, 2018
    Copy the full SHA
    2cee0c4 View commit details
  3. Merge pull request #42356 from Ma27/fix-thefuck-module

    nixos/thefuck: move init scripts to `programs.*.interactiveShellInit`
    Mic92 authored Jun 22, 2018
    Copy the full SHA
    85b1312 View commit details
  4. Merge pull request #42346 from Ma27/fix-yabar

    yabar: fix build
    pSub authored Jun 22, 2018
    Copy the full SHA
    11a0d13 View commit details
  5. installer tests: avoid udisks2

    This is a temporary hack to fix channel until we resolve #42324.
    vcunat committed Jun 22, 2018
    Copy the full SHA
    a8c7103 View commit details
  6. Merge pull request #42268 from philandstuff/fix-dhall-json-1.2.0-deps

    dhall-json_1_2_0: fix dependencies
    peti authored Jun 22, 2018
    Copy the full SHA
    5cb4cdf View commit details
  7. Merge pull request #42349 from ElvishJerricco/fix-hoogle-null-deps

    Fix null deps in ghcWithHoogle
    peti authored Jun 22, 2018
    Copy the full SHA
    7489a76 View commit details
  8. Copy the full SHA
    db0da28 View commit details
Loading