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: c667aba79ce4
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: 05e6cc494433
Choose a head ref
  • 9 commits
  • 7 files changed
  • 4 contributors

Commits on Mar 4, 2020

  1. Copy the full SHA
    51b6f9c View commit details

Commits on Mar 5, 2020

  1. Copy the full SHA
    7de490a View commit details
  2. Copy the full SHA
    ebd9854 View commit details
  3. Copy the full SHA
    3d6cdfa View commit details
  4. Copy the full SHA
    706f13a View commit details
  5. Merge pull request #81808 from r-ryantm/auto-update/link-grammar

    link-grammar: 5.7.0 -> 5.8.0
    jtojnar authored Mar 5, 2020
    Copy the full SHA
    ede0fff View commit details
  6. Merge pull request #81704 from primeos/chromium

    chromium: 80.0.3987.122 -> 80.0.3987.132
    primeos authored Mar 5, 2020
    Copy the full SHA
    19595b3 View commit details
  7. Merge pull request #81779 from r-ryantm/auto-update/gnome-shell-exten…

    …sion-sound-output-device-chooser
    
    gnomeExtensions.sound-output-device-chooser: 24 -> 25
    jtojnar authored Mar 5, 2020
    Copy the full SHA
    c4f21fd View commit details
  8. Copy the full SHA
    05e6cc4 View commit details
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 = "1bahnvn6i08gg10r9p012n7xjwhnjk1xq4c70kw6sqr4p53423mn";
sha256bin64 = "066lvnh18k5982dv9481g9i31g9pq6a8q92g93xkqgj2bipbv6si";
version = "81.0.4044.26";
sha256 = "1yam7lg38dbpvmva7pc3bw3npvgi3d1v6im8ld4z92gjgniwsjh2";
sha256bin64 = "0vsly218wv9x2nv5i82slz8pmb0hmdcl1z2mlhf2j5adnsxn9c5z";
version = "81.0.4044.34";
};
dev = {
sha256 = "0k35sa1qq54cixybb12nyzkjyrwb4cbjfffwfvr5dl859i5bz1kk";
sha256bin64 = "0ckbgk6jw3zq3gqvvwdlcrqlm110hkvija6jfh9dk0ip1wdx8wkm";
version = "82.0.4062.3";
sha256 = "0pxvwjvkajlidk5m7jiqk69mxnxg3h56dr7vpi916r51w17pds0l";
sha256bin64 = "1jdyp0f2ig4251155db3m7lzd4jlmczcjqqnvdj5nwl2bn3ykc3s";
version = "82.0.4068.4";
};
stable = {
sha256 = "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8";
sha256bin64 = "0kipzd0q3p3wwklcl1fb937xhklc0s76apsfrjwy0jcmcy47blzf";
version = "80.0.3987.122";
sha256 = "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c";
sha256bin64 = "00xhacrs74ks3nrpsnnbqm5vk0r9ydyxrq5ifajzviqqyk2n24b8";
version = "80.0.3987.132";
};
}
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.31.0"; # Please backport all updates to the stable channel.
version = "1.32.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "19vsv7jv30xvfgq1nr3091b6x4agymy9afpy9r9mxzgn0xfb0ap9";
sha256 = "1ggblpw2xxhm78sqadswcv0314zagksj34z8pywjnr8h9zkcyiap";
};

