mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d384d8bec5
@ -793,6 +793,12 @@
|
||||
githubId = 5053729;
|
||||
name = "Alias Gram";
|
||||
};
|
||||
alias-dev = {
|
||||
email = "alias-dev@protonmail.com";
|
||||
github = "alias-dev";
|
||||
githubId = 30437811;
|
||||
name = "Alex Andrews";
|
||||
};
|
||||
alibabzo = {
|
||||
email = "alistair.bill@gmail.com";
|
||||
github = "alistairbill";
|
||||
@ -14143,6 +14149,12 @@
|
||||
githubId = 406946;
|
||||
name = "Valentin Lorentz";
|
||||
};
|
||||
prominentretail = {
|
||||
email = "me@jakepark.me";
|
||||
github = "ProminentRetail";
|
||||
githubId = 94048404;
|
||||
name = "Jake Park";
|
||||
};
|
||||
proofconstruction = {
|
||||
email = "source@proof.construction";
|
||||
github = "proofconstruction";
|
||||
|
||||
@ -528,7 +528,7 @@ The only required parameter is `name`.
|
||||
|
||||
: A string representation of the type function name.
|
||||
|
||||
`definition`
|
||||
`description`
|
||||
|
||||
: Description of the type used in documentation. Give information of
|
||||
the type and any of its arguments.
|
||||
|
||||
@ -34,9 +34,6 @@ evalConfigArgs@
|
||||
in lib.optional (e != "") (import e)
|
||||
}:
|
||||
|
||||
let pkgs_ = pkgs;
|
||||
in
|
||||
|
||||
let
|
||||
inherit (lib) optional;
|
||||
|
||||
@ -58,8 +55,9 @@ let
|
||||
nixpkgs.system = lib.mkDefault system;
|
||||
})
|
||||
++
|
||||
(optional (pkgs_ != null) {
|
||||
_module.args.pkgs = lib.mkForce pkgs_;
|
||||
(optional (pkgs != null) {
|
||||
# This should be default priority, so it conflicts with any user-defined pkgs.
|
||||
nixpkgs.pkgs = pkgs;
|
||||
})
|
||||
);
|
||||
};
|
||||
@ -109,10 +107,10 @@ let
|
||||
|
||||
nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; };
|
||||
|
||||
withExtraArgs = nixosSystem: nixosSystem // {
|
||||
withExtraAttrs = configuration: configuration // {
|
||||
inherit extraArgs;
|
||||
inherit (nixosSystem._module.args) pkgs;
|
||||
extendModules = args: withExtraArgs (nixosSystem.extendModules args);
|
||||
inherit (configuration._module.args) pkgs;
|
||||
extendModules = args: withExtraAttrs (configuration.extendModules args);
|
||||
};
|
||||
in
|
||||
withWarnings (withExtraArgs nixosWithUserModules)
|
||||
withWarnings (withExtraAttrs nixosWithUserModules)
|
||||
|
||||
@ -5,7 +5,6 @@ stdenv.mkDerivation {
|
||||
name = "security-wrapper";
|
||||
buildInputs = [ linuxHeaders ];
|
||||
dontUnpack = true;
|
||||
hardeningEnable = [ "pie" ];
|
||||
CFLAGS = [
|
||||
''-DSOURCE_PROG="${sourceProg}"''
|
||||
] ++ (if debug then [
|
||||
|
||||
@ -12,7 +12,9 @@ let
|
||||
|
||||
usePostgresql = cfg.settings.database.name == "psycopg2";
|
||||
hasLocalPostgresDB = let args = cfg.settings.database.args; in
|
||||
usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ]));
|
||||
usePostgresql
|
||||
&& (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ]))
|
||||
&& config.services.postgresql.enable;
|
||||
hasWorkers = cfg.workers != { };
|
||||
|
||||
listenerSupportsResource = resource: listener:
|
||||
@ -944,23 +946,6 @@ in {
|
||||
by synapse in `services.matrix-synapse.settings.listeners` or in one of the workers!
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = hasLocalPostgresDB -> config.services.postgresql.enable;
|
||||
message = ''
|
||||
Cannot deploy matrix-synapse with a configuration for a local postgresql database
|
||||
and a missing postgresql service. Since 20.03 it's mandatory to manually configure the
|
||||
database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for
|
||||
further reference).
|
||||
|
||||
If you
|
||||
- try to deploy a fresh synapse, you need to configure the database yourself. An example
|
||||
for this can be found in <nixpkgs/nixos/tests/matrix/synapse.nix>
|
||||
- update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true`
|
||||
to your configuration.
|
||||
|
||||
For further information about this update, please read the release-notes of 20.03 carefully.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = hasWorkers -> cfg.settings.redis.enabled;
|
||||
message = ''
|
||||
@ -1034,9 +1019,11 @@ in {
|
||||
partOf = [ "matrix-synapse.target" ];
|
||||
wantedBy = [ "matrix-synapse.target" ];
|
||||
unitConfig.ReloadPropagatedFrom = "matrix-synapse.target";
|
||||
requires = optional hasLocalPostgresDB "postgresql.service";
|
||||
}
|
||||
else {
|
||||
after = [ "network-online.target" ] ++ optional hasLocalPostgresDB "postgresql.service";
|
||||
requires = optional hasLocalPostgresDB "postgresql.service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
baseServiceConfig = {
|
||||
@ -1070,7 +1057,7 @@ in {
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
ReadWritePaths = [ cfg.dataDir ];
|
||||
ReadWritePaths = [ cfg.dataDir cfg.settings.media_store_path ];
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
|
||||
RestrictNamespaces = true;
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "butt";
|
||||
version = "0.1.38";
|
||||
version = "0.1.39";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-6c4BknAh+XPaKrEfCz0oHm7lWOLV+9jiJbQx9vvtI4I=";
|
||||
hash = "sha256-dh6NceHiqpN6PVwKIo2jV3qCO17P6E6QHdZGRVyd6/g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip";
|
||||
hash = "sha256-J5LB4uR/NJ6ykiTqBY1VepcLujprgqwpxy7sGD0NtZw=";
|
||||
hash = "sha256-6GYp9uzlR1eVRYhNU3kOmcUOPFY3J9eJPqN+TucNavA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
||||
@ -8,7 +8,7 @@ let
|
||||
extraArgs = removeAttrs args [ "callPackage" ];
|
||||
|
||||
pname = "feishin";
|
||||
version = "0.3.0";
|
||||
version = "0.4.1";
|
||||
appname = "Feishin";
|
||||
|
||||
meta = with lib; {
|
||||
@ -21,6 +21,7 @@ let
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
|
||||
in if stdenv.isDarwin
|
||||
in
|
||||
if stdenv.isDarwin
|
||||
then callPackage ./darwin.nix (extraArgs // { inherit pname appname version meta; })
|
||||
else callPackage ./linux.nix (extraArgs // { inherit pname appname version meta; })
|
||||
|
||||
@ -25,17 +25,17 @@ let
|
||||
comment = "Full-featured Subsonic/Jellyfin compatible desktop music player";
|
||||
icon = "feishin";
|
||||
exec = "feishin %u";
|
||||
categories = [ "Audio" ];
|
||||
categories = [ "Audio" "AudioVideo" ];
|
||||
mimeTypes = [ "x-scheme-handler/feishin" ];
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz";
|
||||
hash = "sha256-sl2zM24bb0yBTfCxtNGizp6Yu+L4nj/Uf669zylnPmE=";
|
||||
hash = "sha256-Y8r329rO7z8V2xP/uRsjTFJfvTn+zyeAYzq6fKDxXs4=";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -70,13 +70,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neovim-unwrapped";
|
||||
version = "0.9.2";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "neovim";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kKstlq1BzoBAy+gy9iL1auRViJ223cVpAt5X7pUWT1U=";
|
||||
hash = "sha256-Lyo98cAs7Zhx23N4s4f3zpWFKYJMmXleWpt3wiVDQZo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
101
pkgs/applications/emulators/dosbox-x/default.nix
Normal file
101
pkgs/applications/emulators/dosbox-x/default.nix
Normal file
@ -0,0 +1,101 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, alsa-lib
|
||||
, AudioUnit
|
||||
, autoreconfHook
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, ffmpeg
|
||||
, fluidsynth
|
||||
, freetype
|
||||
, glib
|
||||
, libpcap
|
||||
, libpng
|
||||
, libslirp
|
||||
, libxkbfile
|
||||
, libXrandr
|
||||
, makeWrapper
|
||||
, ncurses
|
||||
, pkg-config
|
||||
, SDL2
|
||||
, SDL2_net
|
||||
, testers
|
||||
, yad
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dosbox-x";
|
||||
version = "2023.10.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joncampbell123";
|
||||
repo = "dosbox-x";
|
||||
rev = "dosbox-x-v${finalAttrs.version}";
|
||||
hash = "sha256-YNYtYqcpTOx4xS/LXI53h3S+na8JVpn4w8Dhf4fWNBQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
fluidsynth
|
||||
freetype
|
||||
glib
|
||||
libpcap
|
||||
libpng
|
||||
libslirp
|
||||
ncurses
|
||||
SDL2
|
||||
SDL2_net
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
libxkbfile
|
||||
libXrandr
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
AudioUnit
|
||||
Carbon
|
||||
Cocoa
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-sdl2" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
hardeningDisable = [ "format" ]; # https://github.com/joncampbell123/dosbox-x/issues/4436
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
wrapProgram $out/bin/dosbox-x \
|
||||
--prefix PATH : ${lib.makeBinPath [ yad ]}
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
# Version output on stderr, program returns status code 1
|
||||
command = "${lib.getExe finalAttrs.finalPackage} -version 2>&1 || true";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://dosbox-x.com";
|
||||
description = "A cross-platform DOS emulator based on the DOSBox project";
|
||||
longDescription = ''
|
||||
DOSBox-X is an expanded fork of DOSBox with specific focus on running
|
||||
Windows 3.x/9x/Me, PC-98 and 3D support via 3dfx.
|
||||
|
||||
The full expanded feature list is available here:
|
||||
https://dosbox-x.com/wiki/DOSBox%E2%80%90X%E2%80%99s-Feature-Highlights
|
||||
'';
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ hughobrien OPNA2608 ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "dosbox-x";
|
||||
};
|
||||
})
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "feh";
|
||||
version = "3.10";
|
||||
version = "3.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derf";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9NJ6zgQHcFJPmRlqJuCMXcKjLvDPUG+QvKGTJlWvWK4=";
|
||||
hash = "sha256-1dz04RcaoP79EoE+SsatXm2wMRCbNnmAzMECYk3y3jg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flashprint";
|
||||
version = "5.7.1";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-kxvqEgXlKQlfzlCqKb5o3hvop82vDsJmQDK9XOCq61g=";
|
||||
hash = "sha256-T7NHSTDFqM/LygTU3zO64Ut/tdd3vDPQoZuhAv7PWHU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ];
|
||||
|
||||
@ -35,13 +35,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "argo";
|
||||
version = "3.4.10";
|
||||
version = "3.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uhXwCaAVFLlGeqkBbeA5DINo9CjNMzU9rRmOYoYJASI=";
|
||||
hash = "sha256-H14a1JzFvzxoNDv8WGzHgfalLnDZ+nX19BbM5ptrEes=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0563OHMNkKZcmLY1nHS70pbtrufY1d1WNXrxcCl6MKY=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cadical";
|
||||
version = "1.5.3";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arminbiere";
|
||||
repo = "cadical";
|
||||
rev = "rel-${version}";
|
||||
sha256 = "sha256-3H/vowWfE1jfomYg2hOi3B3zjWa4CaLHAJXnoKWzskU=";
|
||||
sha256 = "sha256-hY7+gTwBqQegbm5RjLKhM2vfBOjIRz797Z6wd6usj9s=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glab";
|
||||
version = "1.32.0";
|
||||
version = "1.33.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7XFekLlWcifqGJL6IIONpixdMAyGBJJmqo+l6RKCfC8=";
|
||||
hash = "sha256-sBovwqL+3UmOdGf5pnAVzAiAbu69PJi7YhfcJqdejTY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HiU6Kx/du8QLNKUDsSMm349msxSxyNRppxadtIpglBg=";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetube";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
|
||||
sha256 = "0yr5k9s3r4yvcx85bzwn6y4m03964ljnmhz7nf068zj87m9q8rcc";
|
||||
sha256 = "add96ad3509d4d5c6d8658b005dfd046963cd6bb0a4e1f3e88f726a86c05810f";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
22
pkgs/by-name/re/regols/package.nix
Normal file
22
pkgs/by-name/re/regols/package.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "regols";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kitagry";
|
||||
repo = "regols";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2ZwmIlv3kJ26p15t7NvB9sX2GO+B3ypeNl50b7XA0Iw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-N6gtkZSNLXz3B961grM3xHzm7x4/kzcLkDOgiFLGp8U=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "OPA Rego language server";
|
||||
homepage = "https://github.com/kitagry/regols";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ alias-dev ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell-extension-EasyScreenCast";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EasyScreenCast";
|
||||
repo = "EasyScreenCast";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-+cH/gczCdxoSrLp5nD82Spo8bSGyRnUUut3Xkmr9f3o=";
|
||||
hash = "sha256-G7wdRFA0qL+6inVRLAmKoP0E0IOyvlmQIUwbDv/DbLI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "alexapy";
|
||||
version = "1.27.4";
|
||||
version = "1.27.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "keatontaylor";
|
||||
repo = "alexapy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Z7h6VX4cwcepo0Kxq9GdHv+XFNg/0s/OhJ/iHubhovs=";
|
||||
hash = "sha256-CKaxdKuvie88nn1LSTxCLCdbr9bzD6MtvgSU9lplT/8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
47
pkgs/development/python-modules/apple-weatherkit/default.nix
Normal file
47
pkgs/development/python-modules/apple-weatherkit/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, aiohttp
|
||||
, pythonOlder
|
||||
, pyjwt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apple-weatherkit";
|
||||
version = "1.0.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tjhorner";
|
||||
repo = "python-weatherkit";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-G/0hyK2rjdSSnVnvAUGyDvsfNMHVgAD7NHfNFmdBCNA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pyjwt
|
||||
] ++ pyjwt.optional-dependencies.crypto;
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"apple_weatherkit"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for Apple WeatherKit";
|
||||
homepage = "https://github.com/tjhorner/python-weatherkit";
|
||||
changelog = "https://github.com/tjhorner/python-weatherkit/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "5.4.3";
|
||||
version = "5.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hALpNLXPg2Apha3KbEixFEH3NuzLe6lnEy9V5otskDM=";
|
||||
hash = "sha256-kYZ0DBCrRzfCQE9MD5jcgFLRB3gQxLkG4Yys8F9zoBw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncstdlib";
|
||||
version = "3.10.8";
|
||||
version = "3.10.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "maxfischer2781";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7HQFyIR+NWRzbFkzkZiuEQotZfCXpCzrWfWIFg1lWv4=";
|
||||
hash = "sha256-Wvp2orIGxy10jJOyskY3QMCciH33pPgX4Yd0nHjRjsM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitarray";
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5ozu81qIYl0WFpVQdo/MjTiUkT42PCTsv2uMB+sCyPM=";
|
||||
hash = "sha256-+QsvRLWyM2TV+63iw0ZS4Vsfz+gTxG+CjgCPaKcJFg8=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elmax-api";
|
||||
version = "0.0.4";
|
||||
version = "0.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "albertogeniola";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+dR1ccRa4G91yFeSwjgdZ1lEXV/PIgnKN8e9tfy5fTU=";
|
||||
hash = "sha256-57pmmH7f893H71CMhdnahvbN/5F2yfrVZ6MFpYQ4+mQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ephem";
|
||||
version = "4.1.4";
|
||||
version = "4.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-c6WfDSFi0WJFNcPDt1+VZVa9uyBV6vVUp77xR9P5x2A=";
|
||||
hash = "sha256-DGSoqkAVdMdZQgRbmvcNFlbhTFNmFRwMu0AMvu3CNio=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "eufylife-ble-client";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "eufylife_ble_client";
|
||||
inherit version;
|
||||
hash = "sha256-Vt9hHUVAM0d+BcotPUD9v8jXrcg7lEDVChLENUHd3rY=";
|
||||
hash = "sha256-1pnT5B+m2/IDqHqOIZdDx8WwBdZpJe1Bj/HaxY+VW1Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "0.36.4";
|
||||
version = "0.36.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-H4iKxM6uwpAIISSxm4ux+qXsoPfHmpHBRx5MuGxwCE4=";
|
||||
hash = "sha256-e70SirkWOQveyH6qMe+v2JSoNFvEc0EwJ9tLQA0jxZI=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -1,30 +1,39 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, aiohttp, isPy27 }:
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexwebsocket";
|
||||
version = "0.0.13";
|
||||
disabled = isPy27;
|
||||
version = "0.0.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jjlawren";
|
||||
repo = "python-plexwebsocket";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u9zO3d0d4Qg+u4ezVRGkNDpJqHkYIMrEMJzBK5WKk8Y=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gT9RWpaR33ROs6ttjH2joNPi99Ng94Tp/R9eZY1eGZk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# package does not include tests
|
||||
# Package does not include tests
|
||||
doCheck = false;
|
||||
|
||||
# at least guarantee the module can be imported
|
||||
pythonImportsCheck = [
|
||||
"plexwebsocket"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to react to events issued over Plex websockets";
|
||||
homepage = "https://github.com/jjlawren/python-plexwebsocket/";
|
||||
description = "Async library to react to events issued over Plex websockets";
|
||||
changelog = "https://github.com/jjlawren/python-plexwebsocket/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ colemickens ];
|
||||
};
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-r2d/lc7x45usIhT09JSNnHSErJI4zrr+HuLhznoy1CM=";
|
||||
hash = "sha256-PmdCFeKk2Lz9sKDKcRqNkItpASIaFs9hvGvA1gE1c0E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gvm";
|
||||
version = "23.5.1";
|
||||
version = "23.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jdfrmFpWOuQgYwV2NrRyRDwAZThWdBFgfLByVIZ5HhQ=";
|
||||
hash = "sha256-me7HO6BiW+0S1GDbKkbJiRrUQotEP1MPo/d0Xc84mIg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tagoio-sdk";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "tago-io";
|
||||
repo = "sdk-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ebNiEvQ1U0RLrH3OOt/oRRPElg+9jibj7fsEEd1hdmU=";
|
||||
hash = "sha256-R7qJIgL8/zejIuT6YMnC3bdm8lKLBTK5eVjVDEjvRKs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "eltclsh";
|
||||
version = "1.18";
|
||||
version = "1.19";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.openrobots.org/robots/eltclsh.git";
|
||||
rev = "eltclsh-${version}";
|
||||
hash = "sha256-C996BJxEoCSpA0x/nSnz4nnmleTIWyzm0imZp/K+Q/o=";
|
||||
hash = "sha256-YcJRaNct/cLNsjWk+NLzGiDYOG0jNgKudBczKckQU14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "gi-crystal";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hugopl";
|
||||
repo = "gi-crystal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9px6JRdVzsUoU5wlO+blH1OBGKskozF3WvqLV/EYiiA=";
|
||||
hash = "sha256-SwBzGAgs0cBbBYXtaJSDWjORE+vrvI5aKG9kaC9VA4o=";
|
||||
};
|
||||
|
||||
# Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path
|
||||
|
||||
@ -1,79 +1,69 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, openscenegraph
|
||||
, mygui
|
||||
, SDL2
|
||||
, CoreMedia
|
||||
, VideoToolbox
|
||||
, VideoDecodeAcceleration
|
||||
, boost
|
||||
, bullet
|
||||
, ffmpeg
|
||||
, boost
|
||||
, SDL2
|
||||
, unshield
|
||||
, openal
|
||||
, libXt
|
||||
, luajit
|
||||
, lz4
|
||||
, mygui
|
||||
, openal
|
||||
, openscenegraph
|
||||
, recastnavigation
|
||||
, VideoDecodeAcceleration
|
||||
, unshield
|
||||
, yaml-cpp
|
||||
}:
|
||||
|
||||
let
|
||||
openscenegraph_openmw = (openscenegraph.override { colladaSupport = true; })
|
||||
.overrideDerivation (self: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenMW";
|
||||
repo = "osg";
|
||||
rev = "bbe61c3bc510a4f5bb4aea21cce506519c2d24e6";
|
||||
sha256 = "sha256-t3smLqstp7wWfi9HXJoBCek+3acqt/ySBYF8RJOG6Mo=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# For Darwin, OSG doesn't build some plugins as they're redundant with QuickTime.
|
||||
# OpenMW doesn't like this, and expects them to be there. Apply their patch for it.
|
||||
name = "darwin-osg-plugins-fix.patch";
|
||||
url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/0abe3c9c3858211028d881d7706813d606335f72/macos/osg.patch";
|
||||
sha256 = "sha256-/CLRZofZHot8juH78VG1/qhTHPhy5DoPMN+oH8hC58U=";
|
||||
})
|
||||
];
|
||||
});
|
||||
GL = "GLVND"; # or "LEGACY";
|
||||
|
||||
bullet_openmw = bullet.overrideDerivation (old: rec {
|
||||
version = "3.17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bulletphysics";
|
||||
repo = "bullet3";
|
||||
rev = version;
|
||||
sha256 = "sha256-uQ4X8F8nmagbcFh0KexrmnhHIXFSB3A1CCnjPVeHL3Q=";
|
||||
};
|
||||
patches = [];
|
||||
cmakeFlags = (old.cmakeFlags or []) ++ [
|
||||
osg' = (openscenegraph.override { colladaSupport = true; }).overrideDerivation (old: {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Darwin: Without this patch, OSG won't build osgdb_png.so, which is required by OpenMW.
|
||||
name = "darwin-osg-plugins-fix.patch";
|
||||
url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/0abe3c9c3858211028d881d7706813d606335f72/macos/osg.patch";
|
||||
sha256 = "sha256-/CLRZofZHot8juH78VG1/qhTHPhy5DoPMN+oH8hC58U=";
|
||||
})
|
||||
];
|
||||
cmakeFlags = (old.cmakeFlags or [ ]) ++ [
|
||||
"-Wno-dev"
|
||||
"-DOpenGL_GL_PREFERENCE=${GL}"
|
||||
"-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
|
||||
"-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"
|
||||
] ++ (map (e: "-DBUILD_OSG_PLUGIN_${e}=1") [ "BMP" "DAE" "DDS" "FREETYPE" "JPEG" "OSG" "PNG" "TGA" ]);
|
||||
});
|
||||
|
||||
bullet' = bullet.overrideDerivation (old: {
|
||||
cmakeFlags = (old.cmakeFlags or [ ]) ++ [
|
||||
"-Wno-dev"
|
||||
"-DOpenGL_GL_PREFERENCE=${GL}"
|
||||
"-DUSE_DOUBLE_PRECISION=ON"
|
||||
"-DBULLET2_MULTITHREADING=ON"
|
||||
];
|
||||
});
|
||||
|
||||
in
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openmw";
|
||||
version = "0.47.0";
|
||||
version = "0.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromGitLab {
|
||||
owner = "OpenMW";
|
||||
repo = "openmw";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY=";
|
||||
hash = "sha256-zkjVt3GfQZsFXl2Ht3lCuQtDMYQWxhdFO4aGSb3rsyo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OpenMW/openmw/-/merge_requests/1239.diff";
|
||||
sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
@ -84,27 +74,30 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
# If not set, OSG plugin .so files become shell scripts on Darwin.
|
||||
dontWrapQtApps = true;
|
||||
dontWrapQtApps = stdenv.isDarwin;
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
boost
|
||||
bullet_openmw
|
||||
bullet'
|
||||
ffmpeg
|
||||
libXt
|
||||
luajit
|
||||
lz4
|
||||
mygui
|
||||
openal
|
||||
openscenegraph_openmw
|
||||
unshield
|
||||
lz4
|
||||
osg'
|
||||
recastnavigation
|
||||
unshield
|
||||
yaml-cpp
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreMedia
|
||||
VideoDecodeAcceleration
|
||||
VideoToolbox
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# as of 0.46, openmw is broken with GLVND
|
||||
"-DOpenGL_GL_PREFERENCE=LEGACY"
|
||||
"-DOpenGL_GL_PREFERENCE=${GL}"
|
||||
"-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DOPENMW_OSX_DEPLOYMENT=ON"
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, cmake
|
||||
, openmw
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, luajit
|
||||
, makeWrapper
|
||||
, symlinkJoin
|
||||
@ -85,8 +86,15 @@ let
|
||||
--replace "\"./\"" "\"$out/bin/\""
|
||||
'';
|
||||
|
||||
# https://github.com/TES3MP/openmw-tes3mp/issues/552
|
||||
patches = oldAttrs.patches ++ [ ./tes3mp.patch ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch";
|
||||
sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw=";
|
||||
})
|
||||
|
||||
# https://github.com/TES3MP/openmw-tes3mp/issues/552
|
||||
./tes3mp.patch
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
|
||||
|
||||
@ -4698,7 +4698,8 @@
|
||||
pyweatherflowudp
|
||||
];
|
||||
"weatherkit" = ps: with ps; [
|
||||
]; # missing inputs: apple_weatherkit
|
||||
apple-weatherkit
|
||||
];
|
||||
"webhook" = ps: with ps; [
|
||||
aiohttp-cors
|
||||
];
|
||||
@ -5722,6 +5723,7 @@
|
||||
"waze_travel_time"
|
||||
"weather"
|
||||
"weatherflow"
|
||||
"weatherkit"
|
||||
"webhook"
|
||||
"webostv"
|
||||
"websocket_api"
|
||||
|
||||
@ -1,12 +1,28 @@
|
||||
{ fetchFromGitHub, stdenv, lib, pkg-config, autoreconfHook
|
||||
, ncurses, gnutls, readline
|
||||
, openssl, perl, sqlite, libjpeg, speex, pcre, libuuid
|
||||
, ldns, libedit, yasm, which, libsndfile, libtiff, libxcrypt
|
||||
|
||||
{ fetchFromGitHub
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, lib
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, ncurses
|
||||
, gnutls
|
||||
, readline
|
||||
, openssl
|
||||
, perl
|
||||
, sqlite
|
||||
, libjpeg
|
||||
, speex
|
||||
, pcre
|
||||
, libuuid
|
||||
, ldns
|
||||
, libedit
|
||||
, yasm
|
||||
, which
|
||||
, libsndfile
|
||||
, libtiff
|
||||
, libxcrypt
|
||||
, callPackage
|
||||
|
||||
, SystemConfiguration
|
||||
|
||||
, modules ? null
|
||||
, nixosTests
|
||||
}:
|
||||
@ -110,6 +126,20 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
## TODO Validate with the next upstream release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-44488.patch";
|
||||
url = "https://github.com/signalwire/freeswitch/commit/f1fb05214e4f427dcf922f531431ab649cf0622b.patch";
|
||||
hash = "sha256-6GMebE6O2EBx60NE2LSRVljaiLm9T4zTrkIpwGvaB08=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-5217.patch";
|
||||
url = "https://github.com/signalwire/freeswitch/commit/6f9e72c585265d8def8a613b36cd4f524c201980.patch";
|
||||
hash = "sha256-l64mBpyq/TzRM78n73kbuD0UNsk5zIH5QNJlMKdPfr4=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ];
|
||||
buildInputs = [
|
||||
|
||||
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [ bluez gtk3 pythonPackages.python librsvg
|
||||
gnome.adwaita-icon-theme iproute2 networkmanager ]
|
||||
gnome.adwaita-icon-theme networkmanager ]
|
||||
++ pythonPath
|
||||
++ lib.optional withPulseAudio libpulseaudio;
|
||||
|
||||
@ -36,6 +36,8 @@ in stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
|
||||
# Don't check for runtime dependency `ip` during the configure
|
||||
"--disable-runtime-deps-check"
|
||||
(lib.enableFeature withPulseAudio "pulseaudio")
|
||||
];
|
||||
|
||||
|
||||
@ -13,13 +13,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-typing-booster";
|
||||
version = "2.24.1";
|
||||
version = "2.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-fabian";
|
||||
repo = "ibus-typing-booster";
|
||||
rev = version;
|
||||
hash = "sha256-gG2wuoJoEOsnvcPJkravpsJ746/0r9wAEo2Vft3bEoo=";
|
||||
hash = "sha256-h/8fFo7X5p6loDKxcPjOYWg1P0m0tVqR2IX/QSfvrzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdfview";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-CRYWGGHCH6jdNUtEW0jv9aU9gKXAs4PnnrZLexCOJDA=";
|
||||
sha256 = "sha256-WcGYceMOB8gCycJSW4KdApy2gIBgTnE/d0PxGZClUqg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -27,6 +27,11 @@ buildGoModule rec {
|
||||
hash = "sha256-C8Uuz2FC7Zu07ZmFpp+ejpNxkyC3/mM9J2dc5FUKx64=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Allow configuring Version at build time
|
||||
substituteInPlace daemon/core/version.go --replace "const " "var "
|
||||
'';
|
||||
|
||||
modRoot = "daemon";
|
||||
|
||||
buildInputs = [
|
||||
@ -65,6 +70,8 @@ buildGoModule rec {
|
||||
--replace "/bin/mkdir" "${coreutils}/bin/mkdir"
|
||||
'';
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/evilsocket/opensnitch/daemon/core.Version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/opensnitchd \
|
||||
--prefix PATH : ${lib.makeBinPath [ iptables ]}
|
||||
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr"
|
||||
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes";
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !(stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl);
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/diffutils/diffutils.html";
|
||||
|
||||
@ -2624,6 +2624,10 @@ with pkgs;
|
||||
|
||||
dosbox-staging = callPackage ../applications/emulators/dosbox-staging { };
|
||||
|
||||
dosbox-x = darwin.apple_sdk_11_0.callPackage ../applications/emulators/dosbox-x {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa;
|
||||
};
|
||||
|
||||
duckstation = qt6Packages.callPackage ../applications/emulators/duckstation { };
|
||||
|
||||
dynamips = callPackage ../applications/emulators/dynamips { };
|
||||
@ -11492,9 +11496,7 @@ with pkgs;
|
||||
openfortivpn = callPackage ../tools/networking/openfortivpn { };
|
||||
|
||||
opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix {
|
||||
# Build currently fails on Go > 1.18
|
||||
# See https://github.com/evilsocket/opensnitch/issues/851
|
||||
buildGoModule = buildGo118Module;
|
||||
buildGoModule = buildGo121Module;
|
||||
};
|
||||
|
||||
opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { };
|
||||
@ -38345,7 +38347,7 @@ with pkgs;
|
||||
openloco = pkgsi686Linux.callPackage ../games/openloco { };
|
||||
|
||||
openmw = libsForQt5.callPackage ../games/openmw {
|
||||
inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreMedia VideoDecodeAcceleration VideoToolbox;
|
||||
};
|
||||
|
||||
openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };
|
||||
|
||||
@ -618,6 +618,8 @@ self: super: with self; {
|
||||
|
||||
appdirs = callPackage ../development/python-modules/appdirs { };
|
||||
|
||||
apple-weatherkit = callPackage ../development/python-modules/apple-weatherkit { };
|
||||
|
||||
applicationinsights = callPackage ../development/python-modules/applicationinsights { };
|
||||
|
||||
appnope = callPackage ../development/python-modules/appnope { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user