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: d100f963637f
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: 52565a88187f
Choose a head ref
  • 4 commits
  • 4 files changed
  • 4 contributors

Commits on Mar 9, 2019

  1. react-native-debugger: 0.8.2 -> 0.9.7 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/react-native-debugger/versions

(cherry picked from commit 6d9885f)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
    @r-ryantm @Ma27
    r-ryantm authored and Ma27 committed Mar 9, 2019

    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
    b3acca7 View commit details

  2. sad: Fix build 

    (cherry picked from commit 8ca1c92)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
    @infinisil @Ma27
    infinisil authored and Ma27 committed Mar 9, 2019

    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
    ff568fd View commit details

  3. areca: fix build 

    (cherry picked from commit 13e4398)
    @pSub
    pSub committed Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pSub Pascal Wittmann
    GPG key ID: C899ACE7E2322852
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    87321b6 View commit details

  4. Merge #56833: linuxPackages.bcc: fix build 

    (cherry picked from commit 84be644)
    @vcunat
    vcunat committed Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    52565a8 View commit details
4 changes: 4 additions & 0 deletions pkgs/applications/backup/areca/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
substituteInPlace bin/areca_run.sh --replace "/usr/java" "${jre}/lib/openjdk"
substituteInPlace bin/areca_run.sh --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar"
# Fix for NixOS/nixpkgs/issues/53716
sed -i -e 's;^;#include <attr/attributes.h>;' jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c
substituteInPlace jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c --replace attr/xattr.h sys/xattr.h
sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh
sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${stdenv.lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh
4 changes: 2 additions & 2 deletions pkgs/applications/science/logic/sad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, spass }:
{ stdenv, fetchurl, haskell, spass }:

stdenv.mkDerivation {
name = "system-for-automated-deduction-2.3.25";
src = fetchurl {
url = "http://nevidal.org/download/sad-2.3-25.tar.gz";
sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b";
};
buildInputs = [ ghc spass ];
buildInputs = [ haskell.compiler.ghc844 spass ];
patches = [
./patch
# Since the LTS 12.0 update, <> is an operator in Prelude, colliding with
4 changes: 2 additions & 2 deletions pkgs/development/tools/react-native-debugger/default.nix
View file
Original file line number Diff line number Diff line change
@@ -38,11 +38,11 @@ let
];
in stdenv.mkDerivation rec {
name = "react-native-debugger-${version}";
version = "0.8.2";
version = "0.9.7";

src = fetchurl {
url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
sha256 = "0ljhpqanl9rjk9n69if1vrfvac0s73f8by0k6sa4ngvgqzgvq3kb";
sha256 = "0f1wvk1550z4imcs60sv229zllcxpykx4b60bw658idr1xc3c0ix";
};

buildInputs = [ unzip ];
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/bcc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ python.pkgs.buildPythonApplication rec {
buildInputs = [
llvmPackages.llvm llvmPackages.clang-unwrapped kernel
elfutils luajit netperf iperf
systemtap.stapBuild
systemtap.stapBuild flex
];

patches = [