nativeBuildInputs = [
@@ -127,7 +127,8 @@ in stdenv.mkDerivation rec {
Signal Desktop is an Electron application that links with your
"Signal Android" or "Signal iOS" app.
'';
homepage = https://signal.org/;
homepage = "https://signal.org/";
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ixmatus primeos equirosa ];
platforms = [ "x86_64-linux" ];
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
{ stdenv, fetchFromGitHub }:
{ stdenv
, substituteAll
, fetchFromGitHub
, libpulseaudio
, python3
}:

stdenv.mkDerivation rec {
pname = "gnome-shell-extension-sound-output-device-chooser";
version = "24";
version = "25";

src = fetchFromGitHub {
owner = "kgshank";
repo = "gse-sound-output-device-chooser";
rev = version;
sha256 = "0n1rf4pdf0b78ivmz89x223sqlzv30qydkvlnvn7hwx0j32kyr0x";
sha256 = "16xaa4r01575ix9lrvww8n6pird8r3ml1j037b3sm6dfrf8kvzxs";
};

patches = [
(substituteAll {
src = ./fix-paths.patch;
libpulse = "${libpulseaudio}/lib/libpulse.so";
python = python3.interpreter;
})
];

dontBuild = true;

uuid = "sound-output-device-chooser@kgshank.net";
@@ -23,6 +36,6 @@ stdenv.mkDerivation rec {
description = "GNOME Shell extension adding audio device chooser to panel";
license = licenses.gpl3;
maintainers = with maintainers; [ jtojnar ];
homepage = https://github.com/kgshank/gse-sound-output-device-chooser;
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- a/sound-output-device-chooser@kgshank.net/convenience.js
+++ b/sound-output-device-chooser@kgshank.net/convenience.js
@@ -111,7 +111,7 @@ function refreshCards() {
log("New logic");
let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path();
try {
- let [result, out, err, exit_code] = GLib.spawn_command_line_sync('python ' + pyLocation);
+ let [result, out, err, exit_code] = GLib.spawn_command_line_sync('@python@ ' + pyLocation);
// log("result" + result +" out"+out + " exit_code" + exit_code + "
// err" +err);
if(result && !exit_code) {
--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
@@ -86,7 +86,7 @@ else:

_libraries = {}

-libpulse_library_name = find_library('pulse')
+libpulse_library_name = '@libpulse@'
if libpulse_library_name is None:
raise Exception('No libpulse.so library found!')

8 changes: 4 additions & 4 deletions pkgs/development/tools/documentation/mdsh/default.nix
Original file line number Diff line number Diff line change
@@ -2,20 +2,20 @@

rustPlatform.buildRustPackage rec {
pname = "mdsh";
version = "0.3.0";
version = "0.4.0";

src = fetchFromGitHub {
owner = "zimbatm";
repo = "mdsh";
rev = "v${version}";
sha256 = "1a9i6h8fzrrfzjyfxaps73lxgkz92k0bnmwbjbwdmiwci4qgi9ms";
sha256 = "0y0k6rsspvpia4lssals4c3rdz9fgvlrhwd8gw38say02hn5b7ip";
};

cargoSha256 = "1fxajh1n0qvcdas6w7dy3g92wilhfldy90pyk3779mrnh57fa6n5";
cargoSha256 = "07f2ajg9jpp666915cwsjn5clmi9ghkw25qfqj0lj3kfj79n5ash";

meta = with stdenv.lib; {
description = "Markdown shell pre-processor";
homepage = https://github.com/zimbatm/mdsh;
homepage = "https://github.com/zimbatm/mdsh";
license = with licenses; [ mit ];
maintainers = with maintainers; [ zimbatm ];
platforms = platforms.all;
6 changes: 3 additions & 3 deletions pkgs/tools/nix/nixpkgs-fmt/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "nixpkgs-fmt";
version = "0.6.1";
version = "0.7.0";

src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
sha256 = "1iylldgyvrcarfigpbhicg6j6qyipfiqn7gybza7qajfzyprjqfa";
sha256 = "0b9wwv77bpq24yxky44ndgvxsx2zgsl15lvl6wklbkr41mwz3xis";
};

cargoSha256 = "1jxvy4w9jxv898wgqyj9bpkhnc7pkj9dxg5x0b39xsnkzl2lr239";
cargoSha256 = "1vv2gypbmgd9lksrk5h2z3agcs1269p1i3im9529nhcsl62ckj7n";

meta = with lib; {
description = "Nix code formatter for nixpkgs";
6 changes: 3 additions & 3 deletions pkgs/tools/text/link-grammar/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }:

stdenv.mkDerivation rec {
version = "5.7.0";
version = "5.8.0";
pname = "link-grammar";

outputs = [ "bin" "out" "dev" "man" ];

src = fetchurl {
url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "0ak1v469k56v3511kxxkxvx1nw6zcxcl0f1kcvc82ffacqbr4y96";
sha256 = "1v8ngx77nachxln68xpvyw2lh7z59pzsi99h8j0mnrm0gjsacrdd";
};

nativeBuildInputs = [ pkgconfig python3 ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "A Grammar Checking library";
homepage = https://www.abisource.com/projects/link-grammar/;
homepage = "https://www.abisource.com/projects/link-grammar/";
license = licenses.lgpl21;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;