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: fc5c7f332533
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: 9149da788f9d
Choose a head ref
13 contributors

Commits on Sep 28, 2019

  1. python37Packages.azure-mgmt-network: 4.0.0 -> 5.0.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-network/versions
    @r-ryantm
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    6d38dc4 View commit details

  2. python37Packages.azure-mgmt-devtestlabs: 3.0.0 -> 4.0.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-devtestlabs/versions
    @r-ryantm
    r-ryantm committed Sep 28, 2019

    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
    aa48699 View commit details

  3. python37Packages.cupy: 6.2.0 -> 6.3.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-cupy/versions
    @r-ryantm
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    0feb3d4 View commit details

  4. python37Packages.django-allauth: 0.39.1 -> 0.40.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django-allauth/versions
    @r-ryantm
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    5f434d1 View commit details

Commits on Sep 29, 2019

  1. roundcube: 1.3.9 -> 1.3.10 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/roundcube/versions
    @r-ryantm
    r-ryantm committed Sep 29, 2019
    Copy the full SHA
    ad16672 View commit details

  2. zola: 0.8.0 -> 0.9.0

    @0x4A6F
    0x4A6F committed Sep 29, 2019
    Copy the full SHA
    a228951 View commit details

Commits on Sep 30, 2019

  1. llvmPackages_9.compiler-rt: remove crt patch 

    This doesn't apply because it was merged upstream.
    @arcnmx
    arcnmx committed Sep 30, 2019
    Copy the full SHA
    607a4a6 View commit details

  2. phpPackages.phpstan: 0.11.15 => 0.11.16

    @shyim
    shyim committed Sep 30, 2019
    Copy the full SHA
    f81fe34 View commit details

  3. Merge pull request #69789 from r-ryantm/auto-update/python3.7-django-… 

    …allauth

python37Packages.django-allauth: 0.39.1 -> 0.40.0
    Jon authored Sep 30, 2019
    Copy the full SHA
    ef909f0 View commit details

  4. Merge pull request #70066 from shyim/update-phpstan 

    phpPackages.phpstan: 0.11.15 => 0.11.16
    @etu
    etu authored Sep 30, 2019
    Copy the full SHA
    bcc5f08 View commit details

  5. Merge pull request #69942 from r-ryantm/auto-update/roundcube 

    roundcube: 1.3.9 -> 1.3.10
    @globin
    globin authored Sep 30, 2019
    Copy the full SHA
    d5a782e View commit details

  6. Merge pull request #70044 from arcnmx/compiler-rt-9 

    llvmPackages_9.compiler-rt: remove outdated crt patch
    @matthewbauer
    matthewbauer authored Sep 30, 2019
    Copy the full SHA
    7fd270e View commit details

  7. maintainers: add jonathanmarler

    @marler8997 @Lassulus
    marler8997 authored and Lassulus committed Sep 30, 2019
    Copy the full SHA
    5afde25 View commit details

  8. ocamlPackages.camlpdf: 2.2.1 → 2.3

    @vbgl
    vbgl committed Sep 30, 2019
    Copy the full SHA
    c2ef0a0 View commit details

  9. ocamlPackages.cpdf: 2.2.1 → 2.3

    @vbgl
    vbgl committed Sep 30, 2019
    Copy the full SHA
    2f43ae4 View commit details

  10. pythonPackages.supervisor: fix tests

    Jonathan Ringer committed Sep 30, 2019
    Copy the full SHA
    5d761d9 View commit details

  11. Merge pull request #70073 from jonringer/fix-supervisor 

    pythonPackages.supervisor: fix tests
    Jon authored Sep 30, 2019
    Copy the full SHA
    7587776 View commit details

  12. Merge pull request #69782 from r-ryantm/auto-update/python3.7-cupy 

    python37Packages.cupy: 6.2.0 -> 6.3.0
    Jon authored Sep 30, 2019
    Copy the full SHA
    c21ec6f View commit details

  13. Merge pull request #69781 from r-ryantm/auto-update/python3.7-azure-m… 

    …gmt-devtestlabs

python37Packages.azure-mgmt-devtestlabs: 3.0.0 -> 4.0.0
    Jon authored Sep 30, 2019
    Copy the full SHA
    9669dc6 View commit details

  14. Merge pull request #69772 from r-ryantm/auto-update/python3.7-azure-m… 

    …gmt-network

python37Packages.azure-mgmt-network: 4.0.0 -> 5.0.0
    Jon authored Sep 30, 2019
    Copy the full SHA
    140c301 View commit details

  15. kube3d: build as GoModule instead of GoPackage (#70062) 

    Also adds build flags version and k3sVersion. Previously it was using the default, dev and latest
    @jlesquembre @kalbasit
    jlesquembre authored and kalbasit committed Sep 30, 2019
    Copy the full SHA
    b2c12ab View commit details

  16. zola: 0.8.0 -> 0.9.0 (#70029) 

    zola: 0.8.0 -> 0.9.0
    @dywedir
    dywedir authored Sep 30, 2019
    Copy the full SHA
    9149da7 View commit details
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -3144,6 +3144,11 @@
githubId = 392720;
name = "Jon Banafato";
};
jonathanmarler = {
email = "johnnymarler@gmail.com";
github = "marler8997";
name = "Jonathan Marler";
};
jonathanreeve = {
email = "jon.reeve@gmail.com";
github = "JonathanReeve";
6 changes: 3 additions & 3 deletions pkgs/applications/misc/zola/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "zola";
version = "0.8.0";
version = "0.9.0";

src = fetchFromGitHub {
owner = "getzola";
repo = pname;
rev = "v${version}";
sha256 = "166kmlkzd1qyw9yq2jqs58z8b3d956jjhw9r15jzw98md949psr5";
sha256 = "0dbj2rkn4k5glnwdazsvjhah5pj9cbdb8hwlvm5q4njsmrgpyaw5";
};

cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24";
cargoSha256 = "0i0xqbpbv3md42d2853cfzkhfwlkvxahhz5dldla5x96rm1i2hr8";

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ]
16 changes: 12 additions & 4 deletions pkgs/applications/networking/cluster/kube3d/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
buildGoModule rec {
pname = "kube3d";
version = "1.3.1";
k3sVersion = "0.9.1";

goPackagePath = "github.com/rancher/k3d";

@@ -13,13 +14,20 @@ buildGoPackage rec {
sha256 = "0bdpjnzyxd6mdc1qv0ml89qds6305kn3wmyci2kv6g2y7r7wxvm2";
};

goDeps = ./deps.nix;
buildFlagsArray = ''
-ldflags=
-w -s
-X github.com/rancher/k3d/version.Version=${version}
-X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion}
'';

modSha256 = "1qadf3gc2626l4jpad4lzi649nh8if9m6fgs2cf46r1nish16h95";

meta = with stdenv.lib; {
homepage = "https://github.com/rancher/k3d";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ kuznero ];
maintainers = with maintainers; [ kuznero jlesquembre ];
};
}
174 changes: 0 additions & 174 deletions pkgs/applications/networking/cluster/kube3d/deps.nix
View file

This file was deleted.

3 changes: 1 addition & 2 deletions pkgs/development/compilers/llvm/9/compiler-rt.nix
View file
Original file line number Diff line number Diff line change
@@ -36,8 +36,7 @@ stdenv.mkDerivation rec {

patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch;
];# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch

# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
Loading