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: 9e9fcba6a8e2
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: 99dd49fa6ed8
Choose a head ref
  • 16 commits
  • 9 files changed
  • 8 contributors

Commits on Sep 13, 2019

  1. pythonPackages.xapian: disable smoketests

    Jonathan Ringer committed Sep 13, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    Copy the full SHA
    24b364e View commit details

Commits on Sep 28, 2019

  1. python37Packages.distributed: 2.3.0 -> 2.4.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-distributed/versions
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    c5791b4 View commit details
  2. python37Packages.reproject: 0.4 -> 0.5.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-reproject/versions
    r-ryantm committed Sep 28, 2019
    Copy the full SHA
    0a76244 View commit details

Commits on Sep 29, 2019

  1. uptimed: 0.4.1 -> 0.4.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/uptimed/versions
    r-ryantm committed Sep 29, 2019
    Copy the full SHA
    ca4c504 View commit details
  2. xsecurelock: 1.4.0 -> 1.5.1

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/xsecurelock/versions
    r-ryantm committed Sep 29, 2019
    Copy the full SHA
    114584f View commit details
  3. Merge pull request #70016 from r-ryantm/auto-update/xsecurelock

    xsecurelock: 1.4.0 -> 1.5.1
    marsam authored Sep 29, 2019
    Copy the full SHA
    cbf2987 View commit details
  4. Copy the full SHA
    0e60d86 View commit details
  5. Copy the full SHA
    9a678e6 View commit details
  6. Merge pull request #69769 from r-ryantm/auto-update/python3.7-distrib…

    …uted
    
    python37Packages.distributed: 2.3.0 -> 2.4.0
    ryantm authored Sep 29, 2019
    Copy the full SHA
    8489274 View commit details
  7. Merge pull request #70026 from ttuegel/broken--master--plasma

    Mark some Plasma packages broken with Qt < 5.12.0
    ttuegel authored Sep 29, 2019
    Copy the full SHA
    62d1c85 View commit details
  8. tdesktop: 1.8.8 -> 1.8.9

    primeos committed Sep 29, 2019
    Copy the full SHA
    27a335c View commit details
  9. Copy the full SHA
    88af3a6 View commit details
  10. Merge pull request #69983 from r-ryantm/auto-update/uptimed

    uptimed: 0.4.1 -> 0.4.2
    markuskowa authored Sep 29, 2019
    Copy the full SHA
    b09be3c View commit details
  11. Merge pull request #69907 from r-ryantm/auto-update/python3.7-reproject

    python37Packages.reproject: 0.4 -> 0.5.1
    markuskowa authored Sep 29, 2019
    Copy the full SHA
    e5f2d2d View commit details
  12. Merge pull request #70033 from NixOS/revert-69898-auto-update/qradiolink

    Revert "qradiolink: 0.5.0 -> 0.5.2"
    markuskowa authored Sep 29, 2019
    Copy the full SHA
    6e0c3b0 View commit details
  13. Merge pull request #68711 from jonringer/fix-xapian

    pythonPackages.xapian: disable smoketests
    Ma27 authored Sep 29, 2019
    Copy the full SHA
    99dd49f View commit details
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ with lib;

mkDerivation rec {
pname = "telegram-desktop";
version = "1.8.8";
version = "1.8.9";
# Note: Due to our strong dependency on the Arch patches it's probably best
# to also wait for the Arch update (especially if the patches don't apply).

@@ -17,7 +17,7 @@ mkDerivation rec {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
sha256 = "1aj1pnzc6bz8jbdrfwdj2r54jhw9z7b5fd1095r007zmlnzs51lv";
sha256 = "0b1c903ah3fhxr9qjg23p8x9k895k3cxkzz5ckcr7r4pmmbnnvkp";
fetchSubmodules = true;
};

4 changes: 2 additions & 2 deletions pkgs/applications/radio/qradiolink/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
} :

let
version = "0.5.2";
version = "0.5.0";

in stdenv.mkDerivation {
pname = "qradiolink";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
owner = "kantooon";
repo = "qradiolink";
rev = version;
sha256 = "0djhrr96b8sr2vi6hwbzgzlp9771622dp93f0rsphsyxlwbzsrgl";
sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi";
};

preBuild = ''
3 changes: 3 additions & 0 deletions pkgs/desktops/plasma-5/kdecoration.nix
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@

mkDerivation {
name = "kdecoration";
meta = {
broken = builtins.compareVersions qtbase.version "5.12.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ki18n ];
outputs = [ "out" "dev" ];
5 changes: 4 additions & 1 deletion pkgs/desktops/plasma-5/libkscreen/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
mkDerivation, lib, copyPathsToStore, propagate,
extra-cmake-modules,
kwayland, libXrandr, qtx11extras
kwayland, libXrandr, qtbase, qtx11extras
}:

mkDerivation {
name = "libkscreen";
meta = {
broken = builtins.compareVersions qtbase.version "5.12.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kwayland libXrandr qtx11extras ];
outputs = [ "out" "dev" ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/distributed/default.nix
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@

buildPythonPackage rec {
pname = "distributed";
version = "2.3.0";
version = "2.4.0";

# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
sha256 = "15lb6fz3739nkyxi1igzm5p2lk40digkc9fkzjqx1jpymfac9dwl";
sha256 = "1cz7n84g8dgx3cs28qnrh1sd6lka9lx8llysxa6mxyz6wf3ngl9h";
};

checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/reproject/default.nix
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@

buildPythonPackage rec {
pname = "reproject";
version = "0.4";
version = "0.5.1";

doCheck = false; # tests require pytest-astropy

src = fetchPypi {
inherit pname version;
sha256 = "dbbb18a8b211292c7ce61121b8538fc279540337be1c05cabc7570c5aca6d734";
sha256 = "069rha55cbm8vsi1qf8zydds42lgkcc97sd57hmjw1mgiz025xrp";
};

propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ];
1 change: 0 additions & 1 deletion pkgs/development/python-modules/xapian/default.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,6 @@ buildPythonPackage rec {
doCheck = true;

checkPhase = ''
${python.interpreter} python${pythonSuffix}/smoketest.py
${python.interpreter} python${pythonSuffix}/pythontest.py
'';

4 changes: 2 additions & 2 deletions pkgs/tools/X11/xsecurelock/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "xsecurelock";
version = "1.4.0";
version = "1.5.1";

src = fetchFromGitHub {
owner = "google";
repo = "xsecurelock";
rev = "v${version}";
sha256 = "1l9xk3hb5fxp4sqlxjldm4j6cvmxa39a7a37hw8f7vbpmcqy6n6w";
sha256 = "1if8byaby18ydkrk4k5yy8n0981x1dfqikq59gfpb7c2rv0vgi7i";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/tools/system/uptimed/default.nix
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

stdenv.mkDerivation rec {
pname = "uptimed";
version = "0.4.1";
version = "0.4.2";

src = fetchFromGitHub {
sha256 = "0hqs7n3agayckwdgwadzw5shpdh4h1inqgvp4zr5fi324pj5x80j";
sha256 = "0wnnpjfxnycigqj6hag0n6p5piss8cv40y9jda72d9s4df5n91z8";
rev = "v${version}";
repo = "uptimed";
owner = "rpodgorny";