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: a40c69ed4768
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: af8a177463c3
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 15, 2020

  1. pythonPackages.korean-lunar-calendar: init at 0.2.1 

    (cherry picked from commit cf5a892)
    @risicle
    risicle authored and Jon committed Sep 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8ef4ff9 View commit details

  2. pythonPackages.holidays: fix build by adding korean-lunar-calendar de… 

    …pendency

(cherry picked from commit 9fb14d8)
    @risicle
    risicle authored and Jon committed Sep 15, 2020
    Copy the full SHA
    4c1163d View commit details

  3. caddy1: fix build (#97988) 

    main.go gets overwritten in order to build caddy with telemetry
disabled, but the global variable `run` got neglected, and this in turn
broke the test in caddy/main_test.go.

This commit fixes that, and build can now complete.

(cherry picked from commit c814b0e)
    @panchoh
    panchoh authored and Jon committed Sep 15, 2020
    Copy the full SHA
    af8a177 View commit details
17 changes: 15 additions & 2 deletions pkgs/development/python-modules/holidays/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, six, dateutil, convertdate }:
{ stdenv
, buildPythonPackage
, fetchPypi
, convertdate
, dateutil
, korean-lunar-calendar
, six
}:

buildPythonPackage rec {
pname = "holidays";
@@ -9,7 +16,13 @@ buildPythonPackage rec {
sha256 = "839281f2b1ae7ac576da7951472482f6e714818296853107ea861fa60f5013cc";
};

propagatedBuildInputs = [ six dateutil convertdate ];
propagatedBuildInputs = [
convertdate
dateutil
korean-lunar-calendar
six
];
pythonImportsCheck = [ "holidays" ];

meta = with stdenv.lib; {
homepage = "https://github.com/dr-prodigy/python-holidays";
25 changes: 25 additions & 0 deletions pkgs/development/python-modules/korean-lunar-calendar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:

buildPythonPackage rec {
pname = "korean-lunar-calendar";
version = "0.2.1";

src = fetchPypi {
inherit version;
pname = "korean_lunar_calendar";
sha256 = "0p97r21298ipgvsqh978aq2n6cvybzp8bskcvj15mm1f76qm9khj";
};

# no real tests
pythonImportsCheck = [ "korean_lunar_calendar" ];

meta = with stdenv.lib; {
description = "A library to convert Korean lunar-calendar to Gregorian calendar.";
homepage = "https://github.com/usingsky/korean_lunar_calendar_py";
license = licenses.mit;
maintainers = [ maintainers.ris ];
};
}
3 changes: 2 additions & 1 deletion pkgs/servers/caddy/v1.nix
View file
Original file line number Diff line number Diff line change
@@ -21,9 +21,10 @@ buildGoModule rec {
cat << EOF > caddy/main.go
package main
import "github.com/caddyserver/caddy/caddy/caddymain"
var run = caddymain.Run // replaced for tests
func main() {
caddymain.EnableTelemetry = false
caddymain.Run()
run()
}
EOF
'';
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3191,6 +3191,8 @@ in {

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

korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { };

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

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