Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
ef1a40da01
|
|
@ -9,7 +9,7 @@ wide variety of extensions and libraries available.
|
|||
|
||||
The different versions of PHP that nixpkgs provides are located under
|
||||
attributes named based on major and minor version number; e.g.,
|
||||
`php74` is PHP 7.4.
|
||||
`php81` is PHP 8.1.
|
||||
|
||||
Only versions of PHP that are supported by upstream for the entirety
|
||||
of a given NixOS release will be included in that release of
|
||||
|
|
@ -23,7 +23,7 @@ NixOS - not necessarily the latest major release from upstream.
|
|||
All available PHP attributes are wrappers around their respective
|
||||
binary PHP package and provide commonly used extensions this way. The
|
||||
real PHP 7.4 package, i.e. the unwrapped one, is available as
|
||||
`php74.unwrapped`; see the next section for more details.
|
||||
`php81.unwrapped`; see the next section for more details.
|
||||
|
||||
Interactive tools built on PHP are put in `php.packages`; composer is
|
||||
for example available at `php.packages.composer`.
|
||||
|
|
|
|||
|
|
@ -570,6 +570,7 @@ rec {
|
|||
{ modules
|
||||
, specialArgs ? {}
|
||||
, shorthandOnlyDefinesConfig ? false
|
||||
, description ? null
|
||||
|
||||
# Internal variable to avoid `_key` collisions regardless
|
||||
# of `extendModules`. Wired through by `evalModules`.
|
||||
|
|
@ -618,10 +619,14 @@ rec {
|
|||
|
||||
freeformType = base._module.freeformType;
|
||||
|
||||
in
|
||||
mkOptionType rec {
|
||||
name = "submodule";
|
||||
description = freeformType.description or name;
|
||||
|
||||
in
|
||||
mkOptionType {
|
||||
inherit name;
|
||||
description =
|
||||
if description != null then description
|
||||
else freeformType.description or name;
|
||||
check = x: isAttrs x || isFunction x || path.check x;
|
||||
merge = loc: defs:
|
||||
(base.extendModules {
|
||||
|
|
@ -647,9 +652,7 @@ rec {
|
|||
functor = defaultFunctor name // {
|
||||
type = types.submoduleWith;
|
||||
payload = {
|
||||
modules = modules;
|
||||
specialArgs = specialArgs;
|
||||
shorthandOnlyDefinesConfig = shorthandOnlyDefinesConfig;
|
||||
inherit modules specialArgs shorthandOnlyDefinesConfig description;
|
||||
};
|
||||
binOp = lhs: rhs: {
|
||||
modules = lhs.modules ++ rhs.modules;
|
||||
|
|
@ -666,6 +669,14 @@ rec {
|
|||
else if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig
|
||||
then lhs.shorthandOnlyDefinesConfig
|
||||
else throw "A submoduleWith option is declared multiple times with conflicting shorthandOnlyDefinesConfig values";
|
||||
description =
|
||||
if lhs.description == null
|
||||
then rhs.description
|
||||
else if rhs.description == null
|
||||
then lhs.description
|
||||
else if lhs.description == rhs.description
|
||||
then lhs.description
|
||||
else throw "A submoduleWith option is declared multiple times with conflicting descriptions";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -108,6 +108,12 @@
|
|||
<literal>(with foo; isPower && is32bit && isBigEndian)</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
PHP 7.4 is no longer supported due to upstream not supporting
|
||||
this version for the entire lifecycle of the 22.11 release.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.11-notable-changes">
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
|
||||
|
||||
- PHP 7.4 is no longer supported due to upstream not supporting this
|
||||
version for the entire lifecycle of the 22.11 release.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
|
|
|
|||
|
|
@ -516,9 +516,15 @@
|
|||
./services/mail/roundcube.nix
|
||||
./services/mail/sympa.nix
|
||||
./services/mail/nullmailer.nix
|
||||
./services/matrix/matrix-synapse.nix
|
||||
./services/matrix/appservice-discord.nix
|
||||
./services/matrix/appservice-irc.nix
|
||||
./services/matrix/conduit.nix
|
||||
./services/matrix/dendrite.nix
|
||||
./services/matrix/mautrix-facebook.nix
|
||||
./services/matrix/mautrix-telegram.nix
|
||||
./services/matrix/mjolnir.nix
|
||||
./services/matrix/pantalaimon.nix
|
||||
./services/matrix/synapse.nix
|
||||
./services/misc/ananicy.nix
|
||||
./services/misc/airsonic.nix
|
||||
./services/misc/ankisyncd.nix
|
||||
|
|
@ -537,7 +543,6 @@
|
|||
./services/misc/cpuminer-cryptonight.nix
|
||||
./services/misc/cgminer.nix
|
||||
./services/misc/confd.nix
|
||||
./services/misc/dendrite.nix
|
||||
./services/misc/devmon.nix
|
||||
./services/misc/dictd.nix
|
||||
./services/misc/duckling.nix
|
||||
|
|
@ -580,11 +585,6 @@
|
|||
./services/misc/libreddit.nix
|
||||
./services/misc/lifecycled.nix
|
||||
./services/misc/mame.nix
|
||||
./services/misc/matrix-appservice-discord.nix
|
||||
./services/misc/matrix-appservice-irc.nix
|
||||
./services/misc/matrix-conduit.nix
|
||||
./services/misc/mautrix-facebook.nix
|
||||
./services/misc/mautrix-telegram.nix
|
||||
./services/misc/mbpfan.nix
|
||||
./services/misc/mediatomb.nix
|
||||
./services/misc/metabase.nix
|
||||
|
|
|
|||
|
|
@ -251,6 +251,8 @@ in {
|
|||
] ++ lib.optional config.security.rtkit.enable "rtkit";
|
||||
description = "Pipewire system service user";
|
||||
isSystemUser = true;
|
||||
home = "/var/lib/pipewire";
|
||||
createHome = true;
|
||||
};
|
||||
groups.pipewire.gid = config.ids.gids.pipewire;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ in
|
|||
|
||||
services.phpfpm.pools.postfixadmin = {
|
||||
user = user;
|
||||
phpPackage = pkgs.php74;
|
||||
phpPackage = pkgs.php81;
|
||||
phpOptions = ''
|
||||
error_log = 'stderr'
|
||||
log_errors = on
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ in {
|
|||
|
||||
log_config = mkOption {
|
||||
type = types.path;
|
||||
default = ./matrix-synapse-log_config.yaml;
|
||||
default = ./synapse-log_config.yaml;
|
||||
description = ''
|
||||
The file that holds the logging configuration.
|
||||
'';
|
||||
|
|
@ -767,7 +767,7 @@ in {
|
|||
|
||||
meta = {
|
||||
buildDocsInSandbox = false;
|
||||
doc = ./matrix-synapse.xml;
|
||||
doc = ./synapse.xml;
|
||||
maintainers = teams.matrix.members;
|
||||
};
|
||||
|
||||
|
|
@ -293,9 +293,7 @@ in
|
|||
inherit user;
|
||||
group = webserver.group;
|
||||
|
||||
# Not yet compatible with php 8 https://www.dokuwiki.org/requirements
|
||||
# https://github.com/splitbrain/dokuwiki/issues/3545
|
||||
phpPackage = pkgs.php74;
|
||||
phpPackage = pkgs.php81;
|
||||
phpEnv = {
|
||||
DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig hostName cfg}";
|
||||
DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig hostName cfg}";
|
||||
|
|
|
|||
|
|
@ -115,9 +115,9 @@ in {
|
|||
user = "grocy";
|
||||
group = "nginx";
|
||||
|
||||
# PHP 7.4 is the only version which is supported/tested by upstream:
|
||||
# https://github.com/grocy/grocy/blob/v3.0.0/README.md#how-to-install
|
||||
phpPackage = pkgs.php74;
|
||||
# PHP 8.0 is the only version which is supported/tested by upstream:
|
||||
# https://github.com/grocy/grocy/blob/v3.3.0/README.md#how-to-install
|
||||
phpPackage = pkgs.php80;
|
||||
|
||||
inherit (cfg.phpfpm) settings;
|
||||
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ in
|
|||
};
|
||||
|
||||
services.phpfpm = {
|
||||
phpPackage = pkgs.php74;
|
||||
phpPackage = pkgs.php81;
|
||||
pools = mapAttrs' (hostName: cfg: (
|
||||
nameValuePair "invoiceplane-${hostName}" {
|
||||
inherit user;
|
||||
|
|
@ -302,4 +302,3 @@ in
|
|||
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ let
|
|||
mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
|
||||
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
|
||||
|
||||
phpExt = pkgs.php74.withExtensions
|
||||
phpExt = pkgs.php81.withExtensions
|
||||
({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache ]);
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ in {
|
|||
};
|
||||
phpPackage = mkOption {
|
||||
type = types.package;
|
||||
relatedPackages = [ "php74" "php80" "php81" ];
|
||||
relatedPackages = [ "php80" "php81" ];
|
||||
defaultText = "pkgs.php";
|
||||
description = ''
|
||||
PHP package to use for Nextcloud.
|
||||
|
|
@ -632,7 +632,7 @@ in {
|
|||
services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;
|
||||
|
||||
services.nextcloud.phpPackage =
|
||||
if versionOlder cfg.package.version "21" then pkgs.php74
|
||||
if versionOlder cfg.package.version "24" then pkgs.php80
|
||||
# FIXME: Use PHP 8.1 with Nextcloud 24 and higher, once issues like this one are fixed:
|
||||
#
|
||||
# https://github.com/nextcloud/twofactor_totp/issues/1192
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@ in {
|
|||
|
||||
services.phpfpm.pools.snipe-it = {
|
||||
inherit user group;
|
||||
phpPackage = pkgs.php74;
|
||||
phpPackage = pkgs.php81;
|
||||
phpOptions = ''
|
||||
post_max_size = ${cfg.maxUploadSize}
|
||||
upload_max_filesize = ${cfg.maxUploadSize}
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ in {
|
|||
croc = handleTest ./croc.nix {};
|
||||
cryptpad = handleTest ./cryptpad.nix {};
|
||||
deluge = handleTest ./deluge.nix {};
|
||||
dendrite = handleTest ./dendrite.nix {};
|
||||
dendrite = handleTest ./matrix/dendrite.nix {};
|
||||
dex-oidc = handleTest ./dex-oidc.nix {};
|
||||
dhparams = handleTest ./dhparams.nix {};
|
||||
disable-installer-tools = handleTest ./disable-installer-tools.nix {};
|
||||
|
|
@ -301,9 +301,9 @@ in {
|
|||
mariadb-galera = handleTest ./mysql/mariadb-galera.nix {};
|
||||
mastodon = handleTestOn ["x86_64-linux" "i686-linux" "aarch64-linux"] ./web-apps/mastodon.nix {};
|
||||
matomo = handleTest ./matomo.nix {};
|
||||
matrix-appservice-irc = handleTest ./matrix-appservice-irc.nix {};
|
||||
matrix-conduit = handleTest ./matrix-conduit.nix {};
|
||||
matrix-synapse = handleTest ./matrix-synapse.nix {};
|
||||
matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {};
|
||||
matrix-conduit = handleTest ./matrix/conduit.nix {};
|
||||
matrix-synapse = handleTest ./matrix/synapse.nix {};
|
||||
mattermost = handleTest ./mattermost.nix {};
|
||||
mediatomb = handleTest ./mediatomb.nix {};
|
||||
mediawiki = handleTest ./mediawiki.nix {};
|
||||
|
|
@ -422,7 +422,6 @@ in {
|
|||
pgjwt = handleTest ./pgjwt.nix {};
|
||||
pgmanage = handleTest ./pgmanage.nix {};
|
||||
php = handleTest ./php {};
|
||||
php74 = handleTest ./php { php = pkgs.php74; };
|
||||
php80 = handleTest ./php { php = pkgs.php80; };
|
||||
php81 = handleTest ./php { php = pkgs.php81; };
|
||||
pict-rs = handleTest ./pict-rs.nix {};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
import ../make-test-python.nix ({ pkgs, ... }:
|
||||
let
|
||||
homeserverUrl = "http://homeserver:8008";
|
||||
in
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
import ../make-test-python.nix ({ pkgs, ... }:
|
||||
let
|
||||
name = "conduit";
|
||||
in
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
import ./make-test-python.nix (
|
||||
import ../make-test-python.nix (
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
homeserverUrl = "http://homeserver:8008";
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... } : let
|
||||
import ../make-test-python.nix ({ pkgs, ... } : let
|
||||
|
||||
|
||||
runWithOpenSSL = file: cmd: pkgs.runCommand file {
|
||||
|
|
@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let
|
|||
'';
|
||||
|
||||
|
||||
mailerCerts = import ./common/acme/server/snakeoil-certs.nix;
|
||||
mailerCerts = import ../common/acme/server/snakeoil-certs.nix;
|
||||
mailerDomain = mailerCerts.domain;
|
||||
registrationSharedSecret = "unsecure123";
|
||||
testUser = "alice";
|
||||
|
|
@ -14,10 +14,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "industrializer";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.bz2";
|
||||
sha256 = "0vls94hqpkk8h17da6fddgqbl5dgm6250av3raimhhzwvm5r1gfi";
|
||||
url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.xz";
|
||||
sha256 = "0k688k2wppam351by7cp9m7an09yligzd89padr8viqy63gkdk6v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf automake ];
|
||||
|
|
|
|||
|
|
@ -126,7 +126,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Workaround for the following error affecting newer versions of Clang:
|
||||
# ./config.def.h:xxx:x: error: 'TARGET_OS_TV' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_]
|
||||
NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang [ "-Wno-undef-prefix" ];
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-Wno-undef-prefix" ]
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# duplicate symbol '_apple_platform' in:ui_cocoa.o cocoa_common.o
|
||||
# TODO: drop when upstream gets a fix for it:
|
||||
# https://github.com/libretro/RetroArch/issues/14025
|
||||
++ lib.optionals stdenv.isDarwin [ "-fcommon" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://libretro.com";
|
||||
|
|
|
|||
|
|
@ -1,45 +1,33 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, gdal
|
||||
, clipper
|
||||
, cmake
|
||||
, cups
|
||||
, doxygen
|
||||
, gdal
|
||||
, ninja
|
||||
, proj
|
||||
, clipper
|
||||
, zlib
|
||||
, qttools
|
||||
, qtimageformats
|
||||
, qtlocation
|
||||
, qtsensors
|
||||
, qttools
|
||||
, qttranslations
|
||||
, doxygen
|
||||
, cups
|
||||
, qtimageformats
|
||||
, substituteAll
|
||||
, zlib
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "OpenOrienteering-Mapper";
|
||||
version = "0.9.5";
|
||||
|
||||
buildInputs = [
|
||||
gdal
|
||||
qtlocation
|
||||
qtimageformats
|
||||
qtsensors
|
||||
clipper
|
||||
zlib
|
||||
proj
|
||||
cups
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ninja qttools ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenOrienteering";
|
||||
repo = "mapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5";
|
||||
hash = "sha256-BQbryRV5diBkOtva9sYuLD8yo3IwFqrkz3qC+C6eEfE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -55,6 +43,24 @@ mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
ninja
|
||||
qttools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
clipper
|
||||
cups
|
||||
gdal
|
||||
proj
|
||||
qtimageformats
|
||||
qtlocation
|
||||
qtsensors
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Building the manual and bundling licenses fails
|
||||
# See https://github.com/NixOS/nixpkgs/issues/85306
|
||||
|
|
@ -81,15 +87,12 @@ mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = ''
|
||||
OpenOrienteering Mapper is an orienteering mapmaking program
|
||||
and provides a free alternative to the existing proprietary solution.
|
||||
'';
|
||||
homepage = "https://www.openorienteering.org/apps/mapper/";
|
||||
description = "An orienteering mapmaking program";
|
||||
changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
maintainers = with maintainers; [ mpickering sikmir ];
|
||||
platforms = with platforms; unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ let
|
|||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "http://udig.refractions.net/files/downloads/udig-${version}.linux.gtk.x86_64.zip";
|
||||
sha256 = "03hj1mdd6sq0gbpa838wkccibp3l2hvnwxxf5dyc0jk3mmd94fwa";
|
||||
hash = "sha256-ijuSWq1jSsB8K653bjcUdNwVGZscDaTuegBr01oNEg4=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "http://udig.refractions.net/files/downloads/udig-${version}.macosx.cocoa.x86_64.zip";
|
||||
sha256 = "16rcyp1zy3lr1hwjhzh6vwcgck52w66dm1qsc52gppy1f4i3f692";
|
||||
hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "whitebox_tools";
|
||||
version = "2.0.0";
|
||||
|
|
@ -7,20 +13,22 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "jblindsay";
|
||||
repo = "whitebox-tools";
|
||||
rev = "7551aa70e8d9cbd8b3744fde48e82aa40393ebf8";
|
||||
sha256 = "0mngw99aj60bf02y3piimxc1z1zbw1dhwyixndxh3b3m9xqhk51h";
|
||||
hash = "sha256-MJQJcU91rAF7sz16Dlvg64cfWK8x3uEFcAsYqVLiz1Y=";
|
||||
};
|
||||
|
||||
cargoPatches = [./update-cargo-lock.patch];
|
||||
cargoSha256 = "sha256-+IFLv/mIgqyDKNC5aZgQeW6Ymu6+desOD8dDvEdwsSM=";
|
||||
|
||||
cargoPatches = [
|
||||
./update-cargo-lock.patch
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoSha256 = "08xif13vqhy71w7fnxdyxsd9hvkr22c6kffh521sr0l8z6zlp0gq";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An advanced geospatial data analysis platform";
|
||||
homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html";
|
||||
description = "An advanced geospatial data analysis platform";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.mpickering ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,20 +1,32 @@
|
|||
{ lib, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, atk
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
, pango
|
||||
, python3Packages
|
||||
, txt2tags
|
||||
, wrapGAppsHook
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xdgmenumaker";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gapan";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif";
|
||||
sha256 = "Q38m8YrvkkTCY2dByvPj+Ee1DMSUbWvwSDI0kW182bU=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
strictDeps = false;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
txt2tags
|
||||
|
|
@ -22,26 +34,30 @@ python3Packages.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
atk
|
||||
gdk-pixbuf
|
||||
pango
|
||||
];
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
pyxdg
|
||||
pygobject3
|
||||
pyxdg
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"DESTDIR="
|
||||
];
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tool that generates XDG menus for several window managers";
|
||||
homepage = "https://github.com/gapan/xdgmenumaker";
|
||||
license = licenses.gpl2Plus;
|
||||
license = licenses.gpl3Plus;
|
||||
# NOTE: exclude darwin from platforms because Travis reports hash mismatch
|
||||
platforms = with platforms; filter (x: !(elem x darwin)) unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
# fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667
|
||||
(fetchpatch {
|
||||
url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655";
|
||||
sha256 = "sha256:0ihixyq72yhx6njij7bldsqb80x3y217yh6livknlf5r1wr3hakn";
|
||||
sha256 = "sha256-dio4Mg+5OGrnjtRAf4LwowO0sG50HRmlNR16cbDvEUY=";
|
||||
extraPrefix = "";
|
||||
name = "gnome-todo_meson-build.patch";
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
, ninja
|
||||
, vala
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, gtk3
|
||||
, granite
|
||||
, libgee
|
||||
|
|
@ -20,17 +19,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-videos";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "videos";
|
||||
rev = version;
|
||||
sha256 = "sha256-3V8iDy68ngdFTJxAGimuGi4vPru32pHYevThA0RwNpE=";
|
||||
sha256 = "sha256-IUIY/WgGPVRYk9O+ZocopoBF7TlLnTtScNwO6gDCALw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-notifications";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "notifications";
|
||||
rev = version;
|
||||
sha256 = "sha256-AEcZVQPAQLa202/Yvq0GihY8BfMEH46iXeQ5u3QvuXg=";
|
||||
sha256 = "sha256-kM//T3P8gMGnCMDJ1caQQGgD6HBOQo0wp2wZGMUUPuU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure";
|
||||
version = "1.11.1.1113";
|
||||
version = "1.11.1.1119";
|
||||
|
||||
src = fetchurl {
|
||||
# https://clojure.org/releases/tools
|
||||
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
|
||||
sha256 = "sha256-DJVKVqBx8zueA5+KuQX4NypaYBoNFKMuDM8jDqdgaiI=";
|
||||
sha256 = "sha256-DPFLExCMWheI5IIa8aNz/ZggftJpxgOUIOYZZKBdvIc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
{ callPackage, lib, stdenv, ... }@_args:
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "7.4.29";
|
||||
sha256 = "sha256-fd5YoCsiXCUTDG4q4su6clS7A0D3/hcpFHgXbYZvlII=";
|
||||
});
|
||||
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
bcmath
|
||||
calendar
|
||||
curl
|
||||
ctype
|
||||
dom
|
||||
exif
|
||||
fileinfo
|
||||
filter
|
||||
ftp
|
||||
gd
|
||||
gettext
|
||||
gmp
|
||||
iconv
|
||||
intl
|
||||
json
|
||||
ldap
|
||||
mbstring
|
||||
mysqli
|
||||
mysqlnd
|
||||
opcache
|
||||
openssl
|
||||
pcntl
|
||||
pdo
|
||||
pdo_mysql
|
||||
pdo_odbc
|
||||
pdo_pgsql
|
||||
pdo_sqlite
|
||||
pgsql
|
||||
posix
|
||||
readline
|
||||
session
|
||||
simplexml
|
||||
sockets
|
||||
soap
|
||||
sodium
|
||||
sqlite3
|
||||
tokenizer
|
||||
xmlreader
|
||||
xmlwriter
|
||||
zip
|
||||
zlib
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [ imap ]))
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
{ buildPecl, lib, pcre2, php }:
|
||||
|
||||
buildPecl {
|
||||
pname = "apcu_bc";
|
||||
|
||||
version = "1.0.5";
|
||||
sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20";
|
||||
|
||||
peclDeps = [ php.extensions.apcu ];
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "APCu Backwards Compatibility Module";
|
||||
license = licenses.php301;
|
||||
homepage = "https://pecl.php.net/package/apcu_bc";
|
||||
maintainers = teams.php.members;
|
||||
broken = versionAtLeast php.version "8";
|
||||
};
|
||||
}
|
||||
|
|
@ -16,7 +16,6 @@ buildPecl {
|
|||
configureFlags = [ "--with-couchbase" ];
|
||||
|
||||
buildInputs = [ libcouchbase zlib ];
|
||||
internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@ buildPecl {
|
|||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extension providing efficient data structures for PHP";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = versionOlder php.version "8.0";
|
||||
description = "A PHP code-quality tool";
|
||||
homepage = "https://github.com/phpro/grumphp";
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ buildPecl, lib, version, sha256, oracle-instantclient }:
|
||||
{ buildPecl, lib, oracle-instantclient }:
|
||||
let
|
||||
version = "3.0.1";
|
||||
sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914";
|
||||
in
|
||||
buildPecl {
|
||||
pname = "oci8";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
{ buildPecl, fetchurl, lib, libxl, php }:
|
||||
let
|
||||
pname = "php_excel";
|
||||
phpVersion = "php7";
|
||||
version = "1.0.2";
|
||||
in
|
||||
buildPecl {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz";
|
||||
sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n";
|
||||
};
|
||||
|
||||
buildInputs = [ libxl ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-excel"
|
||||
"--with-libxl-incdir=${libxl}/include_c"
|
||||
"--with-libxl-libdir=${libxl}/lib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PHP Extension interface to the Excel writing/reading library";
|
||||
license = licenses.php301;
|
||||
homepage = "https://github.com/iliaal/php_excel";
|
||||
maintainers = lib.teams.php.members;
|
||||
broken = lib.versionAtLeast php.version "8.0";
|
||||
};
|
||||
}
|
||||
|
|
@ -29,6 +29,5 @@ mkDerivation {
|
|||
license = licenses.bsd3;
|
||||
homepage = "https://phpmd.org/";
|
||||
maintainers = teams.php.members;
|
||||
broken = versionOlder php.version "7.4";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@ buildPecl {
|
|||
|
||||
internalDeps = with php.extensions; [
|
||||
session
|
||||
] ++ lib.optionals (lib.versionOlder php.version "8.0") [
|
||||
json
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-python-hcl2";
|
||||
version = "0.3.42";
|
||||
version = "0.3.43";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-s4O2xoNafYHFBToxkKzgJ5NjQH4M5D7PcpsmiAZqR/8=";
|
||||
hash = "sha256-rUmvhmqvVtblmqzbYJcHUdFSw2PsPGbZFPJRi3Xtjv0=";
|
||||
};
|
||||
|
||||
# Nose is required during build process, so can not use `checkInputs`.
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "0.3.4";
|
||||
version = "0.3.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-s2OPHA3uBoWFnEz51itif3icErYkXhayvQ3+0b6jyjE=";
|
||||
hash = "sha256-cIm4ADZSVbE+Hb23AjKs6vADnIQNFPJjFj3Ex7INnwo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,40 +1,43 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pulumi
|
||||
, parver
|
||||
, pulumi
|
||||
, pythonOlder
|
||||
, semver
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pulumi-aws";
|
||||
# version is independant of pulumi's.
|
||||
version = "5.3.0";
|
||||
disabled = isPy27;
|
||||
# Version is independant of pulumi's.
|
||||
version = "5.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "pulumi-aws";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LrWiNYJeQQvXJDOxklRO86VSiaadvkOepQVPhh2BBkk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oy2TBxE9zDbRc6cSml4nwibAAEq3anWngoxj6h4sYbU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/sdk/python";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pulumi
|
||||
parver
|
||||
pulumi
|
||||
semver
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cd sdk/python
|
||||
'';
|
||||
|
||||
# checks require cloud resources
|
||||
# Checks require cloud resources
|
||||
doCheck = false;
|
||||
pythonImportsCheck = ["pulumi_aws"];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pulumi_aws"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetgear";
|
||||
version = "0.10.4";
|
||||
version = "0.10.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "MatMaul";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-+Tv7i3iUr8HySTHPR4iNO6ycUnpNazKJkp3mXSflu54=";
|
||||
sha256 = "sha256-eYcMS8gxJO5JXvgIcZEEei5THb+gDdmoad+/Vokis/Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywizlight";
|
||||
version = "0.5.13";
|
||||
version = "0.5.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "sbidy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UePrG49Q2tJq3f2QaW4BjbWHHif6cTFGdiO/DZfpMFA=";
|
||||
sha256 = "sha256-IkuAYEg5nuUT6zxmuJe6afp4MVWf0+HAnEoAdOrdTvQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,14 +31,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sunpy";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-01eGYls8eE2e3vzDYXz5D1xQs7pxpmHt89aBKCvVdLg=";
|
||||
hash = "sha256-TKOJcEg5A3zjuJbH/tugoX7A7vxSwcE20jJ5QuvWTu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "svg.path";
|
||||
version = "6.0";
|
||||
version = "6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-X78HaJFzywl3aA4Sl58wHQu2r1NVyjlsww0+ESx5TdU=";
|
||||
hash = "sha256-i0Rx37c2GwibZstC2pZBWO0A6aXKEVuKaaxPXcJHSj8=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "4.19.2";
|
||||
version = "4.19.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9r/1vW7Rhv9+Swxdzu5PTnlQlT8ofJeZamHf5X4ql8w=";
|
||||
hash = "sha256-kXgxIjU5L4YYCqHGvhqjX4YZ3VKNLYIxIKqT1Nmv/GU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.12.5";
|
||||
version = "3.12.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CTWxN7boesxRFxMy+k1BOejuvoSFg/JDYYCC0Aud+Es=";
|
||||
sha256 = "sha256-p7YE1qVhjizVNuJLXZF0lw28WbzvnOwfguvMr0b8ifc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twitchapi";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "twitchAPI";
|
||||
inherit version;
|
||||
hash = "sha256-uNXET3V3r3f6c72IF3DEdXfQlrgkn2w5f4ksKBOsihg=";
|
||||
hash = "sha256-NOLuooJNGpuHnKa9eAEEDzKJnXdJ6/Yx2/9KZqY9SDk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-freezegun";
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bwUQjUaLrsrfmZhzvTfleyXOs1010/g+enQvJdb+iw4=";
|
||||
hash = "sha256-yzotLu6VDqy6rAZzq1BJmCM2XOuMZVursVRKQURkCew=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1206";
|
||||
version = "2.0.1209";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-5pnT9JcE1BY4kgqycfNLm3PiTqZdw2V9ksz2E+jfFkY=";
|
||||
hash = "sha256-q2TwkmP16SvhMJkBcvYMfjbXP6GKZpzEQh7H9N+H20U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "buildkite-test-collector-rust";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "test-collector-rust";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rY/+AwxO0+xcnRj0A8TRhCUJQ0ecosybI6It1mDOdQM=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-qfJ0ROi0S0mmPl6kKrW3dp3VLjYqK+sBVj+iKDNTjyM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rust adapter for Buildkite Test Analytics";
|
||||
homepage = "https://buildkite.com/test-analytics";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ jfroche ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "jorio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256:1371inw11rzfrxmc3v4gv5axp56bxjbcr0mhqm4x839401bfq5mf";
|
||||
sha256 = "sha256-rhbsVgAkDdRJxbCCzJbsy5TbVdmP7MFqz+7nELiN4Yw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +1,49 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fairymax";
|
||||
version = "4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c";
|
||||
sha256 = "01vxhpa4z0613mkgkzmsln293wxmyp5kdzil93cd1ik51q4gwjca";
|
||||
hash = "sha256-ikn+CA5lxtDYSDT+Nsv1tfORhKW6/vlmHcGAT9SFfQc=";
|
||||
};
|
||||
|
||||
ini = fetchurl {
|
||||
url = "http://home.hccnet.nl/h.g.muller/fmax.ini";
|
||||
sha256 = "1zwx70g3gspbqx1zf9gm1may8jrli9idalvskxbdg33qgjys47cn";
|
||||
hash = "sha256-lh2ivXx4jNdWn3pT1WKKNEvkVQ31JfdDx+vqNx44nf8=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
cp ${src} fairymax.c
|
||||
cp ${ini} fmax.ini
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
$CC *.c -Wno-return-type -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"'
|
||||
cc *.c -Wno-return-type \
|
||||
-o fairymax \
|
||||
-DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out"/{bin,share/fairymax}
|
||||
cp fairymax "$out/bin"
|
||||
cp fmax.ini "$out/share/fairymax"
|
||||
'';
|
||||
meta = {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html";
|
||||
description = "A small chess engine supporting fairy pieces";
|
||||
longDescription = ''
|
||||
A version of micro-Max that reads the piece description
|
||||
from a file fmax.ini, so that arbitrary fairy pieces can be
|
||||
implemented. This version (4.8J) supports up to 15 piece types,
|
||||
and board sizes up to 12x8. A Linux port exists in the
|
||||
format of a debian package.
|
||||
A version of micro-Max that reads the piece description from a file
|
||||
fmax.ini, so that arbitrary fairy pieces can be implemented. This version
|
||||
(4.8J) supports up to 15 piece types, and board sizes up to 12x8.
|
||||
'';
|
||||
license = lib.licenses.free ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.all;
|
||||
homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html";
|
||||
license = licenses.free;
|
||||
maintainers = [ maintainers.raskin ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
{ lib, buildPythonApplication, fetchFromGitHub
|
||||
, gtk3, gobject-introspection
|
||||
, wrapGAppsHook, python3Packages }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gshogi";
|
||||
version = "0.5.1";
|
||||
|
||||
|
|
@ -10,7 +14,7 @@ buildPythonApplication rec {
|
|||
owner = "johncheetham";
|
||||
repo = "gshogi";
|
||||
rev = "v${version}";
|
||||
sha256 = "06vgndfgwyfi50wg3cw92zspc9z0k7xn2pp6qsjih0l5yih8iwqh";
|
||||
hash = "sha256-EPOIYPSFAhilxuZeYfuZ4Cd29ReJs/E4KNF5/lyzbxs=";
|
||||
};
|
||||
|
||||
doCheck = false; # no tests available
|
||||
|
|
@ -22,15 +26,15 @@ buildPythonApplication rec {
|
|||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pygobject3
|
||||
pycairo
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A graphical implementation of the Shogi board game, also known as Japanese Chess";
|
||||
homepage = "http://johncheetham.com/projects/gshogi/";
|
||||
license = licenses.gpl3;
|
||||
description = "A graphical implementation of the Shogi board game, also known as Japanese Chess";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.ciil ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, SDL2_mixer
|
||||
, cmake
|
||||
, libpng
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julius";
|
||||
|
|
@ -8,18 +15,18 @@ stdenv.mkDerivation rec {
|
|||
owner = "bvschaik";
|
||||
repo = "julius";
|
||||
rev = "v${version}";
|
||||
sha256 = "0w7kmgz9ya0ck9cxhsyralarg7y6ydx4plmh33r4mkxkamlr7493";
|
||||
hash = "sha256-I5GTaVWzz0ryGLDSS3rzxp+XFVXZa9hZmgwon/6r83A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ SDL2 SDL2_mixer libpng ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source re-implementation of Caesar III";
|
||||
homepage = "https://github.com/bvschaik/julius";
|
||||
description = "An open source re-implementation of Caesar III";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ Thra11 ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ Thra11 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,29 +2,28 @@
|
|||
, lib
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, imake
|
||||
, gccmakedep
|
||||
, imake
|
||||
, installShellFiles
|
||||
, libX11
|
||||
, libXext
|
||||
, installShellFiles
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
let
|
||||
debian-extras = fetchzip {
|
||||
url = "mirror://debian/pool/main/k/koules/koules_1.4-27.debian.tar.xz";
|
||||
sha256 = "0bq1rr6vxqmx2k0dhyrqnwwfiw4h2ycbj576v66vwr0jaq5plil3";
|
||||
hash = "sha256-g0Z6C1YSZL6N2eYUuZgXkPDoOLc4e9jAFL3ivk3OAS8=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "koules";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ucw.cz/~hubicka/koules/packages/${pname}${version}-src.tar.gz";
|
||||
sha256 = "06x2wkpns14kii9fxmxbmj5lma371qj00hgl7fc5kggfmzz96vy3";
|
||||
hash = "sha256-w2+T/q/uvVmYO/RBACQOZ6hKi6yr1+5SjJMEbe/kohs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ imake gccmakedep installShellFiles copyDesktopItems ];
|
||||
|
|
@ -57,20 +56,22 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
desktopName = "Koules";
|
||||
name = "koules";
|
||||
exec = "xkoules";
|
||||
icon = "koules";
|
||||
comment = "Push your enemies away, but stay away from obstacles";
|
||||
categories = [ "Game" "ArcadeGame" ];
|
||||
}) ];
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
desktopName = "Koules";
|
||||
name = "koules";
|
||||
exec = "xkoules";
|
||||
icon = "koules";
|
||||
comment = "Push your enemies away, but stay away from obstacles";
|
||||
categories = [ "Game" "ArcadeGame" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast arcade game based on the fundamental law of body attraction";
|
||||
homepage = "https://www.ucw.cz/~hubicka/koules/English/";
|
||||
description = "Fast arcade game based on the fundamental law of body attraction";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.iblech ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost
|
||||
, opencl-headers, ocl-icd, qtbase , zlib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, boost
|
||||
, opencl-headers
|
||||
, ocl-icd
|
||||
, qtbase
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "leela-zero";
|
||||
|
|
@ -9,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "gcp";
|
||||
repo = "leela-zero";
|
||||
rev = "v${version}";
|
||||
sha256 = "1k04ld1ysabxb8ivci3ji5by9vb3yvnflkf2fscs1x0bp7d6j101";
|
||||
sha256 = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -21,9 +29,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Go engine modeled after AlphaGo Zero";
|
||||
homepage = "https://github.com/gcp/leela-zero";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://github.com/gcp/leela-zero";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.averelld maintainers.omnipotententity ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ stdenv, lib, fetchFromGitHub, python3Packages }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "openttd-nml";
|
||||
version = "0.6.1";
|
||||
|
||||
|
|
@ -8,15 +12,18 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "OpenTTD";
|
||||
repo = "nml";
|
||||
rev = version;
|
||||
sha256 = "0z0n4lqvnqigfjjhmmz7mvis7iivd4a8d287ya2yscfg5hznnqh2";
|
||||
hash = "sha256-AmJrPyzPMe2F8geJhhRpO8aj467n1wqldC9iuzElFnw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ply pillow];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pillow
|
||||
ply
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://openttdcoop.org/";
|
||||
description = "Compiler for OpenTTD NML files";
|
||||
homepage = "http://openttdcoop.org/";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "jorio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256:1yd4clks7kr2hn69c4q1ykc92sw6axbspambm03viapr834bjz3q";
|
||||
sha256 = "sha256-eHy5yED5qrgHqKuqq1dXhmuR2PQBE5aMhSLPoydlpPk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +1,57 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext
|
||||
, glibmm, libxmlxx, pango, librsvg
|
||||
, SDL2, glew, boost, ffmpeg, portaudio, libepoxy
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, boost
|
||||
, cmake
|
||||
, ffmpeg
|
||||
, gettext
|
||||
, glew
|
||||
, glibmm
|
||||
, libepoxy
|
||||
, librsvg
|
||||
, libxmlxx
|
||||
, pango
|
||||
, pkg-config
|
||||
, portaudio
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "performous";
|
||||
version = "1.1";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Karaoke, band and dancing game";
|
||||
homepage = "http://performous.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "performous";
|
||||
repo = "performous";
|
||||
rev = version;
|
||||
sha256 = "08j0qhr65l7qnd5vxl4l07523qpvdwi31h4vzl3lfiinx1zcgr4x";
|
||||
hash = "sha256-neTHfug2RkcH/ZvAMCJv++IhygGU0L5Ls/jQYjLEQCI=";
|
||||
};
|
||||
|
||||
patches = [ ./performous-cmake.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config gettext ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gettext
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glibmm libxmlxx pango librsvg
|
||||
SDL2 glew boost ffmpeg portaudio libepoxy
|
||||
SDL2
|
||||
boost
|
||||
ffmpeg
|
||||
glew
|
||||
glibmm
|
||||
libepoxy
|
||||
librsvg
|
||||
libxmlxx
|
||||
pango
|
||||
portaudio
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://performous.org/";
|
||||
description = "Karaoke, band and dancing game";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, qt4
|
||||
, SDL
|
||||
, qt4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://tw2.bitbusters.club/downloads/tworld-${version}-src.tar.gz";
|
||||
sha256 = "sha256:1y55v2shk2xxcds7bdwdjaq9lka31sgdp2469zqnvldchwbvcb2i";
|
||||
hash = "sha256-USy2F4es0W3xT4aI254OQ02asJKNt3V0Y72LCbXYpfg=";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 SDL ];
|
||||
buildInputs = [ SDL qt4 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postConfigure = ''
|
||||
|
|
@ -36,10 +37,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tile World 2: Tile World is a reimplementation of the game Chip's Challenge";
|
||||
homepage = "https://tw2.bitbusters.club/";
|
||||
description = "Tile World 2: Tile World is a reimplementation of the game Chip's Challenge";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ drperceptron ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,34 @@
|
|||
{ lib, stdenv, fetchzip, fetchFromGitHub, buildFHSUserEnv, makeDesktopItem
|
||||
, copyDesktopItems, gcc, cmake, gmp , libGL, zlib, ncurses, geoip, lua5
|
||||
, nettle, curl, SDL2, freetype, glew , openal, libopus, opusfile, libogg
|
||||
, libvorbis, libjpeg, libwebp, libpng
|
||||
, cacert, aria2 # to download assets
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, buildFHSUserEnv
|
||||
, cmake
|
||||
, copyDesktopItems
|
||||
, curl
|
||||
, freetype
|
||||
, gcc
|
||||
, geoip
|
||||
, glew
|
||||
, gmp
|
||||
, libGL
|
||||
, libjpeg
|
||||
, libogg
|
||||
, libopus
|
||||
, libpng
|
||||
, libvorbis
|
||||
, libwebp
|
||||
, lua5
|
||||
, makeDesktopItem
|
||||
, ncurses
|
||||
, nettle
|
||||
, openal
|
||||
, opusfile
|
||||
, zlib
|
||||
# to download assets
|
||||
, aria2
|
||||
, cacert
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -14,18 +40,21 @@ let
|
|||
repo = "Unvanquished";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1fiqn9f6nsh4cfjy7gfsv950hphwi9ca0ddgsjvn77g7yc0arp6c";
|
||||
sha256 = "sha256-zNysAPPnnWO31K81oFiKHF4IStraveOlYwRqa1yyOLo=";
|
||||
};
|
||||
|
||||
unvanquished-binary-deps = stdenv.mkDerivation rec {
|
||||
# DISCLAIMER: this is selected binary crap from the NaCl SDK
|
||||
name = "unvanquished-binary-deps";
|
||||
version = binary-deps-version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2";
|
||||
sha256 = "08bpyavbh5lmyprvqqi59gnm8s1fjmlk9f1785wlv7f52d9f9z1p";
|
||||
sha256 = "sha256-N/zkUhPFnU15QSe4NGmVLmhU7UslYrzz9ZUWuLbydyE=";
|
||||
};
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
preFixup = ''
|
||||
# We are not using the autoPatchelfHook, because it would make
|
||||
# nacl_bootstrap_helper unable to load nacl_loader:
|
||||
|
|
@ -38,7 +67,12 @@ let
|
|||
fi
|
||||
done
|
||||
'';
|
||||
preCheck = "pnacl/bin/clang -v"; # check it links correctly
|
||||
|
||||
preCheck = ''
|
||||
# check it links correctly
|
||||
pnacl/bin/clang -v
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
|
@ -51,15 +85,18 @@ let
|
|||
|
||||
libstdcpp-preload-for-unvanquished-nacl = stdenv.mkDerivation {
|
||||
name = "libstdcpp-preload-for-unvanquished-nacl";
|
||||
|
||||
propagatedBuildInputs = [ gcc.cc.lib ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir $out/etc -p
|
||||
echo ${gcc.cc.lib}/lib/libstdc++.so.6 > $out/etc/ld-nix.so.preload
|
||||
'';
|
||||
propagatedBuildInputs = [ gcc.cc.lib ];
|
||||
};
|
||||
|
||||
fhsEnv = buildFHSUserEnv {
|
||||
name = "unvanquished-fhs-wrapper";
|
||||
|
||||
targetPkgs = pkgs: [ libstdcpp-preload-for-unvanquished-nacl ];
|
||||
};
|
||||
|
||||
|
|
@ -81,10 +118,14 @@ let
|
|||
pname = "unvanquished-assets";
|
||||
inherit version src;
|
||||
|
||||
outputHash = "sha256:084jdisb48xyk9agjifn0nlnsdnjgg32si8zd1khsywd0kffplzx";
|
||||
outputHash = "sha256-/dPr3ASNew1naB9FLcZ70jZtqQXWRflUmr4jsnRskiA=";
|
||||
outputHashMode = "recursive";
|
||||
|
||||
nativeBuildInputs = [ aria2 cacert ];
|
||||
buildCommand = "bash $src/download-paks --cache=$(pwd) --version=${version} $out";
|
||||
|
||||
buildCommand = ''
|
||||
bash $src/download-paks --cache=$(pwd) --version=${version} $out
|
||||
'';
|
||||
};
|
||||
|
||||
# this really is the daemon game engine, the game itself is in the assets
|
||||
|
|
@ -98,7 +139,12 @@ in stdenv.mkDerivation rec {
|
|||
chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake unvanquished-binary-deps copyDesktopItems ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
unvanquished-binary-deps
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
libGL
|
||||
|
|
@ -168,17 +214,18 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
platforms = [ "x86_64-linux" ];
|
||||
homepage = "https://unvanquished.net/";
|
||||
downloadPage = "https://unvanquished.net/download/";
|
||||
description = "A fast paced, first person strategy game";
|
||||
maintainers = with lib.maintainers; [ afontain ];
|
||||
# don't replace the following lib.licenses.zlib with just "zlib",
|
||||
# or you would end up with the package instead
|
||||
license = with lib.licenses; [
|
||||
mit gpl3Plus lib.licenses.zlib bsd3 # engine
|
||||
cc-by-sa-25 cc-by-sa-30 cc-by-30 cc-by-sa-40 cc0 # assets
|
||||
];
|
||||
maintainers = with lib.maintainers; [ afontain ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,25 @@
|
|||
{lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, SDL
|
||||
, SDL_image
|
||||
, SDL_mixer
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vectoroids";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/vectoroids-${version}.tar.gz";
|
||||
sha256 = "0bkvd4a1v496w0vlvqyi1a6p25ssgpkchxxxi8899sb72wlds54d";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL SDL_image SDL_mixer];
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_image
|
||||
SDL_mixer
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i s,/usr/local,$out, Makefile
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sqlite-zandronum";
|
||||
|
|
@ -6,7 +9,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.sqlite.org/2017/sqlite-autoconf-3180000.tar.gz";
|
||||
sha256 = "0p5cx7nbjxk7glcm277ypi5w4gv144qazw79ql47svlpccj62mrp";
|
||||
hash = "sha256-N1dhJGOXbn0IxenwrzAhYT/CS7z+HFEZfWd2uezprFw=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, stdenv, fetchzip, cmake, zlib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, cmake
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zdbsp";
|
||||
|
|
@ -6,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip";
|
||||
sha256 = "1j6k0appgjjj3ffbll9hy9nnbqr17szd1s66q08zrbkfqf6g8f0d";
|
||||
sha256 = "sha256-DTj0jMNurvwRwMbo0L4+IeNlbfIwUbqcG1LKd68C08g=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
@ -23,8 +28,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "ZDoom's internal node builder for DOOM maps";
|
||||
homepage = "https://zdoom.org/wiki/ZDBSP";
|
||||
description = "ZDoom's internal node builder for DOOM maps";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ lassulus siraben ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, perl
|
||||
, expat
|
||||
, xlibsWrapper
|
||||
, freetype
|
||||
}:
|
||||
|
||||
# !!! assert freetype == xorg.freetype
|
||||
|
||||
|
|
@ -8,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.logicalshift.co.uk/unix/zoom/zoom-${version}.tar.gz";
|
||||
sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj";
|
||||
hash = "sha256-8pZ/HAVV341K6QRDUC0UzzO2rGW2AvSZ++Pp445V27w=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl expat xlibsWrapper freetype ];
|
||||
|
|
@ -16,6 +23,7 @@ stdenv.mkDerivation rec {
|
|||
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.logicalshift.co.uk/unix/zoom/";
|
||||
description = "Player for Z-Code, TADS and HUGO stories or games";
|
||||
longDescription = ''
|
||||
Zoom is a player for Z-Code, TADS and HUGO stories or games. These are
|
||||
|
|
|
|||
|
|
@ -289,6 +289,9 @@ let
|
|||
# Intel GVT-g graphics virtualization supports 64-bit only
|
||||
DRM_I915_GVT = whenAtLeast "4.16" yes;
|
||||
DRM_I915_GVT_KVMGT = whenAtLeast "4.16" module;
|
||||
} // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
|
||||
# enable HDMI-CEC on RPi boards
|
||||
DRM_VC4_HDMI_CEC = whenAtLeast "4.14" yes;
|
||||
};
|
||||
|
||||
sound = {
|
||||
|
|
|
|||
|
|
@ -1,27 +1,32 @@
|
|||
{ lib, stdenv, fetchgit }:
|
||||
{ lib, stdenv, fetchzip, unstableGitUpdater }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mmc-utils";
|
||||
version = "2021-05-11";
|
||||
version = "unstable-2022-04-26";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git";
|
||||
rev = "43282e80e174cc73b09b81a4d17cb3a7b4dc5cfc";
|
||||
sha256 = "0l06ahmprqshh75pkdpagb8fgnp2bwn8q8hwp1yl3laww2ghm8i5";
|
||||
src = fetchzip rec {
|
||||
url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz";
|
||||
passthru.rev = "b7e4d5a6ae9942d26a11de9b05ae7d52c0802802";
|
||||
sha256 = "D2QgntRsa6Y39nCkXQupXFbJR++JfBpMeEZE0Gv0btc=";
|
||||
};
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ];
|
||||
|
||||
installPhase = ''
|
||||
make install prefix=$out
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/man/man1
|
||||
cp man/mmc.1 $out/share/man/man1/
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Configure MMC storage devices from userspace";
|
||||
homepage = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/";
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.dezgeg ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, nixosTests, which
|
||||
, pcre2
|
||||
, withPython3 ? true, python3, ncurses
|
||||
, withPHP74 ? false, php74
|
||||
, withPHP80 ? true, php80
|
||||
, withPerl532 ? false, perl532
|
||||
, withPerl534 ? true, perl534
|
||||
|
|
@ -24,7 +23,6 @@ let
|
|||
fpmSupport = false;
|
||||
};
|
||||
|
||||
php74-unit = php74.override phpConfig;
|
||||
php80-unit = php80.override phpConfig;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
|
@ -42,7 +40,6 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ pcre2.dev ]
|
||||
++ optionals withPython3 [ python3 ncurses ]
|
||||
++ optional withPHP74 php74-unit
|
||||
++ optional withPHP80 php80-unit
|
||||
++ optional withPerl532 perl532
|
||||
++ optional withPerl534 perl534
|
||||
|
|
@ -60,12 +57,10 @@ in stdenv.mkDerivation rec {
|
|||
++ optional withDebug "--debug";
|
||||
|
||||
# Optionally add the PHP derivations used so they can be addressed in the configs
|
||||
usedPhp74 = optionals withPHP74 php74-unit;
|
||||
usedPhp80 = optionals withPHP80 php80-unit;
|
||||
|
||||
postConfigure = ''
|
||||
${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"}
|
||||
${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}
|
||||
${optionalString withPHP80 "./configure php --module=php80 --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"}
|
||||
${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"}
|
||||
${optionalString withPerl534 "./configure perl --module=perl534 --perl=${perl534}/bin/perl"}
|
||||
|
|
|
|||
|
|
@ -97,9 +97,7 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace "$f" \
|
||||
--replace pkg-config "$PKG_CONFIG"
|
||||
done
|
||||
${lib.optionalString (lib.versionAtLeast php.version "8") ''
|
||||
sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py
|
||||
''}
|
||||
sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
phpExt = php.withExtensions
|
||||
({ enabled, all }: with all; [ json filter mysqlnd mysqli pdo pdo_mysql ]);
|
||||
({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "engelsystem";
|
||||
version = "3.1.0";
|
||||
|
|
|
|||
|
|
@ -1013,6 +1013,10 @@ mapAliases ({
|
|||
phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
|
||||
|
||||
# Obsolete PHP version aliases
|
||||
php74 = throw "php74 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2022-05-24
|
||||
php74Packages = php74; # Added 2022-05-24
|
||||
php74Extensions = php74; # Added 2022-05-24
|
||||
|
||||
php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03
|
||||
php73Packages = php73; # Added 2021-06-03
|
||||
php73Extensions = php73; # Added 2021-06-03
|
||||
|
|
|
|||
|
|
@ -1782,7 +1782,7 @@ with pkgs;
|
|||
}) arangodb_3_3 arangodb_3_4 arangodb_3_5;
|
||||
arangodb = arangodb_3_4;
|
||||
|
||||
arcanist = callPackage ../development/tools/misc/arcanist { php = php74; };
|
||||
arcanist = callPackage ../development/tools/misc/arcanist { php = php81; };
|
||||
|
||||
arduino = arduino-core.override { withGui = true; };
|
||||
|
||||
|
|
@ -14408,13 +14408,6 @@ with pkgs;
|
|||
php80Extensions = recurseIntoAttrs php80.extensions;
|
||||
php80Packages = recurseIntoAttrs php80.packages;
|
||||
|
||||
# Import PHP74 interpreter, extensions and packages
|
||||
php74 = callPackage ../development/interpreters/php/7.4.nix {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
};
|
||||
php74Extensions = recurseIntoAttrs php74.extensions;
|
||||
php74Packages = recurseIntoAttrs php74.packages;
|
||||
|
||||
|
||||
picoc = callPackage ../development/interpreters/picoc {};
|
||||
|
||||
|
|
@ -15100,6 +15093,10 @@ with pkgs;
|
|||
|
||||
buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { };
|
||||
|
||||
buildkite-test-collector-rust = callPackage ../development/tools/continuous-integration/buildkite-test-collector-rust {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
bump = callPackage ../development/tools/github/bump { };
|
||||
|
||||
libbpf = callPackage ../os-specific/linux/libbpf { };
|
||||
|
|
@ -21724,7 +21721,7 @@ with pkgs;
|
|||
|
||||
dspam = callPackage ../servers/mail/dspam { };
|
||||
|
||||
engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; };
|
||||
engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; };
|
||||
|
||||
envoy = callPackage ../servers/http/envoy {
|
||||
jdk = openjdk11_headless;
|
||||
|
|
@ -27908,7 +27905,7 @@ with pkgs;
|
|||
|
||||
lrzsz = callPackage ../tools/misc/lrzsz { };
|
||||
|
||||
lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php74; };
|
||||
lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php81; };
|
||||
|
||||
ltex-ls = callPackage ../tools/text/ltex-ls { };
|
||||
|
||||
|
|
|
|||
|
|
@ -196,8 +196,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
apcu = callPackage ../development/php-packages/apcu { };
|
||||
|
||||
apcu_bc = callPackage ../development/php-packages/apcu_bc { };
|
||||
|
||||
ast = callPackage ../development/php-packages/ast { };
|
||||
|
||||
blackfire = pkgs.callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; };
|
||||
|
|
@ -226,13 +224,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
mongodb = callPackage ../development/php-packages/mongodb { };
|
||||
|
||||
oci8 = callPackage ../development/php-packages/oci8 ({
|
||||
version = "2.2.0";
|
||||
sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd";
|
||||
} // lib.optionalAttrs (lib.versionAtLeast php.version "8.0") {
|
||||
version = "3.0.1";
|
||||
sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914";
|
||||
});
|
||||
oci8 = callPackage ../development/php-packages/oci8 { };
|
||||
|
||||
openswoole = callPackage ../development/php-packages/openswoole { };
|
||||
|
||||
|
|
@ -260,8 +252,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
pdo_sqlsrv = callPackage ../development/php-packages/pdo_sqlsrv { };
|
||||
|
||||
php_excel = callPackage ../development/php-packages/php_excel { };
|
||||
|
||||
pinba = callPackage ../development/php-packages/pinba { };
|
||||
|
||||
protobuf = callPackage ../development/php-packages/protobuf { };
|
||||
|
|
@ -345,13 +335,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
configureFlags = [
|
||||
"--with-iconv${lib.optionalString stdenv.isDarwin "=${libiconv}"}"
|
||||
];
|
||||
patches = lib.optionals (lib.versionOlder php.version "8.0") [
|
||||
# Header path defaults to FHS location, preventing the configure script from detecting errno support.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fossar/nix-phps/raw/263861a8c9bdafd7abe44db6db4ef0179643680c/pkgs/iconv-header-path.patch";
|
||||
sha256 = "7GHnEUu+hcsQ4h3itDwk6p46ZKfib9JZ2XpWlXrdn6E=";
|
||||
})
|
||||
];
|
||||
doCheck = false;
|
||||
}
|
||||
{
|
||||
|
|
@ -365,7 +348,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
name = "intl";
|
||||
buildInputs = [ icu64 ];
|
||||
}
|
||||
{ name = "json"; enable = lib.versionOlder php.version "8.0"; }
|
||||
{
|
||||
name = "ldap";
|
||||
buildInputs = [ openldap cyrus_sasl ];
|
||||
|
|
@ -381,9 +363,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
}
|
||||
{
|
||||
name = "mbstring";
|
||||
buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
|
||||
pcre2
|
||||
];
|
||||
buildInputs = [ oniguruma pcre2 ];
|
||||
doCheck = false;
|
||||
}
|
||||
{
|
||||
|
|
@ -416,11 +396,9 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
'')
|
||||
];
|
||||
}
|
||||
# oci8 (7.4, 7.3, 7.2)
|
||||
# odbc (7.4, 7.3, 7.2)
|
||||
{
|
||||
name = "opcache";
|
||||
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [
|
||||
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
valgrind.dev
|
||||
];
|
||||
zendExtension = true;
|
||||
|
|
@ -443,14 +421,12 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
enable = (!stdenv.isDarwin);
|
||||
doCheck = false;
|
||||
}
|
||||
# pdo_firebird (7.4, 7.3, 7.2)
|
||||
{
|
||||
name = "pdo_mysql";
|
||||
internalDeps = with php.extensions; [ pdo mysqlnd ];
|
||||
configureFlags = [ "--with-pdo-mysql=mysqlnd" "PHP_MYSQL_SOCK=/run/mysqld/mysqld.sock" ];
|
||||
doCheck = false;
|
||||
}
|
||||
# pdo_oci (7.4, 7.3, 7.2)
|
||||
{
|
||||
name = "pdo_odbc";
|
||||
internalDeps = [ php.extensions.pdo ];
|
||||
|
|
@ -500,7 +476,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
'';
|
||||
doCheck = false;
|
||||
}
|
||||
{ name = "session"; doCheck = lib.versionOlder php.version "8.0"; }
|
||||
{ name = "session"; doCheck = false; }
|
||||
{ name = "shmop"; }
|
||||
{
|
||||
name = "simplexml";
|
||||
|
|
@ -558,15 +534,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
"--enable-xmlreader"
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "xmlrpc";
|
||||
buildInputs = [ libxml2 libiconv ];
|
||||
# xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc
|
||||
enable = lib.versionOlder php.version "8.0";
|
||||
configureFlags = [
|
||||
"--with-xmlrpc"
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "xmlwriter";
|
||||
buildInputs = [ libxml2 ];
|
||||
|
|
@ -577,7 +544,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
{
|
||||
name = "xsl";
|
||||
buildInputs = [ libxslt libxml2 ];
|
||||
doCheck = lib.versionOlder php.version "8.0";
|
||||
doCheck = false;
|
||||
configureFlags = [ "--with-xsl=${libxslt.dev}" ];
|
||||
}
|
||||
{ name = "zend_test"; }
|
||||
|
|
|
|||
Loading…
Reference in a new issue