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: 36641b25e75e
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: 45bfb96ecdde
Choose a head ref
  • 11 commits
  • 5 files changed
  • 7 contributors

Commits on May 21, 2020

  1. electron_6: 6.1.7 -> 6.1.12 

    (cherry picked from commit 77cade8)
    @prusnak
    prusnak committed May 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9a5239f View commit details

  2. electron_7: 7.1.10 -> 7.3.0 

    (cherry picked from commit eee7e5b)
    @prusnak
    prusnak committed May 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b3c5bba View commit details

  3. electron_8: 8.0.0 -> 8.3.0 

    (cherry picked from commit 72aebd3)
    @prusnak
    prusnak committed May 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a99bb40 View commit details

Commits on May 31, 2020

  1. Merge release-20.03 into staging-20.03

    @FRidh
    FRidh committed May 31, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7b1fab7 View commit details

  2. python38: 3.8.1 -> 3.8.2 

    (cherry picked from commit 2a019cc)
    @FRidh
    Jonathan Ringer authored and FRidh committed May 31, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c570247 View commit details

  3. python38: 3.8.2 -> 3.8.3 

    (cherry picked from commit 0367fa6)
    @FRidh
    FRidh committed May 31, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5150040 View commit details

Commits on Jun 1, 2020

  1. Merge branch 'staging-20.03' into release-20.03

    @vcunat
    vcunat committed Jun 1, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d6d6a87 View commit details

  2. mautrix-whatsapp: 2020-05-27 -> 2020-05-29 

    (cherry picked from commit 55fea6d)
    @Ma27
    Ma27 committed Jun 1, 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
    7a21e9f View commit details

  3. alacritty: 0.4.2 -> 0.4.3 

    https://github.com/alacritty/alacritty/releases/tag/v0.4.3
(cherry picked from commit 043ecdb)
    @Ma27
    Ma27 committed Jun 1, 2020
    Copy the full SHA
    bdee067 View commit details

  4. Merge pull request #88550 from prusnak/electron-20.03 

    [20.03] Update Electron 6,7,8
    @mmahut
    mmahut authored Jun 1, 2020
    Copy the full SHA
    4a2da01 View commit details

  5. dblatex: add pdflscape as a dependency 

    Without it, building a document fails with the following error:

