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: 5f24024de6f6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2361318ade5a
Choose a head ref
  • 16 commits
  • 7 files changed
  • 13 contributors

Commits on Mar 29, 2021

  1. python: mypy-protobuf: 1.23 -> 2.4

    BREAKING CHANGE: Dropping compatibility with python <= 3.5
    https://github.com/dropbox/mypy-protobuf/blob/master/CHANGELOG.md
    jack-michaud committed Mar 29, 2021
    Copy the full SHA
    ab3dd3d View commit details

Commits on Apr 3, 2021

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    525420e View commit details

Commits on Apr 4, 2021

  1. Copy the full SHA
    0602101 View commit details
  2. deno: 1.8.2 -> 1.8.3

    06kellyjac committed Apr 4, 2021
    Copy the full SHA
    f4593ab View commit details
  3. Copy the full SHA
    d207656 View commit details
  4. Merge pull request #118455 from 06kellyjac/deno

    deno: 1.8.2 -> 1.8.3
    marsam authored Apr 4, 2021
    Copy the full SHA
    3e974eb View commit details
  5. Merge pull request #118459 from gebner/duplicityclosuresize

    duplicity: reduce closure size
    gebner authored Apr 4, 2021
    Copy the full SHA
    e0a09eb View commit details
  6. Merge pull request #117971 from jack-michaud/bump-mypy-protobuf-version

    python: mypy-protobuf: 1.23 -> 2.4
    risicle authored Apr 4, 2021
    Copy the full SHA
    5401998 View commit details
  7. Copy the full SHA
    67f3319 View commit details
  8. Merge pull request #118347 from eduardosm/gr3.8

    gnuradio3_8: 3.8.2.0 -> 3.8.3.0
    risicle authored Apr 4, 2021
    Copy the full SHA
    ee33b8b View commit details
  9. Merge pull request #118477 from NeQuissimus/wpa_supplicant_learn

    wpa_supplicant: Enable bgscan 'learn' module
    mweinelt authored Apr 4, 2021
    Copy the full SHA
    6059626 View commit details
  10. crlfuzz: 1.4.0 -> 1.4.1

    r-ryantm committed Apr 4, 2021
    Copy the full SHA
    adfad6c View commit details
  11. Merge pull request #118465 from marsam/update-tflint

    tflint: 0.25.0 -> 0.26.0
    SuperSandro2000 authored Apr 4, 2021
    Copy the full SHA
    09ab1cf View commit details
  12. Merge pull request #118486 from r-ryantm/auto-update/crlfuzz

    crlfuzz: 1.4.0 -> 1.4.1
    fabaff authored Apr 4, 2021
    Copy the full SHA
    7d0ba08 View commit details
  13. Copy the full SHA
    8277f39 View commit details
  14. Copy the full SHA
    2361318 View commit details
30 changes: 8 additions & 22 deletions pkgs/applications/radio/gnuradio/3.8.nix
Original file line number Diff line number Diff line change
@@ -42,15 +42,15 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.8";
minor = "2";
minor = "3";
patch = "0";
}
# We use our build of volk and not the one bundled with the release
, fetchSubmodules ? false
}:

