Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d87de5dd7d
@ -83,7 +83,7 @@
|
||||
VirtualBox settings (Machine / Settings / Shared Folders, then click on the
|
||||
"Add" icon). Add the following to the
|
||||
<literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you do
|
||||
not add <literal>"nofail"</literal>, the system will no boot properly. The
|
||||
not add <literal>"nofail"</literal>, the system will not boot properly. The
|
||||
same goes for disabling <literal>rngd</literal> which is normally used to get
|
||||
randomness but this does not work in virtual machines.
|
||||
</para>
|
||||
|
||||
@ -605,6 +605,10 @@ in
|
||||
|
||||
virtualisation.bootDevice = mkDefault (driveDeviceName 1);
|
||||
|
||||
virtualisation.useEFIBoot = mkDefault
|
||||
(config.boot.loader.systemd-boot.enable ||
|
||||
config.boot.loader.efi.canTouchEfiVariables);
|
||||
|
||||
virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
|
||||
|
||||
# FIXME: Consolidate this one day.
|
||||
|
||||
@ -9,7 +9,6 @@ with pkgs.lib;
|
||||
let
|
||||
common = {
|
||||
virtualisation.useBootLoader = true;
|
||||
virtualisation.useEFIBoot = true;
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
environment.systemPackages = [ pkgs.efibootmgr ];
|
||||
|
||||
40
pkgs/applications/misc/keystore-explorer/default.nix
Normal file
40
pkgs/applications/misc/keystore-explorer/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ fetchzip, stdenv, jdk8, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.4.4";
|
||||
pname = "keystore-explorer";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-544.zip";
|
||||
sha256 = "01kpa8g6p6vcqq9y70w5bm8jbw4kp55pbywj2zrhgjibrhgjqi0b";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/keystore-explorer
|
||||
cp -R icons licenses lib kse.jar $out/share/keystore-explorer/
|
||||
|
||||
# keystore-explorer's kse.sh tries to detect the path of Java by using
|
||||
# Python on Darwin; just write our own start script to avoid unnecessary dependencies
|
||||
cat > $out/bin/keystore-explorer <<EOF
|
||||
#!${runtimeShell}
|
||||
export JAVA_HOME=${jdk8.home}
|
||||
exec ${jdk8}/bin/java -jar $out/share/keystore-explorer/kse.jar "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/keystore-explorer
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
meta = {
|
||||
description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner";
|
||||
license = stdenv.lib.licenses.gpl3Only;
|
||||
maintainers = [ stdenv.lib.maintainers.numinit ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
31
pkgs/applications/radio/soapyaudio/default.nix
Normal file
31
pkgs/applications/radio/soapyaudio/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkg-config
|
||||
, hamlib, rtaudio, alsaLib, libpulseaudio, libjack2, libusb1, soapysdr
|
||||
} :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "soapyaudio";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pothosware";
|
||||
repo = "SoapyAudio";
|
||||
rev = "soapy-audio-${version}";
|
||||
sha256 = "0minlsc1lvmqm20vn5hb4im7pz8qwklfy7sbr2xr73xkrbqdahc0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ hamlib rtaudio alsaLib libpulseaudio libjack2 libusb1 soapysdr ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/"
|
||||
"-DUSE_HAMLIB=ON"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/pothosware/SoapyAudio";
|
||||
description = "SoapySDR plugin for amateur radio and audio devices";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ numinit ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
30
pkgs/development/compilers/flasm/default.nix
Normal file
30
pkgs/development/compilers/flasm/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchzip, unzip, bison, flex, gperf, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flasm";
|
||||
version = "1.64";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.nowrap.de/download/flasm16src.zip";
|
||||
sha256 = "03hvxm66rb6rjwbr07hc3k7ia5rim2xlhxbd9qmcai9xwmyiqafg";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
makeFlags = [ "CC=cc" ];
|
||||
|
||||
nativeBuildInputs = [ unzip bison flex gperf ];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 flasm -t $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Assembler and disassembler for Flash (SWF) bytecode";
|
||||
homepage = "http://flasm.sourceforge.net/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -23,15 +23,17 @@
|
||||
, fftwSinglePrec
|
||||
, zlib
|
||||
, curl
|
||||
, qrupdate
|
||||
, blas, lapack
|
||||
, arpack
|
||||
# These two should use the same lapack and blas as the above
|
||||
, qrupdate, arpack, suitesparse ? null
|
||||
# If set to true, the above 5 deps are overriden to use the blas and lapack
|
||||
# with 64 bit indexes support. If all are not compatible, the build will fail.
|
||||
, use64BitIdx ? false
|
||||
, libwebp
|
||||
, gl2ps
|
||||
, ghostscript ? null
|
||||
, hdf5 ? null
|
||||
, glpk ? null
|
||||
, suitesparse ? null
|
||||
, gnuplot ? null
|
||||
# - Include support for GNU readline:
|
||||
, enableReadline ? true
|
||||
@ -41,7 +43,7 @@
|
||||
, jdk ? null
|
||||
, python ? null
|
||||
, overridePlatforms ? null
|
||||
, sundials_2 ? null
|
||||
, sundials ? null
|
||||
# - Build Octave Qt GUI:
|
||||
, enableQt ? false
|
||||
, qtbase ? null
|
||||
@ -56,9 +58,42 @@
|
||||
, darwin
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
mkDerivation rec {
|
||||
let
|
||||
# Not always evaluated
|
||||
blas' = if use64BitIdx then
|
||||
blas.override {
|
||||
isILP64 = true;
|
||||
}
|
||||
else
|
||||
blas
|
||||
;
|
||||
lapack' = if use64BitIdx then
|
||||
lapack.override {
|
||||
isILP64 = true;
|
||||
}
|
||||
else
|
||||
lapack
|
||||
;
|
||||
qrupdate' = qrupdate.override {
|
||||
# If use64BitIdx is false, this override doesn't evaluate to a new
|
||||
# derivation, as blas and lapack are not overriden.
|
||||
blas = blas';
|
||||
lapack = lapack';
|
||||
};
|
||||
arpack' = arpack.override {
|
||||
blas = blas';
|
||||
lapack = lapack';
|
||||
};
|
||||
# Not always suitesparse is required at all
|
||||
suitesparse' = if suitesparse != null then
|
||||
suitesparse.override {
|
||||
blas = blas';
|
||||
lapack = lapack';
|
||||
}
|
||||
else
|
||||
null
|
||||
;
|
||||
in mkDerivation rec {
|
||||
version = "6.1.0";
|
||||
pname = "octave";
|
||||
|
||||
@ -78,34 +113,36 @@ mkDerivation rec {
|
||||
fltk
|
||||
zlib
|
||||
curl
|
||||
blas
|
||||
lapack
|
||||
blas'
|
||||
lapack'
|
||||
libsndfile
|
||||
fftw
|
||||
fftwSinglePrec
|
||||
portaudio
|
||||
qrupdate
|
||||
arpack
|
||||
qrupdate'
|
||||
arpack'
|
||||
libwebp
|
||||
gl2ps
|
||||
]
|
||||
++ (stdenv.lib.optionals enableQt [
|
||||
++ stdenv.lib.optionals enableQt [
|
||||
qtbase
|
||||
qtsvg
|
||||
qscintilla
|
||||
])
|
||||
++ (stdenv.lib.optional (ghostscript != null) ghostscript)
|
||||
++ (stdenv.lib.optional (hdf5 != null) hdf5)
|
||||
++ (stdenv.lib.optional (glpk != null) glpk)
|
||||
++ (stdenv.lib.optional (suitesparse != null) suitesparse)
|
||||
++ (stdenv.lib.optional (enableJava) jdk)
|
||||
++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
|
||||
++ (stdenv.lib.optional (gnuplot != null) gnuplot)
|
||||
++ (stdenv.lib.optional (python != null) python)
|
||||
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
|
||||
++ (stdenv.lib.optionals (stdenv.isDarwin) [ libiconv
|
||||
darwin.apple_sdk.frameworks.Accelerate
|
||||
darwin.apple_sdk.frameworks.Cocoa ])
|
||||
]
|
||||
++ stdenv.lib.optionals (ghostscript != null) [ ghostscript ]
|
||||
++ stdenv.lib.optionals (hdf5 != null) [ hdf5 ]
|
||||
++ stdenv.lib.optionals (glpk != null) [ glpk ]
|
||||
++ stdenv.lib.optionals (suitesparse != null) [ suitesparse' ]
|
||||
++ stdenv.lib.optionals (enableJava) [ jdk ]
|
||||
++ stdenv.lib.optionals (sundials != null) [ sundials ]
|
||||
++ stdenv.lib.optionals (gnuplot != null) [ gnuplot ]
|
||||
++ stdenv.lib.optionals (python != null) [ python ]
|
||||
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
darwin.apple_sdk.frameworks.Accelerate
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
]
|
||||
;
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
@ -115,12 +152,12 @@ mkDerivation rec {
|
||||
fftwSinglePrec
|
||||
texinfo
|
||||
]
|
||||
++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
|
||||
++ (stdenv.lib.optional enableJIT llvm)
|
||||
++ (stdenv.lib.optionals enableQt [
|
||||
++ stdenv.lib.optionals (sundials != null) [ sundials ]
|
||||
++ stdenv.lib.optionals enableJIT [ llvm ]
|
||||
++ stdenv.lib.optionals enableQt [
|
||||
qtscript
|
||||
qttools
|
||||
])
|
||||
]
|
||||
;
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
@ -128,14 +165,14 @@ mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# See https://savannah.gnu.org/bugs/?50339
|
||||
F77_INTEGER_8_FLAG = if blas.isILP64 then "-fdefault-integer-8" else "";
|
||||
F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else "";
|
||||
|
||||
configureFlags = [
|
||||
"--with-blas=blas"
|
||||
"--with-lapack=lapack"
|
||||
(if blas.isILP64 then "--enable-64" else "--disable-64")
|
||||
(if use64BitIdx then "--enable-64" else "--disable-64")
|
||||
]
|
||||
++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ])
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ]
|
||||
++ stdenv.lib.optionals enableReadline [ "--enable-readline" ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ]
|
||||
++ stdenv.lib.optionals enableQt [ "--with-qt=5" ]
|
||||
@ -149,14 +186,20 @@ mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit version;
|
||||
sitePath = "share/octave/${version}/site";
|
||||
blas = blas';
|
||||
lapack = lapack';
|
||||
qrupdate = qrupdate';
|
||||
arpack = arpack';
|
||||
suitesparse = suitesparse';
|
||||
inherit python;
|
||||
inherit enableQt enableJIT enableReadline enableJava;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/octave/";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [raskin];
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin doronbehar ];
|
||||
description = "Scientific Pragramming Language";
|
||||
# https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
|
||||
broken = enableJIT;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
baseVersion = "2.9";
|
||||
revision = "0";
|
||||
sha256 = "06fiyalvc68p11qqh953azx2vrbav5vr00yvcfp67p9l4csn8m9h";
|
||||
baseVersion = "2.17";
|
||||
revision = "2";
|
||||
sha256 = "0v0yiq0qxcrsn5b34j6bz8i6pds8dih2ds90ylmy1msm5gz7vqpb";
|
||||
postPatch = ''
|
||||
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
|
||||
'';
|
||||
|
||||
@ -4,6 +4,7 @@ callPackage ./generic.nix (args // {
|
||||
baseVersion = "1.10";
|
||||
revision = "17";
|
||||
sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8";
|
||||
sourceExtension = "tgz";
|
||||
extraConfigureFlags = "--with-gnump";
|
||||
postPatch = ''
|
||||
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
|
||||
# Passed by version specific builders
|
||||
, baseVersion, revision, sha256
|
||||
, sourceExtension ? "tar.xz"
|
||||
, extraConfigureFlags ? ""
|
||||
, postPatch ? null
|
||||
, darwin
|
||||
@ -12,10 +13,10 @@ stdenv.mkDerivation rec {
|
||||
version = "${baseVersion}.${revision}";
|
||||
|
||||
src = fetchurl {
|
||||
name = "Botan-${version}.tgz";
|
||||
name = "Botan-${version}.${sourceExtension}";
|
||||
urls = [
|
||||
"http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz"
|
||||
"http://botan.randombit.net/releases/Botan-${version}.tgz"
|
||||
"http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.${sourceExtension}"
|
||||
"http://botan.randombit.net/releases/Botan-${version}.${sourceExtension}"
|
||||
];
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
|
||||
"BLAS=-L${blas}/lib -lblas"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
${stdenv.lib.optionalString blas.isILP64
|
||||
# Use their FFLAGS along with `-fdefault-integer-8`. If another
|
||||
# application intends to use arpack, it should add this to it's FFLAGS as
|
||||
# well. Otherwise (e.g): https://savannah.gnu.org/bugs/?50339
|
||||
"FFLAGS=-fimplicit-none -O3 -funroll-loops -fdefault-integer-8"
|
||||
# If another application intends to use qrupdate compiled with blas with
|
||||
# 64 bit support, it should add this to it's FFLAGS as well. See (e.g):
|
||||
# https://savannah.gnu.org/bugs/?50339
|
||||
"FFLAGS=-fdefault-integer-8"
|
||||
}
|
||||
)
|
||||
'';
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
{ stdenv
|
||||
, cmake
|
||||
, fetchurl
|
||||
, python
|
||||
# GNU Octave needs KLU for ODE solvers
|
||||
, suitesparse
|
||||
, blas, lapack
|
||||
, gfortran
|
||||
, lapackSupport ? true }:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sundials";
|
||||
version = "2.7.0";
|
||||
|
||||
buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [
|
||||
gfortran
|
||||
suitesparse
|
||||
];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "01513g0j7nr3rh7hqjld6mw0mcx5j9z9y87bwjc16w2x2z3wm7yk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
# https://github.com/LLNL/sundials/pull/19
|
||||
url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
|
||||
sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
|
||||
] ++ stdenv.lib.optionals (lapackSupport) [
|
||||
"-DSUNDIALS_INDEX_TYPE=int32_t"
|
||||
# GNU Octave needs KLU for ODE solvers
|
||||
"-DKLU_ENABLE=ON"
|
||||
"-DKLU_INCLUDE_DIR=${suitesparse}/include"
|
||||
"-DKLU_LIBRARY_DIR=${suitesparse}/lib"
|
||||
"-DLAPACK_ENABLE=ON"
|
||||
"-DLAPACK_LIBRARIES=${lapack}/lib/lapack${stdenv.hostPlatform.extensions.sharedLibrary};${blas}/lib/blas${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
];
|
||||
|
||||
# flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3
|
||||
doCheck = false;
|
||||
checkPhase = "make test";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Suite of nonlinear differential/algebraic equation solvers";
|
||||
homepage = "https://computation.llnl.gov/projects/sundials";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ idontgetoutmuch ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@ -3,6 +3,8 @@
|
||||
buildDunePackage rec {
|
||||
pname = "opam-format";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
inherit (opam-core) src version;
|
||||
|
||||
minimumOCamlVersion = "4.02.3";
|
||||
|
||||
@ -5,6 +5,8 @@ buildDunePackage rec {
|
||||
|
||||
minimumOCamlVersion = "4.02";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
inherit (opam-format) src version;
|
||||
|
||||
patches = [ ./download-tool.patch ];
|
||||
|
||||
@ -5,6 +5,8 @@ buildDunePackage rec {
|
||||
|
||||
inherit (opam) src version;
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
# get rid of check for curl at configure time
|
||||
# opam-state does not call curl at run time
|
||||
configureFlags = [ "--disable-checks" ];
|
||||
|
||||
@ -22,14 +22,14 @@ let
|
||||
# Note: when raising the version, ensure that all SNAPSHOT versions in
|
||||
# build.gradle are replaced by a fixed version
|
||||
# (the current one at the time of release) (see postPatch).
|
||||
version = "120.2";
|
||||
version = "121.4";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
rev = "v${version}";
|
||||
sha256 = "01a7qpwfr1n540fk0k65kl03biix0gmg66z7qn22mb2703laq1xc";
|
||||
sha256 = "14w0fkn8q5bj84py7vx33wdk9d37ncrq6rdj5ryz4mvlxbix2n4n";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
@ -74,7 +74,7 @@ let
|
||||
'';
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "1yv9l8zdml6drmvlgv45w3qas9qmb654x4kja3an4d16k020khr7";
|
||||
outputHash = "18n671aa013cnsnp9aaw61llqz4s4vn7zgja8cazd0cg632x8jca";
|
||||
};
|
||||
|
||||
# Separate commands for building and installing the server and the client
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, nativeOnly ? false
|
||||
, runtimeOnly ? false
|
||||
, runtimeShell
|
||||
, stdenv
|
||||
|
||||
# DEPRECATED
|
||||
, withJava ? config.steam.java or false
|
||||
@ -43,22 +44,32 @@ let
|
||||
++ lib.optional withPrimus primus
|
||||
++ extraPkgs pkgs;
|
||||
|
||||
ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs
|
||||
++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs);
|
||||
ldPath = lib.optionals stdenv.is64bit [ "/lib64" ]
|
||||
++ [ "/lib32" ]
|
||||
++ map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs
|
||||
++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs);
|
||||
|
||||
# Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present
|
||||
exportLDPath = ''
|
||||
export LD_LIBRARY_PATH=/lib32:/lib64:${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
|
||||
export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
|
||||
export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
||||
'';
|
||||
|
||||
# bootstrap.tar.xz has 444 permissions, which means that simple deletes fail
|
||||
# and steam will not be able to start
|
||||
fixBootstrap = ''
|
||||
if [ -r $HOME/.local/share/Steam/bootstrap.tar.xz ]; then
|
||||
chmod +w $HOME/.local/share/Steam/bootstrap.tar.xz
|
||||
fi
|
||||
'';
|
||||
|
||||
setupSh = writeScript "setup.sh" ''
|
||||
#!${runtimeShell}
|
||||
'';
|
||||
|
||||
runSh = writeScript "run.sh" ''
|
||||
#!${runtimeShell}
|
||||
runtime_paths="/lib32:/lib64:${lib.concatStringsSep ":" ldPath}"
|
||||
runtime_paths="${lib.concatStringsSep ":" ldPath}"
|
||||
if [ "$1" == "--print-steam-runtime-library-paths" ]; then
|
||||
echo "$runtime_paths''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
||||
exit 0
|
||||
@ -226,7 +237,7 @@ in buildFHSUserEnv rec {
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${steam}/share/icons $out/share
|
||||
ln -s ${steam}/share/pixmaps $out/share
|
||||
sed "s,/usr/bin/steam,steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop
|
||||
ln -s ${steam}/share/applications/steam.desktop $out/share/applications/steam.desktop
|
||||
'';
|
||||
|
||||
profile = ''
|
||||
@ -261,6 +272,7 @@ in buildFHSUserEnv rec {
|
||||
fi
|
||||
fi
|
||||
${lib.optionalString (!nativeOnly) exportLDPath}
|
||||
${fixBootstrap}
|
||||
exec steam "$@"
|
||||
'';
|
||||
|
||||
@ -287,6 +299,7 @@ in buildFHSUserEnv rec {
|
||||
fi
|
||||
shift
|
||||
${lib.optionalString (!nativeOnly) exportLDPath}
|
||||
${fixBootstrap}
|
||||
exec -- "$run" "$@"
|
||||
'';
|
||||
};
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
traceLog = "/tmp/steam-trace-dependencies.log";
|
||||
version = "1.0.0.61";
|
||||
version = "1.0.0.68";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "steam-original";
|
||||
@ -10,7 +10,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
|
||||
sha256 = "0c5xy57gwr14vp3wy3jpqi5dl6y7n01p2dy4jlgl9bf9x7616r6n";
|
||||
sha256 = "sha256-ZeiCYjxnH0Ath5bB20QHmE8R3wU4/3RiAw2NUhrrKNM=";
|
||||
};
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
@ -26,14 +26,16 @@ in stdenv.mkDerivation {
|
||||
EOF
|
||||
chmod +x $out/bin/steamdeps
|
||||
''}
|
||||
install -d $out/lib/udev/rules.d
|
||||
install -m644 lib/udev/rules.d/*.rules $out/lib/udev/rules.d
|
||||
|
||||
# this just installs a link, "steam.desktop -> /lib/steam/steam.desktop"
|
||||
rm $out/share/applications/steam.desktop
|
||||
sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A digital distribution platform";
|
||||
homepage = "http://store.steampowered.com/";
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ jagajaga ];
|
||||
maintainers = with maintainers; [ jagajaga jonringer ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.9.14";
|
||||
version = "5.10.1";
|
||||
in
|
||||
|
||||
buildLinux (args // {
|
||||
@ -13,11 +13,11 @@ buildLinux (args // {
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-zen1";
|
||||
sha256 = "1b8pm80z49d7qk9mvdf9w3hih34pilqr1zjk110q5im1kdz81zrg";
|
||||
sha256 = "1c77x53ixyn64b4qq6br6ckicmjs316c8k08yfxibmhv72av1wcp";
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
branch = "5.9/master";
|
||||
branch = "5.10/master";
|
||||
maintainers = with stdenv.lib.maintainers; [ atemu andresilva ];
|
||||
};
|
||||
|
||||
|
||||
@ -2,8 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpsm2";
|
||||
version = "11.2.156";
|
||||
ifs_version = "10_10_2_0_44";
|
||||
version = "11.2.185";
|
||||
|
||||
preConfigure= ''
|
||||
export UDEVDIR=$out/etc/udev
|
||||
@ -14,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ numactl pkgconfig ];
|
||||
|
||||
installFlags = [
|
||||
installFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"UDEVDIR=/etc/udev"
|
||||
"LIBPSM2_COMPAT_CONF_DIR=/etc"
|
||||
@ -23,8 +22,8 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "opa-psm2";
|
||||
rev = "IFS_RELEASE_${ifs_version}";
|
||||
sha256 = "0ckrfzih1ga9yvximxjdh0z05kn9l858ykqiblv18w6ka3gra1xz";
|
||||
rev = "PSM2_${version}";
|
||||
sha256 = "062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -1,25 +1,17 @@
|
||||
{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
|
||||
{stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
|
||||
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
|
||||
liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
|
||||
openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
|
||||
rsync, glibc, rpcsvc-proto, libtirpc
|
||||
}:
|
||||
let
|
||||
s =
|
||||
rec {
|
||||
baseName="glusterfs";
|
||||
# NOTE: On each glusterfs release, it should be checked if gluster added
|
||||
# new, or changed, Python scripts whose PYTHONPATH has to be set in
|
||||
# `postFixup` below, and whose runtime deps need to go into
|
||||
# `nativeBuildInputs`.
|
||||
# The command
|
||||
# find /nix/store/...-glusterfs-.../ -name '*.py' -executable
|
||||
# can help with finding new Python scripts.
|
||||
version = "7.6";
|
||||
name="${baseName}-${version}";
|
||||
url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
|
||||
sha256 = "0zdcv2jk8dp67id8ic30mkn97ccp07jf20g7v09a5k31pw9aqyih";
|
||||
};
|
||||
# NOTE: On each glusterfs release, it should be checked if gluster added
|
||||
# new, or changed, Python scripts whose PYTHONPATH has to be set in
|
||||
# `postFixup` below, and whose runtime deps need to go into
|
||||
# `nativeBuildInputs`.
|
||||
# The command
|
||||
# find /nix/store/...-glusterfs-.../ -name '*.py' -executable
|
||||
# can help with finding new Python scripts.
|
||||
|
||||
buildInputs = [
|
||||
fuse bison flex_2_5_35 openssl ncurses readline
|
||||
@ -60,16 +52,17 @@ let
|
||||
which # which
|
||||
xfsprogs # xfs_info
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation
|
||||
{
|
||||
inherit (s) name version;
|
||||
inherit buildInputs propagatedBuildInputs;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "glusterfs";
|
||||
version = "8.3";
|
||||
|
||||
patches = [
|
||||
# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed
|
||||
./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
|
||||
];
|
||||
src = fetchFromGitHub {
|
||||
owner = "gluster";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09vvbymiacz2pzwnq6f2dd7g2zszzsivdncz45sh977v3z0n84az";
|
||||
};
|
||||
inherit buildInputs propagatedBuildInputs;
|
||||
|
||||
postPatch = ''
|
||||
sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
|
||||
@ -91,7 +84,7 @@ stdenv.mkDerivation
|
||||
# but fails when the version is empty.
|
||||
# See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705
|
||||
preConfigure = ''
|
||||
echo "v${s.version}" > VERSION
|
||||
echo "v${version}" > VERSION
|
||||
./autogen.sh
|
||||
export PYTHON=${python3}/bin/python
|
||||
'';
|
||||
@ -109,7 +102,7 @@ stdenv.mkDerivation
|
||||
postInstall = ''
|
||||
cp -r $out/$out/* $out
|
||||
rm -r $out/nix
|
||||
'';
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# glusterd invokes `gluster` and other utilities when telling other glusterd nodes to run commands.
|
||||
@ -153,7 +146,7 @@ stdenv.mkDerivation
|
||||
wrapProgram $out/share/glusterfs/scripts/eventsdash.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
|
||||
wrapProgram $out/libexec/glusterfs/glusterfind/brickfind.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
|
||||
wrapProgram $out/libexec/glusterfs/glusterfind/changelog.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
|
||||
'';
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@ -187,12 +180,7 @@ stdenv.mkDerivation
|
||||
rm -r $out/bin/conf.py
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit (s) version;
|
||||
description = "Distributed storage system";
|
||||
homepage = "https://www.gluster.org";
|
||||
license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From f523afac49e24ecc0fa4ad85195135689cf445f0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
|
||||
Date: Wed, 27 Sep 2017 21:36:41 +0200
|
||||
Subject: [PATCH] Fix "glusterfind saves var data under $prefix instead of
|
||||
localstatedir". Fixes #1489610
|
||||
|
||||
Change-Id: Id2362c20f34346c37acfb9eb1ad105d0b7b8b60f
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f87d8a454..b4d3f5d10 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1118,7 +1118,7 @@ if test "x$exec_prefix" = xNONE; then
|
||||
exec_prefix="$(eval echo $prefix)"
|
||||
fi
|
||||
GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs"
|
||||
-GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd"
|
||||
+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/lib/misc/glusterfsd"
|
||||
prefix=$old_prefix
|
||||
exec_prefix=$old_exec_prefix
|
||||
|
||||
--
|
||||
2.12.0
|
||||
|
||||
@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
maintainers = with maintainers; [ erictapen ];
|
||||
platforms = platforms.linux;
|
||||
broken = true; # fails to build with recent versions of botan. https://github.com/das-labor/neopg/issues/98
|
||||
};
|
||||
}
|
||||
|
||||
@ -5107,6 +5107,8 @@ in
|
||||
|
||||
keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
|
||||
|
||||
keystore-explorer = callPackage ../applications/misc/keystore-explorer { };
|
||||
|
||||
kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { };
|
||||
kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix {
|
||||
enableUnfree = false;
|
||||
@ -9070,6 +9072,8 @@ in
|
||||
|
||||
fasmg = callPackage ../development/compilers/fasmg { };
|
||||
|
||||
flasm = callPackage ../development/compilers/flasm { };
|
||||
|
||||
flyctl = callPackage ../development/web/flyctl { };
|
||||
|
||||
flutterPackages =
|
||||
@ -10592,19 +10596,16 @@ in
|
||||
octave = callPackage ../development/interpreters/octave {
|
||||
python = python3;
|
||||
mkDerivation = stdenv.mkDerivation;
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
octave-jit = callPackage ../development/interpreters/octave {
|
||||
python = python3;
|
||||
enableJIT = true;
|
||||
mkDerivation = stdenv.mkDerivation;
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
octaveFull = libsForQt5.callPackage ../development/interpreters/octave {
|
||||
python = python3;
|
||||
enableQt = true;
|
||||
overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
|
||||
ocropus = callPackage ../applications/misc/ocropus { };
|
||||
@ -16083,6 +16084,8 @@ in
|
||||
|
||||
soapyairspy = callPackage ../applications/radio/soapyairspy { };
|
||||
|
||||
soapyaudio = callPackage ../applications/radio/soapyaudio { };
|
||||
|
||||
soapybladerf = callPackage ../applications/radio/soapybladerf { };
|
||||
|
||||
soapyhackrf = callPackage ../applications/radio/soapyhackrf { };
|
||||
@ -16095,6 +16098,7 @@ in
|
||||
extraPackages = [
|
||||
limesuite
|
||||
soapyairspy
|
||||
soapyaudio
|
||||
soapybladerf
|
||||
soapyhackrf
|
||||
soapyremote
|
||||
@ -16250,10 +16254,6 @@ in
|
||||
python = python3;
|
||||
};
|
||||
|
||||
sundials_2 = callPackage ../development/libraries/sundials/2.x.nix {
|
||||
python = python3;
|
||||
};
|
||||
|
||||
sutils = callPackage ../tools/misc/sutils { };
|
||||
|
||||
svrcore = callPackage ../development/libraries/svrcore { };
|
||||
|
||||
@ -9,7 +9,7 @@ let
|
||||
blasUsers = [
|
||||
# "julia_07" "julia_10" "julia_11" "julia_13" "octave" "octaveFull"
|
||||
"fflas-ffpack" "linbox" "R" "ipopt" "hpl" "rspamd" "octopus"
|
||||
"sundials" "sundials_2" "superlu" "suitesparse_5_3" "suitesparse_4_4"
|
||||
"sundials" "superlu" "suitesparse_5_3" "suitesparse_4_4"
|
||||
"suitesparse_4_2" "scs" "scalapack" "petsc" "cholmod-extra"
|
||||
"arpack" "qrupdate" "libcint" "iml" "globalarrays" "arrayfire" "armadillo"
|
||||
"xfitter" "lammps" "plink-ng" "quantum-espresso" "siesta"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user