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: a674930d1577
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: 190e79d0f381
Choose a head ref
  • 5 commits
  • 5 files changed
  • 3 contributors

Commits on Jul 20, 2020

  1. haskellPackages.streaming-osm: 1.0.1 -> 1.0.2 

    This fixes a bug in the parser, where member IDs in Openstreetmap files
were not correctly parsed.

This update significantly increases the usability of the package.
    @erictapen
    erictapen committed Jul 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4a9973a View commit details

  2. Merge pull request #93550 from erictapen/haskell-streaming-osm-1.0.2 

    [20.03] haskellPackages.streaming-osm: 1.0.1 -> 1.0.2
    @infinisil
    infinisil authored Jul 20, 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
    8fa3b97 View commit details

  3. weechat*: remove myself as maintainer 

    I don't use this anymore, so I don't bring any value here.

(cherry picked from commit 309bcc4)
    @Ma27
    Ma27 committed Jul 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d0cd752 View commit details

  4. oraclejdk: 8u251 -> 8u261 

    https://www.oracle.com/java/technologies/javase/8u261-relnotes.html
(cherry picked from commit c5dd1fb)

Rationale for backport: as described in the release notes, this new
build-version is part of the "Critical Patch Update" of Oracle in July
2020[1]. Also, the zip archive for `8u251` isn't available anymore so users
can't build `oraclejdk` at the moment without having backed up the
`8u251` zipfile somewhere.

[1] https://www.oracle.com/security-alerts/cpujul2020.html#AppendixJAVA
    @Ma27
    Ma27 committed Jul 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c146535 View commit details

  5. nextcloud: 19.0.0 -> 19.0.1 

    https://nextcloud.com/changelog/#19-0-1
(cherry picked from commit 2d54371)
    @Ma27
    Ma27 committed Jul 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    190e79d View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/networking/irc/weechat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ let
on https://nixos.org/nixpkgs/manual/#sec-weechat .
'';
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ lovek323 the-kenny lheckemann ma27 ];
maintainers = with stdenv.lib.maintainers; [ lovek323 lheckemann ];
platforms = stdenv.lib.platforms.unix;
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
View file
Original file line number Diff line number Diff line change
@@ -38,8 +38,8 @@ stdenv.mkDerivation {

meta = with stdenv.lib; {
description = "A WeeChat script in Lua that implements the matrix.org chat protocol";
homepage = https://github.com/torhve/weechat-matrix-protocol-script;
maintainers = with maintainers; [ ma27 ];
homepage = "https://github.com/torhve/weechat-matrix-protocol-script";
maintainers = with maintainers; [ ];
license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53
platforms = platforms.unix;

10 changes: 5 additions & 5 deletions pkgs/development/compilers/oraclejdk/jdk8-linux.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "251";
sha256.i686-linux = "0c6d25c09459e435570204f1a22a1cb765ce5d62c5bced92c9a9546b7be337f2";
sha256.x86_64-linux = "777a8d689e863275a647ae52cb30fd90022a3af268f34fc5b9867ce32f1b374e";
sha256.armv7l-linux = "f1b0c979e1b61ec52ebd5e1d0b754d7681d8623b09ac90c69718a553ef9b0cd1";
sha256.aarch64-linux = "58baeaab7da97dd5a6b02ad2dcd77c14b3b6ba014029ee67dbc2bd5f0fa98d1b";
patchVersion = "261";
sha256.i686-linux = "1bl12hd5i53m8d4j8rwkk3bavmzw0ndr88ch5lf5syi7vs5pfjpm";
sha256.x86_64-linux = "0d7a92csz8ws5h0pzqmrxq3sz286s57vw0dqq3ciwsqz14df012s";
sha256.armv7l-linux = "13dih7zyfgj90bkhnfxhpm88d9kqqrj6w5rzpidmxrjwrsnlndp9";
sha256.aarch64-linux = "0zzhs4pcnjss2561b8zrrnacpkb8p49ca0lpdw7hzgsjjj1y146n";
jceName = "jce_policy-8.zip";
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
}
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkgs/servers/nextcloud/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ in {
};

nextcloud19 = generic {
version = "19.0.0";
sha256 = "1bhazqj5f02sclh5pmifzqfahhhfqypixbvkgrnlgqy5ayb44gfj";
version = "19.0.1";
sha256 = "0bavwvjjgx62i150wqh4gqavjva3mnhx6k3im79ib6ck1ph13wsf";
};
}