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

Commits on May 28, 2020

  1. maintainers: add veehaitch

    @veehaitch
    veehaitch authored and Jon committed May 28, 2020
    Copy the full SHA
    4a4f5cd View commit details

  2. pythonPackages.hiyapyco: init at 0.4.16

    @veehaitch
    veehaitch authored and Jon committed May 28, 2020
    Copy the full SHA
    3547984 View commit details
Showing with 44 additions and 0 deletions.
  1. +10 −0 maintainers/maintainer-list.nix
  2. +32 −0 pkgs/development/python-modules/hiyapyco/default.nix
  3. +2 −0 pkgs/top-level/python-packages.nix
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -8177,6 +8177,16 @@
githubId = 6508;
name = "Vincent Demeester";
};
veehaitch = {
name = "Vincent Haupert";
email = "mail@vincent-haupert.de";
github = "veehaitch";
githubId = 15069839;
keys = [{
longkeyid = "rsa4096/0x874BD6F916FAA742";
fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742";
}];
};
velovix = {
email = "xaviosx@gmail.com";
github = "velovix";
32 changes: 32 additions & 0 deletions pkgs/development/python-modules/hiyapyco/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyyaml
, jinja2
}:

buildPythonPackage rec {
pname = "HiYaPyCo";
version = "0.4.16";

src = fetchFromGitHub {
owner = "zerwes";
repo = pname;
rev = "release-${version}";
sha256 = "1ams9dp05yhgbg6255wrjgchl2mqg0s34d8b8prvql9lsh59s1fj";
};

propagatedBuildInputs = [ pyyaml jinja2 ];

checkPhase = ''
set -e
find test -name 'test_*.py' -exec python {} \;
'';

meta = with lib; {
description = "A simple python lib allowing hierarchical overlay of config files in YAML syntax, offering different merge methods and variable interpolation based on jinja2.";
homepage = "https://github.com/zerwes/hiyapyco";
license = licenses.gpl3;
maintainers = with maintainers; [ veehaitch ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -813,6 +813,8 @@ in {

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

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

hocr-tools = callPackage ../development/python-modules/hocr-tools { };

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