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: bc7ec9b65187
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: 4c4aff329371
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 18, 2018

  1. datadog-integrtaions-core: 2018-05-27 -> 2018-09-18 

    (cherry picked from commit 943871a)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Sep 18, 2018
    Copy the full SHA
    68c9569 View commit details

  2. nixos/activation: Switch from bash to sh to avoid reading users bash … 

    …config (#46851)

This fixes #46750. This should also work with non-POSIX shells like in #46042.

(cherry picked from commit 5664e64)
    @etu @xeji
    etu authored and xeji committed Sep 18, 2018
    Copy the full SHA
    4c4aff3 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 nixos/modules/system/activation/top-level.nix
  2. +3 −3 pkgs/tools/networking/dd-agent/integrations-core.nix
2 changes: 1 addition & 1 deletion nixos/modules/system/activation/top-level.nix
View file
Original file line number Diff line number Diff line change
@@ -115,7 +115,7 @@ let

inherit (pkgs) utillinux coreutils;
systemd = config.systemd.package;
inherit (pkgs.stdenv) shell;
shell = "${pkgs.bash}/bin/sh";

inherit children;
kernelParams = config.boot.kernelParams;
6 changes: 3 additions & 3 deletions pkgs/tools/networking/dd-agent/integrations-core.nix
View file
Original file line number Diff line number Diff line change
@@ -41,10 +41,10 @@ let
src = pkgs.fetchFromGitHub {
owner = "DataDog";
repo = "integrations-core";
rev = "7be76e73969a8b9c993903681b300e1dd32f4b4d";
sha256 = "1qsqzm5iswgv9jrflh5mvbz9a7js7jf42cb28lzdzsp45iwfs2aa";
rev = "7e9bebbb5b79ac30c16814ecefdc8f5c63cb4ea4";
sha256 = "0yi7dlbd0rkzzl8cag713r86f40vl87aqrj97ral58csnnj7vfzb";
};
version = "git-2018-05-27";
version = "git-2018-09-18";

# Build helper to build a single datadog integration package.
buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // {