Project import generated by Copybara.
GitOrigin-RevId: 84917aa00bf23c88e5874c683abe05edb0ba4078
This commit is contained in:
Default email
parent
3ee1906b97
commit
c5ce5db644
47 changed files with 1855 additions and 506 deletions
|
|
@ -817,6 +817,10 @@
|
|||
github = "aszlig";
|
||||
githubId = 192147;
|
||||
name = "aszlig";
|
||||
keys = [{
|
||||
longkeyid = "ed25519/0x684089CE67EBB691";
|
||||
fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691";
|
||||
}];
|
||||
};
|
||||
atemu = {
|
||||
name = "Atemu";
|
||||
|
|
@ -1366,12 +1370,12 @@
|
|||
keys = [
|
||||
# compare with https://keybase.io/cab404
|
||||
{
|
||||
longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3";
|
||||
fingerprint = "rsa3072/0xCBDECF658C38079E";
|
||||
fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3";
|
||||
longkeyid = "rsa3072/0xCBDECF658C38079E";
|
||||
}
|
||||
{
|
||||
longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A";
|
||||
fingerprint = "ed25519/0xB7EFFC271D55DB8A";
|
||||
fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A";
|
||||
longkeyid = "ed25519/0xB7EFFC271D55DB8A";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
@ -5227,16 +5231,10 @@
|
|||
github = "lovesegfault";
|
||||
githubId = 7243783;
|
||||
name = "Bernardo Meurer";
|
||||
keys = [
|
||||
{
|
||||
longkeyid = "rsa2048/0xE421C74191EA186C";
|
||||
fingerprint = "5894 12CE 19DF 582A E10A 3320 E421 C741 91EA 186C";
|
||||
}
|
||||
{
|
||||
longkeyid = "rsa2048/0x4A6D87A0E7475769";
|
||||
fingerprint = "56A8 E164 E834 290C 4AC0 EE3E 4A6D 87A0 E747 5769";
|
||||
}
|
||||
];
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0xF4C0D53B8D14C246";
|
||||
fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246";
|
||||
}];
|
||||
};
|
||||
lowfatcomputing = {
|
||||
email = "andreas.wagner@lowfatcomputing.org";
|
||||
|
|
@ -8573,6 +8571,12 @@
|
|||
githubId = 1040871;
|
||||
name = "Mathis Antony";
|
||||
};
|
||||
svrana = {
|
||||
email = "shaw@vranix.com";
|
||||
github = "svrana";
|
||||
githubId = 850665;
|
||||
name = "Shaw Vrana";
|
||||
};
|
||||
svsdep = {
|
||||
email = "svsdep@gmail.com";
|
||||
github = "svsdep";
|
||||
|
|
@ -9089,6 +9093,12 @@
|
|||
githubId = 10110;
|
||||
name = "Travis B. Hartwell";
|
||||
};
|
||||
TredwellGit = {
|
||||
email = "tredwell@tutanota.com";
|
||||
github = "TredwellGit";
|
||||
githubId = 61860346;
|
||||
name = "Tredwell";
|
||||
};
|
||||
treemo = {
|
||||
email = "matthieu.chevrier@treemo.fr";
|
||||
github = "treemo";
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gpodder";
|
||||
version = "3.10.16";
|
||||
version = "3.10.17";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0pbpaasd7kj6y25nm45y1qyb9sxd4570f7g6zkfcpf6pa3nx7qkq";
|
||||
sha256 = "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "Mopidy-Iris";
|
||||
version = "3.50.0";
|
||||
version = "3.54.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04miwf0dqb8jir9g7xkfnn3l62bdn74ap03kqzz2v3byg64f1p0g";
|
||||
sha256 = "0qnshn77dv7fl6smwnpnbq67mbc1vic9gf85skiqnqy8v8w5829f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ let
|
|||
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools;
|
||||
in buildPythonApplication rec {
|
||||
pname = "sonata";
|
||||
version = "1.7b1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "multani";
|
||||
repo = "sonata";
|
||||
rev = "v${version}";
|
||||
sha256 = "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh";
|
||||
sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
|
|
|||
|
|
@ -1,39 +1,55 @@
|
|||
{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x
|
||||
, zlib, gtest, gmock, callPackage, gmp, qt4, util-linux, protobuf, qrencode, libevent }:
|
||||
|
||||
let librustzcash = callPackage ./librustzcash {};
|
||||
in
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper
|
||||
, cargo, pkg-config
|
||||
, bash, curl, coreutils, boost17x, db62, libsodium, libevent, utf8cpp, util-linux
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zcash";
|
||||
version = "2.1.1-1";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zcash";
|
||||
repo = "zcash";
|
||||
rev = "v${version}";
|
||||
sha256 = "1g5zlfzfp31my8w8nlg5fncpr2y95iv9fm04x57sjb93rgmjdh5n";
|
||||
sha256 = "185zrw276g545np0niw5hlhlppkjbf5a1r4rwhnbaimdjdii2dil";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am
|
||||
cargoSha256 = "0qxr6asf8zsya0f1ri39z2cnfpjk96hgwjchz2c7j87vibbvg6dc";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook cargo makeWrapper pkg-config ];
|
||||
buildInputs = [ bash boost17x db62 libevent libsodium utf8cpp ];
|
||||
|
||||
# Use the stdenv default phases (./configure; make) instead of the
|
||||
# ones from buildRustPackage.
|
||||
configurePhase = "configurePhase";
|
||||
buildPhase = "buildPhase";
|
||||
checkPhase = "checkPhase";
|
||||
installPhase = "installPhase";
|
||||
|
||||
postPatch = ''
|
||||
# Have to do this here instead of in preConfigure because
|
||||
# cargoDepsCopy gets unset after postPatch.
|
||||
configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy")
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib
|
||||
protobuf libevent libsodium librustzcash ]
|
||||
++ optionals stdenv.isLinux [ util-linux ];
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ];
|
||||
|
||||
postInstall = ''
|
||||
cp zcutil/fetch-params.sh $out/bin/zcash-fetch-params
|
||||
'';
|
||||
configureFlags = [
|
||||
"--disable-tests"
|
||||
"--with-boost-libdir=${lib.getLib boost17x}/lib"
|
||||
"CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp"
|
||||
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
# Requires hundreds of megabytes of zkSNARK parameters.
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/zcash-fetch-params \
|
||||
--set PATH ${lib.makeBinPath [ coreutils curl util-linux ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Peer-to-peer, anonymous electronic cash system";
|
||||
homepage = "https://z.cash/";
|
||||
maintainers = with maintainers; [ rht tkerber ];
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "librustzcash";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zcash";
|
||||
repo = "librustzcash";
|
||||
rev = version;
|
||||
sha256 = "0d28k29sgzrg9clynz29kpw50kbkp0a4dfdayqhmpjmsh05y6261";
|
||||
};
|
||||
|
||||
cargoSha256 = "1wzyrcmcbrna6rjzw19c4lq30didzk4w6fs6wmvxp0xfg4qqdlax";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp $releaseDir/librustzcash.a $out/lib/
|
||||
mkdir -p $out/include
|
||||
cp librustzcash/include/librustzcash.h $out/include/
|
||||
'';
|
||||
|
||||
# The tests do pass, but they take an extremely long time to run.
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Rust-language assets for Zcash";
|
||||
homepage = "https://github.com/zcash/librustzcash";
|
||||
maintainers = with maintainers; [ rht tkerber ];
|
||||
license = with licenses; [ mit asl20 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "glow";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "glow";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh";
|
||||
sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j";
|
||||
};
|
||||
|
||||
vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z";
|
||||
vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -20,6 +20,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Render markdown on the CLI, with pizzazz!";
|
||||
homepage = "https://github.com/charmbracelet/glow";
|
||||
changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne penguwin ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "obsidian";
|
||||
version = "0.9.20";
|
||||
version = "0.9.22";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
|
||||
sha256 = "19yhmqaz5mynl879q38g338q4w8mwx75fnl25bhwrvy7yy3aa23l";
|
||||
sha256 = "kIqNptt5fl3YORQ7iDqQ5d6Exu+P/nAvVCVgXMRQvpQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper graphicsmagick ];
|
||||
|
|
|
|||
|
|
@ -347,6 +347,10 @@ buildStdenv.mkDerivation ({
|
|||
}/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \
|
||||
"$out"/lib/${binaryName}*/libxul.so
|
||||
patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName}
|
||||
${lib.optionalString (pipewireSupport && lib.versionAtLeast ffversion "83") ''
|
||||
patchelf --add-needed "${lib.getLib pipewire}/lib/libpipewire-0.3.so" \
|
||||
"$out"/lib/${binaryName}/${binaryName}
|
||||
''}
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
|||
41
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix
vendored
Normal file
41
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix
vendored
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ mkDerivation, stdenv, fetchFromGitLab
|
||||
, pkgconfig, wrapQtAppsHook
|
||||
, cmake
|
||||
, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain
|
||||
, libpulseaudio
|
||||
# Not mentioned but seems needed
|
||||
, qtgraphicaleffects
|
||||
, qtdeclarative
|
||||
, qtmacextras
|
||||
, olm, libsecret, cmark, extra-cmake-modules, kirigami2, ki18n, knotifications, kdbusaddons, kconfig, libquotient
|
||||
, KQuickImageEdit, kitemmodels
|
||||
}:
|
||||
|
||||
let
|
||||
qtkeychain-qt5 = qtkeychain.override {
|
||||
inherit qtbase qttools;
|
||||
withQt5 = true;
|
||||
};
|
||||
|
||||
in mkDerivation rec {
|
||||
pname = "neochat";
|
||||
version = "v1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "network";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules wrapQtAppsHook ];
|
||||
buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark kirigami2 ki18n knotifications kdbusaddons kconfig libquotient KQuickImageEdit kitemmodels libpulseaudio ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A client for matrix, the decentralized communication protocol.";
|
||||
homepage = "https://apps.kde.org/en/neochat";
|
||||
license = licenses.gpl3;
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, boost
|
||||
|
|
@ -24,6 +25,15 @@ mkDerivation rec {
|
|||
sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Build with kontactinterface >= 5.14.42.
|
||||
# Remove after next release.
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff";
|
||||
sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
|
@ -48,6 +58,5 @@ mkDerivation rec {
|
|||
maintainers = with maintainers; [ zraexy ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/13d33ba1a0ce6acd583dee6a8a2c7e7398fa30cd.tar.gz";
|
||||
sha256 = "0ggm1iv2ilxj39icqjx4dk9p3sbndvrf90v2qssz9h49xsv9w0j7";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f20dd1d767313d653d6f0c6dd9a82f92d36ecb4c.tar.gz";
|
||||
sha256 = "1prawfbp6390dlgfvd3hxvgdab7rfkr88j35m5cbk3a4hxghkyj3";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gnome-tweaks";
|
||||
version = "3.34.0";
|
||||
version = "3.34.1";
|
||||
format = "other";
|
||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0";
|
||||
sha256 = "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
256
third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix
vendored
Normal file
256
third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix
vendored
Normal file
|
|
@ -0,0 +1,256 @@
|
|||
{ stdenv, pkgsBuildTarget, targetPackages
|
||||
|
||||
# build-tools
|
||||
, bootPkgs
|
||||
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
|
||||
, bash
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
|
||||
, # GHC can be built with system libffi or a bundled one.
|
||||
libffi ? null
|
||||
|
||||
, useLLVM ? !stdenv.targetPlatform.isx86
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
buildLlvmPackages, llvmPackages
|
||||
|
||||
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
|
||||
# library instead of the faster but GPLed integer-gmp library.
|
||||
enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
|
||||
|
||||
, # If enabled, use -fPIC when compiling static libs.
|
||||
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
|
||||
|
||||
# aarch64 outputs otherwise exceed 2GB limit
|
||||
, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
|
||||
|
||||
, # Whether to build dynamic libs for the standard library (on the target
|
||||
# platform). Static libs are always built.
|
||||
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
|
||||
|
||||
, # Whether to build terminfo.
|
||||
enableTerminfo ? !stdenv.targetPlatform.isWindows
|
||||
|
||||
, # What flavour to build. An empty string indicates no
|
||||
# specific flavour and falls back to ghc default values.
|
||||
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
|
||||
(if useLLVM then "perf-cross" else "perf-cross-ncg")
|
||||
|
||||
, # Whether to disable the large address space allocator
|
||||
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
|
||||
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
|
||||
}:
|
||||
|
||||
assert !enableIntegerSimple -> gmp != null;
|
||||
|
||||
let
|
||||
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
inherit (bootPkgs) ghc;
|
||||
|
||||
# TODO(@Ericson2314) Make unconditional
|
||||
targetPrefix = stdenv.lib.optionalString
|
||||
(targetPlatform != hostPlatform)
|
||||
"${targetPlatform.config}-";
|
||||
|
||||
buildMK = ''
|
||||
BuildFlavour = ${ghcFlavour}
|
||||
ifneq \"\$(BuildFlavour)\" \"\"
|
||||
include mk/flavours/\$(BuildFlavour).mk
|
||||
endif
|
||||
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
|
||||
INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
|
||||
'' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
|
||||
Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
|
||||
CrossCompilePrefix = ${targetPrefix}
|
||||
HADDOCK_DOCS = NO
|
||||
BUILD_SPHINX_HTML = NO
|
||||
BUILD_SPHINX_PDF = NO
|
||||
'' + stdenv.lib.optionalString (!enableProfiledLibs) ''
|
||||
GhcLibWays = "v dyn"
|
||||
'' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
|
||||
GhcLibHcOpts += -fPIC
|
||||
GhcRtsHcOpts += -fPIC
|
||||
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
EXTRA_CC_OPTS += -std=gnu99
|
||||
'';
|
||||
|
||||
# Splicer will pull out correct variations
|
||||
libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
|
||||
++ [libffi]
|
||||
++ stdenv.lib.optional (!enableIntegerSimple) gmp
|
||||
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
|
||||
|
||||
toolsForTarget = [
|
||||
pkgsBuildTarget.targetPackages.stdenv.cc
|
||||
] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
|
||||
|
||||
targetCC = builtins.head toolsForTarget;
|
||||
|
||||
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
|
||||
# see #84670 and #49071 for more background.
|
||||
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "8.10.3";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
sha256 = "0cdrdvs5qnqr93cr9zvrlfjv2xr671kjjghnsw4afa4hahcq7p6c";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
patches = stdenv.lib.optionals stdenv.isDarwin [
|
||||
# Make Block.h compile with c++ compilers. Remove with the next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
|
||||
sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
# GHC is a bit confused on its cross terminology.
|
||||
preConfigure = ''
|
||||
for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
|
||||
export "''${env#TARGET_}=''${!env}"
|
||||
done
|
||||
# GHC is a bit confused on its cross terminology, as these would normally be
|
||||
# the *host* tools.
|
||||
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
|
||||
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
|
||||
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
|
||||
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
|
||||
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
|
||||
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
|
||||
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
|
||||
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
|
||||
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
|
||||
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
|
||||
|
||||
echo -n "${buildMK}" > mk/build.mk
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
||||
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
export NIX_LDFLAGS+=" -no_dtrace_dof"
|
||||
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
||||
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
|
||||
echo "patching llvm-targets for musl targets..."
|
||||
echo "Cloning these existing '*-linux-gnu*' targets:"
|
||||
grep linux-gnu llvm-targets | sed 's/^/ /'
|
||||
echo "(go go gadget sed)"
|
||||
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
|
||||
echo "llvm-targets now contains these '*-linux-musl*' targets:"
|
||||
grep linux-musl llvm-targets | sed 's/^/ /'
|
||||
|
||||
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
|
||||
# (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
|
||||
for x in configure aclocal.m4; do
|
||||
substituteInPlace $x \
|
||||
--replace '*-android*|*-gnueabi*)' \
|
||||
'*-android*|*-gnueabi*|*-musleabi*)'
|
||||
done
|
||||
'';
|
||||
|
||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||
configurePlatforms = [ "build" "host" ]
|
||||
++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||
|
||||
# `--with` flags for libraries needed for RTS linker
|
||||
configureFlags = [
|
||||
"--datadir=$doc/share/doc/ghc"
|
||||
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
|
||||
] ++ stdenv.lib.optionals (libffi != null) [
|
||||
"--with-system-libffi"
|
||||
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
|
||||
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
|
||||
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
|
||||
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
|
||||
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
|
||||
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
|
||||
"--with-iconv-includes=${libiconv}/include"
|
||||
"--with-iconv-libraries=${libiconv}/lib"
|
||||
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
|
||||
"--enable-bootstrap-with-devel-snapshot"
|
||||
] ++ stdenv.lib.optionals useLdGold [
|
||||
"CFLAGS=-fuse-ld=gold"
|
||||
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
|
||||
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
|
||||
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
|
||||
"--disable-large-address-space"
|
||||
];
|
||||
|
||||
# Make sure we never relax`$PATH` and hooks support for compatibility.
|
||||
strictDeps = true;
|
||||
|
||||
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
|
||||
dontAddExtraLibs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl autoconf automake m4 python3 sphinx
|
||||
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
|
||||
];
|
||||
|
||||
# For building runtime libs
|
||||
depsBuildTarget = toolsForTarget;
|
||||
|
||||
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
|
||||
|
||||
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
|
||||
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
|
||||
|
||||
depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
|
||||
depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
|
||||
|
||||
# required, because otherwise all symbols from HSffi.o are stripped, and
|
||||
# that in turn causes GHCi to abort
|
||||
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
|
||||
|
||||
checkTarget = "test";
|
||||
|
||||
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
|
||||
|
||||
postInstall = ''
|
||||
# Install the bash completion file.
|
||||
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
|
||||
|
||||
# Patch scripts to include "readelf" and "cat" in $PATH.
|
||||
for i in "$out/bin/"*; do
|
||||
test ! -h $i || continue
|
||||
egrep --quiet '^#!' <(head -n 1 $i) || continue
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit bootPkgs targetPrefix;
|
||||
|
||||
inherit llvmPackages;
|
||||
inherit enableShared;
|
||||
|
||||
# Our Cabal compiler name
|
||||
haskellCompilerName = "ghc-${version}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "http://haskell.org/ghc";
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
|
||||
timeout = 24 * 3600;
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
noAuditTmpdir = true;
|
||||
})
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "12";
|
||||
patch_version = "0-alpha2";
|
||||
patch_version = "0-alpha3";
|
||||
src = fetchTarball {
|
||||
url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha2.tar.xz";
|
||||
sha256 = "148vgjcfajjvrvh0q9kb2y7fszqd02cikb5wyznz7kjxka6xxyn9";
|
||||
url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha3.tar.xz";
|
||||
sha256 = "1hqlf9fi5gmvb6r13z5819rg6k813bw9ihgbbji67hhh4q361wlw";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1164,8 +1164,10 @@ self: super: {
|
|||
# $HOME, which we don't have in our build sandbox.
|
||||
cabal-install-parsers = dontCheck super.cabal-install-parsers;
|
||||
|
||||
# gitit is unbroken in the latest release
|
||||
gitit = markUnbroken super.gitit;
|
||||
# version constraints break the build, so we jailbreak
|
||||
# can be removed at a new release which also fixes
|
||||
# https://github.com/jgm/gitit/issues/665
|
||||
gitit = doJailbreak super.gitit;
|
||||
|
||||
# Test suite requires database
|
||||
persistent-mysql = dontCheck super.persistent-mysql;
|
||||
|
|
@ -1541,4 +1543,9 @@ self: super: {
|
|||
# https://github.com/yesodweb/yesod/issues/1714
|
||||
yesod-core = dontCheck super.yesod-core;
|
||||
|
||||
# Add ApplicationServices on darwin
|
||||
# use 0.4.5 instead of 0.4.4 to fix build with glibc >= 2.32
|
||||
apecs-physics = addPkgconfigDepends super.apecs-physics_0_4_5
|
||||
(pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices);
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -83,6 +83,12 @@ self: super: {
|
|||
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
|
||||
});
|
||||
|
||||
# Version 4.7.2 is broken by the bytestring library shipped by ghc-8.10.3.
|
||||
ListLike = appendPatch super.ListLike (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/ListLike-4.7.2.patch";
|
||||
sha256 = "1v392a74w0sxyn6x0bqixpmjbgla0i2b5hxzkcn1vaa3gaya7ag4";
|
||||
});
|
||||
|
||||
# hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now.
|
||||
hnix = generateOptparseApplicativeCompletion "hnix"
|
||||
(overrideCabal super.hnix (drv: {
|
||||
|
|
|
|||
|
|
@ -1,29 +1,29 @@
|
|||
# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
|
||||
|
||||
compiler: ghc-8.10.2
|
||||
compiler: ghc-8.10.3
|
||||
|
||||
core-packages:
|
||||
- array-0.5.4.0
|
||||
- base-4.14.1.0
|
||||
- binary-0.8.8.0
|
||||
- bytestring-0.10.10.0
|
||||
- Cabal-3.2.0.0
|
||||
- bytestring-0.10.12.0
|
||||
- Cabal-3.2.1.0
|
||||
- containers-0.6.2.1
|
||||
- deepseq-1.4.4.0
|
||||
- directory-1.3.6.0
|
||||
- exceptions-0.10.4
|
||||
- filepath-1.4.2.1
|
||||
- ghc-8.10.2
|
||||
- ghc-boot-8.10.2
|
||||
- ghc-boot-th-8.10.2
|
||||
- ghc-8.10.3
|
||||
- ghc-boot-8.10.3
|
||||
- ghc-boot-th-8.10.3
|
||||
- ghc-compact-0.1.0.0
|
||||
- ghc-heap-8.10.2
|
||||
- ghc-heap-8.10.3
|
||||
- ghc-prim-0.6.1
|
||||
- ghci-8.10.2
|
||||
- ghci-8.10.3
|
||||
- haskeline-0.8.0.1
|
||||
- hpc-0.6.1.0
|
||||
- integer-gmp-1.0.3.0
|
||||
- libiserv-8.10.2
|
||||
- libiserv-8.10.3
|
||||
- mtl-2.2.2
|
||||
- parsec-3.1.14.0
|
||||
- pretty-1.1.3.6
|
||||
|
|
@ -32,7 +32,7 @@ core-packages:
|
|||
- stm-2.5.0.0
|
||||
- template-haskell-2.16.0.0
|
||||
- terminfo-0.4.1.4
|
||||
- text-1.2.3.2
|
||||
- text-1.2.4.1
|
||||
- time-1.9.3
|
||||
- transformers-0.5.6.2
|
||||
- unix-2.7.2.2
|
||||
|
|
@ -3150,9 +3150,6 @@ broken-packages:
|
|||
- aos-signature
|
||||
- aosd
|
||||
- apart
|
||||
- apecs-gloss
|
||||
- apecs-physics
|
||||
- apecs-physics-gloss
|
||||
- apecs-stm
|
||||
- apelsin
|
||||
- api-builder
|
||||
|
|
@ -5091,7 +5088,9 @@ broken-packages:
|
|||
- fei-base
|
||||
- fei-cocoapi
|
||||
- fei-dataiter
|
||||
- fei-datasets
|
||||
- fei-examples
|
||||
- fei-modelzoo
|
||||
- fei-nn
|
||||
- feldspar-compiler
|
||||
- feldspar-language
|
||||
|
|
@ -5178,7 +5177,6 @@ broken-packages:
|
|||
- flamethrower
|
||||
- flamingra
|
||||
- flashblast
|
||||
- flat
|
||||
- flat-maybe
|
||||
- flatbuffers
|
||||
- flay
|
||||
|
|
@ -5541,7 +5539,6 @@ broken-packages:
|
|||
- github-webhook-handler-snap
|
||||
- githud
|
||||
- gitignore
|
||||
- gitit
|
||||
- gitlab-api
|
||||
- gitlib
|
||||
- gitlib-cmdline
|
||||
|
|
@ -5700,7 +5697,6 @@ broken-packages:
|
|||
- gray-code
|
||||
- greencard
|
||||
- greencard-lib
|
||||
- greenclip
|
||||
- greg-client
|
||||
- gremlin-haskell
|
||||
- Grempa
|
||||
|
|
@ -7712,6 +7708,7 @@ broken-packages:
|
|||
- mahoro
|
||||
- maid
|
||||
- mail-pool
|
||||
- mail-reports
|
||||
- mailchimp
|
||||
- mailchimp-subscribe
|
||||
- MailchimpSimple
|
||||
|
|
@ -10394,7 +10391,6 @@ broken-packages:
|
|||
- Tablify
|
||||
- tabloid
|
||||
- tabs
|
||||
- taffybar
|
||||
- tag-bits
|
||||
- tag-stream
|
||||
- tagged-exception-core
|
||||
|
|
@ -11516,6 +11512,7 @@ broken-packages:
|
|||
- yxdb-utils
|
||||
- Z-Data
|
||||
- Z-IO
|
||||
- Z-YAML
|
||||
- z3-encoding
|
||||
- z85
|
||||
- zabt
|
||||
|
|
|
|||
|
|
@ -662,33 +662,9 @@ self: super: builtins.intersectAttrs super {
|
|||
|
||||
spago =
|
||||
let
|
||||
# Spago needs a small patch to work with the latest versions of rio.
|
||||
# https://github.com/purescript/spago/pull/647
|
||||
spagoWithPatches = overrideCabal (appendPatch super.spago (
|
||||
# Spago-0.17 needs a small patch to work with the latest version of dhall.
|
||||
# This can probably be removed with Spago-0.18.
|
||||
# https://github.com/purescript/spago/pull/695
|
||||
pkgs.fetchpatch {
|
||||
url = "https://github.com/purescript/spago/commit/6258ac601480e776c215c989cc5faae46d5ca9f7.patch";
|
||||
sha256 = "02zy4jf24qlqz9fkcs2rqg64ijd8smncmra8s5yp2mln4dmmii1k";
|
||||
}
|
||||
)) (old: {
|
||||
# The above patch contains a completely new spago.cabal file, but our
|
||||
# source tree from Hackage already contains a cabal file. Delete the
|
||||
# local cabal file and just take the one from the patch.
|
||||
#
|
||||
# WARNING: The empty line above the `rm` needs to be kept.
|
||||
prePatch = old.prePatch or "" + ''
|
||||
|
||||
rm spago.cabal
|
||||
'';
|
||||
# The above patch also adds a dependency on the stringsearch package.
|
||||
libraryHaskellDepends = old.libraryHaskellDepends or [] ++ [ self.stringsearch ];
|
||||
});
|
||||
|
||||
# spago requires an older version of megaparsec, but it appears to work
|
||||
# fine with newer versions.
|
||||
spagoWithOverrides = doJailbreak spagoWithPatches;
|
||||
spagoWithOverrides = doJailbreak super.spago;
|
||||
|
||||
# This defines the version of the purescript-docs-search release we are using.
|
||||
# This is defined in the src/Spago/Prelude.hs file in the spago source.
|
||||
|
|
|
|||
1428
third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
generated
vendored
1428
third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
generated
vendored
File diff suppressed because it is too large
Load diff
22
third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix
vendored
Normal file
22
third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix
vendored
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "KQuickImageEditor";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "libraries";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0krx9bq6nfmpjjangis8gaz8rx3z35f6m3cpsrcfdwpgpm22fqll";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtbase qtquickcontrols2 ];
|
||||
}
|
||||
30
third_party/nixpkgs/pkgs/development/libraries/inih/default.nix
vendored
Normal file
30
third_party/nixpkgs/pkgs/development/libraries/inih/default.nix
vendored
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchFromGitHub, meson, ninja }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inih";
|
||||
version = "r52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benhoyt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0lsvm34zabvi1xlximybzvgc58zb90mm3b9babwxlqs05jy871m4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddefault_library=shared"
|
||||
"-Ddistro_install=true"
|
||||
"-Dwith_INIReader=true"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Simple .INI file parser in C, good for embedded systems";
|
||||
homepage = "https://github.com/benhoyt/inih";
|
||||
changelog = "https://github.com/benhoyt/inih/releases/tag/${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ TredwellGit ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,18 +1,21 @@
|
|||
{ lib, buildDunePackage, fetchurl, stdlib-shims }:
|
||||
{ lib, ocaml, buildDunePackage, fetchurl, stdlib-shims, ncurses }:
|
||||
|
||||
buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.04";
|
||||
|
||||
pname = "ounit2";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz";
|
||||
sha256 = "1naahh24lbyxmrnzpfz8karniqbf1nknivf96mrvsr6zlx5ad072";
|
||||
sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ stdlib-shims ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/gildor478/ounit";
|
||||
description = "A unit test framework for OCaml";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
pname = "azure-mgmt-hdinsight";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8";
|
||||
sha256 = "ed55df52d35fc03a9c7ca060af1ec0faf7b5510381d2a5e74b73f59ac0d79028";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "883a862ddd17b0f4868ec55d6697a64c13d91c41b9fa5103198d2140053abac2";
|
||||
sha256 = "b33021b58edacc16bf2ba8453efbb26a8b04242ee3f4d62dcdaa3c6e199f136f";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-resource-manager";
|
||||
version = "0.30.2";
|
||||
version = "0.30.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f";
|
||||
sha256 = "3577bbf38f2c7c2f42306b8dfdeffbb0eedf45aaec947fd513d51937f72046d1";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab_git";
|
||||
version = "0.23.2";
|
||||
version = "0.23.3";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2c4c55c5bc651a670b13e89064f7aba7422b72ad6b3f2b3890ac72cc9a2d4089";
|
||||
sha256 = "20a4954d8d1b1eb6f9111cd15d6a598bd7ff72b08797cf5e86c5a55827c85a1d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ notebook nbdime git ];
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, python
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-mpd2";
|
||||
version = "1.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "tar.bz2";
|
||||
sha256 = "772fa6861273bb9f363a97987c2c45ca3965eb770570f1f02566efec9c89fc5f";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-air-control-exporter";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2c1bce2423b7452388e35756bef098c123b3cd4a38e8b1302f7297a08e0a9eaa";
|
||||
sha256 = "ece2e446273542e5c0352c9d6e80d8279132c6ada3649c59e87a711448801a3b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygame";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "63b038da116a643046181b02173fd894d87d2f85ecfd6aa7d5ece73c6ef501e9";
|
||||
sha256 = "8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "runway-python";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8";
|
||||
sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
sha256 = "wFxv20NfMMcw4yP8wbmLow8189jExDxkSIRqK2Ix/6U=";
|
||||
sha256 = "sha256-hqbyjnmWYHQQEGarGqGSZ9DI1E6uIdqpPJxgVspvnaQ=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
26
third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix
vendored
Normal file
26
third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-minimock";
|
||||
version = "3.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gojuno";
|
||||
repo = "minimock";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h";
|
||||
};
|
||||
|
||||
vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
subPackages = [ "cmd/minimock" "." ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/gojuno/minimock";
|
||||
description = "A golang mock generator from interfaces";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ svrana ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,9 @@
|
|||
{ haskell
|
||||
, haskellPackages
|
||||
, lib
|
||||
|
||||
# The following are only needed for the passthru.tests:
|
||||
, git
|
||||
, nodejs
|
||||
, purescript
|
||||
, runCommand
|
||||
|
|
@ -32,6 +35,7 @@ spago.overrideAttrs (oldAttrs: {
|
|||
{
|
||||
__noChroot = true;
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
nodejs
|
||||
purescript
|
||||
spago
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
|
||||
, base, bower-json, bytestring, Cabal, containers, dhall, directory
|
||||
, either, exceptions, extra, fetchgit, file-embed, filepath, foldl
|
||||
, fsnotify, github, Glob, hpack, hspec, hspec-discover
|
||||
, hspec-megaparsec, http-client, http-conduit, http-types
|
||||
, lens-family-core, megaparsec, mtl, network-uri, open-browser
|
||||
, optparse-applicative, prettyprinter, process, QuickCheck, retry
|
||||
, rio, rio-orphans, safe, semver-range, stdenv, stm, tar
|
||||
, template-haskell, temporary, text, time, transformers, turtle
|
||||
, unliftio, unordered-containers, vector, versions, with-utf8, zlib
|
||||
, fsnotify, generic-lens, github, Glob, hpack, hspec
|
||||
, hspec-discover, hspec-megaparsec, http-client, http-conduit
|
||||
, http-types, lens-family-core, megaparsec, mtl, network-uri
|
||||
, open-browser, optparse-applicative, prettyprinter, process
|
||||
, QuickCheck, retry, rio, rio-orphans, safe, semver-range, stdenv
|
||||
, stm, stringsearch, tar, template-haskell, temporary, text, time
|
||||
, transformers, turtle, unliftio, unordered-containers, utf8-string
|
||||
, vector, versions, with-utf8, zlib
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "spago";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/purescript/spago.git";
|
||||
sha256 = "1w9y1gvk307f92gixs5g02zbg0xwhrshwmc5j97pxhbzzg9qjidy";
|
||||
rev = "3309afdef25e3e77f991a079eed78ff2f750e463";
|
||||
sha256 = "03ww7qhrggwsbm0kcnvcr3ifb8rm860ajimzr81isiw46ykwrl38";
|
||||
rev = "a4d39c21cae2f2c6d43fa204853c8e17c72904d2";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
isLibrary = true;
|
||||
|
|
@ -23,12 +24,12 @@ mkDerivation {
|
|||
libraryHaskellDepends = [
|
||||
aeson aeson-pretty ansi-terminal async-pool base bower-json
|
||||
bytestring Cabal containers dhall directory either exceptions
|
||||
file-embed filepath foldl fsnotify github Glob http-client
|
||||
http-conduit http-types lens-family-core megaparsec mtl network-uri
|
||||
open-browser optparse-applicative prettyprinter process retry rio
|
||||
rio-orphans safe semver-range stm tar template-haskell temporary
|
||||
text time transformers turtle unliftio unordered-containers vector
|
||||
versions with-utf8 zlib
|
||||
file-embed filepath foldl fsnotify generic-lens github Glob
|
||||
http-client http-conduit http-types lens-family-core megaparsec mtl
|
||||
network-uri open-browser optparse-applicative prettyprinter process
|
||||
retry rio rio-orphans safe semver-range stm stringsearch tar
|
||||
template-haskell temporary text time transformers turtle unliftio
|
||||
unordered-containers utf8-string vector versions with-utf8 zlib
|
||||
];
|
||||
libraryToolDepends = [ hpack ];
|
||||
executableHaskellDepends = [ base text turtle with-utf8 ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "augustus";
|
||||
version = "1.4.1a";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Keriew";
|
||||
repo = "augustus";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y";
|
||||
sha256 = "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
description = "An open source re-implementation of Caesar III. Fork of Julius incorporating gameplay changes";
|
||||
homepage = "https://github.com/Keriew/augustus";
|
||||
license = licenses.agpl3;
|
||||
license = licenses.agpl3Only;
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ Thra11 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
dontStrip = true;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://usa.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/us/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz";
|
||||
url = "https://la.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/lad/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz";
|
||||
sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -65,6 +65,40 @@ let plugins = {
|
|||
};
|
||||
meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; };
|
||||
};
|
||||
v370 = stdenv.mkDerivation rec {
|
||||
name = "iscan-v370-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "1ff7adp9mha1i2ibllz540xkagpy8r757h4s3h60bgxbyzv2yggr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook rpm ];
|
||||
|
||||
installPhase = ''
|
||||
cd plugins
|
||||
${rpm}/bin/rpm2cpio iscan-plugin-perfection-v370-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
|
||||
|
||||
mkdir -p $out/share $out/lib
|
||||
cp -r usr/share/{iscan-data,iscan}/ $out/share
|
||||
cp -r usr/lib64/iscan $out/lib
|
||||
mv $out/share/iscan $out/share/esci
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x014a "$plugin/lib/esci/libiscan-plugin-perfection-v370 $plugin/share/esci/esfwdd.bin"
|
||||
'';
|
||||
hw = "Perfection V37/V370";
|
||||
};
|
||||
meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; };
|
||||
};
|
||||
x770 = stdenv.mkDerivation rec {
|
||||
pname = "iscan-gt-x770-bundle";
|
||||
version = "2.30.4";
|
||||
|
|
|
|||
47
third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix
vendored
Normal file
47
third_party/nixpkgs/pkgs/misc/emulators/yuzu/default.nix
vendored
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ stdenv, fetchFromGitHub
|
||||
, cmake, pkgconfig, wrapQtAppsHook
|
||||
, boost173, catch2, fmt, lz4, nlohmann_json, rapidjson, zlib, zstd, SDL2
|
||||
, udev, libusb1, libzip, qtbase, qtwebengine, qttools, ffmpeg
|
||||
, libpulseaudio, libjack2, alsaLib, sndio, ecasound
|
||||
, useVulkan ? true, vulkan-loader, vulkan-headers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yuzu";
|
||||
version = "482";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuzu-emu";
|
||||
repo = "yuzu-mainline"; # They use a separate repo for mainline “branch”
|
||||
rev = "mainline-0-${version}";
|
||||
sha256 = "1bhkdbhj1dv33qv0np26gzsw65p4z88whjmd6bc7mh2b5lvrjwxm";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
|
||||
buildInputs = [ qtbase qtwebengine qttools boost173 catch2 fmt lz4 nlohmann_json rapidjson zlib zstd SDL2 udev libusb1 libpulseaudio alsaLib sndio ecasound libjack2 libzip ffmpeg ]
|
||||
++ stdenv.lib.optionals useVulkan [ vulkan-loader vulkan-headers ];
|
||||
cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ]
|
||||
++ stdenv.lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ];
|
||||
|
||||
# Trick the configure system. This prevents a check for submodule directories.
|
||||
preConfigure = "rm .gitmodules";
|
||||
|
||||
# Fix vulkan detection
|
||||
postFixup = stdenv.lib.optionals useVulkan ''
|
||||
wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://yuzu-emu.org";
|
||||
description = "An experimental Nintendo Switch emulator written in C++";
|
||||
license = with licenses; [
|
||||
gpl2Plus
|
||||
# Icons
|
||||
cc-by-nd-30 cc0
|
||||
];
|
||||
maintainers = with maintainers; [ ivar joshuafern ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
25
third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix
vendored
Normal file
25
third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix
vendored
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "code-minimap";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc";
|
||||
};
|
||||
|
||||
cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A high performance code minimap render";
|
||||
homepage = "https://github.com/wfxr/code-minimap";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ bsima ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
sha256 = "sha256-xMz6e0OLeB3eltGrLV3Hew0lMjH5LSgqJ1l7JT2Ho/M=";
|
||||
sha256 = "sha256-/mlM1EeUlr1nTUJ5rB41idzk3Mfy/htjjPUARYDFpb0=";
|
||||
};
|
||||
|
||||
# Substitute instead of wrapping because the resulting file is
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "httpstat";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "reorx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1";
|
||||
sha256 = "sha256-zUdis41sQpJ1E3LdNwaCVj6gexi/Rk21IBUgoFISiDM=";
|
||||
};
|
||||
doCheck = false; # No tests
|
||||
buildInputs = [ glibcLocales ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "nix-update";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "12fsxy2rv2dgk8l10ymp10j01jkcbn9w0fv5iyb5db85q4xsrsm5";
|
||||
sha256 = "sha256-cMllWFPK6pwqrocjkZKjnELIdtW4tj5Yu6AMw7Zd2JU=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
{ stdenv, lib
|
||||
{ stdenv, lib, fetchpatch
|
||||
, pkgconfig, autoreconfHook
|
||||
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
|
||||
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpm";
|
||||
version = "4.15.1";
|
||||
version = "4.16.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
|
||||
sha256 = "0c6jwail90fhha3bpx70w4a2i8ycxwvnx6zwxm121l8wc3wlbvyx";
|
||||
sha256 = "1k6ank2aad7r503w12m6m494mxr6iccj52wqhwbc94pwxsf34mw3";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]
|
||||
buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ]
|
||||
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
|
||||
|
||||
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
|
||||
|
|
@ -28,14 +29,23 @@ stdenv.mkDerivation rec {
|
|||
"--with-external-db"
|
||||
"--with-lua"
|
||||
"--enable-python"
|
||||
"--enable-ndb"
|
||||
"--enable-sqlite"
|
||||
"--localstatedir=/var"
|
||||
"--sharedstatedir=/com"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here
|
||||
substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable}
|
||||
# Small fixes for ndb on darwin
|
||||
# https://github.com/rpm-software-management/rpm/pull/1465
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "darwin-support.patch";
|
||||
url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch";
|
||||
sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' ""
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Prettyprint and syntax check BibTeX and Scribe bibliography data base files";
|
||||
homepage = "http://ftp.math.utah.edu/pub/bibclean";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1859,6 +1859,8 @@ in
|
|||
|
||||
cpulimit = callPackage ../tools/misc/cpulimit { };
|
||||
|
||||
code-minimap = callPackage ../tools/misc/code-minimap { };
|
||||
|
||||
codesearch = callPackage ../tools/text/codesearch { };
|
||||
|
||||
codec2 = callPackage ../development/libraries/codec2 { };
|
||||
|
|
@ -5937,6 +5939,8 @@ in
|
|||
|
||||
neo-cowsay = callPackage ../tools/misc/neo-cowsay { };
|
||||
|
||||
neochat = libsForQt5.callPackage ../applications/networking/instant-messengers/neochat { };
|
||||
|
||||
neofetch = callPackage ../tools/misc/neofetch { };
|
||||
|
||||
nerdfonts = callPackage ../data/fonts/nerdfonts { };
|
||||
|
|
@ -9438,7 +9442,7 @@ in
|
|||
|
||||
# Please update doc/languages-frameworks/haskell.section.md, “Our
|
||||
# current default compiler is”, if you bump this:
|
||||
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8102;
|
||||
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103;
|
||||
|
||||
inherit (haskellPackages) ghc;
|
||||
|
||||
|
|
@ -13586,6 +13590,8 @@ in
|
|||
|
||||
indilib = callPackage ../development/libraries/indilib { };
|
||||
|
||||
inih = callPackage ../development/libraries/inih { };
|
||||
|
||||
iniparser = callPackage ../development/libraries/iniparser { };
|
||||
|
||||
intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { };
|
||||
|
|
@ -15657,6 +15663,8 @@ in
|
|||
|
||||
kreport = callPackage ../development/libraries/kreport { };
|
||||
|
||||
KQuickImageEdit = callPackage ../development/libraries/KQuickImageEdit { };
|
||||
|
||||
ldutils = callPackage ../development/libraries/ldutils { };
|
||||
|
||||
libcommuni = callPackage ../development/libraries/libcommuni { };
|
||||
|
|
@ -15705,6 +15713,12 @@ in
|
|||
suffix = "qt5";
|
||||
};
|
||||
|
||||
poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix {
|
||||
lcms = lcms2;
|
||||
qt5Support = true;
|
||||
suffix = "qt5";
|
||||
};
|
||||
|
||||
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
|
||||
|
||||
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
|
||||
|
|
@ -18948,6 +18962,8 @@ in
|
|||
|
||||
go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { };
|
||||
|
||||
go-minimock = callPackage ../development/tools/go-minimock { };
|
||||
|
||||
go-protobuf = callPackage ../development/tools/go-protobuf { };
|
||||
|
||||
go-symbols = callPackage ../development/tools/go-symbols { };
|
||||
|
|
@ -20630,13 +20646,10 @@ in
|
|||
|
||||
calibre = calibre-py3;
|
||||
|
||||
calligra = libsForQt514.callPackage ../applications/office/calligra {
|
||||
calligra = libsForQt5.callPackage ../applications/office/calligra {
|
||||
openjpeg = openjpeg_1;
|
||||
poppler = poppler_0_61.override {
|
||||
qt5Support = true;
|
||||
# Must be using the same qt version as calligra itself.
|
||||
qtbase = qt514.qtbase;
|
||||
};
|
||||
# Must use the same Qt version as Calligra itself:
|
||||
poppler = libsForQt5.poppler_0_61;
|
||||
};
|
||||
|
||||
perkeep = callPackage ../applications/misc/perkeep { };
|
||||
|
|
@ -22308,14 +22321,14 @@ in
|
|||
|
||||
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
|
||||
|
||||
kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
|
||||
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
|
||||
|
||||
kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
|
||||
kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
|
||||
llvmPackages = llvmPackages_10;
|
||||
};
|
||||
|
||||
kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };
|
||||
kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix {
|
||||
kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };
|
||||
kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix {
|
||||
python = python3;
|
||||
};
|
||||
|
||||
|
|
@ -24469,7 +24482,7 @@ in
|
|||
|
||||
tribler = callPackage ../applications/networking/p2p/tribler { };
|
||||
|
||||
trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { };
|
||||
trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
|
||||
|
||||
tudu = callPackage ../applications/office/tudu { };
|
||||
|
||||
|
|
@ -25284,7 +25297,7 @@ in
|
|||
|
||||
zam-plugins = callPackage ../applications/audio/zam-plugins { };
|
||||
|
||||
zanshin = libsForQt514.callPackage ../applications/office/zanshin {
|
||||
zanshin = libsForQt5.callPackage ../applications/office/zanshin {
|
||||
boost = boost160;
|
||||
};
|
||||
|
||||
|
|
@ -25623,7 +25636,7 @@ in
|
|||
|
||||
dhewm3 = callPackage ../games/dhewm3 {};
|
||||
|
||||
digikam = libsForQt514.callPackage ../applications/graphics/digikam {};
|
||||
digikam = libsForQt5.callPackage ../applications/graphics/digikam {};
|
||||
|
||||
displaycal = callPackage ../applications/graphics/displaycal {};
|
||||
|
||||
|
|
@ -26509,10 +26522,9 @@ in
|
|||
lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
|
||||
|
||||
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
|
||||
inherit qt5;
|
||||
inherit libsForQt5;
|
||||
inherit pkgs;
|
||||
inherit (lib) makeScope;
|
||||
inherit qt5 libsForQt5;
|
||||
});
|
||||
|
||||
mate = recurseIntoAttrs (callPackage ../desktops/mate { });
|
||||
|
|
@ -28663,6 +28675,10 @@ in
|
|||
|
||||
yaxg = callPackage ../tools/graphics/yaxg {};
|
||||
|
||||
yuzu = libsForQt5.callPackage ../misc/emulators/yuzu {
|
||||
stdenv = gcc10Stdenv;
|
||||
};
|
||||
|
||||
zap = callPackage ../tools/networking/zap { };
|
||||
|
||||
zigbee2mqtt = callPackage ../servers/zigbee2mqtt { };
|
||||
|
|
|
|||
|
|
@ -104,6 +104,16 @@ in {
|
|||
buildLlvmPackages = buildPackages.llvmPackages_9;
|
||||
llvmPackages = pkgs.llvmPackages_9;
|
||||
};
|
||||
ghc8103 = callPackage ../development/compilers/ghc/8.10.3.nix {
|
||||
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
|
||||
bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
|
||||
packages.ghc8102BinaryMinimal
|
||||
else
|
||||
packages.ghc865Binary;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
buildLlvmPackages = buildPackages.llvmPackages_9;
|
||||
llvmPackages = pkgs.llvmPackages_9;
|
||||
};
|
||||
ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
|
||||
bootPkgs = packages.ghc8102Binary;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
|
|
@ -206,6 +216,11 @@ in {
|
|||
ghc = bh.compiler.ghc8102;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
|
||||
};
|
||||
ghc8103 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc8103;
|
||||
ghc = bh.compiler.ghc8103;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
|
||||
};
|
||||
ghc901 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc901;
|
||||
ghc = bh.compiler.ghc901;
|
||||
|
|
|
|||
Loading…
Reference in a new issue