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: e12b9622dcff
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: 9f5e9ef4b71a
Choose a head ref
  • 20 commits
  • 12 files changed
  • 12 contributors

Commits on Mar 25, 2020

  1. Copy the full SHA
    0cf2b46 View commit details
  2. Copy the full SHA
    15789d2 View commit details

Commits on May 1, 2020

  1. cpu-x: init at 3.2.4

    gnidorah committed May 1, 2020
    Copy the full SHA
    671d1ed View commit details

Commits on May 3, 2020

  1. aria2: add libaria2 support

    This changes the derivation to be a multi output derivation
    and at the same time builds the binary against the shared libaria2.
    bachp committed May 3, 2020
    Copy the full SHA
    020d0bf View commit details

Commits on May 10, 2020

  1. krop: install desktop file

    symphorien committed May 10, 2020
    Copy the full SHA
    6bac73b View commit details
  2. tilda: 1.5.0 -> 1.5.1

    r-ryantm committed May 10, 2020
    Copy the full SHA
    a608f2d View commit details

Commits on May 11, 2020

  1. Copy the full SHA
    67d0893 View commit details

Commits on May 12, 2020

  1. makemkv: 1.15.0 -> 1.15.1

    Upstream changelog:
    
    - Added support for AACS v76 (for those poor souls without LibreDrive)
    - Improved handling for discs with mastering errors
    - Many internal improvements and small bugfixes
    - Bug fixes:
      * For some HD audio streams frames were dropped incorrectly on segment
        boundaries
    danieldk committed May 12, 2020
    Copy the full SHA
    7f879e0 View commit details
  2. Updated kind from 0.7 -> 0.8.1

    Also use buildGoModule instead of buildGoPackages
    shuhaowu committed May 12, 2020
    Copy the full SHA
    e7bbcb3 View commit details
  3. Copy the full SHA
    fd13ca9 View commit details
  4. Copy the full SHA
    1a74d41 View commit details
  5. Copy the full SHA
    4569da4 View commit details
  6. Merge pull request #87696 from shuhaowu/update-kind-081

    Updated kind from 0.7 -> 0.8.1
    Mic92 authored May 12, 2020
    Copy the full SHA
    67c6a2e View commit details
  7. Copy the full SHA
    2ccd344 View commit details
  8. Merge pull request #87282 from symphorien/krop-desktop-file

    krop: install desktop file
    Lassulus authored May 12, 2020
    Copy the full SHA
    83b618a View commit details
  9. Copy the full SHA
    81f5a8a View commit details
  10. Merge pull request #86671 from bachp/libaria2

    aria2: add libaria2 support
    Lassulus authored May 12, 2020
    Copy the full SHA
    d630d0e View commit details
  11. Copy the full SHA
    ebeea74 View commit details
  12. Merge pull request #86446 from gnidorah/cpu-x

    cpu-x: init at 3.2.4
    Lassulus authored May 12, 2020
    Copy the full SHA
    8c9e7a7 View commit details
  13. Merge pull request #87595 from aanderse/perl-packages/config-properties

    perlPackages.ConfigProperties: init at 1.80
    aanderse authored May 12, 2020
    Copy the full SHA
    9f5e9ef View commit details
2 changes: 1 addition & 1 deletion nixos/modules/security/pam.nix
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ let
description = ''
If set, users listed in
<filename>~/.yubico/authorized_yubikeys</filename>
are able to log in with the asociated Yubikey tokens.
are able to log in with the associated Yubikey tokens.
'';
};

4 changes: 4 additions & 0 deletions pkgs/applications/graphics/krop/default.nix
Original file line number Diff line number Diff line change
@@ -24,6 +24,10 @@ python3Packages.buildPythonApplication rec {
"\${qtWrapperArgs[@]}"
];

postInstall = ''
install -m666 -Dt $out/share/applications krop.desktop
'';

# Disable checks because of interference with older Qt versions // xcb
doCheck = false;

27 changes: 27 additions & 0 deletions pkgs/applications/misc/cpu-x/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses, curl
, json_c, libcpuid, pciutils, procps, wrapGAppsHook, nasm }:

stdenv.mkDerivation rec {
pname = "cpu-x";
version = "3.2.4";

src = fetchFromGitHub {
owner = "X0rg";
repo = "CPU-X";
rev = "v${version}";
sha256 = "03y49wh9v7x6brmavj5a2clihn0z4f01pypl7m8ymarv4y3a6xkl";
};

nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm ];
buildInputs = [
gtk3 ncurses curl json_c libcpuid pciutils procps
];

meta = with stdenv.lib; {
description = "Free software that gathers information on CPU, motherboard and more";
homepage = src.meta.homepage;
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ gnidorah ];
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/tilda/default.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {

pname = "tilda";
version = "1.5.0";
version = "1.5.1";

src = fetchFromGitHub {
owner = "lanoxx";
repo = "tilda";
rev = "${pname}-${version}";
sha256 = "13djibj3s7ig13c57ywy38pxy3qfmqihii2c0g15fy2h9q8xp1gx";
sha256 = "1kk69sg7ph906yr5jagkjx0qfkhr5w2nyx407wl2dsjimbps44rd";
};

nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
6 changes: 3 additions & 3 deletions pkgs/applications/video/makemkv/default.nix
Original file line number Diff line number Diff line change
@@ -3,21 +3,21 @@
}:

let
version = "1.15.0";
version = "1.15.1";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
sha256 = "1zr63fqx4qcrnrbg1f97w9mp3yzzxf0dk8pw60y2d4436vanfba4";
sha256 = "0c9661sdlld8b1g2pk8lbn3gz7cikh9bjqss11ffkriwii1x9fw0";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
sha256 = "01pdydll37inkq74874rqd5kk0maafnm1lqcv41jzgzjrfkky8d9";
sha256 = "0rm1zykqagy2g8hb7pjrc6akdsym8pgdnx66hnna161jbah3sssy";
};
in mkDerivation {
pname = "makemkv";
10 changes: 5 additions & 5 deletions pkgs/development/tools/kind/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:

with stdenv.lib;

buildGoPackage rec {
buildGoModule rec {
pname = "kind";
version = "0.7.0";
version = "0.8.1";

src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
sha256 = "0hvb0rbi1m0d1flk15l3wws96kmmjhsy6islkhy5h7jalc4k0nx4";
sha256 = "0r301nqvycik8fwlghq0cymmq4rm7xp8haj39i2nynxyw8zk6zym";
};

goDeps = ./deps.nix;
modSha256 = "1vfdyd4yj79f2n0w98k9h4sklxwg49ajlp1blvpslbzmpfkmcjsz";
goPackagePath = "sigs.k8s.io/kind";
subPackages = [ "." ];

Loading