Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
f332a666fb
|
|
@ -214,7 +214,7 @@ in rec {
|
|||
${concatStrings (mapAttrsToList (name: unit:
|
||||
concatMapStrings (name2: ''
|
||||
ln -sfn '${name}' $out/'${name2}'
|
||||
'') unit.aliases) units)}
|
||||
'') (unit.aliases or [])) units)}
|
||||
|
||||
# Create .wants and .requires symlinks from the wantedBy and
|
||||
# requiredBy options.
|
||||
|
|
@ -222,13 +222,13 @@ in rec {
|
|||
concatMapStrings (name2: ''
|
||||
mkdir -p $out/'${name2}.wants'
|
||||
ln -sfn '../${name}' $out/'${name2}.wants'/
|
||||
'') unit.wantedBy) units)}
|
||||
'') (unit.wantedBy or [])) units)}
|
||||
|
||||
${concatStrings (mapAttrsToList (name: unit:
|
||||
concatMapStrings (name2: ''
|
||||
mkdir -p $out/'${name2}.requires'
|
||||
ln -sfn '../${name}' $out/'${name2}.requires'/
|
||||
'') unit.requiredBy) units)}
|
||||
'') (unit.requiredBy or [])) units)}
|
||||
|
||||
${optionalString (type == "system") ''
|
||||
# Stupid misc. symlinks.
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ in
|
|||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
RestrictRealtime = true;
|
||||
RestrictNamespaces = true;
|
||||
|
|
|
|||
|
|
@ -66,10 +66,7 @@ in {
|
|||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
SupplementaryGroups = [ "disk" ];
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged @resources"
|
||||
];
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ in {
|
|||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||
UMask = "0077";
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ in {
|
|||
SystemCallErrorNumber = "EPERM";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@resources" "~@setuid"
|
||||
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -41,6 +41,9 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
systemd.targets.machines.wants = [ "systemd-nspawn@${containerName}.service" ];
|
||||
|
||||
virtualisation.additionalPaths = [ containerSystem ];
|
||||
|
||||
# not needed, but we want to test the nspawn file generation
|
||||
systemd.nspawn.${containerName} = { };
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
|
|||
|
|
@ -277,9 +277,10 @@ let
|
|||
rm -rf $out/share/emacs/site-lisp/elpa/*/server
|
||||
'';
|
||||
dontUseCmakeBuildDir = true;
|
||||
doCheck = true;
|
||||
doCheck = pkgs.stdenv.isLinux;
|
||||
packageRequires = [ self.emacs ];
|
||||
nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.libclang ];
|
||||
buildInputs = [ pkgs.llvmPackages.libclang self.emacs ];
|
||||
nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm ];
|
||||
});
|
||||
|
||||
# tries to write a log file to $HOME
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filezilla";
|
||||
version = "3.60.2";
|
||||
version = "3.61.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
|
||||
hash = "sha256-5AfbrRaZU/+VFFK8vxONlTo6MCNfirsD0nHHEsx+V5I=";
|
||||
hash = "sha256-Cv7w5NolICaHsy7Wsf/NhELVs1vc0W308Cuy6pLimfc=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.6.8";
|
||||
version = "1.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8=";
|
||||
sha256 = "sha256-KvQdYQLzgt/MKPsA/mO5un6nE3/xcvVYwIveNn/uDnU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
{ lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }:
|
||||
|
||||
{ pname ? args.name, version, nativeBuildInputs ? [],
|
||||
createFindlibDestdir ? true,
|
||||
dontStrip ? true,
|
||||
minimumSupportedOcamlVersion ? null,
|
||||
hasSharedObjects ? false,
|
||||
setupHook ? null,
|
||||
meta ? {}, ...
|
||||
}@args:
|
||||
let
|
||||
defaultMeta = {
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
};
|
||||
in
|
||||
assert minimumSupportedOcamlVersion != null ->
|
||||
lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
|
||||
|
||||
stdenv.mkDerivation (args // {
|
||||
name = "ocaml-${pname}-${version}";
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ nativeBuildInputs;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
setupHook = if setupHook == null && hasSharedObjects
|
||||
then writeText "setupHook.sh" ''
|
||||
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${pname}/"
|
||||
''
|
||||
else setupHook;
|
||||
|
||||
inherit createFindlibDestdir;
|
||||
inherit dontStrip;
|
||||
|
||||
meta = defaultMeta // meta;
|
||||
})
|
||||
|
|
@ -6,28 +6,26 @@
|
|||
, flatpak
|
||||
, gettext
|
||||
, glib
|
||||
, granite
|
||||
, gtk3
|
||||
, libgee
|
||||
, libhandy
|
||||
, granite7
|
||||
, gtk4
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
, libxml2
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sideload";
|
||||
version = "6.0.2";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0abpcawmmv5mgzk2i5n9rlairmjr2v9rg9b8c9g7xa085s496bi9";
|
||||
sha256 = "sha256-iyqKhyBU9OLlPLy5ZD/GxoOzprbm7uKBkFzjUUoQc5g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,16 +36,14 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
flatpak
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
libgee
|
||||
libhandy
|
||||
granite7
|
||||
gtk4
|
||||
libxml2
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, python3
|
||||
, ninja
|
||||
, vala
|
||||
, gnome-settings-daemon
|
||||
, gtk3
|
||||
, granite
|
||||
, wingpanel
|
||||
|
|
@ -19,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-sound";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FHZ4YhGLqGTz5Po2XFJvnWuAi1eHKcT9zzgJFHic02E=";
|
||||
sha256 = "sha256-hifEd2uL1sBLF8H8KwYoxCyVpGkv9f4SqD6WmB7xJ7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,6 +39,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
gnome-settings-daemon # media-keys
|
||||
granite
|
||||
gtk3
|
||||
libcanberra-gtk3
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, buildOcaml, fetchFromGitHub, camlp4 }:
|
||||
|
||||
buildOcaml rec {
|
||||
version = "112.35.00";
|
||||
pname = "herelib";
|
||||
|
||||
minimumSupportedOcamlVersion = "4.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "herelib";
|
||||
rev = version;
|
||||
sha256 = "sha256-EuMhHu2na3lcpsJ1wMVOgBr6VKndlonq8jgAW01eelI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ camlp4 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/janestreet/herelib";
|
||||
description = "Syntax extension for inserting the current location";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, buildOcaml, fetchFromGitHub, camlp4 }:
|
||||
|
||||
buildOcaml rec {
|
||||
pname = "pipebang";
|
||||
version = "113.00.00";
|
||||
|
||||
minimumSupportedOcamlVersion = "4.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "pipebang";
|
||||
rev = version;
|
||||
sha256 = "sha256-9A3X/ciL5HtuKQ5awS+hDDBLL5ytOr12wHsmJLNRn+Q=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
propagatedBuildInputs = [ camlp4 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/janestreet/pipebang";
|
||||
description = "Syntax extension to transform x |! f into f x";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi";
|
||||
version = "0.85.0";
|
||||
version = "0.85.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "tiangolo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mgrw5MQMqFcXExtsu/jW01dMlygfE1GzSqXHI6BG7j4=";
|
||||
hash = "sha256-pMKWaj81rDX+zPHGvHakMDWN8+SU2qBAStk7HqENaig=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.22.0";
|
||||
version = "0.22.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-GqPXVi+SsfO0ufUJzEZ5eUzwJmM/wylLA1KMv+WaIsU=";
|
||||
hash = "sha256-mkYtfO+wZ4vIdpCzum9uwoKMv1Xn0few8ywbvrEwxj8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2022.10.8";
|
||||
version = "2022.10.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-92TR0zkYUgIso+ki3k+meTeMQdWrcBooNgL42pf0EqA=";
|
||||
sha256 = "sha256-QBYJnQzKGQDPJJ6mWRBYwuPiv+Yktu31SparORuvUwY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ buildPythonPackage
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, blas
|
||||
, libcint
|
||||
|
|
@ -25,6 +26,12 @@ buildPythonPackage rec {
|
|||
hash = "sha256-KMxwyAK00Zc0i76zWTMznfXQCVCt+4HOH8SlwuOCORk=";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
name = "libxc-6"; # https://github.com/pyscf/pyscf/pull/1467
|
||||
url = "https://github.com/pyscf/pyscf/commit/ebcfacc90e119cd7f9dcdbf0076a84660349fc79.patch";
|
||||
sha256 = "sha256-O+eDlUKJeThxQcHrMGqxjDfRCmCNP+OCgv/L72jAF/o=";
|
||||
})];
|
||||
|
||||
# setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake.
|
||||
nativeBuildInputs = [ cmake ];
|
||||
dontUseCmakeConfigure = true;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -55,7 +55,7 @@ buildPythonPackage rec {
|
|||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = version;
|
||||
hash = "sha256-la+MgVulQS6k6zux2mC7AiXqZWEU2LG/fGUUMFrBI6k=";
|
||||
hash = "sha256-wNI92LVGFN+7LPxnrezPeF7dSS5UgwCuF62/ux3rik4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.42.0";
|
||||
version = "0.42.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-stfHkQqgxlPJ6qMGZ+oCcp5M6GuL71GC8PE08lL8Fig=";
|
||||
sha256 = "sha256-pcd9xyfH0n7UwR/Cyd+PSo9WPK1g7FaBhxOtlRttGEA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Ced/3KY78wBSo02sbowV8eI1tHe+a6g9DnRQ3AXp8fU=";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sBO0rJFRG38qAh1svChkbyCv8eJ9KjVPJHgOhxUMuH0=";
|
||||
sha256 = "sha256-nGeUCxS0SRYjaqG1Fay8U8nvcmSuPgmbd5I/ivjOJyA=";
|
||||
};
|
||||
vendorSha256 = "sha256-yPzuhM0m+ltkz2z7D+DcFVjZ3OvGkJqQdc6iFidcty8=";
|
||||
vendorSha256 = "sha256-03785NZUvjLKyAX+Vsbf9W2xpaYtrIy5jFM9j3sU26Y=";
|
||||
|
||||
# integration tests expect more file changes
|
||||
# types tests are missing CodeLocation
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2022-10-17";
|
||||
cargoSha256 = "sha256-budFHrSZTxGC3a35OlRKtZuJnCWWTwsqqWLpgjSp5Ss=";
|
||||
version = "2022-10-24";
|
||||
cargoSha256 = "sha256-IkYoFcaPtgiCxdmR+nb0kXSYUuAwAR0UmEmDVomIBhs=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-vd+UsJSg+Y/iBRJvvvFsunxwXc0jz4JyJLQPChfgfRA=";
|
||||
sha256 = "sha256-rKESGm1up385ecSGp5txbvOkxRRS8SX88oWI8UubOkA=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "skaffold";
|
||||
version = "1.39.2";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "skaffold";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dDN/nlJiuh35VdAcMYsLLN++VjGzxdYZWAXbtAf09Fs=";
|
||||
sha256 = "sha256-/EqEr7X/bsX4y2yXFxJYH/ujGU4br7qg6bCNx2FTva8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-RA2KgUjYB3y6sOQdnLSZjr52VosZSaRrVU0BXZvjB1M=";
|
||||
vendorSha256 = "sha256-TbHqnj/H5WCBnsk5zbMXPMaWpm5eRmaWWoxJH8YqOts=";
|
||||
|
||||
subPackages = ["cmd/skaffold"];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -25,6 +25,8 @@
|
||||
# Packagers (or people using make install) have to set this variable to an absolute path.
|
||||
wl_set_if_unset(WL_INSTALL_DATADIR "./data")
|
||||
|
||||
+wl_set_if_unset(WL_INSTALL_BINARY "./bin")
|
||||
+
|
||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
|
||||
message(FATAL_ERROR "Widelands needs GCC >= 4.7 to compile.")
|
||||
|
||||
--- a/cmake/WlFunctions.cmake
|
||||
+++ b/cmake/WlFunctions.cmake
|
||||
@@ -276,5 +276,5 @@
|
||||
|
||||
#Quoting the CMake documentation on DESTINATION:
|
||||
#"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX"
|
||||
- install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles)
|
||||
+ install(TARGETS ${NAME} DESTINATION ${WL_INSTALL_BINARY} COMPONENT ExecutableFiles)
|
||||
endfunction()
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config # needed to find minizip
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_mixer
|
||||
, SDL2_net
|
||||
, SDL2_ttf
|
||||
, boost
|
||||
, cmake
|
||||
, curl
|
||||
, doxygen
|
||||
|
|
@ -20,28 +20,24 @@
|
|||
, lua
|
||||
, python3
|
||||
, zlib
|
||||
, minizip
|
||||
, asio
|
||||
, libSM
|
||||
, libICE
|
||||
, libXext
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "widelands";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "widelands";
|
||||
repo = "widelands";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gNumYoeKePaxiAzrqEPKibMxFwv9vyBrCSoua+MKhcM=";
|
||||
sha256 = "sha256-fe1fey34b6T1+kqMa22STROu7dagQJtg24nW2jhVix8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./bincmake.patch
|
||||
# fix for building with Boost 1.77, https://github.com/widelands/widelands/pull/5025
|
||||
(fetchpatch {
|
||||
url = "https://github.com/widelands/widelands/commit/33981fda8c319c9feafc958f5f0b1670c48666ef.patch";
|
||||
sha256 = "sha256-FjxxCTPpg/Zp01XpNfgRXMMLJBfxAptkLpsLmnFXm2Q=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace xdg/org.widelands.Widelands.desktop \
|
||||
--replace 'Exec=widelands' "Exec=$out/bin/widelands"
|
||||
|
|
@ -49,12 +45,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev" # dev warnings are only needed for upstream development
|
||||
"-DWL_INSTALL_BASEDIR=${placeholder "out"}"
|
||||
"-DWL_INSTALL_DATADIR=${placeholder "out"}/share/widelands"
|
||||
"-DWL_INSTALL_BINARY=${placeholder "out"}/bin"
|
||||
"-DWL_INSTALL_BASEDIR=${placeholder "out"}/share/widelands" # for COPYING, Changelog, etc.
|
||||
"-DWL_INSTALL_DATADIR=${placeholder "out"}/share/widelands" # for game data
|
||||
"-DWL_INSTALL_BINDIR=${placeholder "out"}/bin"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen gettext graphviz installShellFiles ];
|
||||
nativeBuildInputs = [ cmake doxygen gettext graphviz installShellFiles pkg-config ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
|
|
@ -62,7 +60,6 @@ stdenv.mkDerivation rec {
|
|||
SDL2_mixer
|
||||
SDL2_net
|
||||
SDL2_ttf
|
||||
boost
|
||||
curl
|
||||
glew
|
||||
icu
|
||||
|
|
@ -70,6 +67,11 @@ stdenv.mkDerivation rec {
|
|||
lua
|
||||
python3
|
||||
zlib
|
||||
minizip
|
||||
asio
|
||||
libSM # XXX: these should be propagated by SDL2?
|
||||
libICE
|
||||
libXext
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -90,6 +92,8 @@ stdenv.mkDerivation rec {
|
|||
Settlers II". It has a single player campaign mode, as well as a networked
|
||||
multiplayer mode.
|
||||
'';
|
||||
changelog = "https://github.com/widelands/widelands/releases/tag/v1.1";
|
||||
mainProgram = "widelands";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ raskin jcumming ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.132";
|
||||
version = "3.0.133";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aliyun";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-X+M81xVJIRPTgDPtd+vKFAgx34D+UMcyS3Mz5PNE3pU=";
|
||||
sha256 = "sha256-cYR/AQJSSXXVH2PBPrc9bBGVU4M59yttj2ykoCsuZcU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rUYlFM9OlPXGzxXyOxweUs6md7HhjocC56F+OtT/IXo=";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.46.3";
|
||||
version = "0.46.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DNwAsHznu+I8CItyvz4fG7QZDuQQvYPRYiy4qJbKZ3s=";
|
||||
hash = "sha256-ROUMFpAgUmcKt7QG+Lfd3OipJQK8DLezvCxvev1yNlo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4TY7/prMbvw5zVPJRoMLg7Omrxvh1HPGsdz1wqPn4uU=";
|
||||
|
|
|
|||
|
|
@ -53,7 +53,9 @@ stdenv.mkDerivation rec {
|
|||
--prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}"
|
||||
'';
|
||||
|
||||
passthru.tests.btrbk = nixosTests.btrbk;
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) btrbk btrbk-no-timer btrbk-section-order;
|
||||
};
|
||||
|
||||
passthru.updateScript = genericUpdater {
|
||||
versionLister = writeShellScript "btrbk-versionLister" ''
|
||||
|
|
|
|||
|
|
@ -1,24 +1,23 @@
|
|||
{ config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3
|
||||
, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2
|
||||
, gnome, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook
|
||||
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
|
||||
, gnome, librsvg, wrapGAppsHook, gobject-introspection
|
||||
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
|
||||
|
||||
let
|
||||
pythonPackages = python3Packages;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "blueman";
|
||||
version = "2.3.2";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-hM99f9Fzh1HHfgYF9y5M3UtyMHindo/j81MJmToDUK4=";
|
||||
sha256 = "sha256-wgYzghQ38yydPRkOzXDR4vclXXSn1pefInEb3C5WAVI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection intltool pkg-config pythonPackages.cython
|
||||
pythonPackages.wrapPython wrapGAppsHook
|
||||
autoreconfHook # drop when below patch is removed
|
||||
];
|
||||
|
||||
buildInputs = [ bluez gtk3 pythonPackages.python librsvg
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZP8MYvGotBVvuLZHFJgTz1SGAZLwuZwk9ohNtfcCSgs=";
|
||||
sha256 = "sha256-gnPplWCP3Dky+CzWumeGC/XAHhHWFt/h4WiFoCLzHMU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+jJUKp2EvtDxGsv+9B+s7FiIopvO8yH9jldeRZkrd20=";
|
||||
vendorSha256 = "sha256-3gpA0EGdcVeUCU7iozpjQJM/iid34PRm3gpxUiwzDEk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "uncover";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-euf6ufKVaDEJdaUCzjog32Gpoi7CPa3X22p60UgnOOQ=";
|
||||
hash = "sha256-bYSqfxjJGue+7gPr8XgkcPF7UUuKWmLuQO07KCJp4jY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FePZWseFEbBhBIsojw67SCZufSJygekZjlk0d7aceak=";
|
||||
vendorSha256 = "sha256-FG0pqzSoqT/KjTOjXidAGjSABMFWgChJJYOhBfyzM7w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "API wrapper to search for exposed hosts";
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ let
|
|||
|
||||
# Libs
|
||||
|
||||
buildOcaml = callPackage ../build-support/ocaml { };
|
||||
|
||||
buildOasisPackage = callPackage ../build-support/ocaml/oasis.nix { };
|
||||
|
||||
buildDunePackage = callPackage ../build-support/ocaml/dune.nix {};
|
||||
|
|
@ -531,8 +529,6 @@ let
|
|||
|
||||
hashcons = callPackage ../development/ocaml-modules/hashcons { };
|
||||
|
||||
herelib = callPackage ../development/ocaml-modules/herelib { };
|
||||
|
||||
hidapi = callPackage ../development/ocaml-modules/hidapi { };
|
||||
|
||||
higlo = callPackage ../development/ocaml-modules/higlo { };
|
||||
|
|
@ -1274,8 +1270,6 @@ let
|
|||
|
||||
parany = callPackage ../development/ocaml-modules/parany { };
|
||||
|
||||
pipebang = callPackage ../development/ocaml-modules/pipebang { };
|
||||
|
||||
portaudio = callPackage ../development/ocaml-modules/portaudio {
|
||||
inherit (pkgs) portaudio;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue