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: 41ba255e23c0
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: 8531aee99f49
Choose a head ref

Commits on Jun 23, 2020

  1. hydra-unstable: 2020-06-01 -> 2020-06-23

    Fixes the build the changes from b505bf2.
    Ma27 committed Jun 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    39e3c15 View commit details
  2. Copy the full SHA
    72cfe09 View commit details

Commits on Jun 24, 2020

  1. dbeaver: 7.1.0 -> 7.1.1

    jojosch committed Jun 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jojosch Johannes Schleifenbaum
    Copy the full SHA
    8888433 View commit details
  2. Copy the full SHA
    4bdb779 View commit details
  3. Merge pull request #91440 from gebner/uvloop-test

    uvloop: fix tests on python 3.8
    gebner authored Jun 24, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    27859f1 View commit details
  4. maintainers: add siriobalmelli

    Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
    siriobalmelli authored and Jon committed Jun 24, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    8bdbb20 View commit details
  5. beancount_docverif: init at 1.0.0

    Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
    Co-Authored-By: Jon <jonringer@users.noreply.github.com>
    siriobalmelli and Jon committed Jun 24, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    d3d039c View commit details
  6. gomuks: 0.1.0 -> 0.1.2

    pstn committed Jun 24, 2020
    Copy the full SHA
    a8f7edd View commit details
  7. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0cff75e View commit details
  8. pythonPackages.srvlookup: init at 2.0.0

    mmlb authored and Jon committed Jun 24, 2020
    Copy the full SHA
    58a35be View commit details
  9. postman: 7.24.0 -> 7.26.0

    r-ryantm authored and Jon committed Jun 24, 2020
    Copy the full SHA
    b8e9a8c View commit details
  10. pythonPackages.pycoin: init at 0.90.20200322

    nyanloutre authored and Jon committed Jun 24, 2020
    Copy the full SHA
    2b11dcd View commit details
  11. python27Packages.bitstruct: 8.10.0 -> 8.11.0

    r-ryantm authored and Jon committed Jun 24, 2020
    Copy the full SHA
    3a44ede View commit details
  12. Merge pull request #91368 from danieldk/drawio-13.3.1

    drawio: 13.2.2 -> 13.3.1
    Ma27 authored Jun 24, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    31f5199 View commit details
  13. Merge pull request #91357 from Ma27/bump-hydra

    hydra-unstable: 2020-06-01 -> 2020-06-23
    Ma27 authored Jun 24, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7be82cc View commit details
  14. Merge pull request #91426 from pstn/gomuks-0.1.1

    gomuks: 0.1.0 -> 0.1.2
    Mic92 authored Jun 24, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e7cc52a View commit details
  15. sundials: 5.1.0 -> 5.3.0

    krtab authored and Jon committed Jun 24, 2020
    Copy the full SHA
    70cf912 View commit details
  16. tmuxPlugins.fingers: init at 1.0.1

    [tmux-fingers](https://github.com/Morantron/tmux-fingers) provides copy pasting with vimium/vimperator like hints.
    
    Use tag for tmux-fingers rev based on PR feedback
    
    Co-Authored-By: Drew <drewrisinger@users.noreply.github.com>
    2 people authored and Jon committed Jun 24, 2020
    Copy the full SHA
    08a69fb View commit details
  17. brave: 1.8.95 -> 1.10.97

    felschr authored and Jon committed Jun 24, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    e09a882 View commit details
  18. protobuf: 3.12.0 -> 3.12.3

    prusnak authored and Jon committed Jun 24, 2020
    Copy the full SHA
    34943a7 View commit details
  19. cadical: enable tests

    danieldk authored and Jon committed Jun 24, 2020
    Copy the full SHA
    5f0cf22 View commit details
  20. Copy the full SHA
    b2c8af4 View commit details

Commits on Jun 25, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    22d4aed View commit details
  2. Merge pull request #91405 from jojosch/dbeaver_7.1.1

    dbeaver: 7.1.0 -> 7.1.1
    marsam authored Jun 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7f86112 View commit details
  3. Merge pull request #91450 from zowoq/gh

    gitAndTools.gh: 0.10.0 -> 0.10.1
    marsam authored Jun 25, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8531aee View commit details
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -7266,6 +7266,16 @@
githubId = 2770647;
name = "Simon Vandel Sillesen";
};
siriobalmelli = {
email = "sirio@b-ad.ch";
github = "siriobalmelli";
githubId = 23038812;
name = "Sirio Balmelli";
keys = [{
longkeyid = "ed25519/0xF72C4A887F9A24CA";
fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA";
}];
};
sivteck = {
email = "sivaram1992@gmail.com";
github = "sivteck";
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/drawio/default.nix
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@

stdenv.mkDerivation rec {
pname = "drawio";
version = "13.2.2";
version = "13.3.1";

src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
sha256 = "0npqw4ih047d9s1yyllcvcih2r61fgji4rvzsw88r02mj5q5rgdn";
sha256 = "0zvxmqqbgfxad1n9pa4h99l8hys486wziw5yyndxbv1v80p55p0p";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/misc/dbeaver/default.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

stdenv.mkDerivation rec {
pname = "dbeaver-ce";
version = "7.1.0";
version = "7.1.1";

desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "1q3f5bghm3jw5c7c62ivf32fldjqhmj1a0qlwgqjxyhmfcig0rnb";
sha256 = "11c9jvpjg72xkwnni4clwg3inig77s7jz3ik52gk52m6f09brxhs";
};

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/brave/default.nix
Original file line number Diff line number Diff line change
@@ -86,11 +86,11 @@ in

stdenv.mkDerivation rec {
pname = "brave";
version = "1.8.95";
version = "1.10.97";

src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "1mlffg2v31b42gj354w5yv0yzlqc2f4f3cmdnddzkplw10jgw6f1";
sha256 = "1qwk75k8km2sy7l3m4k5m383sl75dph4dyrp8hd65x5hnpip67yi";
};

dontConfigure = true;
Original file line number Diff line number Diff line change
@@ -2,19 +2,18 @@

buildGoModule rec {
pname = "gomuks";
version = "0.1.0";
version = "0.1.2";

goPackagePath = "maunium.net/go/gomuks";
patches = [ ./gomod.patch ];

src = fetchFromGitHub {
owner = "tulir";
repo = pname;
rev = "v" + version;
sha256 = "1dcqkyxiqiyivzn85fwkjy8xs9yk89810x9mvkaiz0dx3ha57zhi";
sha256 = "11bainw4w9fdrhv2jm0j9fw0f7r4cxlblyazbhckgr4j9q900383";
};

vendorSha256 = "1mfi167mycnnlq8dwh1kkx6drhhi4ib58aad5fwc90ckdaq1rpb7";
vendorSha256 = "11rk7pma6dr6fsyz8hpjyr7nc2c7ichh5m7ds07m89gzk6ar55gb";

buildInputs = [ olm ];

12 changes: 0 additions & 12 deletions pkgs/applications/networking/instant-messengers/gomuks/gomod.patch

This file was deleted.

2 changes: 2 additions & 0 deletions pkgs/applications/science/logic/cadical/default.nix
Original file line number Diff line number Diff line change
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf";
};

doCheck = true;
dontAddPrefix = true;

installPhase = ''
install -Dm0755 build/cadical "$out/bin/cadical"
install -Dm0755 build/mobical "$out/bin/mobical"
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "gh";
version = "0.10.0";
version = "0.10.1";

src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "0m4qgvhd4fzl83acfbpwff0sqshyfhqiy5q4i7ly8h6rdsjysdck";
sha256 = "0q4zpm10hcci4j0g1gx08q2qwn71ab9f7yaf4k78sfn5p89y7rm2";
};

vendorSha256 = "0zkgdb69zm662p50sk1663lcbkw0vp8ip9blqfp6539mp9b87dn7";
vendorSha256 = "0igbqnylryiq36lbb1gha8najijzxmn10asc0xayxygbxc16s1vi";

nativeBuildInputs = [ installShellFiles ];

4 changes: 2 additions & 2 deletions pkgs/development/libraries/protobuf/3.12.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage, ... }:

