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: ebbeae56bdce
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: 8141d5b21cdb
Choose a head ref
  • 16 commits
  • 9 files changed
  • 10 contributors

Commits on Apr 14, 2019

  1. rust-cbindgen: 0.8.0 -> 0.8.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/rust-cbindgen/versions
    r-ryantm committed Apr 14, 2019
    Copy the full SHA
    d882895 View commit details

Commits on Apr 27, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    b1ae0ef View commit details
  2. wine-mono: 4.8.2 -> 4.8.3

    nyanloutre committed Apr 27, 2019
    Copy the full SHA
    3dc4e55 View commit details

Commits on Apr 30, 2019

  1. bitwarden_rs: fix cargoSha256

    elseym committed Apr 30, 2019
    Copy the full SHA
    93e14c5 View commit details

Commits on May 1, 2019

  1. Copy the full SHA
    d6977eb View commit details
  2. Copy the full SHA
    f82bfd5 View commit details
  3. masterpdfeditor: 5.3.22 -> 5.4.04

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/masterpdfeditor/versions
    r-ryantm committed May 1, 2019
    Copy the full SHA
    48b138b View commit details
  4. Copy the full SHA
    b9ed297 View commit details
  5. Merge pull request #60617 from nyanloutre/jellyfin_10_3_2

    jellyfin: 10.3.1 -> 10.3.2
    etu authored May 1, 2019
    Copy the full SHA
    ea439dc View commit details
  6. rust-cbindgen: 0.8.0 -> 0.8.3 (#59456)

    rust-cbindgen: 0.8.0 -> 0.8.3
    andir authored May 1, 2019
    Copy the full SHA
    a6643de View commit details
  7. Copy the full SHA
    314e06b View commit details
  8. masterpdfeditor: 5.3.22 -> 5.4.10 (#60624)

    masterpdfeditor: 5.3.22 -> 5.4.10
    flokli authored May 1, 2019
    Copy the full SHA
    5036d02 View commit details
  9. Copy the full SHA
    e9fca99 View commit details
  10. Copy the full SHA
    0b39de4 View commit details
  11. Merge pull request #60521 from elseym/fix-bitwarden_rs-cargohash

    bitwarden_rs: fix cargoSha256
    marsam authored May 1, 2019
    Copy the full SHA
    4760bcf View commit details
  12. Merge pull request #60320 from nyanloutre/wine_update

     wine{unstable,staging}: 4.6 -> 4.7
    c0bw3b authored May 1, 2019
    Copy the full SHA
    8141d5b View commit details
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
Original file line number Diff line number Diff line change
@@ -116,6 +116,7 @@ in
installer = handleTest ./installer.nix {};
ipv6 = handleTest ./ipv6.nix {};
jackett = handleTest ./jackett.nix {};
jellyfin = handleTest ./jellyfin.nix {};
jenkins = handleTest ./jenkins.nix {};
kafka = handleTest ./kafka.nix {};
kerberos = handleTest ./kerberos/default.nix {};
28 changes: 22 additions & 6 deletions pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
Original file line number Diff line number Diff line change
@@ -17,25 +17,41 @@ let

};

libvterm = libvterm-neovim.overrideAttrs(old: rec {
pname = "libvterm-neovim";
version = "2019-04-27";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
};
});


in stdenv.mkDerivation rec {
name = "emacs-libvterm-${version}";
version = "unstable-2018-11-16";
version = "unstable-2019-04-28";

src = fetchFromGitHub {
owner = "akermu";
repo = "emacs-libvterm";
rev = "8be9316156be75a685c0636258b2fec2daaf5ab5";
sha256 = "059js4aa7xgqcpaicgy4gz683hppa1iyp1r98mnms5hd31a304k8";
rev = "6adcedf3e4aaadeeaff97437044fba17aeb466d4";
sha256 = "1j6qr5bmajig3idhwsaa3zm72w13q9zn77z2dlrhhx3p4bbds3f8";
};

nativeBuildInputs = [ cmake ];
buildInputs = [ emacs libvterm-neovim ];
buildInputs = [ emacs libvterm ];

cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ];
cmakeFlags = [
"-DEMACS_SOURCE=${emacsSources}"
"-DUSE_SYSTEM_LIBVTERM=True"
];

