Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

darwin: disable broken packages

(cherry picked from commit 54e2c28b09d962860a92b5fd688c6394fb44483b)

authored by Matthew Bauer and committed by Daiderd Jordan 33a4313e 5d1b2221

+17 -11
+1 -1
pkgs/applications/misc/apvlv/default.nix
··· 58 58 ''; 59 59 60 60 license = licenses.lgpl2; 61 - platforms = platforms.unix; 61 + platforms = platforms.linux; 62 62 maintainers = [ maintainers.ardumont ]; 63 63 }; 64 64
+1 -1
pkgs/applications/misc/bb/default.nix
··· 19 19 description = "AA-lib demo"; 20 20 license = licenses.gpl2; 21 21 maintainers = [ maintainers.rnhmjoj ]; 22 - platforms = platforms.unix; 22 + platforms = platforms.linux; 23 23 }; 24 24 }
+1 -1
pkgs/applications/misc/confclerk/default.nix
··· 23 23 homepage = http://www.toastfreeware.priv.at/confclerk; 24 24 license = stdenv.lib.licenses.gpl2; 25 25 maintainers = with stdenv.lib.maintainers; [ ehmry ]; 26 - inherit (qt4.meta) platforms; 26 + platforms = stdenv.lib.platforms.linux; 27 27 }; 28 28 }
+1 -1
pkgs/applications/science/math/bcal/default.nix
··· 15 15 16 16 nativeBuildInputs = [ python3Packages.pytest ]; 17 17 18 - doCheck = true; 18 + doCheck = !stdenv.isDarwin; 19 19 checkPhase = '' 20 20 python3 -m pytest test.py 21 21 '';
+1 -1
pkgs/development/libraries/cmark/default.nix
··· 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ]; 15 - doCheck = true; 15 + doCheck = !stdenv.isDarwin; 16 16 checkPhase = '' 17 17 export LD_LIBRARY_PATH=$(readlink -f ./src) 18 18 CTEST_OUTPUT_ON_FAILURE=1 make test
+1 -1
pkgs/development/misc/avr/gcc/default.nix
··· 54 54 description = "GNU Compiler Collection, version ${version} for AVR microcontrollers"; 55 55 homepage = http://gcc.gnu.org; 56 56 license = licenses.gpl3Plus; 57 - platforms = platforms.unix; 57 + platforms = platforms.linux; 58 58 maintainers = with maintainers; [ mguentner ]; 59 59 }; 60 60 }
+3 -1
pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
··· 10 10 # - su ('security/pam_appl.h' file not found) 11 11 # - find (Undefined symbol '_get_date') 12 12 # - w (Undefined symbol '_res_9_init') 13 + # - expr 13 14 substituteInPlace shell_cmds.xcodeproj/project.pbxproj \ 14 15 --replace "FCBA168714A146D000AA698B /* PBXTargetDependency */," "" \ 15 16 --replace "FCBA165914A146D000AA698B /* PBXTargetDependency */," "" \ 16 - --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" 17 + --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" \ 18 + --replace "FCBA165514A146D000AA698B /* PBXTargetDependency */," "" 17 19 18 20 # disable w, test install 19 21 # get rid of permission stuff
+1 -1
pkgs/tools/backup/bdsync/default.nix
··· 36 36 description = "Fast block device synchronizing tool"; 37 37 homepage = https://github.com/TargetHolding/bdsync; 38 38 license = licenses.gpl2; 39 - platforms = platforms.all; 39 + platforms = platforms.linux; 40 40 maintainers = with maintainers; [ jluttine ]; 41 41 }; 42 42
+1 -1
pkgs/tools/misc/cutecom/default.nix
··· 20 20 homepage = http://cutecom.sourceforge.net/; 21 21 license = stdenv.lib.licenses.gpl2Plus; 22 22 maintainers = [ stdenv.lib.maintainers.bennofs ]; 23 - platforms = stdenv.lib.platforms.unix; 23 + platforms = stdenv.lib.platforms.linux; 24 24 }; 25 25 }
+6 -2
pkgs/top-level/all-packages.nix
··· 12288 12288 knot-dns = callPackage ../servers/dns/knot-dns { }; 12289 12289 knot-resolver = callPackage ../servers/dns/knot-resolver { 12290 12290 # TODO: vimNox after it gets fixed on Darwin or something lighter 12291 - hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/; 12291 + hexdump = if stdenv.isLinux then utillinux.bin 12292 + else if stdenv.isDarwin then darwin.shell_cmds 12293 + else vim/*xxd*/; 12292 12294 }; 12293 12295 12294 12296 rdkafka = callPackage ../development/libraries/rdkafka { }; ··· 19901 19903 19902 19904 pcalc = callPackage ../applications/science/math/pcalc { }; 19903 19905 19904 - bcal = callPackage ../applications/science/math/bcal { }; 19906 + bcal = callPackage ../applications/science/math/bcal { 19907 + stdenv = gccStdenv; 19908 + }; 19905 19909 19906 19910 pspp = callPackage ../applications/science/math/pspp { 19907 19911 inherit (gnome3) gtksourceview;