callPackage ./generic-v3.nix {
version = "3.12.0";
sha256 = "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a";
version = "3.12.3";
sha256 = "0q4sn9d6x8w0zgzydfx9f7b2zdk0kiplk8h9jxyxhw6m9qn276ax";
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/sundials/default.nix
Original file line number Diff line number Diff line change
@@ -11,14 +11,14 @@ assert (!blas.isILP64) && (!lapack.isILP64);

stdenv.mkDerivation rec {
pname = "sundials";
version = "5.1.0";
version = "5.3.0";

buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ];
nativeBuildInputs = [ cmake ];

src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
sha256 = "08cvzmbr2qc09ayq4f5j07lw97hl06q4dl26vh4kh822mm7x28pv";
sha256 = "19xwi7pz35s2nqgldm6r0jl2k0bs36zhbpnmmzc56s1n3bhzgpw8";
};

patches = [
46 changes: 46 additions & 0 deletions pkgs/development/python-modules/beancount_docverif/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, beancount
, pytest, sh
}:

buildPythonPackage rec {
version = "1.0.0";
pname = "beancount_docverif";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "1kjc0axrxpvm828lqq5m2ikq0ls8xksbmm7312zw867gdx56x5aj";
};

propagatedBuildInputs = [
beancount
];

checkInputs = [
pytest
sh
];

