Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 74b8783c495b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 808c122027ed
Choose a head ref
  • 20 commits
  • 14 files changed
  • 9 contributors

Commits on Dec 15, 2020

  1. archivy: 0.9.2 -> 0.9.3

    siraben committed Dec 15, 2020
    Copy the full SHA
    20a9e43 View commit details
  2. Copy the full SHA
    9c8a771 View commit details

Commits on Dec 16, 2020

  1. Copy the full SHA
    5c70ff1 View commit details
  2. Copy the full SHA
    ea66205 View commit details
  3. mopidy-local: 3.1.1 -> 3.2.0

    ruuda committed Dec 16, 2020
    Copy the full SHA
    fa68526 View commit details
  4. Copy the full SHA
    8d51f70 View commit details

Commits on Dec 17, 2020

  1. emacs: Fix accidental double wrapping

    This makeWrapper invocation found it's way back via a rebase.
    adisbladis committed Dec 17, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    dd5d248 View commit details
  2. Merge pull request #106977 from marsam/update-docker-slim

    docker-slim: 1.32.0 -> 1.33.0
    marsam authored Dec 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    656f3b1 View commit details
  3. Merge pull request #107059 from r-ryantm/auto-update/python3.7-google…

    …-cloud-bigquery
    
    python37Packages.google_cloud_bigquery: 2.4.0 -> 2.6.1
    marsam authored Dec 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4a39600 View commit details
  4. Merge pull request #107043 from ruuda/mopidy-local-320

    mopidy-local: 3.1.1 -> 3.2.0
    marsam authored Dec 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2d698bb View commit details
  5. Merge pull request #107035 from marsam/update-ncspot

    ncspot: 0.2.5 -> 0.2.6
    marsam authored Dec 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d24d4b0 View commit details
  6. Merge pull request #107024 from sternenseemann/utf8proc-2.6.1

    utf8proc: 2.6.0 -> 2.6.1
    marsam authored Dec 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    05f00ef View commit details
  7. Merge pull request #106968 from siraben/archivy-update

    archivy: 0.9.2 -> 0.9.3
    marsam authored Dec 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7f5a7cf View commit details
  8. python37Packages.trimesh: 3.8.18 -> 3.8.19

    r-ryantm authored and Jonathan Ringer committed Dec 17, 2020
    Copy the full SHA
    dcd9e3c View commit details
  9. python37Packages.bleak: 0.9.1 -> 0.10.0

    r-ryantm authored and Jonathan Ringer committed Dec 17, 2020
    Copy the full SHA
    469d91a View commit details
  10. vimPlugins: update

    RonanMacF authored and Jonathan Ringer committed Dec 17, 2020
    Copy the full SHA
    4826430 View commit details
  11. python37Packages.pyvcd: 0.2.3 -> 0.2.4

    r-ryantm authored and Jonathan Ringer committed Dec 17, 2020
    Copy the full SHA
    3ee553d View commit details
  12. pythonPackages.psautohint: 2.1.2 -> 2.2.0

    sternenseemann authored and Jonathan Ringer committed Dec 17, 2020
    Copy the full SHA
    cff40a9 View commit details
  13. azure-cli: 2.15.1 -> 2.16.0

    anhdle14 authored and Jonathan Ringer committed Dec 17, 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
    66acfa3 View commit details
  14. Verified

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

python3Packages.buildPythonApplication rec {
pname = "Mopidy-Local";
version = "3.1.1";
version = "3.2.0";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "13m0iz14lyplnpm96gfpisqvv4n89ls30kmkg21z7v238lm0h19j";
sha256 = "14f78sb3wkg83dg3xcqlq77dh059zzcwry5l9ilyhnmvmyrkhqx0";
};

propagatedBuildInputs = [
6 changes: 3 additions & 3 deletions pkgs/applications/audio/ncspot/default.nix
Original file line number Diff line number Diff line change
@@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.2.5";
version = "0.2.6";

src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "19jy1ma2viqnyfbqdpm4cf8mpdrc0xyxrk7sayx1b7dqmkxcyp5c";
sha256 = "0x40qzgw9zcih4q6mzclb7gqkw8h76hrmqzmg6nimpla29jcdxss";
};

cargoSha256 = "0lgd4ff70qsjplm847hkx1hgs3kpwv2ahmgyhsld3mng3k7qfm09";
cargoSha256 = "1pfl7cblf7d4ci514vlkdh1ybgby71x4aszxmlsrqmn92bq56jys";

cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];

16 changes: 8 additions & 8 deletions pkgs/applications/misc/archivy/default.nix
Original file line number Diff line number Diff line change
@@ -5,25 +5,25 @@ watchdog, wtforms }:

