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: 8126ce7e4503
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: 74fe437075bd
Choose a head ref
  • 6 commits
  • 6 files changed
  • 4 contributors

Commits on Oct 29, 2018

  1. yarn: add platforms (#48912) 

    (cherry picked from commit d0544a3)
    @LnL7
    LnL7 committed Oct 29, 2018
    Copy the full SHA
    6092f3e View commit details

  2. loc: enable darwin build 

    It works fine there and probably other unix platforms.

(cherry picked from commit 561fb30)
    @LnL7
    LnL7 committed Oct 29, 2018
    Copy the full SHA
    38e4922 View commit details

  3. bats: add missing grep dependency 

    (cherry picked from commit 8284f09)
    @LnL7
    Tobias Pflug authored and LnL7 committed Oct 29, 2018
    Copy the full SHA
    5e5252c View commit details

  4. httping: add libintl to buildInputs on Darwin (#48188) 

    * httping: add libintl to buildInputs on Darwin

Otherwise it won't compile.

* httping: fix URLs

(cherry picked from commit 9f8b40c)
    @iwinux @LnL7
    iwinux authored and LnL7 committed Oct 29, 2018
    Copy the full SHA
    32c258d View commit details

  5. libmikmod: remove duplicate libpulseaudio dep 

    This is already included as a propagatedBuildInput, so no need to have
it also be a buildInput.

(cherry picked from commit 4807e04)
    @alyssais @LnL7
    alyssais authored and LnL7 committed Oct 29, 2018
    Copy the full SHA
    dc98e14 View commit details

  6. bb: add Darwin compatibility 

    It even has working sound, unlike on Linux!

(cherry picked from commit c49aa0d)
    @alyssais @LnL7
    alyssais authored and LnL7 committed Oct 29, 2018
    Copy the full SHA
    74fe437 View commit details
12 changes: 8 additions & 4 deletions pkgs/applications/misc/bb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }:
{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:

stdenv.mkDerivation rec {
name = "bb-${version}";
@@ -12,13 +12,17 @@ stdenv.mkDerivation rec {
buildInputs = [
aalib ncurses libmikmod
xorg.libXau xorg.libXdmcp xorg.libX11
];
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudio;

meta = with stdenv.lib; {
postPatch = lib.optionalString stdenv.isDarwin ''
sed -i -e '/^#include <malloc.h>$/d' *.c
'';

meta = with lib; {
homepage = http://aa-project.sourceforge.net/bb;
description = "AA-lib demo";
license = licenses.gpl2;
maintainers = [ maintainers.rnhmjoj ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
7 changes: 5 additions & 2 deletions pkgs/development/interpreters/bats/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchzip }:
{ stdenv, fetchzip, gnugrep }:

stdenv.mkDerivation rec {
name = "bats-${version}";
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz";
};

patchPhase = "patchShebangs ./install.sh";
patchPhase = ''
patchShebangs ./install.sh
substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep
'';

installPhase = "./install.sh $out";

2 changes: 1 addition & 1 deletion pkgs/development/libraries/libmikmod/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
};

buildInputs = [ texinfo ]
++ optionals stdenv.isLinux [ alsaLib libpulseaudio ]
++ optional stdenv.isLinux alsaLib
++ optional stdenv.isDarwin CoreAudio;
propagatedBuildInputs =
optional stdenv.isLinux libpulseaudio;
4 changes: 2 additions & 2 deletions pkgs/development/misc/loc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,12 +15,12 @@ buildRustPackage rec {

cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk";

meta = {
meta = with stdenv.lib; {
homepage = https://github.com/cgag/loc;
description = "Count lines of code quickly";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
platforms = platforms.unix;
};
}

1 change: 1 addition & 0 deletions pkgs/development/tools/yarn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
description = "Fast, reliable, and secure dependency management for javascript";
license = licenses.bsd2;
maintainers = [ maintainers.offline ];
platforms = platforms.linux ++ platforms.darwin;
};
}
10 changes: 5 additions & 5 deletions pkgs/tools/networking/httping/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, gettext, ncurses, openssl
{ stdenv, fetchurl, gettext, libintl, ncurses, openssl
, fftw ? null }:

stdenv.mkDerivation rec {
name = "httping-${version}";
version = "2.5";

src = fetchurl {
url = "https://www.vanheusden.com/httping/${name}.tgz";
url = "https://vanheusden.com/httping/${name}.tgz";
sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y";
};

buildInputs = [ fftw ncurses openssl ];
buildInputs = [ fftw libintl ncurses openssl ];
nativeBuildInputs = [ gettext ];

makeFlags = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];

meta = with stdenv.lib; {
homepage = http://www.vanheusden.com/httping;
homepage = https://vanheusden.com/httping;
description = "ping with HTTP requests";
longDescription = ''
Give httping an url, and it'll show you how long it takes to connect,
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.agpl3;
maintainers = with maintainers; [ rickynils ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}