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: e14d5a2cf125
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: 2eacb6035357
Choose a head ref
  • 6 commits
  • 5 files changed
  • 5 contributors

Commits on Sep 2, 2020

  1. ibm-plex: 5.1.0 -> 5.1.3

    marsam committed Sep 2, 2020
    Copy the full SHA
    de5d2d6 View commit details
  2. python3Packages.phonopy: fix build and tests

    Jonathan Ringer committed Sep 2, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jonringer Jonathan Ringer
    Copy the full SHA
    135a6f8 View commit details

Commits on Sep 3, 2020

  1. Merge pull request #96943 from marsam/update-ibm-plex

    ibm-plex: 5.1.0 -> 5.1.3
    marsam authored Sep 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d6c7a19 View commit details
  2. terraform_0_13: 0.13.1 -> 0.13.2 (#96971)

    Diego Rodriguez authored Sep 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8761381 View commit details
  3. Merge pull request #96501 from jonringer/fix-phonopy

    python3Packages.phonopy: fix build and tests
    risicle authored Sep 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    55e8cbd View commit details
  4. goreplay: init at 1.1.0

    lovek323 authored and zowoq committed Sep 3, 2020
    Copy the full SHA
    2eacb60 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/terraform/default.nix
Original file line number Diff line number Diff line change
@@ -132,8 +132,8 @@ in rec {
});

terraform_0_13 = pluggable (generic {
version = "0.13.1";
sha256 = "0a2sjjb79ziv42ifhplpkvqgsg8gxvr1wdgkhdj59dwahqv64pm2";
version = "0.13.2";
sha256 = "04pm57l29j3ai6dvh2343q4yhskkxqj8ayr2hdw2qqjch52p8mrw";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
4 changes: 2 additions & 2 deletions pkgs/data/fonts/ibm-plex/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, fetchzip }:

let
version = "5.1.0";
version = "5.1.3";

in fetchzip {
name = "ibm-plex-${version}";
@@ -13,7 +13,7 @@ in fetchzip {
unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
'';

sha256 = "1lcbj6zkpnsq38s2xkx3z4d7bd43k630lmzmgdcv1w05gjij0pw5";
sha256 = "0w07fkhav2lqdyki7ipnkpji5ngwarlhsyliy0ip7cd29x24ys5h";

meta = with lib; {
description = "IBM Plex Typeface";
18 changes: 9 additions & 9 deletions pkgs/development/python-modules/phonopy/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py }:
{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }:

buildPythonPackage rec {
pname = "phonopy";
@@ -9,15 +9,15 @@ buildPythonPackage rec {
sha256 = "482c6ff29c058d091ac885e561e28ba3e516ea9e91c44a951cad11f3ae19856c";
};

propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ];
propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ];

checkPhase = ''
cd test
# dynamic structure factor test ocassionally fails do to roundoff
# see issue https://github.com/atztogo/phonopy/issues/79
rm spectrum/test_dynamic_structure_factor.py
${python.interpreter} -m unittest discover -b
cd ../..
checkInputs = [ pytestCheckHook ];
# flakey due to floating point inaccuracy
disabledTests = [ "test_NaCl" ];

# prevent pytest from importing local directory
preCheck = ''
rm -r phonopy
'';

meta = with stdenv.lib; {
26 changes: 26 additions & 0 deletions pkgs/tools/networking/goreplay/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ stdenv, buildGoPackage, fetchFromGitHub, libpcap }:

buildGoPackage rec {
pname = "goreplay";
version = "1.1.0";
rev = "v${version}";

goPackagePath = "github.com/buger/goreplay";

src = fetchFromGitHub {
inherit rev;
owner = "buger";
repo = "goreplay";
sha256 = "07nsrx5hwmk6l8bqp48gqk40i9bxf0g4fbmpqbngx6j5f7lpbk2n";
};

buildInputs = [ libpcap ];

meta = {
homepage = "https://github.com/buger/goreplay";
license = stdenv.lib.licenses.lgpl3Only;
description = "GoReplay is an open-source tool for capturing and replaying live HTTP traffic.";
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ lovek323 ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -4062,6 +4062,8 @@ in

gopro = callPackage ../tools/video/gopro { };

goreplay = callPackage ../tools/networking/goreplay { };

gource = callPackage ../applications/version-management/gource { };

govc = callPackage ../tools/virtualization/govc { };