Merge aaae520562 into haskell-updates
This commit is contained in:
@@ -200,6 +200,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
|
||||
/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @wolfgangwalther
|
||||
/maintainers/scripts/haskell @sternenseemann @maralorn @wolfgangwalther
|
||||
/pkgs/development/compilers/ghc @sternenseemann @maralorn @wolfgangwalther
|
||||
/pkgs/development/compilers/ghc/9.6.6-debian-binary.nix @sternenseemann @maralorn @wolfgangwalther @OPNA2608
|
||||
/pkgs/development/haskell-modules @sternenseemann @maralorn @wolfgangwalther
|
||||
/pkgs/test/haskell @sternenseemann @maralorn @wolfgangwalther
|
||||
/pkgs/top-level/release-haskell.nix @sternenseemann @maralorn @wolfgangwalther
|
||||
|
||||
@@ -55,10 +55,11 @@ async function checkCommitMessages({ github, context, core }) {
|
||||
|
||||
const logMsgStart = `Commit ${commit.sha}'s message's subject ("${firstLine}")`
|
||||
|
||||
if (!firstLine.includes(':')) {
|
||||
if (!firstLine.includes(': ')) {
|
||||
core.error(
|
||||
`${logMsgStart} was detected as not meeting our guidelines because ` +
|
||||
'it does not contain a colon. There are likely other issues as well.',
|
||||
'it does not contain a colon followed by a whitespace.' +
|
||||
'There are likely other issues as well.',
|
||||
)
|
||||
failures.add(commit.sha)
|
||||
}
|
||||
|
||||
+15
-11
@@ -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
@@ -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": [
|
||||
|
||||
@@ -53,6 +53,8 @@
|
||||
- `kanata` now requires `karabiner-dk` version 6.0+ or later.
|
||||
The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package.
|
||||
|
||||
- Reloading or restarting systemd units from the NixOS activation script is deprecated, and will be removed in NixOS 26.11. This deprecation is part of a bigger effort to deprecate activation scripts altogether, which will take place over several releases. There are no in-tree usages of the now-deprecated reload/restart functionality.
|
||||
|
||||
- `elegant-sddm` has been updated to be Qt6 compatible. Themes for SDDM are slightly different so read the [wiki](https://wiki.nixos.org/wiki/SDDM_Themes) for more.
|
||||
|
||||
- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
@@ -2601,7 +2601,7 @@
|
||||
github = "auscyber";
|
||||
name = "Ivy Pierlot";
|
||||
githubId = 12080502;
|
||||
matrix = "@ivy:faggot.sh";
|
||||
matrix = "@ivy:fargone.sh";
|
||||
};
|
||||
austin-artificial = {
|
||||
email = "austin.platt@artificial.io";
|
||||
@@ -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 = {
|
||||
|
||||
@@ -34,25 +34,6 @@ is also run when `nixos-rebuild dry-activate` is run. To differentiate between
|
||||
real and dry activation, the `$NIXOS_ACTION` environment variable can be
|
||||
read which is set to `dry-activate` when a dry activation is done.
|
||||
|
||||
An activation script can write to special files instructing
|
||||
`switch-to-configuration` to restart/reload units. The script will take these
|
||||
requests into account and will incorporate the unit configuration as described
|
||||
above. This means that the activation script will "fake" a modified unit file
|
||||
and `switch-to-configuration` will act accordingly. By doing so, configuration
|
||||
like [systemd.services.\<name\>.restartIfChanged](#opt-systemd.services) is
|
||||
respected. Since the activation script is run **after** services are already
|
||||
stopped, [systemd.services.\<name\>.stopIfChanged](#opt-systemd.services)
|
||||
cannot be taken into account anymore and the unit is always restarted instead
|
||||
of being stopped and started afterwards.
|
||||
|
||||
The files that can be written to are `/run/nixos/activation-restart-list` and
|
||||
`/run/nixos/activation-reload-list` with their respective counterparts for
|
||||
dry activation being `/run/nixos/dry-activation-restart-list` and
|
||||
`/run/nixos/dry-activation-reload-list`. Those files can contain
|
||||
newline-separated lists of unit names where duplicates are being ignored. These
|
||||
files are not create automatically and activation scripts must take the
|
||||
possibility into account that they have to create them first.
|
||||
|
||||
## NixOS snippets {#sec-activation-script-nixos-snippets}
|
||||
|
||||
There are some snippets NixOS enables by default because disabling them would
|
||||
@@ -63,12 +44,8 @@ do:
|
||||
- `etc` sets up the contents of `/etc`, this includes systemd units and
|
||||
excludes `/etc/passwd`, `/etc/group`, and `/etc/shadow` (which are managed by
|
||||
the `users` snippet)
|
||||
- `hostname` sets the system's hostname in the kernel (not in `/etc`)
|
||||
- `modprobe` sets the path to the `modprobe` binary for module auto-loading
|
||||
- `nix` prepares the nix store and adds a default initial channel
|
||||
- `specialfs` is responsible for mounting filesystems like `/proc` and `sys`
|
||||
- `users` creates and removes users and groups by managing `/etc/passwd`,
|
||||
`/etc/group` and `/etc/shadow`. This also creates home directories
|
||||
- `usrbinenv` creates `/usr/bin/env`
|
||||
- `var` creates some directories in `/var` that are not service-specific
|
||||
- `wrappers` creates setuid wrappers like `sudo`
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -41,6 +41,8 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs "audit" { };
|
||||
|
||||
failureMode = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"silent"
|
||||
@@ -93,7 +95,7 @@ in
|
||||
"audit_backlog_limit=${toString cfg.backlogLimit}"
|
||||
];
|
||||
|
||||
environment.systemPackages = [ pkgs.audit ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
# upstream contains a audit-rules.service, which uses augenrules.
|
||||
# That script does not handle cleanup correctly and insists on loading from /etc/audit.
|
||||
@@ -119,12 +121,12 @@ in
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${lib.getExe' pkgs.audit "auditctl"} -R ${rules}/audit.rules";
|
||||
ExecStart = "${lib.getExe' cfg.package "auditctl"} -R ${rules}/audit.rules";
|
||||
ExecStopPost = [
|
||||
# Disable auditing
|
||||
"${lib.getExe' pkgs.audit "auditctl"} -e 0"
|
||||
"${lib.getExe' cfg.package "auditctl"} -e 0"
|
||||
# Delete all rules
|
||||
"${lib.getExe' pkgs.audit "auditctl"} -D"
|
||||
"${lib.getExe' cfg.package "auditctl"} -D"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -101,6 +101,8 @@ in
|
||||
options.security.auditd = {
|
||||
enable = lib.mkEnableOption "the Linux Audit daemon";
|
||||
|
||||
package = lib.mkPackageOption pkgs "auditd" { default = "audit"; };
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
freeformType = lib.types.attrsOf settingsType;
|
||||
@@ -146,7 +148,7 @@ in
|
||||
defaultText = lib.literalExpression ''
|
||||
{
|
||||
af_unix = {
|
||||
path = lib.getExe' pkgs.audit "audisp-af_unix";
|
||||
path = lib.getExe' config.security.auditd.package "audisp-af_unix";
|
||||
args = [
|
||||
"0640"
|
||||
"/var/run/audispd_events"
|
||||
@@ -155,15 +157,15 @@ in
|
||||
format = "binary";
|
||||
};
|
||||
remote = {
|
||||
path = lib.getExe' pkgs.audit "audisp-remote";
|
||||
path = lib.getExe' config.security.auditd.package "audisp-remote";
|
||||
settings = { };
|
||||
};
|
||||
filter = {
|
||||
path = lib.getExe' pkgs.audit "audisp-filter";
|
||||
path = lib.getExe' config.security.auditd.package "audisp-filter";
|
||||
args = [
|
||||
"allowlist"
|
||||
"/etc/audit/audisp-filter.conf"
|
||||
(lib.getExe' pkgs.audit "audisp-syslog")
|
||||
(lib.getExe' config.security.auditd.package "audisp-syslog")
|
||||
"LOG_USER"
|
||||
"LOG_INFO"
|
||||
"interpret"
|
||||
@@ -171,7 +173,7 @@ in
|
||||
settings = { };
|
||||
};
|
||||
syslog = {
|
||||
path = lib.getExe' pkgs.audit "audisp-syslog";
|
||||
path = lib.getExe' config.security.auditd.package "audisp-syslog";
|
||||
args = [ "LOG_INFO" ];
|
||||
};
|
||||
}
|
||||
@@ -226,7 +228,7 @@ in
|
||||
|
||||
security.auditd.plugins = {
|
||||
af_unix = {
|
||||
path = lib.getExe' pkgs.audit "audisp-af_unix";
|
||||
path = lib.getExe' cfg.package "audisp-af_unix";
|
||||
args = [
|
||||
"0640"
|
||||
"/run/audit/audispd_events"
|
||||
@@ -235,15 +237,15 @@ in
|
||||
format = "binary";
|
||||
};
|
||||
remote = {
|
||||
path = lib.getExe' pkgs.audit "audisp-remote";
|
||||
path = lib.getExe' cfg.package "audisp-remote";
|
||||
settings = { };
|
||||
};
|
||||
filter = {
|
||||
path = lib.getExe' pkgs.audit "audisp-filter";
|
||||
path = lib.getExe' cfg.package "audisp-filter";
|
||||
args = [
|
||||
"allowlist"
|
||||
"/etc/audit/audisp-filter.conf"
|
||||
(lib.getExe' pkgs.audit "audisp-syslog")
|
||||
(lib.getExe' cfg.package "audisp-syslog")
|
||||
"LOG_USER"
|
||||
"LOG_INFO"
|
||||
"interpret"
|
||||
@@ -251,12 +253,12 @@ in
|
||||
settings = { };
|
||||
};
|
||||
syslog = {
|
||||
path = lib.getExe' pkgs.audit "audisp-syslog";
|
||||
path = lib.getExe' cfg.package "audisp-syslog";
|
||||
args = [ "LOG_INFO" ];
|
||||
};
|
||||
};
|
||||
|
||||
systemd.packages = [ pkgs.audit.out ];
|
||||
systemd.packages = [ cfg.package.out ];
|
||||
|
||||
systemd.services.auditd = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
@@ -271,7 +273,7 @@ in
|
||||
ExecStart = [
|
||||
# the upstream unit does not allow symlinks, so clear and rewrite the ExecStart
|
||||
""
|
||||
"${lib.getExe' pkgs.audit "auditd"} -l -s nochange"
|
||||
"${lib.getExe' cfg.package "auditd"} -l -s nochange"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -332,7 +332,7 @@ in
|
||||
services.power-profiles-daemon.enable = mkDefault true;
|
||||
services.gnome.at-spi2-core.enable = true;
|
||||
services.gnome.evolution-data-server.enable = true;
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
services.gnome.gnome-keyring.enable = mkDefault true;
|
||||
services.gnome.gcr-ssh-agent.enable = mkDefault true;
|
||||
services.gnome.gnome-online-accounts.enable = mkDefault true;
|
||||
services.gnome.localsearch.enable = mkDefault true;
|
||||
|
||||
@@ -245,9 +245,9 @@ in
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@chown"
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"@chown"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -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 =
|
||||
|
||||
@@ -12,20 +12,20 @@ let
|
||||
# update-script-start: urls
|
||||
urls = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.tar.gz";
|
||||
hash = "sha256-kMilT2GSRaVDXDQ/lPOVlatZzTy62laeKx4ovKzby0o=";
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.1.tar.gz";
|
||||
hash = "sha256-j/WgB1G/b1x8RIXT1LWdcgISCCqHOmqLatfOzpV4T8Y=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.tar.gz";
|
||||
hash = "sha256-IE7T9yYod9Ckaq8wxbr7cha06XNr6+5xQlyZPBhIavg=";
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.1-aarch64.tar.gz";
|
||||
hash = "sha256-7UKtan4cuM7svjWayM2SThGemASTSrAxKVk0TUwEgbg=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.dmg";
|
||||
hash = "sha256-KC/X8wLZWt7tAi+NbGedMpJ3j5YgU5SvUt0JD2IB8zg=";
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.1.dmg";
|
||||
hash = "sha256-5Dnb9xwtAid63j6ntU5YIZN+oVLzZsXNJexGpL8m9sM=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.dmg";
|
||||
hash = "sha256-sQyr2pPIjSe8wTWkSh/Zj+YP6DBWBtbnWg1bc28N8nQ=";
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.1-aarch64.dmg";
|
||||
hash = "sha256-24ZD2GpM4pGrJyqxyEJSQsERINR6/dNhLtd3WtzmNaU=";
|
||||
};
|
||||
};
|
||||
# update-script-end: urls
|
||||
@@ -40,8 +40,8 @@ mkJetBrainsProduct {
|
||||
productShort = "Gateway";
|
||||
|
||||
# update-script-start: version
|
||||
version = "2025.3";
|
||||
buildNumber = "253.28294.342";
|
||||
version = "2025.3.1";
|
||||
buildNumber = "253.29346.239";
|
||||
# update-script-end: version
|
||||
|
||||
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
|
||||
@@ -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 =
|
||||
|
||||
@@ -12,20 +12,20 @@ let
|
||||
# update-script-start: urls
|
||||
urls = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.jetbrains.com/go/goland-2025.3.tar.gz";
|
||||
hash = "sha256-YVGFYobqVG64r5rrAldyzua9VxNPRUlKgY6NogqGkcY=";
|
||||
url = "https://download.jetbrains.com/go/goland-2025.3.1.tar.gz";
|
||||
hash = "sha256-FhhHHmKbil4YZ2TdHPQBor2arTui/3j92Jb1Gncn+Uo=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.jetbrains.com/go/goland-2025.3-aarch64.tar.gz";
|
||||
hash = "sha256-xTDdS8x6B1oEC2SFnss0FCyPwDmWJcWhOuLXqPWXQ0A=";
|
||||
url = "https://download.jetbrains.com/go/goland-2025.3.1-aarch64.tar.gz";
|
||||
hash = "sha256-5lsXviK9nwHogCCwVTkeqIBe1G/ZWDUzD3z7Hyx6y0Y=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.jetbrains.com/go/goland-2025.3.dmg";
|
||||
hash = "sha256-4d9PELFYx3iHNlWWZiROmUUApA21sIZh4mkTV9Jp2/Q=";
|
||||
url = "https://download.jetbrains.com/go/goland-2025.3.1.dmg";
|
||||
hash = "sha256-QBsP0ar6550uZpj1JEutHSRHMrgfDZI8fZ7sZ7uoulk=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.jetbrains.com/go/goland-2025.3-aarch64.dmg";
|
||||
hash = "sha256-1O4gtcPfYVHTZtbMmwa5FUmf8MHrEYSqtToBB4kI7Ik=";
|
||||
url = "https://download.jetbrains.com/go/goland-2025.3.1-aarch64.dmg";
|
||||
hash = "sha256-yVmu/WfRsERQkySjCWW3PB4p/XCOAHF8/g6Op1ibsFA=";
|
||||
};
|
||||
};
|
||||
# update-script-end: urls
|
||||
@@ -39,8 +39,8 @@ in
|
||||
product = "Goland";
|
||||
|
||||
# update-script-start: version
|
||||
version = "2025.3";
|
||||
buildNumber = "253.28294.337";
|
||||
version = "2025.3.1";
|
||||
buildNumber = "253.29346.255";
|
||||
# update-script-end: version
|
||||
|
||||
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
|
||||
@@ -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 =
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
let
|
||||
src = mkJetBrainsSource {
|
||||
# update-script-start: source-args
|
||||
version = "2025.3.1";
|
||||
buildNumber = "253.29346.138";
|
||||
version = "2025.3.1.1";
|
||||
buildNumber = "253.29346.240";
|
||||
buildType = "idea";
|
||||
ideaHash = "sha256-eAq/lgv6ZcN9SR2E1KYnnhDHe/rBQ3GqqbbF6GstDoU=";
|
||||
ideaHash = "sha256-L5O6QjDY3SqSQ1DnQTjIez7pIvPAdtOXP/+B05bAV+Q=";
|
||||
androidHash = "sha256-quMCzrjCKIo1pkzw4PWewAs5tz7A2aq7TI5zd+QaaUY=";
|
||||
jpsHash = "sha256-iHpt926BDLNUwHRXvkqVgwlWiLo1qSZEaGeJcS0Fjmk=";
|
||||
restarterHash = "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag=";
|
||||
@@ -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";
|
||||
|
||||
@@ -12,20 +12,20 @@ let
|
||||
# update-script-start: urls
|
||||
urls = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.tar.gz";
|
||||
hash = "sha256-/Yk3q2t5YFzvyZF//moI4FprfMAlb6IXhiPSTsMi+ik=";
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1.tar.gz";
|
||||
hash = "sha256-u5b/elgB4/kMrgkgyqhz4L2BZqsNqt6Fwb+JIC1eSEk=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.tar.gz";
|
||||
hash = "sha256-dkhmf4W0xFkosE1MJvIogqiqZaeHpk+i96/+UaG8KmE=";
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1-aarch64.tar.gz";
|
||||
hash = "sha256-iHIsnxTpuunA/L8/ZQsbQCqEfIu2lvtNNq9V0yPvBvY=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.dmg";
|
||||
hash = "sha256-EZiLzuXZSycepnrqzT6DYClZWmz+v+wmWVZfwYpK0tE=";
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1.dmg";
|
||||
hash = "sha256-L4brbVVJgRgv/A2yu3oDGycWX6z5IiDf/7Zd/W2V2tk=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.dmg";
|
||||
hash = "sha256-BFPgpu6Gw8v5e4xI8oJnUdgIW/ghG1QaBHUmIcWvFrw=";
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.1-aarch64.dmg";
|
||||
hash = "sha256-I1j18NK10Vda4F2VOIm3mvjqUvhFMc7OYq1NpyRG+bw=";
|
||||
};
|
||||
};
|
||||
# update-script-end: urls
|
||||
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
|
||||
product = "PhpStorm";
|
||||
|
||||
# update-script-start: version
|
||||
version = "2025.3.1";
|
||||
buildNumber = "253.29346.151";
|
||||
version = "2025.3.1.1";
|
||||
buildNumber = "253.29346.257";
|
||||
# update-script-end: version
|
||||
|
||||
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
|
||||
@@ -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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.1";
|
||||
hash = "sha256-28vuJwUDHcJAVqnHsIVw1t6DXAhzMqmgh0MHC+mcmJQ=";
|
||||
version = "2.1.3";
|
||||
hash = "sha256-UH4f3SZbKQTJS4w0AsZMLpmHg0+kyUYZkHOzy2R5Amo=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-augment";
|
||||
publisher = "augment";
|
||||
version = "0.696.2";
|
||||
hash = "sha256-HV4z7qmFXFGrgBXE6oO+GVqD0zWWtkE743FAbG7oVp4=";
|
||||
version = "0.731.1";
|
||||
hash = "sha256-Kv47LVomNt/u0fJKos/R7Q0hhBesOGXGPu5QHaaOKEQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -81,14 +81,14 @@ let
|
||||
];
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.40.13";
|
||||
version = "3.40.14";
|
||||
pname = "qgis-ltr-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-2VPgD7ycj26cTpl16BSEukNEuUXtP25HwG2fRWBXNrU=";
|
||||
hash = "sha256-/AA3ATNjXj95XILyyfX8c5Sww2aUqlMXxGf8chwUbFY=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -81,7 +81,7 @@ let
|
||||
];
|
||||
in
|
||||
mkDerivation rec {
|
||||
version = "3.44.5";
|
||||
version = "3.44.6";
|
||||
pname = "qgis-unwrapped";
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -92,7 +92,7 @@ mkDerivation rec {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-VrI3pk7Qi0A9D7ONl18YeX9cFS6NfSU2Hvrzx8JIoXo=";
|
||||
hash = "sha256-gC7luJpGSrKHRmgOetrLDE8zegbE/4QjM+aHaew5pGM=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -52,13 +52,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-e7Wjda+CobYatblvVCGkMAO2aWrdSCp7q+qIEGnGDCY=";
|
||||
};
|
||||
|
||||
# Fix hangs in tests, hopefully
|
||||
# FIXME: remove in next release
|
||||
patches = [
|
||||
# Fix hangs in tests, hopefully
|
||||
# FIXME: remove in next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/sane-project/backends/-/commit/8acc267d5f4049d8438456821137ae56e91baea9.patch";
|
||||
hash = "sha256-IyupDeH1MPvEBnGaUzBbCu106Gp7zXxlPGFAaiiINQI=";
|
||||
})
|
||||
# Fix multipages scanning
|
||||
# https://gitlab.com/sane-project/backends/-/merge_requests/883
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/sane-project/backends/-/commit/fbf80b0fc1d262ed40d4b49dd53c14707083ef60.patch";
|
||||
hash = "sha256-9KKTr7p1vCgvGr6hFY83K5gbL7Ilm4Uzc86JIxv+ahI=";
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tesseract";
|
||||
version = "5.5.1";
|
||||
version = "5.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tesseract-ocr";
|
||||
repo = "tesseract";
|
||||
rev = version;
|
||||
sha256 = "sha256-bLTYdT9CNfgrmmjP6m0rRqJDHiSOkcuGVCFwPqT12jk=";
|
||||
sha256 = "sha256-VLmKwycJK66fFkdWOSYO5OJkJC8MTWKTQWIVb243ekc=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -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="
|
||||
},
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"linux-canary": {
|
||||
"hash": "sha256-Ed/VSiwvpwbdcL4v2v/bd1M3g27mQ7+n0RbqqeZdcYU=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.832/discord-canary-0.0.832.tar.gz",
|
||||
"version": "0.0.832"
|
||||
"hash": "sha256-2o0SBMbtozibAIL7lHDJ2LfNjbDKY578PvcNdFs/AC4=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.844/discord-canary-0.0.844.tar.gz",
|
||||
"version": "0.0.844"
|
||||
},
|
||||
"linux-development": {
|
||||
"hash": "sha256-EVkjWoqWl9Z+iHCLPOLu4PIUb2wC3HVcPVjOVz++IVw=",
|
||||
@@ -10,9 +10,9 @@
|
||||
"version": "0.0.94"
|
||||
},
|
||||
"linux-ptb": {
|
||||
"hash": "sha256-79uScgULDIh+Ci8RHSEDT8y8xX5mxFbbPQ+TJn7iPZU=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.171/discord-ptb-0.0.171.tar.gz",
|
||||
"version": "0.0.171"
|
||||
"hash": "sha256-szmKLp+aXZjrWClTOQ+NTwenY7b5c3eONFUUmszfUSk=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.172/discord-ptb-0.0.172.tar.gz",
|
||||
"version": "0.0.172"
|
||||
},
|
||||
"linux-stable": {
|
||||
"hash": "sha256-/NfgHBXsUWYoDEVGz13GBU1ISpSdB5OmrjhSN25SBMg=",
|
||||
@@ -20,9 +20,9 @@
|
||||
"version": "0.0.119"
|
||||
},
|
||||
"osx-canary": {
|
||||
"hash": "sha256-x/9U+cb1M8MXG99PriElUA+ZGIULMsNRLaNB542ac4w=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.936/DiscordCanary.dmg",
|
||||
"version": "0.0.936"
|
||||
"hash": "sha256-qh5+hCEQXivdugj5jzS+i1ftmyh6l2YEE63oS+qV2Go=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.948/DiscordCanary.dmg",
|
||||
"version": "0.0.948"
|
||||
},
|
||||
"osx-development": {
|
||||
"hash": "sha256-y840b3WlWnSK+22l7AoasQbDmbB+2LOzbxA13yJxrPA=",
|
||||
@@ -30,9 +30,9 @@
|
||||
"version": "0.0.106"
|
||||
},
|
||||
"osx-ptb": {
|
||||
"hash": "sha256-AxO2DxBelp2mtYUWot/WtIa72Du53gGCcmPnx+x1FOw=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.203/DiscordPTB.dmg",
|
||||
"version": "0.0.203"
|
||||
"hash": "sha256-tjWbvWOvSinVZDvJYFFcbmr+y7W5PmIr/alrS82ECBo=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.204/DiscordPTB.dmg",
|
||||
"version": "0.0.204"
|
||||
},
|
||||
"osx-stable": {
|
||||
"hash": "sha256-OjHYJNZlM/cOLM61qvoauzNl3f/GVPdJMsnM+kxc/38=",
|
||||
|
||||
+2
-2
@@ -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 = [
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "wee-slack";
|
||||
version = "2.11.0";
|
||||
version = "2.11.0-unstable-2026-01-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "wee-slack";
|
||||
owner = "wee-slack";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xQO/yi4pJSnO/ldzVQkC7UhAfpy57xzO58NV7KZm4E8=";
|
||||
rev = "08a9cd05d482772e79d879e0b99ddd66a94d979d";
|
||||
hash = "sha256-9S8XI+ZSzXcWOQbH6hxZ3N8VEczRE0+xxh5w9dqTL00=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
|
||||
name = "wee-slack-env";
|
||||
paths = with python3Packages; [
|
||||
websocket-client
|
||||
six
|
||||
];
|
||||
}
|
||||
}/${python3Packages.python.sitePackages}";
|
||||
|
||||
@@ -188,3 +188,15 @@ index e37df27fd817..937c12e8c4c5 100644
|
||||
saveAsPDF(u"tdf163105-kashida-spaces.fodt");
|
||||
|
||||
auto pPdfDocument = parsePDFExport();
|
||||
diff --git a/sc/qa/unit/functions_array.cxx b/sc/qa/unit/functions_array.cxx
|
||||
index ef0da39f5..43caa9002 100644
|
||||
--- a/sc/qa/unit/functions_array.cxx
|
||||
+++ b/sc/qa/unit/functions_array.cxx
|
||||
@@ -25,6 +25,7 @@ void ArrayFunctionsTest::testArrayFormulasFODS()
|
||||
|
||||
void ArrayFunctionsTest::testDubiousArrayFormulasFODS()
|
||||
{
|
||||
+ return; // flaky https://github.com/NixOS/nixpkgs/issues/398633
|
||||
//TODO: sc/qa/unit/data/functions/array/dubious/fods/linest.fods produces widely different
|
||||
// values when built with -ffp-contract enabled (-ffp-contract=on default on Clang 14,
|
||||
// -ffp-contract=fast default when building with optimizations on GCC) on at least aarch64
|
||||
|
||||
@@ -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=";
|
||||
},
|
||||
|
||||
...
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.34.3";
|
||||
version = "1.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2Avq1EzK+i+16yoPM7j6IlavDi2oUS5A1hOIdzVThEQ=";
|
||||
hash = "sha256-aP3qhD2d1x+VPDifkg9lXgVD38UcongyN6vHkn8oYos=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "abbreviate";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dnnrly";
|
||||
repo = "abbreviate";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-foGg+o+BbPsfpph+XHIfyPaknQD1N1rcZW58kgZ5HYM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9z3M3FEjllNpae+5EcLVkF1rAtOQzUQGebJeU7QsmTA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd abbreviate \
|
||||
--bash <($out/bin/abbreviate completion bash) \
|
||||
--fish <($out/bin/abbreviate completion fish) \
|
||||
--zsh <($out/bin/abbreviate completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Shorten your strings using common abbreviations";
|
||||
mainProgram = "abbreviate";
|
||||
homepage = "https://github.com/dnnrly/abbreviate";
|
||||
changelog = "https://github.com/dnnrly/abbreviate/releases/tag/${src.rev}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -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 ];
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "Adwaita Sans, a variation of Inter, and Adwaita Mono, Iosevka customized to match Inter";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/adwaita-fonts";
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.qxrein ];
|
||||
teams = [ lib.teams.gnome ];
|
||||
};
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "anew";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomnomnom";
|
||||
repo = "anew";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NQSs99/2GPOtXkO7k+ar16G4Ecu4CPGMd/CTwEhcyto=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Tool for adding new lines to files, skipping duplicates";
|
||||
mainProgram = "anew";
|
||||
homepage = "https://github.com/tomnomnom/anew";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,26 +7,31 @@
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
icoutils,
|
||||
fetchpatch2,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "antares";
|
||||
version = "0.7.29";
|
||||
version = "0.7.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antares-sql";
|
||||
repo = "antares";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3zgr3Eefx3WDUW9/1NOaneUbFy3GTnJ3tGgivtW1K/g=";
|
||||
hash = "sha256-A/ievIKXfFGu90aijxhmEWvfg2RqDtd7AtU+iyma3lU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-WJ5HVVa4rEOsvr52L/OGk+vlxRiKLJTxWmUnpN1FnbY=";
|
||||
npmDepsHash = "sha256-X2dG75fpeXeU40wb22KAI7tDBybFwWUpKVj0Mlo3xhc=";
|
||||
|
||||
patches = [
|
||||
# Since version 0.7.28, package-lock is not updated properly so this patch update it to be able to build the package
|
||||
# This patch will probably be removed in the next version
|
||||
# If it does not build without it, you just need to do a npm update in the antares project and copy the patch
|
||||
./npm-lock.patch
|
||||
# https://github.com/antares-sql/antares/pull/1005
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/antares-sql/antares/commit/6b2a45d93cf7fefdc92e0d87f390cd21a069b9a4.patch?full_index=1";
|
||||
hash = "sha256-2dOGY0K6jMxSLNLDhwy/+ysTRB24XRXSoDu1AVxi4w4=";
|
||||
})
|
||||
];
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "astronomer";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ullaakut";
|
||||
repo = "astronomer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4hUfJI2BRZl3Trk8F2qLZAyA57kq0oW9/e13atj/BVg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EOtpZPIrAVMPIZGnkZoNs7ovaR7Ts3dJsFLXClIoNVI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Tool to detect illegitimate stars from bot accounts on GitHub projects";
|
||||
homepage = "https://github.com/Ullaakut/astronomer";
|
||||
changelog = "https://github.com/Ullaakut/astronomer/releases/tag/${src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
mainProgram = "astronomer";
|
||||
};
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
intltool,
|
||||
glib,
|
||||
dbus,
|
||||
gtk3,
|
||||
libappindicator-gtk3,
|
||||
gst_all_1,
|
||||
librsvg,
|
||||
wrapGAppsHook3,
|
||||
pulseaudioSupport ? true,
|
||||
libpulseaudio,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "audio-recorder";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
name = "audio-recorder-${finalAttrs.version}.tar.gz";
|
||||
url = "https://launchpad.net/~audio-recorder/+archive/ubuntu/ppa/+files/audio-recorder_${finalAttrs.version}%7Ejammy.tar.gz";
|
||||
hash = "sha256-RQ8zAT98EdVgdHENX0WDDYGvu7XjoB7f2FPv2JYJqug=";
|
||||
};
|
||||
|
||||
# https://bugs.launchpad.net/audio-recorder/+bug/1784622
|
||||
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
dbus
|
||||
gtk3
|
||||
librsvg
|
||||
libappindicator-gtk3
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-libav
|
||||
])
|
||||
++ lib.optional pulseaudioSupport libpulseaudio;
|
||||
|
||||
meta = {
|
||||
description = "Audio recorder for GNOME and Unity Desktops";
|
||||
mainProgram = "audio-recorder";
|
||||
longDescription = ''
|
||||
This program allows you to record your favourite music or audio to a file.
|
||||
It can record audio from your system soundcard, microphones, browsers and
|
||||
webcams. Put simply; if it plays out of your loudspeakers you can record it.
|
||||
This program has a timer that can start, stop or pause recording on certain
|
||||
conditions such as audio level, file size and clock time. This recorder can
|
||||
automatically record your Skype calls. It supports several audio (output)
|
||||
formats such as OGG audio, Flac, MP3 and WAV.
|
||||
'';
|
||||
homepage = "https://launchpad.net/~audio-recorder";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.msteen ];
|
||||
};
|
||||
})
|
||||
@@ -1,12 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
config,
|
||||
buildNimPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
withHEVC ? true,
|
||||
withWhisper ? false,
|
||||
withWhisper ? false, # TODO: Investigate linker failure. See PR 476678
|
||||
withVpx ? true,
|
||||
withSvtAv1 ? true,
|
||||
withCuda ? false,
|
||||
|
||||
ffmpeg,
|
||||
ffmpeg-full,
|
||||
yt-dlp,
|
||||
lame,
|
||||
libopus,
|
||||
@@ -15,6 +20,7 @@
|
||||
x265,
|
||||
dav1d,
|
||||
svt-av1,
|
||||
libvpl,
|
||||
whisper-cpp,
|
||||
|
||||
python3,
|
||||
@@ -23,42 +29,36 @@
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "auto-editor";
|
||||
version = "29.4.0";
|
||||
version = "29.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WyattBlue";
|
||||
repo = "auto-editor";
|
||||
tag = version;
|
||||
hash = "sha256-DzgR/GyVIUq6Dfes6OnTdYO/vyGBPcKSeD2IikF7sIM=";
|
||||
hash = "sha256-7/ey7nZdy1SnGdW5LjX7dtxyqqvrTuIvtJXMXYVYB6k=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
ffmpeg-full
|
||||
lame
|
||||
libopus
|
||||
libvpx
|
||||
x264
|
||||
dav1d
|
||||
svt-av1
|
||||
]
|
||||
++ lib.optionals withHEVC [
|
||||
x265
|
||||
]
|
||||
++ lib.optionals withWhisper [
|
||||
whisper-cpp
|
||||
];
|
||||
++ lib.optionals withHEVC [ x265 ]
|
||||
++ lib.optionals withWhisper [ whisper-cpp ]
|
||||
++ lib.optionals withVpx [ libvpx ]
|
||||
++ lib.optionals withSvtAv1 [ svt-av1 ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libvpl ];
|
||||
|
||||
nimFlags = [
|
||||
"--passc:-Wno-incompatible-pointer-types"
|
||||
]
|
||||
++ lib.optionals withHEVC [
|
||||
"-d:enable_hevc"
|
||||
]
|
||||
++ lib.optionals withWhisper [
|
||||
"-d:enable_whisper"
|
||||
];
|
||||
nimFlags =
|
||||
lib.optionals withHEVC [ "-d:enable_hevc" ]
|
||||
++ lib.optionals withWhisper [ "-d:enable_whisper" ]
|
||||
++ lib.optionals withVpx [ "-d:enable_vpx" ]
|
||||
++ lib.optionals withSvtAv1 [ "-d:enable_svtav1" ]
|
||||
++ lib.optionals withCuda [ "-d:enable_cuda" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/log.nim \
|
||||
@@ -77,7 +77,7 @@ buildNimPackage rec {
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
eval "nim r --nimcache:$NIX_BUILD_TOP/nimcache $nimFlags $src/tests/rationals.nim"
|
||||
eval "nim r --nimcache:$NIX_BUILD_TOP/nimcache $nimFlags $src/tests/unit.nim"
|
||||
|
||||
substituteInPlace tests/test.py \
|
||||
--replace-fail '"./auto-editor"' "\"$out/bin/main\""
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
wrapGAppsHook3,
|
||||
cairo,
|
||||
dblatex,
|
||||
ghostscript,
|
||||
gnumake,
|
||||
gobject-introspection,
|
||||
graphicsmagick,
|
||||
@@ -23,6 +24,33 @@
|
||||
pkg-config,
|
||||
poppler,
|
||||
}:
|
||||
let
|
||||
perlWithPackages = perl.withPackages (
|
||||
p: with p; [
|
||||
ArchiveZip
|
||||
Cairo
|
||||
CairoGObject
|
||||
DBDSQLite
|
||||
DBI
|
||||
EmailAddress
|
||||
EmailMIME
|
||||
EmailSender
|
||||
EmailSimple
|
||||
Glib
|
||||
GlibObjectIntrospection
|
||||
Gtk3
|
||||
HashMerge
|
||||
LocaleGettext
|
||||
NetCUPS
|
||||
OpenOfficeOODoc
|
||||
PerlMagick
|
||||
TextCSV
|
||||
XMLParser
|
||||
XMLSimple
|
||||
XMLWriter
|
||||
]
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "auto-multiple-choice";
|
||||
version = "1.7.0";
|
||||
@@ -36,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = [
|
||||
"PERLPATH=${perl}/bin/perl"
|
||||
"PERLPATH=${perlWithPackages}/bin/perl"
|
||||
# We *need* to set DESTDIR as empty and use absolute paths below,
|
||||
# because the Makefile ignores PREFIX and MODSDIR is required to
|
||||
# be an absolute path to not trigger "portable distribution" check
|
||||
@@ -72,30 +100,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/auto-multiple-choice \
|
||||
''${makeWrapperArgs[@]} \
|
||||
--prefix PERL5LIB : "${
|
||||
with perlPackages;
|
||||
makeFullPerlPath [
|
||||
ArchiveZip
|
||||
DBDSQLite
|
||||
Cairo
|
||||
CairoGObject
|
||||
DBI
|
||||
Glib
|
||||
GlibObjectIntrospection
|
||||
Gtk3
|
||||
HashMerge
|
||||
LocaleGettext
|
||||
OpenOfficeOODoc
|
||||
PerlMagick
|
||||
TextCSV
|
||||
XMLParser
|
||||
XMLSimple
|
||||
XMLWriter
|
||||
]
|
||||
}:"$out/share/perl5 \
|
||||
--prefix PERL5LIB : $out/share/perl5 \
|
||||
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
|
||||
--prefix PATH : "$out/bin" \
|
||||
--set TEXINPUTS ":.:$out/tex/latex"
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
(placeholder "out")
|
||||
ghostscript
|
||||
netpbm
|
||||
]
|
||||
} \
|
||||
--set TEXINPUTS ".:$out/tex/latex:"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -121,24 +135,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
opencv
|
||||
pango
|
||||
poppler
|
||||
]
|
||||
++ (with perlPackages; [
|
||||
perl
|
||||
ArchiveZip
|
||||
Cairo
|
||||
CairoGObject
|
||||
DBDSQLite
|
||||
DBI
|
||||
Glib
|
||||
GlibObjectIntrospection
|
||||
Gtk3
|
||||
LocaleGettext
|
||||
PerlMagick
|
||||
TextCSV
|
||||
XMLParser
|
||||
XMLSimple
|
||||
XMLWriter
|
||||
]);
|
||||
perlWithPackages
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tlType = "run";
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -57,13 +57,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bambu-studio";
|
||||
version = "02.03.01.51";
|
||||
version = "02.04.00.70";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bambulab";
|
||||
repo = "BambuStudio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SnWOTFymTVHzYqraMzohOrpM0UuLW+PRfZBqkFASEWs=";
|
||||
hash = "sha256-BrH8gKbc0y76wbWrQxU+0xMJcYAm4Gi/xmECVf6pGkI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -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,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.85.118";
|
||||
version = "1.85.120";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-xn7x6O2JVKu2KlcMXSo7P4oTYfVyC1S4OIemXK82vD0=";
|
||||
hash = "sha256-Q645SeKK2oBfzVOVwKi+VgjkcKA3hyBCK1uYkey29Zk=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-I++3Oq+iW4uuccKiSa5FwS652aT+tFQI0D0n4Nq6U1w=";
|
||||
hash = "sha256-5Sa1dfX3uMUkTi/AKLRuf/lmdPXuyVHPD7eN7EUAiRo=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-Igh0anjOkf+nemi4hi6kOu49+oXL4cQ0z7bxjyAt5AU=";
|
||||
hash = "sha256-XNafmhhPIo1McFVHERpefQFDCLQZJFreoReySyUYAkY=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-NxL7IsFhPIthG8kO1wO6lbxqlghixZvnsgTbLfi2OX4=";
|
||||
hash = "sha256-BqNhfkNMsnbydr+fnHiXhQih2UjpzbjeD+VNrvA3CNU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
clang_20,
|
||||
buildNpmPackage,
|
||||
nodejs_22,
|
||||
bruno,
|
||||
pkg-config,
|
||||
pango,
|
||||
@@ -21,6 +22,9 @@ buildNpmPackage {
|
||||
# to keep them in sync with easier maintenance
|
||||
inherit (bruno) version src npmDepsHash;
|
||||
|
||||
# npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmWorkspace = "packages/bruno-cli";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
@@ -45,6 +49,7 @@ buildNpmPackage {
|
||||
|
||||
npm run build --workspace=packages/bruno-common
|
||||
npm run build --workspace=packages/bruno-graphql-docs
|
||||
npm run build --workspace=packages/bruno-schema-types
|
||||
npm run build --workspace=packages/bruno-converters
|
||||
npm run build --workspace=packages/bruno-query
|
||||
npm run build --workspace=packages/bruno-filestore
|
||||
@@ -64,12 +69,12 @@ buildNpmPackage {
|
||||
pushd $out/lib/node_modules/usebruno
|
||||
|
||||
# packages used by the GUI app, unused by CLI
|
||||
rm -r packages/bruno-{app,electron,tests,toml,schema,docs}
|
||||
rm -r packages/bruno-{app,electron,tests,toml,docs}
|
||||
rm node_modules/bruno
|
||||
rm node_modules/@usebruno/{app,tests,toml,schema}
|
||||
rm node_modules/@usebruno/{app,tests,toml}
|
||||
|
||||
# heavy dependencies that seem to be unused
|
||||
rm -rf node_modules/{@tabler,pdfjs-dist,*redux*,prettier,@types*,*react*,*graphiql*}
|
||||
rm -rf node_modules/{@tabler,pdfjs-dist,*redux*,prettier,@types*,*react*,*graphiql*,@swagger-api}
|
||||
rm -r node_modules/.bin
|
||||
|
||||
# unused file types
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bruno";
|
||||
version = "2.15.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-REK3rJ+Svf6bLIfLwizlLa3rIBgnhQHbhzTTe8VPoc4=";
|
||||
hash = "sha256-lvv1SJuUxNwukg/yi6mhgvVs8M/Eyf2H36NJN+6XKSE=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
@@ -36,7 +36,7 @@ buildNpmPackage rec {
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-CXXXyDaaoAoZhUo1YNP3PUEGzlmIaDnA+JhrCqBY1H4=";
|
||||
npmDepsHash = "sha256-zb0oP4/L7449z83tpcT6W/6sXS4Urph3ELN9kUC32dA=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -102,6 +102,7 @@ buildNpmPackage rec {
|
||||
|
||||
npm run build --workspace=packages/bruno-common
|
||||
npm run build --workspace=packages/bruno-graphql-docs
|
||||
npm run build --workspace=packages/bruno-schema-types
|
||||
npm run build --workspace=packages/bruno-converters
|
||||
npm run build --workspace=packages/bruno-app
|
||||
npm run build --workspace=packages/bruno-query
|
||||
@@ -167,6 +168,11 @@ buildNpmPackage rec {
|
||||
makeWrapper ${lib.getExe electron} $out/bin/bruno \
|
||||
--add-flags $out/opt/bruno/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
stdenv.cc.cc.lib
|
||||
]
|
||||
} \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--inherit-argv0
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bulky";
|
||||
version = "4.0";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "bulky";
|
||||
tag = version;
|
||||
hash = "sha256-BHMCtvnz3Ua4pa3Pnh2PbxZ9a0vJOJ+Se2/DaPbUqQA=";
|
||||
hash = "sha256-rUQ4GN8Pj7dXLbQBt99RmFk4rs+mFL/1taFJiTTVC2A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "camunda-modeler";
|
||||
version = "5.42.0";
|
||||
version = "5.43.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
|
||||
hash = "sha256-6P3b9qcYOfKzJCsDc5K09fKklu/9jFYwoeLMbC8JR64=";
|
||||
hash = "sha256-NR1UXnIU0Wf2WeiagqijEXz9qUShFbM1umenFFETOJI=";
|
||||
};
|
||||
sourceRoot = "camunda-modeler-${version}-linux-x64";
|
||||
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-hack";
|
||||
version = "0.6.40";
|
||||
version = "0.6.41";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-j2T4ElD69oMDTBVPSO6d1bjsJjoJieiaG+YNEmQ47aU=";
|
||||
hash = "sha256-JfYsMlu+eYZvQ5HtAIhJ/y33BNkdj9LvQeSJUVL5F7Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1S7e/R3XCbNRQg152CqNuqieU+nfLXf5o8/5kC9UpSY=";
|
||||
cargoHash = "sha256-fC9EUu0j/M2dfpFS5Th2pqveFia+lSEtQdaH6Xv32ww=";
|
||||
|
||||
# some necessary files are absent in the crate version
|
||||
doCheck = false;
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
wrapGAppsHook4,
|
||||
gobject-introspection,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
pname = "catnip-gtk4";
|
||||
version = "0-unstable-2023-06-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diamondburned";
|
||||
repo = "catnip-gtk4";
|
||||
rev = "e635904af952fcee7e9f4b1a3e45ce8519428d9f";
|
||||
hash = "sha256-yJNw/pDgvIzcX4H6RoFJBiRwzWQXWF3obUPxYf4ALOY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gcr3e5Fm2xCTOoTgl71Dv3rxI6gQbqRz0M1NO7fAZk0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "GTK4 frontend for catnip";
|
||||
homepage = "https://github.com/diamondburned/catnip-gtk4";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
mainProgram = "catnip-gtk4";
|
||||
};
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cdwe";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "synoet";
|
||||
repo = "cdwe";
|
||||
rev = version;
|
||||
hash = "sha256-6NWhx82BXhWhbI18k5gE3vEkw9v5gstE8ICJhtq68rM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pZpG98lwvggBU1TBb2JuSNLev5Jx8n5QjY902dJVn0Y=";
|
||||
|
||||
meta = {
|
||||
description = "Configurable cd wrapper that lets you define your environment per directory";
|
||||
homepage = "https://github.com/synoet/cdwe";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
mainProgram = "cdwe";
|
||||
};
|
||||
}
|
||||
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
|
||||
--replace-warn 'edition = "2021"' 'edition = "2024"'
|
||||
'';
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
env.RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
gfortran,
|
||||
tk,
|
||||
@@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-0cZtq8nVAHAubHD6IDofnh8N7xiNHQkbhXR5OpdhPQU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes crash for test_particlef on LoongArch64
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/CGNS/CGNS/commit/0ea14abf6da44f13ca8a01117ad7af8eb405394c.patch?full_index=1";
|
||||
hash = "sha256-dtwTD8YqRm0NCXTDPRHmaPLTU17ZLzOyVii1aoGYge0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/cgnstools/tkogl/tkogl.c \
|
||||
--replace-fail "<tk-private/generic/tkInt.h>" "<tkInt.h>"
|
||||
|
||||
@@ -90,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xxHash
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
(lib.cmakeFeature "CHIAKI_USE_SYSTEM_CURL" "true")
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-desktop";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-desktop";
|
||||
tag = version;
|
||||
hash = "sha256-vBRaUXsPAPOpMEs2pl6AaaKIMeeXB0UdCb1hzYd43KY=";
|
||||
hash = "sha256-AcUJ9anKuvUAJKaQVHbkYShmrlSHG35gV/NIkPgJojk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-settings-daemon";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-settings-daemon";
|
||||
tag = version;
|
||||
hash = "sha256-WK7MU63M3B0C4Dsik6j4cDyBTZlkF6pofZi2aJcH9eI=";
|
||||
hash = "sha256-s8LKta03ei4MIQICY5t4Kh2oDEN9egstX8IQ56FXq7s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-translations";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-translations";
|
||||
tag = version;
|
||||
hash = "sha256-6y1zHKO/qpkAL5fs6QUjNJki16X+bxW/175Sz1PUPQw=";
|
||||
hash = "sha256-DHwW9YrQFNtTvY4/QMBVLQ2idyuknacZvoMIMiHFsU4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -74,13 +74,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon";
|
||||
version = "6.6.3";
|
||||
version = "6.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon";
|
||||
tag = version;
|
||||
hash = "sha256-BPHHvcE0jmrOo5W4Egv1Hir8t4CSPJGH3oqv1VJ4AUQ=";
|
||||
hash = "sha256-K1Saz0WY5Qwb7YF8fcH0yWNK071dFwzxuPZP2MuSvrs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ckan";
|
||||
version = "1.36.0";
|
||||
version = "1.36.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
|
||||
hash = "sha256-Tw8s86FtBz/92uq2imFZm4n88NCCpePTpydoAoYsE3U=";
|
||||
hash = "sha256-EZSf+n6QUEZW2Bjl2ac/6e+Jo+PlxWd1Z1PKHvgC/Ko=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.1",
|
||||
"version": "2.1.2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.1",
|
||||
"version": "2.1.2",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-GZIh20GyhsXaAm13veg2WErT4rF9a1x8Dzr9q5Al0io=";
|
||||
hash = "sha256-PpNXyZ3xoZ/4lCvtErltkdsL/1hDRyiicblvhykgROw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-F9FaDezEb8kP4Oq4nQNGVspbubk6AZ5caOEXsd8x5Us=";
|
||||
npmDepsHash = "sha256-KdVaAYXCy+oMN9b1lLeIRiGp/Zb29T4b3pvDp8O1v/M=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "clima";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "clima";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CRnAxhkuCTyHR4uQofA51Dm3+YKqm3iwBkFNkbLTv1A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3BNDo5ksra1d8X6yQZYSlS2CSiZfkuTHkQtIC2ckbKE=";
|
||||
|
||||
meta = {
|
||||
description = "Minimal viewer for Termimad";
|
||||
homepage = "https://github.com/Canop/clima";
|
||||
changelog = "https://github.com/Canop/clima/releases/tag/${src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
mainProgram = "clima";
|
||||
};
|
||||
}
|
||||
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
RUSTC_BOOTSTRAP = true;
|
||||
env.RUSTC_BOOTSTRAP = true;
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -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,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coloquinte";
|
||||
version = "0.3.1";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coloquinte";
|
||||
repo = "PlaceRoute";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-bPDXaNZCNBM0qiu+46cL/zH/41lwqHPqfqTzJaERgVQ=";
|
||||
hash = "sha256-BQg2rVYe1wJOX7YnvgDVpmN6hwBJZKH0fxm+8HC8bvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cook-cli";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cooklang";
|
||||
repo = "cookcli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kqfbqyShQQSnYOWu6zk/0srb3AXRttWDCmQWhSsoB5I=";
|
||||
hash = "sha256-qfsyEHQnOfJYqgZi5QxiGJX1pbXx7oR7qzBEwTYH7oY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vmIMh7no/3UeFANUdvlRUfEzY3XpwpLW4GIb3URG8Z0=";
|
||||
cargoHash = "sha256-xQTMxas5gO17DvNXvxdJ03Rhd4kaJPBf+GikbCE1fWI=";
|
||||
|
||||
# Build without the self-updating feature
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -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=";
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbeaver-bin";
|
||||
version = "25.3.1";
|
||||
version = "25.3.2";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
aarch64-darwin = "macos-aarch64.dmg";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-+9bKKfLFR+9iBv/Sgwbd/gVpUa2c4uvkZGzx61x5bJ8=";
|
||||
aarch64-linux = "sha256-sfrytO39RnqODECo0CPj2tusvZBIo5I9KuRqzoLbE0M=";
|
||||
x86_64-darwin = "sha256-74EMwaG2xmH2gEyhcwqZKgVzNOup81DG8T8DmELN53g=";
|
||||
aarch64-darwin = "sha256-cJ9hS/jQySoGbXd0yLmBNlVak8OOnMW2ToXojnx9Th4=";
|
||||
x86_64-linux = "sha256-kOlQLHrE5QmrmtzyX9fDJ0tCZ21YPAO+jnR0B+kXSrA=";
|
||||
aarch64-linux = "sha256-+GegQSZIUMqWsQJBVoC1xqEN9rQAXPh0ApKl2lDPpUA=";
|
||||
x86_64-darwin = "sha256-eimRS96Mpej3BUU5O1XPS/oze0mGw3+4QV2DrRQy68U=";
|
||||
aarch64-darwin = "sha256-S7sdXGfL16Q5hIXmkM22dbmfZeSHKEv3MthoQOYO6n0=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deark";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsummers";
|
||||
repo = "deark";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EnolN4uSHDm1sIkbwCmZUe70DdHyXP3Si4QwGaMtN0A=";
|
||||
hash = "sha256-FA0O/yJoFByOPEb1UcRWARr2z7CdjWHKa4s8Q4Sl5Zo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user