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: 3768913cc9ec
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: c922e20b5d39
Choose a head ref
  • 12 commits
  • 17 files changed
  • 10 contributors

Commits on Sep 28, 2018

  1. haskellPackages.term-rewriting: doJailbreak and dontCheck 

    (cherry picked from commit 5c45ca0)
Backport of #47456
    @srhb
    srhb committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    0e0cd2f View commit details
    Browse the repository at this point in the history

  2. Add ssh backdoor to VM tests infrastructure. 

    Thanks to @dezgeg for prototype implementation, I've
cleaned it up and added documentation.

(cherry picked from commit d6e3db4)
Signed-off-by: Domen Kožar <domen@dev.si>
    @dezgeg @domenkozar
    dezgeg authored and domenkozar committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    a7fa8e1 View commit details
    Browse the repository at this point in the history

  3. linuxPackages.jool: 3.5.7 -> unstable-20180706 (#47284) 

    3.5.7 doesn't build with kernel 4.14.71.
Needs most recent upstream revision to build, which supports
kernels up to 4.17.

(cherry picked from commit f0e4b31)
    @xeji
    xeji committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    0c29a51 View commit details
    Browse the repository at this point in the history

  4. retroshare: mark as broken (#47350) 

    Broken by libupnp: 1.6.21 -> 1.8.3 (#41684).

(cherry picked from commit eeac44c)
    @orivej @xeji
    orivej authored and xeji committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    1e1821c View commit details
    Browse the repository at this point in the history

  5. systemd: don't restart user-runtime-dir@ on upgrades 

    Likewise logind we should not try to restart this service after upgrade,
the user's current session depends on it.

(cherry picked from commit aa69bb5)
    @Mic92
    Mic92 committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    1e9f50f View commit details
    Browse the repository at this point in the history

  6. ghcjs-*: Expose the version of GHC used 

    This is more meaningful than the GHCJS version for most tasks.
    @Ericson2314
    Ericson2314 committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    d892f1a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #47488 from obsidiansystems/ghcjs-ghc-version 

    ghcjs-*: Expose the version of GHC used
    @Ericson2314
    Ericson2314 committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    aab182e View commit details
    Browse the repository at this point in the history

  8. nixos/rspamd: Remove non-working socket activation 

    The socket activation I added to the rspamd module doesn't actually work
and can't be made to work without changes to rspamd.

See: #47421
See: rspamd/rspamd#2035
(cherry picked from commit 783a58f)
    @griff @xeji
    griff authored and xeji committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    3108f74 View commit details
    Browse the repository at this point in the history

  9. fox: mark broken on darwin 

        Undefined symbols for architecture x86_64:
      "_MPCreateSemaphore", referenced from:
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
      "_MPDeleteSemaphore", referenced from:
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
      "_MPSignalSemaphore", referenced from:
          FX::FXSemaphore::post() in FXThread.o
      "_MPWaitOnSemaphore", referenced from:
          FX::FXSemaphore::wait() in FXThread.o
          FX::FXSemaphore::trywait() in FXThread.o
    ld: symbol(s) not found for architecture x86_64

/cc ZHF #45961

(cherry picked from commit 6390b8b)
    @LnL7 @xeji
    LnL7 authored and xeji committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    c1f9ffc View commit details
    Browse the repository at this point in the history

  10. flpsed: mark linux only 

    Doesn't build on darwin and probably other platforms.

    GsWidget.H:26:3: error: 'Atom' does not name a type; did you mean 'tm'?
       Atom atoms[5];
       ^~~~
       tm
    GsWidget.cxx: In member function 'void GsWidget::setProps()':
    GsWidget.cxx:47:2: error: 'atoms' was not declared in this scope
      atoms[0] = XInternAtom(fl_display,"GHOSTVIEW" , false);
      ^~~~~

/cc ZHF #45961

(cherry picked from commit cd78d0c)
    @LnL7 @xeji
    LnL7 authored and xeji committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    e087e20 View commit details
    Browse the repository at this point in the history

  11. freedroidrpg: don't build on hydra 

    Similar to some other builds, sdl-config gets stuck and times out.

    checking for sdl-config... /nix/store/q2hm1ka0qxs2gv5bmrxj7j80lygk4b5z-SDL-1.2.15-dev/bin/sdl-config
    building of '/nix/store/m2d7v0n5hd2498vfxp18i37p7r1lf76p-freedroidrpg-0.16.1' timed out after 7200 seconds of silence

/cc ZHF #45961

(cherry picked from commit 9b99819)
    @LnL7 @xeji
    LnL7 authored and xeji committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    f5db056 View commit details
    Browse the repository at this point in the history

  12. exempi: patch CVE-2018-12648, enable tests on linux (#47496) 

    (cherry picked from commit e502c72)
    @symphorien @xeji
    symphorien authored and xeji committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    c922e20 View commit details
    Browse the repository at this point in the history