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: db59e9405948
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: c1ec8ba2442c
Choose a head ref
  • 16 commits
  • 15 files changed
  • 7 contributors

Commits on Dec 9, 2019

  1. fusuma: 0.10.2 -> 1.3.0

    Br1ght0ne committed Dec 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    Copy the full SHA
    9299ee0 View commit details
  2. Copy the full SHA
    af4f2e3 View commit details

Commits on Dec 16, 2019

  1. coredns: 1.3.1 -> 1.6.6

    Br1ght0ne committed Dec 16, 2019
    Copy the full SHA
    03aa4ac View commit details
  2. hydroxide: init at 0.2.11

    Br1ght0ne committed Dec 16, 2019
    Copy the full SHA
    2318f7f View commit details
  3. croc: 6.4.6 -> 6.4.7

    equirosa committed Dec 16, 2019
    Copy the full SHA
    93a51b8 View commit details

Commits on Dec 17, 2019

  1. cocoapods-beta: 1.8.4 -> 1.9.0.beta.1

    Lily Ballard committed Dec 17, 2019
    Copy the full SHA
    ab9bdca View commit details
  2. ruby-modules: parse build_flags correctly:

    In building a gem whose native extension is a Rakefile, the previous
    version of this code will call essentially `rake ""`, when it means to
    call `rake`.
    
    This change converts `""` into `[]` rather than `[""]`.
    burke authored and alyssais committed Dec 17, 2019
    Copy the full SHA
    62e680c View commit details
  3. Copy the full SHA
    56a206e View commit details
  4. pythonPackages.casbin: init at 0.8.3

    costrouc authored and Jon committed Dec 17, 2019
    Copy the full SHA
    9b372dc View commit details
  5. Revert "python: gym: 0.15.3 -> 0.15.4"

    0.15.4 requires python-opencv, which isn't packaged yet,
    and is not trival to package
    
    This reverts commit 8ee4062.
    Jonathan Ringer committed Dec 17, 2019
    Copy the full SHA
    ef3756f View commit details
  6. Merge pull request #75806 from lilyball/cocoapods-beta

    cocoapods-beta: 1.8.4 -> 1.9.0.beta.1
    marsam authored Dec 17, 2019
    Copy the full SHA
    535eba7 View commit details
  7. Merge pull request #75775 from equirosa/croc

    croc: 6.4.6 -> 6.4.7
    marsam authored Dec 17, 2019
    Copy the full SHA
    4419653 View commit details
  8. Merge pull request #75756 from filalex77/coredns-1.6.6

    coredns: 1.3.1 -> 1.6.6
    marsam authored Dec 17, 2019
    Copy the full SHA
    df10128 View commit details
  9. Merge pull request #75768 from filalex77/hydroxide-0.2.11

    hydroxide: init at 0.2.11
    marsam authored Dec 17, 2019
    Copy the full SHA
    f95f587 View commit details
  10. Merge pull request #75404 from filalex77/fusuma-1.3.0

    fusuma: 0.10.2 -> 1.3.0
    marsam authored Dec 17, 2019
    Copy the full SHA
    26eecab View commit details
  11. Merge pull request #75809 from marsam/update-gauche

    gauche: 0.9.8 -> 0.9.9
    marsam authored Dec 17, 2019
    Copy the full SHA
    c1ec8ba View commit details
33 changes: 33 additions & 0 deletions pkgs/applications/networking/hydroxide/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:

buildGoModule rec {
pname = "hydroxide";
version = "0.2.11";

src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "0rn35iyli80kgj3yn93lrx0ybgc8fhvmkvx1d18ill7r4cmavand";
};

modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp";

# FIXME: remove with next release
patches = [
(fetchpatch {
url = "https://github.com/emersion/hydroxide/commit/80e0fa6f3e0154338fb0af8a82ca32ae6281dd15.patch";
sha256 = "1xi0clzgz14a7sxnwr0li7sz9p05sfh3zh5iqg2qz5f415k9jknj";
})
];

subPackages = [ "cmd/hydroxide" ];

