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: 295a1a03ca63
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: 24bf8b393f7e
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 13, 2020

  1. inotify-tools: 3.20.1 -> 3.20.2.2 

    (cherry picked from commit 69d7cc5)
    @Ma27
    Ma27 committed Mar 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    60a1fde View commit details

  2. ipfs: 0.4.22 -> 0.4.23 

    (cherry picked from commit c882314)
    @Ma27
    Ma27 committed Mar 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ca1b7ea View commit details

  3. wikicurses: fix build 

    The package doesn't have a testsuite, but fails as the checkPhase is
missing appropriate locale configuration (usually taken from
`pkgs.glibcLocales`). Entirely disabling the `checkPhase` for now as
it's basically a no-op.

ZHF: #80379
See also https://hydra.nixos.org/build/114125176

(cherry picked from commit 1505633)
    @Ma27
    Ma27 committed Mar 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bebc254 View commit details

  4. wikicurses: install man pages 

    (cherry picked from commit 04ea9dc)
    @Ma27
    Ma27 committed Mar 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    24bf8b3 View commit details
Showing with 27 additions and 6 deletions.
  1. +10 −0 pkgs/applications/misc/wikicurses/default.nix
  2. +7 −3 pkgs/applications/networking/ipfs/default.nix
  3. +10 −3 pkgs/development/tools/misc/inotify-tools/default.nix
10 changes: 10 additions & 0 deletions pkgs/applications/misc/wikicurses/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,18 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm";
};

outputs = [ "out" "man" ];

propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ];

postInstall = ''
mkdir -p $man/share/man/man{1,5}
cp wikicurses.1 $man/share/man/man1/
cp wikicurses.conf.5 $man/share/man/man5/
'';

doCheck = false;

meta = {
description = "A simple curses interface for MediaWiki sites such as Wikipedia";
homepage = https://github.com/ids1024/wikicurses/;
10 changes: 7 additions & 3 deletions pkgs/applications/networking/ipfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,17 +2,21 @@

buildGoModule rec {
pname = "ipfs";
version = "0.4.22";
version = "0.4.23";
rev = "v${version}";

src = fetchFromGitHub {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
sha256 = "1drwkam2m1qdny51l7ja9vd33jffy8w0z0wbp28ajx4glp0kyra2";
sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm";
};

modSha256 = "0jbzkifn88myk2vpd390clyl835978vpcfz912y8cnl26s6q677n";
postPatch = ''
rm -rf test/dependencies
'';

modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm";

meta = with stdenv.lib; {
description = "A global, versioned, peer-to-peer filesystem";
13 changes: 10 additions & 3 deletions pkgs/development/tools/misc/inotify-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
{ stdenv, autoreconfHook, fetchFromGitHub }:
{ stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:

stdenv.mkDerivation rec {
pname = "inotify-tools";
version = "3.20.1";
version = "3.20.2.2";

src = fetchFromGitHub {
repo = "inotify-tools";
owner = "rvoicilas";
rev = version;
sha256 = "14dci1i4mhsd5sa33k8h3ayphk19kizynh5ql9ryibdpmcanfiyq";
sha256 = "1r12bglkb0bkqff6kgxjm81hk6z20nrxq3m7iv15d4nrqf9pm7s0";
};

patches = [
(fetchpatch {
url = "https://github.com/inotify-tools/inotify-tools/commit/7ddf45158af0c1e93b02181a45c5b65a0e5bed25.patch";
sha256 = "08imqancx8l0bg9q7xaiql1xlalmbfnpjfjshp495sjais0r6gy7";
})
];

nativeBuildInputs = [ autoreconfHook ];

meta = with stdenv.lib; {