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: 11d491dce56b
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: bbe83c05205b
Choose a head ref
  • 13 commits
  • 10 files changed
  • 7 contributors

Commits on Apr 4, 2019

  1. Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    Copy the full SHA
    671c673 View commit details

Commits on Apr 10, 2019

  1. dune: 1.8.2 -> 1.9.0

    Zimmi48 committed Apr 10, 2019

    Unverified

    The email in this signature doesn’t match the committer email.
    Copy the full SHA
    fdcce20 View commit details
  2. puddletag: fix homepage

    peterhoeg committed Apr 10, 2019
    Copy the full SHA
    64283f8 View commit details
  3. Copy the full SHA
    102d67b View commit details
  4. anydesk: fix homepage

    peterhoeg committed Apr 10, 2019
    Copy the full SHA
    e7f6bfe View commit details
  5. Copy the full SHA
    c7b743d View commit details

Commits on Apr 11, 2019

  1. Merge pull request #59263 from Zimmi48/dune-1.9.0

    dune: 1.8.2 -> 1.9.0
    basvandijk authored Apr 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1a926b8 View commit details
  2. hiredis-vip: init at 0.3.0

    FRidh committed Apr 11, 2019
    Copy the full SHA
    f6dcb5f View commit details
  3. Merge pull request #59265 from peterhoeg/f/repology

    repology: fix homepage for a few packages - nothing else
    dotlambda authored Apr 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    84029e2 View commit details
  4. Copy the full SHA
    8f371c8 View commit details
  5. Copy the full SHA
    6542a4c View commit details
  6. Merge pull request #58798 from r-ryantm/auto-update/python3.7-ldap3

    python37Packages.ldap3: 2.5.2 -> 2.6
    worldofpeace authored Apr 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f8062cb View commit details
  7. Merge pull request #58969 from veprbl/pr/awkward_0_8_14

    pythonPackages.awkward: 0.8.7 -> 0.8.14, enable more tests
    worldofpeace authored Apr 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    bbe83c0 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/lollypop/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
version = "1.0.3";
version = "1.0.5";

format = "other";
doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "1gjxcwl467h7011j9v4zy1j0fjlz480ibvk4akr6xwjg894jykbx";
sha256 = "1p6glzvbbha3cvq462ymbn1q58skclfk469kk28cr1hlsf5x2pry";
};

nativeBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/applications/audio/puddletag/default.nix
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@ python2Packages.buildPythonApplication rec {
dontStrip = true; # we are not generating any binaries

meta = with stdenv.lib; {
homepage = https://puddletag.net;
description = "An audio tag editor similar to the Windows program, Mp3tag";
homepage = https://docs.puddletag.net;
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
14 changes: 8 additions & 6 deletions pkgs/applications/misc/krename/default.nix
Original file line number Diff line number Diff line change
@@ -17,15 +17,17 @@ in mkDerivation rec {
sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a";
};

buildInputs = [ taglib exiv2 podofo ];

nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];

propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ];

meta = with lib; {
homepage = http://www.krename.net;
description = "A powerful batch renamer for KDE";
homepage = https://kde.org/applications/utilities/krename/;
license = licenses.gpl2;
inherit (kconfig.meta) platforms;
maintainers = with maintainers; [ peterhoeg ];
inherit (kconfig.meta) platforms;
};

buildInputs = [ taglib exiv2 podofo ];
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ];
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/remote/anydesk/default.nix
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {

meta = with stdenv.lib; {
inherit description;
homepage = http://www.anydesk.com;
homepage = https://www.anydesk.com;
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ peterhoeg ];
25 changes: 25 additions & 0 deletions pkgs/development/libraries/hiredis-vip/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv
, lib
, fetchFromGitHub
}:

stdenv.mkDerivation rec {
pname = "hiredis-vip";
version = "0.3.0";

src = fetchFromGitHub {
owner = "vipshop";
repo = "hiredis-vip";
rev = version;
sha256 = "1z9zry635pxqv6d2cgk3dghb5qfpg9m7dz34ld4djw9b53hjr2z2";
};

makeFlags = [ "PREFIX=$(out)" ];

meta = {
description = "A C client library for the Redis database";
homepage = https://github.com/vipshop/hiredis-vip;
license = lib.licenses.bsd3;
};

}
8 changes: 5 additions & 3 deletions pkgs/development/python-modules/awkward/default.nix
Original file line number Diff line number Diff line change
@@ -2,22 +2,24 @@
, buildPythonPackage
, fetchPypi
, numpy
, pandas
, pyarrow
, pytestrunner
, pytest
, h5py
}:

buildPythonPackage rec {
pname = "awkward";
version = "0.8.7";
version = "0.8.14";

src = fetchPypi {
inherit pname version;
sha256 = "0a53c484za2l4yy1i05qhkylvygg8fnh4j1v3n35x2dsi929awdp";
sha256 = "1mf8ddxn7bdlhic5xcd8nvskp3cmyv8vk2hz52hb7faixsgvgj18";
};

nativeBuildInputs = [ pytestrunner ];
checkInputs = [ pytest h5py ];
checkInputs = [ pandas pyarrow pytest h5py ];
propagatedBuildInputs = [ numpy ];

checkPhase = ''
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/broadlink/default.nix
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ buildPythonPackage rec {

meta = with lib; {
description = "Python API for controlling Broadlink IR controllers";
homepage = http://github.com/mjg59/python-broadlink;
homepage = https://github.com/mjg59/python-broadlink;
license = licenses.mit;
};
}
16 changes: 4 additions & 12 deletions pkgs/development/python-modules/ldap3/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pyasn1 }:

buildPythonPackage rec {
version = "2.5.2";
pname = "ldap3";
version = "2.6";

## This should work, but 2.5.2 has a weird tarball with empty source files
## where upstream repository has non-empty ones
# src = fetchPypi {
# inherit pname version;
# sha256 = "063dacy01mphc3n7z2qc2avykjavqm1gllkbvy7xzw5ihlqwhrrz";
# };
src = fetchFromGitHub {
owner = "cannatag";
repo = pname;
rev = "v${version}";
sha256 = "0p5l4bhy6j2nvvlxz5zvznbaqb72x791v9la2jr2wpwr60mzz9hw";
src = fetchPypi {
inherit pname version;
sha256 = "1f0v82584b7gkzrnnnl4fc88w4i73x7cxqbzy0r0bknm33yfwcq5";
};

propagatedBuildInputs = [ pyasn1 ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/ocaml/dune/default.nix
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

stdenv.mkDerivation rec {
name = "dune-${version}";
version = "1.8.2";
version = "1.9.0";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a";
sha256 = "18j5afg54bww9az05wc7m5ixzvvq38wfnwq6ni09pi2n848m21ca";
};

buildInputs = [ ocaml findlib ];
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -10535,6 +10535,8 @@ in

hiredis = callPackage ../development/libraries/hiredis { };

hiredis-vip = callPackage ../development/libraries/hiredis-vip { };

hivex = callPackage ../development/libraries/hivex { };

hound = callPackage ../development/tools/misc/hound { };