python3.pkgs.buildPythonApplication rec {
pname = "archivy";
version = "0.9.2";
version = "0.9.3";

src = fetchPypi {
inherit pname version;
sha256 = "5cb760da57dc9dcdd62c0af824993d1715ec7035915629b4046d8bf50442756c";
sha256 = "b6ff08a9ecd0a929663c36c73844ac5cb4dc847e69aae639a450c64d4320a506";
};

# Relax some dependencies
postPatch = ''
substituteInPlace requirements.txt \
--replace 'validators ==' 'validators >=' \
--replace 'elasticsearch ==' 'elasticsearch >=' \
--replace 'python-dotenv ==' 'python-dotenv >=' \
--replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \
--replace 'WTForms ==' 'WTForms >=' \
--replace 'python_dotenv ==' 'python_dotenv >=' \
--replace 'attrs == 20.2.0' 'attrs' \
--replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \
--replace 'elasticsearch ==' 'elasticsearch >=' \
--replace 'python_dotenv ==' 'python_dotenv >=' \
--replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \
--replace 'requests ==' 'requests >='
--replace 'requests ==' 'requests >=' \
--replace 'validators ==' 'validators >=' \
--replace 'watchdog ==' 'watchdog >='
'';

propagatedBuildInputs = [
5 changes: 3 additions & 2 deletions pkgs/applications/virtualization/docker-slim/default.nix
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@

buildGoPackage rec {
pname = "docker-slim";
version = "1.32.0";
version = "1.33.0";

goPackagePath = "github.com/docker-slim/docker-slim";

src = fetchFromGitHub {
owner = "docker-slim";
repo = "docker-slim";
rev = version;
sha256 = "0pd2v7df176ca923c4nw9ns5gz442jkb0jhzqjl53rwfwz1vxy9h";
sha256 = "0fk1r9id3fjcqdg4nls2k5ik3822njz4xx9fpbvmx0fycvjmbr4v";
};

subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
@@ -39,6 +39,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "Minify and secure Docker containers";
homepage = "https://dockersl.im/";
changelog = "https://github.com/docker-slim/docker-slim/blob/${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ];
};
5 changes: 0 additions & 5 deletions pkgs/build-support/emacs/wrapper.nix
Original file line number Diff line number Diff line change
@@ -185,11 +185,6 @@ runCommand
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \
--subst-var prog
chmod +x $out/bin/$progname
makeWrapper "$prog" "$out/bin/$progname" \
--suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:" \
--suffix EMACSNATIVELOADPATH ":" "$deps/share/emacs/native-lisp:"
done
# Wrap MacOS app
4 changes: 2 additions & 2 deletions pkgs/development/libraries/utf8proc/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "utf8proc";
version = "2.6.0";
version = "2.6.1";

src = fetchFromGitHub {
owner = "JuliaStrings";
repo = pname;
rev = "v${version}";
sha256 = "0czk8xw1jra0fjf6w4bcaridyz3wz2br3v7ik1g7z0j5grx9n8r1";
sha256 = "1zqc6airkzkssbjxanx5v8blfk90180gc9id0dx8ncs54f1ib8w7";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/bleak/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildPythonPackage rec {
pname = "bleak";
version = "0.9.1";
version = "0.10.0";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "f81b0069e5c1570883144c1910b884e5cefe16d3c2ed09e579b6d8f853f08588";
sha256 = "5c3a873965f2910865895e572e7a4f10533d6e150e6ba17936397426bf8d1eee";
};

postPatch = ''
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "2.4.0";
version = "2.6.1";

src = fetchPypi {
inherit pname version;
sha256 = "2d53d6fed1c25c9c0ce361dad1c64203c96b2344f7156357a501630d1cb08445";
sha256 = "1f99fd0c0c5bde999e056a1be666e5d5bbf392f62c9e730dfcbaf6e8408d44ef";
};

disabled = pythonOlder "3.6";
7 changes: 4 additions & 3 deletions pkgs/development/python-modules/psautohint/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, fonttools, lxml, fs
, fonttools
, lxml, fs # for fonttools extras
, setuptools_scm
, pytestCheckHook, pytest_5, pytestcov, pytest_xdist
}:

buildPythonPackage rec {
pname = "psautohint";
version = "2.1.2";
version = "2.2.0";

disabled = pythonOlder "3.6";

src = fetchFromGitHub {
owner = "adobe-type-tools";
repo = pname;
rev = "v${version}";
sha256 = "1s2l54gzn11y07zaggprwif7r3ia244qijjhkbvjdx4jsgc5df8n";
sha256 = "0gsgfr190xy2rnjf1gf7688xrh13ihgq10s19s4rv5hp6pmg9iaa";
fetchSubmodules = true; # data dir for tests
};

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyvcd/default.nix
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@
}:

buildPythonPackage rec {
version = "0.2.3";
version = "0.2.4";
pname = "pyvcd";
disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
sha256 = "c0fd7321143e821033f59dd41fc6b0350d1533ddccd4c8fc1d1f76e21cd667de";
sha256 = "071e51a8362908ad5a2a12f078185639b98b20b653a56f01679de169d0fa425d";
};

buildInputs = [ setuptools_scm ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/trimesh/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "trimesh";
version = "3.8.18";
version = "3.8.19";

src = fetchPypi {
inherit pname version;
sha256 = "89f9ec5f1abe7e829f7f1cb9a7aa3f3eb768482272beb2c8987e933d9c068110";
sha256 = "e2ec4fc75bddf46fd494a9c95adc0bf0fe6f667cae242ead99955ad659d6e375";
};

propagatedBuildInputs = [ numpy ];
12 changes: 6 additions & 6 deletions pkgs/misc/vim-plugins/generated.nix
Original file line number Diff line number Diff line change
@@ -3036,12 +3036,12 @@ let

plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
version = "2020-12-12";
version = "2020-12-16";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
rev = "16eb57376ce62fbb86ebbd721fb7d2c1b1a0164f";
sha256 = "0nn1bili0xfldn12svm2px81y8957mj7snl07xx6v1qpfjinp1pm";
rev = "2c7d9031eea13e50818f94118a5cdd30692feafa";
sha256 = "1vx0l3p44ycqhy1mkdz47j64bdakq77hlda2zldbcfshxlmsb6rb";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -3722,12 +3722,12 @@ let

telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2020-12-15";
version = "2020-12-16";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "af8d990c2cc19577f9503fae29c59d256e304bee";
sha256 = "021978fdd73rdwwsz2zjghkg7x4d0d33589xvyvhxbca1fnznf3v";
rev = "b5ff9de13d4b15e78e9d3433d6bf085601f62a5d";
sha256 = "1ckb1ka1wp8m859xdbvzhh52gq4i3j5qia4w6mcz78x358mknp6x";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
4 changes: 2 additions & 2 deletions pkgs/tools/admin/azure-cli/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:

let
version = "2.15.1";
version = "2.16.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
sha256 = "05vwaafb6yzvrhig0gjkb4803yj6qr00gqh41rws9520899f2m9d";
sha256 = "wuHPNpt5pizgAwxRxJpRBiX6keJpKRpHu6M5BpFUyeY=";
};

# put packages that needs to be overriden in the py package scope
36 changes: 12 additions & 24 deletions pkgs/tools/admin/azure-cli/python-packages.nix
Original file line number Diff line number Diff line change
@@ -6,7 +6,8 @@ let
prePatch = (attrs.prePatch or "") + ''
rm -f azure_bdist_wheel.py tox.ini
substituteInPlace setup.py \
--replace "wheel==0.30.0" "wheel"
--replace "wheel==0.30.0" "wheel" \
--replace "cryptography>=2.3.1,<3.0.0" "cryptography"
sed -i "/azure-namespace-package/c\ " setup.cfg
'';

@@ -148,8 +149,8 @@ let
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
"13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";

azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.2.0" "zip"
"ddfe4c0c55f0e3fd1f66dd82c1d4a3d872ce124639b9a77fcd172daf464438a5";
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.3.0" "zip"
"1bb95rlwfikfl3pgyga0v5lfgr1xyaybm1nq2498rncfcvdpkjhz";

azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip"
"0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy";
@@ -196,17 +197,17 @@ let
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";

azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.13.0" "zip"
"1fq3hgwwhba6vv07rciiibwmp2zlygz20zp1mzdxajqlfg838q78";
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.14.0" "zip"
"0f8m7j8sdm1rfrwizz3qfk4lyb2x02af3v66as5yqjriipk1bnbg";

azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";

azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip"
"18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh";

azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "12.0.0" "zip"
"150074lnld426lv37v4gy41cqqvj57zw4mrz5svv7iynljb2jl3l";
azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "13.0.0" "zip"
"02ac54fs4wqdwy986j9qyx6fbl5zmpkh1sykr9r6mqk1xx9l4jq8";

azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip"
"1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm";
@@ -241,8 +242,8 @@ let
azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip"
"1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm";

azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.3.0" "zip"
"0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy";
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.5.0" "zip"
"0dr8xml9zlsnag761zx7ifvdkhsv4syzxpmdn4gbf9c5qcq65dsf";

azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip"
"1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77";
@@ -256,8 +257,8 @@ let
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip"
"2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d";

azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip"
"0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.2.0" "zip"
"10b8y1b5qlyr666x7yimnwis9386ciphrxdnmmyzk90qg6h0niry";

azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc15" "zip"
"1fnmdl3m7kdn6c2ws5vrm7nwadcbq9mgc6g5bg4s1a4xjb23q6vb";
@@ -392,19 +393,6 @@ let
'';
});

cryptography = super.cryptography.overridePythonAttrs(oldAttrs: rec {
version = "2.9.2";

src = super.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
sha256 = "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0";
};

# prevent cycle with cryptography-vectors
doCheck = false;
});

knack = super.knack.overridePythonAttrs(oldAttrs: rec {
version = "0.7.2";