Merge e1a33b0feb into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2025-11-30 00:25:31 +00:00
committed by GitHub
259 changed files with 1064 additions and 3281 deletions
+1 -1
View File
@@ -46,7 +46,7 @@ module.exports = async ({ github, context, core, dry, cherryPicks }) => {
sha,
commit,
severity: 'warning',
message: `Couldn't locate original commit hash in message of ${sha}.`,
message: `Couldn't locate the cherry-picked commit's hash in the commit message of ${sha}.`,
type: 'no-commit-hash',
}
+1 -1
View File
@@ -195,6 +195,7 @@
- `python3Packages.duckduckgo-search` has been updated to v9+ and therefore has been renamed to ddgs.
Use `python3Packages.ddgs` instead.
See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0)
- `python3Packages.heif-image-plugin` has been dropped due to lack of upstream maintenance and breakage. Use `python3Packages.pillow-heif` instead.
@@ -205,7 +206,6 @@
- `python3Packages.pyocr` no longer supports `cuneiform` on Linux by default. It is still possible to enable it using `withCuneiformSupport` override.
- `qt5.full` and `qt6.full` aliases have been removed. Their use has always been discouraged, and downstream projects should use `qtN.env` with the right set of packages.
See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0)
- `rabbitmq-server` has been updated from 4.0.9 to 4.1.4. The 4.1.0 release includes breaking changes. For more information read the [changelog of 4.1.0](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v4.1.0)
+3 -3
View File
@@ -2088,15 +2088,15 @@ rec {
# Inputs
`feature`
: The feature to be set
`type`
: The type of the feature to be set, as described in
https://cmake.org/cmake/help/latest/command/set.html
the possible values (case insensitive) are:
BOOL FILEPATH PATH STRING INTERNAL LIST
`feature`
: The feature to be set
`value`
: The desired value
@@ -1110,7 +1110,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
- [preload](http://sourceforge.net/projects/preload), a service that makes
applications run faster by prefetching binaries and shared objects.
Available as [services.preload](#opt-services.preload.enable).
Available as `services.preload`.
### Other Notable Changes {#sec-release-23.11-nixos-notable-changes}
-1
View File
@@ -913,7 +913,6 @@
./services/misc/podgrab.nix
./services/misc/polaris.nix
./services/misc/portunus.nix
./services/misc/preload.nix
./services/misc/pufferpanel.nix
./services/misc/pykms.nix
./services/misc/radicle.nix
+10
View File
@@ -71,6 +71,16 @@ in
"programs"
"gnome-documents"
] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule
[
"services"
"preload"
]
''
The corresponding package was removed from nixpkgs,
due to lack of usage and being broken since its introduction.
''
) # added 2025-11-29
(mkRemovedOptionModule [
"programs"
"goldwarden"
@@ -108,7 +108,7 @@ in
systemd.services.q3ds = {
description = "Quake 3 dedicated server";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
environment.HOME = if baseq3InStore then home else cfg.baseq3;
+29 -21
View File
@@ -16,29 +16,37 @@ let
limit != null && window != null
) "Both power limit and window must be set";
"${toString limit} ${toString window}";
cliArgs = lib.cli.toCommandLineGNU { } {
inherit (cfg)
verbose
temp
turbo
;
# `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs:
#
# Core or Cache offsets have no effect. It is not possible to set different offsets for
# CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to
# both CPU and Cache. A warning message will be displayed if you attempt to set different offsets.
core = cfg.coreOffset;
cache = cfg.coreOffset;
gpu = cfg.gpuOffset;
uncore = cfg.uncoreOffset;
analogio = cfg.analogioOffset;
cliArgs =
let
optionFormat = optionName: {
option = "--${optionName}";
sep = null;
explicitBool = false;
};
in
lib.cli.toCommandLine optionFormat {
inherit (cfg)
verbose
temp
turbo
;
# `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs:
#
# Core or Cache offsets have no effect. It is not possible to set different offsets for
# CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to
# both CPU and Cache. A warning message will be displayed if you attempt to set different offsets.
core = cfg.coreOffset;
cache = cfg.coreOffset;
gpu = cfg.gpuOffset;
uncore = cfg.uncoreOffset;
analogio = cfg.analogioOffset;
temp-bat = cfg.tempBat;
temp-ac = cfg.tempAc;
temp-bat = cfg.tempBat;
temp-ac = cfg.tempAc;
power-limit-long = mkPLimit cfg.p1.limit cfg.p1.window;
power-limit-short = mkPLimit cfg.p2.limit cfg.p2.window;
};
power-limit-long = mkPLimit cfg.p1.limit cfg.p1.window;
power-limit-short = mkPLimit cfg.p2.limit cfg.p2.window;
};
in
{
options.services.undervolt = {
@@ -53,7 +53,7 @@ in
description = "Govee2MQTT Service";
wantedBy = [ "multi-user.target" ];
after = [
"networking.target"
"network.target"
"network-online.target"
];
requires = [ "network-online.target" ];
+1 -1
View File
@@ -244,7 +244,7 @@ in
services.phpfpm.pools.roundcube = {
user = if localDB then user else "nginx";
phpOptions = ''
error_log = 'stderr'
error_log = '/dev/stderr'
log_errors = on
post_max_size = ${cfg.maxAttachmentSize}
upload_max_filesize = ${cfg.maxAttachmentSize}
-36
View File
@@ -1,36 +0,0 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.preload;
in
{
meta = {
maintainers = pkgs.preload.meta.maintainers;
};
options.services.preload = {
enable = lib.mkEnableOption "preload";
package = lib.mkPackageOption pkgs "preload" { };
};
config = lib.mkIf cfg.enable {
systemd.services.preload = {
description = "Loads data into ram during idle time of CPU.";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
EnvironmentFile = "${cfg.package}/etc/conf.d/preload";
ExecStart = "${lib.getExe cfg.package} -l '' --foreground $PRELOAD_OPTS";
Type = "simple";
# Only preload data during CPU idle time
IOSchedulingClass = 3;
DynamicUser = true;
StateDirectory = "preload";
};
};
};
}
+1 -1
View File
@@ -92,7 +92,7 @@ in
systemd.services.alerta = {
description = "Alerta Monitoring System";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
environment = {
ALERTA_SVR_CONF_FILE = alertaConf;
};
@@ -2045,7 +2045,7 @@ in
description = "Grafana Service Daemon";
wantedBy = [ "multi-user.target" ];
after = [
"networking.target"
"network.target"
]
++ lib.optional usePostgresql "postgresql.target"
++ lib.optional useMysql "mysql.service";
@@ -169,7 +169,7 @@ in
systemd.services.kapacitor = {
description = "Kapacitor Real-Time Stream Processing Engine";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${pkgs.kapacitor}/bin/kapacitord -config ${kapacitorConf}";
User = "kapacitor";
@@ -74,7 +74,7 @@ in
systemd.services.litestream = {
description = "Litestream";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
serviceConfig = {
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
ExecStart = "${cfg.package}/bin/litestream replicate";
+1 -1
View File
@@ -41,7 +41,7 @@ in
systemd.services.convos = {
description = "Convos Service";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
environment = {
CONVOS_HOME = "%S/convos";
CONVOS_REVERSE_PROXY = if cfg.reverseProxy then "1" else "0";
+1 -1
View File
@@ -134,7 +134,7 @@ in
systemd.services.cryptpad = {
description = "Cryptpad service";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
serviceConfig = {
BindReadOnlyPaths = [
cryptpadConfigFile
+1 -1
View File
@@ -99,7 +99,7 @@ in
description = "dex identity provider";
wantedBy = [ "multi-user.target" ];
after = [
"networking.target"
"network.target"
]
++ (optional (cfg.settings.storage.type == "postgres") "postgresql.target");
path = with pkgs; [ replace-secret ];
+1 -1
View File
@@ -294,7 +294,7 @@ in
description = "HedgeDoc Service";
documentation = [ "https://docs.hedgedoc.org/" ];
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
preStart =
let
configFile = settingsFormat.generate "hedgedoc-config.json" {
@@ -134,7 +134,7 @@ in
"https://hledger.org/hledger-web.html"
];
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
serviceConfig = mkMerge [
{
ExecStart = "${pkgs.hledger-web}/bin/hledger-web ${serverArgs}";
+1 -1
View File
@@ -119,7 +119,7 @@ in
systemd.services.node-red = {
description = "Node-RED Service";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
environment = {
HOME = cfg.userDir;
};
+1 -1
View File
@@ -679,7 +679,7 @@ in
description = "Outline wiki and knowledge base";
wantedBy = [ "multi-user.target" ];
after = [
"networking.target"
"network.target"
]
++ lib.optional (cfg.databaseUrl == "local") "postgresql.target"
++ lib.optional (cfg.redisUrl == "local") "redis-outline.service";
@@ -84,7 +84,7 @@ in
systemd.services.powerdns-admin = {
description = "PowerDNS web interface";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
after = [ "network.target" ];
environment.FLASK_CONF = builtins.toFile "powerdns-admin-config.py" configText;
environment.PYTHONPATH = pkgs.powerdns-admin.pythonPath;
+1 -1
View File
@@ -103,7 +103,7 @@ let
};
systemd.services.cfssl.after = [
"cfssl-init.service"
"networking.target"
"network.target"
];
systemd.tmpfiles.rules = [ "d /var/ssl 777 root root" ];
+1 -1
View File
@@ -38,7 +38,7 @@ runTest (
services.nextcloud.config.objectstore.s3 = {
enable = true;
bucket = "nextcloud";
autocreate = true;
verify_bucket_exists = true;
key = accessKey;
secretFile = "${pkgs.writeText "secretKey" secretKey}";
hostname = "acme.test";
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "sourcegraph";
name = "amp";
version = "0.0.1763851087";
hash = "sha256-x579QIkkFBAa1w6e6mtmx2sHQ3ypDcDWWVge6kCq9wU=";
version = "0.0.1764403772";
hash = "sha256-3R9SMaIop+7gBPVh2cdovbt6FyfaxjMhPIgdDJIPNIE=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2025-11-20";
version = "0-unstable-2025-11-27";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "012dbe9dc11fd5fd765ef92e0ad4c08583862f69";
hash = "sha256-hsv8eeU+/cuknyKQ7WNKrmRYu7kXLxu7bPkoVN9qZoE=";
rev = "3609f054a65aea4b4cab5a87b2fdc876d911d244";
hash = "sha256-S18J0S50/S/50rCmcGkwSLslnA1abvsX9HhtFVcQ7XM=";
};
makefile = "Makefile";
+28 -20
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
mkDerivation,
fetchurl,
fetchpatch,
@@ -40,28 +41,35 @@ mkDerivation rec {
lrelease diffpdf.pro
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
installPhase =
if stdenv.isDarwin then
''
mkdir -p "$out"
mv diffpdf.app "$out"/
''
else
''
mkdir -p $out/bin $out/share/man/man1
install -Dpm755 -D diffpdf $out/bin/diffpdf
install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1
install -Dpm755 -D diffpdf $out/bin/diffpdf
install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1
install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications
install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/
install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/
install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png
install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications
install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/
install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/
install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png
cat > $out/share/applications/diffpdf.desktop <<EOF
[Desktop Entry]
Type=Application
Version=1.0
Name=diffpdf
Icon=diffpdf
Comment=PDF diffing tool
Exec=$out/bin/diffpdf
Terminal=false
EOF
'';
cat > $out/share/applications/diffpdf.desktop <<EOF
[Desktop Entry]
Type=Application
Version=1.0
Name=diffpdf
Icon=diffpdf
Comment=PDF diffing tool
Exec=$out/bin/diffpdf
Terminal=false
EOF
'';
meta = {
homepage = "http://www.qtrac.eu/diffpdf.html";
@@ -69,6 +77,6 @@ mkDerivation rec {
mainProgram = "diffpdf";
license = lib.licenses.gpl2Plus;
maintainers = [ ];
platforms = with lib.platforms; linux;
platforms = with lib.platforms; unix;
};
}
@@ -453,13 +453,13 @@
"vendorHash": "sha256-/8h2bmesnFz3tav3+iDelZSjp1Z9lreexwcw0WdYekA="
},
"goharbor_harbor": {
"hash": "sha256-Z3lytylGY67wOajPPLqnmmhzxoJD1EfjSU0h3yg+kzY=",
"hash": "sha256-YrFGx/xHd2Z0G6ZidHnOCY9RtcsjReUWXfiLhdDGmWM=",
"homepage": "https://registry.terraform.io/providers/goharbor/harbor",
"owner": "goharbor",
"repo": "terraform-provider-harbor",
"rev": "v3.11.2",
"rev": "v3.11.3",
"spdx": "MIT",
"vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
"vendorHash": "sha256-mzDFyk2oImRXt72kFV5Ln++ScgoecpJEJtzUKjvCaws="
},
"grafana_grafana": {
"hash": "sha256-/ygaIYisQW6Vx33KxoKHeZKo8OkQL6jcjsTomVGUCr4=",
@@ -615,13 +615,13 @@
"vendorHash": "sha256-MDhCYXJe8x7AEqQwVn+Ot3jI1i5l4AJB0KEoiHXplCc="
},
"hashicorp_nomad": {
"hash": "sha256-+lWAVb9ffyTfnkR3qZzgggRVjizdrgQ96Tj/K4ngZWQ=",
"hash": "sha256-lTO1ZLB0N+WLdMDegIP1NcAC++/vsBV7EB5BDxj588I=",
"homepage": "https://registry.terraform.io/providers/hashicorp/nomad",
"owner": "hashicorp",
"repo": "terraform-provider-nomad",
"rev": "v2.5.1",
"rev": "v2.5.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-CIR59EIgC5kkwfITQYrzoU8quCx5iCDRNOdYphVVk6Y="
"vendorHash": "sha256-BG97FSQvb++PX/MBMNazEnbksLmZaOQsOj5QLO8Cbkc="
},
"hashicorp_null": {
"hash": "sha256-hPAcFWkeK1vjl1Cg/d7FaZpPhyU3pkU6VBIwxX2gEvA=",
@@ -949,13 +949,13 @@
"vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
},
"newrelic_newrelic": {
"hash": "sha256-iqqjOaop4h7ffAo3Q80ryIcwXZnKH1vmLGAZ/seRqrM=",
"hash": "sha256-mRGLUSHwPu5U2vH8ZCHiiv4a8lrQDts32G5C/shpsc8=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.75.4",
"rev": "v3.76.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-AfkCBD1qYDhwUsezUZg27fbENMOQN21gH4dT54AMco4="
"vendorHash": "sha256-SUALSNpd/d0chLtrCpzMTJ63Iudpf45DittU30+jark="
},
"ns1-terraform_ns1": {
"hash": "sha256-vSq6502jHjEQEgKmgMpUrid88jhsENOVF+3MA6Zm8lg=",
+10 -10
View File
@@ -1,28 +1,28 @@
{
"stable": {
"linux": {
"version": "8.11.18",
"version": "8.11.20",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.18.x64.tar.gz",
"hash": "sha256-0a3DfTuCfPH49Nanb825azgc3WglQCf44g8w3GPI68Q="
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.20.x64.tar.gz",
"hash": "sha256-3MqsHp6Kbqg6VjpNkwX1kYmFzLzJN5Ll00ZwQWDHoik="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.18.arm64.tar.gz",
"hash": "sha256-1fyQjPBQP6kYYh63bNQkggqGf8Pj+CEcDfLjweDrCrs="
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.20.arm64.tar.gz",
"hash": "sha256-+wRkOHezTAxWgcgiJn23Wuz4v1lt3R7znfnVUm11fjs="
}
}
},
"darwin": {
"version": "8.11.18",
"version": "8.11.20",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.18-x86_64.zip",
"hash": "sha256-N9t4oIdI/xXE8YHVHAfPykbaSdob01liCZ4n4Ef/FYo="
"url": "https://downloads.1password.com/mac/1Password-8.11.20-x86_64.zip",
"hash": "sha256-QZcxmpc0UNbCkljkaP52tm3eR+bIpPOAGBJ7Q9lZlnA="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.18-aarch64.zip",
"hash": "sha256-OoaZw8IfgQFaU8FtLIrVeQxR7iAMt+PWAZBb9TsWlDs="
"url": "https://downloads.1password.com/mac/1Password-8.11.20-aarch64.zip",
"hash": "sha256-8VoCNK6JwN6a5EUWZKQGDAY6mIN8bc4zBinEky7b0fM="
}
}
}
+6
View File
@@ -24,6 +24,7 @@
nix-update-script,
withGraphics ? false,
versionCheckHook,
}:
let
rpathLibs = [
@@ -142,6 +143,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
updateScript = nix-update-script { };
};
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = {
description = "Cross-platform, GPU-accelerated terminal emulator";
homepage =
+3 -3
View File
@@ -18,13 +18,13 @@
}:
let
pname = "alcom";
version = "1.1.4";
version = "1.1.5";
src = fetchFromGitHub {
owner = "vrc-get";
repo = "vrc-get";
tag = "gui-v${version}";
hash = "sha256-pGWDMQIS2WgtnqRoOXRZrc25kJ5c6TY6UE2aZtpxN/s=";
hash = "sha256-xucU8nXskniHOiuwrtVoZM2FIKNKU45i4DNo6iLjZvM=";
};
subdir = "vrc-get-gui";
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage {
webkitgtk_4_1
];
cargoHash = "sha256-JuZHfpOYuLNdb03srECx73GK5ajgL6bHlbKbiuMN2NE=";
cargoHash = "sha256-MeCx3BoEXckMZfecyBcwwVE8+6V9Di6ULkIhUvUFZIA=";
buildAndTestSubdir = subdir;
npmDeps = fetchNpmDeps {
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "aliyun-cli";
version = "3.1.5";
version = "3.1.6";
src = fetchFromGitHub {
owner = "aliyun";
repo = "aliyun-cli";
tag = "v${version}";
hash = "sha256-RFeARCkzFRj8j5aS/1dpvuMqApz9HfnDMtAg9k7trsE=";
hash = "sha256-H0+XAOVXg9UAvWQC1hVUQs5AbqCVpw9NKtRKhm7m9Lw=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -17,11 +17,11 @@ let
rec {
x86_64-linux = {
urlSuffix = "linux-x86_64.tar.gz";
hash = "sha256-q5hFX4qO4BJdrsCvZJICCHwOEUYMjk9mnJ61/MCycxs=";
hash = "sha256-HXBRWQfdhlKmOOULdRELrGcxVVhKV+PvgtRHW1yU6+I=";
};
x86_64-darwin = {
urlSuffix = "macos-universal.zip";
hash = "sha256-0deWxb0nUSkCQ7eXo3XqfonlMTItQHixuAC2iYry8Ec=";
hash = "sha256-Mv4HfG93+NpbMAhDwcXZ260APL+sbYM6C+DqGZr6ogU=";
};
aarch64-darwin = x86_64-darwin;
}
@@ -30,7 +30,7 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "appflowy";
version = "0.10.3";
version = "0.10.4";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";
+7 -4
View File
@@ -2,20 +2,21 @@
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "autocorrect";
version = "2.14.1";
version = "2.16.2";
src = fetchFromGitHub {
owner = "huacnlee";
repo = "autocorrect";
rev = "5af1bc295d48b0fd04f7dbc35ea99d479f682e78";
hash = "sha256-tbN+48a8NnwirJqUci0LgxsvJI0KzuG/aDvV/Yr8Xu8=";
rev = "v${finalAttrs.version}";
hash = "sha256-IpBEmgZ40CFHMISP4tRzt2c2bE2Di9tn8e+/YJPg9RA=";
};
cargoHash = "sha256-cEiIs7wvfjP5/tkRtYb2XEZfssw09zkbOrqZsOX9ajQ=";
cargoHash = "sha256-sn+72+Qq7qppaiiiMS46RXVhFcm27lCPgXmAIYORKU8=";
cargoBuildFlags = [
"-p"
@@ -26,6 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
"autocorrect-cli"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Linter and formatter for help you improve copywriting, to correct spaces, punctuations between CJK (Chinese, Japanese, Korean)";
mainProgram = "autocorrect";
+2 -2
View File
@@ -31,14 +31,14 @@
}:
stdenv.mkDerivation rec {
version = "4.2.0";
version = "4.3.0";
pname = "baresip";
src = fetchFromGitHub {
owner = "baresip";
repo = "baresip";
rev = "v${version}";
hash = "sha256-kC1pqquIddjqIvGSIE9Rzlvr6qzTXF+mFsZlIzFBExI=";
hash = "sha256-E8FfETn4VnPYscFtwrDGCaYB7L0KU0ZTkDMfBj1dfxA=";
};
patches = [
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "bitrise";
version = "2.34.7";
version = "2.35.3";
src = fetchFromGitHub {
owner = "bitrise-io";
repo = "bitrise";
rev = "v${version}";
hash = "sha256-5L44yqHk2fvSQ7cPGB2gf2lJfQGfIg8g2sGrqDxiyMY=";
hash = "sha256-RjtOo8+vXKeZbTtnwmUq1t8WwZUJypSUoQSJtr9xd70=";
};
# many tests rely on writable $HOME/.bitrise and require network access
+6 -6
View File
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "blackfire";
version = "2.29.1";
version = "2.29.7";
src =
passthru.sources.${stdenv.hostPlatform.system}
@@ -60,23 +60,23 @@ stdenv.mkDerivation rec {
sources = {
"x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
sha256 = "n4jG21FgJbRtxhQSxXNKNFJHPqb9CmQFMd2P3+vnHVE=";
sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
};
"i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
sha256 = "eX8kMQM9ofssQ9USft69ZzMV/pl1CV5EnUMgxOLuIcA=";
sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
};
"aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
sha256 = "LCqGWc/KJHa5YA1Ex35qI/wVbe1leBwPeG6SUlxrpvY=";
sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=";
};
"aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
sha256 = "RlTCB0lARb94dwDnDh9L6QYMZXTD/v5Ae756RETias0=";
sha256 = "TvxIm4plE7nnTIkJNfCzxzr2r0B2Aqlxdveb1M+sqL4=";
};
"x86_64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
sha256 = "PGfBHkKOSd4uRKWW95MwyFRD7SWQzck9g6Jk/mWC384=";
sha256 = "oNDNIPBqvaARz9W967bxuvo2bpPORiHci3sryGqznsU=";
};
};
-89
View File
@@ -1,89 +0,0 @@
{
lib,
SDL,
SDL_image,
expat,
fetchpatch,
fetchurl,
libGL,
libGLU,
libvorbis,
libX11,
lua,
pkg-config,
scons,
smpeg,
stdenv,
zip,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "btanks";
version = "0.9.8083";
src = fetchurl {
url = "mirror://sourceforge/btanks/btanks-${finalAttrs.version}.tar.bz2";
hash = "sha256-P9LOaitF96YMOxFPqa/xPLPdn7tqZc3JeYt2xPosQ0E=";
};
patches = [
(fetchpatch {
name = "lua52.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/lua52.patch?h=btanks&id=cd0e016963238f16209baa2da658aa3fad36e33d";
hash = "sha256-Xwl//sfGprhg71jf+X3q8qxdB+5ZtqJrjBxS8+cw5UY=";
})
(fetchpatch {
url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/gcc-4.7.patch";
hash = "sha256-JN7D+q63EvKJX9wAEQgcVqE1VZzMa4Y1CPIlA3uYtLc=";
})
(fetchpatch {
url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/pow10f.patch";
hash = "sha256-6QFP1GTwqXnjfekzEiIpWKCD6HOcGusYW+02sUE6hcA=";
})
(fetchpatch {
url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/python3.patch";
hash = "sha256-JpK409Myi8mxQaunmLFKKh1NKvKLXpNHHsDvRee8OoQ=";
})
(fetchpatch {
url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/scons.patch";
hash = "sha256-JCvBY2fOV8Sc/mpvEsJQv1wKcS1dHqYxvRk6I9p7ZKc=";
})
];
nativeBuildInputs = [
SDL
pkg-config
scons
smpeg
zip
];
buildInputs = [
SDL
SDL_image
expat
libGL
libGLU
libX11
libvorbis
lua
smpeg
zlib
];
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_image}/include/SDL";
enableParallelBuilding = true;
strictDeps = true;
meta = {
homepage = "https://sourceforge.net/projects/btanks/";
description = "Fast 2d tank arcade game with multiplayer and split-screen modes";
license = lib.licenses.gpl2Plus;
mainProgram = "btanks";
maintainers = [ ];
inherit (SDL.meta) platforms;
};
})
+3 -3
View File
@@ -7,16 +7,16 @@
buildGo125Module (finalAttrs: {
pname = "chezmoi";
version = "2.66.2";
version = "2.67.1";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
tag = "v${finalAttrs.version}";
hash = "sha256-TYEVMxebA4dvWMmgx4bMv1UKO2YGH+D+lZuiAu8ZmI4=";
hash = "sha256-srrkOgd/3nL4sMe2M9Gs7a3NnjkpJcdzpqO0MrPh0Rc=";
};
vendorHash = "sha256-g9bzsmLKJ7pCmTnO8N9Um1FDBvQA0mqw14fwGYMb/K0=";
vendorHash = "sha256-N5mPoIWZfGgH1CkDnQgxQ94Zq++l2+uQMST0l/m4Z+g=";
nativeBuildInputs = [
installShellFiles
-2102
View File
File diff suppressed because it is too large Load Diff
-54
View File
@@ -1,54 +0,0 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
stdenv,
openssl,
}:
rustPlatform.buildRustPackage rec {
pname = "chit";
version = "0.1.15";
src = fetchFromGitHub {
owner = "peterheesterman";
repo = "chit";
tag = version;
sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
openssl
];
# update Carg.lock to work with openssl 3
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
meta = with lib; {
description = "Crate help in terminal: A tool for looking up details about rust crates without going to crates.io";
mainProgram = "chit";
longDescription = ''
Chit helps answer these questions:
* Who wrote this crate? What else did they write?
* What alternatives are there?
* How old is this crate?
* What versions are there? When did they come out?
* What are the downloads over time?
* Should i use this crate?
* How mature is it?
'';
homepage = "https://github.com/peterheesterman/chit";
license = licenses.mit;
maintainers = [ ];
};
}
+10 -10
View File
@@ -16,20 +16,20 @@ let
sources = {
x86_64-linux = fetchurl {
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/x64/Cursor-2.0.64-x86_64.AppImage";
hash = "sha256-zT9GhdwGDWZJQl+WpV2txbmp3/tJRtL6ds1UZQoKNzA=";
url = "https://downloads.cursor.com/production/60d42bed27e5775c43ec0428d8c653c49e58e26a/linux/x64/Cursor-2.1.39-x86_64.AppImage";
hash = "sha256-SsKhW8q/AzOn1HqykhwaVHyTVm+OqTUiFtda7XDiAho=";
};
aarch64-linux = fetchurl {
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/arm64/Cursor-2.0.64-aarch64.AppImage";
hash = "sha256-1pN9LfnplKyVUxlICQ2KsxcAn++dZY9hGR4XubHxLUY=";
url = "https://downloads.cursor.com/production/60d42bed27e5775c43ec0428d8c653c49e58e26a/linux/arm64/Cursor-2.1.39-aarch64.AppImage";
hash = "sha256-m0QNf/ock6hRkOJXqMACBV6mM6/6ZAD6/yues9hGCfU=";
};
x86_64-darwin = fetchurl {
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/x64/Cursor-darwin-x64.dmg";
hash = "sha256-lY5BJeauw5VtWuaAu8C9C2inmKFvv/OnCxOicE2Zs48=";
url = "https://downloads.cursor.com/production/60d42bed27e5775c43ec0428d8c653c49e58e26a/darwin/x64/Cursor-darwin-x64.dmg";
hash = "sha256-kFjKAoRMxRJqBC75LCcbEiwqdunaphj/e2afrFD3NaM=";
};
aarch64-darwin = fetchurl {
url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/arm64/Cursor-darwin-arm64.dmg";
hash = "sha256-IIJbuRdxTG7kSspspWk8GH9KZsKPyLJahz0iqSvP1B0=";
url = "https://downloads.cursor.com/production/60d42bed27e5775c43ec0428d8c653c49e58e26a/darwin/arm64/Cursor-darwin-arm64.dmg";
hash = "sha256-9kP0C7KLLSD0Oak75P/4Qt5sIncTwW6Sldz2/9yi4EE=";
};
};
@@ -39,12 +39,12 @@ in
inherit useVSCodeRipgrep;
commandLineArgs = finalCommandLineArgs;
version = "2.0.64";
version = "2.1.39";
pname = "cursor";
# You can find the current VSCode version in the About dialog:
# workbench.action.showAboutDialog (Help: About)
vscodeVersion = "1.99.3";
vscodeVersion = "1.105.1";
executableName = "cursor";
longName = "Cursor";
+7 -4
View File
@@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-jgasZhdcJ+UF3VIl8HLcxBayvbA/dkaOG8UtANRgeP4=";
};
patches = [ ./dont-fix-app-bundle.diff ];
patches = lib.optionals stdenv.hostPlatform.isDarwin [
./dont-fix-app-bundle.diff
./remove-deep-flag-from-codesign.diff
];
outputs = [
"out"
@@ -82,17 +85,17 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p $out/nix-support $terminfo/share
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir $out/Applications
mkdir $out/Applications $out/bin
cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share
mv $out/contour.app $out/Applications
ln -s $out/bin $out/Applications/contour.app/Contents/MacOS
ln -s $out/Applications/contour.app/Contents/MacOS/contour $out/bin/contour
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
mv $out/share/terminfo $terminfo/share/
rm -r $out/share/contour
''
+ ''
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
rm -r $out/share/contour
'';
passthru.tests.test = nixosTests.terminal-emulators.contour;
@@ -0,0 +1,16 @@
diff --git a/remove-deep-flag-from-codesign.diff b/remove-deep-flag-from-codesign.diff
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/contour/CMakeLists.txt b/src/contour/CMakeLists.txt
index 3c7ac83720..55e6830bfc 100644
--- a/src/contour/CMakeLists.txt
+++ b/src/contour/CMakeLists.txt
@@ -510,7 +510,7 @@
# Ensure code signature
execute_process(
WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\"
- COMMAND codesign --force --deep --sign \"${CODE_SIGN_CERTIFICATE_ID}\" \"${BUNDLE_APP}\"
+ COMMAND codesign --force --sign \"${CODE_SIGN_CERTIFICATE_ID}\" \"${BUNDLE_APP}/Contents/MacOS/contour\"
)
")
else()
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "cook-cli";
version = "0.18.2";
version = "0.19.0";
src = fetchFromGitHub {
owner = "cooklang";
repo = "cookcli";
rev = "v${version}";
hash = "sha256-uw1xwE7hIE00OADV9kOXR1/gKSzvleW1/5PwfhH4fvE=";
hash = "sha256-yNUiwMzCAj5aXuQIzfzpy2GylhB37CuSmyHsyxcmKXM=";
};
cargoHash = "sha256-Yxln5eKNXONGd4Hy9Ru9t92iqK9zcTSpzu2j75bc3fk=";
cargoHash = "sha256-Kq70YgTis5e8PcIAOgAqk/fi3HmE+lbpYjaV47axGX4=";
# Build without the self-updating feature
buildNoDefaultFeatures = true;
+3 -3
View File
@@ -19,13 +19,13 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-reader";
version = "0-unstable-2025-10-12";
version = "0-unstable-2025-11-25";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-reader";
rev = "35bf8c556bbff415e1149d7cbf267d2b6ff6f300";
hash = "sha256-721Y1VbBPWMXcH8rt5AyO2GFV1Q70kHnG4TAPmeX414=";
rev = "8459e02be5bd778d6e06e2f0c4f561f03dd14a85";
hash = "sha256-R0t+JkSUkDJkvnj3mjDFN3pcpqI0VkuRpgteXqcEH6Y=";
};
cargoHash = "sha256-4ofAtZN3FpYwNahinldALbdEJA5lDwa+CUsVIISnSTc=";
-61
View File
@@ -1,61 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
openssl,
curl,
zlib,
gtest,
cppcheck,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cpr";
version = "1.12.0";
src = fetchFromGitHub {
owner = "libcpr";
repo = "cpr";
tag = finalAttrs.version;
hash = "sha256-OkOyh2ibt/jX/Dc+TB1uSlWtzEhdSQwHVN96oCOh2yM=";
};
nativeBuildInputs = [
cmake
pkg-config
gtest
cppcheck
];
buildInputs = [
openssl
zlib
curl
];
cmakeFlags = [
# NOTE: Does not build with CPPCHECK
# (lib.cmakeBool "CPR_ENABLE_CPPCHECK" true)
(lib.cmakeBool "CPR_BUILD_TEST" true)
(lib.cmakeBool "CURL_ZLIB" false)
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
(lib.cmakeBool "CPR_USE_SYSTEM_CURL" true)
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
];
# Install headers
postInstall = ''
mkdir -p $out/include
cp -r $src/include/* $out/include/
'';
meta = {
description = "C++ Requests: Curl for People, a spiritual port of Python Requests";
homepage = "https://github.com/libcpr/cpr";
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ phodina ];
};
})
+9 -9
View File
@@ -9,26 +9,26 @@ let
inherit (stdenv) hostPlatform;
sources = {
x86_64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-otTYUTmGqqXT4Jx+r1RlFjJD7FYU62QRl+y69eo/khs=";
url = "https://downloads.cursor.com/lab/2025.11.25-d5b3271/linux/x64/agent-cli-package.tar.gz";
hash = "sha256-oWYGMIlp7d0cpS7iQxbj62XdfhXnztTqlu1yFmhVKVU=";
};
aarch64-linux = fetchurl {
url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-jPqgGdtjLg4qZWktz1/X1LI0+e6RYcCtuLw91k1Xofg=";
url = "https://downloads.cursor.com/lab/2025.11.25-d5b3271/linux/arm64/agent-cli-package.tar.gz";
hash = "sha256-Cqoc+42LbrKTQv1YEQeX8Vfoj7KosUOWsdVTf6whxw4=";
};
x86_64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-UVR+iomdZzmPfj4o4N4FfUSCa9ttJre7Ipso5weIn1k=";
url = "https://downloads.cursor.com/lab/2025.11.25-d5b3271/darwin/x64/agent-cli-package.tar.gz";
hash = "sha256-PRxUE0AhEe/5EpXahWx5WW68uUkncwHGxG5eTjFxwyk=";
};
aarch64-darwin = fetchurl {
url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-t5s9TfLLA/VLCYNF+fsf9wgfk2W96eQSIbW/cdUKMuY=";
url = "https://downloads.cursor.com/lab/2025.11.25-d5b3271/darwin/arm64/agent-cli-package.tar.gz";
hash = "sha256-IOb37qUv9R/ZfH5ooThZmFbWxl592Zv8F7bAifsWvjk=";
};
};
in
stdenv.mkDerivation {
pname = "cursor-cli";
version = "0-unstable-2025-11-06";
version = "0-unstable-2025-11-25";
src = sources.${hostPlatform.system};
+3 -3
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "deck";
version = "1.53.2";
version = "1.54.0";
src = fetchFromGitHub {
owner = "Kong";
repo = "deck";
tag = "v${version}";
hash = "sha256-txALVamKm1ADwSsSNei04LNqKr5lkEYB4OyxpjvMk90=";
hash = "sha256-DVj4VHmU3yORL4zytWzXIPEjrS1P+WLE18Vdcdbibos=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule rec {
];
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-eg9Ks3IGNzGIanY3jsGtAPb/iYYDitskt0slaX8b+qs=";
vendorHash = "sha256-x+nL+bnwXio/z3XFC9A9G9T7mtB5BsnNgLWT54OJLCE=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd deck \
+2 -2
View File
@@ -11,13 +11,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "distrobox";
version = "1.8.2.0";
version = "1.8.2.2";
src = fetchFromGitHub {
owner = "89luca89";
repo = "distrobox";
tag = finalAttrs.version;
hash = "sha256-uwJD7HsWoQ/LxYL0mSSxMni676qqEnMHndpL01M5ySE=";
hash = "sha256-g7GbMJeUfDf3FIM2K7rk0X9SNyUMV0A3fSP1J5F44oo=";
};
dontConfigure = true;
+3 -3
View File
@@ -9,17 +9,17 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "dooit";
version = "3.3.3";
version = "3.3.4";
pyproject = true;
src = fetchFromGitHub {
owner = "dooit-org";
repo = "dooit";
tag = "v${version}";
hash = "sha256-MWdih+j7spUVEWXCBzF2J/FVXK0TQ8VhrJNDhNfxpQE=";
hash = "sha256-A3l+E9B2fWyNpDzMr8WRiiHD/fIcUzcIwtmur+2Mk0k=";
};
build-system = with python3.pkgs; [ poetry-core ];
build-system = with python3.pkgs; [ hatchling ];
pythonRelaxDeps = [
"tzlocal"
@@ -1,7 +1,7 @@
{ mkDprintPlugin }:
mkDprintPlugin {
description = "Biome (JS/TS) wrapper plugin";
hash = "sha256-V8lXwGRWGvl/g2kjqL8Ei1N7V0nuTP2WcLFWJvC7D+A=";
hash = "sha256-HYbQ0lyOe91AI2In9YZ6SXNzgEmgYHBvgtU/iVq+Gvc=";
initConfig = {
configExcludes = [ "**/node_modules" ];
configKey = "biome";
@@ -16,6 +16,6 @@ mkDprintPlugin {
};
pname = "dprint-plugin-biome";
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
url = "https://plugins.dprint.dev/biome-0.11.6.wasm";
version = "0.11.6";
url = "https://plugins.dprint.dev/biome-0.11.7.wasm";
version = "0.11.7";
}
+2 -2
View File
@@ -61,13 +61,13 @@ in
stdenv.mkDerivation rec {
pname = "easyeffects";
version = "8.0.4";
version = "8.0.5";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
tag = "v${version}";
hash = "sha256-K2oPY38SF8Xkg6uAh1xi8T380EwM7AWKDmLeYU0p2SQ=";
hash = "sha256-LBF8P512XeawlSgOz6AV03Q3ZGTwn+Gnqwh0xU0WEz4=";
};
patches = [ ./qmlmodule-fix.patch ];
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "Recommends instance types based on resource criteria like vcpus and memory";
homepage = "https://github.com/aws/amazon-ec2-instance-selector";
changelog = "https://github.com/aws/amazon-ec2-instance-selector/tags/v${finalAttrs.version}";
changelog = "https://github.com/aws/amazon-ec2-instance-selector/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ wcarlsen ];
mainProgram = "ec2-instance-selector";
@@ -1,24 +0,0 @@
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
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Signed-off-by: Luke Granger-Brown <git@lukegb.com>
---
bazel/dependency_imports.bzl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
index ecfe356b3f9c44dbc00877e57b72a675e9e5baf0..10be4b0b3f65e486c1dc8419337a5cf823431774 100644
--- a/bazel/dependency_imports.bzl
+++ b/bazel/dependency_imports.bzl
@@ -24,7 +24,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set")
# go version for rules_go
-GO_VERSION = "1.24.6"
+GO_VERSION = "host"
JQ_VERSION = "1.7"
YQ_VERSION = "4.24.4"
@@ -13,10 +13,11 @@ diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
index 10be4b0b3f65e486c1dc8419337a5cf823431774..b0badb3ccab3b112043bd8616770f8014238d396 100644
--- a/bazel/dependency_imports.bzl
+++ b/bazel/dependency_imports.bzl
@@ -38,7 +38,11 @@ def envoy_dependency_imports(
@@ -40,7 +40,11 @@ def envoy_dependency_imports(
yq_version = YQ_VERSION,
buf_sha = BUF_SHA,
buf_version = BUF_VERSION):
compatibility_proxy_repo()
- rules_foreign_cc_dependencies()
+ rules_foreign_cc_dependencies(
+ register_default_tools=False, # no prebuilt toolchains
+10 -10
View File
@@ -12,7 +12,6 @@
rustPlatform,
cmake,
gn,
go_1_24,
openjdk11_headless,
ninja,
patchelf,
@@ -39,9 +38,9 @@ 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.35.2";
rev = "2c2cd7efd119a5c9028b68a97d88a540248f8d18";
hash = "sha256-HhjIewZMOr9hzcnFPIckfK5PIozqdypSdmYgvb7ccds=";
version = "1.36.2";
rev = "dc2d3098ae5641555f15c71d5bb5ce0060a8015c";
hash = "sha256-ll7gn3y2dUW3kMtbUTjfi7ZTviE87S30ptiRlCPec9Q=";
};
# these need to be updated for any changes to fetchAttrs
@@ -50,8 +49,8 @@ let
depsHash
else
{
x86_64-linux = "sha256-xBSSDxvp6VjZt+Fc62/eP5Z2WWfpkAGl1Z+PupyDpg4=";
aarch64-linux = "sha256-2g8x12zkyZyjkv5NubG4bVmiLiN8uoEZ33e6Azd1guw=";
x86_64-linux = "sha256-AqXGk6IZ85TFNO7v8KFJOe8Caf1x4xQh/VuhaUq9rB4=";
aarch64-linux = "sha256-l70j1UcVNHGrzzvcqdeLDJUuaLkoLNM2yWCHKY4EShs=";
}
.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
@@ -76,9 +75,6 @@ buildBazelPackage rec {
# 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
@@ -124,7 +120,6 @@ buildBazelPackage rec {
cmake
python3
gn
go_1_24
jdk
ninja
patchelf
@@ -178,6 +173,10 @@ buildBazelPackage rec {
rm -r $bazelOut/external/local_jdk
rm -r $bazelOut/external/bazel_gazelle_go_repository_tools/bin
# CMake 4.1 drops compatibility with <3.5; bump libevent's floor to avoid configure failure.
sed -i 's/cmake_minimum_required(VERSION 3\\.1.2 FATAL_ERROR)/cmake_minimum_required(VERSION 3.5 FATAL_ERROR)/' \
$bazelOut/external/com_github_libevent_libevent/CMakeLists.txt
# Remove compiled python
find $bazelOut -name '*.pyc' -delete
@@ -200,6 +199,7 @@ buildBazelPackage rec {
dontUseNinjaInstall = true;
bazel = null;
preConfigure = ''
export CMAKE_POLICY_VERSION_MINIMUM=3.5
echo "common --repository_cache=\"$bazelOut/external/repository_cache\"" >> .bazelrc
echo "common --repository_disable_download" >> .bazelrc
+1 -1
View File
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Advanced cross-platform rhythm game focused on keyboard play";
homepage = "https://etternaonline.com";
changelog = "https://github.com/etternagame/etterna/release/tag/v${finalAttrs.version}";
changelog = "https://github.com/etternagame/etterna/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ alikindsys ];
mainProgram = "etterna";
+3 -3
View File
@@ -12,13 +12,13 @@
buildGoModule rec {
pname = "fastly";
version = "13.0.0";
version = "13.1.0";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
tag = "v${version}";
hash = "sha256-7GrdwLEjs1KOm5AGXMy1MtfD4RfbhX4Y/5Sqs0ttYKU=";
hash = "sha256-42QWj9I5XxyaoE/F4JpKRMcBNLhtT1LiP6fJo7Fih2g=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,
@@ -35,7 +35,7 @@ buildGoModule rec {
"cmd/fastly"
];
vendorHash = "sha256-lHAZPfm3VcYl1M1CYe2j6r9pZCTzN8b0bTN5z7guoiA=";
vendorHash = "sha256-cf+9PXGzNWuRVGlpY2rtq9/QMsGs/+pg4H1Qb+Q6HNU=";
nativeBuildInputs = [
installShellFiles
+3 -3
View File
@@ -6,10 +6,10 @@
let
pname = "fflogs";
version = "8.17.85";
version = "8.17.101";
src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
hash = "sha256-vI2WI9CeupQf96GxW89D8Z8R/h1hB5Rfib2A+4Yd6zc=";
hash = "sha256-yCnFN46/vHrQA8KkaoWQUBCOZ1+6Oa4UkdUhCghGByo=";
};
extracted = appimageTools.extractType2 { inherit pname version src; };
in
@@ -21,7 +21,7 @@ appimageTools.wrapType2 {
cp -r ${extracted}/usr/share/icons $out/share/
chmod -R +w $out/share/
test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294
cp ${extracted}/fflogs.desktop $out/share/applications/
cp ${extracted}/'FF Logs Uploader.desktop' $out/share/applications/fflogs.desktop
sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop
'';
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ffsubsync";
version = "0.4.30";
version = "0.4.31";
pyproject = true;
src = fetchFromGitHub {
owner = "smacke";
repo = "ffsubsync";
tag = version;
hash = "sha256-Px4WaeFn6SS6VUsm0bAKmdVtqQzXX12PRKO1n6UNxdM=";
hash = "sha256-j9E4h2de2EOtYpuxKFbPOxZ5FBRO0EkbZhJdx5RiPn8=";
};
build-system = with python3.pkgs; [ setuptools ];
+55
View File
@@ -0,0 +1,55 @@
{
lib,
stdenv,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fut";
version = "3.2.13";
src = fetchFromGitHub {
owner = "fusionlanguage";
repo = "fut";
tag = "fut-${finalAttrs.version}";
hash = "sha256-raYlY3HDL5+lv68IRVUXrpypmXfDkgWzHv/qZVECFhs=";
};
buildPhase = ''
runHook preBuild
make
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp fut $out/bin/
runHook postInstall
'';
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = false;
passthru.updateScript = nix-update-script { };
meta = {
description = "Fusion programming language";
longDescription = ''
Fusion is a programming language designed for implementing reusable components (libraries) for C, C++, C#, D, Java, JavaScript, Python, Swift, TypeScript and OpenCL C, all from a single codebase.
'';
homepage = "https://fusion-lang.org";
changelog = "https://github.com/fusionlanguage/fut/releases/tag/fut-${finalAttrs.version}";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ chillcicada ];
mainProgram = "fut";
};
})
+1 -1
View File
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
hash = "sha256-F7yYZgCBMmRX1yYWC60RRtIw/ObDcbUcwY0yF4Ikagg=";
hash = "sha256-gf0KFCjtnDGwD9Y/t/usozflzLzDXp+HvYNYsd0iYiI=";
};
sourceRoot = ".";
+1 -1
View File
@@ -13,7 +13,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
hash = "sha256-LwFialu3vQehcGVleuCSmDrrsw7b0uTxuAFhSwdE9jQ=";
hash = "sha256-4bXY1oKPuVOrsLuPST+9kV5TXIhoNZ3gmNSDRGcrVM0=";
}
else
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
+1 -1
View File
@@ -4,7 +4,7 @@
callPackage,
}:
let
version = "5.5.245";
version = "5.5.247";
pname = "gdevelop";
meta = {
description = "Graphical Game Development Studio";
+3 -3
View File
@@ -13,16 +13,16 @@
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
version = "0.17.1";
version = "0.18.4";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-zfORrAMVozHiUawWiy3TMT+pjEaRJ/DrHeDFPJiCp38=";
hash = "sha256-TSHL3X+p74yFGTNFk9r4r+nnul2etgVdXxy8x9BjsRg=";
};
npmDepsHash = "sha256-dKaKRuHzvNJgi8LP4kKsb68O5k2MTqblQ+7cjYqLqs0=";
npmDepsHash = "sha256-2Z6YrmUHlYKRU3pR0ZGwQbBgzNFqakBB6LYZqf66nSs=";
nativeBuildInputs = [
jq
+2 -2
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gemmi";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
owner = "project-gemmi";
repo = "gemmi";
tag = "v${finalAttrs.version}";
hash = "sha256-T7vmQEP7+3yNkQ7l36xbeLJsm5eYZvt7oRq/ksy6zQU=";
hash = "sha256-0MAY3mNHTv0ydtoVcJQKbOcSxCTvzH5S/5O82PjumKE=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -11,13 +11,13 @@
buildNpmPackage rec {
pname = "ghostfolio";
version = "2.218.0";
version = "2.219.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = version;
hash = "sha256-r/C/P+tdfaTLe0yCa5XPUg8O4NO9cHEF7EXzyfpkpD8=";
hash = "sha256-WXBKUvwfllH6HQFgUBcUSaaHqhMrWU3V969ZtJ9y7KQ=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
'';
};
npmDepsHash = "sha256-EMLQUZaL6u5jsOgBa67bivUHItJo8JeGZLbIq6tJdgE=";
npmDepsHash = "sha256-Xn+8+CHgCQ6Zh2/HUbl1xW8LkIypCfHAFzflc6vIeKQ=";
nativeBuildInputs = [
prisma
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gitlogue";
version = "0.3.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "unhappychoice";
repo = "gitlogue";
tag = "v${finalAttrs.version}";
hash = "sha256-IKCjv33I6bM5PSp1IBXEArHgNF1hV9J+Zko0uV2OPZA=";
hash = "sha256-SkdyOEMN4neW/KHf5nuBh3e5CJ2Vrul/1ydOhpK1Rdg=";
};
cargoHash = "sha256-j8h+EI+vOf8nN69ROFiwuUBRi84T/QdhbdMpAMupkoM=";
cargoHash = "sha256-RIs7pf+S01nupYzOIferlh+c/NuNHgBTspx+9MGl33g=";
nativeBuildInputs = [ pkg-config ];
+1 -1
View File
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Language server for the Gleam programming language";
homepage = "https://github.com/maurobalbi/glas";
changelog = "https://github.com/maurobalbi/glas/tag/v${version}";
changelog = "https://github.com/maurobalbi/glas/releases/tag/v${version}";
license = with lib.licenses; [
asl20
mit
+3 -3
View File
@@ -25,17 +25,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "glycin-loaders";
version = "2.0.5";
version = "2.0.7";
src = fetchurl {
url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
hash = "sha256-hK431LVux1WH/TtDs00Jw64T9sBu2LKWobOyCgGOf80=";
hash = "sha256-xBasKbbT7NxnuQwVU3uhKTzrevlvoQHK5nt9HTflCrA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
name = "glycin-loaders-deps-${finalAttrs.version}";
hash = "sha256-U5Ro3ahrYK+B+82bchkdoXR4BwtCBn18oKcqeXl39ag=";
hash = "sha256-UVVVjMt4vWkLob0H/MxIaW6rkBSFImu+5dezaCnc3Q8=";
dontConfigure = true;
};
@@ -76,11 +76,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-control-center";
version = "49.2.1";
version = "49.2.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
hash = "sha256-T6tOmdR+Q8CoJ9/SRA2QjKX/JrwDxpcqy42cAWTOB2Q=";
hash = "sha256-wjriINbBI30oWSXeeAHg42M4ucwai7UcLjfnFea1A60=";
};
patches = [
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "goimapnotify";
version = "2.5.3";
version = "2.5.4";
src = fetchFromGitLab {
owner = "shackra";
repo = "goimapnotify";
tag = version;
hash = "sha256-sA2fXk7/xnPl8ogrF00fiRCZvhFoHWjNlugL6gTGHk0=";
hash = "sha256-6hsepgXdG+BSSKTVics2459qUxYPIHKNqm2yq8UJXks=";
};
vendorHash = "sha256-5cZzaCoOR1R7iST0q3GaJbYIbKKEigeWqhp87maOL04=";
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "gonzo";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "control-theory";
repo = "gonzo";
tag = "v${finalAttrs.version}";
hash = "sha256-P8Ntt8Dj5zq+Ff5MkZEvWabk2w5Cm6tXxl3ssMxDNok=";
hash = "sha256-NoZDSKdFb805WjtXLwA8/bnbTdJgnCtFxk6FqbuEo/0=";
};
vendorHash = "sha256-XKwtq8EF774lHLHtyFzveFa5agJa15CvhsuwwaQdJwU=";
+1 -1
View File
@@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "Tool designed to simplify interaction with Grafana instances";
homepage = "https://github.com/grafana/grafanactl";
changelog = "https://github.com/grafana/grafanactl/tags/v${finalAttrs.version}";
changelog = "https://github.com/grafana/grafanactl/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ wcarlsen ];
mainProgram = "grafanactl";
+10 -4
View File
@@ -3,16 +3,17 @@
rustPlatform,
fetchFromGitHub,
nix-update-script,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "harper";
version = "0.71.0";
src = fetchFromGitHub {
owner = "Automattic";
repo = "harper";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-Hf086Ub0nVGET4qELDMddOErGAhK8B6ohbI5JhnU6z8=";
};
@@ -22,10 +23,15 @@ rustPlatform.buildRustPackage rec {
passthru.updateScript = nix-update-script { };
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = {
description = "Grammar Checker for Developers";
homepage = "https://github.com/Automattic/harper";
changelog = "https://github.com/Automattic/harper/releases/tag/v${version}";
changelog = "https://github.com/Automattic/harper/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
pbsds
@@ -34,4 +40,4 @@ rustPlatform.buildRustPackage rec {
];
mainProgram = "harper-ls";
};
}
})
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hath-rust";
version = "1.14.0";
version = "1.14.1";
src = fetchFromGitHub {
owner = "james58899";
repo = "hath-rust";
tag = "v${finalAttrs.version}";
hash = "sha256-shixrhIl4bbZQrJea2Dx4bbeGXOaPvMKUHgHq+JfAWs=";
hash = "sha256-bo9MXMk/Dfa8cXjeWn14MF6rmVcWYes0WeVn1oC2y0k=";
};
cargoHash = "sha256-eoki+QXqBC26PC7qNlOLlgkXxc6Fsx7T4o9GIbAaO8Y=";
cargoHash = "sha256-4xty4nUs81nq2Ax7koFplHlscpG1Pdbd5zwd/lQwbmg=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
+3 -3
View File
@@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hl-log-viewer";
version = "0.32.2";
version = "0.32.3";
src = fetchFromGitHub {
owner = "pamburus";
repo = "hl";
tag = "v${finalAttrs.version}";
hash = "sha256-JG5+RpUc8UGYxSlEX0c+dcUU2fFuVEwz/duK94XYkOc=";
hash = "sha256-BYSVzLh/GGC5BK0Q2xyZ54AA6UUxmWNFj9mH8gGvLXQ=";
};
cargoHash = "sha256-dIUQVLjjlQGHrMgWUeFc3R/QJbddRG8wmZklUHQTaas=";
cargoHash = "sha256-F9C6OeU0lxVdollldL1PV/wTo5+3j+MGZg9lkJVVvFI=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -39,13 +39,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hmcl";
version = "3.7.6";
version = "3.8.1";
src = fetchurl {
# HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.
# See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28
url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";
hash = "sha256-bgZsQ/5CUeOkbahIV0hQSPHrYfK+EaAIV6uMZzpLOVM=";
hash = "sha256-mQ0iuIOVRETdueNbe5s9USbis6IB6n0eA2EzsMzyGng=";
};
# - HMCL prompts users to download prebuilt Terracotta binary for
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hyprutils";
version = "0.10.3";
version = "0.10.4";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprutils";
tag = "v${finalAttrs.version}";
hash = "sha256-Q4ZfdlEGQU2LJ/Dif0qzF88xgIkpD6/uRsGfxOpu9jc=";
hash = "sha256-XQLlR/QJWiRRWY+ohtOqfe0fDMMPl/UyQCcypfUtZiE=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -1,7 +1,7 @@
import ./generic.nix {
hash = "sha256-XJp0Loaj3FFygyiIkSaMl4T0KmkNt7xtyU4nz++6yHs=";
version = "6.18.0";
vendorHash = "sha256-ySNeO06x8FzCH29EHbO3/ASVNSXTviyeULFrVoQwxcw=";
hash = "sha256-TdJe/vnjSc5ZT5tgZQsQacCVfW5+TKd5cjQLOp8SuZg=";
version = "6.19.1";
vendorHash = "sha256-Dx/AsSvDL/cHS/nRV5invkxgBg4w8jvtZ20LK7tOW14=";
patches = [ ];
nixUpdateExtraArgs = [
"--override-filename=pkgs/by-name/in/incus/package.nix"
+2 -2
View File
@@ -13,14 +13,14 @@
python3Packages.buildPythonPackage rec {
pname = "iplookup-gtk";
version = "0.4.2";
version = "0.5.0";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "Bytezz";
repo = "IPLookup-gtk";
tag = "v${version}";
hash = "sha256-9v4v8LWTGHtQKtiJPZSDJyHMujnwRv7cyRtmdMDnyFo=";
hash = "sha256-pRTN91uwjYu3Li4NbDvJ6l9gikBnXj0j+ApMWpuLUTU=";
};
nativeBuildInputs = [
+10 -3
View File
@@ -1,4 +1,5 @@
{
stdenv,
lib,
fetchFromGitHub,
rustPlatform,
@@ -7,22 +8,28 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "iwe";
version = "0.0.33";
version = "0.0.56";
src = fetchFromGitHub {
owner = "iwe-org";
repo = "iwe";
tag = "iwe-v${finalAttrs.version}";
hash = "sha256-PjonpAyq6FPJs5mo4W3z9yIVU8auGGtTrK/GBxMcPbk=";
hash = "sha256-nEn2iR2/ROboalMAXJV4y8qZiN36QkaWin+sMLZSKMQ=";
};
cargoHash = "sha256-EfoDpa2hN9W2unci4rIi4gjlJV2NzdU77FbOW0OTu2c=";
cargoHash = "sha256-fi16wLc/ZQV2bJHiIo7HVP+IS8zuoJeQQ7kV0cJ9GZ8=";
cargoBuildFlags = [
"--package=iwe"
"--package=iwes"
];
postPatch = ''
substituteInPlace crates/iwe/tests/common/mod.rs --replace-fail \
'binary_path.push("target");' \
'binary_path.push("target/${stdenv.hostPlatform.rust.rustcTarget}");'
'';
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
doInstallCheck = true;
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "jotta-cli";
version = "0.17.132497";
version = "0.17.148769";
src = fetchzip {
url = "https://repo.jotta.us/archives/linux/amd64/jotta-cli-${version}_linux_amd64.tar.gz";
hash = "sha256-prhFFjywvffsZKcTIMJfsccA/TYrvpsn/+TpDtIdc98=";
hash = "sha256-uI5yYpyLa7gGg9eL1nG5MMwHZ2j2yH5/8n5sB/WgoQI=";
stripRoot = false;
};
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "jq-lsp";
version = "0.1.14";
version = "0.1.15";
src = fetchFromGitHub {
owner = "wader";
repo = "jq-lsp";
tag = "v${version}";
hash = "sha256-VWZZFa+mMFAbfHTrFqf5vEEqA20DiCz4VjX50mgTuzw=";
hash = "sha256-5z5CTamk13QL50Hof2XeQ02NqRWMh4cECDhD6egGcnE=";
};
vendorHash = "sha256-oiy80U6WmpG0lHl5yTF017gZbiB2cWuM+cQJB0bs+RU=";
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "karmor";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "kubearmor";
repo = "kubearmor-client";
rev = "v${version}";
hash = "sha256-coZYcLhY9KW1LsjRP7nJkjWW7lXZBO5Asgx0nSaVG9M=";
hash = "sha256-xOI6meI88GB5w19T9eSn+8dTnhrUxUCKHUBk/1EaDVI=";
};
vendorHash = "sha256-FL5WL44dsM0uPYXMNfYKRd37umId21rMGvj84rYTU3A=";
+3 -3
View File
@@ -7,15 +7,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "kibi";
version = "0.3.1";
version = "0.3.2";
cargoHash = "sha256-IF7pcatGJDcwTmBziB8hVWJkleoV+pXXRQnbYfQtBJE=";
cargoHash = "sha256-EOw4iE9MTZVL0vIgPHVr0dggtksS5b8IvrRykblF0vA=";
src = fetchFromGitHub {
owner = "ilai-deutel";
repo = "kibi";
tag = "v${finalAttrs.version}";
hash = "sha256-EXobpuVob4RD37LK0RlpCGXACfemm+e+JczYYPNDhrc=";
hash = "sha256-lakx3ZNj9HeLFdRVxYLUh8W6yHXpBXlguQjjFofWl/s=";
};
nativeBuildInputs = [ makeWrapper ];
+2 -2
View File
@@ -39,13 +39,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "koboldcpp";
version = "1.101.1";
version = "1.102.2";
src = fetchFromGitHub {
owner = "LostRuins";
repo = "koboldcpp";
tag = "v${finalAttrs.version}";
hash = "sha256-gPbvzbbgm13HjXISPY5hpcCgUejQ5OHkmMu2zCwm/sQ=";
hash = "sha256-0mZa5g6YK5dImoTOXIMyoc8zQkHh4ytOdH1cDOzUjZU=";
};
enableParallelBuilding = true;
+3 -3
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "kubelogin";
version = "1.34.2";
version = "1.35.0";
src = fetchFromGitHub {
owner = "int128";
repo = "kubelogin";
tag = "v${finalAttrs.version}";
hash = "sha256-Uk8zsOrX1mrOofl6pUCTPUye463fyCKDcK09IA6uwtw=";
hash = "sha256-POJY3r+8Fx9RUurShNADsin/LHZGvpB/4H6I9eG+4pQ=";
};
subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
"-X main.version=v${finalAttrs.version}"
];
vendorHash = "sha256-WZ7tJufvgclC6xKQNXmVcf0HAmqBH9bKSu3TFzWSYdI=";
vendorHash = "sha256-Bjge514SLWjRuoOhnI0OxSJm5utvfDB0hx77uYnGsgY=";
# test all packages
preCheck = ''
+15 -8
View File
@@ -4,11 +4,12 @@
fetchFromGitHub,
cmake,
curl,
pkg-config,
staticOnly ? stdenv.hostPlatform.isStatic,
}:
let
version = "1.12.0";
version = "1.13.0";
in
stdenv.mkDerivation {
pname = "libcpr";
@@ -23,16 +24,19 @@ stdenv.mkDerivation {
owner = "libcpr";
repo = "cpr";
rev = version;
hash = "sha256-OkOyh2ibt/jX/Dc+TB1uSlWtzEhdSQwHVN96oCOh2yM=";
hash = "sha256-qoNA88GL9Yv3r/7UsZduYXuyrQVxfFY/0P6RfLqT5Uw=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
pkg-config
];
propagatedBuildInputs = [ curl ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if staticOnly then "OFF" else "ON"}"
"-DCPR_USE_SYSTEM_CURL=ON"
(lib.cmakeBool "BUILD_SHARED_LIBS" (!staticOnly))
(lib.cmakeBool "CPR_USE_SYSTEM_CURL" true)
];
postPatch = ''
@@ -42,15 +46,18 @@ stdenv.mkDerivation {
postInstall = ''
substituteInPlace "$out/lib/cmake/cpr/cprTargets.cmake" \
--replace "_IMPORT_PREFIX \"$out\"" \
"_IMPORT_PREFIX \"$dev\""
--replace-fail "_IMPORT_PREFIX \"$out\"" \
"_IMPORT_PREFIX \"$dev\""
'';
meta = with lib; {
description = "C++ wrapper around libcurl";
homepage = "https://docs.libcpr.org/";
license = licenses.mit;
maintainers = with maintainers; [ rycee ];
maintainers = with maintainers; [
phodina
rycee
];
platforms = platforms.all;
};
}
+3 -3
View File
@@ -27,14 +27,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libglycin";
version = "2.0.5";
version = "2.0.7";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "glycin";
tag = finalAttrs.version;
hash = "sha256-RrklQ1+9v2iEIv0/gQLEyYV7ELazcm+vSn/6gyXA6mo=";
hash = "sha256-17ebdiLMuDJuuw8TBYWamyyDM4aZgtWRWEQhWGb/2mw=";
};
nativeBuildInputs = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-u1zHQwqrPT22Utl7Woah/JdKJSe65Q2Jc7cuh7b+R5Q=";
hash = "sha256-7x4Ts0wRFoxZ2u3AHVEey8g6+XWDpxM/hFZeomkojKU=";
};
buildInputs = [
+2 -2
View File
@@ -9,9 +9,9 @@
openssl,
sqlcipher,
boost,
cpr,
curl,
glib,
libcpr,
libsecret,
libmaddy-markdown,
testers,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
curl
cpr
libcpr
libsecret
libmaddy-markdown
sqlcipher
+95
View File
@@ -0,0 +1,95 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
pkg-config,
openssl,
onnxruntime,
versionCheckHook,
runCommand,
writeText,
testers,
nix-update-script,
magika-cli,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "magika-cli";
version = "1.0.1";
src = fetchFromGitHub {
owner = "google";
repo = "magika";
tag = "cli/v${finalAttrs.version}";
hash = "sha256-g/fnSdh2jpOHOLTuR4DUPB1kbC0eKADHLKcfB1q08XI=";
};
cargoHash = "sha256-uqnTyedry9nWyO2518r0D3hk6oWb4wQE/Ku0cOkSjBA=";
cargoRoot = "rust/cli";
buildAndTestSubdir = finalAttrs.cargoRoot;
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
onnxruntime
];
env = {
OPENSSL_NO_VENDOR = "true";
};
doInstallCheck = true;
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "--version";
passthru = {
tests = {
mime = testers.testEqualContents {
assertion = "magika detects the correct language from content even when the file extension is wrong";
# Magika does not support Nix files yet: https://github.com/google/magika/issues/1247
expected = writeText "expected" ''
application/x-rust
'';
actual =
runCommand "actual"
{
nativeBuildInputs = [
magika-cli
];
}
''
magika --format '%m' '${./test.md}' >>"$out"
'';
};
};
updateScript = nix-update-script {
extraArgs = [ "--version-regex=^cli/v([0-9.]+)$" ];
};
};
meta = {
description = "Determines file content types using AI";
homepage = "https://securityresearch.google/magika/";
downloadPage = "https://github.com/google/magika";
changelog = "https://github.com/google/magika/releases/tag/cli/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
kachick
];
mainProgram = "magika";
platforms = with lib.platforms; unix ++ windows;
# The package test fails on Darwin with this error, even though the build succeeds:
# libc++abi: terminating due to uncaught exception of type std::__1::system_error: mutex lock failed: Invalid argument
broken = stdenv.hostPlatform.isDarwin;
};
})
+3
View File
@@ -0,0 +1,3 @@
fn main() {
println!("This is a code example");
}
+4 -4
View File
@@ -1,6 +1,6 @@
{
version = "1.27.11";
hash = "sha256-0moTf5DEI+tw6Kx6/6cWzGdgem7rAfsj4iJg9I7Pjbk=";
npmDepsHash = "sha256-P9uTFeJ8ikK3Hp9bFt33mIzqp9duvMs1fYw1ErwXg1A=";
vendorHash = "sha256-MgxpoNj8Rv98AnqvWWewoFgvHWSD16MXLlkkVoQRGTE=";
version = "1.28.0";
hash = "sha256-9kvJr6haMe86pMakLkj3aKmA8IgYnJ+mV9Jtp4LsiSs=";
npmDepsHash = "sha256-ip+HMjAIGD47dzs9rrpMi8ZVyHlUpnf1KmjPgTILzYM=";
vendorHash = "sha256-n5/elG98ALYSXlW7TS+S8JI2Wpikk6X9Sl1J9FhbizY=";
}
+3 -3
View File
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "mainsail";
version = "2.14.0";
version = "2.15.0";
src = fetchFromGitHub {
owner = "mainsail-crew";
repo = "mainsail";
rev = "v${version}";
hash = "sha256-hZgENY1Vb0wr6fqQfodjXQ+a/JAca0AQFKHlTc4EG68=";
hash = "sha256-JmN5VPj4h83gLx/UsT69mXFxyvCHir0tl7zN2Q7eMOc=";
};
npmDepsHash = "sha256-9pkcQS281OC9q9WadctQ/GAgbaeejrj7HLwKK/SDkAU=";
npmDepsHash = "sha256-8rUhDo1l0oLENWwy56UzwlSGIBJtTPsH6w5OX8tnp6U=";
# Prevent Cypress binary download.
CYPRESS_INSTALL_BINARY = 0;
+3 -3
View File
@@ -11,19 +11,19 @@
python3.pkgs.buildPythonApplication rec {
pname = "migrate-to-uv";
version = "0.7.3";
version = "0.8.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mkniewallner";
repo = "migrate-to-uv";
tag = version;
hash = "sha256-hLcWZKY1wauGpcAn+tC4P1zvFid7QDVXUK24QSIJ4u0=";
hash = "sha256-l8YJVOWNtvN13fEZp6L0fwmUu12jV7xxQBp3Glr+Df4=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src pname version;
hash = "sha256-nyJ2UbdBcNX8mNpq447fM2QuscTdJwnjqP7AKBKv7kY=";
hash = "sha256-35BBfNz3h/KpchCcUnoHN46znkQ7UuhhliWdgCYPw20=";
};
build-system = [
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "mitra";
version = "4.13.1";
version = "4.14.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "silverpill";
repo = "mitra";
rev = "v${version}";
hash = "sha256-cfE+4rbM5B9+ojevkoxc1ZY3r0TY5aRV8/qhZ3h4/0A=";
hash = "sha256-LYtiavRgWEH9wFLfnS4xPuZmwSBatPbzDEc3qn2rrBM=";
};
cargoHash = "sha256-45vFKMPc73XBHCJISdab59HIkY3a0va8BGQMWsrhaZg=";
cargoHash = "sha256-NXPhc1c8JYjAPcQfVobOQten1czD77KLpBqwyEC3AuQ=";
# require running database
doCheck = false;
-37
View File
@@ -1,37 +0,0 @@
{
appimageTools,
lib,
fetchurl,
}:
let
pname = "neo4j-desktop";
version = "1.6.0";
src = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${pname}-${version}-x86_64.AppImage";
hash = "sha256-/ptMEU4BM5mPK4KWWRdor6N8gw3oaNgyzD0c4jI+3fI=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit pname version src;
extraPkgs = pkgs: [ pkgs.libsecret ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "GUI front-end for Neo4j";
homepage = "https://neo4j.com/";
license = licenses.unfree;
maintainers = [ maintainers.bobvanderlinden ];
platforms = [ "x86_64-linux" ];
mainProgram = "neo4j-desktop";
};
}

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