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: 3bf9cc3154c5
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: 8500d560a44d
Choose a head ref

Commits on Dec 23, 2019

  1. asciidoctorj: 2.1.0 -> 2.2.0

    r-ryantm committed Dec 23, 2019
    Copy the full SHA
    54cdd26 View commit details

Commits on Dec 24, 2019

  1. pspg: 2.6.0 -> 2.6.4

    r-ryantm committed Dec 24, 2019
    Copy the full SHA
    48a85e5 View commit details

Commits on Jan 1, 2020

  1. mutagen: init at 0.10.2

    marsam committed Jan 1, 2020
    Copy the full SHA
    184d0e7 View commit details

Commits on Jan 20, 2020

  1. diffoscope: 133 -> 135

    r-ryantm committed Jan 20, 2020
    Copy the full SHA
    cc1bed5 View commit details

Commits on Jan 21, 2020

  1. pspg: 2.6.4 -> 2.6.6

    marsam committed Jan 21, 2020
    Copy the full SHA
    64699ca View commit details
  2. pspg: enable on darwin

    marsam committed Jan 21, 2020
    Copy the full SHA
    8af54fc View commit details
  3. Copy the full SHA
    1c45292 View commit details
  4. groonga: 9.1.0 -> 9.1.1

    r-ryantm committed Jan 21, 2020
    Copy the full SHA
    3d302c3 View commit details
  5. pantheon.elementary-gtk-theme: 5.4.0 -> 5.4.1

    * Improve contrast in text selections elementary/stylesheet#572
    * Add border and background to selected image radios elementary/stylesheet#576
    worldofpeace committed Jan 21, 2020
    Copy the full SHA
    dc18433 View commit details
  6. Copy the full SHA
    2c4ab48 View commit details
  7. Copy the full SHA
    0c8041d View commit details
  8. pythonPackages.nest-asyncio: build without tests

    Tests fail on v1.2.1 & old v1.2.0.
    This disables the tests to allow this package to build.
    There doesn't seem to be an easy fix to allow running tests, b/c
    the GitHub repo doesn't have release tags.
    drewrisinger authored and Jon committed Jan 21, 2020
    Copy the full SHA
    338c151 View commit details
  9. Merge pull request #78158 from marsam/update-jetbrains-mono

    jetbrains-mono: 1.0.0 -> 1.0.1
    marsam authored Jan 21, 2020
    Copy the full SHA
    d1d1273 View commit details
  10. Merge pull request #78064 from marsam/init-mutagen

    mutagen: init at 0.10.2
    marsam authored Jan 21, 2020
    Copy the full SHA
    e4ba082 View commit details
  11. Merge pull request #78071 from r-ryantm/auto-update/diffoscope

    diffoscope: 133 -> 135
    marsam authored Jan 21, 2020
    Copy the full SHA
    9e6868b View commit details
  12. Merge pull request #78170 from r-ryantm/auto-update/groonga

    groonga: 9.1.0 -> 9.1.1
    marsam authored Jan 21, 2020
    Copy the full SHA
    33c1cb4 View commit details
  13. Merge pull request #76216 from r-ryantm/auto-update/asciidoctorj

    asciidoctorj: 2.1.0 -> 2.2.0
    marsam authored Jan 21, 2020
    Copy the full SHA
    248b427 View commit details
  14. pythonPackages.denonavr: init at 0.7.10

    colemickens authored and Jon committed Jan 21, 2020
    Copy the full SHA
    bb92cfd View commit details
  15. plexapi: init at 3.2.0

    colemickens authored and Jon committed Jan 21, 2020
    Copy the full SHA
    4249db1 View commit details
  16. plexauth: init at 0.0.5

    colemickens authored and Jon committed Jan 21, 2020
    Copy the full SHA
    51c0802 View commit details
  17. plexwebsocket: init at 0.0.6

    colemickens authored and Jon committed Jan 21, 2020
    Copy the full SHA
    4e26252 View commit details
  18. fluidasserts: 20.1.22554 -> 20.1.28253

    - bumps the fluidasserts version to 20.1.28253
    - in this version the build process is deterministic and
      reproducible (you'll get the same hash on multiple builds)
    - see: https://gitlab.com/fluidattacks/asserts/issues/873
    kamadorueda authored and Jon committed Jan 21, 2020
    Copy the full SHA
    2dddf14 View commit details

Commits on Jan 22, 2020

  1. Copy the full SHA
    273d7de View commit details
  2. jetty: 9.4.24.v20191120 -> 9.4.25.v20191220

    r-ryantm authored and Jon committed Jan 22, 2020
    Copy the full SHA
    359f235 View commit details
  3. flrig: 1.3.48 -> 1.3.49

    r-ryantm authored and Jon committed Jan 22, 2020
    Copy the full SHA
    35098e4 View commit details
  4. kmymoney: 5.0.7 -> 5.0.8

    r-ryantm authored and Jon committed Jan 22, 2020
    Copy the full SHA
    5cbce71 View commit details
  5. Merge pull request #76367 from r-ryantm/auto-update/pspg

    pspg: 2.6.0 -> 2.6.4
    marsam authored Jan 22, 2020
    Copy the full SHA
    8500d56 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/office/kmymoney/default.nix
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@

stdenv.mkDerivation rec {
pname = "kmymoney";
version = "5.0.7";
version = "5.0.8";

src = fetchurl {
url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
sha256 = "1h5mzvgpfyl2j66b3nsw17yxvg0ja1qhjlcmfkz62221vcqsrp6m";
sha256 = "1h6l01a08f1xgk4dfpndl7rmgbp9npm58qi760jwl2gggprwwsxc";
};

# Hidden dependency that wasn't included in CMakeLists.txt:
4 changes: 2 additions & 2 deletions pkgs/applications/radio/flrig/default.nix
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@
}:

stdenv.mkDerivation rec {
version = "1.3.48";
version = "1.3.49";
pname = "flrig";

src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "0f46rmrr8aphj8fsbfa1bywihigzfzyxq9zg66d1laa7d3jsfs9q";
sha256 = "0icfniiw2l7d7gyxrzy87n3ragzvf0ykvq7c10ppf111wl5in295";
};

buildInputs = [
10 changes: 6 additions & 4 deletions pkgs/data/fonts/jetbrains-mono/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{ lib, fetchzip }:

let
version = "1.0.0";
version = "1.0.1";
in
fetchzip rec {
name = "JetBrainsMono-${version}";

url = "https://download.jetbrains.com/fonts/JetBrainsMono-${version}.zip";
url = "https://github.com/JetBrains/JetBrainsMono/releases/download/${version}/JetBrainsMono-${version}.zip";

sha256 = "0mwqi66d56v4ml1w7wjsiidrh153jvh0czafyic47rkvmxhnrrhv";
sha256 = "15a8fwyg8ns6krq6nsvgn41iaqbd3lgm3cmv7w370gr6brbn6lxq";

postFetch = ''
unzip $downloadedFile
install -m444 -Dt $out/share/fonts/truetype *.ttf
install -m444 -Dt $out/share/fonts/truetype ttf/*.ttf
install -m444 -Dt $out/share/fonts/woff/ web/woff/*.woff
install -m444 -Dt $out/share/fonts/woff2/ web/woff2/*.woff2
'';

meta = with lib; {
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@

stdenv.mkDerivation rec {
pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
version = "1.7.0";
version = "1.7.1";

repoName = "screenshot";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "09jcyy4drzpfxb1blln7hyjg5b7r8w5j5v7va2qhq31y7vzczh62";
sha256 = "179ib2ldvhdx3hks5lqyx2cvlkk3j1qccvlfwh2yd2bl79zpk3ma";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@

stdenv.mkDerivation rec {
pname = "switchboard-plug-mouse-touchpad";
version = "2.3.1";
version = "2.4.0";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1974zdr5w3xd882gi95fp7axgilfni1sclsr750qm32yhl7d9bfn";
sha256 = "1ls5jxzmd7cmbv8h67q6mcmfrfksgwjndqd6r9gxivsz2lcji3x7";
};

passthru = {
Original file line number Diff line number Diff line change
@@ -8,15 +8,15 @@

stdenv.mkDerivation rec {
pname = "elementary-gtk-theme";
version = "5.4.0";
version = "5.4.1";

repoName = "stylesheet";

src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "0dh7lqc9b4ciyzbphqw071xcg742fvlc7gz9l1q3nqjsa2k6xg80";
sha256 = "0fnh08wqlhvigkxp69xkdha19ny9j0hg4ycwhhwvyr0d0z47kilw";
};

passthru = {
29 changes: 29 additions & 0 deletions pkgs/development/python-modules/denonavr/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests
, pytest, testtools, requests-mock }:

buildPythonPackage rec {
pname = "denonavr";
version = "0.7.10";

src = fetchFromGitHub {
owner = "scarface-4711";
repo = "denonavr";
rev = version;
sha256 = "078nhr69f68nfazhmkf2sl7wiadqx96a5ry3ziggiy1xs04vflj7";
};

propagatedBuildInputs = [ requests ];

doCheck = !isPy27;
checkInputs = [ pytest testtools requests-mock ];
checkPhase = ''
pytest tests
'';

meta = with lib; {
homepage = "https://github.com/scarface-4711/denonavr";
description = "Automation Library for Denon AVR receivers.";
license = licenses.mit;
maintainers = with maintainers; [ colemickens ];
};
}
40 changes: 10 additions & 30 deletions pkgs/development/python-modules/fluidasserts/default.nix
Original file line number Diff line number Diff line change
@@ -57,13 +57,13 @@

buildPythonPackage rec {
pname = "fluidasserts";
version = "20.1.22554";
version = "20.1.28253";
disabled = !isPy37;

src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0j7zppwingi9m58z51phy40d69jlskx1vgyz1gj9miqhbjfdymhi";
sha256 = "1d2smx9ywd1azsiwgavp69vlixmvwaabshprm192wnmprbghsp6c";
};

patchPhase = ''
@@ -82,6 +82,7 @@ buildPythonPackage rec {
--replace "'pymssql==2.1.4'," "" \
--replace "'pytesseract==0.3.0'," "" \
--replace "'pywinrm==0.4.1'," "" \
--replace "'mitmproxy==5.0.1'," "" \
'';

@@ -145,34 +146,13 @@ buildPythonPackage rec {
rm test/conftest.py
pytest \
test/test_cloud_aws_cloudformation_cloudfront.py \
test/test_cloud_aws_cloudformation_dynamodb.py \
test/test_cloud_aws_cloudformation_ec2.py \
test/test_cloud_aws_cloudformation_elb.py \
test/test_cloud_aws_cloudformation_elb2.py \
test/test_cloud_aws_cloudformation_fsx.py \
test/test_cloud_aws_cloudformation_iam.py \
test/test_cloud_aws_cloudformation_kms.py \
test/test_cloud_aws_cloudformation_rds.py \
test/test_cloud_aws_cloudformation_s3.py \
test/test_cloud_aws_cloudformation_secretsmanager.py \
test/test_format_apk.py \
test/test_format_file.py \
test/test_format_jks.py \
test/test_format_jwt.py \
test/test_format_pdf.py \
test/test_format_pkcs12.py \
test/test_format_string.py \
test/test_helper_asynchronous.py \
test/test_helper_crypto.py \
test/test_lang_core.py \
test/test_lang_csharp.py \
test/test_lang_docker.py \
test/test_lang_dotnetconfig.py \
test/test_lang_html.py \
test/test_lang_php.py \
test/test_lang_python.py \
test/test_lang_rpgle.py \
test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \
test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \
test/test_format_{apk,file,jks,jwt,pdf,pkcs12,string}.py \
test/test_helper_{asynchronous,crypto}.py \
test/test_lang_{javascript,java}.py \
test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \
test/test_utils_generic.py
'';

5 changes: 5 additions & 0 deletions pkgs/development/python-modules/nest-asyncio/default.nix
Original file line number Diff line number Diff line change
@@ -14,6 +14,11 @@ buildPythonPackage rec {
sha256 = "7d4d7c1ca2aad0e5c2706d0222c8ff006805abfd05caa97e6127c8811d0f6adc";
};

# tests not packaged with source dist as of 1.2.1/1.2.2, and
# can't check tests out of GitHub easily without specific commit IDs (no tagged releases)
doCheck = false;
pythonImportsCheck = [ "nest_asyncio" ];

meta = with stdenv.lib; {
homepage = https://github.com/erdewit/nest_asyncio;
description = "Patch asyncio to allow nested event loops";
26 changes: 26 additions & 0 deletions pkgs/development/python-modules/plexapi/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests
, tqdm, websocket_client, pytest, pillow, mock, isPy27 }:

buildPythonPackage rec {
pname = "PlexAPI";
version = "3.2.0";

src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "1rzy018zcsws56mcghnphhzwj650pwj7qg6nh9z1kjvgwwjfmghf";
};

propagatedBuildInputs = [ requests tqdm websocket_client ];

checkInputs = [ pytest pillow ]
++ lib.optionals isPy27 [ mock ];

meta = with lib; {
homepage = "https://github.com/pkkid/python-plexapi";
description = "Python bindings for the Plex API";
license = licenses.bsd3;
maintainers = with maintainers; [ colemickens ];
};
}
31 changes: 31 additions & 0 deletions pkgs/development/python-modules/plexauth/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ lib, buildPythonPackage, fetchFromGitHub, aiohttp, isPy27 }:

buildPythonPackage rec {
pname = "plexauth";
version = "0.0.5";
disabled = isPy27;

src = fetchFromGitHub {
owner = "jjlawren";
repo = "python-plexauth";
rev = "v${version}";
sha256 = "1wbrn22iywl4ccz64r3w3f17k0r7vi2cqkqd2mrdkx5xqhscn9hz";
};

propagatedBuildInputs = [ aiohttp ];

# package does not include tests
doCheck = false;

# at least guarantee the module can be imported
pythonImportsCheck = [
"plexauth"
];

meta = with lib; {
homepage = "https://github.com/jjlawren/python-plexauth/";
description = "Handles the authorization flow to obtain tokens from Plex.tv via external redirection";
license = licenses.mit;
maintainers = with maintainers; [ colemickens ];
};
}
31 changes: 31 additions & 0 deletions pkgs/development/python-modules/plexwebsocket/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ lib, buildPythonPackage, fetchFromGitHub, aiohttp, isPy27 }:

buildPythonPackage rec {
pname = "plexwebsocket";
version = "0.0.6";
disabled = isPy27;

src = fetchFromGitHub {
owner = "jjlawren";
repo = "python-plexwebsocket";
rev = "v${version}";
sha256 = "1sy9khxksimcmdvghg1ksk65mkiihjvhi7m7ms2kzmy7mrg3s3i7";
};

propagatedBuildInputs = [ aiohttp ];

# package does not include tests
doCheck = false;

# at least guarantee the module can be imported
pythonImportsCheck = [
"plexwebsocket"
];

meta = with lib; {
homepage = "https://github.com/jjlawren/python-plexwebsocket/";
description = "Async library to react to events issued over Plex websockets";
license = licenses.mit;
maintainers = with maintainers; [ colemickens ];
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/http/jetty/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "jetty";
version = "9.4.24.v20191120";
version = "9.4.25.v20191220";
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
name = "jetty-distribution-${version}.tar.gz";
sha256 = "072vr8gfly2xdwxx1c771yymf145l8nv0j31liwqrih8zqvvhsd4";
sha256 = "1jnx4hnvd2krsdisqwpws1qd1r0f8gm9a4sx4a8c7zqrmfd2zx1a";
};

phases = [ "unpackPhase" "installPhase" ];
4 changes: 2 additions & 2 deletions pkgs/servers/search/groonga/default.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {

pname = "groonga";
version = "9.1.0";
version = "9.1.1";

src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
sha256 = "11mlpnaldb6z438qdb7qjq9dxbh71l6v6lrv69fxka34izpgyhkk";
sha256 = "16i5bmypawxjac6g808qgr0z3rvla6g6dr586rmwl7sbq0z2nr82";
};

buildInputs = with stdenv.lib;
4 changes: 2 additions & 2 deletions pkgs/tools/misc/diffoscope/default.nix
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "133";
version = "135";

src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "15hi2fwcx3sf189rmxpyah0amq1a49wgp1ynhvwij5qj13wib2q8";
sha256 = "1grf28mb6lyxdqbmvws4h7inalda9z7qnjx7dc859mzkf54cn3yd";
};

patches = [
24 changes: 24 additions & 0 deletions pkgs/tools/misc/mutagen/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:

buildGoModule rec {
pname = "mutagen";
version = "0.10.2";

src = fetchFromGitHub {
owner = "mutagen-io";
repo = pname;
rev = "v${version}";
sha256 = "0andmgzg2dbnahfh6ncnk9b7d5jlwss7rddsf9z3nmw2q3lj90iz";
};

modSha256 = "0zb6wqfgp5v0hpm8ad6s9lc1n3wayyqindv4vfkmp3980ikb8qwx";

subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ];

meta = with lib; {
description = "Make remote development work with your local tools";
homepage = "https://mutagen.io/";
maintainers = [ maintainers.marsam ];
license = licenses.mit;
};
}
Loading