checkPhase = ''
pytest
'';

meta = with lib; {
homepage = "https://github.com/siriobalmelli/beancount_docverif";
description = "Document verification plugin for Beancount";
longDescription = ''
Docverif is the "Document Verification" plugin for beancount, fulfilling the following functions:
- Require that every transaction touching an account have an accompanying document on disk.
- Explictly declare the name of a document accompanying a transaction.
- Explicitly declare that a transaction is expected not to have an accompanying document.
- Look for an "implicit" PDF document matching transaction data.
- Associate (and require) a document with any type of entry, including open entries themselves.
- Guarantee integrity: verify that every document declared does in fact exist on disk.
'';
license = licenses.mit;
maintainers = with maintainers; [ siriobalmelli ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/bitstruct/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "bitstruct";
version = "8.10.0";
version = "8.11.0";

src = fetchPypi {
inherit pname version;
sha256 = "0dncll29a0lx8hn1xlhr32abkvj1rh8xa6gc0aas8wnqzh7bvqqm";
sha256 = "0p9d5242pkzag7ac5b5zdjyfqwxvj2jisyjghp6yhjbbwz1z44rb";
};

meta = with lib; {
42 changes: 42 additions & 0 deletions pkgs/development/python-modules/pycoin/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{ stdenv
, fetchPypi
, buildPythonPackage
, gnupg
, setuptools
, pytestCheckHook
}:

buildPythonPackage rec {
pname = "pycoin";
version = "0.90.20200322";

src = fetchPypi {
inherit pname version;
sha256 = "c8af579e86c118deb64d39e0d844d53a065cdd8227ddd632112e5667370b53a3";
};

propagatedBuildInputs = [ setuptools ];

postPatch = ''
substituteInPlace ./pycoin/cmds/tx.py --replace '"gpg"' '"${gnupg}/bin/gpg"'
'';

checkInputs = [ pytestCheckHook ];

dontUseSetuptoolsCheck = true;

# Disable tests depending on online services
disabledTests = [
"ServicesTest"
"test_tx_pay_to_opcode_list_txt"
"test_tx_fetch_unspent"
"test_tx_with_gpg"
];

meta = with stdenv.lib; {
description = "Utilities for Bitcoin and altcoin addresses and transaction manipulation";
homepage = "https://github.com/richardkiss/pycoin";
license = licenses.mit;
maintainers = with maintainers; [ nyanloutre ];
};
}
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/srvlookup/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, fetchPypi, buildPythonPackage
, dnspython
, mock, nose
}:

buildPythonPackage rec {
pname = "srvlookup";
version = "2.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "1zf1v04zd5phabyqh0nhplr5a8vxskzfrzdh4akljnz1yk2n2a0b";
};

propagatedBuildInputs = [ dnspython ];
checkInputs = [ mock nose ];

meta = with stdenv.lib; {
homepage = "https://github.com/gmr/srvlookup";
license = [ licenses.bsd3 ];
description = "A small wrapper for dnspython to return SRV records for a given host, protocol, and domain name as a list of namedtuples.";
maintainers = [ maintainers.mmlb ];
};
}
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/uvloop/default.nix
Original file line number Diff line number Diff line change
@@ -44,6 +44,9 @@ buildPythonPackage rec {
"--tb=native"
# ignore code linting tests
"--ignore=tests/test_sourcecode.py"
# Fails on Python 3.8
# https://salsa.debian.org/python-team/modules/uvloop/-/commit/302a7e8f5a2869e13d0550cd37e7a8f480e79869
"--ignore=tests/test_tcp.py"
];

disabledTests = [
15 changes: 4 additions & 11 deletions pkgs/development/tools/misc/hydra/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }:
{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }:

{
# Package for phase-1 of the db migration for Hydra.
@@ -24,22 +24,15 @@
# so when having an older version, `pkgs.hydra-migration` should be deployed first.

hydra-unstable = callPackage ./common.nix {
version = "2020-06-01";
version = "2020-06-23";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a";
sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4";
rev = "bb32aafa4a9b027c799e29b1bcf68727e3fc5f5b";
sha256 = "0kl9h70akwxpik3xf4dbbh7cyqn06023kshfvi14mygdlb84djgx";
};
nix = nixFlakes;

patches = [
(fetchpatch {
url = "https://github.com/NixOS/hydra/commit/d4822a5f4b57dff26bdbf436723a87dd62bbcf30.patch";
sha256 = "1n6hyjz1hzvka4wi78d4wg0sg2wanrdmizqy23vmp7pmv8s3gz8w";
})
];

tests = {
db-migration = nixosTests.hydra-db-migration.mig;
basic = nixosTests.hydra.hydra-unstable;
5 changes: 4 additions & 1 deletion pkgs/development/tools/unity3d/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium
, libpqxx
, libpqxx, libselinux, pciutils, libpulseaudio
}:

let
@@ -15,6 +15,8 @@ let
libX11 libXcursor libXdamage libXfixes libXrender libXi
libXcomposite libXext libXrandr libXtst libSM libICE libxcb
libpqxx gtk3

libselinux pciutils libpulseaudio
];
libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ];
binPath = lib.makeBinPath [ nodejs gnutar ];
@@ -56,6 +58,7 @@ in stdenv.mkDerivation {
mkdir -p $out/bin
makeWrapper $unitydir/Unity $out/bin/unity-editor \
--prefix LD_LIBRARY_PATH : "${libPath64}" \
--prefix LD_PRELOAD : "$unitydir/libunity-nosuid.so" \
--prefix PATH : "${binPath}"
'';
5 changes: 4 additions & 1 deletion pkgs/development/tools/unityhub/default.nix
Original file line number Diff line number Diff line change
@@ -11,7 +11,10 @@ in appimageTools.wrapType2 rec {
libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5

libX11 libXcursor libXdamage libXfixes libXrender libXi
libXcomposite libXext libXrandr libXtst libSM libICE libxcb ]);
libXcomposite libXext libXrandr libXtst libSM libICE libxcb

