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: ade0eba99ddb
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: 6d035a9d10d9
Choose a head ref
  • 14 commits
  • 8 files changed
  • 11 contributors

Commits on Apr 25, 2020

  1. bluez-alsa: fix installation of D-Bus policy and alsa config

    This allows granting bluez-alsa access to the systemwide D-bus name
    lheckemann committed Apr 25, 2020
    Copy the full SHA
    3605fc7 View commit details

Commits on May 3, 2020

  1. Copy the full SHA
    cbb5b57 View commit details

Commits on May 12, 2020

  1. Copy the full SHA
    467a87b View commit details

Commits on May 19, 2020

  1. flow: 0.124.0 -> 0.125.1

    r-ryantm committed May 19, 2020
    Copy the full SHA
    e07f578 View commit details
  2. caf: 0.17.4 -> 0.17.5

    tobim committed May 19, 2020
    Copy the full SHA
    99f3fee View commit details
  3. janet: 1.8.1 -> 1.9.1

    r-ryantm committed May 19, 2020
    Copy the full SHA
    754562f View commit details
  4. Merge pull request #86643 from asbachb/zsh-bash-autocomplete

    zsh: added option to enable compatibility with bash's completion system
    Ma27 authored May 19, 2020
    Copy the full SHA
    5d0fc0f View commit details
  5. Merge pull request #88164 from tobim/pkgs/caf-0.17.5

    caf: 0.17.4 -> 0.17.5
    Mic92 authored May 19, 2020
    Copy the full SHA
    1a4a828 View commit details
  6. Merge pull request #87704 from veprbl/pr/cmake_32bit_workaround

    pkgsi686Linux.cmake: compile with _FILE_OFFSET_BITS=64 for 32-bit targets
    ttuegel authored May 19, 2020
    Copy the full SHA
    694d80b View commit details
  7. Merge pull request #88134 from r-ryantm/auto-update/flow

    flow: 0.124.0 -> 0.125.1
    marsam authored May 19, 2020
    Copy the full SHA
    dba512b View commit details
  8. Copy the full SHA
    f0bc522 View commit details
  9. Copy the full SHA
    6e195c2 View commit details
  10. Merge pull request #85991 from lheckemann/bluez-alsa-fix-dbus-policy

    bluez-alsa: fix installation of D-Bus policy and alsa config
    lheckemann authored May 19, 2020
    Copy the full SHA
    4b2dc0f View commit details
  11. Copy the full SHA
    6d035a9 View commit details
12 changes: 12 additions & 0 deletions nixos/modules/programs/zsh/zsh.nix
Original file line number Diff line number Diff line change
@@ -135,6 +135,13 @@ in
type = types.bool;
};

enableBashCompletion = mkOption {
default = false;
description = ''
Enable compatibility with bash's programmable completion system.
'';
type = types.bool;
};

enableGlobalCompInit = mkOption {
default = cfg.enableCompletion;
@@ -239,6 +246,11 @@ in
autoload -U compinit && compinit
''}
${optionalString cfg.enableBashCompletion ''
# Enable compatibility with bash's completion system.
autoload -U bashcompinit && bashcompinit
''}
# Setup custom interactive shell init stuff.
${cfge.interactiveShellInit}
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/janet/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "janet";
version = "1.8.1";
version = "1.9.1";

src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "1v2kgbx6w1ii83a1c9ridm1i52rmcjb0g1d23fhqn7hya5bwrhr6";
sha256 = "1zdiwddnppwg5zrizy2ypd449zj4mivib76h73xhvr1syl7dk7sc";
};

nativeBuildInputs = [ meson ninja ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/caf/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "actor-framework";
version = "0.17.4";
version = "0.17.5";

src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = version;
sha256 = "04p3kgk1zadadl6n0prwc77nfxrbdasbwbqpws1y9y6f77lrcxdn";
sha256 = "1w7sanxhh4sv4ap3ildqzlziazcy7ydx2pbjjrf3k60lcwq0lzn6";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/analysis/flow/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "flow";
version = "0.124.0";
version = "0.125.1";

src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "1isy67fx0lrszvkf3bw3pp8mzvcyab4qnssmv4kvvz32vls8gh25";
sha256 = "0c6ai2fcssys8xd445xxc0zdn3jz6kcy85mac1p89mnlqd1r1xk4";
};

installPhase = ''
5 changes: 5 additions & 0 deletions pkgs/development/tools/build-managers/cmake/default.nix
Original file line number Diff line number Diff line change
@@ -71,6 +71,11 @@ stdenv.mkDerivation rec {
"--docdir=share/doc/${pname}${version}"
] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
++ lib.optional (useQt4 || withQt5) "--qt-gui"
# Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568
++ lib.optionals stdenv.hostPlatform.is32bit [
"CFLAGS=-D_FILE_OFFSET_BITS=64"
"CXXFLAGS=-D_FILE_OFFSET_BITS=64"
]
++ [
"--"
# We should set the proper `CMAKE_SYSTEM_NAME`.
6 changes: 3 additions & 3 deletions pkgs/shells/zsh/oh-my-zsh/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:

stdenv.mkDerivation rec {
version = "2020-05-16";
version = "2020-05-18";
pname = "oh-my-zsh";
rev = "cbd6fbe7a7c3ef260f497704092dc43f2e953c3f";
rev = "4012df8fbb449bd551400c66f7602452bbae0bd1";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "1h7q68n9nbmv9rgvzcx5ciisw8gh5p3ka0bz0abhmk00xsinhy09";
sha256 = "0pd39fgz9zqkzgpgpjp59vwq1px2clbsn1rz0cy3mhk85fhdbais";
};

pathsToLink = [ "/share/oh-my-zsh" ];
4 changes: 2 additions & 2 deletions pkgs/tools/bluetooth/bluez-alsa/default.nix
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
++ optional aacSupport fdk_aac;

configureFlags = [
"--with-alsaplugindir=\$out/lib/alsa-lib"
"--with-dbusconfdir=\$out/etc/dbus-1"
"--with-alsaplugindir=${placeholder "out"}/lib/alsa-lib"
"--with-dbusconfdir=${placeholder "out"}/share/dbus-1/system.d"
"--enable-rfcomm"
"--enable-hcitop"
]
6 changes: 3 additions & 3 deletions pkgs/tools/text/ripgrep-all/default.nix
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@

rustPlatform.buildRustPackage rec {
pname = "ripgrep-all";
version = "0.9.5";
version = "0.9.6";

src = fetchFromGitHub {
owner = "phiresky";
repo = pname;
rev = "v${version}";
sha256 = "1nl03i36ilhxn5xbcry6pcr7vbl5667m43flpxaa0lf1wijzn5c2";
sha256 = "1wjpgi7m3lxybllkr3r60zaphp02ykq2syq72q9ail2760cjcir6";
};

cargoSha256 = "0ndyd8qrvljkk6yvpsp0w17iizxb529sh5q2bj790m32x0gz2w8l";
cargoSha256 = "0arwxqrpxdws4q1pnqzqkp1yv5aas08lkzh1vcgmf26j58sycniy";
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optional stdenv.isDarwin Security;