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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6df405b654f4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 74e217e6af5e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 28, 2019

  1. conda: Remove version suffix 

    Currently the `conda-shell` binary is installed as
`conda-shell-4.6.14` which is not very friendly to type.

With this change the binary is simply installed as `conda-shell`.
    @adisbladis
    adisbladis committed Jun 28, 2019
    Copy the full SHA
    8a1c8e6 View commit details

  2. pythonPackages.datadog: 0.26.0 -> 0.29.3

    @adisbladis
    adisbladis committed Jun 28, 2019
    Copy the full SHA
    74e217e View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/development/python-modules/datadog/default.nix
  2. +1 −1 pkgs/tools/package-management/conda/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/datadog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

buildPythonPackage rec {
pname = "datadog";
version = "0.26.0";
version = "0.29.3";

src = fetchPypi {
inherit pname version;
sha256 = "cbaa6b4b2b88fd552605e6730f60d5437017bb76d6b701432eaafbc983735b79";
sha256 = "0p47hy1p2hf233blalyz0yr6nf13iwk9ndkqdk428dmf8b8m2plr";
};

postPatch = ''
2 changes: 1 addition & 1 deletion pkgs/tools/package-management/conda/default.nix
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ let
'';
in
buildFHSUserEnv {
name = "conda-shell-${version}";
name = "conda-shell";
targetPkgs = pkgs: (builtins.concatLists [ [ conda ] condaDeps extraPkgs]);
profile = ''
# Add conda to PATH