Merge b7051feb30 into haskell-updates

This commit is contained in:
github-actions[bot]
2025-01-09 00:15:21 +00:00
committed by GitHub
244 changed files with 3501 additions and 10085 deletions

View File

@@ -221,3 +221,5 @@ adb9714bd909df283c66bbd641bd631ff50a4260
667d42c00d566e091e6b9a19b365099315d0e611
84d4f874c2bac9f3118cb6907d7113b3318dcb5e
# tmuxPlugins sha-to-sri.py script
516b1e74c358a9c4b06e5591f8c1a2897aad0c33

View File

@@ -37,7 +37,10 @@ let
lib.attrNames (
lib.filterAttrs (
name: value:
isPythonInterpreter name && name != pname && interpreterName name == interpreterName pname
# use tryEval to handle entries in aliases.nix
(builtins.tryEval (
isPythonInterpreter name && name != pname && interpreterName name == interpreterName pname
)).value
) pkgs
);

View File

@@ -57,7 +57,6 @@ sets are
* `pkgs.python313Packages`
* `pkgs.python314Packages`
* `pkgs.pypy27Packages`
* `pkgs.pypy39Packages`
* `pkgs.pypy310Packages`
and the aliases
@@ -66,7 +65,7 @@ and the aliases
* `pkgs.python3Packages` pointing to `pkgs.python312Packages`
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
* `pkgs.pypy2Packages` pointing to `pkgs.pypy27Packages`
* `pkgs.pypy3Packages` pointing to `pkgs.pypy39Packages`
* `pkgs.pypy3Packages` pointing to `pkgs.pypy310Packages`
* `pkgs.pypyPackages` pointing to `pkgs.pypy2Packages`

View File

@@ -52,10 +52,81 @@ let
in
rec {
/* !!! The interface of this function is kind of messed up, since
it's way too overloaded and almost but not quite computes a
topological sort of the depstrings. */
/**
Topologically sort a collection of dependent strings.
Only the values to keys listed in `arg` and their dependencies will be included in the result.
::: {.note}
This function doesn't formally fulfill the definition of topological sorting, but it's good enough for our purposes in Nixpkgs.
:::
# Inputs
`predefined` (attribute set)
: strings with annotated dependencies (strings or attribute set)
A value can be a simple string if it has no dependencies.
Otherwise, is can be an attribute set with the following attributes:
- `deps` (list of strings)
- `text` (Any
`arg` (list of strings)
: Keys for which the values in the dependency closure will be included in the result
# Type
```
textClosureList :: { ${phase} :: { deps :: [String]; text :: String; } | String; } -> [String] -> [String]
```
# Examples
:::{.example}
## `lib.stringsWithDeps.textClosureList` usage example
```nix
textClosureList {
a = {
deps = [ "b" "c" "e" ];
text = "a: depends on b, c and e";
};
b = {
deps = [ ];
text = "b: no dependencies";
};
c = {
deps = [ "b" ];
text = "c: depends on b";
};
d = {
deps = [ "c" ];
text = "d: not being depended on by anything in `arg`";
};
e = {
deps = [ "c" ];
text = "e: depends on c, depended on by a, not in `arg`";
};
} [
"a"
"b"
"c"
]
=> [
"b: no dependencies"
"c: depends on b"
"e: depends on c, depended on by a, not in `arg`"
"a: depends on b, c and e"
]
```
:::
Common real world usages are:
- Ordering the dependent phases of `system.activationScripts`
- Ordering the dependent phases of `system.userActivationScripts`
For further examples see: [NixOS activation script](https://nixos.org/manual/nixos/stable/#sec-activation-script)
*/
textClosureList = predefined: arg:
let
f = done: todo:

View File

@@ -2138,6 +2138,11 @@
name = "aszlig";
keys = [ { fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; } ];
};
atagen = {
name = "atagen";
github = "atagen";
githubId = 11548989;
};
atalii = {
email = "taliauster@gmail.com";
github = "atalii";
@@ -18541,8 +18546,8 @@
};
pwnwriter = {
name = "Nabeen Tiwaree";
email = "hey@pwnwriter.xyz";
keys = [ { fingerprint = "B681 763F 9B5B DF27 9A13 9E0C 0544 A89B C519 20AA"; } ];
email = "hi@pwnwriter.me";
keys = [ { fingerprint = "C153 DE7C 0A0D 432E F033 2B0B A524 11EC 5582 DE3A"; } ];
github = "pwnwriter";
githubId = 90331517;
};
@@ -20349,6 +20354,11 @@
githubId = 3958212;
name = "Tom Sorlie";
};
scd31 = {
name = "scd31";
github = "scd31";
githubId = 57571338;
};
schinmai-akamai = {
email = "schinmai@akamai.com";
github = "tchinmai7";
@@ -25027,6 +25037,12 @@
githubId = 58453832;
keys = [ { fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; } ];
};
yechielw = {
name = "yechielw";
email = "yechielworen@gmail.com";
github = "yechielw";
githubId = 41305372;
};
yelite = {
name = "Lite Ye";
email = "yelite958@gmail.com";

View File

@@ -343,6 +343,12 @@ have a predefined type and string generator already declared under
and returning a set with TOML-specific attributes `type` and
`generate` as specified [below](#pkgs-formats-result).
`pkgs.formats.cdn` { }
: A function taking an empty attribute set (for future extensibility)
and returning a set with [CDN](https://github.com/dzikoysk/cdn)-specific
attributes `type` and `generate` as specified [below](#pkgs-formats-result).
`pkgs.formats.elixirConf { elixir ? pkgs.elixir }`
: A function taking an attribute set with values

View File

@@ -875,6 +875,12 @@
"module-services-networking-dnsmasq-references": [
"index.html#module-services-networking-dnsmasq-references"
],
"module-service-doh-server": [
"index.html#module-service-doh-server"
],
"module-service-doh-server-quick-start": [
"index.html#module-service-doh-server-quick-start"
],
"module-services-samba": [
"index.html#module-services-samba"
],

View File

@@ -56,6 +56,8 @@
- [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager.
- [doh-server](https://github.com/m13253/dns-over-https), a high performance DNS over HTTPS server. Available as [services.doh-server](options.html#opt-services.doh-server.enable).
- [ncps](https://github.com/kalbasit/ncps), a Nix binary cache proxy service implemented in Go using [go-nix](https://github.com/nix-community/go-nix). Available as [services.ncps](options.html#opt-services.ncps.enable).
- [Conduwuit](https://conduwuit.puppyirl.gay/), a federated chat server implementing the Matrix protocol, forked from Conduit. Available as [services.conduwuit](#opt-services.conduwuit.enable).
@@ -157,6 +159,10 @@
access or want to access home directory via `killHook`, hardening setting can
be changed via, e.g. `systemd.services.earlyoom.serviceConfig.ProtectSystem`.
`services.earlyoom.extraArgs` is now shell-escaped for each element without
word-breaking. So you want to write `extraArgs = [ "--prefer" "spaced pat" ]`
rather than previous `extraArgs = [ "--prefer 'spaced pat'" ]`.
- `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead.
- `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead.

View File

@@ -870,6 +870,7 @@ in
# Create the ISO image.
image.extension = if config.isoImage.compressImage then "iso.zst" else "iso";
image.filePath = "iso/${config.image.fileName}";
image.baseName = "nixos${lib.optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}" }-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
system.build.image = config.system.build.isoImage;
system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
inherit (config.isoImage) compressImage volumeID contents;

View File

@@ -1055,6 +1055,7 @@
./services/networking/dnsmasq.nix
./services/networking/dnsproxy.nix
./services/networking/doh-proxy-rust.nix
./services/networking/doh-server.nix
./services/networking/ejabberd.nix
./services/networking/envoy.nix
./services/networking/epmd.nix

View File

@@ -0,0 +1,69 @@
# DNS-over-HTTPS Server {#module-service-doh-server}
[DNS-over-HTTPS](https://github.com/m13253/dns-over-https) is a high performance DNS over HTTPS client & server. This module enables its server part (`doh-server`).
## Quick Start {#module-service-doh-server-quick-start}
Setup with Nginx + ACME (recommended):
```nix
{
services.doh-server = {
enable = true;
settings = {
upstream = [ "udp:1.1.1.1:53" ];
};
};
services.nginx = {
enable = true;
virtualHosts."doh.example.com" = {
enableACME = true;
forceSSL = true;
http2 = true;
locations."/".return = 404;
locations."/dns-query" = {
proxyPass = "http://127.0.0.1:8053/dns-query";
recommendedProxySettings = true;
};
};
# and other virtual hosts ...
};
security.acme = {
acceptTerms = true;
defaults.email = "you@example.com";
};
networking.firewall.allowedTCPPorts = [ 80 443 ];
}
```
`doh-server` can also work as a standalone HTTPS web server (with SSL cert and key specified), but this is not recommended as `doh-server` does not do OCSP Stabbing.
Setup a standalone instance with ACME:
```nix
let
domain = "doh.example.com";
in
{
security.acme.certs.${domain} = {
dnsProvider = "cloudflare";
credentialFiles."CF_DNS_API_TOKEN_FILE" = "/run/secrets/cf-api-token";
};
services.doh-server = {
enable = true;
settings = {
listen = [ ":443" ];
upstream = [ "udp:1.1.1.1:53" ];
};
useACMEHost = domain;
};
networking.firewall.allowedTCPPorts = [ 443 ];
}
```
See a full configuration in https://github.com/m13253/dns-over-https/blob/master/doh-server/doh-server.conf.

View File

@@ -0,0 +1,175 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.doh-server;
toml = pkgs.formats.toml { };
in
{
options.services.doh-server = {
enable = lib.mkEnableOption "DNS-over-HTTPS server";
package = lib.mkPackageOption pkgs "dns-over-https" { };
settings = lib.mkOption {
type = lib.types.submodule {
freeformType = toml.type;
options = {
listen = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [
"127.0.0.1:8053"
"[::1]:8053"
];
example = [ ":443" ];
description = "HTTP listen address and port";
};
path = lib.mkOption {
type = lib.types.str;
default = "/dns-query";
example = "/dns-query";
description = "HTTP path for resolve application";
};
upstream = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [
"udp:1.1.1.1:53"
"udp:1.0.0.1:53"
"udp:8.8.8.8:53"
"udp:8.8.4.4:53"
];
example = [ "udp:127.0.0.1:53" ];
description = ''
Upstream DNS resolver.
If multiple servers are specified, a random one will be chosen each time.
You can use "udp", "tcp" or "tcp-tls" for the type prefix.
For "udp", UDP will first be used, and switch to TCP when the server asks to or the response is too large.
For "tcp", only TCP will be used.
For "tcp-tls", DNS-over-TLS (RFC 7858) will be used to secure the upstream connection.
'';
};
timeout = lib.mkOption {
type = lib.types.int;
default = 10;
example = 15;
description = "Upstream timeout";
};
tries = lib.mkOption {
type = lib.types.int;
default = 3;
example = 5;
description = "Number of tries if upstream DNS fails";
};
verbose = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = "Enable logging";
};
log_guessed_client_ip = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = ''
Enable log IP from HTTPS-reverse proxy header: X-Forwarded-For or X-Real-IP
Note: http uri/useragent log cannot be controlled by this config
'';
};
ecs_allow_non_global_ip = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = ''
By default, non global IP addresses are never forwarded to upstream servers.
This is to prevent two things from happening:
1. the upstream server knowing your private LAN addresses;
2. the upstream server unable to provide geographically near results,
or even fail to provide any result.
However, if you are deploying a split tunnel corporation network environment, or for any other reason you want to inhibit this behavior and allow local (eg RFC1918) address to be forwarded, change the following option to "true".
'';
};
ecs_use_precise_ip = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = ''
If ECS is added to the request, let the full IP address or cap it to 24 or 128 mask. This option is to be used only on private networks where knowledge of the terminal endpoint may be required for security purposes (eg. DNS Firewalling). Not a good option on the internet where IP address may be used to identify the user and not only the approximate location.
'';
};
};
};
default = { };
example = {
listen = [ ":8153" ];
upstream = [ "udp:127.0.0.1:53" ];
};
description = "Configuration of doh-server in toml. See example in https://github.com/m13253/dns-over-https/blob/master/doh-server/doh-server.conf";
};
useACMEHost = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
example = "doh.example.com";
description = ''
A host of an existing Let's Encrypt certificate to use.
*Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using [](#opt-security.acme.certs).*
'';
};
configFile = lib.mkOption {
type = lib.types.path;
example = "/path/to/doh-server.conf";
description = ''
The config file for the doh-server.
Setting this option will override any configuration applied by the `settings` option.
'';
};
};
config = lib.mkIf cfg.enable {
services.doh-server.configFile = lib.mkDefault (toml.generate "doh-server.conf" cfg.settings);
services.doh-server.settings = lib.mkIf (cfg.useACMEHost != null) (
let
sslCertDir = config.security.acme.certs.${cfg.useACMEHost}.directory;
in
{
cert = "${sslCertDir}/cert.pem";
key = "${sslCertDir}/key.pem";
}
);
systemd.services.doh-server = {
description = "DNS-over-HTTPS Server";
documentation = [ "https://github.com/m13253/dns-over-https" ];
after = [
"network.target"
] ++ lib.optional (cfg.useACMEHost != null) "acme-${cfg.useACMEHost}.service";
wants = lib.optional (cfg.useACMEHost != null) "acme-finished-${cfg.useACMEHost}.target";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
ExecStart = "${cfg.package}/bin/doh-server -conf ${cfg.configFile}";
LimitNOFILE = 1048576;
Restart = "always";
RestartSec = 3;
Type = "simple";
DynamicUser = true;
SupplementaryGroups = lib.optional (cfg.useACMEHost != null) "acme";
};
};
};
meta.maintainers = with lib.maintainers; [ DictXiong ];
meta.doc = ./doh-server.md;
}

View File

@@ -139,9 +139,14 @@ in
default = [ ];
example = [
"-g"
"--prefer '(^|/)(java|chromium)$'"
"--prefer"
"(^|/)(java|chromium)$"
];
description = "Extra command-line arguments to be passed to earlyoom.";
description = ''
Extra command-line arguments to be passed to earlyoom. Each element in
the value list will be escaped as an argument without further
word-breaking.
'';
};
};

