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

Commits on Jan 10, 2020

  1. pythonPackages.omegaconf: init at 1.4.1

    @bcdarwin
    bcdarwin authored and Jon committed Jan 10, 2020
    Copy the full SHA
    60c03fb View commit details

  2. pythonPackages.hydra: init at 1.4.1

    @bcdarwin
    bcdarwin authored and Jon committed Jan 10, 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
    ee7d45c View commit details
Showing with 58 additions and 0 deletions.
  1. +29 −0 pkgs/development/python-modules/hydra/default.nix
  2. +25 −0 pkgs/development/python-modules/omegaconf/default.nix
  3. +4 −0 pkgs/top-level/python-packages.nix
29 changes: 29 additions & 0 deletions pkgs/development/python-modules/hydra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytest, omegaconf, pathlib2 }:

buildPythonPackage rec {
pname = "hydra";
version = "0.11.3";

src = fetchFromGitHub {
owner = "facebookresearch";
repo = pname;
rev = version;
sha256 = "0plbls65qfrvvigza3qvy0pwjzgkz8ylpgb1im14k3b125ny41ad";
};

checkInputs = [ pytest ];
propagatedBuildInputs = [ omegaconf ] ++ lib.optional isPy27 pathlib2;

checkPhase = ''
runHook preCheck
pytest tests/
runHook postCheck
'';

meta = with lib; {
description = "A framework for configuring complex applications";
homepage = https://hydra.cc;
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
};
}
25 changes: 25 additions & 0 deletions pkgs/development/python-modules/omegaconf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }:

buildPythonPackage rec {
pname = "omegaconf";
version = "1.4.1";

src = fetchFromGitHub {
owner = "omry";
repo = pname;
rev = version;
sha256 = "1vpcdjlq54pm8xmkv2hqm2n1ysvz2a9iqgf55x0w6slrb4595cwb";
};

checkInputs = [ pytest ];
buildInputs = [ pytestrunner ];
propagatedBuildInputs = [ pyyaml six ] ++ stdenv.lib.optional isPy27 pathlib2;

meta = with stdenv.lib; {
description = "A framework for configuring complex applications";
homepage = "https://github.com/omry/omegaconf";
license = licenses.free; # prior bsd license (1988)
maintainers = with maintainers; [ bcdarwin ];
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3737,6 +3737,8 @@ in {

hvac = callPackage ../development/python-modules/hvac { };

hydra = callPackage ../development/python-modules/hydra { };

hypothesis = callPackage ../development/python-modules/hypothesis { };

colored = callPackage ../development/python-modules/colored { };
@@ -4402,6 +4404,8 @@ in {

od = callPackage ../development/python-modules/od { };

omegaconf = callPackage ../development/python-modules/omegaconf { };

orderedset = callPackage ../development/python-modules/orderedset { };

python-multipart = callPackage ../development/python-modules/python-multipart { };