libselinux pciutils libpulseaudio
]);

profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
4 changes: 2 additions & 2 deletions pkgs/development/web/postman/default.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@

stdenv.mkDerivation rec {
pname = "postman";
version = "7.24.0";
version = "7.26.0";

src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha256 = "0wriyj58icgljmghghyxi1mnjr1vh5jyp8lzwcf6lcsdvsh0ccmw";
sha256 = "05xs389bf0127n8rdivbfxvgjvlrk9pyr74klswwlksxciv74i3j";
name = "${pname}.tar.gz";
};

13 changes: 13 additions & 0 deletions pkgs/misc/tmux-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -109,6 +109,19 @@ in rec {
};
};

fingers = mkDerivation rec {
pluginName = "fingers";
version = "1.0.1";
src = fetchFromGitHub {
owner = "Morantron";
repo = "tmux-fingers";
rev = version;
sha256 = "0gp37m3d0irrsih96qv2yalvr1wmf1n64589d4qzyzq16lzyjcr0";
fetchSubmodules = true;
};
dependencies = [ pkgs.gawk ];
};

fpp = mkDerivation {
pluginName = "fpp";
version = "unstable-2016-03-08";
6 changes: 6 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -517,6 +517,8 @@ in {

beanstalkc = callPackage ../development/python-modules/beanstalkc { };

beancount_docverif = callPackage ../development/python-modules/beancount_docverif { };

bitarray = callPackage ../development/python-modules/bitarray { };

bitcoinlib = callPackage ../development/python-modules/bitcoinlib { };
@@ -1554,6 +1556,8 @@ in {

spglib = callPackage ../development/python-modules/spglib { };

srvlookup = callPackage ../development/python-modules/srvlookup { };

sshpubkeys = callPackage ../development/python-modules/sshpubkeys { };

sshtunnel = callPackage ../development/python-modules/sshtunnel { };
@@ -5241,6 +5245,8 @@ in {

pyaudio = callPackage ../development/python-modules/pyaudio { };

pycoin = callPackage ../development/python-modules/pycoin { };

pysam = callPackage ../development/python-modules/pysam { };

pysaml2 = callPackage ../development/python-modules/pysaml2 {