meta = with lib; {
description = "A third-party, open-source ProtonMail bridge";
homepage = "https://github.com/emersion/hydroxide";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
platforms = platforms.unix;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/gauche/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
pname = "gauche";
version = "0.9.8";
version = "0.9.9";

src = fetchurl {
url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
sha256 = "0jxp1ladpy8kvfvk561c64spf1c3d6giqla6zscqkd6qa480vcry";
sha256 = "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac";
};

nativeBuildInputs = [ pkgconfig texinfo ];
27 changes: 17 additions & 10 deletions pkgs/development/mobile/cocoapods/Gemfile-beta.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.1)
CFPropertyList (3.0.2)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
@@ -12,10 +12,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.8.4)
cocoapods (1.9.0.beta.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.8.4)
cocoapods-core (= 1.9.0.beta.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -30,15 +30,17 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.11.1, < 2.0)
cocoapods-core (1.8.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.0.beta.1)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-downloader (1.3.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
@@ -50,23 +52,28 @@ GEM
colored2 (3.1.2)
concurrent-ruby (1.1.5)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.11.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.2.0)
minitest (5.12.2)
json (2.3.0)
minitest (5.13.0)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.13.0)
xcodeproj (1.14.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
@@ -80,4 +87,4 @@ DEPENDENCIES
cocoapods (>= 1.7.0.beta.1)!

BUNDLED WITH
1.17.2
1.17.3
62 changes: 47 additions & 15 deletions pkgs/development/mobile/cocoapods/gemset-beta.nix
Original file line number Diff line number Diff line change
@@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf";
type = "gem";
};
version = "3.0.1";
version = "3.0.2";
};
claide = {
groups = ["default"];
@@ -57,21 +57,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "007ssx75588ji2d8l8s6c95dng1c7b6yacng8nngpy7maijzjgzc";
sha256 = "14447zrbg90gvjhfpwmjsfh4n7i9f0p1zd0jj3m2cx4y8102djiy";
type = "gem";
};
version = "1.8.4";
version = "1.9.0.beta.1";
};
cocoapods-core = {
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"];
dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zcisqb404828n5d3lbk9y2yyx8v2yr6rk1l8y9a4i1hp743fiad";
sha256 = "0nhrqwrvblpgf4k3cy0nyxfphyzw46zql1pdv1x7y42h4cn5z8qp";
type = "gem";
};
version = "1.8.4";
version = "1.9.0.beta.1";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -88,10 +88,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3";
sha256 = "08vn0pgcyn6w6fq5xjd7szv2h9s5rzl17kyidnd7fl5qdmzc9c54";
type = "gem";
};
version = "1.2.2";
version = "1.3.0";
};
cocoapods-plugins = {
dependencies = ["nap"];
@@ -175,6 +175,27 @@
};
version = "0.0.4";
};
ethon = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9";
type = "gem";
};
version = "0.12.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd";
type = "gem";
};
version = "1.11.3";
};
fourflusher = {
groups = ["default"];
platforms = [];
@@ -231,20 +252,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
type = "gem";
};
version = "2.2.0";
version = "2.3.0";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zjm24aiz42i9n37mcw8lydd7n0y7wfk27by06jx77ypcld3qvkw";
sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
type = "gem";
};
version = "5.12.2";
version = "5.13.0";
};
molinillo = {
groups = ["default"];
@@ -306,6 +327,17 @@
};
version = "0.3.6";
};
typhoeus = {
dependencies = ["ethon"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
type = "gem";
};
version = "1.3.1";
};
tzinfo = {
dependencies = ["thread_safe"];
groups = ["default"];
@@ -323,9 +355,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c69yrhqd92q6nnpyhvnqyw9l7axnc91gnbd2gai8f5njdisd8wx";
sha256 = "1h9iba53mrb663qdqzpfbdwkwzqv7hndd0df71yr2kj2hzwjmkvb";
type = "gem";
};
version = "1.13.0";
version = "1.14.0";
};
}
40 changes: 40 additions & 0 deletions pkgs/development/python-modules/casbin/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, simpleeval
, isPy27
, coveralls
}:

buildPythonPackage rec {
pname = "casbin";
version = "0.8.3";

disabled = isPy27;

src = fetchFromGitHub {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
sha256 = "1s89m62933m4wprsknwhabgg7irykrcimv80hh2zkyyslz5vbq71";
};

propagatedBuildInputs = [
simpleeval
];

checkInputs = [
coveralls
];

checkPhase = ''
coverage run -m unittest discover -s tests -t tests
'';

meta = with lib; {
description = "An authorization library that supports access control models like ACL, RBAC, ABAC in Python";
homepage = https://github.com/casbin/pycasbin;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/gym/default.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

buildPythonPackage rec {
pname = "gym";
version = "0.15.4";
version = "0.15.3";

src = fetchPypi {
inherit pname version;
sha256 = "3b930cbe1c76bbd30455b5e82ba723dea94159a5f988e927f443324bf7cc7ddd";
sha256 = "18381e13bbd1e2f206a1b88a2af4fb87affd7d06ee7955a6e5e6a79478a9adfc";
};

postPatch = ''
5 changes: 3 additions & 2 deletions pkgs/development/ruby-modules/gem/nix-bundle-install.rb
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
require 'fileutils'
require 'pathname'
require 'tmpdir'
require 'shellwords'

if defined?(Encoding.default_internal)
Encoding.default_internal = Encoding::UTF_8
@@ -31,7 +32,7 @@
type = ARGV[0]
name = ARGV[1]
version = ARGV[2]
build_flags = ARGV[3]
build_flags = Shellwords.split(ARGV[3])
if type == "git"
uri = ARGV[4]
REPO = ARGV[5]
@@ -117,7 +118,7 @@ def copy_to(destination, submodules=false)
source = Bundler::Source::Path.new(options)
end
spec = source.specs.search_all(name).first
Bundler.rubygems.with_build_args [build_flags] do
Bundler.rubygems.with_build_args build_flags do
source.install(spec)
end

14 changes: 7 additions & 7 deletions pkgs/servers/dns/coredns/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
buildGoModule rec {
pname = "coredns";
version = "1.3.1";
version = "1.6.6";

goPackagePath = "github.com/coredns/coredns";

src = fetchFromGitHub {
owner = "coredns";
repo = "coredns";
rev = "v${version}";
sha256 = "0aflm0c3qcjcq4dy7yx9f5xlvdm4k0b2awsp3qvbfgyp74by0584";
sha256 = "1x8sgchp0kkk5xdharjrq29qxgv1mdzrw3f12s2kchgqf1m6r0sx";
};

goDeps = ./deps.nix;
modSha256 = "10ljggg1g5x00gpgzc5m29n1k5akf0s0g3hkdh8adcbrcz0pgr5c";

meta = with stdenv.lib; {
homepage = https://coredns.io;
homepage = "https://coredns.io";
description = "A DNS server that runs middleware";
license = licenses.asl20;
maintainers = [ maintainers.rushmorem maintainers.rtreffer maintainers.deltaevo ];
maintainers = with maintainers; [ rushmorem rtreffer deltaevo ];
};
}
Loading