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: a4f8cec54dcf
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: 7829e5791ba1
Choose a head ref
  • 9 commits
  • 3 files changed
  • 8 contributors

Commits on May 11, 2020

  1. gitAndTools.gh: 0.6.4 -> 0.7.0 

    https://github.com/cli/cli/releases/tag/v0.7.0
(cherry picked from commit f7b9c6c)
    @zowoq
    zowoq committed May 11, 2020
    Copy the full SHA
    c9ae4b6 View commit details

Commits on May 12, 2020

  1. gitAndTools.gh: 0.7.0 -> 0.8.0 

    https://github.com/cli/cli/releases/tag/v0.8.0
(cherry picked from commit 6618edf)
    @zowoq
    zowoq committed May 12, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 5EF7BA26748D673D
    Learn about vigilant mode
    Copy the full SHA
    b24db14 View commit details

Commits on May 13, 2020

  1. visidata: add setuptools 

    and ran nixpkgs-fmt.

This allows to access visidata's help via ctrl+H.

(cherry picked from commit d21cf30)
    @teto
    teto authored and Badi Abdul-Wahid committed May 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3310a6b View commit details

  2. visidata: add darwin to supported platforms 

    (cherry picked from commit b332947)
    @badmutex
    badmutex authored and Badi Abdul-Wahid committed May 13, 2020
    Copy the full SHA
    05d17d0 View commit details

  3. qutebrowser: 1.10.0 -> 1.10.1 

    (cherry picked from commit 1619ec9)
    @emmanuelrosa @bjornfor
    emmanuelrosa authored and bjornfor committed May 13, 2020
    Copy the full SHA
    aa00678 View commit details

  4. qutebrowser: 1.10.1 -> 1.11.0 

    (cherry picked from commit 4a5b853)
    @paumr @bjornfor
    paumr authored and bjornfor committed May 13, 2020
    Copy the full SHA
    2c073a6 View commit details

  5. qutebrowser: 1.11.0 -> 1.11.1 

    fixes CVE-2020-11054

(cherry picked from commit 52fcfd3)
    @dotlambda @bjornfor
    dotlambda authored and bjornfor committed May 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c3e2cbf View commit details

  6. Merge pull request #87743 from badmutex/release-20.03-visidata-darwin 

    backport: visidata is supported on darwin + add setuptools
    @7c6f434c
    7c6f434c authored May 13, 2020
    Copy the full SHA
    bd561f6 View commit details

Commits on May 14, 2020

  1. Merge pull request #87655 from zowoq/gh-backport 

    [20.03] gitAndTools.gh: 0.6.4 -> 0.8.0
    @marsam
    marsam authored May 14, 2020
    Copy the full SHA
    7829e57 View commit details
35 changes: 28 additions & 7 deletions pkgs/applications/misc/visidata/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
{ buildPythonApplication, lib, fetchFromGitHub
, dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp
{ buildPythonApplication
, lib
, fetchFromGitHub
, dateutil
, pyyaml
, openpyxl
, xlrd
, h5py
, fonttools
, lxml
, pandas
, pyshp
, setuptools
}:
buildPythonApplication rec {
pname = "visidata";
@@ -12,17 +23,27 @@ buildPythonApplication rec {
sha256 = "19gs8i6chrrwibz706gib5sixx1cjgfzh7v011kp3izcrn524mc0";
};

propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools
lxml pandas pyshp ];
propagatedBuildInputs = [
dateutil
pyyaml
openpyxl
xlrd
h5py
fonttools
lxml
pandas
pyshp
setuptools
];

doCheck = false;

meta = {
inherit version;
description = "Interactive terminal multitool for tabular data";
license = lib.licenses.gpl3 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.raskin ];
platforms = with lib.platforms; linux ++ darwin;
homepage = "http://visidata.org/";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/qutebrowser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,12 +21,12 @@ let

in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
version = "1.10.0";
version = "1.11.1";

# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby";
sha256 = "0cxmmw002f5rvxzyhlhzqm2ipf64w4vspf298p6c5kpg535m8cvs";
};

# Needs tox
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/git-and-tools/gh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,19 +2,19 @@

buildGoModule rec {
pname = "gh";
version = "0.6.4";
version = "0.8.0";

src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "0na8zfvcmdy968i47x6qd1jwfaphy5h18ff7ym5sxyia9a27yhf8";
sha256 = "08fy3677yq52x40rab49ijhw4r25ls2807dbv9wpna6w07n7r8v7";
};

modSha256 = "102v30wr9wmd6n20qdvgs5mp2s639pwbqqd71r8q52f42p694bi1";
modSha256 = "0v33x9bnwjfg4425vralnsb4i22c0g1rcmaga9911v0i7d51k0fn";

buildFlagsArray = [
"-ldflags=-X github.com/cli/cli/command.Version=${version}"
"-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}"
];

subPackages = [ "cmd/gh" ];