let
sourceSha256 = "SFDjtyQRp0fXijZukpLYtISpx8imxedlYN9mRibv1eA=";
sourceSha256 = "0lwbj3slhc8bjjvfw7yz45if21hajydgy2vsjvj2barzmhfb37fd";
featuresInfo = {
# Needed always
basic = {
@@ -241,12 +241,17 @@ stdenv.mkDerivation rec {
};
cmakeFlags = shared.cmakeFlags
# From some reason, if these are not set, libcodec2 and gsm are not
# detected properly. NOTE: qradiolink needs libcodec2 to be detected in
# detected properly. The issue is reported upstream:
# https://github.com/gnuradio/gnuradio/issues/4278
#
# NOTE: qradiolink needs libcodec2 to be detected in
# order to build, see https://github.com/qradiolink/qradiolink/issues/67
++ lib.optionals (hasFeature "gr-vocoder" features) [
"-DLIBCODEC2_FOUND=TRUE"
"-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"
"-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
"-DLIBCODEC2_HAS_FREEDV_API=ON"
"-DLIBGSM_FOUND=TRUE"
"-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"
"-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
]
@@ -262,23 +267,4 @@ stdenv.mkDerivation rec {
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
''
;
patches = [
# Don't install python referencing files if python support is disabled.
# See: https://github.com/gnuradio/gnuradio/pull/3839
(fetchpatch {
url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff";
sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q=";
})
(fetchpatch {
url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff";
sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4=";
})
# Needed to use boost 1.7x, see:
# https://github.com/gnuradio/gnuradio/issues/3720
# https://github.com/gnuradio/gnuradio/pull/3967
(fetchpatch {
url = "https://github.com/gnuradio/gnuradio/commit/cbcb968358fad56f3646619b258f18b0e6693a07.diff";
sha256 = "1ajf4797f869lqv436xw61s29qdbn7f01i0970kfxv3yahd34p9v";
})
];
}
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/mypy-protobuf/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{ lib, fetchPypi, buildPythonApplication, protobuf }:
{ lib, fetchPypi, buildPythonApplication, protobuf, pythonOlder }:

buildPythonApplication rec {
pname = "mypy-protobuf";
version = "2.4";

disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
sha256 = "77e10c476cdd3ee14535c2357e64deac6b1a69f33eb500d795b064acda48c66f";
6 changes: 3 additions & 3 deletions pkgs/development/tools/analysis/tflint/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "tflint";
version = "0.25.0";
version = "0.26.0";

src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "1n234ivpjfvppfqcpgbvsqg869m4g5xyi536di3ckm3sba9r4jwr";
sha256 = "054g0lr0r1xzbss4b4j9ixkls9p1llmw61afib1381z4k0lvzgwn";
};

vendorSha256 = "101bw29c2dn0mf5n32r7rkqrb9r71z3afbhwnzrm31xckbkvlwsa";
vendorSha256 = "0j2avkhyq6vz6113lkf004d4hysygc6iw78v70z98s6m15mg9imn";

doCheck = false;

6 changes: 3 additions & 3 deletions pkgs/development/web/deno/default.nix
Original file line number Diff line number Diff line change
@@ -15,15 +15,15 @@

rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.8.2";
version = "1.8.3";

src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fZuhI+ZvYsFz2gDpHkRRqmmHRyEiEO+vWfqKYdeNtaU=";
sha256 = "sha256-QkVDIpJ4VW3DpcwhydDnt68zxVXwkitIiN8blGlqX1g=";
};
cargoSha256 = "sha256-us0Kzst7iq+H/WBAlSBQJSpnirsl4zImse2bFREoW4I=";
cargoSha256 = "sha256-pf/4/H3wNORNvAswz8+7B3x5T5MyQgW7HgtDLBhfE/o=";

# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/wpa_supplicant/default.nix
Original file line number Diff line number Diff line change
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
CONFIG_P2P=y
CONFIG_TDLS=y
CONFIG_BGSCAN_SIMPLE=y
CONFIG_BGSCAN_LEARN=y
'' + optionalString (pcsclite != null) ''
CONFIG_EAP_SIM=y
CONFIG_EAP_AKA=y
2 changes: 1 addition & 1 deletion pkgs/tools/backup/duplicity/default.nix
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication rec {
librsync
];

propagatedBuildInputs = with pythonPackages; [
pythonPath = with pythonPackages; [
b2sdk
boto
boto3
6 changes: 3 additions & 3 deletions pkgs/tools/security/crlfuzz/default.nix
Original file line number Diff line number Diff line change
@@ -5,16 +5,16 @@

buildGoModule rec {
pname = "crlfuzz";
version = "1.4.0";
version = "1.4.1";

src = fetchFromGitHub {
owner = "dwisiswant0";
repo = pname;
rev = "v${version}";
sha256 = "03g7z7cczn52hvg6srp1i5xhdbpia226adrh2d54cs640063bx3m";
sha256 = "sha256-rqhdxOQmZCRtq+IZygKLleb5GoKP2akyEc3rbGcnZmw=";
};

vendorSha256 = "19cj07f7d3ksp7lh5amdjz1s8p7xmqbwal4vp61al82n8944ify8";
vendorSha256 = "sha256-yLtISEJWIKqCuZtQxReu/Vykw5etqgLpuXqOdtwBkqU=";

doCheck = true;