View File

@@ -61,9 +61,7 @@ let
hydraJob ((import lib/eval-config.nix {
inherit system;
modules = makeModules module {
image.baseName = "nixos-${type}";
};
modules = makeModules module { };
}).config.system.build.isoImage);

View File

@@ -78,12 +78,24 @@ let
passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; };
preConfigure = ''
# include llvm-config in path
export PATH="${lib.getDev llvm_18}/bin:$PATH"
cd build
sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static
substituteInPlace Make.llvm.static \
--replace 'mkdir -p $@ && cd $@ && ar -x ../../$<' 'mkdir -p $@ && cd $@ && ar -x ../source/build/lib/libfaust.a && cd ../source/build/'
substituteInPlace Make.llvm.static \
--replace 'rm -rf $(TMP)' ' '
--replace 'rm -rf $(TMP)' ' ' \
--replace-fail "ar" "${stdenv.cc.targetPrefix}ar"
sed -i 's@LIBNCURSES_PATH ?= .*@LIBNCURSES_PATH ?= ${ncurses_static}/lib/libncurses.a@' Make.llvm.static
cd ..
shopt -s globstar
for f in **/Makefile **/Makefile.library **/CMakeLists.txt build/Make.llvm.static embedded/faustjava/faust2engine architecture/autodiff/autodiff.sh source/tools/faust2appls/* **/llvm.cmake tools/benchmark/faust2object; do
echo $f "llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
substituteInPlace $f \
--replace-quiet "llvm-config" "llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"
done
shopt -u globstar
cd build
'';
cmakeFlags = [

View File

@@ -1,4 +1,5 @@
{
bash,
faust,
jack2,
qtbase,
@@ -32,6 +33,10 @@ faust.wrapWithBuildEnv {
"faust2jackserver"
];
buildInputs = [
bash
];
propagatedBuildInputs = [
jack2
qtbase

View File

@@ -1,4 +1,5 @@
{
bash,
boost,
faust,
lv2,
@@ -9,6 +10,10 @@ faust.wrapWithBuildEnv {
baseName = "faust2lv2";
buildInputs = [
bash
];
propagatedBuildInputs = [
boost
lv2

View File

@@ -1,31 +1,33 @@
{ lib
, stdenv
, curl
, jq
, htmlq
, xorg
, alsa-lib
, freetype
, p7zip
, autoPatchelfHook
, writeShellScript
, zlib
, libjack2
, makeWrapper
, copyDesktopItems
, makeDesktopItem
, curl
, freetype
, htmlq
, jq
, libglvnd
, librsvg
, makeDesktopItem
, makeWrapper
, p7zip
, writeShellScript
}:
let
versionForFile = v: builtins.replaceStrings [ "." ] [ "" ] v;
archdirs =
if stdenv.hostPlatform.isx86_64 then ["x86-64bit" "amd64"]
else if stdenv.hostPlatform.isAarch64 then ["arm-64bit" "arm"]
else throw "unsupported platform";
mkPianoteq =
{ name
, mainProgram
, startupWMClass
, src
, version
, archdir ? if (stdenv.hostPlatform.system == "aarch64-linux") then "arm-64bit" else "x86-64bit"
, ...
}:
stdenv.mkDerivation rec {
@@ -45,11 +47,10 @@ let
];
buildInputs = [
(lib.getLib stdenv.cc.cc)
xorg.libX11 # libX11.so.6
xorg.libXext # libXext.so.6
(lib.getLib stdenv.cc.cc) # libgcc_s.so.1, libstdc++.so.6
alsa-lib # libasound.so.2
freetype # libfreetype.so.6
libglvnd # libGL.so.1
];
desktopItems = [
@@ -68,20 +69,7 @@ let
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv -t $out/bin Pianoteq*/${archdir}/*
for f in $out/bin/Pianoteq*; do
if [ -x "$f" ] && [ -f "$f" ]; then
wrapProgram "$f" --prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath (buildInputs ++ [
xorg.libXcursor
xorg.libXinerama
xorg.libXrandr
libjack2
zlib
])
}
fi
done
mv -t $out/bin ${builtins.concatStringsSep " " (builtins.map (dir: "Pianoteq*/${dir}/*") archdirs)}
install -Dm644 ${./pianoteq.svg} $out/share/icons/hicolor/scalable/apps/pianoteq.svg
for size in 16 22 32 48 64 128 256; do
dir=$out/share/icons/hicolor/"$size"x"$size"/apps
@@ -219,59 +207,64 @@ let
'';
};
in
{
# TODO currently can't install more than one because `lame` clashes
stage-trial = mkPianoteq rec {
name = "stage-trial";
mainProgram = "Pianoteq 8 STAGE";
startupWMClass = "Pianoteq STAGE Trial";
version = "8.2.0";
src = fetchPianoteqTrial {
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
hash = "sha256-66xbcqNrnVJ+C9FQ8Bg8A7nj/bFrjt6jKheusrXVWvI=";
};
};
standard-trial = mkPianoteq rec {
name = "standard-trial";
mainProgram = "Pianoteq 8";
startupWMClass = "Pianoteq Trial";
version = "8.2.0";
src = fetchPianoteqTrial {
name = "pianoteq_linux_trial_v${versionForFile version}.7z";
hash = "sha256-IFFQMn8EFo5X8sUZV2/vtQOA83NHEFrUsU++CvYbN1c=";
};
};
stage-6 = mkPianoteq rec {
name = "stage-6";
mainProgram = "Pianoteq 6 STAGE";
startupWMClass = "Pianoteq STAGE";
version = "6.7.3";
archdir = if (stdenv.hostPlatform.system == "aarch64-linux") then throw "Pianoteq stage-6 is not supported on aarch64-linux" else "amd64";
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
hash = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy";
};
};
stage-7 = mkPianoteq rec {
name = "stage-7";
mainProgram = "Pianoteq 7 STAGE";
startupWMClass = "Pianoteq STAGE";
version = "7.3.0";
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
hash = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx";
};
};
standard-8 = mkPianoteq rec {
name = "standard-8";
mainProgram = "Pianoteq 8";
version6 = "6.7.3";
version7 = "7.5.4";
version8 = "8.4.0";
mkStandard = version: hash: mkPianoteq {
name = "standard";
mainProgram = "Pianoteq ${lib.versions.major version}";
startupWMClass = "Pianoteq";
version = "8.2.0";
inherit version;
src = fetchPianoteqWithLogin {
name = "pianoteq_linux_v${versionForFile version}.7z";
hash = "sha256-ME0urUc1jwUKpg+5BdawYo9WhvMsrztYTVOrJTVxtkY=";
inherit hash;
};
};
# TODO other paid binaries, I don't own that so I don't know their hash.
mkStage = version: hash: mkPianoteq {
name = "stage";
mainProgram = "Pianoteq ${lib.versions.major version} STAGE";
startupWMClass = "Pianoteq STAGE";
inherit version;
src = fetchPianoteqWithLogin {
name = "pianoteq_stage_linux_v${versionForFile version}.7z";
inherit hash;
};
};
mkStandardTrial = version: hash: mkPianoteq {
name = "standard-trial";
mainProgram = "Pianoteq ${lib.versions.major version}";
startupWMClass = "Pianoteq Trial";
inherit version;
src = fetchPianoteqTrial {
name = "pianoteq_linux_trial_v${versionForFile version}.7z";
inherit hash;
};
};
mkStageTrial = version: hash: mkPianoteq {
name = "stage-trial";
mainProgram = "Pianoteq ${lib.versions.major version} STAGE";
startupWMClass = "Pianoteq STAGE Trial";
inherit version;
src = fetchPianoteqTrial {
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
inherit hash;
};
};
in
{
standard_8 = mkStandard version8 "sha256-ZDGB/SOOz+sWz7P+sNzyaipEH452n8zq5LleO3ztSXc=";
stage_8 = mkStage version8 "";
standard-trial_8 = mkStandardTrial version8 "sha256-K3LbAWxciXt9hVAyRayxSoE/IYJ38Fd03+j0s7ZsMuw=";
stage-trial_8 = mkStageTrial version8 "sha256-k0p7SnkEq90bqIlT7PTYAQuhKEDVi+srHwYrpMUtIbM=";
standard_7 = mkStandard version7 "sha256-TA9CiuT21fQedlMUGz7bNNxYun5ArmRjvIxjOGqXDCs=";
stage_7 = mkStage version7 "";
standard-trial_7 = mkStandardTrial version7 "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ=";
stage-trial_7 = mkStageTrial version7 "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc=";
standard_6 = mkStandard version6 "sha256-u6ZNpmHFVOk+r+6Q8OURSfAi41cxMoDvaEXrTtHEAVY=";
stage_6 = mkStage version6 "";
standard-trial_6 = mkStandardTrial version6 "sha256-nHTAqosOJqC0VnRw2/xVpZ6y02vvau6CgfNmgiN/AHs=";
stage-trial_6 = mkStageTrial version6 "sha256-zrv0c/Mxt1EysR7ZvmxtksXAF5MyXTFMNj4KAdO3QnE=";
}

View File

@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI=";
};
patches = [
# expose error function used by dependents
./expose-error.patch
];
nativeBuildInputs = [
autoreconfHook
gettext

View File

@@ -0,0 +1,13 @@
diff --git a/src/m_pd.h b/src/m_pd.h
index c658fa5..a3a506c 100644
--- a/src/m_pd.h
+++ b/src/m_pd.h
@@ -8,6 +8,8 @@
extern "C" {
#endif
+extern void error(const char* fmt, ...);
+
#define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 54
#define PD_BUGFIX_VERSION 1

View File

@@ -1,100 +1,135 @@
{ config, lib, stdenv
, fetchurl
, autoPatchelfHook
, makeWrapper
, undmg
{
config,
lib,
stdenv,
fetchurl,
autoPatchelfHook,
makeWrapper,
undmg,
, alsa-lib
, curl
, gtk3
, lame
, libxml2
, ffmpeg
, vlc
, xdg-utils
, xdotool
, which
alsa-lib,
curl,
gtk3,
lame,
libxml2,
ffmpeg,
vlc,
xdg-utils,
xdotool,
which,
, jackSupport ? stdenv.hostPlatform.isLinux
, jackLibrary
, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux
, libpulseaudio
jackSupport ? stdenv.hostPlatform.isLinux,
jackLibrary,
pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
libpulseaudio,
}:
let
url_for_platform = version: arch: if stdenv.hostPlatform.isDarwin
then "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_universal.dmg"
else "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz";
url_for_platform =
version: arch:
if stdenv.hostPlatform.isDarwin then
"https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${
builtins.replaceStrings [ "." ] [ "" ] version
}_universal.dmg"
else
"https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${
builtins.replaceStrings [ "." ] [ "" ] version
}_linux_${arch}.tar.xz";
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "7.28";
version = "7.29";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = if stdenv.hostPlatform.isDarwin then "sha256-bhrBIXrE3gaAjpqrOtFK9Awb3rKMIckYhpQKVioBbqY=" else {
x86_64-linux = "sha256-HTxuu1IfjDYnCRksW5tjbOLIFz150wBwyJKCkMATlAk=";
aarch64-linux = "sha256-3jH6UwQefhLyymGltw7+//tUaO0V/3VySWuDsS3cqSo=";
}.${stdenv.hostPlatform.system};
hash =
if stdenv.hostPlatform.isDarwin then
"sha256-b1Gb5guaFyWrt9KEwptuXGvfrJAvgnFEl8QuwSufktE="
else
{
x86_64-linux = "sha256-uFK8Y36pYTDK3foCKH9kiq3u1MTir2nNM5KrDwIHEm0=";
aarch64-linux = "sha256-KZTUeEtyAVwIFTmclYv4GcGJ2WXukEF0/mfYmmBPfz0=";
}
.${stdenv.hostPlatform.system};
};
nativeBuildInputs = [
makeWrapper
] ++ lib.optionals stdenv.hostPlatform.isLinux [
which
autoPatchelfHook
xdg-utils # Required for desktop integration
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
undmg
];
nativeBuildInputs =
[
makeWrapper
]
++ lib.optionals stdenv.hostPlatform.isLinux [
which
autoPatchelfHook
xdg-utils # Required for desktop integration
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
undmg
];
sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app";
buildInputs = [
(lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6
] ++ lib.optionals stdenv.hostPlatform.isLinux [
gtk3
alsa-lib
];
buildInputs =
[
(lib.getLib stdenv.cc.cc) # reaper and libSwell need libstdc++.so.6
]
++ lib.optionals stdenv.hostPlatform.isLinux [
gtk3
alsa-lib
];
runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
gtk3 # libSwell needs libgdk-3.so.0
]
++ lib.optional jackSupport jackLibrary
++ lib.optional pulseaudioSupport libpulseaudio;
runtimeDependencies =
lib.optionals stdenv.hostPlatform.isLinux [
gtk3 # libSwell needs libgdk-3.so.0
]
++ lib.optional jackSupport jackLibrary
++ lib.optional pulseaudioSupport libpulseaudio;
dontBuild = true;
installPhase = if stdenv.hostPlatform.isDarwin then ''
runHook preInstall
mkdir -p "$out/Applications/Reaper.app"
cp -r * "$out/Applications/Reaper.app/"
makeWrapper "$out/Applications/Reaper.app/Contents/MacOS/REAPER" "$out/bin/reaper"
runHook postInstall
'' else ''
runHook preInstall
installPhase =
if stdenv.hostPlatform.isDarwin then
''
runHook preInstall
mkdir -p "$out/Applications/Reaper.app"
cp -r * "$out/Applications/Reaper.app/"
makeWrapper "$out/Applications/Reaper.app/Contents/MacOS/REAPER" "$out/bin/reaper"
runHook postInstall
''
else
''
runHook preInstall
HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \
--install $out/opt \
--integrate-user-desktop
rm $out/opt/REAPER/uninstall-reaper.sh
HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \
--install $out/opt \
--integrate-user-desktop
rm $out/opt/REAPER/uninstall-reaper.sh
# Dynamic loading of plugin dependencies does not adhere to rpath of
# reaper executable that gets modified with runtimeDependencies.
# Patching each plugin with DT_NEEDED is cumbersome and requires
# hardcoding of API versions of each dependency.
# Setting the rpath of the plugin shared object files does not
# seem to have an effect for some plugins.
# We opt for wrapping the executable with LD_LIBRARY_PATH prefix.
# Note that libcurl and libxml2 are needed for ReaPack to run.
wrapProgram $out/opt/REAPER/reaper \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc ]}"
# Dynamic loading of plugin dependencies does not adhere to rpath of
# reaper executable that gets modified with runtimeDependencies.
# Patching each plugin with DT_NEEDED is cumbersome and requires
# hardcoding of API versions of each dependency.
# Setting the rpath of the plugin shared object files does not
# seem to have an effect for some plugins.
# We opt for wrapping the executable with LD_LIBRARY_PATH prefix.
# Note that libcurl and libxml2 are needed for ReaPack to run.
wrapProgram $out/opt/REAPER/reaper \
--prefix LD_LIBRARY_PATH : "${
lib.makeLibraryPath [
curl
lame
libxml2
ffmpeg
vlc
xdotool
stdenv.cc.cc
]
}"
mkdir $out/bin
ln -s $out/opt/REAPER/reaper $out/bin/
mkdir $out/bin
ln -s $out/opt/REAPER/reaper $out/bin/
runHook postInstall
'';
runHook postInstall
'';
passthru.updateScript = ./updater.sh;
@@ -103,7 +138,18 @@ stdenv.mkDerivation rec {
homepage = "https://www.reaper.fm/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
maintainers = with maintainers; [ ilian orivej uniquepointer viraptor ];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
maintainers = with maintainers; [
atinba
ilian
orivej
uniquepointer
viraptor
];
};
}

View File

@@ -8,14 +8,14 @@ reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9
function set_hash_for_linux() {
local arch=$1
pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz)
pkg_hash=$(nix hash to-sri "sha256:$pkg_hash")
pkg_hash=$(nix hash convert "sha256:$pkg_hash")
update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux --ignore-same-version
}
function set_hash_for_darwin() {
local arch=$1
pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_universal.dmg)
pkg_hash=$(nix hash to-sri "sha256:$pkg_hash")
pkg_hash=$(nix hash convert "sha256:$pkg_hash")
update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-darwin --ignore-same-version
}

View File

@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "electrs";
version = "0.10.7";
version = "0.10.8";
src = fetchFromGitHub {
owner = "romanz";
repo = pname;
rev = "v${version}";
hash = "sha256-KDl+SV5U2aqsl3UMK8WWZiwkcqLpaRGmH/J8vBKTZcQ=";
hash = "sha256-L26jzAn8vwnw9kFd6ciyYS/OLEFTbN8doNKy3P8qKRE=";
};
cargoHash = "sha256-vcn+94KklWlYQw4fbH8KxhBnovk0dJc8Hkj+jJ+SeB0=";
cargoHash = "sha256-/0XS4xF5gzEBWXS39f0FsIK1dFwmGT4McaExR/srB5Y=";
# needed for librocksdb-sys
nativeBuildInputs = [ rustPlatform.bindgenHook ];

View File

@@ -8,13 +8,13 @@
melpaBuild {
pname = "edraw";
version = "1.2.0-unstable-2024-12-18";
version = "1.2.0-unstable-2025-01-06";
src = fetchFromGitHub {
owner = "misohena";
repo = "el-easydraw";
rev = "1c46469d0ea3642958eaf7cea1016fcf05b4daec";
hash = "sha256-Z7LPC112FXHtDop1HXPnR6S+cSqfEW1HuYS8YD/qM+c=";
rev = "9a5b5e2b071be99350bfc8db6fbc2c9c667f3725";
hash = "sha256-lQYSUQFAv6rqvZySsFbe8B7ZqEaa2L+L3HXB231D4OQ=";
};
propagatedUserEnvPkgs = [ gzip ];

View File

@@ -9,12 +9,12 @@
replaceVars,
}:
let
version = "0.9.3";
version = "0.10.0";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
tag = "v${version}";
hash = "sha256-j6hBURbIZbvNE69l4AyCtCwfeOi3oNxVtooFK7/WUuA=";
hash = "sha256-MfHI4efAdaoCU8si6YFdznZmSTprthDq3YKuF91z7ss=";
};
libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
blink-fuzzy-lib = rustPlatform.buildRustPackage {

View File

@@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "24.7.17";
version = "26.0.4";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-DWNFh3ocU5WVi5WZheMOMUYH6FHJ+LJbaUC1XkQ5TFo=";
hash = "sha256-3tEWLRen8lRQEDFlfTWT9+L15k+7z/7To6p7SkmdJhU=";
};
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-bAvS7AXmmS+yYsEkXxvszlErpZ3J5hVVXxxzYcsVP5Y=";
hash = "sha256-DElSCZwVGZF/sjec0SFi7iIe/2Ern85oT5rp6bQl5wg=";
};
nativeBuildInputs =

View File

@@ -119,11 +119,9 @@ lib.makeScope pkgs.newScope (
nativeBuildInputs = with pkgs; [ which ];
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.cc.isClang [
"-Wno-error=incompatible-function-pointer-types"
]
);
# workaround for issue:
# https://github.com/alessandrofrancesconi/gimp-plugin-bimp/issues/411
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
installFlags = [
"SYSTEM_INSTALL_DIR=${placeholder "out"}/${gimp.targetPluginDir}/bimp"
@@ -139,69 +137,6 @@ lib.makeScope pkgs.newScope (
};
};
gap = pluginDerivation {
/*
menu:
Video
*/
pname = "gap";
version = "2.6.0-unstable-2023-05-20";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "Archive";
repo = "gimp-gap";
rev = "b2aa06cc7ee4ae1938f14640fe46b75ef5b15982";
hash = "sha256-q5TgCy0+iIfxyqJRXsKxiFrWMFSzBqC0SA9MBGTHXcA=";
};
nativeBuildInputs = with pkgs; [ autoreconfHook ];
postUnpack = ''
tar -xf $sourceRoot/extern_libs/ffmpeg.tar.gz -C $sourceRoot/extern_libs
'';
postPatch =
let
ffmpegPatch = fetchpatch2 {
name = "fix-ffmpeg-binutil-2.41.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb";
hash = "sha256-vLSltvZVMcQ0CnkU0A29x6fJSywE8/aU+Mp9os8DZYY=";
};
in
''
patch -Np1 -i ${ffmpegPatch} -d extern_libs/ffmpeg
ffmpegSrc=$(realpath extern_libs/ffmpeg)
'';
configureFlags =
[
"--with-ffmpegsrcdir=${placeholder "ffmpegSrc"}"
]
++ lib.optionals (!stdenv.hostPlatform.isx86) [
"--disable-libavformat"
];
hardeningDisable = [ "format" ];
env = {
NIX_LDFLAGS = "-lm";
};
meta = with lib; {
description = "GIMP Animation Package";
homepage = "https://www.gimp.org";
# The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license
# falls inside "free".
license = with licenses; [
gpl3
free
];
# Depends on linux/soundcard.h
platforms = platforms.linux;
};
};
farbfeld = pluginDerivation {
pname = "farbfeld";
version = "unstable-2019-08-12";
@@ -371,10 +306,14 @@ lib.makeScope pkgs.newScope (
sha256 = "1jj3n7spkjc63aipwdqsvq9gi07w13bb1v8iqzvxwzld2kxa3c8w";
};
buildInputs = with pkgs; [
lensfun
gexiv2
];
buildInputs = (
with pkgs;
[
lensfun
gexiv2
]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp
);
installPhase = "
installPlugin gimp-lensfun
@@ -387,7 +326,6 @@ lib.makeScope pkgs.newScope (
license = lib.licenses.gpl3Plus;
maintainers = [ ];
platforms = lib.platforms.gnu ++ lib.platforms.linux;
};
};

View File

@@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gpxsee";
version = "13.33";
version = "13.34";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = finalAttrs.version;
hash = "sha256-5x21KEalRpNhtSNlStziXDyDnvNmqvy6Lq0jgAZ2WE8=";
hash = "sha256-adZTcZGRE0PkG9rntvD3vLIqXOsVxP28LCZrfyVqy9M=";
};
buildInputs =

View File

@@ -28,7 +28,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "phoc";
version = "0.41.0";
version = "0.44.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "Phosh";
repo = "phoc";
rev = "v${finalAttrs.version}";
hash = "sha256-T2gKvP3WyrGNOiCwiX93UjMuSTnnZ+nykEAFhq0BF4U=";
hash = "sha256-KaCQtORMJUM7/BLD+Jnbunhd/9/3NYWYx/XMYMo27hI=";
};
nativeBuildInputs = [

View File

@@ -1,18 +1,19 @@
{ lib, fetchFromGitHub }:
rec {
version = "1.5.25";
version = "1.5.27";
src = fetchFromGitHub {
owner = "TandoorRecipes";
repo = "recipes";
rev = version;
hash = "sha256-Yw68wxLqoyPRQmP/krSaxByv24CKh7Y7O07NU+dL5mo=";
hash = "sha256-HP4gVk127hvvL337Cb4Wbvvf55RWY7u5RF/FKDCottw=";
};
yarnHash = "sha256-lU8QrTkI32XOHefIkj/0fa2UKhuZpQIT1wyweQnzXmQ=";
meta = with lib; {
homepage = "https://tandoor.dev/";
changelog = "https://github.com/TandoorRecipes/recipes/releases/tag/${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ jvanbruegge ];
};

View File

@@ -1,9 +1,9 @@
{
"chromium": {
"version": "131.0.6778.204",
"version": "131.0.6778.264",
"chromedriver": {
"hash_darwin": "sha256-xxTu1aPNTfGpaPFC55NihzJbcjDL3fBXimQIGBPaU18=",
"hash_darwin_aarch64": "sha256-WyNiLNIPPUesDCYYs6Uc0aZDou0N60kZvL31DlqHMtw="
"hash_darwin": "sha256-ibvVBD3q+ed1VffgSEZie7VAmSdBT3CJ9bNnjyYzWis=",
"hash_darwin_aarch64": "sha256-Eup+/qrFxMAU9AoYfd5BYTKM+J7CWE7GLGETiYdYorU="
},
"deps": {
"depot_tools": {
@@ -19,8 +19,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "52183f9e99a61056f9b78535f53d256f1516f2a0",
"hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=",
"rev": "2d05e31515360f4da764174f7c448b33e36da871",
"hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -760,8 +760,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0",
"hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc="
"rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1",
"hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58="
}
}
},

View File

@@ -615,11 +615,11 @@
"vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8="
},
"huaweicloud": {
"hash": "sha256-WVoG8XoH1u0mnM4i/mULV+c6gGr3u6AVj5RiqOAlBmA=",
"hash": "sha256-cfyd8vbzRPaGqgo3iPqjzoeb3h2hWvLgFP+Q41kDn/c=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.71.2",
"rev": "v1.72.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -958,13 +958,13 @@
"vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI="
},
"opentelekomcloud": {
"hash": "sha256-H7IG6YjGSbPXaprWfGjQzHcaEIa9H6xUuoG4PPho/8s=",
"hash": "sha256-gcELIKjDeXp0rqz+tDp2S9VEzPVoL+7RfvpfNF/qets=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.36.27",
"rev": "v1.36.28",
"spdx": "MPL-2.0",
"vendorHash": "sha256-3dDj0I7kBkwbQun90VUqdvpUcelMz1v7/OfgXfb87yE="
"vendorHash": "sha256-KvQNpXn11KdGbGQBWj7FwVypJOcFhLjgOKBfFZOyL7M="
},
"opsgenie": {
"hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",

View File

@@ -184,9 +184,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.10.3";
hash = "sha256-KY18YFTKWj366CPTh1MJ9DLamiFUVql3BhuMUzN7zf8=";
vendorHash = "sha256-AajBuUwOhK0OniRRfCqR89+mA9LnQBkbG3Xge9c0qSQ=";
version = "1.10.4";
hash = "sha256-wJg/BfKWgDzv9HKOsNaq+l2jG37VbOtmBF+QEhNLQ1k=";
vendorHash = "sha256-YFsPxDlD7SqHo0x2UQnsJ5jDTp2JXdhEgDvtIpWVQ9o=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;

View File

@@ -9,24 +9,24 @@ let
versions =
if stdenv.hostPlatform.isLinux then
{
stable = "0.0.78";
stable = "0.0.79";
ptb = "0.0.124";
canary = "0.0.549";
development = "0.0.60";
canary = "0.0.556";
development = "0.0.61";
}
else
{
stable = "0.0.330";
ptb = "0.0.153";
canary = "0.0.661";
development = "0.0.68";
stable = "0.0.331";
ptb = "0.0.154";
canary = "0.0.668";
development = "0.0.70";
};
version = versions.${branch};
srcs = rec {
x86_64-linux = {
stable = fetchurl {
url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-1G9NM0Z6dN2LtunHkkIzNNA+xFslxhnI8GVrjXlNZK8=";
hash = "sha256-gQVx+PueGDofUjKSvyorCu73myNujcKz9gugMKB9koY=";
};
ptb = fetchurl {
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
@@ -34,29 +34,29 @@ let
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-hwgvPNoEGjfg6uLlC/k3iYfxfjbja5H2F2aSiEcGZ/o=";
hash = "sha256-5qn0YL0+1uE6kmQO3Fh2DD0gNjk6MT+yAdIoMK7Y8Tw=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
hash = "sha256-SL+lWMSXC1Y11Sk59sE7F8n04DED2365RKKeKFU8R6o=";
hash = "sha256-9ssgue3Y8StyKnc1dvr6b0Z3hjPYtJCNuVsruqFx8ug=";
};
};
x86_64-darwin = {
stable = fetchurl {
url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg";
hash = "sha256-wLDr2jtjPsV3rUsFCNKKHXTwGPdoR/whLmr4w8I7x+U=";
hash = "sha256-U37JyZwPmsk6ArD8Lz0xAiy/I78H+wHSig3+1BpD9iA=";
};
ptb = fetchurl {
url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
hash = "sha256-EvIEMyqOotnyqBC8w4XbF+RuP+g2Bjt4hD4aEeEzZGU=";
hash = "sha256-BVKhyLoz/EoaZ6LgCaJuZZ37u9ProXOPddrfg171Eu4=";
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
hash = "sha256-dCeLnfgvaKngO8r/VIDgQLkMKgV7BDOOKcXUdo91Eeo=";
hash = "sha256-1eCHufW68AuYuYWzfq6Tt+YylFgCLT88DrvrNZvQG8A=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
hash = "sha256-5sUkGN9ucyYArGkfbGBdJokoqpHKBrkwxH055LpMlrs=";
hash = "sha256-UdHwa/ALOOt/bNA6UmVJB8GNe+yHJ1xFoyF0nT1Zn3g=";
};
};
aarch64-darwin = x86_64-darwin;

View File

@@ -18,13 +18,13 @@
buildPythonApplication rec {
pname = "matrix-commander";
version = "7.6.2";
version = "8.0.4";
src = fetchFromGitHub {
owner = "8go";
repo = "matrix-commander";
rev = "v${version}";
hash = "sha256-BiQShJHCTvEdkhp21uxxCTxBZ1eezuWE6btMc/wkPlc=";
hash = "sha256-JZcdAo6d7huwDQ9hJE8oT5FH0ZQjg0DhoglOkhOyk1o=";
};
format = "pyproject";

View File

@@ -102,6 +102,9 @@ stdenv.mkDerivation rec {
DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g')
# Temp fix: openjfx doesn't build with webkit
unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/
runHook postInstall
'';

View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.32.1";
version = "2.32.2";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-b+HaFXi3Z2vOU2saEvg22uLHbJLdM4dGEZeI6lvI/dk=";
hash = "sha256-i4wpM7Rc4pFUUzPFvoPxUlifIvk4GJzBhCLpUndFnjE=";
};
postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-AOLAyyg8ZFPjreK/PEY+TJy4puxqMCg5kjEyBfEfmPk=";
vendorHash = "sha256-UP1SDAaoGD1iYqb0RKCZgB22CuE2OU8FW7YFPxiY42w=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

View File

@@ -16,6 +16,7 @@
, pulseaudio
, evince
, glib
, modemmanager
, gtk4
, gnome-bluetooth
, gnome-control-center
@@ -41,12 +42,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "phosh";
version = "0.41.1";
version = "0.44.0";
src = fetchurl {
# Release tarball which includes subprojects gvc and libcall-ui
url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-Oc6Dltjj+2D3LWZz1eYArqEKEJYYqJPSrScEkxyNhX0=";
hash = "sha256-b4yrSC0TzTuh5kl93DeJNh06ZKjvNhTSjhDzmsEuK2g=";
};
nativeBuildInputs = [
@@ -70,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
evolution-data-server
pulseaudio
glib
modemmanager
gcr
networkmanager
polkit

View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "ab-av1";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "alexheretic";
repo = "ab-av1";
rev = "v${version}";
hash = "sha256-xKZVvwRSCd4AxJnfEnRYuyB0yhxkg19a2tI0x2rcvWs=";
hash = "sha256-I9XApll0/mvfhL/BLWoVwL0ffqa5r3dOBWYTHizJ0hc=";
};
cargoHash = "sha256-nK3ye3wJBBv4ei41e9V/bj5kg5ujjzi0EvLwKKfvfUU=";
cargoHash = "sha256-jTCAB4O+SePCaKivHwbfFJZKjlxZmzP4uLT5idKmiO4=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -10,7 +10,7 @@
}:
let
version = "1.7.5";
version = "1.7.6";
in
buildGoModule {
pname = "actionlint";
@@ -22,10 +22,10 @@ buildGoModule {
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
hash = "sha256-CJ3T47zPO1p29Nxpxtgf7oTe3TT240RXJG14DW1uANY=";
hash = "sha256-NHmz+r7xO84eSQFBNwaI+ctzIgd014rRQtqvi8hOWPE=";
};
vendorHash = "sha256-3c+0Hxn7JcJzrg9Ep/BKKb0mu0nbb5qX2snljCeu1N0=";
vendorHash = "sha256-4hBIDrFOADGo3gsTRW8hjBYzmWRo/5yyoM7Ylv3KJBk=";
nativeBuildInputs = [
makeWrapper

View File

@@ -1,13 +1,14 @@
{
lib,
stdenv,
darwin,
fetchFromGitHub,
installShellFiles,
libcap,
nix-update-script,
openssl,
pkg-config,
rustPlatform,
Security,
zlib,
}:
@@ -17,9 +18,9 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
repo = "authoscope";
tag = "v${version}";
hash = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
};
cargoHash = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k=";
@@ -29,11 +30,15 @@ rustPlatform.buildRustPackage rec {
pkg-config
];
buildInputs = [
libcap
zlib
openssl
] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
buildInputs =
[
libcap
zlib
openssl
]
++ lib.optional stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
];
postInstall = ''
installManPage docs/${pname}.1
@@ -42,10 +47,13 @@ rustPlatform.buildRustPackage rec {
# Tests requires access to httpin.org
doCheck = false;
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "Scriptable network authentication cracker";
homepage = "https://github.com/kpcyrd/authoscope";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ fab ];
changelog = "https://github.com/kpcyrd/authoscope/releases/tag/v${version}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ fab ];
};
}

View File

@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "bigloo";
version = "4.4b";
version = "4.5b";
src = fetchurl {
url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz";
sha256 = "sha256-oxOSJwKWmwo7PYAwmeoFrKaYdYvmvQquWXyutolc488=";
sha256 = "sha256-hk1SXuan/zOf2ajJc8xGv5piOjgn2Ev7bgSikiNwfaU=";
};
nativeBuildInputs = [

View File

@@ -4,7 +4,7 @@
fetchFromGitHub,
copyPkgconfigItems,
makePkgconfigItem,
version ? "2.1.1",
version ? "2.1.2",
}:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
rev = "rel-${version}";
hash =
{
"2.1.1" = "sha256-1/qJGGyx+hGZ09pIT2uNykotaYlU8BCKArblYhHsMxo=";
"2.1.2" = "sha256-fhvQd/f8eaw7OA2/XoOTVOnQxSSxUvugu6VWo2nmpQ0=";
"2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc=";
}
.${version};

View File

@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-bundle-licenses";
version = "1.3.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "sstadick";
repo = "cargo-bundle-licenses";
rev = "v${version}";
hash = "sha256-pWQU0IMahbFJR7oRUqnz73cB8yRbTpkh5NASmUKg0E0=";
hash = "sha256-oyb5uWIKXhPSMpb1t6C/IYKK8FMSANIQXs2XdJ/bD2A=";
};
cargoHash = "sha256-eUY3dyyWbqSqFqafdZ2AdI7vsH60vCRNk2cAGJw0ROk=";
cargoHash = "sha256-HxFRHgb0nBF6YGaiynv95fNwej70IAwP4jhVcGvdFok=";
meta = with lib; {
description = "Generate a THIRDPARTY file with all licenses in a cargo project";

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-component";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "cargo-component";
rev = "v${version}";
hash = "sha256-HiDwFWEzzCmwlEKsVmKREtn5OfAziC+irgeh66fRWIQ=";
hash = "sha256-pW3hhcsMzKSWmUX8HwAtZCB+v9B4qXw6WUGODhPtW+Q=";
};
cargoHash = "sha256-AtOZGYH0ya5mza3QFTfaXvw9tcFDGuz72JUhfTdUml8=";
cargoHash = "sha256-knNtEBSJigamj1hE6wU4Hc/f3TUcFiufOUMLwsK6t+A=";
nativeBuildInputs = [
pkg-config

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deb";
version = "2.9.4";
version = "2.10.0";
src = fetchFromGitHub {
owner = "kornelski";
repo = pname;
rev = "v${version}";
hash = "sha256-jTmETLENCUaGIJIN2smSS+QKNco0mFJWrOkQgiMBcz8=";
hash = "sha256-J3ChNrZUctDcs1bOCoDLTQtqTT9rWi24XK2fki8PYLw=";
};
cargoHash = "sha256-QruSmVER4WE0++b5MHKCtVduQkyF2Dkszw6gmhdZEKs=";
cargoHash = "sha256-CjlMadj4/QhbSlCoZs3JRaplbY4XlcBFKR4ZXJLK+Uo=";
nativeBuildInputs = [
makeWrapper

View File

@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-shuttle";
version = "0.49.0";
version = "0.50.0";
src = fetchFromGitHub {
owner = "shuttle-hq";
repo = "shuttle";
rev = "v${version}";
hash = "sha256-97AiRgTPzkNsnxMTF0zleHVR6QYLyRlhguh2nz+duUM=";
hash = "sha256-D3o4GdGD/lP4bchjpyj684G1CDWMhnZHke131GAI1es=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-eHmNGIcSXzFdfEHKKr0R+igtZbm8bPRFg2uhzJwKDhk=";
cargoHash = "sha256-hlYcDQi4wv43UBYSvnWUMunAKVCFVFA7hvxjaeGA2pA=";
nativeBuildInputs = [ pkg-config ];

View File

@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnquery";
version = "11.35.0";
version = "11.36.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnquery";
tag = "v${version}";
hash = "sha256-WBzl3DyjPr5vV9oobqZx1pprs4gkVN9BafOMIMqqb7E=";
hash = "sha256-LISy9xMAv9Wal+iRF9qoCLrQnq0r4HOqCir/w0uTrAA=";
};
subPackages = [ "apps/cnquery" ];
vendorHash = "sha256-rgjYpiTWp9KqC7gX05Fx5h2hKT1ah2GQorPzPhJpQH0=";
vendorHash = "sha256-JweIdmjnybaOyL5GOxCmP8TpyMYTG9qD5aFbabAJ4h8=";
ldflags = [
"-w"

View File

@@ -6,11 +6,11 @@
let
pname = "codux";
version = "15.40.0";
version = "15.41.0";
src = fetchurl {
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
hash = "sha256-HPpzlIpMieQbFJFFshGtKm7ztnZ8obnVEpJTETQekL8=";
hash = "sha256-l1Z4jcbsTdzn4kFDcAGENAuewIThP2ENB/fbG7XerdY=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };

View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
rustPlatform,
appstream,
makeBinaryWrapper,
@@ -24,18 +25,18 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-store";
version = "1.0.0-alpha.2";
version = "1.0.0-alpha.4";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-store";
rev = "epoch-${version}";
hash = "sha256-mq94ZMVOdXAPR52ID5x8nppJ9mNoTOPBfn7Eouj3T1U=";
hash = "sha256-VaOKF3cCnNbfUfJeuhx0wXRvprAnSspTe8gIiR/t2Ng=";
fetchSubmodules = true;
};
useFetchCargoVendor = true;
cargoHash = "sha256-lhMMzT6igjEEvwpcc7d8JyyHU0DcWVIh3z9KR6eCv7c=";
cargoHash = "sha256-Zt2199zlxNbrN/S6bogp4JPM3ZMZpQL5jTXKMki6LQE=";
postPatch = ''
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
@@ -99,6 +100,10 @@ rustPlatform.buildRustPackage rec {
}
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
homepage = "https://github.com/pop-os/cosmic-store";
description = "App Store for the COSMIC Desktop Environment";

View File

@@ -22,13 +22,13 @@ let
in
buildDartApplication rec {
pname = "dart-sass";
version = "1.83.0";
version = "1.83.1";
src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
hash = "sha256-BT9ubYNireRXWqTHRrL7gHXle6tX3pjKG3siQ9TNf1M=";
hash = "sha256-uy3kp6oT51AW2qE+qHOvvDDS59Tgw9fEAer94PsQOkg=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;

View File

@@ -180,11 +180,11 @@
"dependency": "direct dev",
"description": {
"name": "dart_style",
"sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
"sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.7"
"version": "3.0.1"
},
"dartdoc": {
"dependency": "direct dev",
@@ -290,11 +290,11 @@
"dependency": "transitive",
"description": {
"name": "http_parser",
"sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360",
"sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.1.1"
"version": "4.1.2"
},
"io": {
"dependency": "transitive",
@@ -510,11 +510,11 @@
"dependency": "direct dev",
"description": {
"name": "pub_api_client",
"sha256": "d9ced27bb5b933012a5218120f1fbee2a7d3bd234a7d5cc6fe29dedf4df6127a",
"sha256": "1b95df9b91bc1d5edf21a46e74b7aad64eaf33d56467781bfd8d730539a1f57d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.0"
"version": "3.1.0"
},
"pub_semver": {
"dependency": "direct main",
@@ -530,11 +530,11 @@
"dependency": "direct dev",
"description": {
"name": "pubspec_parse",
"sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
"sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.0"
"version": "1.4.0"
},
"retry": {
"dependency": "transitive",
@@ -620,21 +620,21 @@
"dependency": "direct main",
"description": {
"name": "stack_trace",
"sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
"sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.12.0"
"version": "1.12.1"
},
"stream_channel": {
"dependency": "direct main",
"description": {
"name": "stream_channel",
"sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
"sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
"version": "2.1.4"
},
"stream_transform": {
"dependency": "direct main",
@@ -670,11 +670,11 @@
"dependency": "direct dev",
"description": {
"name": "test",
"sha256": "43490fe4c0f5ecb898f3fa1cdcdad8d521d7f6ff17ebdc4e8cd32b2e99524a20",
"sha256": "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.25.13"
"version": "1.25.14"
},
"test_api": {
"dependency": "transitive",
@@ -700,11 +700,11 @@
"dependency": "direct dev",
"description": {
"name": "test_descriptor",
"sha256": "abe245e8b0d61245684127fe32343542c25dc2a1ce8f405531637241d98d07e4",
"sha256": "9ce468c97ae396e8440d26bb43763f84e2a2a5331813ee5a397cb4da481aaf9a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.1"
"version": "2.0.2"
},
"test_process": {
"dependency": "direct dev",
@@ -810,11 +810,11 @@
"dependency": "direct dev",
"description": {
"name": "yaml",
"sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
"sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.2"
"version": "3.1.3"
}
},
"sdks": {

View File

@@ -11,7 +11,7 @@
coreutils,
util-linux,
gnugrep,
gnupg1,
gnupg,
gnutar,
gnused,
gzip,
@@ -32,7 +32,7 @@ let
dpkg
gawk
gnugrep
gnupg1
gnupg
gnused
gnutar
gzip
@@ -43,14 +43,14 @@ let
in
stdenv.mkDerivation rec {
pname = "debootstrap";
version = "1.0.138";
version = "1.0.140";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "debootstrap";
rev = "refs/tags/${version}";
hash = "sha256-2NUFt39isGThOqlg1LNOFxYJOPm93jDCvIztJoE5Vts=";
hash = "sha256-kusY42HwyMFuzwJimdVzuwx9XGjKssGAR7guB4E0TbQ=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "diffnav";
version = "0.2.8";
version = "0.3.0";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "diffnav";
rev = "refs/tags/v${version}";
hash = "sha256-xZAi/Ky1RjOxjhQKHvozaPTqDPcrGfhMemGWzi7WyW4=";
hash = "sha256-JXxeRq8OuTvzkbxDr1xVXeW0RFtCRyEbhCGvXeWHb0g=";
};
vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI=";

View File

@@ -0,0 +1,65 @@
{
lib,
stdenv,
fetchFromGitHub,
desktop-file-utils,
glib,
gobject-introspection,
gtk3,
meson,
ninja,
pkg-config,
vala,
wrapGAppsHook3,
xvfb-run,
libayatana-appindicator,
libpeas,
libXtst,
zeitgeist,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "diodon";
version = "1.13.0";
src = fetchFromGitHub {
owner = "diodon-dev";
repo = "diodon";
tag = finalAttrs.version;
hash = "sha256-VCJANasrGmC0jIy8JNNURvmgpL/SLOaVsKo7Pf+X8DQ=";
};
strictDeps = true;
nativeBuildInputs = [
desktop-file-utils # for `desktop-file-validate`
glib # for glib-compile-schemas
gobject-introspection # For g-ir-compiler
gtk3 # for gtk-update-icon-cache
meson
ninja
pkg-config
vala
wrapGAppsHook3
xvfb-run
];
buildInputs = [
gtk3
libayatana-appindicator
libpeas
libXtst
zeitgeist
];
doCheck = true;
meta = {
description = "Aiming to be the best integrated clipboard manager for the Unity desktop";
homepage = "https://launchpad.net/diodon";
mainProgram = "diodon";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.sfrijters ];
platforms = lib.platforms.unix;
};
})

View File

@@ -22,7 +22,7 @@
python3Packages.buildPythonApplication rec {
pname = "eartag";
version = "0.6.3";
version = "0.6.4";
format = "other";
src = fetchFromGitLab {
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
owner = "World";
repo = pname;
rev = version;
hash = "sha256-eo6Vboo2Kn39M0r1OeqRFG3ug6frxzMKler5qT9KysY=";
hash = "sha256-K93sj84MdDCQgIMghkjpGIieSrlnlQiw85JSgggRlf4=";
};
postPatch = ''

View File

@@ -17,14 +17,14 @@ let
in
flutter324.buildFlutterApplication rec {
pname = "ente-auth";
version = "4.2.2";
version = "4.2.3";
src = fetchFromGitHub {
owner = "ente-io";
repo = "ente";
sparseCheckout = [ "auth" ];
tag = "auth-v${version}";
hash = "sha256-pg2ivtTsMtDRNmxp2SQwI2n94qg60q8JfIWoO/rEUJE=";
hash = "sha256-G+uSEEJUD8mq8d7FJRKSHjpcFsILZJmtpgBmtpQYP58=";
};
sourceRoot = "${src.name}/auth";

View File

@@ -1,4 +1,4 @@
From 47406ebaf0260e5b66a92baac3717936c8386b69 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:52:59 +0200
Subject: [PATCH] nixpkgs: use system Python
@@ -10,7 +10,7 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
2 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
index 9f2b336b1a..53a2c93c59 100644
index 9f2b336b1a36ca0d2f04a40ac1809b30ff21df27..53a2c93c59492a12ef4a6ecfc0c8a679f0df73f7 100644
--- a/bazel/python_dependencies.bzl
+++ b/bazel/python_dependencies.bzl
@@ -1,28 +1,25 @@
@@ -47,7 +47,7 @@ index 9f2b336b1a..53a2c93c59 100644
extra_pip_args = ["--require-hashes"],
)
diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
index b92dd461ba..cef32b3140 100644
index b92dd461ba7037d2f1c079f283ff2c466686f7a4..cef32b3140588cb7668d47d0c08528f131184fe4 100644
--- a/bazel/repositories_extra.bzl
+++ b/bazel/repositories_extra.bzl
@@ -2,19 +2,11 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")

View File

@@ -1,4 +1,4 @@
From 4be181e96199529a36e9a93c837af7173c827493 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:58:00 +0200
Subject: [PATCH] nixpkgs: use system Go
@@ -9,7 +9,7 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
index c68eb4bf3e..addee4f6af 100644
index c68eb4bf3ed2d39d46d38d7bd0eeab2c74a507fa..addee4f6af74ea78ae778b73384e01db83ac6694 100644
--- a/bazel/dependency_imports.bzl
+++ b/bazel/dependency_imports.bzl
@@ -20,7 +20,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")

View File

@@ -1,4 +1,4 @@
From 3ecb08a7603a07310d1a38c0f47bc54bbe1f11c8 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:59:22 +0200
Subject: [PATCH] nixpkgs: use system C/C++ toolchains
@@ -9,7 +9,7 @@ Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
index addee4f6af..dc1967e43b 100644
index addee4f6af74ea78ae778b73384e01db83ac6694..dc1967e43b2b71358d2767a3d83b52819987290d 100644
--- a/bazel/dependency_imports.bzl
+++ b/bazel/dependency_imports.bzl
@@ -26,7 +26,11 @@ JQ_VERSION = "1.7"

View File

@@ -0,0 +1,55 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 2 Jan 2025 09:32:41 +0100
Subject: [PATCH] nixpkgs: patch boringssl for gcc14
Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
bazel/boringssl-gcc14.patch | 25 +++++++++++++++++++++++++
bazel/repositories.bzl | 1 +
2 files changed, 26 insertions(+)
create mode 100644 bazel/boringssl-gcc14.patch
diff --git a/bazel/boringssl-gcc14.patch b/bazel/boringssl-gcc14.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8dcad4cc11f691eec93efa29075c1d356732e58b
--- /dev/null
+++ b/bazel/boringssl-gcc14.patch
@@ -0,0 +1,25 @@
+diff --git a/crypto/internal.h b/crypto/internal.h
+index a77102d..a45f97b 100644
+--- a/crypto/internal.h
++++ b/crypto/internal.h
+@@ -1174,6 +1174,11 @@
+
+ // Arithmetic functions.
+
++// The most efficient versions of these functions on GCC and Clang depend on C11
++// |_Generic|. If we ever need to call these from C++, we'll need to add a
++// variant that uses C++ overloads instead.
++#if !defined(__cplusplus)
++
+ // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry
+ // bit. |carry| must be zero or one.
+ #if OPENSSL_HAS_BUILTIN(__builtin_addc)
+@@ -1275,6 +1280,8 @@
+ #define CRYPTO_subc_w CRYPTO_subc_u32
+ #endif
+
++#endif // !__cplusplus
++
+
+ // FIPS functions.
+
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 5cb573770f0aeac7b42d803673c8c520b5e35131..e864ef24db4bf837ef50d90c8eca316eba939d74 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -264,6 +264,7 @@ def _boringssl():
patch_args = ["-p1"],
patches = [
"@envoy//bazel:boringssl_static.patch",
+ "@envoy//bazel:boringssl-gcc14.patch",
],
)

View File

@@ -0,0 +1,128 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "dependency-envoy[bot]"
<148525496+dependency-envoy[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:09:22 +0000
Subject: [PATCH] deps: Bump `rules_rust` -> 0.54.1 (#37056)
Fix #37054
Signed-off-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
---
bazel/repository_locations.bzl | 10 ++++++---
.../dynamic_modules/sdk/rust/Cargo.Bazel.lock | 21 +++++++++++--------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index 85a125d44ece6c655f94aab3d986d96ab837897f..cfe7d145b59b691f6455b58b1baaae48276b7e9f 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -1465,12 +1465,16 @@ REPOSITORY_LOCATIONS_SPEC = dict(
license = "Emscripten SDK",
license_url = "https://github.com/emscripten-core/emsdk/blob/{version}/LICENSE",
),
+ # After updating you may need to run:
+ #
+ # CARGO_BAZEL_REPIN=1 bazel sync --only=crate_index
+ #
rules_rust = dict(
project_name = "Bazel rust rules",
project_desc = "Bazel rust rules (used by Wasm)",
project_url = "https://github.com/bazelbuild/rules_rust",
- version = "0.51.0",
- sha256 = "042acfb73469b2d1848fe148d81c3422c61ea47a9e1900f1c9ec36f51e8e7193",
+ version = "0.54.1",
+ sha256 = "af4f56caae50a99a68bfce39b141b509dd68548c8204b98ab7a1cafc94d5bb02",
# Note: rules_rust should point to the releases, not archive to avoid the hassle of bootstrapping in crate_universe.
# This is described in https://bazelbuild.github.io/rules_rust/crate_universe.html#setup, otherwise bootstrap
# is required which in turn requires a system CC toolchains, not the bazel controlled ones.
@@ -1482,7 +1486,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
],
implied_untracked_deps = ["rules_cc"],
extensions = ["envoy.wasm.runtime.wasmtime"],
- release_date = "2024-09-19",
+ release_date = "2024-11-07",
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/bazelbuild/rules_rust/blob/{version}/LICENSE.txt",
diff --git a/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock b/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock
index fa6012f406464428b37d548eecd6cec3fdaf901b..6af752304b65af39aa621fa201a8c0108931dad0 100644
--- a/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock
+++ b/source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
{
- "checksum": "96b309ddded40cf6f46a62829d15a02d7253b4cc94af2ac1890e492f9c07e93f",
+ "checksum": "b550022ca979d6b55c6dbee950bbf18368e4b8da16973c4e88e292b4d6f28e81",
"crates": {
"aho-corasick 1.1.3": {
"name": "aho-corasick",
@@ -2149,9 +2149,6 @@
"aarch64-apple-ios-sim": [
"aarch64-apple-ios-sim"
],
- "aarch64-fuchsia": [
- "aarch64-fuchsia"
- ],
"aarch64-linux-android": [
"aarch64-linux-android"
],
@@ -2159,6 +2156,9 @@
"aarch64-pc-windows-msvc": [
"aarch64-pc-windows-msvc"
],
+ "aarch64-unknown-fuchsia": [
+ "aarch64-unknown-fuchsia"
+ ],
"aarch64-unknown-linux-gnu": [
"aarch64-unknown-linux-gnu"
],
@@ -2197,8 +2197,8 @@
"aarch64-apple-darwin",
"aarch64-apple-ios",
"aarch64-apple-ios-sim",
- "aarch64-fuchsia",
"aarch64-linux-android",
+ "aarch64-unknown-fuchsia",
"aarch64-unknown-linux-gnu",
"aarch64-unknown-nixos-gnu",
"aarch64-unknown-nto-qnx710",
@@ -2213,9 +2213,9 @@
"s390x-unknown-linux-gnu",
"x86_64-apple-darwin",
"x86_64-apple-ios",
- "x86_64-fuchsia",
"x86_64-linux-android",
"x86_64-unknown-freebsd",
+ "x86_64-unknown-fuchsia",
"x86_64-unknown-linux-gnu",
"x86_64-unknown-nixos-gnu"
],
@@ -2264,15 +2264,15 @@
"wasm32-wasi": [
"wasm32-wasi"
],
+ "wasm32-wasip1": [
+ "wasm32-wasip1"
+ ],
"x86_64-apple-darwin": [
"x86_64-apple-darwin"
],
"x86_64-apple-ios": [
"x86_64-apple-ios"
],
- "x86_64-fuchsia": [
- "x86_64-fuchsia"
- ],
"x86_64-linux-android": [
"x86_64-linux-android"
],
@@ -2283,6 +2283,9 @@
"x86_64-unknown-freebsd": [
"x86_64-unknown-freebsd"
],
+ "x86_64-unknown-fuchsia": [
+ "x86_64-unknown-fuchsia"
+ ],
"x86_64-unknown-linux-gnu": [
"x86_64-unknown-linux-gnu"
],

View File

@@ -0,0 +1,127 @@
From 448e4e14f4f188687580362a861ae4a0dbb5b1fb Mon Sep 17 00:00:00 2001
From: "Krinkin, Mike" <krinkin.m.u@gmail.com>
Date: Sat, 16 Nov 2024 00:40:40 +0000
Subject: [PATCH] [contrib] Disable GCC warnings and broken features (#37131)
Currently contrib does not build with GCC because of various false
positive compiler warnings turned to errors and a GCC compiler bug.
Let's first start with the bug, in GCC apparently
using -gsplit-dwarf (debug fission) and -fdebug-types-section (used to
optimize the size of debug inforamtion), when used together, can result
in a linker failure.
Refer to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110885 for the GCC
bug report of this issue. When it comes to Envoy, optimized builds with
GCC are affected on at least GCC 11 (used by --config=docker-gcc) and
GCC 12 (and I'm pretty sure the bug isn't fixed in any newer versions
either, though I didn't check each version).
Given that we cannot have both debug fission and a debug types section,
we decided to abandon the debug types sections and keep the fission.
That being said, apparently both of those options are unmaintained in
GCC which poses a question of long term viability of using those or GCC.
Other changes in this commit disable GCC compiler errors for various
warnings that happen when building contrib. I checked those warnings and
didn't find any true
positive.
And additionally, for warnings that exists in both Clang and GCC, Clang
warnings don't trigger, so Clang also disagrees with GCC here.
Additionally missing-requires warning is new and does not exist in GCC
11, but exists in later versions of GCC, so to avoid breaking on this
warning for future versions of GCC I disabled it, but also tell GCC to
not complain if it sees a flag related to an unknwon diagnostic.
This is the last change required to make GCC contrib builds work (you
can find more context and discussions in
https://github.com/envoyproxy/envoy/issues/31807)
Risk Level: Low
Testing: building with --config=gcc and --config=docker-gcc
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A
Fixes #31807
Signed-off-by: Mikhail Krinkin <krinkin.m.u@gmail.com>
---
.bazelrc | 18 +++++++++++++++++-
bazel/envoy_internal.bzl | 16 +++++++++++++++-
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/.bazelrc b/.bazelrc
index e0e4899cecf1..7df94c77944c 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -57,9 +57,9 @@ test --experimental_ui_max_stdouterr_bytes=11712829 #default 1048576
# Allow tags to influence execution requirements
common --experimental_allow_tags_propagation
+build:linux --copt=-fdebug-types-section
# Enable position independent code (this is the default on macOS and Windows)
# (Workaround for https://github.com/bazelbuild/rules_foreign_cc/issues/421)
-build:linux --copt=-fdebug-types-section
build:linux --copt=-fPIC
build:linux --copt=-Wno-deprecated-declarations
build:linux --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
@@ -95,6 +95,21 @@ build:gcc --linkopt=-fuse-ld=gold --host_linkopt=-fuse-ld=gold
build:gcc --test_env=HEAPCHECK=
build:gcc --action_env=BAZEL_COMPILER=gcc
build:gcc --action_env=CC=gcc --action_env=CXX=g++
+# This is to work around a bug in GCC that makes debug-types-section
+# option not play well with fission:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110885
+build:gcc --copt=-fno-debug-types-section
+# These trigger errors in multiple places both in Envoy dependecies
+# and in Envoy code itself when using GCC.
+# And in all cases the reports appear to be clear false positives.
+build:gcc --copt=-Wno-error=restrict
+build:gcc --copt=-Wno-error=uninitialized
+build:gcc --cxxopt=-Wno-missing-requires
+# We need this because -Wno-missing-requires options is rather new
+# in GCC, so flags -Wno-missing-requires exists in GCC 12, but does
+# not in GCC 11 and GCC 11 is what is used in docker-gcc
+# configuration currently
+build:gcc --cxxopt=-Wno-unknown-warning
# Clang-tidy
# TODO(phlax): enable this, its throwing some errors as well as finding more issues
@@ -375,6 +390,7 @@ build:docker-clang-libc++ --config=docker-sandbox
build:docker-clang-libc++ --config=rbe-toolchain-clang-libc++
build:docker-gcc --config=docker-sandbox
+build:docker-gcc --config=gcc
build:docker-gcc --config=rbe-toolchain-gcc
build:docker-asan --config=docker-sandbox
diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl
index 015659851c1b..27ecaa0bbf47 100644
--- a/bazel/envoy_internal.bzl
+++ b/bazel/envoy_internal.bzl
@@ -68,7 +68,21 @@ def envoy_copts(repository, test = False):
"-Wc++2a-extensions",
"-Wrange-loop-analysis",
],
- repository + "//bazel:gcc_build": ["-Wno-maybe-uninitialized"],
+ repository + "//bazel:gcc_build": [
+ "-Wno-maybe-uninitialized",
+ # GCC implementation of this warning is too noisy.
+ #
+ # It generates warnings even in cases where there is no ambiguity
+ # between the overloaded version of a method and the hidden version
+ # from the base class. E.g., when the two have different number of
+ # arguments or incompatible types and therefore a wrong function
+ # cannot be called by mistake without triggering a compiler error.
+ #
+ # As a safeguard, this warning is only disabled for GCC builds, so
+ # if Clang catches a problem in the code we would get a warning
+ # anyways.
+ "-Wno-error=overloaded-virtual",
+ ],
# Allow 'nodiscard' function results values to be discarded for test code only
# TODO(envoyproxy/windows-dev): Replace /Zc:preprocessor with /experimental:preprocessor
# for msvc versions between 15.8 through 16.4.x. see

View File

@@ -0,0 +1,19 @@
diff -Naur a/bazel/protobuf.patch b/bazel/protobuf.patch
--- a/bazel/protobuf.patch 2025-01-06 23:00:26.683972526 +0100
+++ b/bazel/protobuf.patch 2025-01-07 00:53:33.997482569 +0100
@@ -149,3 +149,15 @@
#if PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII
#define PROTOBUF_DEBUG true
#else
+diff -Naur a/build_defs/cpp_opts.bzl b/build_defs/cpp_opts.bzl
+--- a/build_defs/cpp_opts.bzl 2025-01-06 23:02:56.356552216 +0100
++++ b/build_defs/cpp_opts.bzl 2025-01-07 00:23:30.534047300 +0100
+@@ -22,7 +22,7 @@
+ "-Woverloaded-virtual",
+ "-Wno-sign-compare",
+ "-Wno-nonnull",
+- "-Werror",
++ "-Wno-maybe-uninitialized",
+ ],
+ })
+

View File

@@ -4,6 +4,7 @@
bazel-gazelle,
buildBazelPackage,
fetchFromGitHub,
applyPatches,
stdenv,
cacert,
cargo,
@@ -29,32 +30,66 @@ let
# However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that
# people should update both.
version = "1.32.0";
rev = "86dc7ef91ca15fb4957a74bd599397413fc26a24";
hash = "sha256-Wcbt62RfaNcTntmPjaAM0cP3LJangm4ht7Q0bzEpu5A=";
version = "1.32.3";
rev = "58bd599ebd5918d4d005de60954fcd2cb00abd95";
hash = "sha256-5HpxcsAPoyVOJ3Aem+ZjSLa8Zu6s76iCMiWJbp8RjHc=";
};
# these need to be updated for any changes to fetchAttrs
depsHash =
{
x86_64-linux = "sha256-LkDNPFT7UUCsGPG1dMnwzdIw0lzc5+3JYDoblF5oZVk=";
aarch64-linux = "sha256-DkibjmY1YND9Q2aQ41bhNdch0SKM5ghY2mjYSQfV30M=";
x86_64-linux = "sha256-YFXNatolLM9DdwkMnc9SWsa6Z6/aGzqLmo/zKE7OFy0=";
aarch64-linux = "sha256-AjG1OBjPjiSwWCmIJgHevSQHx8+rzRgmLsw3JwwD0hk=";
}
.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
in
buildBazelPackage rec {
pname = "envoy";
inherit (srcVer) version;
bazel = bazel_6;
src = fetchFromGitHub {
owner = "envoyproxy";
repo = "envoy";
inherit (srcVer) hash rev;
postFetch = ''
chmod -R +w $out
rm $out/.bazelversion
echo ${srcVer.rev} > $out/SOURCE_VERSION
src = applyPatches {
src = fetchFromGitHub {
owner = "envoyproxy";
repo = "envoy";
inherit (srcVer) hash rev;
};
patches = [
# use system Python, not bazel-fetched binary Python
./0001-nixpkgs-use-system-Python.patch
# use system Go, not bazel-fetched binary Go
./0002-nixpkgs-use-system-Go.patch
# use system C/C++ tools
./0003-nixpkgs-use-system-C-C-toolchains.patch
# patch boringssl to work with GCC 14
# vendored patch from https://boringssl.googlesource.com/boringssl/+/c70190368c7040c37c1d655f0690bcde2b109a0d
./0004-nixpkgs-patch-boringssl-for-gcc14.patch
# update rust rules to work with rustc v1.83
# cherry-pick of https://github.com/envoyproxy/envoy/commit/019f589da2cc8da7673edd077478a100b4d99436
# drop with v1.33.x
./0005-deps-Bump-rules_rust-0.54.1-37056.patch
# patch gcc flags to work with GCC 14
# (silences erroneus -Werror=maybe-uninitialized and others)
# cherry-pick of https://github.com/envoyproxy/envoy/commit/448e4e14f4f188687580362a861ae4a0dbb5b1fb
# drop with v1.33.x
./0006-gcc-warnings.patch
# Remove "-Werror" from protobuf build
# This is fixed in protobuf v28 and later:
# https://github.com/protocolbuffers/protobuf/commit/f5a1b178ad52c3e64da40caceaa4ca9e51045cb4
# drop with v1.33.x
./0007-protobuf-remove-Werror.patch
];
postPatch = ''
chmod -R +w .
rm ./.bazelversion
echo ${srcVer.rev} > ./SOURCE_VERSION
'';
};
@@ -80,17 +115,6 @@ buildBazelPackage rec {
mv bazel/nix/rules_rust.patch bazel/rules_rust.patch
'';
patches = [
# use system Python, not bazel-fetched binary Python
./0001-nixpkgs-use-system-Python.patch
# use system Go, not bazel-fetched binary Go
./0002-nixpkgs-use-system-Go.patch
# use system C/C++ tools
./0003-nixpkgs-use-system-C-C-toolchains.patch
];
nativeBuildInputs = [
cmake
python3
@@ -194,6 +218,8 @@ buildBazelPackage rec {
"--noexperimental_strict_action_env"
"--cxxopt=-Wno-error"
"--linkopt=-Wl,-z,noexecstack"
"--config=gcc"
"--verbose_failures"
# Force use of system Java.
"--extra_toolchains=@local_jdk//:all"

View File

@@ -16,16 +16,16 @@
}:
let
version = "0.132.0";
version = "0.132.1";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-9HF9Beu2nLUoRViFluEc4kqGah2NfN/K0hqTZ4Bmo5c=";
hash = "sha256-TrKPI+b9hlVPGUXmJ73QO2TfGoDip31KZ5RzgQC+BS4=";
};
vendorHash = "sha256-xxE/KBZvPBMd9cLE/uU74iyLaOYRd6m9HokTDi0FnRg=";
vendorHash = "sha256-jhYDk2BV1L6lrkOl6sSiYe79Q7vtC4Da/DzWzilCXRM=";
commonMeta = with lib; {
license = licenses.mit;

View File

@@ -1,6 +1,7 @@
{
stdenv,
lib,
bash,
fetchFromGitHub,
faust2jaqt,
faust2lv2,
@@ -16,28 +17,45 @@ stdenv.mkDerivation rec {
sha256 = "sha256-CADiJXyB4FivQjbh1nhpAVgCkTi1pW/vtXKXfL7o7xU=";
};
buildInputs = [
nativeBuildInputs = [
faust2jaqt
faust2lv2
];
buildInputs = [
bash
];
# ld: /nix/store/*-gcc-14-20241116/lib/gcc/x86_64-unknown-linux-gnu/14.2.1/crtbegin.o:
# relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object
hardeningDisable = [ "pie" ];
dontWrapQtApps = true;
buildPhase = ''
runHook preBuild
cd examples/physicalModeling
for f in *MIDI.dsp; do
faust2jaqt -time -vec -double -midi -nvoices 16 -t 99999 $f
faust2lv2 -time -vec -double -gui -nvoices 16 -t 99999 $f
done
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/lv2 $out/bin
mv *.lv2/ $out/lib/lv2
for f in $(find . -executable -type f); do
cp $f $out/bin/
done
patchShebangs --host $out/bin
runHook postInstall
'';
meta = with lib; {
@@ -46,5 +64,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ magnetophon ];
# compiles stuff for the build platform, difficult to do properly
broken = stdenv.hostPlatform != stdenv.buildPlatform;
};
}

View File

@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fcgi";
version = "2.4.3";
version = "2.4.4";
src = fetchFromGitHub {
owner = "FastCGI-Archives";
repo = "fcgi2";
rev = finalAttrs.version;
hash = "sha256-P8wkiURBc5gV0PxwemkIIpTPOpug6YIZE//3j5U76K0=";
hash = "sha256-GI2RL0djfCej7bBhxR6cK/FrTbDYEl75SEfQFgl0ctA=";
};
nativeBuildInputs = [ autoreconfHook ];

View File

@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.13.5";
version = "3.13.6";
pyproject = true;
# Fetch from GitHub in order to use `requirements.in`
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
tag = "v${version}";
hash = "sha256-R6E5NWnrnezJsDm+Nnqgibv4e6mXVrOrKaCl/MBqUnY=";
hash = "sha256-I6AQtoGk/YUDM5DzegvLi8QmVvoma16zJGZ8BMUUN3c=";
};
# relax dep constrains, keep environment constraints

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "flip-link";
version = "0.1.9";
version = "0.1.10";
src = fetchFromGitHub {
owner = "knurling-rs";
repo = pname;
rev = "v${version}";
hash = "sha256-slidPVL0LAUtmCI2rlAwfGVUmB4WRF9bHqQhdgbO2oc=";
hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g=";
};
cargoHash = "sha256-x3JnqztoLol5dNMact/qMveQuvcMTg/jqHxW0lksB7Y=";
cargoHash = "sha256-OxmRIJ2LtAz+Paxzy1ppxnLliMocKbiJXf/io8mGPNQ=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;

View File

@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "flirt";
version = "0.2.1";
version = "0.3";
src = fetchFromSourcehut {
owner = "~hadronized";
repo = "flirt";
rev = "v${version}";
hash = "sha256-LCwSETvXHAUbe4QIeGpT7vVbuZl1SDfIehVG8svkmHM=";
hash = "sha256-xhNo85xwcVI4qliHU4/uNEvS7rW5avKOv8fMfRrvqD0=";
};
cargoHash = "sha256-EquriyhfbYyi87TP3zuLiCXDV7baDRaTRuZd7Yht/UA=";
cargoHash = "sha256-9DmTSx1sKINnvJv3px8UKaa5j8AUnJiYB1lwnBR+xn8=";
passthru.updateScript = nix-update-script { };

View File

@@ -1,17 +1,19 @@
{
lib,
python3Packages,
fetchPypi,
fetchFromGitHub,
git,
}:
python3Packages.buildPythonApplication rec {
pname = "git-aggregator";
version = "2.1.0";
version = "4.0.2";
src = fetchPypi {
inherit pname version;
hash = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw=";
src = fetchFromGitHub {
owner = "acsone";
repo = "git-aggregator";
tag = version;
hash = "sha256-6o+bf3s5KyRQWA7hp3xk76AfxBdzP0lOBOozgwe3Wtw=";
};
nativeBuildInputs = with python3Packages; [

View File

@@ -10,16 +10,16 @@
buildGo123Module rec {
pname = "git-spice";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "abhinav";
repo = "git-spice";
tag = "v${version}";
hash = "sha256-Q5cNkX6ZtNXh+qDjpR0a2FfHmk5YA9izLCBRPFRpdvs=";
hash = "sha256-1EWuKjvDeOV6W+nntdevUI/SO68ssYgoxJ5QIy5jkFM=";
};
vendorHash = "sha256-4NkeLDToefiRYv9xta3U6O/5L2/J0d+59Er515R2zcw=";
vendorHash = "sha256-F9CyhUtdkwvEsmQ+T5zt2n+TBRhVgyr2CEOvIzcXpug=";
subPackages = [ "." ];

View File

@@ -8,13 +8,13 @@
stdenv.mkDerivation (final: {
pname = "glaze";
version = "4.2.2";
version = "4.2.3";
src = fetchFromGitHub {
owner = "stephenberry";
repo = "glaze";
rev = "v${final.version}";
hash = "sha256-P6hrwSpeQXHhag7HV28EVXsEwd2ZJEad3GRclCiOz8w=";
hash = "sha256-exEmEV4j18WGnnEFPaHlfFuLk0dPu18pYp85XBX8Y2w=";
};
nativeBuildInputs = [ cmake ];

View File

@@ -1,73 +1,116 @@
{
lib,
stdenv,
cargo,
desktop-file-utils,
fetchurl,
pkg-config,
glib,
gnome,
gtk3,
wrapGAppsHook3,
librsvg,
gsound,
gettext,
gtk4,
itstool,
libadwaita,
librsvg,
libxml2,
libgnome-games-support,
libgee,
gst_all_1,
meson,
ninja,
vala,
python3,
desktop-file-utils,
adwaita-icon-theme,
pkg-config,
rustc,
rustPlatform,
wrapGAppsHook4,
_experimental-update-script-combinators,
common-updater-scripts,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-robots";
version = "40.0";
version = "41.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/gnome-robots-${version}.tar.xz";
hash = "sha256-b78viFdQ8aURCnJPjzWt3ZvGEYTuMc8MDLiZU+T0yxE=";
url = "mirror://gnome/sources/gnome-robots/${lib.versions.major finalAttrs.version}/gnome-robots-${finalAttrs.version}.tar.xz";
hash = "sha256-K4BQcFrIPpOL56iREyYB62XHk/IJzX6RDGzWQphzBHg=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
name = "gnome-robots-${finalAttrs.version}";
hash = "sha256-rn/rs0D2qKDYf8oxpegQalPQIVuT8rSrHTzeZqWGn44=";
};
nativeBuildInputs = [
pkg-config
meson
ninja
vala
python3
libxml2
wrapGAppsHook3
gettext
cargo
rustc
rustPlatform.cargoSetupHook
gtk4 # for gtk4-update-icon-cache
wrapGAppsHook4
itstool
desktop-file-utils
];
buildInputs = [
gtk3
glib
gtk4
libadwaita
librsvg
gsound
libgnome-games-support
libgee
adwaita-icon-theme
libxml2
# Sound playback, not checked at build time.
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
];
postPatch = ''
chmod +x build-aux/meson_post_install.py
patchShebangs build-aux/meson_post_install.py
# https://gitlab.gnome.org/GNOME/gnome-robots/-/merge_requests/38
substituteInPlace data/icons/meson.build \
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
'';
preFixup = ''
# Seal GStreamer plug-ins so that we can notice when they are missing.
gappsWrapperArgs+=(--set "GST_PLUGIN_SYSTEM_PATH_1_0" "$GST_PLUGIN_SYSTEM_PATH_1_0")
unset GST_PLUGIN_SYSTEM_PATH_1_0
'';
passthru = {
updateScript = gnome.updateScript { packageName = "gnome-robots"; };
updateScript =
let
updateSource = gnome.updateScript {
packageName = "gnome-robots";
};
updateLockfile = {
command = [
"sh"
"-c"
''
PATH=${
lib.makeBinPath [
common-updater-scripts
]
}
update-source-version gnome-robots --ignore-same-version --source-key=cargoDeps > /dev/null
''
];
# Experimental feature: do not copy!
supportedFeatures = [ "silent" ];
};
in
_experimental-update-script-combinators.sequence [
updateSource
updateLockfile
];
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/GNOME/gnome-robots";
changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${version}/NEWS?ref_type=tags";
changelog = "https://gitlab.gnome.org/GNOME/gnome-robots/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
description = "Avoid the robots and make them crash into each other";
mainProgram = "gnome-robots";
maintainers = teams.gnome.members;
license = licenses.gpl3Plus;
platforms = platforms.unix;
};
}
})

View File

@@ -0,0 +1,16 @@
libcob: Fix include for xmlCleanupParser
common.c uses xmlCleanupParser, which is defined in libxml/parser.h.
---
--- a/libcob/common.c 2025-01-01 03:03:49.762316279 +0100
+++ b/libcob/common.c 2025-01-01 03:01:56.632597306 +0100
@@ -136,6 +136,7 @@
#if defined (WITH_XML2)
#include <libxml/xmlversion.h>
#include <libxml/xmlwriter.h>
+#include <libxml/parser.h>
#endif
#if defined (WITH_CJSON)

View File

@@ -63,6 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
# XXX: Without this, we get a cycle between bin and dev
propagatedBuildOutputs = [ ];
patches = [
./fix-libxml2-include.patch
];
# Skips a broken test
postPatch = ''
sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at

View File

@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "go-ios";
version = "1.0.166";
version = "1.0.168";
src = fetchFromGitHub {
owner = "danielpaulus";
repo = "go-ios";
rev = "v${version}";
sha256 = "sha256-Lao7cK7ZWeU0WXa9qDHlc+NuE9Ktl7k3mJXxIIfbROk=";
sha256 = "sha256-BaJFFaNPPpPvDc8bMl89SfGYglvx9TwpoDQUEr0mqYM=";
};
proxyVendor = true;

View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-mockery";
version = "2.50.1";
version = "2.50.4";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
sha256 = "sha256-WRzrWyBkngTlAh8Nu1dKht28A5R7mV/8pljtwh6SZQU=";
sha256 = "sha256-pJUMdCnvgfm/re442QhuQs4UCdPicitLu1NTS+I61IY=";
};
preCheck = ''

View File

@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "golangci-lint";
version = "1.63.1";
version = "1.63.4";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
hash = "sha256-Q7SwLm+rnwyjlXf8iArUQWYC0DyjFZI9HIWJsgNplyw=";
hash = "sha256-7nIo6Nuz8KLuQlT7btjnTRFpOl+KVd30v973HRKzh08=";
};
vendorHash = "sha256-Rsg/bVbMsA2dUz0GjAdzifBTpDDVrFYY+ptyB5m3AgM=";
vendorHash = "sha256-atr4HMxoPEfGeaNlHqwTEAcvgbSyzgCe262VUg3J86c=";
subPackages = [ "cmd/golangci-lint" ];

View File

@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "gom";
version = "0.4";
version = "0.5.3";
outputs = [
"out"
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17ca07hpg7dqxjn0jpqim3xqcmplk2a87wbwrrlq3dd3m8381l38";
url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz";
sha256 = "Bp0JCfvca00n7feoeTZhlOOrUIsDVIv1uJ/2NUbSAXc=";
};
patches = [
@@ -54,8 +54,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
packageName = "gom";
};
};

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "gql";
version = "0.33.0";
version = "0.35.0";
src = fetchFromGitHub {
owner = "AmrDeveloper";
repo = "GQL";
rev = version;
hash = "sha256-I0ggNHvswuRhcUkndl0acEU3eOHGJqHB2csm9rXZ2sU=";
hash = "sha256-3aIZZvOmmGOa1+QHz7VrhLeEcyHSbsUMdD3PAqPpXVY=";
};
cargoHash = "sha256-yOf5kKHiPMvKi/+j6SCBZD1+gUBK4oR+H1JICPThwBA=";
cargoHash = "sha256-IHh+7BdIZZOUyjJPHpuoUDfZDHUYoVQaMYjq1CCoxfM=";
nativeBuildInputs = [
pkg-config

View File

@@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gxml";
version = "0.20.3";
version = "0.20.4";
outputs = [
"out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "GNOME";
repo = "gxml";
rev = finalAttrs.version;
hash = "sha256-GlctGxsLyQ2kPV3oBmusRiouG4PPncBTh3vgxhVaQOo=";
hash = "sha256-/gaWuUytBsvAsC95ee6MtTW6g3ltGbkD+JWqrAjJLDc=";
};
nativeBuildInputs = [
@@ -47,8 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
# https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/24
# https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/28
substituteInPlace gxml/gxml.pc.in \
--replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include"
--replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include" \
--replace-fail ">=2" ">= 2" \
--replace-fail ">=0" ">= 0"
'';
doCheck = true;

View File

@@ -1,11 +1,9 @@
diff --git a/src/tz.cpp b/src/tz.cpp
index 68436c3..2bfe19e 100644
--- a/src/tz.cpp
+++ b/src/tz.cpp
@@ -349,7 +349,7 @@ discover_tz_dir()
struct stat sb;
using namespace std;
# ifndef __APPLE__
@@ -498,7 +498,7 @@ discover_tz_dir()
else
throw runtime_error("discover_tz_dir failed to find zoneinfo\n");
# elif !defined(__APPLE__)
- CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo";
+ CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo";
CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc";

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "howard-hinnant-date";
version = "3.0.1";
version = "3.0.3";
src = fetchFromGitHub {
owner = "HowardHinnant";
repo = "date";
rev = "v${version}";
sha256 = "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35";
hash = "sha256-qfrmH3NRyrDVmHRmmWzM5Zz37E7RFXJqaV1Rq2E59qs=";
};
patches = [
@@ -19,13 +19,6 @@ stdenv.mkDerivation rec {
url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728";
sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154";
})
# Fix CMake include directory path.
# https://github.com/HowardHinnant/date/pull/753
(fetchpatch {
name = "fix-cmake-include-dir.patch";
url = "https://github.com/HowardHinnant/date/commit/8061b53c489b0c8676feedcb65049b27664327b5.patch";
hash = "sha256-weZUgu0SDad7EK7msUbVzk1zY4euI0Biafj/5jD4JV4=";
})
# Without this patch, this library will drop a `tzdata` directory into
# `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
# searches for `zoneinfo` be the one from the `tzdata` package.
@@ -33,13 +26,6 @@ stdenv.mkDerivation rec {
src = ./make-zoneinfo-available.diff;
inherit tzdata;
})
# The reported version to cmake's find_package() is 3.0.0, but the actual
# version is 3.0.1. This patch fixes that.
(fetchpatch {
name = "fix-cmake-version.patch";
url = "https://github.com/HowardHinnant/date/commit/2e19c006e2218447ee31f864191859517603f59f.patch";
hash = "sha256-SRAWrwv64ap3Qh3RlhwqgS0L2YsrjqVSgw6iH3KlWvk=";
})
];
# Tweaks to fix undefined variable substitutions

View File

@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.140.1";
version = "0.140.2";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
tag = "v${version}";
hash = "sha256-9H7hXBz/rKJZr/XvqFRmOQylf6sfJtkwik3jh/k+Vec=";
hash = "sha256-4W/iUJHVsmCrIR5z0qSQ/Fsa4qtiuSie6/cot6oYQNM=";
};
vendorHash = "sha256-swcj1JxYoRqKscu/IC0uiAATp4AXN0aANWkSq/mJsyc=";
vendorHash = "sha256-gyXvxg1pKf0MYbwf2FTUnDLSBf0Bcb4uNZ5rDq/2QGY=";
checkFlags =
let

View File

@@ -3,12 +3,18 @@
fetchFromGitHub,
python3Packages,
pciutils,
installShellFiles,
}:
python3Packages.buildPythonApplication rec {
pname = "hyfetch";
version = "1.99.0";
pyproject = true;
outputs = [
"out"
"man"
];
src = fetchFromGitHub {
owner = "hykilpikonna";
repo = "hyfetch";
@@ -24,6 +30,10 @@ python3Packages.buildPythonApplication rec {
python3Packages.typing-extensions
];
nativeBuildInputs = [
installShellFiles
];
# No test available
doCheck = false;
@@ -31,6 +41,15 @@ python3Packages.buildPythonApplication rec {
"hyfetch"
];
# NOTE: The HyFetch project maintains an updated version of neofetch renamed
# to "neowofetch" which is included in this package. However, the man page
# included is still named "neofetch", so to prevent conflicts and confusion
# we rename the file to "neowofetch" before installing it:
postInstall = ''
mv ./docs/neofetch.1 ./docs/neowofetch.1
installManPage ./docs/hyfetch.1 ./docs/neowofetch.1
'';
postFixup = ''
wrapProgram $out/bin/neowofetch \
--prefix PATH : ${lib.makeBinPath [ pciutils ]}
@@ -53,6 +72,7 @@ python3Packages.buildPythonApplication rec {
maintainers = with lib.maintainers; [
yisuidenghua
isabelroses
nullcube
];
};
}

View File

@@ -72,8 +72,8 @@ python3Packages.buildPythonApplication rec {
preBuild = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools==69.0.2" "setuptools" \
--replace-fail "wheel==0.42.0" "wheel"
--replace-fail "setuptools==75.6.0" "setuptools" \
--replace-fail "wheel==0.45.1" "wheel"
substituteInPlace src/foundation/__init__.py \
--replace-fail "0.0.1" "${version}"

View File

@@ -91,6 +91,8 @@ buildNpmPackage rec {
-c.electronVersion=${electron.version}
'';
NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
installPhase = ''
runHook preInstall

View File

@@ -0,0 +1,33 @@
{
lib,
fetchFromGitHub,
buildGoModule,
nix-update-script,
}:
buildGoModule rec {
pname = "kubectl-linstor";
version = "0.3.1";
src = fetchFromGitHub {
owner = "piraeusdatastore";
repo = "kubectl-linstor";
tag = "v${version}";
hash = "sha256-1wXhrnQlOIg2mJi6DhHGcb+OxSblDq+V95pZ5bl72R4=";
};
vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs=";
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Plugin to control a LINSTOR cluster using kubectl";
homepage = "https://github.com/piraeusdatastore/kubectl-linstor";
changelog = "https://github.com/piraeusdatastore/kubectl-linstor/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "kubectl-linstor";
};
}

View File

@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "kubelogin";
version = "1.31.0";
version = "1.31.1";
src = fetchFromGitHub {
owner = "int128";
repo = "kubelogin";
rev = "v${version}";
hash = "sha256-IEKP5mHxJyGzlxNL4h0MR/Ge7g1kKidIjinYr+bL6as=";
hash = "sha256-LfMxfXM3L4r0S8eDQVgFO1jTf/BcYpxxQSMl4zRh/yA=";
};
subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule rec {
"-X main.version=v${version}"
];
vendorHash = "sha256-3hNc16zpazm9YqDx2M/RafCBLev2S8TzJzClGRkKydg=";
vendorHash = "sha256-o+74+PnwhMe2oMfFLMD95R4m3gMjQS2d4pAvCEjh05U=";
# test all packages
preCheck = ''

View File

@@ -26,6 +26,12 @@ stdenv.mkDerivation {
sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030";
};
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-implicit-function-declaration"
"-Wno-error=int-conversion"
"-Wno-error=return-mismatch"
];
nativeBuildInputs = [
pkg-config
autoconf

View File

@@ -5,19 +5,21 @@
fetchFromGitHub,
git,
gmp,
cadical,
libuv,
perl,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lean4";
version = "4.11.0";
version = "4.12.0";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean4";
rev = "v${finalAttrs.version}";
hash = "sha256-5KIZGt4glC2rZDKDL0FiHUNVjVZAyY8iWDWQgdF/PIs=";
hash = "sha256-O2Egyh2D0TfQWzQKfHUeAh7qAjMfeLVwXwGUw5QqcvE=";
};
postPatch = ''
@@ -35,10 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
cadical
];
buildInputs = [
gmp
libuv
];
nativeCheckInputs = [

View File

@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "lesspipe";
version = "2.14";
version = "2.17";
src = fetchFromGitHub {
owner = "wofr06";
repo = "lesspipe";
rev = "v${version}";
hash = "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=";
hash = "sha256-afJuTByGUMU6kFqGGa3pbPaFVdYGcJYiR0RfDNYNgDk=";
};
nativeBuildInputs = [
@@ -85,89 +85,84 @@ stdenv.mkDerivation rec {
];
fake = {
# script guards usage behind has_cmd test function, it's safe to leave these external and optional
external =
[
"cpio"
"isoinfo"
"cabextract"
"bsdtar"
"rpm2cpio"
"bsdtar"
"unzip"
"ar"
"unrar"
"rar"
"7zr"
"7za"
"isoinfo"
"gzip"
"bzip2"
"lzip"
"lzma"
"xz"
"brotli"
"compress"
"zstd"
"lz4"
"archive_color"
"bat"
"batcat"
"pygmentize"
"source-highlight"
"vimcolor"
"code2color"
external = [
"cpio"
"isoinfo"
"cabextract"
"bsdtar"
"rpm2cpio"
"bsdtar"
"unzip"
"ar"
"unrar"
"rar"
"7zr"
"7za"
"isoinfo"
"gzip"
"bzip2"
"lzip"
"lzma"
"xz"
"brotli"
"compress"
"zstd"
"lz4"
"archive_color"
"bat"
"batcat"
"pygmentize"
"source-highlight"
"vimcolor"
"code2color"
"w3m"
"lynx"
"elinks"
"html2text"
"xmq"
"dtc"
"pdftotext"
"pdftohtml"
"pdfinfo"
"ps2ascii"
"procyon"
"ccze"
"mdcat"
"pandoc"
"docx2txt"
"libreoffice"
"pptx2md"
"mdcat"
"xlscat"
"odt2txt"
"wvText"
"catdoc"
"broken_catppt"
"sxw2txt"
"groff"
"mandoc"
"unrtf"
"dvi2tty"
"pod2text"
"perldoc"
"h5dump"
"ncdump"
"matdump"
"djvutxt"
"openssl"
"gpg"
"plistutil"
"plutil"
"id3v2"
"csvlook"
"csvtable"
"jq"
"zlib-flate"
"lessfilter"
"snap"
]
++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [
# resholve only identifies this on darwin/bsd
# call site is guarded by || so it's safe to leave dynamic
"locale"
];
"w3m"
"lynx"
"elinks"
"html2text"
"xmq"
"dtc"
"pdftotext"
"pdftohtml"
"pdfinfo"
"ps2ascii"
"procyon"
"ccze"
"mdcat"
"pandoc"
"docx2txt"
"libreoffice"
"pptx2md"
"mdcat"
"xlscat"
"odt2txt"
"wvText"
"catdoc"
"broken_catppt"
"sxw2txt"
"groff"
"mandoc"
"unrtf"
"dvi2tty"
"pod2text"
"perldoc"
"h5dump"
"ncdump"
"matdump"
"djvutxt"
"openssl"
"gpg"
"plistutil"
"plutil"
"id3v2"
"csvlook"
"csvtable"
"jq"
"zlib-flate"
"lessfilter"
"snap"
"locale" # call site is guarded by || so it's safe to leave dynamic
];
builtin = [ "setopt" ];
};
execer = [

View File

@@ -0,0 +1,54 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
lttng-tools,
libatomic_ops,
perl,
coreutils,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libmsquic";
version = "2.4.7";
src = fetchFromGitHub {
owner = "microsoft";
repo = "msquic";
tag = "v${finalAttrs.version}";
hash = "sha256-WveyZ9rMevLTc5C4cgMFcnj0O6Hd+HcfU8ccD6VBgyU=";
fetchSubmodules = true;
};
nativeBuildInputs = [
cmake
perl
];
buildInputs = [
lttng-tools
libatomic_ops
];
postUnpack = ''
for f in "$(find . -type f -name "*.pl")"; do
patchShebangs --build $f 2>&1 > /dev/null
done
for g in $(find . -type f -name "*" ); do
if test -f $g; then
sed -i "s|/usr/bin/env|${coreutils}/bin/env|g" $g
fi
done
'';
meta = {
description = "Cross-platform, C implementation of the IETF QUIC protocol, exposed to C, C++, C# and Rust";
homepage = "https://github.com/microsoft/msquic";
changelog = "https://github.com/microsoft/msquic/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ SohamG ];
};
})

View File

@@ -7,6 +7,7 @@
cpp-jwt,
doxygen,
enet,
fetchpatch,
fetchzip,
fmt,
ffmpeg_6-headless,
@@ -112,6 +113,14 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals enableCubeb [ cubeb ]
++ optional useDiscordRichPresence rapidjson;
patches = [
# Fix boost errors
(fetchpatch {
url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/fa2f92b888f8c0aab70414ca560b823ffb33b122/games-emulation/lime3ds/files/lime3ds-0002-boost-fix.patch";
hash = "sha256-XJogqvQE7I5lVHtvQja0woVlO40blhFOqnoYftIQwJs=";
})
];
postPatch = ''
# Fix file not found when looking in var/empty instead of opt
mkdir externals/dynarmic/src/dynarmic/ir/var

View File

@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lua-language-server";
version = "3.13.4";
version = "3.13.5";
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
tag = finalAttrs.version;
hash = "sha256-keyJ1Vtt+QjBAgGSIx6WEWAowFKgBpCfZMgemt6Qh9M=";
hash = "sha256-t1kKRLrh5gVWIiVNEW2O3YAyECVzWc84Wp91Sc9fTrU=";
fetchSubmodules = true;
};

View File

@@ -7,11 +7,11 @@
appimageTools.wrapType2 rec {
pname = "lunarclient";
version = "3.3.1";
version = "3.3.2";
src = fetchurl {
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
hash = "sha512-tRLT/jR6e9fwmQWAZ1OwjAOMiLy7us9WjiGpS8NBOzHO7jJ4TofSRvvSwpohr9YsnLiLnqANdlWtuabRpQhLLw==";
hash = "sha512-Gpm17h5U9Cw9r5EHE1wF5e0aza9yaGPUf+rhMVAhXjrVYBqiUsc/UG11TXWqarKlLpRmPDe+BvCF0qqTtTEZhw==";
};
nativeBuildInputs = [ makeWrapper ];

View File

@@ -2,22 +2,33 @@
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
testers,
mago,
}:
rustPlatform.buildRustPackage rec {
pname = "mago";
version = "0.0.9";
version = "0.0.18";
src = fetchFromGitHub {
owner = "carthage-software";
repo = "mago";
tag = version;
hash = "sha256-MeI2pya0K1W7tbEJU8VrT6b0wYlr9Q7MTi27+wHfJjg=";
hash = "sha256-QSb+5wlv8uFT2wTeJyfsz+vE4Kegqgi7Dqyl1KZU//U=";
};
cargoHash = "sha256-LcY04XkTQHpixPPPs86OVO1ehPrcdynKmScgfWEU24Q=";
cargoHash = "sha256-7ElDEhWZLFuqzZjeh7TdrLy1++bmdS7CLRwyOLzaJ18=";
env = {
# Get openssl-sys to use pkg-config
OPENSSL_NO_VENDOR = 1;
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
passthru = {
tests.version = testers.testVersion {

View File

@@ -0,0 +1,43 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
oniguruma,
stdenv,
darwin,
}:
rustPlatform.buildRustPackage rec {
pname = "marmite";
version = "0.2.3";
src = fetchFromGitHub {
owner = "rochacbruno";
repo = "marmite";
tag = version;
hash = "sha256-AblitYe7YDUc2Tg2P7j+wnOjMAhDtieDsbq6B6x+uMs=";
};
cargoHash = "sha256-u8sJS9hvIao+af7IA4vE0eUSx0xmI1Kb5NXyZBrOCIw=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
oniguruma
];
env = {
RUSTONIG_SYSTEM_LIBONIG = true;
};
meta = {
description = "Static Site Generator for Blogs";
homepage = "https://github.com/rochacbruno/marmite";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ matthewcroughan ];
mainProgram = "marmite";
};
}

Some files were not shown because too many files have changed in this diff Show More