Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-01-10 00:18:09 +00:00
committed by GitHub
164 changed files with 1977 additions and 1492 deletions
+15 -11
View File
@@ -1,10 +1,10 @@
# zig.hook {#zig-hook}
# Zig {#zig}
[Zig](https://ziglang.org/) is a general-purpose programming language and toolchain for maintaining robust, optimal and reusable software.
In Nixpkgs, `zig.hook` overrides the default build, check and install phases.
In Nixpkgs, `zig` overrides the default build, check and install phases.
## Example code snippet {#zig-hook-example-code-snippet}
## Example code snippet {#zig-example-code-snippet}
```nix
{
@@ -16,7 +16,7 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases.
stdenv.mkDerivation {
# . . .
nativeBuildInputs = [ zig.hook ];
nativeBuildInputs = [ zig ];
zigBuildFlags = [ "-Dman-pages=true" ];
@@ -26,11 +26,11 @@ stdenv.mkDerivation {
}
```
## Variables controlling zig.hook {#zig-hook-variables-controlling}
## Variables controlling zig {#zig-variables-controlling}
### `zig.hook` Exclusive Variables {#zig-hook-exclusive-variables}
### `zig` Exclusive Variables {#zig-exclusive-variables}
The variables below are exclusive to `zig.hook`.
The variables below are exclusive to `zig`.
#### `dontUseZigBuild` {#dont-use-zig-build}
@@ -44,19 +44,23 @@ Disables using `zigCheckPhase`.
Disables using `zigInstallPhase`.
### Similar variables {#zig-hook-similar-variables}
#### `dontSetZigDefaultFlags` {#dont-set-zig-default-flags}
Disables using a set of default flags when performing zig builds.
### Similar variables {#zig-similar-variables}
The following variables are similar to their `stdenv.mkDerivation` counterparts.
| `zig.hook` Variable | `stdenv.mkDerivation` Counterpart |
| `zig` Variable | `stdenv.mkDerivation` Counterpart |
|---------------------|-----------------------------------|
| `zigBuildFlags` | `buildFlags` |
| `zigCheckFlags` | `checkFlags` |
| `zigInstallFlags` | `installFlags` |
### Variables honored by zig.hook {#zig-hook-variables-honored}
### Variables honored by zig {#zig-variables-honored}
The following variables commonly used by `stdenv.mkDerivation` are honored by `zig.hook`.
The following variables commonly used by `stdenv.mkDerivation` are honored by `zig`.
- `prefixKey`
- `dontAddPrefix`
+15 -6
View File
@@ -2713,16 +2713,20 @@
"waf-hook-honored-variables": [
"index.html#waf-hook-honored-variables"
],
"zig-hook": [
"zig": [
"index.html#zig",
"index.html#zig-hook"
],
"zig-hook-example-code-snippet": [
"zig-example-code-snippet": [
"index.html#zig-example-code-snippet",
"index.html#zig-hook-example-code-snippet"
],
"zig-hook-variables-controlling": [
"zig-variables-controlling": [
"index.html#zig-variables-controlling",
"index.html#zig-hook-variables-controlling"
],
"zig-hook-exclusive-variables": [
"zig-exclusive-variables": [
"index.html#zig-exclusive-variables",
"index.html#zig-hook-exclusive-variables"
],
"dont-use-zig-build": [
@@ -2734,10 +2738,15 @@
"dont-use-zig-install": [
"index.html#dont-use-zig-install"
],
"zig-hook-similar-variables": [
"dont-set-zig-default-flags": [
"index.html#dont-set-zig-default-flags"
],
"zig-similar-variables": [
"index.html#zig-similar-variables",
"index.html#zig-hook-similar-variables"
],
"zig-hook-variables-honored": [
"zig-variables-honored": [
"index.html#zig-variables-honored",
"index.html#zig-hook-variables-honored"
],
"xcbuildhook": [
+32 -19
View File
@@ -111,7 +111,7 @@
_0x5a4 = {
email = "bej86nug@hhu.de";
name = "0x5a4";
github = "0x5a4";
github = "einetuer";
githubId = 54070204;
};
_0xB10C = {
@@ -382,7 +382,7 @@
};
aaravrav = {
name = "aaravrav";
github = "aaravrav";
github = "Aarav";
githubId = 3279912;
};
aarnphm = {
@@ -610,7 +610,7 @@
name = "Adam Perkowski";
email = "me@adamperkowski.dev";
matrix = "@adam:matrix.system72.dev";
github = "adamperkowski";
github = "koibtw";
githubId = 75480869;
keys = [
{ fingerprint = "00F6 1623 FB56 BC5B B709 4E63 4CE6 C117 2DF6 BE79"; }
@@ -2049,7 +2049,7 @@
};
aprl = {
email = "aprl@acab.dev";
github = "CutestNekoAqua";
github = "aprilthepink";
githubId = 30842467;
name = "April John";
};
@@ -2157,7 +2157,7 @@
};
argrat = {
email = "n.bertazzo@protonmail.com";
github = "argo-v5";
github = "brtz-cs";
githubId = 98821629;
name = "Nicolò Bertazzo";
};
@@ -2326,7 +2326,7 @@
};
asauzeau = {
email = "antoine.sauzeau3@gmail.com";
github = "AntoineSauzeau";
github = "asauzeau";
githubId = 72159603;
name = "Antoine Sauzeau";
};
@@ -2906,7 +2906,7 @@
baileylu = {
name = "Luke Bailey";
email = "baileylu@tcd.ie";
github = "baileyluTCD";
github = "baileylu121";
githubId = 156000062;
};
baitinq = {
@@ -5325,7 +5325,7 @@
};
connerohnesorge = {
email = "conneroisu@outlook.com";
github = "conneroisu";
github = "connerohnesorge";
githubId = 88785126;
name = "Conner Ohnesorge";
};
@@ -6070,7 +6070,7 @@
};
davidarmstronglewis = {
email = "davidlewis@mac.com";
github = "oceanlewis";
github = "hazel-ocean";
githubId = 6754950;
name = "Ocean Armstrong Lewis";
};
@@ -6863,7 +6863,7 @@
};
dmvianna = {
email = "dmlvianna@gmail.com";
github = "dmvianna";
github = "pasunboneleve";
githubId = 1708810;
name = "Daniel Vianna";
};
@@ -9133,6 +9133,13 @@
githubId = 23723926;
name = "Dash R";
};
fulsomenko = {
email = "max.blomstervall@gmail.com";
github = "fulsomenko";
githubId = 14945057;
name = "Max Emil Yoon Blomstervall";
keys = [ { fingerprint = "D14A 78F2 AAC5 9A1B 3E1F 0547 044B 046E 5745 CC2B"; } ];
};
funkeleinhorn = {
email = "git@funkeleinhorn.com";
github = "funkeleinhorn";
@@ -11875,7 +11882,7 @@
jayesh-bhoot = {
name = "Jayesh Bhoot";
email = "jb@jayeshbhoot.com";
github = "jbhoot";
github = "bhootd";
githubId = 1915507;
};
jayman2000 = {
@@ -16217,7 +16224,7 @@
};
marsupialgutz = {
email = "mars@possums.xyz";
github = "pupbrained";
github = "skulldogged";
githubId = 33522919;
name = "Marshall Arruda";
};
@@ -18788,7 +18795,7 @@
};
nikitavoloboev = {
email = "nikita.voloboev@gmail.com";
github = "nikitavoloboev";
github = "nikivdev";
githubId = 6391776;
name = "Nikita Voloboev";
};
@@ -20355,7 +20362,7 @@
githubId = 6771175;
};
pedohorse = {
github = "pedohorse";
github = "permahorse";
githubId = 13556996;
name = "pedohorse";
};
@@ -22644,7 +22651,7 @@
};
robwalt = {
email = "robwalter96@gmail.com";
github = "robwalt";
github = "JasmineLowen";
githubId = 26892280;
name = "Robert Walter";
};
@@ -24242,7 +24249,7 @@
shreerammodi = {
name = "Shreeram Modi";
email = "shreerammodi10@gmail.com";
github = "shrimpram";
github = "shreerammodi";
githubId = 67710369;
keys = [ { fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; } ];
};
@@ -24977,7 +24984,7 @@
name = "Seraphim Pardee";
matrix = "@xsrp:matrix.org";
email = "me@srp.life";
github = "SeraphimRP";
github = "RdrSeraphim";
githubId = 8297347;
};
srv6d = {
@@ -25083,6 +25090,12 @@
github = "stasjok";
githubId = 1353637;
};
staticdev = {
email = "staticdev-support@proton.me";
github = "staticdev";
githubId = 1446633;
name = "Thiago A.";
};
StayBlue = {
name = "StayBlue";
email = "blue@spook.rip";
@@ -29179,7 +29192,7 @@
keys = [ { fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; } ];
};
yusuf-duran = {
github = "yusuf-duran";
github = "postgnostic";
githubId = 37774475;
name = "Yusuf Duran";
};
@@ -29456,7 +29469,7 @@
ziguana = {
name = "Zig Uana";
email = "git@ziguana.dev";
github = "nomadic-stare";
github = "Jingles52";
githubId = 45833444;
};
zimbatm = {
+47 -14
View File
@@ -32,15 +32,15 @@ in
default = { };
example = {
"application/pdf" = "firefox.desktop";
"text/xml" = [
"text/*" = [
"nvim.desktop"
"codium.desktop"
];
};
description = ''
Adds associations between mimetypes and applications. See the
[
specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information.
[specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information.
Globs in all variations are supported.
'';
};
@@ -49,15 +49,15 @@ in
default = { };
example = {
"application/pdf" = "firefox.desktop";
"image/png" = [
"image/*" = [
"sxiv.desktop"
"gimp.desktop"
];
};
description = ''
Sets the default applications for given mimetypes. See the
[
specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/default) for more information.
[specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/default) for more information.
Globs in all variations are supported.
'';
};
@@ -65,7 +65,7 @@ in
type = associationOptions;
default = { };
example = {
"audio/mp3" = [
"audio/*" = [
"mpv.desktop"
"umpv.desktop"
];
@@ -73,22 +73,55 @@ in
};
description = ''
Removes associations between mimetypes and applications. See the
[
specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information.
[specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information.
Globs in all variations are supported.
'';
};
};
config = lib.mkIf cfg.enable {
environment.etc."xdg/mimeapps.list" =
let
generateMimeScript =
title: attrs:
lib.optionalString (attrs != { }) ''
echo "[${title}]" >> $out
''
+ (lib.concatStringsSep "\n" (
lib.attrValues (
lib.mapAttrs (
k: v: ''generateMimeItem "${k}" "${if lib.isList v then lib.concatStringsSep ";" v else v}"''
) attrs
)
));
in
lib.mkIf
(cfg.addedAssociations != { } || cfg.defaultApplications != { } || cfg.removedAssociations != { })
{
text = lib.generators.toINI { } {
"Added Associations" = cfg.addedAssociations;
"Default Applications" = cfg.defaultApplications;
"Removed Associations" = cfg.removedAssociations;
};
source = pkgs.runCommandLocal "mimeapps.list" { } ''
function generateMimeItem() {
mime=$1
app=$2
if [[ $mime == *"*"* ]]; then
while read line; do
if [[ $line == $mime ]]; then
echo "$line=$app" >> $out
fi
done < ${pkgs.shared-mime-info}/share/mime/types
else
echo "$mime=$app" >> $out
fi
}
${lib.concatStringsSep "\n" (
lib.attrValues (
lib.mapAttrs generateMimeScript {
"Added Associations" = cfg.addedAssociations;
"Default Applications" = cfg.defaultApplications;
"Removed Associations" = cfg.removedAssociations;
}
)
)}
'';
};
environment.pathsToLink = [ "/share/mime" ];
+1 -1
View File
@@ -9,7 +9,7 @@ let
in
{
options.hardware.xpad-noone = {
enable = lib.mkEnableOption "The Xpad driver from the Linux kernel with support for Xbox One controllers removed";
enable = lib.mkEnableOption "the Xpad driver from the Linux kernel with support for Xbox One controllers removed";
};
config = lib.mkIf cfg.enable {
+27 -13
View File
@@ -846,19 +846,33 @@ in
environment.etc =
lib.genAttrs
(map (file: "zfs/zed.d/${file}") [
"all-syslog.sh"
"pool_import-led.sh"
"resilver_finish-start-scrub.sh"
"statechange-led.sh"
"vdev_attach-led.sh"
"zed-functions.sh"
"data-notify.sh"
"resilver_finish-notify.sh"
"scrub_finish-notify.sh"
"statechange-notify.sh"
"vdev_clear-led.sh"
])
(map (file: "zfs/zed.d/${file}") (
[
"all-syslog.sh"
"data-notify.sh"
"history_event-zfs-list-cacher.sh"
"resilver_finish-notify.sh"
"resilver_finish-start-scrub.sh"
"scrub_finish-notify.sh"
"statechange-notify.sh"
]
++ lib.optionals (lib.versionOlder cfgZfs.package.version "2.4") [
"deadman-slot_off.sh"
"pool_import-led.sh"
"statechange-led.sh"
"statechange-slot_off.sh"
"vdev_attach-led.sh"
"vdev_clear-led.sh"
]
++ lib.optionals (lib.versionAtLeast cfgZfs.package.version "2.4") [
"deadman-sync-slot_off.sh"
"pool_import-sync-led.sh"
"statechange-sync-led.sh"
"statechange-sync-slot_off.sh"
"vdev_attach-sync-led.sh"
"vdev_clear-sync-led.sh"
]
))
(file: {
source = "${cfgZfs.package}/etc/${file}";
})
@@ -62,11 +62,10 @@ lib.makeOverridable mkDerivation (
mainProgram = pname;
};
# FIXME: Do not use meta attributes, see README (`TODO` section)
desktopItem = makeDesktopItem {
name = pname;
exec = pname;
comment = lib.replaceStrings [ "\n" ] [ " " ] meta.longDescription;
comment = lib.trim (lib.replaceString "\n" " " meta.longDescription);
desktopName = product;
genericName = meta.description;
categories = [ "Development" ];
@@ -68,7 +68,7 @@ in
xz
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/clion/";
description = "C/C++ IDE from JetBrains";
@@ -45,11 +45,14 @@ mkJetBrainsProduct {
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/datagrip/";
description = "Database IDE from JetBrains";
longDescription = "DataGrip is a new IDE from JetBrains built for database admins. It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more.";
longDescription = ''
DataGrip is an IDE from JetBrains built for database admins.
It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more.
'';
maintainers = [ ];
license = lib.licenses.unfree;
sourceProvenance =
@@ -55,11 +55,14 @@ mkJetBrainsProduct {
'')
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/dataspell/";
description = "Data science IDE from JetBrains";
longDescription = "DataSpell is a new IDE from JetBrains built for Data Scientists. Mainly it integrates Jupyter notebooks in the IntelliJ platform.";
longDescription = ''
DataSpell is an IDE from JetBrains built for Data Scientists.
Mainly it integrates Jupyter notebooks in the IntelliJ platform.
'';
maintainers = with lib.maintainers; [ leona ];
license = lib.licenses.unfree;
sourceProvenance =
@@ -50,11 +50,11 @@ mkJetBrainsProduct {
libgcc
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/remote-development/gateway/";
description = "Remote development for JetBrains products";
longDescription = "JetBrains Gateway is a lightweight launcher that connects a remote server with your local machine, downloads necessary components on the backend, and opens your project in JetBrains Client.";
longDescription = "JetBrains Gateway is a lightweight launcher that connects a remote server with your local machine and opens your project in JetBrains Client.";
maintainers = [ ];
license = lib.licenses.unfree;
sourceProvenance =
@@ -53,12 +53,14 @@ in
libgcc
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/go/";
description = "Go IDE from JetBrains";
longDescription = "Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development.
The new IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language";
longDescription = ''
Goland is a commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development.
The IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language.
'';
maintainers = with lib.maintainers; [ tymscar ];
license = lib.licenses.unfree;
sourceProvenance =
@@ -57,11 +57,14 @@ mkJetBrainsProduct {
''--set M2 "${maven}/maven/bin"''
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/idea/";
description = "Free Java, Kotlin, Groovy and Scala IDE from Jetbrains (built from source)";
longDescription = "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.";
description = "Free Java, Kotlin, Groovy and Scala IDE from JetBrains (built from source)";
longDescription = ''
IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven.
Also known as IntelliJ.
'';
maintainers = with lib.maintainers; [
gytis-ivaskevicius
tymscar
@@ -60,11 +60,14 @@ mkJetBrainsProduct {
musl
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/idea/";
description = "Java, Kotlin, Groovy and Scala IDE from Jetbrains";
longDescription = "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.";
description = "Java, Kotlin, Groovy and Scala IDE from JetBrains";
longDescription = ''
IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven.
Also known as IntelliJ.
'';
maintainers = with lib.maintainers; [
gytis-ivaskevicius
tymscar
@@ -45,7 +45,7 @@ mkJetBrainsProduct {
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/mps/";
description = "IDE for building domain-specific languages from JetBrains";
@@ -49,11 +49,11 @@ mkJetBrainsProduct {
musl
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/phpstorm/";
description = "PHP IDE from JetBrains";
longDescription = "PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ";
longDescription = "PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code.";
maintainers = with lib.maintainers; [
dritter
tymscar
@@ -50,11 +50,15 @@ in
product = "PyCharm Open Source";
productShort = "PyCharm";
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/pycharm/";
description = "Free Python IDE from JetBrains (built from source)";
longDescription = "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!";
longDescription = ''
Python IDE with complete set of tools for productive development with Python programming language.
In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine.
It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing and powerful Debugger.
'';
maintainers = with lib.maintainers; [
genericnerdyusername
tymscar
@@ -38,7 +38,6 @@ in
wmClass = "jetbrains-pycharm";
product = "PyCharm";
productShort = "PyCharm";
# update-script-start: version
version = "2025.3.1";
@@ -51,11 +50,15 @@ in
musl
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/pycharm/";
description = "Python IDE from JetBrains";
longDescription = "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!";
longDescription = ''
Python IDE with complete set of tools for productive development with Python programming language.
In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine.
It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing and powerful Debugger.
'';
maintainers = with lib.maintainers; [
genericnerdyusername
tymscar
@@ -78,11 +78,15 @@ in
libX11
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/rider/";
description = ".NET IDE from JetBrains";
longDescription = "JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. Rider supports .NET Core, .NET Framework and Mono based projects. This lets you develop a wide array of applications including .NET desktop apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications.";
longDescription = ''
JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper.
Rider supports .NET Core, .NET Framework and Mono based projects.
This lets you develop a wide array of applications including .NET desktop apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications.
'';
maintainers = with lib.maintainers; [ raphaelr ];
license = lib.licenses.unfree;
sourceProvenance =
@@ -49,7 +49,7 @@ mkJetBrainsProduct {
musl
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/ruby/";
description = "Ruby IDE from JetBrains";
@@ -63,7 +63,7 @@ in
xz
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/rust/";
description = "Rust IDE from JetBrains";
@@ -49,7 +49,7 @@ mkJetBrainsProduct {
musl
];
# NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README)
# NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed
meta = {
homepage = "https://www.jetbrains.com/webstorm/";
description = "Web IDE from JetBrains";
@@ -56,8 +56,6 @@ Any comments or other manual changes between these markers will be removed when
- Add it to `default.nix`
### TODO:
- remove the usage of `meta.` properties for building the Linux desktop files
(JetBrains already provides their own Desktop files, we can just use those probably?)
- drop the community IDEs
- Switch `mkJetbrainsProduct` to use `lib.extendMkDerivation`, see also:
- https://github.com/NixOS/nixpkgs/pull/475183#discussion_r2655305961
@@ -1965,8 +1965,8 @@ let
mktplcRef = {
name = "gitlab-workflow";
publisher = "gitlab";
version = "6.62.1";
hash = "sha256-Sbtrmla1vRZ7isSvr5QhDiP519/IG/VJ5zI9Y28UFx4=";
version = "6.64.1";
hash = "sha256-kJqn7xNI6DF10h+CemsO0E80oJBifMdKKxpKJ3Y6PJ4=";
};
meta = {
description = "GitLab extension for Visual Studio Code";
@@ -3196,8 +3196,8 @@ let
mktplcRef = {
name = "vscode-kubernetes-tools";
publisher = "ms-kubernetes-tools";
version = "1.3.28";
hash = "sha256-5O0WxTuAIDeTk2/YospejjvHWVkCcMvVwiVYQWQYZKc=";
version = "1.3.29";
hash = "sha256-FzNVg925O76GTmc/14W/IjC5VLkKoRIlK1p/b+xRsiw=";
};
meta = {
license = lib.licenses.mit;
@@ -3854,8 +3854,8 @@ let
mktplcRef = {
publisher = "redhat";
name = "java";
version = "1.50.0";
hash = "sha256-QF9CTfhhwq+Ld3M31VRaZaAUsBDiUTNdbbOwjlE66Zk=";
version = "1.51.0";
hash = "sha256-uOTvQjLDkMjzTfc98cq+WlvKwRQfPpTrlXKbWG7Gy+c=";
};
buildInputs = [ jdk ];
meta = {
@@ -5048,8 +5048,8 @@ let
mktplcRef = {
name = "vscode-gradle";
publisher = "vscjava";
version = "3.17.1";
hash = "sha256-3AGa1S6WN7zVaKxjHVba+CjXhEq8PjTD5HU5WY9pF4c=";
version = "3.17.2";
hash = "sha256-oBtUDkuGMu7/CvxiHxvbiHHTQ2dG85VY08es9u3xKJk=";
};
meta = {
+3 -3
View File
@@ -144,9 +144,9 @@ rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "10.19";
version = "10.20";
url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
hash = "sha256-fOxYMjxvKq7nrKk1Fzecu/75biwsWAxo/4XdAAy73UY=";
hash = "sha256-gbShU5WPYkf+UEHV32Xq3Lvuoba6jNok6349fOLR/jw=";
patches = [
# Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -156,7 +156,7 @@ rec {
# see https://gitlab.winehq.org/wine/wine-staging
staging = fetchFromGitLab {
inherit version;
hash = "sha256-GmHeqHZPnFZkntMOJJzRDUN9H+G1qXdacy/Al6T5eZU=";
hash = "sha256-Ys0VNYj568qMHq56ZCprnsbpb/iqtiDlU3w0er8Ol5g=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine-staging";
@@ -7,6 +7,7 @@
openjdk17-bootstrap,
jdk11,
jdk8,
writeScript,
}:
let
@@ -16,6 +17,7 @@ let
hash,
platform ? "",
jdk,
updateScript ? null,
...
}@attrs:
let
@@ -83,21 +85,34 @@ let
maintainers = with lib.maintainers; [
kalbasit
kashw2
Misaka13514
];
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.unfree;
platforms = lib.platforms.unix;
};
passthru.updateScript = updateScript;
};
in
{
charles5 = (
generic {
version = "5.0";
hash = "sha256-gvspRI3uF7bjE4UBuTGS5+n2h0nKudLtW3sqs2GZIyM=";
version = "5.0.3";
hash = "sha256-SiZ15ekuAW7AyXBHN5Zel4ZFL/4oNy1td64NQ0GNUhE=";
platform = "_x86_64";
jdk = openjdk17-bootstrap;
updateScript = writeScript "update-charles" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnugrep common-updater-scripts
set -eu -o pipefail
version=$(curl -A "Mozilla/5.0" -s https://www.charlesproxy.com/download/ | grep -oP 'Version \K[0-9.]+' | head -n1)
update-source-version charles5 "$version"
'';
}
);
charles4 = (
@@ -1130,11 +1130,11 @@
"vendorHash": "sha256-33NOGIvqLpgndG68GxAeoiISjWV7ApR4jmvqyZHjPKo="
},
"rootlyhq_rootly": {
"hash": "sha256-aAZTcZ97/rPOfvBwmPTp3BF/G0IkrCrx0u4yPiTfXrY=",
"hash": "sha256-v/CdJiEmMmmtQ0EhDxg6IT3FGWs3jeuZ/BKhmcHi9XM=",
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
"owner": "rootlyhq",
"repo": "terraform-provider-rootly",
"rev": "v5.2.1",
"rev": "v5.2.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-H0ohTNvSeFYEhHFIJoY37asNWwe+s2RKsDzYbx1CkJw="
},
@@ -42,14 +42,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "telegram-desktop-unwrapped";
version = "6.3.4";
version = "6.4.1";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-0d5PFo0tv8yayHqsd44gvodgbyRb1b5IPXtJahkWjHU=";
hash = "sha256-jmUj0kTyok5CsOe/to6bTN3jH/RMF7jE+AnFJi2nW90=";
};
nativeBuildInputs = [
@@ -6,9 +6,9 @@
# overridable. This is useful when the upstream archive was replaced
# and nixpkgs is not in sync yet.
officeVersion ? {
version = "1228";
version = "1230";
edition = "";
hash = "sha256-Va0QkLQtsPbDAo3ygfp6UKr0OkLLBS0yAup+xLoLD0s=";
hash = "sha256-/4qKFnLoou1ZuGkRt+2Yf/FPGOnYhx7fnE+8D3gutaY=";
},
...
@@ -7,9 +7,9 @@
# Softmaker Office or when the upstream archive was replaced and
# nixpkgs is not in sync yet.
officeVersion ? {
version = "1228";
version = "1230";
edition = "2024";
hash = "sha256-3/pdn3LLYy5U6GZp5jABH2oMpP/kDU9oAO9KvMwo9V8=";
hash = "sha256-xaXS22feHbRVPWP43vGbfptoT2S6jLUrGVFQ3xY7SJY=";
},
...
+2 -3
View File
@@ -106,15 +106,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "2ship2harkinian";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "HarbourMasters";
repo = "2ship2harkinian";
tag = finalAttrs.version;
hash = "sha256-EC8o5FIP/eXa+0LZt0C8EWHzKVAniv9SIXkZdbibcxg=";
hash = "sha256-3TmgOhlcYpu5FYvn9xblmNxwYUVSLjyE4VKbddR6D9s=";
fetchSubmodules = true;
fetchTags = true;
deepClone = true;
postFetch = ''
cd $out
+2 -2
View File
@@ -10,13 +10,13 @@ telegram-desktop.override {
inherit withWebkit;
unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec {
pname = "64gram-unwrapped";
version = "1.1.88";
version = "1.1.93";
src = fetchFromGitHub {
owner = "TDesktop-x64";
repo = "tdesktop";
tag = "v${version}";
hash = "sha256-zC51hlfi4EwqaDBTQev7KAYvQmUMJl1RBWh5/By2GUU=";
hash = "sha256-AwzTmEaN6MsJNq1W+cyAbg+QkYrPaV2LXmt3NzKc/vQ=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "ada";
version = "3.3.0";
version = "3.4.1";
src = fetchFromGitHub {
owner = "ada-url";
repo = "ada";
tag = "v${version}";
hash = "sha256-MzQ8Tefwct4/LlTWA8BpnnHMSzWmKvnf0OO5exAzIfI=";
hash = "sha256-2xrued35FRqmtZjrMTBtl5r/TB/pXNhhcKOfuwjxrhc=";
};
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -14,7 +14,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "agate";
version = "3.3.19";
version = "3.3.20";
__darwinAllowLocalNetworking = true;
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "mbrubeck";
repo = "agate";
tag = "v${finalAttrs.version}";
hash = "sha256-MPBjGtrQFM24ilBYJubfnfVHmTTIkNuWbfdbVYAXvtI=";
hash = "sha256-MV0fZo5tpRA5mkxzo5bGM5ASh+zxQbqrg1lL65IcUg8=";
};
cargoHash = "sha256-8llvdpF8kQtLxsu5Ynn7Cw/LXXdE0N7ACVVeJtccwuQ=";
cargoHash = "sha256-gteG7Oa15MtQPTu5/fZCmul1cDz7Lf19jEt7jELR6X4=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
+1 -1
View File
@@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
makeWrapper
];
RUSTC_BOOTSTRAP = 1; # We need rust unstable features
env.RUSTC_BOOTSTRAP = 1; # We need rust unstable features
postInstall = ''
install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop"
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "alistral";
version = "0.6.3";
version = "0.6.5";
src = fetchFromGitHub {
owner = "RustyNova016";
repo = "Alistral";
tag = "v${finalAttrs.version}";
hash = "sha256-lbdyE/k28fJzrOQEKDL8ZLnm6tNcAM4tsfHpcGlJB9s=";
hash = "sha256-X+yTt/oaV0ev0yexTcS0egcv0SQHFMysqSNEhZgikV0=";
};
cargoHash = "sha256-smoUGJSMmRKdnUz4L+LvPOH/A6CHVmkiHxdyesu+BTw=";
cargoHash = "sha256-XFBBtTF9V5l2CIyCRbvJqNkbPAT+Yi6PtnN1hjpKrsI=";
buildNoDefaultFeatures = true;
# Would be cleaner with an "--all-features" option
+3 -3
View File
@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "apko";
version = "0.30.34";
version = "0.30.35";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = "apko";
tag = "v${finalAttrs.version}";
hash = "sha256-kKYjy3Z5Irel+P2B2Ri6hyPJZ+UuWg7vJypOSN0Rdqw=";
hash = "sha256-2jgIJ1vEaIdfWouQeK/WnHXymcNRwawW9nnsXkamQaQ=";
# 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;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-+rgkyTmuD3OMil5vO9xDcAvNl19JfvqPz3zotDiGPCU=";
vendorHash = "sha256-KBLthYP5dwtuzfa4f1KARmG5ecStzTwsnX2E95z3S2Q=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -12,13 +12,13 @@ telegram-desktop.override {
unwrapped = telegram-desktop.unwrapped.overrideAttrs (
finalAttrs: previousAttrs: {
pname = "ayugram-desktop-unwrapped";
version = "6.2.4";
version = "6.3.10";
src = fetchFromGitHub {
owner = "AyuGram";
repo = "AyuGramDesktop";
tag = "v${finalAttrs.version}";
hash = "sha256-bFGk8lqPlNlaxbrulYe0+8ayj33frctruce3/TZ+W2c=";
hash = "sha256-kyxnr246bhxHpDUhhEnraDtHZDnF2uU2tdmfIvPnKHo=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec {
pname = "b3sum";
version = "1.8.2";
version = "1.8.3";
src = fetchCrate {
inherit version pname;
hash = "sha256-/qyBs+t8n5I6uf1dSc3E0yHpdlUz77pvlqV5+r4dRBc=";
hash = "sha256-mU2r5xbYf6A1RibWqhow/637YxybCFMT3UzYcUMjhdg=";
};
cargoHash = "sha256-PKVDfBFWQY95FxJ66vl6E26GEZChNCsA3ST++iieYSM=";
cargoHash = "sha256-w9l8dn4Ahck3NXuN4Ph9qmGoS767/mQRBgO9AT0CH3Y=";
meta = {
description = "BLAKE3 cryptographic hash function";
+2 -2
View File
@@ -9,10 +9,10 @@
}:
let
pname = "beeper";
version = "4.2.367";
version = "4.2.455";
src = fetchurl {
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
hash = "sha256-t2knYAy6G/Xd/dOAvqA+wiTa6K//maHiwjY7Apshjhk=";
hash = "sha256-3FHaPIJb40ta/+sguolz2QQBKkGgd1P3CgyEHHxX5xA=";
};
appimageContents = appimageTools.extract {
inherit pname version src;
+3 -3
View File
@@ -11,18 +11,18 @@
buildNpmPackage rec {
pname = "caprine";
version = "2.60.3";
version = "2.61.0";
src = fetchFromGitHub {
owner = "sindresorhus";
repo = "caprine";
rev = "v${version}";
hash = "sha256-yfCilJ62m7nKe8B+4puwAbNgr2g1P7HaKIhFINdv0/k=";
hash = "sha256-hBGsqOqKMHNy2SNw1kHCQq1lPDd2S36L5pdKgD2O8FA=";
};
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
npmDepsHash = "sha256-hNOAplCSXrO4NZqDTkmhf0oZVeGRUHr2Y/Qdx2RIV9c=";
npmDepsHash = "sha256-FgOHuMMUX92VHF6hdznoi7bhO/27t6+l038kmpqjctQ=";
nativeBuildInputs = [ copyDesktopItems ];
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-deny";
version = "0.18.9";
version = "0.19.0";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-deny";
tag = finalAttrs.version;
hash = "sha256-2ZexBVt3+tnEwxtRuzS6f7BQyu/nvjC098221hadKw8=";
hash = "sha256-kDjRP+UXYzsXTrcsPbomtATzDVTSZqXoRXf6qqCGOZw=";
};
cargoHash = "sha256-2u1DQtvjRfwbCXnX70M7drrMEvNsrVxsbikgrnNOkUE=";
cargoHash = "sha256-Lu1KhQmsQGvzgozFTcv9/hY3ZXOuaxkv0I+QPmAdZBU=";
nativeBuildInputs = [
pkg-config
+1 -1
View File
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
--replace-warn 'edition = "2021"' 'edition = "2024"'
'';
RUSTC_BOOTSTRAP = 1;
env.RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
just
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cfspeedtest";
version = "2.0.2";
version = "2.0.3";
src = fetchFromGitHub {
owner = "code-inflation";
repo = "cfspeedtest";
tag = "v${finalAttrs.version}";
hash = "sha256-MWVWYA++gxcKcCvBynVmm+l3qoSb6JKUtGUbRWEGrP8=";
hash = "sha256-KeJ/p9kXfI3OuAyNUx2C6DKpmtL3239uHpWAf4mDr4Q=";
};
cargoHash = "sha256-Oa+k+iBkKFdDcMAxrDdLNWhy2CakbX1G+AMlwGQFBsk=";
cargoHash = "sha256-mXSbbY3nuhEw+QUk6gt71HIh2gKNBO6C0trZbyzbpnM=";
nativeBuildInputs = [ installShellFiles ];
+1 -1
View File
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
passthru.updateScript = ./update.sh;
RUSTC_BOOTSTRAP = true;
env.RUSTC_BOOTSTRAP = true;
buildInputs = [ sqlite ];
meta = {
+4 -4
View File
@@ -7,17 +7,17 @@
buildNpmPackage {
pname = "coc-pyright";
version = "0-unstable-2026-01-01";
version = "0-unstable-2026-01-04";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "coc-pyright";
# No tagged releases, this commit corresponds to the latest release of the package.
rev = "33184c03e543b29227df989cf893752bae5f3ea2";
hash = "sha256-fj6iSQHprf/lkDGI5aFsogMAPv6a3Ghp9uDqnTM3/MY=";
rev = "767eebcb9f9b828412b9ec02e80558f3e748798a";
hash = "sha256-PNCh6EiXQxIYgU6hOG1/ialhP0p2uGTQAgipiDpgI6s=";
};
npmDepsHash = "sha256-0KKEPl0H0HxNCw7GTaxE+voQhS5J1TSpd4JjyWW62UI=";
npmDepsHash = "sha256-D5e17ubJ8leB5zoNO0DbZ1rUf/JpSJlezOldA3pvtFo=";
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
@@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "copilot-language-server";
version = "1.406.0";
version = "1.408.0";
src = fetchzip {
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
hash = "sha256-GGTERNSfg/XgM+5URVin05ocNe3JuH6+8JB7hBOqPrE=";
hash = "sha256-sO6ea8SV3/7V0wgotEp7eLs5BUjQlFxBgOdWF1aoHuY=";
stripRoot = false;
};
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "coroot";
version = "1.17.6";
version = "1.17.7";
src = fetchFromGitHub {
owner = "coroot";
repo = "coroot";
rev = "v${version}";
hash = "sha256-MeHRWrRGvp5oOSiMXtXNMZtKA6Q2577ty47HOxtBGJk=";
hash = "sha256-rfAJIRisLKkS6SuVJFLWjVnTAqbP+axuk3ECJ5n/7ek=";
};
vendorHash = "sha256-DCdrE8UYkuUN+rUuxVSGbAnAeLivZ2Xp8xjM+56ZF+A=";
+2 -2
View File
@@ -28,14 +28,14 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "ctranslate2";
version = "4.6.2";
version = "4.6.3";
src = fetchFromGitHub {
owner = "OpenNMT";
repo = "CTranslate2";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-AUi/MODxCSVuJhFjlhbMUyrGnK0X28B2+uTIHIg7oMg=";
hash = "sha256-J9h4G+4jv02/gbpHd/THLAxxII/hlmsFuaJUTU8TMgQ=";
};
# Fix CMake 4 compatibility
+6 -6
View File
@@ -12,20 +12,20 @@
}:
let
pname = "dependabot-cli";
version = "1.80.0";
version = "1.81.0";
# `tag` is what `dependabot` uses to find the relevant docker images.
tag = "nixpkgs-dependabot-cli-${version}";
# Get these hashes from
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
updateJobProxy.imageDigest = "sha256:3a7868b09318bef45224e475c3a018deba34f65f451f3ddd5b852b440c65fb83";
updateJobProxy.hash = "sha256-PVFo/PT7l3iR5FTt+jDrGVupc6zPoDpiw9Pxqp3yprU=";
updateJobProxy.imageDigest = "sha256:d26fd269228ce287141aef81ef54e23a0001d2c6c6a3e16db286488c7d769c8c";
updateJobProxy.hash = "sha256-6mmiI2AjKxopeC5SfTa9XOR4hatxEu6M/28wycRnz2w=";
# Get these hashes from
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
updaterGitHubActions.imageDigest = "sha256:a791d0ef463a059dc371ef62c6d1ac341a7e1197ed871a0a6451371a8710cd0e";
updaterGitHubActions.hash = "sha256-uNqif7HesnXeiGOrc4sC2fgSAHNFJwVwrA3iIv8fVYc=";
updaterGitHubActions.imageDigest = "sha256:5964979027fe1d6fc358e89774074bfe34fa89b2b53ce7d45b44b4ebf71b7953";
updaterGitHubActions.hash = "sha256-dmMq/T7DLomvzPtOGIBQnrv+k5/NpfxbcXFxxo5ij6o=";
in
buildGoModule {
inherit pname version;
@@ -34,7 +34,7 @@ buildGoModule {
owner = "dependabot";
repo = "cli";
rev = "v${version}";
hash = "sha256-5SD4VIa11r2P9YbURby6Sgi58lv03UB9X5UDOZxjVLQ=";
hash = "sha256-9//TW+56UM/5J6psJWcS6lJqyKwQUEOWftTOJxEaCcQ=";
};
vendorHash = "sha256-dD48OKpuGAJAro7qV4tqpf/uENV2X1VQ2kUvAuJLXc0=";
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "docker-credential-helpers";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "docker";
repo = "docker-credential-helpers";
rev = "v${version}";
sha256 = "sha256-cDpo3hw0yP9QnFvlGUIpjfMzni57KNkY+S+SIYOKBKQ=";
sha256 = "sha256-iZETkZK7gY5dQOT4AN341wfzeaol9HT4kr/G4o2oWzw=";
};
vendorHash = null;
+1 -1
View File
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
cargoTestFlags = cargoBuildFlags;
# requires unstable rust features
RUSTC_BOOTSTRAP = 1;
env.RUSTC_BOOTSTRAP = 1;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd eww \
+7 -8
View File
@@ -6,11 +6,6 @@
callPackage,
}:
let
zig_hook = zig_0_15.hook.overrideAttrs {
zig_default_flags = "-Dcpu=baseline -Doptimize=ReleaseSafe --color off";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "flow-control";
version = "0.6.0";
@@ -29,12 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
} $ZIG_GLOBAL_CACHE_DIR/p
'';
nativeBuildInputs = [
zig_hook
];
nativeBuildInputs = [ zig_0_15 ];
passthru.updateScript = ./update.sh;
dontSetZigDefaultFlags = true;
zigBuildFlags = [
"-Dcpu=baseline"
"-Doptimize=ReleaseSafe"
];
env.VERSION = finalAttrs.version;
meta = {
+3
View File
@@ -114,6 +114,9 @@ buildGoModule rec {
getGoDirs() {
make show-backend-tests
}
# TestRunHookPrePostReceive (cmd/hook_test.go) needs .git to pass
git init
'';
checkFlags =
+2 -2
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
version = "11.0.8";
hash = "sha256-KwVk4kRvrPQWsDWxX5L9pKjC+VwywLKKd2oYH+vlg74=";
version = "11.0.9";
hash = "sha256-1jp0FT/T+j1CAPc99lTRSUd4R4YhgLMjZr4k3jW6ho8=";
npmDepsHash = "sha256-Qs1aZxgjlsjdxfBpa4pOrwEfDfb/96L49uJd29Ysn/I=";
vendorHash = "sha256-TVp4WxrGBlKVaPIbsj4EP/3pt5iseXLY7xIVum71ZXU=";
lts = true;
+4 -4
View File
@@ -1,8 +1,8 @@
import ./generic.nix {
version = "13.0.3";
hash = "sha256-ViqwTEVZkccNx5Pt+lrWvAqzD5RRTzwfBhUTfWyDhtE=";
npmDepsHash = "sha256-7WjcMsKPtKUWJfDrJc65ZXq2tjK8+8DnqwINj+0XyiQ=";
vendorHash = "sha256-gHdggzCJlYvs8JXs4CJ/AyqYMPCC2o4uRwDiem3rNFM=";
version = "13.0.4";
hash = "sha256-AZQ4ppJES4CsvlkzBX82KfEp3PlFa2Ypd1KmTj/SXJk=";
npmDepsHash = "sha256-v+vl0fxcnqH8Jp4BILDYe5ioFQTQkB2XnFVEtkgadPc=";
vendorHash = "sha256-tq/72teHKowp6jwOKIJxS0OkcFI7UV19uTAv/OB/rm8";
lts = false;
nixUpdateExtraArgs = [
"--override-filename"
+1 -1
View File
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-LKltHVig33zUSWoRgCb1BgeKiJsDnlYEuPfQfrnhafI=";
# freshfetch depends on rust nightly features
RUSTC_BOOTSTRAP = 1;
env.RUSTC_BOOTSTRAP = 1;
meta = {
description = "Fresh take on neofetch";
+1 -1
View File
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-OoTWGeF96BpPDx1Y9AEVOIBK7kCz6pjw24pLiNcKmOc=";
RUSTC_BOOTSTRAP = 1;
env.RUSTC_BOOTSTRAP = 1;
cargoBuildFlags = [
"--workspace"
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "genact";
version = "1.4.2";
version = "1.5.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "genact";
rev = "v${version}";
sha256 = "sha256-Rn9kJWutWKPj9cLu2ZJKITmC+I8/ikhCAoIp00Yg6ZA=";
sha256 = "sha256-6d8p+Hon9zZMNRLX9+eBB3K5PffsX7w5PcbIiesCvSc=";
};
cargoHash = "sha256-Ttg9stfiIYCXk35+GWdGOzQrM/aYZPZK+e9y+zw1ZXQ=";
cargoHash = "sha256-umb+hf61k/sSfPVUCS1qJ0p+NLfjgZffuEWoQj1NIVY=";
nativeBuildInputs = [ installShellFiles ];
-1
View File
@@ -4,7 +4,6 @@
fetchFromGitHub,
makeWrapper,
bundlerEnv,
tree,
}:
let
version = "1.2.1";
+5 -7
View File
@@ -29,13 +29,7 @@
# https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options
optimizeLevel ? "ReleaseFast",
}:
let
zig = zig_0_14;
zig_hook = zig.hook.overrideAttrs {
zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "ghostty";
version = "1.2.3";
@@ -66,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
pandoc
pkg-config
removeReferencesTo
zig_hook
zig_0_14
# GTK frontend
glib # Required for `glib-compile-schemas`
@@ -93,10 +87,14 @@ stdenv.mkDerivation (finalAttrs: {
harfbuzz
];
dontSetZigDefaultFlags = true;
zigBuildFlags = [
"--system"
"${finalAttrs.deps}"
"-Dversion-string=${finalAttrs.version}"
"-Dcpu=baseline"
"-Doptimize=${optimizeLevel}"
]
++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {
inherit glslang;
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "ginkgo";
version = "2.27.3";
version = "2.27.4";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "sha256-qEGV5QLRVuy0pNBat19u3kp8jUrUHFjyY1pC1nkyZC0=";
sha256 = "sha256-bPGWqWNXvl+kHi5/LLdZ8zw/OXxg06mr6ZWjIQH4QJg=";
};
vendorHash = "sha256-Vmcva/iMaOszQi87avO7utD0ahlB2gFBmVEI86hvnyQ=";
@@ -28,12 +28,12 @@
stdenv.mkDerivation rec {
pname = "gpu-screen-recorder";
version = "5.11.2";
version = "5.11.5";
src = fetchgit {
url = "https://repo.dec05eba.com/${pname}";
tag = version;
hash = "sha256-9hmuaqa6HQogL4OwDOID/kL4ZYaDDKJeFrEtrDS9ZYg=";
hash = "sha256-o9IjuKuE2/41I52vpR7EOLCDSLJty/Wq0k7UiFHHlDk=";
};
nativeBuildInputs = [
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-egrxcnDVKKgk1sL5WNMIR2FPwQbjjMy20VWizcTBEtM=";
# requires nightly features
RUSTC_BOOTSTRAP = 1;
env.RUSTC_BOOTSTRAP = 1;
meta = {
description = "Tool for unit testing tree sitter highlights for nvim-treesitter";
+1 -1
View File
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
# Use rust nightly features
RUSTC_BOOTSTRAP = 1;
env.RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
cmake
+1 -1
View File
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-YZ2c6W6CCqgyN+6i7Vh5fWLKw8L4pUqvq/tDO/Q/kf0=";
# Use rust nightly features
RUSTC_BOOTSTRAP = 1;
env.RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [
cmake
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "hugo";
version = "0.154.2";
version = "0.154.3";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
tag = "v${finalAttrs.version}";
hash = "sha256-DVNuVhybpi9LOSciCftEVzWdMYsnQKREKFlalB4QMX8=";
hash = "sha256-bUOzm1Uj1z2WN9MRqaKXyi/t+4JROdTwPEYV0bxibtM=";
};
vendorHash = "sha256-7hI2FblqJQYhoWX2K+J+/HIY8CzQ+tBZmForS6gEnoE=";
vendorHash = "sha256-Olkrmi26U4fq/JmYSow5ET4YyCPS10eS+L99t/bLo4g=";
checkFlags =
let
+715 -588
View File
File diff suppressed because it is too large Load Diff
+216
View File
@@ -0,0 +1,216 @@
diff --git a/build.gradle.kts b/build.gradle.kts
index 7e4d28a9..0fe94ff6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -115,46 +115,11 @@ fun isNonStable(version: String): Boolean {
destinationDirectory.set(layout.buildDirectory)
}
-val distWin by tasks.registering(Zip::class) {
- group = "jadx"
- description = "Build Windows bundle"
-
- val guiTask = tasks.getByPath("jadx-gui:copyDistWin")
- dependsOn(guiTask)
- from(guiTask.outputs)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-val distWinWithJre by tasks.registering(Zip::class) {
- description = "Build Windows with JRE bundle"
-
- val guiTask = tasks.getByPath(":jadx-gui:copyDistWinWithJre")
- dependsOn(guiTask)
- from(guiTask.outputs)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
val dist by tasks.registering {
group = "jadx"
description = "Build jadx distribution zip bundles"
dependsOn(pack)
-
- val os = DefaultNativePlatform.getCurrentOperatingSystem()
- if (os.isWindows) {
- if (project.hasProperty("bundleJRE")) {
- println("Build win bundle with JRE")
- dependsOn(distWinWithJre)
- } else {
- dependsOn(distWin)
- }
- }
}
val cleanBuildDir by tasks.registering(Delete::class) {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ff9e7e36..7a63af40 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -4,8 +4,6 @@
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0")
-
- implementation("org.openrewrite:plugin:6.19.1")
}
repositories {
diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
index ad65de18..ecb53db1 100644
--- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts
+++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
@@ -3,8 +3,6 @@
plugins {
java
checkstyle
-
- id("jadx-rewrite")
}
val jadxVersion: String by rootProject.extra
diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
deleted file mode 100644
index aab46d55..00000000
--- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
+++ /dev/null
@@ -1,35 +0,0 @@
-plugins {
- id("org.openrewrite.rewrite")
-}
-
-repositories {
- mavenCentral()
-}
-
-dependencies {
- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.13.0")
- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.11.0")
- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.13.0")
- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.12.0")
-}
-
-tasks {
- rewrite {
- // exclusion("src/test/java/jadx/tests/integration")
-
- // activeRecipe("org.openrewrite.java.migrate.Java8toJava11")
-
- // checkstyle auto fix
- // activeRecipe("org.openrewrite.staticanalysis.CodeCleanup")
- // setCheckstyleConfigFile(file("$rootDir/config/checkstyle/checkstyle.xml"))
-
- // logging
- // activeRecipe("org.openrewrite.java.logging.slf4j.Slf4jBestPractices")
- // activeRecipe("org.openrewrite.java.logging.slf4j.LoggersNamedForEnclosingClass")
- // activeRecipe("org.openrewrite.java.logging.slf4j.ParameterizedLogging")
- // activeRecipe("org.openrewrite.java.logging.PrintStackTraceToLogError")
-
- // testing
- activeRecipe("org.openrewrite.java.testing.assertj.Assertj")
- }
-}
diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
index b9d64ae7..4c1c23f8 100644
--- a/jadx-gui/build.gradle.kts
+++ b/jadx-gui/build.gradle.kts
@@ -2,7 +2,6 @@
id("jadx-kotlin")
id("application")
id("jadx-library")
- id("edu.sc.seis.launch4j") version "3.0.6"
id("com.gradleup.shadow") version "8.3.8"
id("org.beryx.runtime") version "1.13.1"
}
@@ -136,36 +135,6 @@
}
}
-launch4j {
- mainClassName.set(application.mainClass.get())
- copyConfigurable.set(listOf<Any>())
- dontWrapJar.set(true)
- icon.set("$projectDir/src/main/resources/logos/jadx-logo.ico")
- outfile.set("jadx-gui-$jadxVersion.exe")
- version.set(jadxVersion)
- copyright.set("Skylot")
- windowTitle.set("jadx")
- companyName.set("jadx")
- jreMinVersion.set("11")
- jvmOptions.set(escapeJVMOptions())
- requires64Bit.set(true)
- downloadUrl.set("https://www.oracle.com/java/technologies/downloads/#jdk21-windows")
- supportUrl.set("https://github.com/skylot/jadx")
-
- bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")
- classpath.set(tasks.getByName("shadowJar").outputs.files.map { "%EXEDIR%/lib/${it.name}" }.sorted().toList())
- println("Launch4J classpath: ${classpath.get()}")
-
- chdir.set("") // don't change current dir
- libraryDir.set("") // don't add any libs
-}
-
-fun escapeJVMOptions(): List<String> {
- return application.applicationDefaultJvmArgs
- .toList()
- .map { if (it.startsWith("-D")) "\"$it\"" else it }
-}
-
runtime {
addOptions("--strip-debug", "--compress", "zip-9", "--no-header-files", "--no-man-pages")
addModules(
@@ -186,48 +155,6 @@ fun escapeJVMOptions(): List<String> {
}
}
-val copyDistWin by tasks.registering(Copy::class) {
- description = "Copy files for Windows bundle"
-
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-val copyDistWinWithJre by tasks.registering(Copy::class) {
- description = "Copy files for Windows with JRE bundle"
-
- val jreTask = tasks.runtime.get()
- dependsOn(jreTask)
- from(jreTask.jreDir) {
- include("**/*")
- into("jre")
- }
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
val syncNLSLines by tasks.registering(JavaExec::class) {
group = "jadx-dev"
description = "Utility task to sync new/missing translation using EN as a reference"
-68
View File
@@ -1,68 +0,0 @@
diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
index 09f2c05f..bdb641b0 100644
--- a/jadx-gui/build.gradle.kts
+++ b/jadx-gui/build.gradle.kts
@@ -1,7 +1,6 @@
plugins {
id("jadx-kotlin")
id("application")
- id("edu.sc.seis.launch4j") version "3.0.5"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("org.beryx.runtime") version "1.13.1"
}
@@ -101,24 +100,6 @@
}
}
-launch4j {
- mainClassName.set(application.mainClass.get())
- copyConfigurable.set(listOf<Any>())
- setJarTask(tasks.shadowJar.get())
- icon.set("$projectDir/src/main/resources/logos/jadx-logo.ico")
- outfile.set("jadx-gui-$jadxVersion.exe")
- copyright.set("Skylot")
- windowTitle.set("jadx")
- companyName.set("jadx")
- jreMinVersion.set("11")
- jvmOptions.set(application.applicationDefaultJvmArgs.toSet())
- requires64Bit.set(true)
- initialHeapPercent.set(5)
- maxHeapSize.set(4096)
- maxHeapPercent.set(70)
- downloadUrl.set("https://www.oracle.com/java/technologies/downloads/#jdk17-windows")
- bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")
-}
runtime {
addOptions("--strip-debug", "--compress", "2", "--no-header-files", "--no-man-pages")
@@ -137,30 +118,6 @@
}
}
-val copyDistWinWithJre by tasks.registering(Copy::class) {
- group = "jadx"
- dependsOn(tasks.named("runtime"), tasks.named("createExe"))
- from(runtime.jreDir) {
- include("**/*")
- into("jre")
- }
- from(tasks.named("createExe").get().outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-$jadxVersion-with-jre-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-val distWinWithJre by tasks.registering(Zip::class) {
- group = "jadx"
- dependsOn(copyDistWinWithJre)
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
- from(copyDistWinWithJre.get().outputs) {
- include("**/*")
- }
- into(layout.buildDirectory.asFile)
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
val addNewNLSLines by tasks.registering(JavaExec::class) {
group = "jadx"
+8 -5
View File
@@ -17,18 +17,18 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "jadx";
version = "1.5.0";
version = "1.5.3";
src = fetchFromGitHub {
owner = "skylot";
repo = "jadx";
rev = "v${finalAttrs.version}";
hash = "sha256-+F+PHAd1+FmdAlQkjYDBsUYCUzKXG19ZUEorfvBUEg0=";
hash = "sha256-YfA0o25A3jtqVTB8LsJGCS6+dk7zt9kWnxlzDceHjeg=";
};
patches = [
# Remove use of launch4j - contains platform binaries not able to be cached by mitmCache
./no-native-deps.diff
# Remove launch4j (uncacheable Windows binaries) and OpenRewrite (build failures)
./nix-build.patch
];
nativeBuildInputs = [
@@ -106,6 +106,9 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
mainProgram = "jadx-gui";
maintainers = with lib.maintainers; [ emilytrau ];
maintainers = with lib.maintainers; [
emilytrau
Misaka13514
];
};
})
+76
View File
@@ -0,0 +1,76 @@
{
lib,
maven,
fetchsvn,
makeWrapper,
makeDesktopItem,
copyDesktopItems,
jdk,
jre,
}:
let
version = "2.1-0-unstable-2025-01-18";
description = "Java program for drawing Feynman diagrams";
in
maven.buildMavenPackage {
pname = "jaxodraw";
inherit version;
# pom.xml in the 2.1-0 source refers to non-existent ../pom/pom.xml and fails to build.
# src = fetchurl {
# url = "mirror://sourceforge/jaxodraw/jaxodraw-${version}-src.tar.gz";
# hash = "sha256-EE0amcFKm/zUO4PzPhkPYZYykZw+ARJFu0/hlUOhu5s=";
# };
src = fetchsvn {
url = "https://svn.code.sf.net/p/jaxodraw/code/trunk/jaxodraw";
rev = "3346";
hash = "sha256-jZ2Jvrysb5TeoAw5gubhtn39gMxdAGh/vTsaSIEZ7zs=";
};
mvnJdk = jdk;
mvnParameters = "-PskipTests"; # Tests fail
mvnHash = "sha256-QfMyiz0zWFi3kUwH8pcgu7FiXleP/KO111avs1WWWG0=";
nativeBuildInputs = [
makeWrapper
copyDesktopItems
];
desktopItems = [
(makeDesktopItem {
name = "jaxodraw";
desktopName = "JaxoDraw";
exec = "jaxodraw";
icon = "jaxodraw";
categories = [
"Science"
"Education"
"Physics"
];
comment = description;
})
];
installPhase = ''
runHook preInstall
install -Dm644 target/jaxodraw-*-with-deps.jar $out/lib/jaxodraw/jaxodraw.jar
makeWrapper ${lib.getExe jre} $out/bin/jaxodraw \
--add-flags "-jar $out/lib/jaxodraw/jaxodraw.jar"
install -Dm644 src/site/resources/images/top.png $out/share/icons/hicolor/128x128/apps/jaxodraw.png
runHook postInstall
'';
meta = {
inherit description;
homepage = "https://jaxodraw.sourceforge.io";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ ulysseszhan ];
mainProgram = "jaxodraw";
};
}
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "json-fortran";
version = "9.1.0";
version = "9.2.0";
src = fetchFromGitHub {
owner = "jacobwilliams";
repo = "json-fortran";
rev = version;
hash = "sha256-MumYG9kfbtIMT0BQzHF2jZRT1yAUkfbQ/I0/LqRKnKk=";
hash = "sha256-DjNBB1qYXZcUSvjcWqunFeI275F3YojRDCRf61pIkYs=";
};
nativeBuildInputs = [
+38
View File
@@ -0,0 +1,38 @@
{
lib,
fetchFromGitHub,
rustPlatform,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "kanban";
version = "0.1.16";
src = fetchFromGitHub {
owner = "fulsomenko";
repo = "kanban";
tag = "v${finalAttrs.version}";
hash = "sha256-WksL0AhooBTV+W1knU+tns/qvHDd0z6mE2HkC57BAcU=";
};
GIT_COMMIT_HASH = finalAttrs.src.rev;
cargoHash = "sha256-Q/o5MHjVRrJpfhkzNNJ6j4oASV5wDg/0Zi43zPlp5p8=";
passthru.updateScript = nix-update-script { };
meta = {
description = "Terminal-based project management solution";
longDescription = ''
A terminal-based kanban/project management tool inspired by lazygit,
built with Rust. Features include file persistence, keyboard-driven
navigation, multi-select capabilities, and sprint management.
'';
homepage = "https://github.com/fulsomenko/kanban";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fulsomenko ];
mainProgram = "kanban";
platforms = lib.platforms.all;
};
})
+1 -1
View File
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
'';
# requires nightly features
RUSTC_BOOTSTRAP = true;
env.RUSTC_BOOTSTRAP = true;
meta = {
description = "Functional programming language and proof assistant";
+1 -1
View File
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
version = "0.6.1";
# kord depends on nightly features
RUSTC_BOOTSTRAP = 1;
env.RUSTC_BOOTSTRAP = 1;
src = fetchFromGitHub {
owner = "twitchax";
+3
View File
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
# fix cmake compatibility. vendored from https://github.com/The-OpenROAD-Project/lemon-graph/pull/2
./cmake_version.patch
# fix C++20 compatibility. vendored from https://github.com/The-OpenROAD-Project/lemon-graph/commit/f871b10396270cfd09ffddc4b6ead07722e9c232
./update_cxx20.patch
];
meta = {
@@ -0,0 +1,127 @@
From f871b10396270cfd09ffddc4b6ead07722e9c232 Mon Sep 17 00:00:00 2001
From: Matt Liberty <mliberty@precisioninno.com>
Date: Wed, 13 Nov 2024 03:48:00 +0000
Subject: [PATCH] Update for c++20
Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
---
lemon/bits/array_map.h | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/lemon/bits/array_map.h b/lemon/bits/array_map.h
index 355ee00..f8a7133 100644
--- a/lemon/bits/array_map.h
+++ b/lemon/bits/array_map.h
@@ -75,6 +75,7 @@ namespace lemon {
typedef typename Notifier::ObserverBase Parent;
typedef std::allocator<Value> Allocator;
+ typedef std::allocator_traits<Allocator> AllocatorTraits;
public:
@@ -88,7 +89,7 @@ namespace lemon {
Item it;
for (nf->first(it); it != INVALID; nf->next(it)) {
int id = nf->id(it);;
- allocator.construct(&(values[id]), Value());
+ AllocatorTraits::construct(allocator, &(values[id]), Value());
}
}
@@ -102,7 +103,7 @@ namespace lemon {
Item it;
for (nf->first(it); it != INVALID; nf->next(it)) {
int id = nf->id(it);;
- allocator.construct(&(values[id]), value);
+ AllocatorTraits::construct(allocator, &(values[id]), value);
}
}
@@ -121,7 +122,7 @@ namespace lemon {
Item it;
for (nf->first(it); it != INVALID; nf->next(it)) {
int id = nf->id(it);;
- allocator.construct(&(values[id]), copy.values[id]);
+ AllocatorTraits::construct(allocator, &(values[id]), copy.values[id]);
}
}
@@ -218,15 +219,15 @@ namespace lemon {
for (nf->first(it); it != INVALID; nf->next(it)) {
int jd = nf->id(it);;
if (id != jd) {
- allocator.construct(&(new_values[jd]), values[jd]);
- allocator.destroy(&(values[jd]));
+ AllocatorTraits::construct(allocator, &(new_values[jd]), values[jd]);
+ AllocatorTraits::destroy(allocator, &(values[jd]));
}
}
if (capacity != 0) allocator.deallocate(values, capacity);
values = new_values;
capacity = new_capacity;
}
- allocator.construct(&(values[id]), Value());
+ AllocatorTraits::construct(allocator, &(values[id]), Value());
}
// \brief Adds more new keys to the map.
@@ -260,8 +261,8 @@ namespace lemon {
}
}
if (found) continue;
- allocator.construct(&(new_values[id]), values[id]);
- allocator.destroy(&(values[id]));
+ AllocatorTraits::construct(allocator, &(new_values[id]), values[id]);
+ AllocatorTraits::destroy(allocator, &(values[id]));
}
if (capacity != 0) allocator.deallocate(values, capacity);
values = new_values;
@@ -269,7 +270,7 @@ namespace lemon {
}
for (int i = 0; i < int(keys.size()); ++i) {
int id = nf->id(keys[i]);
- allocator.construct(&(values[id]), Value());
+ AllocatorTraits::construct(allocator, &(values[id]), Value());
}
}
@@ -279,7 +280,7 @@ namespace lemon {
// and it overrides the erase() member function of the observer base.
virtual void erase(const Key& key) {
int id = Parent::notifier()->id(key);
- allocator.destroy(&(values[id]));
+ AllocatorTraits::destroy(allocator, &(values[id]));
}
// \brief Erase more keys from the map.
@@ -289,7 +290,7 @@ namespace lemon {
virtual void erase(const std::vector<Key>& keys) {
for (int i = 0; i < int(keys.size()); ++i) {
int id = Parent::notifier()->id(keys[i]);
- allocator.destroy(&(values[id]));
+ AllocatorTraits::destroy(allocator, &(values[id]));
}
}
@@ -303,7 +304,7 @@ namespace lemon {
Item it;
for (nf->first(it); it != INVALID; nf->next(it)) {
int id = nf->id(it);;
- allocator.construct(&(values[id]), Value());
+ AllocatorTraits::construct(allocator, &(values[id]), Value());
}
}
@@ -317,7 +318,7 @@ namespace lemon {
Item it;
for (nf->first(it); it != INVALID; nf->next(it)) {
int id = nf->id(it);
- allocator.destroy(&(values[id]));
+ AllocatorTraits::destroy(allocator, &(values[id]));
}
allocator.deallocate(values, capacity);
capacity = 0;
--
2.52.0
+9 -3
View File
@@ -25,9 +25,15 @@ stdenv.mkDerivation {
})
];
# Allow install_name_tool rewrite paths on darwin.
# error: install_name_tool: changing install names or rpaths can't be redone for: /nix/store/...-libamplsolver-.../lib/libamplsolver.dylib (for architecture arm64) because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
env = {
# For non-trapping FP architectures like loongarch64 and riscv64
NIX_CFLAGS_COMPILE = lib.optionalString (
stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isLoongArch64
) "-DNO_fpu_control";
# Allow install_name_tool rewrite paths on darwin.
# error: install_name_tool: changing install names or rpaths can't be redone for: /nix/store/...-libamplsolver-.../lib/libamplsolver.dylib (for architecture arm64) because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
};
installPhase = ''
runHook preInstall
+4 -4
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage {
pname = "librespot-ma";
version = "0.7.1-unstable-2025-11-06";
version = "0.8.0-unstable-2025-12-05";
src = fetchFromGitHub {
owner = "music-assistant";
repo = "librespot";
rev = "2af61256649d6c1ed149791a53a20a595b617704";
hash = "sha256-sarxS6YArK5luX4TRXJUKhreMqhZbsS/3fCVWHxPNpY=";
rev = "1d68d603027d89d1a60bf5a15f180e28382e2cfc";
hash = "sha256-quKAiXqTwf6cgKi9qqksQRaGqV9UZjerHQZfqDVHCIs=";
};
cargoHash = "sha256-CI2BFmQNK1+J2qaKg6u6WM83jwBuWjeh9dROnrF3Kv0=";
cargoHash = "sha256-Kf3w6tD/MQaXXegtiCkFbUcYwr4OMw6ipLxNLxJ2NTQ=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -11,12 +11,12 @@ telegram-desktop.override {
unwrapped = telegram-desktop.unwrapped.overrideAttrs (
finalAttrs: previousAttrs: {
pname = "materialgram-unwrapped";
version = "6.2.3.1";
version = "6.4.0.1";
src = fetchFromGitHub {
owner = "kukuruzka165";
repo = "materialgram";
hash = "sha256-wWg45n6Da/f2j3rT8PNNEN5uuX8rMzZNbHAA2wL8NLA=";
hash = "sha256-aNgvuuowyhEYUm5ie2vxCsdpaDuuZ/3xZJqWA0bN5Lc=";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
};
+3 -3
View File
@@ -22,16 +22,16 @@
rustPlatform.buildRustPackage rec {
pname = "mise";
version = "2026.1.0";
version = "2026.1.1";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
rev = "v${version}";
hash = "sha256-AxNVHWqvLePR4SeVuzUZxLoR0ZGo97I3SJzGOCchjeU=";
hash = "sha256-z2sk7g0XleaV83udcxqvlyqit3NPcqbcttN6Zo9asdI=";
};
cargoHash = "sha256-Z8qZEmtFUeT4c78gIWxanVRJEjArLD65j3eaO7fjfz0=";
cargoHash = "sha256-zau4N7TsgcKmG5AUdUm1WL3AKqT7d8CqTnjnUgqYDvU=";
nativeBuildInputs = [
installShellFiles
+4 -4
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "mmtui";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitHub {
owner = "SL-RU";
repo = "mmtui";
tag = "v${version}";
hash = "sha256-s+50kz6OODZ0xKz8oNF2YEzk+mLZ6gXXynl8g6Uwdo4=";
tag = "mmt-v${version}";
hash = "sha256-ESnxy3TUWBb0akP471dK6wFQyJQSnjlIevA7ndLAjoE=";
};
cargoHash = "sha256-9F1YMepkWksTQRrkziNhLxVJnhoDH17lSKef5kOjp3Y=";
cargoHash = "sha256-Ck2mQ8PuA4apF6XKDtISmEtNFEHFRRlZwpYCDKCR/rc=";
nativeBuildInputs = [
rustPlatform.bindgenHook
@@ -31,13 +31,13 @@ in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "modrinth-app-unwrapped";
version = "0.10.23";
version = "0.10.25";
src = fetchFromGitHub {
owner = "modrinth";
repo = "code";
tag = "v${finalAttrs.version}";
hash = "sha256-Or2KkcZnZCZOnUd++SmDgbUOwa6ZmRDaoo7gF3XvN6I=";
hash = "sha256-e+Oienb0jhz7XT9NZB5IAELi+YU3i60JIWBDG8LCEZw=";
};
patches = [
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '1.0.0-local' '${finalAttrs.version}'
'';
cargoHash = "sha256-hWjoNwKA39YYhPSrQUNaM1nS+CtV9vff+aXpoQLPCOM=";
cargoHash = "sha256-pZwWqWkcq142iIO0Ier9NH56P1EWXAoRiqDCNyElXCA=";
mitmCache = gradle.fetchDeps {
inherit (finalAttrs) pname;
data = ./deps.json;
@@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 1;
hash = "sha256-jLuI8qNJgFkuBbKuBNKGuk/6v62iY7fNZX2t3U3olk0=";
hash = "sha256-4MRVk5k/HkCMA/OeRMZwwkCyqmSWkujqLe/8sPfYcwc=";
};
nativeBuildInputs = [
@@ -160,7 +160,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
gpl3Plus
unfreeRedistributable
];
maintainers = with lib.maintainers; [ getchoo ];
maintainers = with lib.maintainers; [
getchoo
hythera
];
mainProgram = "ModrinthApp";
platforms = with lib.platforms; linux ++ darwin;
# This builds on architectures like aarch64, but the launcher itself does not support them yet.
+11 -7
View File
@@ -19,14 +19,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
};
cargoHash = "sha256-U8U70nzTmpY6r8J661EJ4CGjx6vWrGovu5m25dvz5sY=";
# Requires nightly features
env.RUSTC_BOOTSTRAP = 1;
# Without -headerpad, the following error occurs on x86_64-darwin
# error: install_name_tool: changing install names or rpaths can't be redone for: ... because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
NIX_LDFLAGS = lib.optionals (with stdenv.hostPlatform; isDarwin && isx86_64) [
"-headerpad_max_install_names"
];
# Requires nightly features
env = {
RUSTC_BOOTSTRAP = 1;
# Without -headerpad, the following error occurs on x86_64-darwin
# error: install_name_tool: changing install names or rpaths can't be redone for: ... because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
NIX_LDFLAGS = toString (
lib.optionals (with stdenv.hostPlatform; isDarwin && isx86_64) [
"-headerpad_max_install_names"
]
);
};
buildInputs = [
icu
+2 -2
View File
@@ -53,11 +53,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mysql-workbench";
version = "8.0.43";
version = "8.0.45";
src = fetchurl {
url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz";
hash = "sha256-E9fn72r35WrGzIOoDouIvJFZdpfw9sgDNHwEe/0DdUI=";
hash = "sha256-00sswmBIBtNmxMrJBDqzOhPLErXuXGs634JRHML/aKE=";
};
patches = [
+4 -2
View File
@@ -21,8 +21,10 @@ rustPlatform.buildRustPackage rec {
hardeningDisable = [ "stackprotector" ];
NIX_SYSTEM = stdenv.system;
RUSTC_BOOTSTRAP = "1";
env = {
NIX_SYSTEM = stdenv.system;
RUSTC_BOOTSTRAP = "1";
};
preCheck = ''
export NIX_LD=${stdenv.cc.bintools.dynamicLinker}
+3 -3
View File
@@ -8,16 +8,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nnd";
version = "0.67";
version = "0.68";
src = fetchFromGitHub {
owner = "al13n321";
repo = "nnd";
tag = "v${finalAttrs.version}";
hash = "sha256-qiWzTZlv01IjNUwjzcNRfQrmVyUMTsKtfhXuZydg/Pc=";
hash = "sha256-77WKsk/kKWJjSwikXtLDWY0pRf1pC6YkY9c9xDtheUI=";
};
cargoHash = "sha256-cx4V/DNafoqjfbtPl43Y09eF4fJ89x/ldx6qe70Qn/g=";
cargoHash = "sha256-I9TcZQqKjR4awufmT8fM883YDeyNZUozHaoZfEaE6+0=";
meta = {
description = "Debugger for Linux";
+25 -6
View File
@@ -2,33 +2,52 @@
stdenvNoCC,
openbao,
yarn-berry_3,
nodejs,
nodejs_22,
}:
let
yarn = yarn-berry_3.override { nodejs = nodejs_22; };
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = openbao.pname + "-ui";
inherit (openbao) version src;
sourceRoot = "${finalAttrs.src.name}/ui";
offlineCache = yarn-berry_3.fetchYarnBerryDeps {
offlineCache = yarn.fetchYarnBerryDeps {
inherit (finalAttrs) src sourceRoot;
hash = "sha256-ZG/br4r2YzPPgsysx7MBy1WtUBkar1U84nkKecZ5bvU=";
};
nativeBuildInputs = [
yarn-berry_3.yarnBerryConfigHook
nodejs
yarn-berry_3
yarn.yarnBerryConfigHook
nodejs_22
yarn
];
env.YARN_ENABLE_SCRIPTS = 0;
preConfigure = ''
printYarnErrors() {
cat /build/*.log
}
failureHooks+=(printYarnErrors)
'';
postConfigure = ''
substituteInPlace .ember-cli \
--replace-fail "../http/web_ui" "$out"
'';
buildPhase = "yarn run ember build --environment=production";
buildPhase = ''
runHook preBuild
yarn run ember build --environment=production
runHook postBuild
'';
dontInstall = true;
meta = (builtins.removeAttrs openbao.meta [ "mainProgram" ]) // {
description = openbao.meta.description + " - web UI";
};
})
+3 -3
View File
@@ -8,18 +8,18 @@
buildGoModule (finalAttrs: {
pname = "opkssh";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "openpubkey";
repo = "opkssh";
tag = "v${finalAttrs.version}";
hash = "sha256-av8XmHRNttZ17y9DnUQkMG+ZHjEytvfetBDPjhn+6+o=";
hash = "sha256-l1FizvOO4oCNHEJEClwOupnjQzthvGO/vRTq1PhJDao=";
};
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
vendorHash = "sha256-vZb94nwfrqoWnFk1STDDiyqGn1Esqz5VvoQemXIzlNg=";
vendorHash = "sha256-AdQtYqhwhkvvr9bbSWylACg75nC/K7hxb13bP5itusM=";
nativeInstallCheckInputs = [
versionCheckHook
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "phrase-cli";
version = "2.52.0";
version = "2.53.0";
src = fetchFromGitHub {
owner = "phrase";
repo = "phrase-cli";
rev = version;
sha256 = "sha256-y4AsxCtjm3E1nwmSgGelUAa5jajNXfpKLvEjxW7uNrI=";
sha256 = "sha256-G7hIJUGzgMB202Unzrycv9KTkJ88bmRbgVT0v5jA99M=";
};
vendorHash = "sha256-cdoSsESxH1twepMQHg+pl6az6pipbb1LxkpMyMxSCW4=";
vendorHash = "sha256-LyPS2E5v3n7RVV3YEsEUZJZWB5x32TTfeOHAZProuCs=";
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
+3 -3
View File
@@ -5,16 +5,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "pkarr";
version = "5.0.1";
version = "5.0.2";
src = fetchFromGitHub {
owner = "pubky";
repo = "pkarr";
rev = "v${version}";
hash = "sha256-564JL7EG/RB2k2JdxAENpP5UZtKtaGlrZfeYOgsLBEY=";
hash = "sha256-Sh7ly4jmW7XTizsxGV/iDsWjbhxEEall+dUNkEtYahc=";
};
cargoHash = "sha256-HG4cmKQleiWdYBrOgv1Aj/erWjZX5PMwIZpQSQc+sFU=";
cargoHash = "sha256-ikLXNXnU3ysZrB6pcZcusOziBlYM9fCaFvWM6CKe9Zg=";
meta = {
description = "Public Key Addressable Resource Records (sovereign TLDs) ";
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "poutine";
version = "1.0.4";
version = "1.0.5";
src = fetchFromGitHub {
owner = "boostsecurityio";
repo = "poutine";
tag = "v${version}";
hash = "sha256-Rk4Fd/h83NKIVlz/QXOSLnCKfxfKFXUfvUF5FSjomQY=";
hash = "sha256-lAnErnkJY2qU+felYqsbeEBOlCj54unX2iycTWqVAhs=";
};
vendorHash = "sha256-qp3Ko+01kk9AH0oCT2Si/si+74gT5KFtPFslwih/IBE=";
-1
View File
@@ -227,7 +227,6 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "proxysql";
homepage = "https://proxysql.com/";
license = with lib.licenses; [ gpl3Only ];
teams = [ lib.teams.helsinki-systems ];
platforms = lib.platforms.unix;
};
})
@@ -1,6 +1,6 @@
{
lib,
stdenv,
clangStdenv,
fetchgit,
autoreconfHook,
pixman,
@@ -13,7 +13,7 @@
libXext,
}:
stdenv.mkDerivation (finalAttrs: {
clangStdenv.mkDerivation (finalAttrs: {
pname = "quartz-wm";
version = "1.3.2";
+11 -8
View File
@@ -6,29 +6,32 @@
buildGoModule rec {
name = "regal";
version = "0.34.1";
version = "0.37.0";
src = fetchFromGitHub {
owner = "StyraInc";
owner = "open-policy-agent";
repo = "regal";
rev = "v${version}";
hash = "sha256-gdoQ+u9YbwTq28b3gYsNA0SxYFigeKK2JUd0paz8WYQ=";
hash = "sha256-zAp4v1bKz+q+29jlhEccl7o9RWLA+Hn3Kp/UGBQlmA8=";
};
vendorHash = "sha256-FycDMCfvpUkW7KcTLMUBOjbU4JnKCJrWQalNKSY1RkM=";
vendorHash = "sha256-yvUvv8EL3WrsyBnzaGQK4DR+O5Ner9ehkZYCMnfRwRU=";
# Only build the main binary, exclude build/lsp/main.go
subPackages = [ "." ];
ldflags = [
"-s"
"-w"
"-X github.com/styrainc/regal/pkg/version.Version=${version}"
"-X github.com/styrainc/regal/pkg/version.Commit=${version}"
"-X github.com/open-policy-agent/regal/pkg/version.Version=${version}"
"-X github.com/open-policy-agent/regal/pkg/version.Commit=${version}"
];
meta = {
description = "Linter and language server for Rego";
mainProgram = "regal";
homepage = "https://github.com/StyraInc/regal";
changelog = "https://github.com/StyraInc/regal/releases/tag/${src.rev}";
homepage = "https://github.com/open-policy-agent/regal";
changelog = "https://github.com/open-policy-agent/regal/releases/tag/${src.rev}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ rinx ];
};
+2 -2
View File
@@ -25,7 +25,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "river-classic";
version = "0.3.13";
version = "0.3.14";
outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
domain = "codeberg.org";
owner = "river";
repo = "river-classic";
hash = "sha256-XLWvxSChYN5wyhr8R8/3Pfykw61k451XmvgoM45zkEk=";
hash = "sha256-UhWA7jmBDhktHqHds06C0GY+xzlQZZezYopsLmIAGgI=";
tag = "v${finalAttrs.version}";
};
+4 -3
View File
@@ -31,6 +31,10 @@ rustPlatform.buildRustPackage {
hash = "sha256-pPnOM4hpbAkGCV47aw5eHbpOujjFtJa3v/3/D8gybO8=";
};
dontUseZigBuild = true;
dontUseZigCheck = true;
dontUseZigInstall = true;
nativeBuildInputs = [
cmake
zig_0_13
@@ -53,9 +57,6 @@ rustPlatform.buildRustPackage {
cargoHash = "sha256-wJViSHcezoIchWe4Py9j+9U+YJUA5ja/x94UipuWO2g=";
# prevents zig AccessDenied error github.com/ziglang/zig/issues/6810
XDG_CACHE_HOME = "xdg_cache";
preBuild =
let
llvmVersion = builtins.splitVersion llvmPackages.release_version;
+1 -3
View File
@@ -2,6 +2,4 @@
python3Packages,
}:
(python3Packages.toPythonApplication python3Packages.sbom2dot).overrideAttrs (previousAttrs: {
meta.mainProgram = "sbom2dot";
})
python3Packages.toPythonApplication python3Packages.sbom2dot
+1 -3
View File
@@ -2,6 +2,4 @@
python3Packages,
}:
(python3Packages.toPythonApplication python3Packages.sbom4files).overrideAttrs (previousAttrs: {
meta.mainProgram = "sbom4files";
})
python3Packages.toPythonApplication python3Packages.sbom4files

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