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: 2355d9d545fe
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: e61c924adba6
Choose a head ref
  • 9 commits
  • 8 files changed
  • 5 contributors

Commits on Apr 16, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    alexarice Alex Rice
    Copy the full SHA
    ef2c3ab View commit details
  2. gifski: 0.10.2 -> 0.10.4

    r-ryantm committed Apr 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    Copy the full SHA
    fa5ee6e View commit details
  3. Merge pull request #85360 from primeos/chromium

    chromium: 81.0.4044.92 -> 81.0.4044.113
    primeos authored Apr 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    Copy the full SHA
    6109f94 View commit details
  4. Merge pull request #85387 from r-ryantm/auto-update/gifski

    gifski: 0.10.2 -> 0.10.4
    nh2 authored Apr 16, 2020
    Copy the full SHA
    37d03dd View commit details
  5. upwork: init at 5.3.3-883

    zakkor authored and Jon committed Apr 16, 2020
    Copy the full SHA
    13c58fb View commit details
  6. maintainers: add zakkor

    zakkor authored and Jon committed Apr 16, 2020
    Copy the full SHA
    e14c4ba View commit details
  7. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    cd5bc89 View commit details
  8. Copy the full SHA
    20252ee View commit details
  9. Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    Copy the full SHA
    e61c924 View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -8431,6 +8431,12 @@
githubId = 250877;
name = "Elmar Athmer";
};
zakkor = {
email = "edward.dalbon@gmail.com";
github = "zakkor";
githubId = 6191421;
name = "Edward d'Albon";
};
zef = {
email = "zef@zef.me";
name = "Zef Hemel";
55 changes: 55 additions & 0 deletions pkgs/applications/misc/upwork/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{ stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook, writeShellScript
, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:

stdenv.mkDerivation rec {
pname = "upwork";
version = "5.3.3-883";

src = fetchurl {
url = "https://updates-desktopapp.upwork.com/binaries/v5_3_3_883_1f817bc1fefd44e7/upwork_5.3.3.883_amd64.deb";
sha256 = "072zns79w4h46bvbj23rvr8i12sf2l378ry0z3hchwcimkrph9wx";
};

dontWrapGApps = true;

nativeBuildInputs = [
dpkg
wrapGAppsHook
autoPatchelfHook
];

buildInputs = [
libcxx systemd libpulseaudio
stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
libXtst nspr nss libxcb pango systemd libXScrnSaver
];

libPath = stdenv.lib.makeLibraryPath buildInputs;

unpackPhase = ''
dpkg-deb -x ${src} ./
'';

installPhase = ''
mv usr $out
mv opt $out
sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop
makeWrapper $out/opt/Upwork/upwork \
$out/bin/upwork \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : ${libPath}
'';

meta = with stdenv.lib; {
description = "Online freelancing platform desktop application for time tracking";
homepage = "https://www.upwork.com/ab/downloads/";
license = licenses.unfree;
maintainers = with maintainers; [ zakkor ];
};
}
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2";
sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8";
version = "81.0.4044.92";
sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17";
sha256bin64 = "1iwn0yyhk0jn47pn7rx9kadli47xyvz3xilfl4faifmasin2fq8v";
version = "81.0.4044.113";
};
dev = {
sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy";
sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai";
version = "83.0.4100.3";
sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf";
sha256bin64 = "1hn2hjni5k370jhc0nikmx5ypwzcqnmr02h185a5ry697643abdd";
version = "83.0.4103.14";
};
stable = {
sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2";
sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72";
version = "81.0.4044.92";
sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17";
sha256bin64 = "0ap7flrw3h885454fa2r7psa4sh8567ql7v7x96q11gh9gjrdvp3";
version = "81.0.4044.113";
};
}
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/evcxr/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "evcxr";
version = "0.5.0";
version = "0.5.1";

src = fetchFromGitHub {
owner = "google";
repo = "evcxr";
rev = "239e431c58d04c641da22af791e4d3e1b894365e";
sha256 = "0vkcis06gwsqfwvrl8xcf74mfcs6j77b9fhcz5rrh77mwl7ixsdc";
rev = "582ce09f216d4812f7d152f6eedf0b034fc4dbbd";
sha256 = "12hlqgh74z8vmd7fkxh4vk3dqp8hlhzkxnbyywk6nphi562n6w5w";
};

cargoSha256 = "0pamwqhw3sj4anqc1112l5cayhqzibdhqjc28apfrkf2m63cclzi";
cargoSha256 = "0yr8vwlpfsg47sg0032yrsdcgxyky0hy4963zkh0pmjykbyqkb3h";

nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
8 changes: 4 additions & 4 deletions pkgs/servers/mautrix-whatsapp/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2020-04-02";
version = "2020-04-12";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "064b5b8fedb6896d04509aa0e094a8d9f83426c2";
sha256 = "1xky31x5jk7yxh875nk20vvsn9givy6vxdqhqg5qwf4xjj2zqh2p";
rev = "44bb623e7a7486a0cdd13fd67b2aaca2ddba20ce";
sha256 = "1fwxn6511pq9fdc8d2jp4vgkm1zag55pig75qdxfn63hl3i2607k";
};

modSha256 = "0qcxxhfp3fkx90r3lwhi0lkzg3digwrnxk8cack11k717szg7zrd";
modSha256 = "04pdap1q7zsa1wv2h0j9104fawn95g37yqslmp2mq7722hiqhp9x";

meta = with stdenv.lib; {
homepage = "https://github.com/tulir/mautrix-whatsapp";
6 changes: 3 additions & 3 deletions pkgs/tools/graphics/gifski/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "gifski";
version = "0.10.2";
version = "0.10.4";

src = fetchFromGitHub {
owner = "ImageOptim";
repo = "gifski";
rev = version;
sha256 = "0gsk1pagg89q1mi3d28q6dsnanncwphw9lrb7qybppw0vyvqlqbx";
sha256 = "1ly465y435cha22rmnq632hgq2s7y0akrcna6m30f6l078br8mhn";
};

cargoSha256 = "0k7pzcll7hn2a354vviyj8dr0kq63cwsldgv303kwklmxji02d0v";
cargoSha256 = "0khfkh1ylqv4v5dsb4hsha5fh3b62hcvkp3swplv64h626p3q54s";

nativeBuildInputs = [ pkgconfig ];

6 changes: 3 additions & 3 deletions pkgs/tools/networking/findomain/default.nix
Original file line number Diff line number Diff line change
@@ -9,16 +9,16 @@

rustPlatform.buildRustPackage rec {
pname = "findomain";
version = "1.4.5";
version = "1.5.0";

src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
sha256 = "1p4ddyqg1v27hf19n1ksmfvj5s6z2c8i13syb0anhlyzqy576hwb";
sha256 = "1w3parmk3836v5ghn3cgcxyk0alk05r5ljl3j1fpnly5xvl131rd";
};

cargoSha256 = "0mdcj4almwziq1ph3imfdx41a96xq19sbjm7wsm9lxlzhvv256br";
cargoSha256 = "1cs076cgkzjan6y78a3bhriv2q2s83hp5vzhkjwz4dqn83r6b8hx";

nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optional stdenv.isDarwin Security;
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -7498,6 +7498,8 @@ in

uptimed = callPackage ../tools/system/uptimed { };

upwork = callPackage ../applications/misc/upwork { };

urjtag = callPackage ../tools/misc/urjtag { };

urlwatch = callPackage ../tools/networking/urlwatch { };