Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
0630061ef3
10 changed files with 48 additions and 26 deletions
|
|
@ -6,7 +6,9 @@ with lib;
|
|||
|
||||
let
|
||||
|
||||
etc' = filter (f: f.enable) (attrValues config.environment.etc);
|
||||
# if the source is a local file, it should be imported to the store
|
||||
localToStore = mapAttrs (name: value: if name == "source" then "${value}" else value);
|
||||
etc' = map localToStore (filter (f: f.enable) (attrValues config.environment.etc));
|
||||
|
||||
etc = pkgs.runCommandLocal "etc" {
|
||||
# This is needed for the systemd module
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, meson
|
||||
, ninja
|
||||
, exiv2
|
||||
, libheif
|
||||
, libjpeg
|
||||
, libtiff
|
||||
, gst_all_1
|
||||
|
|
@ -32,11 +33,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gthumb";
|
||||
version = "3.11.3";
|
||||
version = "3.11.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "11bvcimamdcksgqj1ymh54yzhpwc5j8glda8brqqhwq3h2wj0j9d";
|
||||
sha256 = "sha256-3ZsPiUXX34Ev/a3OyMO94dyXZyMy4AVt5Cp/ELZLIGw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -66,6 +67,7 @@ stdenv.mkDerivation rec {
|
|||
json-glib
|
||||
lcms2
|
||||
libchamplain
|
||||
libheif
|
||||
libjpeg
|
||||
libraw
|
||||
librsvg
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet-electron";
|
||||
version = "2.8.10";
|
||||
version = "2.8.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
|
||||
sha256 = "sha256-k++vumbhcMl9i4s8f04zOUAfYlA1g477FjrGuEGSD1U=";
|
||||
sha256 = "sha256-DznbSwA1UISw3EkIfM5hGgmIToeXsH1b1HB7UOgDTKU=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "0jjjvqkqmpj55v111p1a1i2ry7mpd1bpphn1bhvlr18rgw7xdrja";
|
||||
sha256 = "0s9wkygjd7xhvd1zdaidbvszq4abb0iv5830ir65glcfzbdbfak9";
|
||||
};
|
||||
|
||||
patches = optional smimeSupport (fetchpatch {
|
||||
|
|
|
|||
|
|
@ -4,20 +4,20 @@
|
|||
|
||||
mixRelease rec {
|
||||
pname = "elixir-ls";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-lsp";
|
||||
repo = "elixir-ls";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pUvONMTYH8atF/p2Ep/K3bwJUDxTzCsxLPbpjP0tQpM=";
|
||||
sha256 = "sha256-KlZq12RCor9GrwA8QMP3R+jUQ/xFHRjkLwwkvthiMU0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
mixFodDeps = fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version;
|
||||
sha256 = "sha256-YRzPASpg1K2kZUga5/aQf4Q33d8aHCwhw7KJxSY56k4=";
|
||||
sha256 = "sha256-OzjToAg+q/ybCyqzNFk28OBsItjFTbdPi416EPh2qX0=";
|
||||
};
|
||||
|
||||
# elixir_ls is an umbrella app
|
||||
|
|
|
|||
|
|
@ -170,14 +170,14 @@ let
|
|||
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
|
||||
};
|
||||
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
|
||||
crossVersion = "1.3.6";
|
||||
crossVersion = "01c176ac0f57d40cc3b6f8e441062780f073d952"; # Aug 22, 2021
|
||||
|
||||
perl-cross-src = fetchFromGitHub {
|
||||
name = "perl-cross-${crossVersion}";
|
||||
owner = "arsv";
|
||||
repo = "perl-cross";
|
||||
rev = crossVersion;
|
||||
sha256 = "0k5vyj40czbkfl7r3dcwxpc7dvdlp2xliaav358bviq3dq9vq9bb";
|
||||
sha256 = "19mwr1snwl4156rlhn74kmpl1wyc7ahhlrjfpnfcj3n63ic0c56y";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
|
||||
|
|
@ -214,7 +214,7 @@ in {
|
|||
perldevel = common {
|
||||
perl = pkgs.perldevel;
|
||||
buildPerl = buildPackages.perldevel;
|
||||
version = "5.35.0";
|
||||
sha256 = "0217nbswhkjhw60kng2p64611xna7za681kk30fkriyicd3yph6n";
|
||||
version = "5.35.3";
|
||||
sha256 = "06442zc5rvisl120f58jpy95bkf8f1cc4n577nzihdavlbfmnyyn";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "krankerl";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ChristophWurst";
|
||||
repo = "krankerl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uIFcWHdW8887CDkFxZznh9akYs+vxsE9Bc9g1hKi7Kc=";
|
||||
sha256 = "sha256-Kol39AtM5m6FC+s5SDbQhWuASkGbeXPlmSGb7axEuK8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-6joHwz0HIVbta8ALvsJLMvmeDh9IFPR4Cx36H63MliI=";
|
||||
cargoSha256 = "sha256-bPcKe3vE3VIjLJ4iYdF3Gt0sID09gRpxG5TpTGWhnPs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strace";
|
||||
version = "5.13";
|
||||
version = "5.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Wsw0iIudUQrWrJFdSo3wj1HPGukg6iRkn2pLuYTQtlY=";
|
||||
sha256 = "sha256-kBvubbXhfeutRTDdn/tNyalsSmVu2+HDFBt8swexHnM=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib
|
||||
, # sdl
|
||||
SDL2
|
||||
, # blind
|
||||
gmp
|
||||
|
||||
, withSDL ? true
|
||||
, withGLX ? false
|
||||
|
|
@ -63,7 +65,7 @@ let
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ libjpeg zlib libvorbis curl ]
|
||||
buildInputs = [ libjpeg zlib libvorbis curl gmp ]
|
||||
++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ]
|
||||
++ lib.optional withSDL [ SDL2.dev ];
|
||||
|
||||
|
|
@ -74,17 +76,27 @@ let
|
|||
|
||||
dontStrip = target != "release";
|
||||
|
||||
buildPhase = lib.optionalString withDedicated ''
|
||||
postConfigure = ''
|
||||
pushd ../d0_blind_id
|
||||
./configure $configureFlags
|
||||
popd
|
||||
'';
|
||||
|
||||
buildPhase = (lib.optionalString withDedicated ''
|
||||
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sv-${target}
|
||||
'' + lib.optionalString withGLX ''
|
||||
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cl-${target}
|
||||
'' + lib.optionalString withSDL ''
|
||||
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sdl-${target}
|
||||
'') + ''
|
||||
pushd ../d0_blind_id
|
||||
make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES
|
||||
popd
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
installPhase = (''
|
||||
for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024 scalable; do
|
||||
install -Dm644 ../../misc/logos/xonotic_icon.svg \
|
||||
$out/share/icons/hicolor/$size/xonotic.svg
|
||||
|
|
@ -95,6 +107,10 @@ let
|
|||
install -Dm755 darkplaces-glx "$out/bin/xonotic-glx"
|
||||
'' + lib.optionalString withSDL ''
|
||||
install -Dm755 darkplaces-sdl "$out/bin/xonotic-sdl"
|
||||
'') + ''
|
||||
pushd ../d0_blind_id
|
||||
make install
|
||||
popd
|
||||
'';
|
||||
|
||||
# Xonotic needs to find libcurl.so at runtime for map downloads
|
||||
|
|
@ -121,10 +137,10 @@ in rec {
|
|||
xonotic-data = fetchzip {
|
||||
name = "xonotic-data";
|
||||
url = "https://dl.xonotic.org/xonotic-${version}.zip";
|
||||
sha256 = "1ygkh0v68y4sd1w5vpk8dgb65h5jm599hwszdfgjp3ax4d3ml81x";
|
||||
sha256 = "15caj11v9hhr7w55w3rs1rspblzr9lg1crqivbn9pyyq0rif8cpl";
|
||||
extraPostFetch = ''
|
||||
cd $out
|
||||
rm -rf $(ls | grep -v "^data$")
|
||||
rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$")
|
||||
'';
|
||||
meta.hydraPlatforms = [];
|
||||
passthru.version = version;
|
||||
|
|
@ -156,7 +172,7 @@ in rec {
|
|||
copyDesktopItems
|
||||
'' + ''
|
||||
for binary in $out/bin/xonotic-*; do
|
||||
wrapProgram $binary --add-flags "-basedir ${xonotic-data}"
|
||||
wrapProgram $binary --add-flags "-basedir ${xonotic-data}" --prefix LD_LIBRARY_PATH : "${xonotic-unwrapped}/lib"
|
||||
done
|
||||
'');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2562,7 +2562,9 @@ in {
|
|||
|
||||
fints = callPackage ../development/python-modules/fints { };
|
||||
|
||||
fiona = callPackage ../development/python-modules/fiona { };
|
||||
fiona = callPackage ../development/python-modules/fiona {
|
||||
gdal = pkgs.gdal_2;
|
||||
};
|
||||
|
||||
fipy = callPackage ../development/python-modules/fipy { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue