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: dacd1e48be64
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: 6817991464d8
Choose a head ref

Commits on May 13, 2020

  1. welle-io: add qtgraphicaleffects to inputs

    programm fails to start without this package
    markuskowa committed May 13, 2020
    Copy the full SHA
    68160d7 View commit details

Commits on May 19, 2020

  1. maintainers: add jk

    06kellyjac committed May 19, 2020
    Copy the full SHA
    d200350 View commit details
  2. deno: init at 1.0.0

    Adding deno for it's 1.0.0 release
    
    * Builds from source (doesn't build V8 from source)
    * Runs most of the tests
    * Bundles completions for:
      * bash - tested
      * zsh  - untested
      * fish - untested
    * Set up for multiple builds:
      * x86_64-linux
        * Passed - NixOS
      * aarch64-linux
        * Passed just build - Raspbian on RPI4
        * Failed build + check (ended with SIGKILL 9)
      * x86_64-darwin
        * Untested
    06kellyjac committed May 19, 2020
    Copy the full SHA
    409a1f0 View commit details

Commits on May 21, 2020

  1. Copy the full SHA
    f49defc View commit details

Commits on May 22, 2020

  1. mednafen: 1.24.2 -> 1.24.3

    r-ryantm committed May 22, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    Copy the full SHA
    72dfda3 View commit details

Commits on May 23, 2020

  1. Copy the full SHA
    6aefe6c View commit details
  2. Copy the full SHA
    8088772 View commit details
  3. Copy the full SHA
    3623ea3 View commit details
  4. Copy the full SHA
    9d8916e View commit details
  5. Verified

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

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    454c813 View commit details
  7. postgresqlPackages.pgrouting: remove unneeded dependencies

    These dependencies were removed in pgRouting/pgrouting#1188
    marsam committed May 23, 2020
    Copy the full SHA
    6fcae88 View commit details
  8. Copy the full SHA
    59769e6 View commit details
  9. Merge pull request #88658 from r-ryantm/auto-update/pg_partman

    postgresql11Packages.pg_partman: 4.3.1 -> 4.4.0
    marsam authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    55b7d3c View commit details
  10. Merge pull request #88662 from r-ryantm/auto-update/python2.7-braintree

    python27Packages.braintree: 4.0.0 -> 4.1.0
    marsam authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4735ab0 View commit details
  11. Merge pull request #88671 from r-ryantm/auto-update/python2.7-cloudflare

    python27Packages.cloudflare: 2.6.5 -> 2.7.1
    marsam authored May 23, 2020
    Copy the full SHA
    dfef7b6 View commit details
  12. Merge pull request #88655 from r-ryantm/auto-update/powerstat

    powerstat: 0.02.22 -> 0.02.23
    marsam authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    65f396b View commit details
  13. Merge pull request #87732 from markuskowa/fix-welle-io

    welle-io: fix, add qtgraphicaleffects to inputs
    markuskowa authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b85cccb View commit details
  14. Merge pull request #88659 from r-ryantm/auto-update/profile-cleaner

    profile-cleaner: 2.37 -> 2.41
    marsam authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6be26b8 View commit details
  15. Merge pull request #88477 from mweinelt/intelMicrocode

    microcodeIntel: 20200508 → 20200520
    andir authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    db90666 View commit details
  16. Merge pull request #87653 from 06kellyjac/deno_release

    Deno: init at 1.0.0
    marsam authored May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0958a7b View commit details
  17. lumina.lumina-calculator: 2019-04-27 -> 1.6.0

    Milan Pässler committed May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    664c988 View commit details
  18. lumina.lumina: 1.5.0 -> 1.6.0

    Milan Pässler committed May 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    285adc8 View commit details
  19. lumina.lumina-pdf: 2019-04-27 -> 1.6.0

    Milan Pässler committed May 23, 2020
    Copy the full SHA
    a375fd4 View commit details
  20. lumina.lumina: use mkDerivation from libsForQt5

    romildo authored and Milan committed May 23, 2020
    Copy the full SHA
    ce9f79b View commit details
  21. lumina.lumina-pdf: use mkDerivation from libsForQt5

    romildo authored and Milan committed May 23, 2020
    Copy the full SHA
    2d896e0 View commit details
  22. lumina.lumina-calculator: use mkDerivation from libsForQt5

    romildo authored and Milan committed May 23, 2020
    Copy the full SHA
    3478f3e View commit details
  23. Merge pull request #88660 from r-ryantm/auto-update/python2.7-authlib

    python27Packages.authlib: 0.14.1 -> 0.14.3
    flokli authored May 23, 2020
    Copy the full SHA
    3058384 View commit details
  24. pythonPackages.kicad: bindings to kicad

    Add the Python bindings for kicad.
    
    Following now functions
    
        $ nix run "(import ./. {}).python3.withPackages(ps: with ps; [ kicad  ])" -c python3 -c "import pcbnew"
    
    Have not tested this any further.
    FRidh committed May 23, 2020
    Copy the full SHA
    bc3c3b4 View commit details
  25. Merge pull request #88654 from r-ryantm/auto-update/pgrouting

    postgresql11Packages.pgrouting: 2.6.3 -> 3.0.0
    marsam authored May 23, 2020
    Copy the full SHA
    c167ec8 View commit details
  26. Merge pull request #88582 from r-ryantm/auto-update/mednafen

    mednafen: 1.24.2 -> 1.24.3
    AndersonTorres authored May 23, 2020
    Copy the full SHA
    8e4129f View commit details
  27. Copy the full SHA
    721d5dc View commit details
  28. Copy the full SHA
    cb2686a View commit details
  29. zstd: 1.4.4 -> 1.4.5 (#88609)

    The previous CMake version did not run any tests, the current version
    tries to run all tests (I could not await their completion), and the
    last GNU Make version ran `make -C tests shortest` which ran only
    playTests.sh, so I've enabled only the playTests test.
    orivej authored May 23, 2020
    Copy the full SHA
    6817991 View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -3592,6 +3592,12 @@
githubId = 51518420;
name = "jitwit";
};
jk = {
email = "hello+nixpkgs@j-k.io";
github = "06kellyjac";
githubId = 9866621;
name = "Jack";
};
jlesquembre = {
email = "jl@lafuente.me";
github = "jlesquembre";
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

stdenv.mkDerivation rec {
pname = "psi-plus";
version = "1.4.1159";
version = "1.4.1231";

src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = version;
sha256 = "1k4ip2glkjsbb28gzffahi81kz90qkf213j89gsmcvbdjf4kp687";
sha256 = "0m5p8is8nk3g0cbwiq73cff9nn2y09fcnh1pzc6rlqqhmz1acg4i";
};

cmakeFlags = [
3 changes: 2 additions & 1 deletion pkgs/applications/radio/welle-io/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2
, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects
, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }:
let

@@ -30,6 +30,7 @@ in mkDerivation {
qtmultimedia
qtquickcontrols
qtquickcontrols2
qtgraphicaleffects
rtl-sdr
soapysdr-with-plugins
];
2 changes: 1 addition & 1 deletion pkgs/applications/science/electronics/kicad/base.nix
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
, oceSupport ? false, opencascade
, withOCCT ? true, opencascade-occt
, ngspiceSupport ? true, libngspice
, scriptingSupport ? true, swig, python, pythonPackages, wxPython
, scriptingSupport ? true, swig, python, wxPython
, debug ? false, valgrind
, withI18n ? true
}:
6 changes: 3 additions & 3 deletions pkgs/applications/science/electronics/kicad/default.nix
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
, oceSupport ? false, opencascade
, withOCCT ? true, opencascade-occt
, ngspiceSupport ? true, libngspice
, scriptingSupport ? true, swig, python3, python3Packages
, scriptingSupport ? true, swig, python3
, debug ? false, valgrind
, with3d ? true
, withI18n ? true
@@ -31,9 +31,9 @@ let
# but brings high DPI support?
else wxGTK31.override { withGtk2 = false; };

pythonPackages = python3Packages;
pythonPackages = python.pkgs;
python = python3;
wxPython = python3Packages.wxPython_4_0;
wxPython = pythonPackages.wxPython_4_0;

in
stdenv.mkDerivation rec {
10 changes: 5 additions & 5 deletions pkgs/desktops/lumina/lumina-calculator/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }:
{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools }:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lumina-calculator";
version = "2019-04-27";
version = "1.6.0";

src = fetchFromGitHub {
owner = "lumina-desktop";
repo = pname;
rev = "ccb792fc713aa7163fffd37fc20c83ffe9ca7523";
sha256 = "0cdyz94znycsc3qxg5bmg51bwms7586d4ja1bsmj8cb9pd3lv980";
rev = "v${version}";
sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y";
};

sourceRoot = "source/src-qt5";
10 changes: 5 additions & 5 deletions pkgs/desktops/lumina/lumina-pdf/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, poppler }:
{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, qttools, poppler }:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lumina-pdf";
version = "2019-04-27";
version = "1.6.0";