pdflatex failed
index.tex: File `pdflscape.sty' not found.
index.tex:47: Emergency stop.

(cherry picked from commit 75b0777)
    @svanderburg
    svanderburg committed Jun 1, 2020
    Copy the full SHA
    45bfb96 View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/misc/alacritty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,16 +52,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "alacritty";
version = "0.4.2";
version = "0.4.3";

src = fetchFromGitHub {
owner = "alacritty";
repo = pname;
rev = "v${version}";
sha256 = "133d8vm7ihlvgw8n1jghhh35h664h0f52h6gci54f11vl6c1spws";
sha256 = "1b6fspcd8yn1857cgn1m8a828bvjspvrfc2giwsa9ai0ighcqbgl";
};

cargoSha256 = "0y7yzbl6hyb89f2lcn3s65jbrzibr8b8x7l84iriw6ifsqnvcyg5";
cargoSha256 = "0hskj1rnql8sxsgr317vidcb9av3rvjwfwrfp89dlw5l87gyvn8s";

nativeBuildInputs = [
cmake
@@ -129,7 +129,7 @@ rustPlatform.buildRustPackage rec {
description = "A cross-platform, GPU-accelerated terminal emulator";
homepage = "https://github.com/alacritty/alacritty";
license = licenses.asl20;
maintainers = with maintainers; [ filalex77 mic92 cole-h ];
maintainers = with maintainers; [ filalex77 mic92 cole-h ma27 ];
platforms = platforms.unix;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -105,10 +105,10 @@ in {
sourceVersion = {
major = "3";
minor = "8";
patch = "1";
patch = "3";
suffix = "";
};
sha256 = "1s4lwn5vzsajlc88m6hkghsvnjw4d00l2dsgng0m2w6vyqbl32bm";
sha256 = "0r2qg4pdvv52ld5dd95fl6lzzsxxxhbsxmymwcphh6624g3mxayz";
inherit (darwin) configd;
inherit passthruFun;
};
36 changes: 18 additions & 18 deletions pkgs/development/tools/electron/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,27 +20,27 @@ in
aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add";
};

electron_6 = mkElectron "6.1.7" {
x86_64-linux = "7fe94fc1edebe2f5645056a4300fc642c04155e55da8dd4ee058a0c0ef835ae8";
x86_64-darwin = "1c790a4cbda05f1c136d18fa6a09bdb09a1941f521207466756a3e95e343c485";
i686-linux = "1afd8ea79acb2b4782fb459e084549ed4cd4ead779764829b1d862148359eae5";
armv7l-linux = "14f2ea0459f0dda8c566b0fa4a2fe755f4220bbae313ea0c453861ac2f803196";
aarch64-linux = "80e05c1a0b51c335483666e959c1631a089246986b7fc3a4f9ee1288a57a602a";
electron_6 = mkElectron "6.1.12" {
x86_64-linux = "dc628216588a896e72991d46071d06ef11aed2cdeca18d11d472c29cfbf12349";
x86_64-darwin = "6c7244319fdfb90899a48ffd0f426e36dba7c3fc5e29b28a4d29fdca7fb924d3";
i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab";
armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc";
aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b";
};

electron_7 = mkElectron "7.1.10" {
x86_64-linux = "296f034ac9a00afa4dc99ed145410c015af3f59cd7e9becc7709d70a4f8a9ebf";
x86_64-darwin = "10eb453c2b19948777a6f404fbdbdd48464a4cd63db16bd3ce66b60dda016724";
i686-linux = "681b6440d4f0f7ffa29a34610ef41103d72937d6e524d81fd2d0fa8d9eb67936";
armv7l-linux = "2c09e9a77f1da152d766dc2e43719e2852b70f917229466a2ac457416d1374f7";
aarch64-linux = "1dad780b872bbc069eb1cac9ff4ec8f0b8d200153ab7f51397e27219094db1f0";
electron_7 = mkElectron "7.3.0" {
x86_64-linux = "5841d2dae8633ddec654574507689a61983acd774e6cdc8774a64b26eb41b5d4";
x86_64-darwin = "dfe6aeda73b71aa016fb87f5fdbf87f7d8e574f1cf318fc2a5543399b4e975ae";
i686-linux = "fdcedc8fda7c3580dadfa50d2ffcf9ebde4d7a01b0a36fb799703510e3a7811f";
armv7l-linux = "b2989bab1be05230364c058fbadf9967b23873d24e24ac3f7c8d013c11ed73e4";
aarch64-linux = "15a70ae79aabbf6bb9ee8a107fd08ddc1021c534679899f88e1fcc8d4de980fe";
};

electron_8 = mkElectron "8.0.0" {
x86_64-linux = "b457a2ece83bb8a2efea42e75403740cbba051a64e325288760046b8999dd1c9";
x86_64-darwin = "3f96dfa1d4e0313d11b9e5c66e2df161cfdb30685ee9dadcc779bcad2fb3876e";
i686-linux = "0633ac2b6b6d00302e0e5df224d0e808e4ea9ecc14643e8534027e49b20436fb";
armv7l-linux = "8d1f3daa86c77e7aceb8c8e4491c094e789951c7d475fc536b85fe7d279794bf";
aarch64-linux = "484c04204478e8594d66f8bd332529c0c5eecfd71ee1705cc0478fa59c6818ee";
electron_8 = mkElectron "8.3.0" {
x86_64-linux = "e69d8e36d2f842c7e741794f71952dc8bc5fbaa46ff22bb82ffd71fcf16e2302";
x86_64-darwin = "582c9f9b53e8752885aa14d829f9318283f1d56eeb12982a03051d795a23e535";
i686-linux = "2cf7fc55a74427d96ebe67fb601ece2f27802deb95a5bae3d7b427afe71d272c";
armv7l-linux = "14b67e8a41ce8882442816a2db0eee69fac141e359911704002beb7063aa0eff";
aarch64-linux = "1d89a75fff3b690efe1295fe6f91225c4fa64f3c22c6acddec895d54e1040b4d";
};
}
6 changes: 3 additions & 3 deletions pkgs/servers/mautrix-whatsapp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2020-05-27";
version = "2020-05-29";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "7cf19b0908dec6cb8239aebc3f79ee88dccbfc51";
sha256 = "14cadqvbcjd9vp6dix3jzn0l071r3i9sz0lwpppgzpid8mg9zbx4";
rev = "7947ba616ca1b776883ca7db9cab8de9ee8d9ee6";
sha256 = "10rkkjnbppv9gi67hknijh8ib841qyy16grdw29gz3ips6qs8zq7";
};

modSha256 = "1klwbp9cmyp8dj6divalxsw1dfjh0frw57pwfgd2gakmzj35416b";
2 changes: 1 addition & 1 deletion pkgs/tools/typesetting/tex/dblatex/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, tex ? texlive.combine { # satisfy all packages that ./configure mentions
inherit (texlive) scheme-basic epstopdf anysize appendix changebar
fancybox fancyvrb float footmisc listings jknapltx/*for mathrsfs.sty*/
multirow overpic pdfpages graphics stmaryrd subfigure titlesec wasysym
multirow overpic pdfpages pdflscape graphics stmaryrd subfigure titlesec wasysym
# pkgs below don't seem requested by dblatex, but our manual fails without them
ec zapfding symbol eepic times rsfs cs tex4ht courier helvetic ly1;
}