installPhase = ''
install -d $out/share/emacs/site-lisp
install ../*.el $out/share/emacs/site-lisp
install ./*.so $out/share/emacs/site-lisp
install ../*.so $out/share/emacs/site-lisp
'';
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/masterpdfeditor/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:

let
version = "5.3.22";
version = "5.4.10";

in stdenv.mkDerivation {
name = "masterpdfeditor-${version}";

src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
sha256 = "0cnw01g3j5l07f2lng604mx8qqm61i5sflryj1vya2gkjmrphkan";
sha256 = "1902ahb2g9xanrip1n0ihr31az8sv9fsvzddnzf70kbwlfclnqf7";
};

nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
version = "2.1.7";
version = "2.1.8";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1icz1is576d2w5a6wc06bnkg2vbsj5g6mz0b6ikzyjddr6j743ql";
sha256 = "1xpgkvcv3bylpaj7c80727vr55vilkgjvnlbw7d5pr56v6mv7n9j";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/desktop/wingpanel/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "wingpanel";
version = "2.2.3";
version = "2.2.4";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1kd1w3mxysg33niryrz5yp6fdayzjpg73ihvq7dlasj8ls5d0qyj";
sha256 = "17xl4l0znr91aj6kb9p0rswyii4gy8k16r9fvj7d96dd5szdp4mc";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/development/tools/rust/cbindgen/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

rustPlatform.buildRustPackage rec {
name = "rust-cbindgen-${version}";
version = "0.8.0";
version = "0.8.3";

src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
sha256 = "07cizbhr02x3rh07xhs10hzzs3lmmpf61g08sa62b98cgadvs9fq";
sha256 = "08zlnk1k1nddjciccfdcplxqngsnz6ml3zxm57mijabzybry8zz1";
};

cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb";
10 changes: 5 additions & 5 deletions pkgs/misc/emulators/wine/sources.nix
Original file line number Diff line number Diff line change
@@ -31,24 +31,24 @@ in rec {

## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "4.8.2";
version = "4.8.3";
url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi";
sha256 = "1hvwhqdb11j9yzhhw86fjhj9bawg76zrh0wnx658pn5xghhk2jhy";
sha256 = "0xhavcjwwr21am3bxp2cxlvykwasw8y4g8p470j5fg7skc0izynn";
};
};

unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "4.6";
version = "4.7";
url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz";
sha256 = "1nk2nlkdklwpd0kbq8hx59gl05b5wglcla0v3892by6k4kwh341j";
sha256 = "1c5swx6jj0hz9w2jgyl30pdjcq9n62qp1rmqyq1d4q2a6n291jiv";
inherit (stable) mono gecko32 gecko64;
};

staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "0mripibsi1p8h2j9ngqszkcjppdxji027ss4shqwb0nypaydd9w2";
sha256 = "1sgyq57dyzchwnvkgx96bcx5rv821s0vidzdyz7x5711j7xmiv70";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
4 changes: 2 additions & 2 deletions pkgs/servers/jellyfin/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
pname = "jellyfin";
version = "10.3.1";
version = "10.3.2";

# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
sha256 = "1j6jyrbc0ha348y63wk5jv9wjcjydma9cr3jxva1y85pjrmm7z90";
sha256 = "0cwmaq61xhdb34f53m2vhnw8v4zrj266vjzfdm106gyychpr46vz";
};

buildInputs = [
2 changes: 1 addition & 1 deletion pkgs/tools/security/bitwarden_rs/default.nix
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {

RUSTC_BOOTSTRAP = 1;

cargoSha256 = "0bzid5wrpcrghazv5652ghyv4amp298p5kfridswv175kmr9gg0x";
cargoSha256 = "02xrz7vq8nan70f07xyf335blfmdc6gaz9sbfjipsi1drgfccf09";

meta = with lib; {
description = "An unofficial lightweight implementation of the Bitwarden server API using Rust and SQLite";