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: c1c6b006278b
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: 0e7c9b32817e
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 17, 2018

  1. rename: fix build 

    failed since there is no 'devdoc' output

(cherry picked from commit 6f01885)
    @xeji @gebner
    xeji authored and gebner committed Mar 17, 2018
    Copy the full SHA
    b1053e6 View commit details

  2. libdynd: fix build w/gcc7 

    (cherry picked from commit 4436d21)
    @xeji @gebner
    xeji authored and gebner committed Mar 17, 2018
    Copy the full SHA
    6e6417c View commit details

  3. Merge #37059: liferea: 1.12.1 -> 1.12.2 (bugfix) 

    (cherry picked from commit c3aadd5)
    @vcunat
    vcunat committed Mar 17, 2018
    Copy the full SHA
    0e7c9b3 View commit details
Showing with 10 additions and 2 deletions.
  1. +2 −2 pkgs/applications/networking/newsreaders/liferea/default.nix
  2. +7 −0 pkgs/development/libraries/libdynd/default.nix
  3. +1 −0 pkgs/tools/misc/rename/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/newsreaders/liferea/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

let
pname = "liferea";
version = "1.12.1";
version = "1.12.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
sha256 = "14qx3x2xjcnydc4ma8vdac63phas7jzwbjl4b9r5hf6vxv3mpvdq";
sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15";
};

nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];
7 changes: 7 additions & 0 deletions pkgs/development/libraries/libdynd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,12 @@ stdenv.mkDerivation {
"-DDYND_BUILD_BENCHMARKS=OFF"
];

# added to fix build with gcc7
NIX_CFLAGS_COMPILE = [
"-Wno-error=implicit-fallthrough"
"-Wno-error=nonnull"
];

buildInputs = [ cmake ];

outputs = [ "out" "dev" ];
@@ -24,5 +30,6 @@ stdenv.mkDerivation {
description = "C++ dynamic ndarray library, with Python exposure.";
homepage = http://libdynd.org;
license = licenses.bsd2;
platforms = platforms.linux;
};
}
1 change: 1 addition & 0 deletions pkgs/tools/misc/rename/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
buildPerlPackage rec {
name = "rename-${version}";
version = "1.9";
outputs = [ "out" ];
src = fetchFromGitHub {
owner = "pstray";
repo = "rename";