src = fetchFromGitHub {
owner = "lumina-desktop";
repo = pname;
rev = "645ed591ef91c3607d3ab87dd86f7acfd08b05c9";
sha256 = "0gl943jb9c9rcgb5wksx3946hwlifghfd27r97skm9is8ih6k0vn";
rev = "v${version}";
sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6";
};

sourceRoot = "source/src-qt5";
7 changes: 4 additions & 3 deletions pkgs/desktops/lumina/lumina/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv,
mkDerivation,
fetchFromGitHub,
desktop-file-utils,
fluxbox,
@@ -14,15 +15,15 @@
wrapGAppsHook
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "lumina";
version = "1.5.0";
version = "1.6.0";

src = fetchFromGitHub {
owner = "lumina-desktop";
repo = pname;
rev = "v${version}";
sha256 = "0rj2gzifr98db7i82cg3hg7l5yfik810pjpawg6n54qbzq987z25";
sha256 = "0bvs12c9pkc6fnkfcr7rrxc8jfbzbslch4nlfjrzwi203fcv4avw";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/authlib/default.nix
Original file line number Diff line number Diff line change
@@ -8,14 +8,14 @@
}:

buildPythonPackage rec {
version = "0.14.1";
version = "0.14.3";
pname = "authlib";

src = fetchFromGitHub {
owner = "lepture";
repo = "authlib";
rev = "v${version}";
sha256 = "0z56r5s8z8pfp0p8zrf1chgzan4q25zg0awgc7bgkvkwgxbhzx4m";
sha256 = "0ph97j94i40jj7nc5ya8pfq0ccx023zbqpcs5hrxmib53g64k5xy";
};

propagatedBuildInputs = [ cryptography requests ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/braintree/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

buildPythonPackage rec {
pname = "braintree";
version = "4.0.0";
version = "4.1.0";

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

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

buildPythonPackage rec {
pname = "cloudflare";
version = "2.6.5";
version = "2.7.1";

src = fetchPypi {
inherit pname version;
sha256 = "4463d5f2927338384169315f34c2a8ac0840075b59489f8d1d773b91caba6c39";
sha256 = "0w8ihj9gram2d4wkbki8f6gr8hsd950b3wzfi1qqqm17lqfk8k7h";
};

propagatedBuildInputs = [
139 changes: 139 additions & 0 deletions pkgs/development/web/deno/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{ stdenv
, fetchurl
, fetchFromGitHub
, rust
, rustPlatform
, python27
, installShellFiles
, Security
, CoreServices
}:
let
pname = "deno";
version = "1.0.0";

denoSrc = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "0k8mqy1hf9hkp60jhd0x4z814y36g51083b3r7prc69ih2523hd1";

fetchSubmodules = true;
};
cargoSha256 = "1fjl07qqvl1f20qazcqxh32xmdfh80jni7i3jzvz6vgsfw1g5cmk";

rustyV8Lib = fetchlib "rusty_v8" "0.4.2" {
x86_64-linux = "1ac6kv3kv087df6kdgfd7kbh24187cg9z7xhbz6rw6jjv4ci2zbi";
aarch64-linux = "06iyjx4p4vp2i81wdy0vxai2k18pki972ff7k0scjqrgmnav1p8k";
x86_64-darwin = "02hwbpsqdzb9mvfndgykvv44f1jig3w3a26l0h26hs5shsrp47jv";
};

arch = rust.toRustTarget stdenv.hostPlatform;
fetchlib = name: version: sha256: fetchurl {
url = "https://github.com/denoland/${name}/releases/download/v${version}/librusty_v8_release_${arch}.a";
sha256 = sha256."${stdenv.hostPlatform.system}";
meta = { inherit version; };
};
in
rustPlatform.buildRustPackage rec {
inherit pname version cargoSha256;

src = denoSrc;

nativeBuildInputs = [
# chromium/V8 requires python 2.7, we're not building V8 from source
# but as a result rusty_v8's download script also uses python 2.7
# tracking issue: https://bugs.chromium.org/p/chromium/issues/detail?id=942720
python27

# Install completions post-install
installShellFiles
];

buildInputs = with stdenv.lib; [ ]
++ optionals stdenv.isDarwin [ Security CoreServices ];

# The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
# To avoid this we pre-download the file and place it in the locations it will require it in advance
preBuild = ''
# Check the rusty_v8 lib downloaded matches the Cargo.lock file
rusty_v8_ver="$(grep 'name = "rusty_v8"' -A 1 Cargo.lock | grep "version =" | cut -d\" -f2)"
if [ "${rustyV8Lib.meta.version}" != "$rusty_v8_ver" ]; then
printf "%s\n" >&2 \
"version mismatch between 'rusty_v8' in Cargo.lock and downloaded library:" \
" wanted: ${rustyV8Lib.meta.version}" \
" got: $rusty_v8_ver"
exit 1
fi;
_rusty_v8_setup() {
for v in "$@"; do
dir="target/$v/gn_out/obj"
mkdir -p "$dir" && cp "${rustyV8Lib}" "$dir/librusty_v8.a"
done
}
# Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed
_rusty_v8_setup "debug" "release" "${arch}/release"
'';

# Set home to existing env var TMP dir so tests that write there work correctly
preCheck = ''
export HOME="$TMPDIR"
'';

checkFlags = [
# Strace not allowed on hydra
"--skip benchmark_test"

# Tests that try to write to `/build/source/target/debug`
"--skip _017_import_redirect"
"--skip https_import"
"--skip js_unit_tests"
"--skip lock_write_fetch"

# Cargo test runs a deno test on the std lib with sub-benchmarking-tests,
# The sub-sub-tests that are failing:
# forAwaitFetchDenolandX10, promiseAllFetchDenolandX10is
# Trying to access https://deno.land/ on build's limited network access
"--skip std_tests"

# Fails on aarch64 machines
# tracking issue: https://github.com/denoland/deno/issues/5324
"--skip run_v8_flags"

# Skip for multiple reasons:
# downloads x86_64 binary on aarch64 machines
# tracking issue: https://github.com/denoland/deno/pull/5402
# downloads a binary that needs ELF patching & tries to run imediately
# upgrade will likely never work with nix as it tries to replace itself
# code: https://github.com/denoland/deno/blob/v1.0.0/cli/upgrade.rs#L211
"--skip upgrade_in_tmpdir"
"--skip upgrade_with_version_in_tmpdir"
];

# TODO: Move to enhanced installShellCompletion when merged: PR #83630
postInstall = ''
$out/bin/deno completions bash > deno.bash
$out/bin/deno completions fish > deno.fish
$out/bin/deno completions zsh > _deno
installShellCompletion deno.{bash,fish} --zsh _deno
'';

meta = with stdenv.lib; {
homepage = "https://deno.land/";
description = "A secure runtime for JavaScript and TypeScript";
longDescription = ''
Deno aims to be a productive and secure scripting environment for the modern programmer.
Deno will always be distributed as a single executable.
Given a URL to a Deno program, it is runnable with nothing more than the ~15 megabyte zipped executable.
Deno explicitly takes on the role of both runtime and package manager.
It uses a standard browser-compatible protocol for loading modules: URLs.
Among other things, Deno is a great replacement for utility scripts that may have been historically written with
bash or python.
'';
license = licenses.mit;
maintainers = with maintainers; [ jk ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
};
}
4 changes: 2 additions & 2 deletions pkgs/misc/emulators/mednafen/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "mednafen";
version = "1.24.2";
version = "1.24.3";

src = fetchurl {
url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz";
sha256 = "0v3w0miyz86ihcir7ab82zjfklp550pk6g9xjxcx6mmvhp9dws8i";
sha256 = "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix";
};

nativeBuildInputs = [ pkgconfig ];
5 changes: 0 additions & 5 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
Original file line number Diff line number Diff line change
@@ -14,11 +14,6 @@
"sha256": "1i066nk101banphs9gbcbvmyrhcvf83xf449rs6vxanb0yhwvqvn",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.42.a/linux-hardened-5.4.42.a.patch"
},
"5.5": {
"name": "linux-hardened-5.5.19.a.patch",
"sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch"
},
"5.6": {
"name": "linux-hardened-5.6.14.a.patch",
"sha256": "1hnlhlssa2gwmww6j17768gn2fbw2f3v8c0cs423lg14r7plkv44",
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/microcode/intel.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

stdenv.mkDerivation rec {
pname = "microcode-intel";
version = "20200508";
version = "20200520";

src = fetchFromGitHub {
owner = "intel";
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/powerstat/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "powerstat";
version = "0.02.22";
version = "0.02.23";

src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
sha256 = "0r355b9syqa2nhfy8ksvxyy5d58v0isf983842js091s6liy0x7g";
sha256 = "1yj8ja0hw92wscazxh9vr3qdz24wpw2fgd3w7w088srfzg2aqf3a";
};

installFlags = [ "DESTDIR=${placeholder "out"}" ];
4 changes: 2 additions & 2 deletions pkgs/servers/sql/postgresql/ext/pg_partman.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

stdenv.mkDerivation rec {
pname = "pg_partman";
version = "4.3.1";
version = "4.4.0";

buildInputs = [ postgresql ];

src = fetchFromGitHub {
owner = "pgpartman";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "12mfydlva05dczjhrw14xq9zr0hqqyszlwivvq2zj9h1p9agm7fn";
sha256 = "0wr2nivp0b8vk355rnv4bygiashq98q9zhfgdbxzhm7bgxd01rk2";
};

installPhase = ''
Loading