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: f52e3212cb43
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: a4082cca757f
Choose a head ref
  • 20 commits
  • 20 files changed
  • 11 contributors

Commits on Jul 15, 2020

  1. tor: 0.4.3.5 -> 0.4.3.6

    @r-ryantm
    r-ryantm committed Jul 15, 2020
    Copy the full SHA
    90007b5 View commit details

Commits on Jul 23, 2020

  1. kube3d 1.7.0 -> 3.0.0

    David Arnold committed Jul 23, 2020
    Copy the full SHA
    8edebc8 View commit details

  2. kub3d: add shell completions

    David Arnold committed Jul 23, 2020
    Copy the full SHA
    7f8171b View commit details

  3. kube3d: fix verion prefix tu pull correct image 

    docker pull rancher/k3d-proxy:3.0.0
Error response from daemon: manifest for rancher/k3d-proxy:3.0.0 not found: manifest unknown: manifest unknown

vs

docker pull rancher/k3d-proxy:v3.0.0
v3.0.0: Pulling from rancher/k3d-proxy

The version tag selects the image tag.
    David Arnold committed Jul 23, 2020
    Copy the full SHA
    850d284 View commit details

Commits on Jul 28, 2020

  1. Merge pull request #93680 from xoe-labs/da-kube3d-update 

    kube3d 1.7.0 -> 3.0.0
    @timokau
    timokau authored Jul 28, 2020

    Partially verified

    This commit is signed with the committer’s verified signature. The key has expired.
    marsam’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    09e7fb1 View commit details

  2. xxHash: 0.7.4 -> 0.8.0 (#94051)

    @orivej
    orivej authored Jul 28, 2020
    Copy the full SHA
    f8369ba View commit details

  3. python3Packages.mautrix: 0.5.7 -> 0.5.8 

    https://pypi.org/project/mautrix/0.6.0/
    @Ma27
    Ma27 committed Jul 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    colemickens Cole Mickens
    GPG key ID: B475C2955744A019
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c800307 View commit details

  4. mautrix-telegram: 0.8.1 -> 0.8.2 

    https://github.com/tulir/mautrix-telegram/releases/tag/v0.8.2
    @Ma27
    Ma27 committed Jul 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    colemickens Cole Mickens
    GPG key ID: B475C2955744A019
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9c6503a View commit details

  5. element-web: 1.7.1 -> 1.7.2 

    https://github.com/vector-im/riot-web/releases/tag/v1.7.2
    @Ma27
    Ma27 committed Jul 28, 2020
    Copy the full SHA
    0da5788 View commit details

  6. element-desktop: 1.7.1 -> 1.7.2 

    https://github.com/vector-im/riot-desktop/releases/tag/v1.7.2
    @Ma27
    Ma27 committed Jul 28, 2020
    Copy the full SHA
    ad75463 View commit details

  7. pythonPackages.urwid: 2.1.0 -> 2.1.1

    @veehaitch @FRidh
    veehaitch authored and FRidh committed Jul 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    colemickens Cole Mickens
    GPG key ID: B475C2955744A019
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5a845cd View commit details

  8. linux: 5.8-rc6 -> 5.8-rc7

    @NeQuissimus
    NeQuissimus committed Jul 28, 2020
    Copy the full SHA
    931c554 View commit details

  9. aml: init at 0.1.0

    @primeos
    primeos committed Jul 28, 2020
    Copy the full SHA
    2f56b88 View commit details

  10. neatvnc: 0.1.0 -> 0.2.0

    @primeos
    primeos committed Jul 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: F44F23D596B4F71D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    715cd6c View commit details

  11. wayvnc: 0.1.2 -> 0.2.0

    @primeos
    primeos committed Jul 28, 2020
    Copy the full SHA
    2f641ec View commit details

  12. pythonPackages.webdavclient3: init at 3.14.5

    @dmrauh
    dmrauh committed Jul 28, 2020
    Copy the full SHA
    5a680ef View commit details

  13. Merge pull request #93162 from r-ryantm/auto-update/tor 

    tor: 0.4.3.5 -> 0.4.3.6
    @mweinelt
    mweinelt authored Jul 28, 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
    d965a55 View commit details

  14. github-actions: increase timeout to wait for ofborg

    @Mic92
    Mic92 committed Jul 28, 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
    13f1c23 View commit details

  15. Merge pull request #94070 from dmrauh/add/webdavclient3 

    pythonPackages.webdavclient3: init at 3.14.5
    @mweinelt
    mweinelt authored Jul 28, 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
    83f41b7 View commit details

  16. Merge pull request #94076 from primeos/wayvnc 

    wayvnc: 0.1.2 -> 0.2.0, neatvnc: 0.1.0 -> 0.2.0, aml: init at 0.1.0
    @primeos
    primeos authored Jul 28, 2020
    Copy the full SHA
    a4082cc View commit details
6 changes: 3 additions & 3 deletions .github/workflows/wait-ofborg.yml
View file
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@ jobs:
steps:
- name: Wait for ofborg CI
run: |
# wait for ~10min
set -x
for i in $(seq 120); do
# wait for ~30min...
# ..in future a better fix would be to make ofborg mark CI as pending right away.
for i in $(seq 260); do
res=$(curl --silent \
-H "Accept: application/vnd.github.antiope-preview+json" \
-H "Authorization: token ${GITHUB_TOKEN}" \
21 changes: 15 additions & 6 deletions pkgs/applications/networking/cluster/kube3d/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:

buildGoModule rec {
pname = "kube3d";
version = "1.7.0";
k3sVersion = "1.17.3-k3s1";
version = "3.0.0";
k3sVersion = "1.18.6-k3s1";

goPackagePath = "github.com/rancher/k3d";
excludedPackages = ''tools'';

src = fetchFromGitHub {
owner = "rancher";
repo = "k3d";
rev = "v${version}";
sha256 = "0aij2l7zmg4cxbw7pwf7ddc64di25hpjvbmp1madhz9q28rwfa9w";
sha256 = "1p4rqzi67cr8vf1ih7zqxkpssqq0vy4pb5crvkxbbf5ad5mwrjri";
};

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

nativeBuildInputs = [ installShellFiles ];
postInstall = ''
for shell in bash zsh; do
$out/bin/k3d completion $shell > k3d.$shell
installShellCompletion k3d.$shell
done
'';

vendorSha256 = null;
9 changes: 5 additions & 4 deletions pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "element-desktop",
"productName": "Element (Riot)",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.1",
"version": "1.7.2",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -42,13 +42,14 @@
"electron-builder-squirrel-windows": "^22.7.0",
"electron-devtools-installer": "^2.2.4",
"electron-notarize": "^0.2.0",
"eslint": "^5.8.0",
"eslint": "7.3.1",
"eslint-config-google": "^0.7.1",
"eslint-config-matrix-org": "^0.1.2",
"eslint-plugin-babel": "^4.1.2",
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
"matrix-js-sdk": "7.1.0",
"matrix-js-sdk": "8.0.0",
"mkdirp": "^1.0.3",
"needle": "^2.5.0",
"node-pre-gyp": "^0.15.0",
Loading