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: 7010635ac274
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: d95513b710ba
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Mar 9, 2020

  1. [20.03] procs: 0.9.6 -> 0.9.18 

    (cherry picked from commit c882a90)
    @bhipple
    bhipple committed Mar 9, 2020
    Copy the full SHA
    e76d4a0 View commit details

  2. Merge pull request #82126 from bhipple/bp/procs 

    [20.03] procs: 0.9.6 -> 0.9.18
    @marsam
    marsam authored Mar 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0b5f073 View commit details

  3. python3Packages.acoustics: 0.2.3 -> 0.2.4 

    (cherry picked from commit 634ab6f)
    @FRidh
    FRidh committed Mar 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d95513b View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/development/python-modules/acoustics/default.nix
  2. +3 −3 pkgs/tools/admin/procs/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/acoustics/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@

buildPythonPackage rec {
pname = "acoustics";
version = "0.2.3";
version = "0.2.4";

checkInputs = [ pytest ];
propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ];

src = fetchPypi {
inherit pname version;
sha256 = "ca663059d61fbd2899aed4e3cedbc3f983aa67afd3ae1617db3c59b724206fb3";
sha256 = "8ccb68ac258ba81a0b9064523e85eae013f9bfce7244d01db42d7d2d21d712cc";
};

checkPhase = ''
6 changes: 3 additions & 3 deletions pkgs/tools/admin/procs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "procs";
version = "0.9.6";
version = "0.9.18";

src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
sha256 = "06q18ynb4r9dcxc690291z9vvll9rfpc8j1gkkgfav2f1xdndzq3";
sha256 = "0bqaj4a56h26sgiw2r453k6f252sy6lrb71ammr0ki3bqqqjhvdi";
};

cargoSha256 = "11wv02nn6gp32zzcd6kmsh6ky0dzyk1qqhb5vxvmq2nxhxjlddwv";
cargoSha256 = "1fvb2gk7ab799d16fiq0sb0fxs5ha1jg38wfm58k15nnn5c1hmrc";

buildInputs = stdenv.lib.optional stdenv.isDarwin Security;