mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
27ca218d2f
@ -209,6 +209,18 @@
|
||||
to upgrade existing repositories.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>services.kubo.settings</literal> option is now no
|
||||
longer stateful. If you changed any of the options in
|
||||
<literal>services.kubo.settings</literal> in the past and then
|
||||
removed them from your NixOS configuration again, those
|
||||
changes are still in your Kubo configuration file but will now
|
||||
be reset to the default. If you’re unsure, you may want to
|
||||
make a backup of your configuration file (probably
|
||||
/var/lib/ipfs/config) and compare after the update.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The EC2 image module no longer fetches instance metadata in
|
||||
@ -697,6 +709,36 @@
|
||||
<link xlink:href="https://github.com/google/ngx_brotli/blob/master/README.md">here</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Updated recommended settings in
|
||||
<literal>services.nginx.recommendedGzipSettings</literal>:
|
||||
</para>
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Enables gzip compression for only certain proxied
|
||||
requests.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Allow checking and loading of precompressed files.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Updated gzip mime-types.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Increased the minimum length of a response that will be
|
||||
gzipped.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://garagehq.deuxfleurs.fr/">Garage</link>
|
||||
|
||||
@ -60,6 +60,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.
|
||||
|
||||
- The `services.kubo.settings` option is now no longer stateful. If you changed any of the options in `services.kubo.settings` in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update.
|
||||
|
||||
- The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services.
|
||||
This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service`
|
||||
|
||||
@ -179,6 +181,12 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- A new option `recommendedBrotliSettings` has been added to `services.nginx`. Learn more about compression in Brotli format [here](https://github.com/google/ngx_brotli/blob/master/README.md).
|
||||
|
||||
- Updated recommended settings in `services.nginx.recommendedGzipSettings`:
|
||||
- Enables gzip compression for only certain proxied requests.
|
||||
- Allow checking and loading of precompressed files.
|
||||
- Updated gzip mime-types.
|
||||
- Increased the minimum length of a response that will be gzipped.
|
||||
|
||||
- [Garage](https://garagehq.deuxfleurs.fr/) version is based on [system.stateVersion](options.html#opt-system.stateVersion), existing installations will keep using version 0.7. New installations will use version 0.8. In order to upgrade a Garage cluster, please follow [upstream instructions](https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/) and force [services.garage.package](options.html#opt-services.garage.package) or upgrade accordingly [system.stateVersion](options.html#opt-system.stateVersion).
|
||||
|
||||
- `hip` has been separated into `hip`, `hip-common` and `hipcc`.
|
||||
|
||||
@ -5,6 +5,23 @@ let
|
||||
|
||||
settingsFormat = pkgs.formats.json {};
|
||||
|
||||
rawDefaultConfig = lib.importJSON (pkgs.runCommand "kubo-default-config" {
|
||||
nativeBuildInputs = [ cfg.package ];
|
||||
} ''
|
||||
export IPFS_PATH="$TMPDIR"
|
||||
ipfs init --empty-repo --profile=${profile}
|
||||
ipfs --offline config show > "$out"
|
||||
'');
|
||||
|
||||
# Remove the PeerID (an attribute of "Identity") of the temporary Kubo repo.
|
||||
# The "Pinning" section contains the "RemoteServices" section, which would prevent
|
||||
# the daemon from starting as that setting can't be changed via ipfs config replace.
|
||||
defaultConfig = builtins.removeAttrs rawDefaultConfig [ "Identity" "Pinning" ];
|
||||
|
||||
customizedConfig = lib.recursiveUpdate defaultConfig cfg.settings;
|
||||
|
||||
configFile = settingsFormat.generate "kubo-config.json" customizedConfig;
|
||||
|
||||
kuboFlags = utils.escapeSystemdExecArgs (
|
||||
optional cfg.autoMount "--mount" ++
|
||||
optional cfg.enableGC "--enable-gc" ++
|
||||
@ -161,9 +178,9 @@ in
|
||||
};
|
||||
};
|
||||
description = lib.mdDoc ''
|
||||
Attrset of daemon configuration to set using {command}`ipfs config`, every time the daemon starts.
|
||||
Attrset of daemon configuration.
|
||||
See [https://github.com/ipfs/kubo/blob/master/docs/config.md](https://github.com/ipfs/kubo/blob/master/docs/config.md) for reference.
|
||||
Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default!
|
||||
You can't set `Identity` or `Pinning`.
|
||||
'';
|
||||
default = { };
|
||||
example = {
|
||||
@ -211,6 +228,21 @@ in
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = !builtins.hasAttr "Identity" cfg.settings;
|
||||
message = ''
|
||||
You can't set services.kubo.settings.Identity because the ``config replace`` subcommand used at startup does not support modifying any of the Identity settings.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = !((builtins.hasAttr "Pinning" cfg.settings) && (builtins.hasAttr "RemoteServices" cfg.settings.Pinning));
|
||||
message = ''
|
||||
You can't set services.kubo.settings.Pinning.RemoteServices because the ``config replace`` subcommand used at startup does not work with it.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
environment.variables.IPFS_PATH = cfg.dataDir;
|
||||
|
||||
@ -262,21 +294,26 @@ in
|
||||
|
||||
preStart = ''
|
||||
if [[ ! -f "$IPFS_PATH/config" ]]; then
|
||||
ipfs init ${optionalString cfg.emptyRepo "-e"} --profile=${profile}
|
||||
ipfs init ${optionalString cfg.emptyRepo "-e"}
|
||||
else
|
||||
# After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open.
|
||||
rm -vf "$IPFS_PATH/api"
|
||||
'' + optionalString cfg.autoMigrate ''
|
||||
${pkgs.kubo-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y
|
||||
'' + ''
|
||||
ipfs --offline config profile apply ${profile} >/dev/null
|
||||
fi
|
||||
'' + ''
|
||||
ipfs --offline config show \
|
||||
| ${pkgs.jq}/bin/jq '. * $settings' --argjson settings ${
|
||||
escapeShellArg (builtins.toJSON cfg.settings)
|
||||
} \
|
||||
| ipfs --offline config replace -
|
||||
ipfs --offline config show |
|
||||
${pkgs.jq}/bin/jq -s '.[0].Pinning as $Pinning | .[0].Identity as $Identity | .[1] + {$Identity,$Pinning}' - '${configFile}' |
|
||||
|
||||
# This command automatically injects the private key and other secrets from
|
||||
# the old config file back into the new config file.
|
||||
# Unfortunately, it doesn't keep the original `Identity.PeerID`,
|
||||
# so we need `ipfs config show` and jq above.
|
||||
# See https://github.com/ipfs/kubo/issues/8993 for progress on fixing this problem.
|
||||
# Kubo also wants a specific version of the original "Pinning.RemoteServices"
|
||||
# section (redacted by `ipfs config show`), such that that section doesn't
|
||||
# change when the changes are applied. Whyyyyyy.....
|
||||
ipfs --offline config replace -
|
||||
'';
|
||||
serviceConfig = {
|
||||
ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${kuboFlags}" ];
|
||||
|
||||
@ -184,25 +184,17 @@ let
|
||||
brotli_window 512k;
|
||||
brotli_min_length 256;
|
||||
brotli_types ${lib.concatStringsSep " " compressMimeTypes};
|
||||
brotli_buffers 32 8k;
|
||||
''}
|
||||
|
||||
# https://docs.nginx.com/nginx/admin-guide/web-server/compression/
|
||||
${optionalString cfg.recommendedGzipSettings ''
|
||||
gzip on;
|
||||
gzip_proxied any;
|
||||
gzip_comp_level 5;
|
||||
gzip_types
|
||||
application/atom+xml
|
||||
application/javascript
|
||||
application/json
|
||||
application/xml
|
||||
application/xml+rss
|
||||
image/svg+xml
|
||||
text/css
|
||||
text/javascript
|
||||
text/plain
|
||||
text/xml;
|
||||
gzip_static on;
|
||||
gzip_vary on;
|
||||
gzip_comp_level 5;
|
||||
gzip_min_length 256;
|
||||
gzip_proxied expired no-cache no-store private auth;
|
||||
gzip_types ${lib.concatStringsSep " " compressMimeTypes};
|
||||
''}
|
||||
|
||||
${optionalString cfg.recommendedProxySettings ''
|
||||
|
||||
@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "A command driven spotify player";
|
||||
homepage = "https://github.com/aome510/spotify-player";
|
||||
mainProgram = "spotify_player";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
tar xfvz $src -C $out
|
||||
|
||||
# Patch binaries.
|
||||
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
|
||||
interpreter="$(cat $NIX_BINTOOLS/nix-support/dynamic-linker)"
|
||||
libCairo=$out/eclipse/libcairo-swt.so
|
||||
patchelf --set-interpreter $interpreter $out/eclipse/eclipse
|
||||
[ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo
|
||||
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.eclipse.org/";
|
||||
inherit description;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -20,6 +20,11 @@ let
|
||||
buildmonth = "11"; #sometimes differs from release month
|
||||
timestamp = "${year}${buildmonth}231800";
|
||||
gtk = gtk3;
|
||||
arch = if stdenv.hostPlatform.isx86_64 then
|
||||
"x86_64"
|
||||
else if stdenv.hostPlatform.isAarch64 then
|
||||
"aarch64"
|
||||
else throw "don't know what platform suffix for ${stdenv.hostPlatform.system} will be";
|
||||
in rec {
|
||||
|
||||
buildEclipse = callPackage ./build-eclipse.nix {
|
||||
@ -35,8 +40,11 @@ in rec {
|
||||
description = "Eclipse IDE for C/C++ Developers";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw==";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
|
||||
hash = {
|
||||
x86_64 = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw==";
|
||||
aarch64 = "sha512-kmeNH6F8oK72LtrYtiJVLKhy6Q1HwnU+Bh+mpXdXSrfj9KtqzHQkJ0kTnnJkGYLtpi+zyXDwsxzyjh6pPyDRJA==";
|
||||
}.${arch};
|
||||
};
|
||||
};
|
||||
|
||||
@ -47,8 +55,11 @@ in rec {
|
||||
description = "Eclipse Modeling Tools";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q==";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
|
||||
hash = {
|
||||
x86_64 = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q==";
|
||||
aarch64 = "sha512-F63f2o9u/p7hhrxI+Eu6NiL4sPccIYw876Nnj8mfSZ7bozs1OVNWftZj+xbdLLbr0bVz3WKnt4BHzcLUA6QG7g==";
|
||||
}.${arch};
|
||||
};
|
||||
};
|
||||
|
||||
@ -59,15 +70,18 @@ in rec {
|
||||
description = "Eclipse Platform ${year}-${month}";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw==";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
|
||||
hash = {
|
||||
x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw==";
|
||||
aarch64 = "sha512-BvUkOdCsjwtscPeuBXG7ZpitOr8EQK5JL8nSGpw/RhhBEFz46nsc7W18l0aYjdzRHh2ie55RylS2PEQELkS/hQ==";
|
||||
}.${arch};
|
||||
};
|
||||
};
|
||||
|
||||
### Eclipse Scala SDK
|
||||
|
||||
eclipse-scala-sdk =
|
||||
buildEclipse.override { jdk = jdk8; gtk = gtk2; } {
|
||||
(buildEclipse.override { jdk = jdk8; gtk = gtk2; } {
|
||||
name = "eclipse-scala-sdk-4.7.0";
|
||||
description = "Eclipse IDE for Scala Developers";
|
||||
src =
|
||||
@ -75,7 +89,10 @@ in rec {
|
||||
url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "1n5w2a7mh9ajv6fxcas1gpgwb04pdxbr9v5dzr67gsz5bhahq4ya";
|
||||
};
|
||||
};
|
||||
}).overrideAttrs(oa: {
|
||||
# Only download for x86_64
|
||||
meta.platforms = [ "x86_64-linux" ];
|
||||
});
|
||||
|
||||
### Eclipse SDK
|
||||
|
||||
@ -84,8 +101,11 @@ in rec {
|
||||
description = "Eclipse ${year}-${month} Classic";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ==";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
|
||||
hash = {
|
||||
x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw==";
|
||||
aarch64 = "sha512-UYp8t7r2RrN3rKN180cWpJyhyO5LVXL8LrTRKJzttUgB7kM1nroTEI3DesBu+Hw4Ynl7eLiBK397rqcpOAfxJw==";
|
||||
}.${arch};
|
||||
};
|
||||
};
|
||||
|
||||
@ -96,8 +116,11 @@ in rec {
|
||||
description = "Eclipse IDE for Java Developers";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ==";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
|
||||
hash = {
|
||||
x86_64 = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ==";
|
||||
aarch64 = "sha512-KOQ6BZuQJeVpbMQVxF67M3F/KXMmDhmZQBNq0yWM+/8+d0DiBRkwJtqPYsnTqrax8FSunn2yy+CzlfyHSoNvpg==";
|
||||
}.${arch};
|
||||
};
|
||||
};
|
||||
|
||||
@ -108,8 +131,11 @@ in rec {
|
||||
description = "Eclipse IDE for Enterprise Java and Web Developers";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ==";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
|
||||
hash = {
|
||||
x86_64 = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ==";
|
||||
aarch64 = "sha512-iaoTB/Pinoj1weiGBBv0plQ4jGNdFs2JiBG7S/icUoAX5O6jTGAgJvOwh7Nzn+0N6YL6+HPWaV24a6lM43y8Og==";
|
||||
}.${arch};
|
||||
};
|
||||
};
|
||||
|
||||
@ -120,8 +146,11 @@ in rec {
|
||||
description = "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q==";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
|
||||
hash = {
|
||||
x86_64 = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q==";
|
||||
aarch64 = "sha512-B866dFJcsTkq+h0RZ61CxXE83TWvCf8ZAbGeIC385PpPR3i/gZnRjN2oRrDP22CNR5XXA+PfXKxqvERhJB5ebA==";
|
||||
}.${arch};
|
||||
};
|
||||
};
|
||||
|
||||
@ -132,8 +161,11 @@ in rec {
|
||||
description = "Eclipse IDE for RCP and RAP Developers";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU=";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
|
||||
hash = {
|
||||
x86_64 = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU=";
|
||||
aarch64 = "sha256-sMB6a3f0fiL6ZentIjJTMi59ZOh7dizXrkMQuIRbds0=";
|
||||
}.${arch};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -5,8 +5,15 @@
|
||||
, gitUpdater
|
||||
, cmake
|
||||
, python3
|
||||
, withDynarec ? stdenv.hostPlatform.isAarch64
|
||||
, runCommand
|
||||
, hello-x86_64
|
||||
, box64
|
||||
}:
|
||||
|
||||
# Currently only supported on ARM
|
||||
assert withDynarec -> stdenv.hostPlatform.isAarch64;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "box64";
|
||||
version = "0.2.0";
|
||||
@ -33,49 +40,57 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DNOGIT=1"
|
||||
] ++ (
|
||||
if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
[
|
||||
"-DARM_DYNAREC=ON"
|
||||
]
|
||||
else [
|
||||
"-DLD80BITS=1"
|
||||
"-DNOALIGN=1"
|
||||
]
|
||||
);
|
||||
"-DNOGIT=ON"
|
||||
"-DARM_DYNAREC=${if withDynarec then "ON" else "OFF"}"
|
||||
"-DRV64=${if stdenv.hostPlatform.isRiscV64 then "ON" else "OFF"}"
|
||||
"-DPPC64LE=${if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then "ON" else "OFF"}"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
"-DLD80BITS=ON"
|
||||
"-DNOALIGN=ON"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm 0755 box64 "$out/bin/box64"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
ctest
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
echo Checking if it works
|
||||
$out/bin/box64 -v
|
||||
|
||||
echo Checking if Dynarec option was respected
|
||||
$out/bin/box64 -v | grep ${lib.optionalString (!withDynarec) "-v"} Dynarec
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
passthru = {
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
tests.hello = runCommand "box64-test-hello" {
|
||||
nativeBuildInputs = [ box64 hello-x86_64 ];
|
||||
} ''
|
||||
# There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to
|
||||
# tell what problems the emulator has run into.
|
||||
BOX64_NOBANNER=0 BOX64_LOG=1 box64 ${hello-x86_64}/bin/hello --version | tee $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://box86.org/";
|
||||
description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ gador OPNA2608 ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,13 +1,8 @@
|
||||
{ mkDerivation
|
||||
, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, autoreconfHook
|
||||
, gitUpdater
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ffmpeg
|
||||
@ -16,41 +11,63 @@
|
||||
, libX11
|
||||
, libXrandr
|
||||
, sndio
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "punes";
|
||||
version = "0.109";
|
||||
version = "0.110";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "punesemu";
|
||||
repo = "puNES";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6aRtR/d8nhzmpN9QKSZ62jye7qjfO+FpRMCXkX4Yubk=";
|
||||
sha256 = "sha256-+hL168r40aYUjyLbWFXWk9G2srrrG1TH1gLYMliHftU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ];
|
||||
|
||||
buildInputs = [ ffmpeg qtbase qtsvg libGLU ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libX11 libXrandr ]
|
||||
++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--prefix=${placeholder "out"}"
|
||||
"--without-opengl-nvidia-cg"
|
||||
"--with-ffmpeg"
|
||||
patches = [
|
||||
# Fixes compilation on aarch64
|
||||
# Remove when version > 0.110
|
||||
(fetchpatch {
|
||||
url = "https://github.com/punesemu/puNES/commit/90dd5bc90412bbd199c2716f67a24aa88b24d80f.patch";
|
||||
hash = "sha256-/KNpTds4qjwyaTUebWWPlVXfuxVh6M4zOInxUfYztJg=";
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
libGLU
|
||||
qtbase
|
||||
qtsvg
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
libX11
|
||||
libXrandr
|
||||
] ++ lib.optionals stdenv.hostPlatform.isBSD [
|
||||
sndio
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_GIT_INFO=OFF"
|
||||
"-DENABLE_RELEASE=ON"
|
||||
"-DENABLE_FFMPEG=ON"
|
||||
"-DENABLE_OPENGL=ON"
|
||||
"-DENABLE_QT6_LIBS=${if lib.versionAtLeast qtbase.version "6.0" then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player";
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "felix";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoheiu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VQTZj2BCdV2TnXrYRaJqrf9sR35zsojmeoe7t+I3kyQ=";
|
||||
sha256 = "sha256-KuEuWZSxh04NefkkJBYClnKs+UP7VwlyPElACjNZ5k8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jH2BaPiGanBOlOU7JQZ0c0ObCaVURpjvmx2m92Fbdm4=";
|
||||
cargoSha256 = "sha256-jYDe/3PDGCweNgHb+8i9az7J7BATlRjd3yha0nOc/gc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -258,8 +258,6 @@ let
|
||||
host_toolchain = "//build/toolchain/linux/unbundle:default";
|
||||
# Don't build against a sysroot image downloaded from Cloud Storage:
|
||||
use_sysroot = false;
|
||||
# The default value is hardcoded instead of using pkg-config:
|
||||
system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner";
|
||||
# Because we use a different toolchain / compiler version:
|
||||
treat_warnings_as_errors = false;
|
||||
# We aren't compiling with Chrome's Clang (would enable Chrome-specific
|
||||
@ -293,11 +291,14 @@ let
|
||||
chrome_pgo_phase = 0;
|
||||
clang_base_path = "${llvmPackages.clang}";
|
||||
use_qt = false;
|
||||
} // lib.optionalAttrs (!chromiumVersionAtLeast "110") {
|
||||
# The default has changed to false. We'll build with libwayland from
|
||||
# Nixpkgs for now but might want to eventually use the bundled libwayland
|
||||
# as well to avoid incompatibilities (if this continues to be a problem
|
||||
# from time to time):
|
||||
use_system_libwayland = true;
|
||||
# The default value is hardcoded instead of using pkg-config:
|
||||
system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner";
|
||||
} // lib.optionalAttrs proprietaryCodecs {
|
||||
# enable support for the H.264 codec
|
||||
proprietary_codecs = true;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NmTMpTaekUTSMnIFn5e1DnuHehJLM5YToY+QK0hnvXk=";
|
||||
hash = "sha256-O/InVEWSqdcfqchVMYetZ3RCOxgEjQ9XvnKpOIjV2zE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM=";
|
||||
vendorHash = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wayvnc";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WKtflN6DyzumOMEx+iX0AoIyGRN4nXUckmW/9Z2EW+Q=";
|
||||
sha256 = "sha256-yNWTTjlmMCMTed1SiRep3iUxchQya1GnTVoub1cpR14=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ustreamer";
|
||||
version = "5.20";
|
||||
version = "5.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pikvm";
|
||||
repo = "ustreamer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZJebLsmoaIxfM8Eenv/r351Kr8XM+wyZUc2TI+oGDxU=";
|
||||
sha256 = "sha256-VnqCiEPaBzGN2TL7oXO4T7dcNdGneac/5nFPwRPiJ9c=";
|
||||
};
|
||||
|
||||
buildInputs = [ libbsd libevent libjpeg ];
|
||||
|
||||
@ -13,19 +13,19 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${passthru.prettyName}-unwrapped";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "unstable-2022-10-03";
|
||||
version = "unstable-2023-01-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "61538429a501a09f369366d832799f2e3b196a02";
|
||||
sha256 = "sha256-YvqRw0klSqOxIuO5QFKjcUp6aRWlO2j3L+T1ekx8SfA=";
|
||||
rev = "996740acdbb173499ec1bf2ba6c8942f2a374220";
|
||||
sha256 = "sha256-9m+0e2v1Hk8jYZHqJwb1mN02WgGDArsWbF7Ut3Z5OIg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs *.sh
|
||||
|
||||
for dateSource in cmnvars.sh bld/wipfc/configure; do
|
||||
for dateSource in bld/wipfc/configure; do
|
||||
substituteInPlace $dateSource \
|
||||
--replace '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" '
|
||||
done
|
||||
@ -35,14 +35,17 @@ stdenv.mkDerivation rec {
|
||||
--replace '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\""
|
||||
|
||||
substituteInPlace build/makeinit \
|
||||
--replace '%__CYEAR__' '%OWCYEAR'
|
||||
--replace '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')"
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
substituteInPlace build/mif/local.mif \
|
||||
--replace '-static' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ dosbox ]
|
||||
++ lib.optional withDocs ghostscript;
|
||||
nativeBuildInputs = [
|
||||
dosbox
|
||||
] ++ lib.optionals withDocs [
|
||||
ghostscript
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
@ -120,7 +123,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://open-watcom.github.io";
|
||||
license = licenses.watcom;
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-windows" "i686-windows" ];
|
||||
platforms = with platforms; windows ++ unix;
|
||||
badPlatforms = platforms.riscv ++ [ "powerpc64-linux" "powerpc64le-linux" "mips64el-linux" ];
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,16 +13,29 @@ let
|
||||
wrapper =
|
||||
{}:
|
||||
let
|
||||
archToBindir = with stdenv.hostPlatform; if isx86 then
|
||||
"bin"
|
||||
else if isAarch then
|
||||
"arm"
|
||||
# we don't support running on AXP
|
||||
# don't know what MIPS, PPC bindirs are called
|
||||
else throw "Don't know where ${system} binaries are located!";
|
||||
|
||||
binDirs = with stdenv.hostPlatform; if isWindows then [
|
||||
(lib.optionalString is64bit "binnt64")
|
||||
"binnt"
|
||||
(lib.optionalString is32bit "binw")
|
||||
] else if (isDarwin && is64bit) then [
|
||||
"bino64"
|
||||
(lib.optionalString is64bit "${archToBindir}nt64")
|
||||
"${archToBindir}nt"
|
||||
(lib.optionalString is32bit "${archToBindir}w")
|
||||
] else if (isDarwin) then [
|
||||
(lib.optionalString is64bit "${archToBindir}o64")
|
||||
# modern Darwin cannot execute 32-bit code anymore
|
||||
(lib.optionalString is32bit "${archToBindir}o")
|
||||
] else [
|
||||
(lib.optionalString is64bit "binl64")
|
||||
"binl"
|
||||
(lib.optionalString is64bit "${archToBindir}l64")
|
||||
"${archToBindir}l"
|
||||
];
|
||||
# TODO
|
||||
# This works good enough as-is, but should really only be targetPlatform-specific
|
||||
# but we don't support targeting DOS, OS/2, 16-bit Windows etc Nixpkgs-wide so this needs extra logic
|
||||
includeDirs = with stdenv.hostPlatform; [
|
||||
"h"
|
||||
]
|
||||
@ -71,9 +84,9 @@ let
|
||||
}
|
||||
EOF
|
||||
cat test.c
|
||||
# Darwin target not supported, only host
|
||||
wcl386 -fe=test_c test.c
|
||||
${lib.optionalString (!stdenv.hostPlatform.isDarwin) "./test_c"}
|
||||
# Only test execution if hostPlatform is targetable
|
||||
${lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch) "./test_c"}
|
||||
|
||||
cat <<EOF >test.cpp
|
||||
#include <string>
|
||||
@ -91,9 +104,9 @@ let
|
||||
}
|
||||
EOF
|
||||
cat test.cpp
|
||||
# Darwin target not supported, only host
|
||||
wcl386 -fe=test_cpp test.cpp
|
||||
${lib.optionalString (!stdenv.hostPlatform.isDarwin) "./test_cpp"}
|
||||
# Only test execution if hostPlatform is targetable
|
||||
${lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch) "./test_cpp"}
|
||||
touch $out
|
||||
'';
|
||||
cross = runCommand "${name}-test-cross" { nativeBuildInputs = [ wrapped file ]; } ''
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dinghy";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "nedbat";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-3qj3CU0A7oyPcUMEoqe4lUK5Jl1tlnCaqXMtDnn9+bw=";
|
||||
hash = "sha256-xtcNcykfgcWvifso0xaeMT31+G5x4HCp+tLAIEEq4cw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -4,8 +4,8 @@ buildRubyGem rec {
|
||||
inherit ruby;
|
||||
name = "${gemName}-${version}";
|
||||
gemName = "bundler";
|
||||
version = "2.4.5";
|
||||
source.sha256 = "sha256-Wvj6rwlmbVnM3xqORh8Xu8XE5Jutstyu4XRln4yH1Eo=";
|
||||
version = "2.4.6";
|
||||
source.sha256 = "sha256-MI/g13w5NMoHQ78AJ11BlKhulroUI6xNPqQ19iH51P8=";
|
||||
dontPatchShebangs = true;
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, help2man, gettext
|
||||
, libxml2, perl, python3, doxygen }:
|
||||
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl
|
||||
, pkg-config, autoreconfHook, help2man, gettext, libxml2, perl, python3, doxygen
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsmbios";
|
||||
@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
name = "musl.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/libsmbios/fixes.patch?id=bdc4f67889c958c1266fa5d0cab71c3cd639122f";
|
||||
sha256 = "aVVc52OovDYvqWRyKcRAi62daa9AalkKvnVOGvrTmRk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkg-config ];
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
@ -9,23 +9,23 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# remove when upgrading to pjsip >2.12.1
|
||||
# remove when upgrading to pjsip >2.13
|
||||
pjsip_patches = [
|
||||
(fetchpatch {
|
||||
name = "0150-CVE-2022-31031.patch";
|
||||
url = "https://github.com/pjsip/pjproject/commit/450baca94f475345542c6953832650c390889202.patch";
|
||||
sha256 = "sha256-30kHrmB51UIw4x/J6/CD+vPKf/gBYDCcFoUpwEWkDMY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0151-CVE-2022-39244.patch";
|
||||
url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch";
|
||||
sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0152-CVE-2022-39269.patch";
|
||||
url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch";
|
||||
sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "pjsip-2.12.1-CVE-2022-23537.patch";
|
||||
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23537.patch";
|
||||
sha256 = "sha256-KNSnHt0/o1qJk4r2z5bxbYxKAa7WBtzGOhRXkru3VK4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "pjsip-2.12.1-CVE-2022-23547.patch";
|
||||
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23547.patch";
|
||||
sha256 = "sha256-0iEr/Z4UQpWsTXYWVYzWWk7MQDOFnTQ1BBYpynGLTVQ=";
|
||||
})
|
||||
];
|
||||
common = {version, sha256, externals}: stdenv.mkDerivation {
|
||||
inherit version;
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{
|
||||
"asterisk_16": {
|
||||
"sha256": "406a91290e18d25a6fc23ae6b9c56b1fb2bd70216e336c74cf9c26b908c89c3d",
|
||||
"version": "16.29.0"
|
||||
"sha256": "f8448e8784df7fac019e459bf7c82529d80afe64ae97d73d40e6aa0e4fb39724",
|
||||
"version": "16.30.0"
|
||||
},
|
||||
"asterisk_18": {
|
||||
"sha256": "a963dafeba0e7e1051a1ac56964999c111dbcdb25a47010bc1f772bf8edbed75",
|
||||
"version": "18.15.0"
|
||||
"sha256": "2d280794ae7505ed3dfc58b3190774cb491aa74c339fbde1a11740e6be79b466",
|
||||
"version": "18.16.0"
|
||||
},
|
||||
"asterisk_19": {
|
||||
"sha256": "832a967c5a040b0768c0e8df1646762f7304019fcf7f2e065a8b4828fa4092b7",
|
||||
"version": "19.7.0"
|
||||
"sha256": "f0c56d1f8e39e0427455edfe25d24ff088c756bdc32dd1278c9f7a320815cbaa",
|
||||
"version": "19.8.0"
|
||||
},
|
||||
"asterisk_20": {
|
||||
"sha256": "949022c20dc6da65b456e1b1b5b42a7901bb41fc9ce20920891739e7220d72eb",
|
||||
"version": "20.0.0"
|
||||
"sha256": "4364dc762652e2fd4d3e7dc8428c83550ebae090b8a0e9d4820583e081778883",
|
||||
"version": "20.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "home-assistant-intents";
|
||||
version = "2023.1.25";
|
||||
version = "2023.1.31";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant";
|
||||
repo = "intents";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-nMEcN2b0XHF4yRRsHKMplxqcMLl+gJcPAdvwnySN+ug=";
|
||||
hash = "sha256-buq/SLXDFP0xvIb2yGiHQzuL7HKvc7bxxdkhq4KHpvM=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/package";
|
||||
|
||||
@ -12,20 +12,20 @@ in
|
||||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.75.0";
|
||||
version = "1.76.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cfvekrZRLbdsUqkkPF8hz9B4qsum1kpIL0aCnJf3HYg=";
|
||||
hash = "sha256-kPc6T8yLe1TDxPKLnK/TcU+RUxAVIq8qsr5JQXCXyjM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-oyXgHqOrMKs+mYGAI4Wn+fuVQWsQJIkPwCY4t+cUlQ4=";
|
||||
hash = "sha256-tXtnVYH9uWu0nHHx53PgML92NWl3qcAcnFKhiijvQBc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
# gcc 11.2 suggested on 3.10.0.
|
||||
# gcc 11.2 suggested on 3.10.3.
|
||||
# gcc 11.3.0 unsupported yet, investigate gcc support when upgrading
|
||||
# See https://github.com/arangodb/arangodb/issues/17454
|
||||
gcc10Stdenv
|
||||
@ -32,13 +32,13 @@ in
|
||||
|
||||
gcc10Stdenv.mkDerivation rec {
|
||||
pname = "arangodb";
|
||||
version = "3.10.0";
|
||||
version = "3.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "arangodb";
|
||||
owner = "arangodb";
|
||||
rev = "v${version}";
|
||||
sha256 = "0vjdiarfnvpfl4hnqgr7jigxgq3b3zhx88n8liv1zqa1nlvykfrb";
|
||||
sha256 = "sha256-Jp2rvapTe0CtyYfh1YLJ5eUngh8V+BCUQ/OgH3nE2Ro=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "panoply";
|
||||
version = "5.2.2";
|
||||
version = "5.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
|
||||
sha256 = "sha256-RIjdNfX4jsMwpgbE1aTzT6bysIFGUi33o5m030fF6mg=";
|
||||
sha256 = "sha256-bbePMbI1YF0YvakO5vlURdE7UG3pLiuByImYvDq9cRY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/rhboot/efivar/commit/ca48d3964d26f5e3b38d73655f19b1836b16bd2d.patch";
|
||||
hash = "sha256-DkNFIK4i7Eypyf2UeK7qHW36N2FSVRJ2rnOVLriWi5c=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "musl-backport.patch";
|
||||
url = "https://github.com/rhboot/efivar/commit/cece3ffd5be2f8641eb694513f2b73e5eb97ffd3.patch";
|
||||
sha256 = "7/E0gboU0A45/BY6jGPLuvds6qKtNjzpgKgdNTaVaZQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config mandoc ];
|
||||
|
||||
@ -2028,7 +2028,12 @@ with pkgs;
|
||||
wxGTK = wxGTK32;
|
||||
};
|
||||
|
||||
box64 = callPackage ../applications/emulators/box64 { };
|
||||
box64 = callPackage ../applications/emulators/box64 {
|
||||
hello-x86_64 = if stdenv.hostPlatform.isx86_64 then
|
||||
hello
|
||||
else
|
||||
pkgsCross.gnu64.hello;
|
||||
};
|
||||
|
||||
caprice32 = callPackage ../applications/emulators/caprice32 { };
|
||||
|
||||
@ -2184,6 +2189,8 @@ with pkgs;
|
||||
|
||||
punes = libsForQt5.callPackage ../applications/emulators/punes { };
|
||||
|
||||
punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { };
|
||||
|
||||
py65 = python3Packages.callPackage ../applications/emulators/py65 { };
|
||||
|
||||
resim = callPackage ../applications/emulators/resim {};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user