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: 862f05cb00da
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e3230f71911
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Oct 4, 2019

  1. python3Packages.asyncpg: fix hash 

    The hash to the patch is broken, even with the original revision
which adds asyncpg (ee2161c). As the
downloaded patch seems fine, I guess that it was generated with
`nix-prefetch-url` (the hashes for `fetchpatch` usually differ) and the
issue wasn't found as the fixed-output-derivation was already in the
contributor's store.

See https://hydra.nixos.org/build/102495795

ZHF #68361

(cherry picked from commit 7c74ebd)
    @Ma27
    Ma27 committed Oct 4, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    28a0cae View commit details

  2. nodejs-11_x: remove 

    Package is EOLed by upstream: https://github.com/nodejs/Release

Fixes #69008

(cherry picked from commit 334641d)
    @Ma27
    Ma27 committed Oct 4, 2019
    7
    Copy the full SHA
    3a12434 View commit details

  3. sourcehut: mark as broken 

    There were several custom python dependencies broken. I decided to
modify the `sourcehut` expression as it wouldn't even evaluate without
nodejs-11_x I didn't manage to get it building.

(cherry picked from commit 594378c)
    @Ma27
    Ma27 committed Oct 4, 2019
    Copy the full SHA
    4e3230f View commit details
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-1909.xml
View file
Original file line number Diff line number Diff line change
@@ -930,6 +930,11 @@
Please use the fork <literal>cawbird</literal> instead which has been adapted to the API changes and is still maintained.
</para>
</listitem>
<listitem>
<para>
The <literal>nodejs-11_x</literal> package has been removed as it's EOLed by upstream.
</para>
</listitem>
</itemizedlist>
</section>

7 changes: 4 additions & 3 deletions pkgs/applications/version-management/sourcehut/core.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchgit, fetchNodeModules, buildPythonPackage
, pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests
, sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic
, sassc, nodejs-11_x
, sassc, nodejs
, writeText }:

buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {

node_modules = fetchNodeModules {
src = "${src}/srht";
nodejs = nodejs-11_x;
nodejs = nodejs;
sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p";
};

@@ -26,7 +26,7 @@ buildPythonPackage rec {

nativeBuildInputs = [
sassc
nodejs-11_x
nodejs
];

propagatedBuildInputs = [
@@ -75,6 +75,7 @@ buildPythonPackage rec {
homepage = https://git.sr.ht/~sircmpwn/srht;
description = "Core modules for sr.ht";
license = licenses.bsd3;
broken = true;
maintainers = with maintainers; [ eadwu ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/asyncpg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ buildPythonPackage rec {
patches = [
(fetchpatch {
url = "https://github.com/MagicStack/asyncpg/commit/aaeb7076e5acb045880b46155014c0640624797e.patch";
sha256 = "0r6g6pvb39vzci8g67mv9rlrvavqvfz6vlv8988wv53bpz1mss3p";
sha256 = "0l420cmk7469wgb1xq2rxinvja1f2brb5cm4smj2s2wqgymbrf6h";
})
];

10 changes: 0 additions & 10 deletions pkgs/development/web/nodejs/v11.nix
View file

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4412,10 +4412,6 @@ in
nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
enableNpm = false;
};
nodejs-11_x = callPackage ../development/web/nodejs/v11.nix { };
nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix {
enableNpm = false;
};
nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { };
nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
enableNpm = false;