mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-03-08 04:04:06 +01:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
0da46582cf
129 changed files with 2134 additions and 1481 deletions
|
|
@ -34,6 +34,12 @@
|
|||
The latter was probably broken anyway.
|
||||
If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary.
|
||||
|
||||
- `haskellPackages` and the package sets under `haskell.packages` no longer expose an `llvmPackages` attribute,
|
||||
though it can still be accessed via `ghc.llvmPackages` (from the same package set).
|
||||
Haskell packages usually only need to depend on an LLVM version matching GHC if they force the use the LLVM
|
||||
backend even if NCG is available. In this case, it is best to use the `forceLlvmCodegenBackend` helper.
|
||||
In all other cases, like linking against `libLLVM`, Haskell packages should use the appropriate version of `llvmPackages` from `pkgs`.
|
||||
|
||||
- `base16-builder` node package has been removed due to lack of upstream maintenance.
|
||||
|
||||
- `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities.
|
||||
|
|
@ -114,6 +120,8 @@
|
|||
|
||||
- `python3Packages.triton` no longer takes an `enableRocm` argument and supports ROCm in all build configurations via runtime binding. In most cases no action will be needed. If triton is unable to find the HIP SDK add `rocmPackages.clr` as a build input or set the environment variable `HIP_PATH="${rocmPackages.clr}"`.
|
||||
|
||||
- `floorp` has been replaced with a binary build, available as `floorp-bin`. Due to major changes in the upstream project structure and build system, building Floorp from source has become unfeasible. No configuration or state migration is necessary.
|
||||
|
||||
- `inspircd` has been updated to the v4 release series. Please refer to the upstream documentation for [general information](https://docs.inspircd.org/4/overview/#v4-overview) and a list of [breaking changes](https://docs.inspircd.org/4/breaking-changes/).
|
||||
|
||||
- `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
|
||||
|
|
@ -155,6 +163,11 @@
|
|||
|
||||
- `rofi-emoji-wayland` has been merged into `rofi-emoji` as `rofi` has been updated to `2.0.0` and supports both X11 & Wayland.
|
||||
|
||||
- `emacs-macport` has been moved to a fork of Mitsuharu Yamamoto's patched source code starting with Emacs v30 as the original project seems to be currently dormant. All older versions of this package have been dropped.
|
||||
This introduces some backwards‐incompatible changes; see the NEWS for details.
|
||||
NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar.
|
||||
It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30).
|
||||
|
||||
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -571,6 +571,9 @@ let
|
|||
inherit (self.versions)
|
||||
splitVersion
|
||||
;
|
||||
inherit (self.network.ipv6)
|
||||
mkEUI64Suffix
|
||||
;
|
||||
}
|
||||
);
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
{ lib }:
|
||||
let
|
||||
inherit (import ./internal.nix { inherit lib; }) _ipv6;
|
||||
inherit (lib.strings) match concatStringsSep toLower;
|
||||
inherit (lib.trivial)
|
||||
pipe
|
||||
bitXor
|
||||
fromHexString
|
||||
toHexString
|
||||
;
|
||||
inherit (lib.lists) elemAt;
|
||||
in
|
||||
{
|
||||
ipv6 = {
|
||||
|
|
@ -45,5 +53,60 @@ in
|
|||
{
|
||||
inherit address prefixLength;
|
||||
};
|
||||
|
||||
/**
|
||||
Converts a 48-bit MAC address into a EUI-64 IPv6 address suffix.
|
||||
|
||||
# Example
|
||||
|
||||
```nix
|
||||
mkEUI64Suffix "66:75:63:6B:20:75"
|
||||
=> "6475:63ff:fe6b:2075"
|
||||
```
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
mkEUI64Suffix :: String -> String
|
||||
```
|
||||
|
||||
# Inputs
|
||||
|
||||
mac
|
||||
: The MAC address (may contain these delimiters: `:`, `-` or `.` but it's not necessary)
|
||||
*/
|
||||
mkEUI64Suffix =
|
||||
mac:
|
||||
pipe mac [
|
||||
# match mac address
|
||||
(match "^([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})$")
|
||||
|
||||
# check if there are matches
|
||||
(
|
||||
matches:
|
||||
if matches == null then
|
||||
throw ''"${mac}" is not a valid MAC address (expected 6 octets of hex digits)''
|
||||
else
|
||||
matches
|
||||
)
|
||||
|
||||
# transform to result hextets
|
||||
(octets: [
|
||||
# combine 1st and 2nd octets into first hextet, flip U/L bit, 512 = 0x200
|
||||
(toHexString (bitXor 512 (fromHexString ((elemAt octets 0) + (elemAt octets 1)))))
|
||||
|
||||
# combine 3rd and 4th octets, combine them, insert fffe pattern in between to get next two hextets
|
||||
"${elemAt octets 2}ff"
|
||||
"fe${elemAt octets 3}"
|
||||
|
||||
# combine 5th and 6th octets into the last hextet
|
||||
((elemAt octets 4) + (elemAt octets 5))
|
||||
])
|
||||
|
||||
# concat to result suffix
|
||||
(concatStringsSep ":")
|
||||
|
||||
toLower
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,4 +114,48 @@ expectFailure '(internal._ipv6.split "/::/").prefixLength' "is not a valid IPv
|
|||
expectSuccess 'lib.network.ipv6.fromString "2001:DB8::ffff/64"' '{"address":"2001:db8:0:0:0:0:0:ffff","prefixLength":64}'
|
||||
expectSuccess 'lib.network.ipv6.fromString "1234:5678:90ab:cdef:fedc:ba09:8765:4321/44"' '{"address":"1234:5678:90ab:cdef:fedc:ba09:8765:4321","prefixLength":44}'
|
||||
|
||||
expectSuccess 'mkEUI64Suffix "00:11:22:AA:BB:CC"' '"211:22ff:feaa:bbcc"'
|
||||
expectSuccess 'mkEUI64Suffix "00-11-22-AA-BB-CC"' '"211:22ff:feaa:bbcc"'
|
||||
expectSuccess 'mkEUI64Suffix "00.11.22.AA.BB.CC"' '"211:22ff:feaa:bbcc"'
|
||||
expectSuccess 'mkEUI64Suffix "00:11:22:aa:bb:cc"' '"211:22ff:feaa:bbcc"'
|
||||
expectSuccess 'mkEUI64Suffix "00-11-22-aa-bb-cc"' '"211:22ff:feaa:bbcc"'
|
||||
expectSuccess 'mkEUI64Suffix "00.11.22.aa.bb.cc"' '"211:22ff:feaa:bbcc"'
|
||||
|
||||
expectSuccess 'mkEUI64Suffix "12:34:56:78:9A:bc"' '"1034:56ff:fe78:9abc"'
|
||||
expectSuccess 'mkEUI64Suffix "123456789ABC"' '"1034:56ff:fe78:9abc"'
|
||||
|
||||
expectSuccess 'mkEUI64Suffix "001122AABBCC"' '"211:22ff:feaa:bbcc"'
|
||||
expectSuccess 'mkEUI64Suffix "001122aabbcc"' '"211:22ff:feaa:bbcc"'
|
||||
|
||||
expectSuccess 'mkEUI64Suffix "ff-ff-ff-ff-ff-ff"' '"fdff:ffff:feff:ffff"'
|
||||
expectSuccess 'mkEUI64Suffix "ffffffffffff"' '"fdff:ffff:feff:ffff"'
|
||||
expectSuccess 'mkEUI64Suffix "00.00.00.00.00.00"' '"200:00ff:fe00:0000"'
|
||||
expectSuccess 'mkEUI64Suffix "000000000000"' '"200:00ff:fe00:0000"'
|
||||
|
||||
expectFailure 'mkEUI64Suffix "123456789AB"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "123456789A"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "123456789"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "12345678"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "1234567"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "123456"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "12345"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "1234"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "123"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "12"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "1"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix ""' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "------------"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "............"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "::::::::::::"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "ab:cd:ef:g0:12:34"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "AB:CD:EF:G0:12:34"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "ab:cd:ef:gh:jk:lm"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "AB:CD:EF:GH:JK:LM"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "01:23:3a:bc:de:fg"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
expectFailure 'mkEUI64Suffix "01:23:3A:BC:DE:FG"' "is not a valid MAC address \(expected 6 octets of hex digits\)"
|
||||
|
||||
echo >&2 tests ok
|
||||
|
|
|
|||
|
|
@ -641,6 +641,12 @@
|
|||
githubId = 8026586;
|
||||
name = "Adrien Faure";
|
||||
};
|
||||
adhityaravi = {
|
||||
email = "adhitya.ravi@canonical.com";
|
||||
github = "adhityaravi";
|
||||
githubId = 34714491;
|
||||
name = "Adhitya Ravi";
|
||||
};
|
||||
adisbladis = {
|
||||
email = "adisbladis@gmail.com";
|
||||
matrix = "@adis:blad.is";
|
||||
|
|
@ -3191,6 +3197,12 @@
|
|||
github = "benwis";
|
||||
githubId = 6953353;
|
||||
};
|
||||
bepri = {
|
||||
email = "imani.pelton@canonical.com";
|
||||
github = "bepri";
|
||||
githubId = 17732342;
|
||||
name = "Imani Pelton";
|
||||
};
|
||||
berberman = {
|
||||
email = "berberman@yandex.com";
|
||||
matrix = "@berberman:mozilla.org";
|
||||
|
|
@ -6965,6 +6977,12 @@
|
|||
github = "dsluijk";
|
||||
githubId = 8537327;
|
||||
};
|
||||
dstathis = {
|
||||
email = "dylan.stephano-shachter@canonical.com";
|
||||
github = "dstathis";
|
||||
githubId = 2110777;
|
||||
name = "Dylan Stephano-Shachter";
|
||||
};
|
||||
dstengele = {
|
||||
name = "Dennis Stengele";
|
||||
email = "dennis@stengele.me";
|
||||
|
|
@ -13360,6 +13378,13 @@
|
|||
githubId = 18579667;
|
||||
name = "Adam J.";
|
||||
};
|
||||
kfiz = {
|
||||
email = "doroerose@gmail.com";
|
||||
github = "kfiz";
|
||||
githubId = 5100646;
|
||||
name = "kfiz";
|
||||
matrix = "@kfiz:matrix.sopado.de";
|
||||
};
|
||||
kfollesdal = {
|
||||
email = "kfollesdal@gmail.com";
|
||||
github = "kfollesdal";
|
||||
|
|
|
|||
|
|
@ -162,6 +162,8 @@
|
|||
|
||||
- The `yeahwm` package and `services.xserver.windowManager.yeahwm` module were removed due to the package being broken and unmaintained upstream.
|
||||
|
||||
- The `services.snapserver` module has been migrated to use the settings option and render a configuration file instead of passing every option over the command line.
|
||||
|
||||
- The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection.
|
||||
|
||||
- The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
config,
|
||||
options,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
|
|
@ -9,77 +8,96 @@ let
|
|||
|
||||
name = "snapserver";
|
||||
|
||||
inherit (lib)
|
||||
literalExpression
|
||||
mkEnableOption
|
||||
mkOption
|
||||
mkPackageOption
|
||||
mkRemovedOptionModule
|
||||
mkRenamedOptionModule
|
||||
types
|
||||
;
|
||||
|
||||
cfg = config.services.snapserver;
|
||||
|
||||
# Using types.nullOr to inherit upstream defaults.
|
||||
sampleFormat = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
Default sample format.
|
||||
'';
|
||||
example = "48000:16:2";
|
||||
format = pkgs.formats.ini {
|
||||
listsAsDuplicateKeys = true;
|
||||
};
|
||||
|
||||
codec = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
Default audio compression method.
|
||||
'';
|
||||
example = "flac";
|
||||
};
|
||||
|
||||
streamToOption =
|
||||
name: opt:
|
||||
let
|
||||
os = val: lib.optionalString (val != null) "${val}";
|
||||
os' = prefix: val: lib.optionalString (val != null) (prefix + "${val}");
|
||||
toQueryString = key: value: "&${key}=${value}";
|
||||
in
|
||||
"--stream.stream=\"${opt.type}://"
|
||||
+ os opt.location
|
||||
+ "?"
|
||||
+ os' "name=" name
|
||||
+ os' "&sampleformat=" opt.sampleFormat
|
||||
+ os' "&codec=" opt.codec
|
||||
+ lib.concatStrings (lib.mapAttrsToList toQueryString opt.query)
|
||||
+ "\"";
|
||||
|
||||
optionalNull = val: ret: lib.optional (val != null) ret;
|
||||
|
||||
optionString = lib.concatStringsSep " " (
|
||||
lib.mapAttrsToList streamToOption cfg.streams
|
||||
# global options
|
||||
++ [ "--stream.bind_to_address=${cfg.listenAddress}" ]
|
||||
++ [ "--stream.port=${toString cfg.port}" ]
|
||||
++ optionalNull cfg.sampleFormat "--stream.sampleformat=${cfg.sampleFormat}"
|
||||
++ optionalNull cfg.codec "--stream.codec=${cfg.codec}"
|
||||
++ optionalNull cfg.streamBuffer "--stream.stream_buffer=${toString cfg.streamBuffer}"
|
||||
++ optionalNull cfg.buffer "--stream.buffer=${toString cfg.buffer}"
|
||||
++ lib.optional cfg.sendToMuted "--stream.send_to_muted"
|
||||
# tcp json rpc
|
||||
++ [ "--tcp.enabled=${toString cfg.tcp.enable}" ]
|
||||
++ lib.optionals cfg.tcp.enable [
|
||||
"--tcp.bind_to_address=${cfg.tcp.listenAddress}"
|
||||
"--tcp.port=${toString cfg.tcp.port}"
|
||||
]
|
||||
# http json rpc
|
||||
++ [ "--http.enabled=${toString cfg.http.enable}" ]
|
||||
++ lib.optionals cfg.http.enable [
|
||||
"--http.bind_to_address=${cfg.http.listenAddress}"
|
||||
"--http.port=${toString cfg.http.port}"
|
||||
]
|
||||
++ lib.optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\""
|
||||
);
|
||||
configFile = format.generate "snapserver.conf" cfg.settings;
|
||||
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "controlPort" ]
|
||||
[ "services" "snapserver" "tcp" "port" ]
|
||||
)
|
||||
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "listenAddress" ]
|
||||
[ "services" "snapserver" "settings" "stream" "bind_to_address" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "port" ]
|
||||
[ "services" "snapserver" "settings" "stream" "port" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "sampleFormat" ]
|
||||
[ "services" "snapserver" "settings" "stream" "sampleformat" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "codec" ]
|
||||
[ "services" "snapserver" "settings" "stream" "codec" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "streamBuffer" ]
|
||||
[ "services" "snapserver" "settings" "stream" "chunk_ms" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "buffer" ]
|
||||
[ "services" "snapserver" "settings" "stream" "buffer" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "send" ]
|
||||
[ "services" "snapserver" "settings" "stream" "chunk_ms" ]
|
||||
)
|
||||
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "tcp" "enable" ]
|
||||
[ "services" "snapserver" "settings" "tcp" "enabled" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "tcp" "listenAddress" ]
|
||||
[ "services" "snapserver" "settings" "tcp" "bind_to_address" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "tcp" "port" ]
|
||||
[ "services" "snapserver" "settings" "tcp" "port" ]
|
||||
)
|
||||
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "http" "enable" ]
|
||||
[ "services" "snapserver" "settings" "http" "enabled" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "http" "listenAddress" ]
|
||||
[ "services" "snapserver" "settings" "http" "bind_to_address" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "http" "port" ]
|
||||
[ "services" "snapserver" "settings" "http" "port" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "snapserver" "http" "docRoot" ]
|
||||
[ "services" "snapserver" "settings" "http" "doc_root" ]
|
||||
)
|
||||
|
||||
(mkRemovedOptionModule [
|
||||
"services"
|
||||
"snapserver"
|
||||
"streams"
|
||||
] "Configure `services.snapserver.settings.stream.source` instead")
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
|
@ -88,31 +106,93 @@ in
|
|||
|
||||
services.snapserver = {
|
||||
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable snapserver.
|
||||
'';
|
||||
};
|
||||
enable = mkEnableOption "snapserver";
|
||||
|
||||
package = lib.options.mkPackageOption pkgs "snapcast" { };
|
||||
package = mkPackageOption pkgs "snapcast" { };
|
||||
|
||||
listenAddress = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "::";
|
||||
example = "0.0.0.0";
|
||||
settings = mkOption {
|
||||
default = { };
|
||||
description = ''
|
||||
The address where snapclients can connect.
|
||||
'';
|
||||
};
|
||||
Snapserver configuration.
|
||||
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 1704;
|
||||
description = ''
|
||||
The port that snapclients can connect to.
|
||||
Refer to the [example configuration](https://github.com/badaix/snapcast/blob/develop/server/etc/snapserver.conf) for possible options.
|
||||
'';
|
||||
type = types.submodule {
|
||||
freeformType = format.type;
|
||||
options = {
|
||||
stream = {
|
||||
bind_to_address = mkOption {
|
||||
default = "::";
|
||||
description = ''
|
||||
Address to listen on for snapclient connections.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 1704;
|
||||
description = ''
|
||||
Port to listen on for snapclient connections.
|
||||
'';
|
||||
};
|
||||
|
||||
source = mkOption {
|
||||
type = with types; either str (listOf str);
|
||||
example = "pipe:///tmp/snapfifo?name=default";
|
||||
description = ''
|
||||
One or multiple URIs to PCM inpuit streams.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
tcp = {
|
||||
enabled = mkEnableOption "the TCP JSON-RPC";
|
||||
|
||||
bind_to_address = mkOption {
|
||||
default = "::";
|
||||
description = ''
|
||||
Address to listen on for snapclient connections.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 1705;
|
||||
description = ''
|
||||
Port to listen on for snapclient connections.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
http = {
|
||||
enabled = mkEnableOption "the HTTP JSON-RPC";
|
||||
|
||||
bind_to_address = mkOption {
|
||||
default = "::";
|
||||
description = ''
|
||||
Address to listen on for snapclient connections.
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 1705;
|
||||
description = ''
|
||||
Port to listen on for snapclient connections.
|
||||
'';
|
||||
};
|
||||
|
||||
doc_root = lib.mkOption {
|
||||
type = with lib.types; nullOr path;
|
||||
default = pkgs.snapweb;
|
||||
defaultText = literalExpression "pkgs.snapweb";
|
||||
description = ''
|
||||
Path to serve from the HTTP servers root.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
openFirewall = lib.mkOption {
|
||||
|
|
@ -122,200 +202,13 @@ in
|
|||
Whether to automatically open the specified ports in the firewall.
|
||||
'';
|
||||
};
|
||||
|
||||
inherit sampleFormat;
|
||||
inherit codec;
|
||||
|
||||
streamBuffer = lib.mkOption {
|
||||
type = with lib.types; nullOr int;
|
||||
default = null;
|
||||
description = ''
|
||||
Stream read (input) buffer in ms.
|
||||
'';
|
||||
example = 20;
|
||||
};
|
||||
|
||||
buffer = lib.mkOption {
|
||||
type = with lib.types; nullOr int;
|
||||
default = null;
|
||||
description = ''
|
||||
Network buffer in ms.
|
||||
'';
|
||||
example = 1000;
|
||||
};
|
||||
|
||||
sendToMuted = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Send audio to muted clients.
|
||||
'';
|
||||
};
|
||||
|
||||
tcp.enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable the JSON-RPC via TCP.
|
||||
'';
|
||||
};
|
||||
|
||||
tcp.listenAddress = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "::";
|
||||
example = "0.0.0.0";
|
||||
description = ''
|
||||
The address where the TCP JSON-RPC listens on.
|
||||
'';
|
||||
};
|
||||
|
||||
tcp.port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 1705;
|
||||
description = ''
|
||||
The port where the TCP JSON-RPC listens on.
|
||||
'';
|
||||
};
|
||||
|
||||
http.enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable the JSON-RPC via HTTP.
|
||||
'';
|
||||
};
|
||||
|
||||
http.listenAddress = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "::";
|
||||
example = "0.0.0.0";
|
||||
description = ''
|
||||
The address where the HTTP JSON-RPC listens on.
|
||||
'';
|
||||
};
|
||||
|
||||
http.port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 1780;
|
||||
description = ''
|
||||
The port where the HTTP JSON-RPC listens on.
|
||||
'';
|
||||
};
|
||||
|
||||
http.docRoot = lib.mkOption {
|
||||
type = with lib.types; nullOr path;
|
||||
default = pkgs.snapweb;
|
||||
defaultText = lib.literalExpression "pkgs.snapweb";
|
||||
description = ''
|
||||
Path to serve from the HTTP servers root.
|
||||
'';
|
||||
};
|
||||
|
||||
streams = lib.mkOption {
|
||||
type =
|
||||
with lib.types;
|
||||
attrsOf (submodule {
|
||||
options = {
|
||||
location = lib.mkOption {
|
||||
type = lib.types.oneOf [
|
||||
lib.types.path
|
||||
lib.types.str
|
||||
];
|
||||
description = ''
|
||||
For type `pipe` or `file`, the path to the pipe or file.
|
||||
For type `librespot`, `airplay` or `process`, the path to the corresponding binary.
|
||||
For type `tcp`, the `host:port` address to connect to or listen on.
|
||||
For type `meta`, a list of stream names in the form `/one/two/...`. Don't forget the leading slash.
|
||||
For type `alsa`, use an empty string.
|
||||
'';
|
||||
example = lib.literalExpression ''
|
||||
"/path/to/pipe"
|
||||
"/path/to/librespot"
|
||||
"192.168.1.2:4444"
|
||||
"/MyTCP/Spotify/MyPipe"
|
||||
'';
|
||||
};
|
||||
type = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"pipe"
|
||||
"librespot"
|
||||
"airplay"
|
||||
"file"
|
||||
"process"
|
||||
"tcp"
|
||||
"alsa"
|
||||
"spotify"
|
||||
"meta"
|
||||
];
|
||||
default = "pipe";
|
||||
description = ''
|
||||
The type of input stream.
|
||||
'';
|
||||
};
|
||||
query = lib.mkOption {
|
||||
type = attrsOf str;
|
||||
default = { };
|
||||
description = ''
|
||||
Key-value pairs that convey additional parameters about a stream.
|
||||
'';
|
||||
example = lib.literalExpression ''
|
||||
# for type == "pipe":
|
||||
{
|
||||
mode = "create";
|
||||
};
|
||||
# for type == "process":
|
||||
{
|
||||
params = "--param1 --param2";
|
||||
logStderr = "true";
|
||||
};
|
||||
# for type == "tcp":
|
||||
{
|
||||
mode = "client";
|
||||
}
|
||||
# for type == "alsa":
|
||||
{
|
||||
device = "hw:0,0";
|
||||
}
|
||||
'';
|
||||
};
|
||||
inherit sampleFormat;
|
||||
inherit codec;
|
||||
};
|
||||
});
|
||||
default = {
|
||||
default = { };
|
||||
};
|
||||
description = ''
|
||||
The definition for an input source.
|
||||
'';
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
mpd = {
|
||||
type = "pipe";
|
||||
location = "/run/snapserver/mpd";
|
||||
sampleFormat = "48000:16:2";
|
||||
codec = "pcm";
|
||||
};
|
||||
};
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
warnings =
|
||||
# https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85
|
||||
lib.filter (w: w != "") (
|
||||
lib.mapAttrsToList (
|
||||
k: v:
|
||||
lib.optionalString (v.type == "spotify") ''
|
||||
services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead.
|
||||
''
|
||||
) cfg.streams
|
||||
);
|
||||
environment.etc."snapserver.conf".source = configFile;
|
||||
|
||||
systemd.services.snapserver = {
|
||||
after = [
|
||||
|
|
@ -328,10 +221,13 @@ in
|
|||
"mpd.service"
|
||||
"mopidy.service"
|
||||
];
|
||||
|
||||
restartTriggers = [ configFile ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = "${cfg.package}/bin/snapserver --daemon ${optionString}";
|
||||
ExecStart = toString [
|
||||
(lib.getExe' cfg.package "snapserver")
|
||||
"--daemon"
|
||||
];
|
||||
Type = "forking";
|
||||
LimitRTPRIO = 50;
|
||||
LimitRTTIME = "infinity";
|
||||
|
|
@ -349,9 +245,9 @@ in
|
|||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts =
|
||||
lib.optionals cfg.openFirewall [ cfg.port ]
|
||||
++ lib.optional (cfg.openFirewall && cfg.tcp.enable) cfg.tcp.port
|
||||
++ lib.optional (cfg.openFirewall && cfg.http.enable) cfg.http.port;
|
||||
lib.optionals cfg.openFirewall [ cfg.settings.stream.port ]
|
||||
++ lib.optional (cfg.openFirewall && cfg.settings.tcp.enabled) cfg.settings.tcp.port
|
||||
++ lib.optional (cfg.openFirewall && cfg.settings.http.enabled) cfg.settings.http.port;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ let
|
|||
type = types.str;
|
||||
};
|
||||
|
||||
botPolicy = lib.mkOption {
|
||||
botPolicy = mkDefaultOption "botPolicy" {
|
||||
default = null;
|
||||
description = ''
|
||||
Anubis policy configuration in Nix syntax. Set to `null` to use the baked-in policy which should be
|
||||
|
|
@ -265,7 +265,18 @@ in
|
|||
wants = [ "network-online.target" ];
|
||||
|
||||
environment = lib.mapAttrs (lib.const (lib.generators.mkValueStringDefault { })) (
|
||||
lib.filterAttrs (_: v: v != null) instance.settings
|
||||
lib.filterAttrs (_: v: v != null) (
|
||||
instance.settings
|
||||
// {
|
||||
POLICY_FNAME =
|
||||
if instance.settings.POLICY_FNAME != null then
|
||||
instance.settings.POLICY_FNAME
|
||||
else if instance.botPolicy != null then
|
||||
jsonFormat.generate "${instanceName name}-botPolicy.json" instance.botPolicy
|
||||
else
|
||||
null;
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
serviceConfig = {
|
||||
|
|
|
|||
|
|
@ -26,13 +26,11 @@ in
|
|||
params = lib.mkOption {
|
||||
default = [ ];
|
||||
type = with lib.types; listOf str;
|
||||
example = ''
|
||||
[
|
||||
"--dpi-desync=fake,disorder2"
|
||||
"--dpi-desync-ttl=1"
|
||||
"--dpi-desync-autottl=2"
|
||||
]
|
||||
'';
|
||||
example = [
|
||||
"--dpi-desync=fake,disorder2"
|
||||
"--dpi-desync-ttl=1"
|
||||
"--dpi-desync-autottl=2"
|
||||
];
|
||||
description = ''
|
||||
Specify the bypass parameters for Zapret binary.
|
||||
There are no universal parameters as they vary between different networks, so you'll have to find them yourself.
|
||||
|
|
@ -44,14 +42,12 @@ in
|
|||
whitelist = lib.mkOption {
|
||||
default = [ ];
|
||||
type = with lib.types; listOf str;
|
||||
example = ''
|
||||
[
|
||||
"youtube.com"
|
||||
"googlevideo.com"
|
||||
"ytimg.com"
|
||||
"youtu.be"
|
||||
]
|
||||
'';
|
||||
example = [
|
||||
"youtube.com"
|
||||
"googlevideo.com"
|
||||
"ytimg.com"
|
||||
"youtu.be"
|
||||
];
|
||||
description = ''
|
||||
Specify a list of domains to bypass. All other domains will be ignored.
|
||||
You can specify either whitelist or blacklist, but not both.
|
||||
|
|
@ -63,11 +59,9 @@ in
|
|||
blacklist = lib.mkOption {
|
||||
default = [ ];
|
||||
type = with lib.types; listOf str;
|
||||
example = ''
|
||||
[
|
||||
"example.com"
|
||||
]
|
||||
'';
|
||||
example = [
|
||||
"example.com"
|
||||
];
|
||||
description = ''
|
||||
Specify a list of domains NOT to bypass. All other domains will be bypassed.
|
||||
You can specify either whitelist or blacklist, but not both.
|
||||
|
|
@ -124,12 +118,10 @@ in
|
|||
udpPorts = lib.mkOption {
|
||||
default = [ ];
|
||||
type = with lib.types; listOf str;
|
||||
example = ''
|
||||
[
|
||||
"50000:50099"
|
||||
"1234"
|
||||
]
|
||||
'';
|
||||
example = [
|
||||
"50000:50099"
|
||||
"1234"
|
||||
];
|
||||
description = ''
|
||||
List of UDP ports to route.
|
||||
Port ranges are delimited with a colon like this "50000:50099".
|
||||
|
|
|
|||
|
|
@ -559,10 +559,6 @@ in
|
|||
flannel = runTestOn [ "x86_64-linux" ] ./flannel.nix;
|
||||
flaresolverr = runTest ./flaresolverr.nix;
|
||||
flood = runTest ./flood.nix;
|
||||
floorp = runTest {
|
||||
imports = [ ./firefox.nix ];
|
||||
_module.args.firefoxPackage = pkgs.floorp;
|
||||
};
|
||||
fluent-bit = runTest ./fluent-bit.nix;
|
||||
fluentd = runTest ./fluentd.nix;
|
||||
fluidd = runTest ./fluidd.nix;
|
||||
|
|
|
|||
|
|
@ -11,9 +11,13 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
services.anubis = {
|
||||
defaultOptions.settings = {
|
||||
DIFFICULTY = 3;
|
||||
USER_DEFINED_DEFAULT = true;
|
||||
defaultOptions = {
|
||||
# Get default botPolicy
|
||||
botPolicy = lib.importJSON "${config.services.anubis.package.src}/data/botPolicies.json";
|
||||
settings = {
|
||||
DIFFICULTY = 3;
|
||||
USER_DEFINED_DEFAULT = true;
|
||||
};
|
||||
};
|
||||
instances = {
|
||||
"".settings = {
|
||||
|
|
@ -38,11 +42,34 @@
|
|||
group = "nginx";
|
||||
settings.TARGET = "unix:///run/nginx/nginx.sock";
|
||||
};
|
||||
|
||||
"botPolicy-default" = {
|
||||
botPolicy = null;
|
||||
settings.TARGET = "http://localhost:8080";
|
||||
};
|
||||
|
||||
"botPolicy-file" = {
|
||||
settings = {
|
||||
TARGET = "http://localhost:8080";
|
||||
POLICY_FNAME = "/etc/anubis-botPolicy.json";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Empty json for testing
|
||||
environment.etc."anubis-botPolicy.json".text = lib.generators.toJSON { } {
|
||||
bots = [
|
||||
{
|
||||
name = "allow-all";
|
||||
user_agent_regex = ".*";
|
||||
action = "ALLOW";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
# support
|
||||
users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
|
||||
users.users.nginx.extraGroups = [ config.services.anubis.defaultOptions.group ];
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
recommendedProxySettings = true;
|
||||
|
|
@ -115,5 +142,10 @@
|
|||
# Make sure defaults don't overwrite themselves
|
||||
machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"')
|
||||
machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"')
|
||||
|
||||
# Check correct BotPolicy settings are applied
|
||||
machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"')
|
||||
machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="')
|
||||
machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"')
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
|
@ -12,7 +13,7 @@ let
|
|||
in
|
||||
{
|
||||
name = "snapcast";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ hexa ];
|
||||
};
|
||||
|
||||
|
|
@ -20,30 +21,27 @@ in
|
|||
server = {
|
||||
services.snapserver = {
|
||||
enable = true;
|
||||
port = port;
|
||||
tcp.port = tcpPort;
|
||||
http.port = httpPort;
|
||||
openFirewall = true;
|
||||
buffer = bufferSize;
|
||||
streams = {
|
||||
mpd = {
|
||||
type = "pipe";
|
||||
location = "/run/snapserver/mpd";
|
||||
query.mode = "create";
|
||||
};
|
||||
bluetooth = {
|
||||
type = "pipe";
|
||||
location = "/run/snapserver/bluetooth";
|
||||
settings = {
|
||||
stream = {
|
||||
port = port;
|
||||
source = [
|
||||
"pipe:///run/snapserver/mpd?name=mpd&mode=create"
|
||||
"pipe:///run/snapserver/bluetooth?name=bluetooth"
|
||||
"tcp://127.0.0.1:${toString tcpStreamPort}?name=tcp"
|
||||
"meta:///mpd/bluetooth/tcp?name=meta"
|
||||
];
|
||||
buffer = bufferSize;
|
||||
};
|
||||
tcp = {
|
||||
type = "tcp";
|
||||
location = "127.0.0.1:${toString tcpStreamPort}";
|
||||
enabled = true;
|
||||
port = tcpPort;
|
||||
};
|
||||
meta = {
|
||||
type = "meta";
|
||||
location = "/mpd/bluetooth/tcp";
|
||||
http = {
|
||||
enabled = true;
|
||||
port = httpPort;
|
||||
};
|
||||
};
|
||||
openFirewall = true;
|
||||
};
|
||||
environment.systemPackages = [ pkgs.snapcast ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
asio,
|
||||
avahi,
|
||||
boost,
|
||||
expat,
|
||||
flac,
|
||||
libogg,
|
||||
libvorbis,
|
||||
|
|
@ -23,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snapcast";
|
||||
version = "0.30.0";
|
||||
version = "0.32.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badaix";
|
||||
repo = "snapcast";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EJgpZz4PnXfge0rkVH1F7cah+i9AvDJVSUVqL7qChDM=";
|
||||
hash = "sha256-pGON2Nh7GgcGvMUNI3nWstm5Q9R+VW9eEi4IE6KkFBo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
|
|||
boost
|
||||
asio
|
||||
avahi
|
||||
expat
|
||||
flac
|
||||
libogg
|
||||
libvorbis
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ lib.makeScope pkgs.newScope (
|
|||
sources = import ./sources.nix {
|
||||
inherit lib;
|
||||
inherit (pkgs)
|
||||
fetchFromBitbucket
|
||||
fetchFromGitHub
|
||||
fetchzip
|
||||
;
|
||||
};
|
||||
|
|
@ -31,7 +31,7 @@ lib.makeScope pkgs.newScope (
|
|||
withPgtk = true;
|
||||
};
|
||||
|
||||
emacs29-macport = callPackage (self.sources.emacs29-macport) (
|
||||
emacs30-macport = callPackage (self.sources.emacs30-macport) (
|
||||
inheritedArgs
|
||||
// {
|
||||
srcRepo = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromBitbucket,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
|
|
@ -32,8 +32,8 @@ let
|
|||
}
|
||||
);
|
||||
"macport" = (
|
||||
fetchFromBitbucket {
|
||||
owner = "mituharu";
|
||||
fetchFromGitHub {
|
||||
owner = "jdtsmith";
|
||||
repo = "emacs-mac";
|
||||
inherit rev hash;
|
||||
}
|
||||
|
|
@ -68,13 +68,14 @@ let
|
|||
''
|
||||
+ lib.optionalString (variant == "macport") ''
|
||||
|
||||
This release is built from Mitsuharu Yamamoto's patched source code
|
||||
tailored for macOS.
|
||||
This release initially was built from Mitsuharu Yamamoto's patched source code
|
||||
tailored for macOS. Moved to a fork of the latter starting with emacs v30 as the
|
||||
original project seems to be currently dormant.
|
||||
'';
|
||||
changelog =
|
||||
{
|
||||
"mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}";
|
||||
"macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac";
|
||||
"macport" = "https://github.com/jdtsmith/emacs-mac/blob/${rev}/NEWS-mac";
|
||||
}
|
||||
.${variant};
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
|
@ -88,7 +89,9 @@ let
|
|||
matthewbauer
|
||||
panchoh
|
||||
];
|
||||
"macport" = with lib.maintainers; [ ];
|
||||
"macport" = with lib.maintainers; [
|
||||
kfiz
|
||||
];
|
||||
}
|
||||
.${variant};
|
||||
platforms =
|
||||
|
|
@ -117,26 +120,11 @@ in
|
|||
];
|
||||
});
|
||||
|
||||
emacs29-macport = import ./make-emacs.nix (mkArgs {
|
||||
emacs30-macport = import ./make-emacs.nix (mkArgs {
|
||||
pname = "emacs-mac";
|
||||
version = "29.4";
|
||||
version = "30.2.50";
|
||||
variant = "macport";
|
||||
rev = "emacs-29.4-mac-10.1";
|
||||
hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic=";
|
||||
patches = fetchpatch: [
|
||||
# CVE-2024-53920
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";
|
||||
hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4=";
|
||||
})
|
||||
|
||||
# CVE-2025-1244
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";
|
||||
hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w=";
|
||||
})
|
||||
];
|
||||
|
||||
meta.knownVulnerabilities = [ ];
|
||||
rev = "emacs-mac-30.2";
|
||||
hash = "sha256-i/W2Xa6Vk1+T1fs6fa4wJVMLLB6BK8QAPcdmPrU8NwM=";
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -143,13 +143,13 @@ in
|
|||
assertNoAdditions {
|
||||
advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
fzf-lua
|
||||
snacks-nvim
|
||||
telescope-nvim
|
||||
];
|
||||
dependencies = with self; [
|
||||
telescope-nvim
|
||||
vim-fugitive
|
||||
vim-rhubarb
|
||||
fzf-lua
|
||||
plenary-nvim
|
||||
];
|
||||
};
|
||||
|
|
@ -1107,11 +1107,11 @@ assertNoAdditions {
|
|||
easy-dotnet-nvim = super.easy-dotnet-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
telescope-nvim
|
||||
];
|
||||
checkInputs = with self; [
|
||||
# Pickers, can use telescope or fzf-lua
|
||||
# Pickers, can use telescope, fzf-lua, or snacks
|
||||
fzf-lua
|
||||
telescope-nvim
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -1628,11 +1628,13 @@ assertNoAdditions {
|
|||
};
|
||||
|
||||
leetcode-nvim = super.leetcode-nvim.overrideAttrs {
|
||||
checkInputs = [ self.snacks-nvim ];
|
||||
checkInputs = with self; [
|
||||
snacks-nvim
|
||||
telescope-nvim
|
||||
];
|
||||
dependencies = with self; [
|
||||
nui-nvim
|
||||
plenary-nvim
|
||||
telescope-nvim
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
@ -2185,11 +2187,14 @@ assertNoAdditions {
|
|||
};
|
||||
|
||||
neotest-playwright = super.neotest-playwright.overrideAttrs {
|
||||
checkInputs = with self; [
|
||||
# Optional picker integration
|
||||
telescope-nvim
|
||||
];
|
||||
dependencies = with self; [
|
||||
neotest
|
||||
nvim-nio
|
||||
plenary-nvim
|
||||
telescope-nvim
|
||||
];
|
||||
# Unit test assert
|
||||
nvimSkipModules = "neotest-playwright-assertions";
|
||||
|
|
@ -2629,14 +2634,10 @@ assertNoAdditions {
|
|||
};
|
||||
|
||||
nvim-tinygit = super.nvim-tinygit.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
telescope-nvim
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
gitMinimal
|
||||
# transitive dependency (telescope-nvim) not properly propagated to the test environment
|
||||
self.plenary-nvim
|
||||
# interactive staging support
|
||||
self.telescope-nvim
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -3595,9 +3596,6 @@ assertNoAdditions {
|
|||
};
|
||||
|
||||
uv-nvim = super.uv-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
telescope-nvim
|
||||
];
|
||||
runtimeDeps = [ uv ];
|
||||
};
|
||||
|
||||
|
|
@ -4001,9 +3999,12 @@ assertNoAdditions {
|
|||
};
|
||||
|
||||
vs-tasks-nvim = super.vs-tasks-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
telescope-nvim
|
||||
checkInputs = [
|
||||
# Optional telescope integration
|
||||
self.telescope-nvim
|
||||
];
|
||||
dependencies = [
|
||||
self.plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildMozillaMach,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
(
|
||||
(buildMozillaMach rec {
|
||||
pname = "floorp";
|
||||
packageVersion = "11.30.0";
|
||||
applicationName = "Floorp";
|
||||
binaryName = "floorp";
|
||||
branding = "browser/branding/official";
|
||||
requireSigning = false;
|
||||
allowAddonSideload = true;
|
||||
|
||||
# Must match the contents of `browser/config/version.txt` in the source tree
|
||||
version = "128.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Floorp-Projects";
|
||||
repo = "Floorp";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${packageVersion}";
|
||||
hash = "sha256-4IAN0S9JWjaGXtnRUJz3HqUm+ZWL7KmryLu8ojSXiqg=";
|
||||
};
|
||||
|
||||
extraConfigureFlags = [
|
||||
"--with-app-basename=${applicationName}"
|
||||
"--with-unsigned-addon-scopes=app,system"
|
||||
"--enable-proxy-bypass-protection"
|
||||
];
|
||||
|
||||
extraPostPatch = ''
|
||||
# Fix .desktop files for PWAs generated by Floorp
|
||||
# The executable path returned by Services.dirsvc.get() is absolute and
|
||||
# thus is the full /nix/store/[..] path. To avoid breaking PWAs with each
|
||||
# update, rely on `floorp` being in $PATH, as before.
|
||||
substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \
|
||||
--replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' '"floorp"'
|
||||
'';
|
||||
|
||||
updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Fork of Firefox that seeks balance between versatility, privacy and web openness";
|
||||
homepage = "https://floorp.app/";
|
||||
maintainers = with lib.maintainers; [ christoph-heiss ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.buildPlatform.is32bit;
|
||||
# since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "floorp";
|
||||
};
|
||||
tests = {
|
||||
inherit (nixosTests) floorp;
|
||||
};
|
||||
}).override
|
||||
{
|
||||
# Upstream build configuration can be found at
|
||||
# .github/workflows/src/linux/shared/mozconfig_linux_base
|
||||
privacySupport = true;
|
||||
webrtcSupport = true;
|
||||
enableOfficialBranding = false;
|
||||
geolocationSupport = true;
|
||||
# https://github.com/NixOS/nixpkgs/issues/418473
|
||||
ltoSupport = false;
|
||||
}
|
||||
).overrideAttrs
|
||||
(prev: {
|
||||
MOZ_DATA_REPORTING = "";
|
||||
MOZ_TELEMETRY_REPORTING = "";
|
||||
})
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl nix-prefetch-github jq gnused
|
||||
|
||||
set -e
|
||||
|
||||
owner=Floorp-Projects
|
||||
repo=Floorp
|
||||
dirname="$(dirname "$0")"
|
||||
|
||||
updateVersion() {
|
||||
sed -i "s/packageVersion = \"[0-9.]*\";/packageVersion = \"$1\";/g" "$dirname/default.nix"
|
||||
}
|
||||
|
||||
updateBaseVersion() {
|
||||
local base
|
||||
base=$(curl -s "https://raw.githubusercontent.com/$owner/$repo/v$1/browser/config/version.txt")
|
||||
sed -i "s/version = \"[0-9.]*\";/version = \"$base\";/g" "$dirname/default.nix"
|
||||
}
|
||||
|
||||
updateHash() {
|
||||
local hash
|
||||
hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq -r .hash)
|
||||
sed -i "s|hash = \"[a-zA-Z0-9\/+-=]*\";|hash = \"$hash\";|g" "$dirname/default.nix"
|
||||
}
|
||||
|
||||
currentVersion=$(cd "$dirname" && nix eval --raw -f ../../../../.. floorp.version)
|
||||
|
||||
latestTag=$(curl -s https://api.github.com/repos/Floorp-Projects/Floorp/releases/latest | jq -r ".tag_name")
|
||||
latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "Floorp is up-to-date: ${currentVersion}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
updateVersion "$latestVersion"
|
||||
updateBaseVersion "$latestVersion"
|
||||
updateHash "$latestVersion"
|
||||
488
pkgs/by-name/ad/add-determinism/Cargo.lock
generated
488
pkgs/by-name/ad/add-determinism/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "add-determinism";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keszybz";
|
||||
repo = "add-determinism";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QFhed8YTgvfm6bB/cRsrnN0foplJhK1b9IYD9HGdJUc=";
|
||||
hash = "sha256-jUBHIdqPuK95jNNMFeSgj0xd3WSneqRa0kcVDhFC3aw=";
|
||||
};
|
||||
|
||||
# this project has no Cargo.lock now
|
||||
|
|
@ -24,15 +24,6 @@ rustPlatform.buildRustPackage rec {
|
|||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix MetadataExt imports for macOS builds, will be removed when the PR is merged:
|
||||
# https://github.com/keszybz/add-determinism/pull/48
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Emin017/add-determinism/commit/0c6c4d1c78c845ab6b6b0666aee0e2dc85492205.patch";
|
||||
sha256 = "sha256-y5blOfQuZ5GMug4cDkDDKc5jaGgQEYtLTuuLl041sZs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -3,16 +3,10 @@
|
|||
stdenv,
|
||||
fetchFromGitLab,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
doxygen,
|
||||
graphviz,
|
||||
qtbase,
|
||||
qtwebengine,
|
||||
mpir,
|
||||
libplasma,
|
||||
knewstuff,
|
||||
kpackage,
|
||||
wrapQtAppsHook,
|
||||
kdePackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -23,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
domain = "invent.kde.org";
|
||||
owner = "office";
|
||||
repo = "alkimia";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-v5DfnnzOMsoCXr074ydXxBIrSsnbex6G/OqF6psTvPs=";
|
||||
};
|
||||
|
||||
|
|
@ -33,16 +27,18 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
doxygen
|
||||
graphviz
|
||||
]
|
||||
++ (with kdePackages; [
|
||||
extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
];
|
||||
]);
|
||||
|
||||
# qtwebengine is not a mandatory dependency, but it adds some features
|
||||
# we might need for alkimia's dependents. See:
|
||||
# https://github.com/KDE/alkimia/blob/v8.1.2/CMakeLists.txt#L124
|
||||
buildInputs = [
|
||||
buildInputs = with kdePackages; [
|
||||
qtbase
|
||||
qtwebengine
|
||||
libplasma
|
||||
|
|
@ -63,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
application boundaries.
|
||||
'';
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = qtbase.meta.platforms;
|
||||
platforms = kdePackages.qtbase.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,53 +2,45 @@
|
|||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
|
||||
npmHooks,
|
||||
nodejs,
|
||||
esbuild,
|
||||
brotli,
|
||||
zstd,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "anubis";
|
||||
version = "1.21.3";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TecharoHQ";
|
||||
repo = "anubis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CMFd9che+D1ot1Iqk0VcJmna0xIqHlRIvNnzYo+q+RU=";
|
||||
hash = "sha256-LOYBl9r00AJljGvlacd506cLeMr8Ndh817/ZIw46Uu0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cWkC3Bqut5h3hHh5tPIPeHMnkwoqKMnG1x40uCtUIwI=";
|
||||
vendorHash = "sha256-/iTAbwYSHTz9SrJ0vrAXsA+3yS0jUreJDF52gju9CgU=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "anubis-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-s+OxVf6Iysobfuo0nAh5qF157opD2sR5D+7awAx6GTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
esbuild
|
||||
brotli
|
||||
zstd
|
||||
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
];
|
||||
|
||||
xess = buildNpmPackage {
|
||||
pname = "anubis-xess";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
npmDepsHash = "sha256-NJMUXGXcaY8l1WIbvCn+aIknVuagR7X8gRkme9xpYQ0=";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
npx postcss ./xess/xess.css -o xess.min.css
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 xess.min.css $out/xess.min.css
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/anubis" ];
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -58,20 +50,35 @@ buildGoModule (finalAttrs: {
|
|||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags=-static" ];
|
||||
|
||||
prePatch = ''
|
||||
# we must forcefully disable the hook when creating the go vendor archive
|
||||
if [[ $name =~ go-modules ]]; then
|
||||
npmConfigHook() { true; }
|
||||
fi
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./web/build.sh
|
||||
patchShebangs ./web/build.sh ./lib/challenge/preact/build.sh
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
go generate ./... && ./web/build.sh && cp -r ${finalAttrs.xess}/xess.min.css ./xess
|
||||
# do not run when creating go vendor archive
|
||||
if [[ ! $name =~ go-modules ]]; then
|
||||
# https://github.com/TecharoHQ/anubis/blob/main/xess/build.sh
|
||||
npx postcss ./xess/xess.css -o xess/xess.min.css
|
||||
go generate ./...
|
||||
./web/build.sh
|
||||
fi
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export DONT_USE_NETWORK=1
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) anubis; };
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) anubis; };
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex=^v(\\d+\\.\\d+\\.\\d+)$" ]; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Weighs the soul of incoming HTTP requests using proof-of-work to stop AI crawlers";
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
nix-update anubis --src-only --version-regex='^v(\d+\.\d+\.\d+)$'
|
||||
nix-update anubis.xess --version=skip
|
||||
nix-update anubis --version=skip
|
||||
|
|
@ -2,6 +2,8 @@
|
|||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
python3,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
|
@ -15,8 +17,17 @@ buildGoModule rec {
|
|||
hash = "sha256-bNnansZNshWp70LQQsa6+bS+LJxpCzdTkL2pX+ksrP0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
vendorHash = "sha256-yTNUxwnulQ+WbHdQbeNDghH4RPXurQMIgKDyXfrMxG8=";
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/bbctl \
|
||||
--prefix PATH : ${python3}/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tool for running self-hosted bridges with the Beeper Matrix server";
|
||||
homepage = "https://github.com/beeper/bridge-manager";
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ let
|
|||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-D CMAKE_BUILD_TYPE=Release"
|
||||
"-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include"
|
||||
"-G Ninja"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -132,7 +132,11 @@ python.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://github.com/canonical/charmcraft";
|
||||
changelog = "https://github.com/canonical/charmcraft/releases/tag/${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [
|
||||
adhityaravi
|
||||
bepri
|
||||
dstathis
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,53 +1,50 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo125Module,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
let
|
||||
argset = {
|
||||
pname = "chezmoi";
|
||||
version = "2.64.0";
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "chezmoi";
|
||||
version = "2.65.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${argset.version}";
|
||||
hash = "sha256-MiIZfT2ax5LszSboXOtDp0hOpOJ8gXqeBTXyoacl+BY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LVq++K5ElXeArEpXLnSxg+8D9XJoXCHozOPeJrFbDRE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${argset.version}"
|
||||
"-X main.builtBy=nixpkgs"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash
|
||||
installShellCompletion --fish completions/chezmoi.fish
|
||||
installShellCompletion --zsh completions/chezmoi.zsh
|
||||
'';
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.chezmoi.io/";
|
||||
description = "Manage your dotfiles across multiple machines, securely";
|
||||
changelog = "https://github.com/twpayne/chezmoi/releases/tag/${argset.src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "chezmoi";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-neUltKkmNUtTajTwfWIIM9sJfDSXuAqJT3uLq6vR5NE=";
|
||||
};
|
||||
in
|
||||
buildGoModule argset
|
||||
|
||||
vendorHash = "sha256-NQ7k9bydAJDOGRX3bvRGkX5FuU8Va1IjUa6h0JEiLzo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
"-X main.builtBy=nixpkgs"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash
|
||||
installShellCompletion --fish completions/chezmoi.fish
|
||||
installShellCompletion --zsh completions/chezmoi.zsh
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Manage your dotfiles across multiple machines, securely";
|
||||
homepage = "https://www.chezmoi.io/";
|
||||
changelog = "https://github.com/twpayne/chezmoi/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "chezmoi";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "compose2nix";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aksiksi";
|
||||
repo = "compose2nix";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rFnnbRVVv/N5021Al3vmjFAui1cTp8NBZDBNQo8CsXM=";
|
||||
hash = "sha256-3i49IyYDwyVQffjHrHPmtPJl4ZkT1VpiFVDmX/dHcKw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kiUXgbXJg4x89k2SXf/1e1DLB04ETS+Qp2gx8uJA2DU=";
|
||||
vendorHash = "sha256-ckN4nK2A0micl+iBtvxwf5iMchrcGdC0xzjQta6Jges=";
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "conduit";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LLNL";
|
||||
repo = "conduit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-xs/9hsE1DLCegXp3CHSl6qpC4ap+niNAWX5lNlUxz9E=";
|
||||
hash = "sha256-mX7/5C4wd70Kx1rQyo2BcZMwDRqvxo4fBdz3pq7PuvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "coppwr";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dimtpap";
|
||||
repo = "coppwr";
|
||||
rev = version;
|
||||
hash = "sha256-Wit0adP9M8vlCXF6WJx2tZnR6LrwcvoTNx1KC1HfN8w=";
|
||||
hash = "sha256-9oFWX44jToJh0vJaDV/KZXVNQgLG0lr1iA+0hInAhLA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tgvSOwZmboe4DzEqJOCYWwIbAStGV1F6ZAzlwCd7Uo4=";
|
||||
cargoHash = "sha256-Fq8I1pt83yqrjiA4VXA+z7o2LFTac2SonAwTycQRP8M=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -12,19 +12,14 @@ let
|
|||
in
|
||||
flutter329.buildFlutterApplication rec {
|
||||
pname = "cwtch-ui";
|
||||
version = "1.15.5";
|
||||
version = "1.16.0";
|
||||
# This Gitea instance has archive downloads disabled, so: fetchgit
|
||||
src = fetchgit {
|
||||
url = "https://git.openprivacy.ca/cwtch.im/cwtch-ui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u0IFLZp53Fg8soKjSXr6IjNxFI9aTU5xUYgf1SN6rTQ=";
|
||||
hash = "sha256-887BiDqu35kocQmren9/rRhLdMNEXPmzsQFAixUvTxo=";
|
||||
};
|
||||
|
||||
# NOTE: The included pubspec.json does not exactly match the upstream
|
||||
# pubspec.lock. With Flutter 3.24, a newer version of material_color_utilities
|
||||
# is required than the upstream locked version. From a checkout of cwtch-ui
|
||||
# 1.15.4, I ran `flutter pub upgrade material_color_utilities` on 2024-12-15.
|
||||
# This upgraded material_color_utilities and its dependencies.
|
||||
pubspecLock = lib.importJSON ./pubspec.json;
|
||||
gitHashes = {
|
||||
flutter_gherkin = "sha256-Y8tR84kkczQPBwh7cGhPFAAqrMZKRfGp/02huPaaQZg=";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -5,15 +5,15 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "libcwtch";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
# This Gitea instance has archive downloads disabled, so: fetchgit
|
||||
src = fetchgit {
|
||||
url = "https://git.openprivacy.ca/cwtch.im/autobindings.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LlnfGHwjZFvygVF1/f9q+q1rD0OpEGIPzt7E6N6HWDc=";
|
||||
hash = "sha256-QHEaf3xm6SIHLnQamf0cUrKJ/A1v0iFaaGsMg33uIBs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t9SupYMfWBF0wHY3EFVT1zu0vvcd4OD/aQqlPeExw04=";
|
||||
vendorHash = "sha256-pnAdUFG1G0Bi/e9KNVX0WwloJy8xQ25YVFnGerRGy9A=";
|
||||
overrideModAttrs = (
|
||||
old: {
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@
|
|||
}:
|
||||
let
|
||||
pname = "dependabot-cli";
|
||||
version = "1.71.0";
|
||||
version = "1.72.0";
|
||||
|
||||
# `tag` is what `dependabot` uses to find the relevant docker images.
|
||||
tag = "nixpkgs-dependabot-cli-${version}";
|
||||
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
|
||||
updateJobProxy.imageDigest = "sha256:a42f9b9845929ae044b8cd51b5335195c33fd610405e558552408287c5295827";
|
||||
updateJobProxy.hash = "sha256-pEtwBoJ+wF2TdQCcCyigLg4NYqOp2oNCEB7oCJOkwYc=";
|
||||
updateJobProxy.imageDigest = "sha256:b0a4c841300510255d6e647e9bcdb939d194bc644dee7962a543f637515b0f23";
|
||||
updateJobProxy.hash = "sha256-+drR2uTtaQU0ckPTEbEBj5yvDtSP0BC3D0MxqRZ1Cjc=";
|
||||
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
|
||||
updaterGitHubActions.imageDigest = "sha256:ca93364b87b6a803d0005409cdb4c61d9c6d808dca33de47de14ef8c30811b51";
|
||||
updaterGitHubActions.hash = "sha256-TnV8IaBrGPpd06YYmvazGMlZTAVJIMCSWdOgi6hkpRE=";
|
||||
updaterGitHubActions.imageDigest = "sha256:3cbd297b1181de69e72a43ce2d7aa02eb7c2e71bc0c11d41288a86384af24aa0";
|
||||
updaterGitHubActions.hash = "sha256-Btn7bsBNJb34T7JXmgpTxkxBXXT9IpQihernhNAT/HQ=";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
|
@ -34,10 +34,10 @@ buildGoModule {
|
|||
owner = "dependabot";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RZNZ72FG4KQr52X0No6iXU4NMUQs7k000KYpw2Kuz5U=";
|
||||
hash = "sha256-YI5HkypIEWkPmdtPvMrOp7r71ccucAEKNFo/va6yICE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5zOMTe8Sa/nkIGtwm4FbAqv3/9Mg5Du2ixxF84VQbXE=";
|
||||
vendorHash = "sha256-KrjwObQ3o5A0JuOW71EKNi9yNJYwsPHI+6a0AZY/cqU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "displaycal";
|
||||
version = "3.9.16";
|
||||
version = "3.9.17";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "DisplayCAL";
|
||||
inherit version;
|
||||
hash = "sha256-Ozl0RrYJ/oarNddnz+JjQKyRY6ZNvM9sJapqn75X3Mw=";
|
||||
hash = "sha256-cV8x1Hx+KQUhOOzqw/89QgoZ9+82vhwGrhG13KpE9Vw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,49 +4,66 @@
|
|||
rustPlatform,
|
||||
fetchFromGitLab,
|
||||
stdenv,
|
||||
mdbook,
|
||||
}:
|
||||
|
||||
let
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "engage";
|
||||
version = "0.2.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
version = "0.2.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
];
|
||||
|
||||
env = {
|
||||
ENGAGE_DOCS_LINK = "file://${builtins.placeholder "doc"}/share/doc/${finalAttrs.pname}/index.html";
|
||||
};
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.computer.surgery";
|
||||
owner = "charles";
|
||||
repo = "engage";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-n7ypFJBYT712Uzh1NnWWSOIpEDKR0e6sQxbiIN6pZgo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0r5MIoitmFxUODxzi0FBLsUpdGrG1pY8Lo+gy7HeJU8=";
|
||||
cargoHash = "sha256-UTIxxPBtxzsZilxriAT8ksl2ovoDzIhB+8f+b2cGN3k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
|
||||
"installShellCompletion --cmd engage "
|
||||
+ builtins.concatStringsSep " " (
|
||||
builtins.map (shell: "--${shell} <($out/bin/engage completions ${shell})") [
|
||||
"bash"
|
||||
"fish"
|
||||
"zsh"
|
||||
]
|
||||
)
|
||||
);
|
||||
checkFlags = [
|
||||
# Upstream doesn't set `ENGAGE_DOCS_LINK` during tests so the output differs.
|
||||
"--skip=long_help"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd engage ${
|
||||
builtins.concatStringsSep " " (
|
||||
builtins.map (shell: "--${shell} <($out/bin/engage completions ${shell})") [
|
||||
"bash"
|
||||
"zsh"
|
||||
"fish"
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
${lib.getExe mdbook} build
|
||||
mkdir -p "$doc/share/doc"
|
||||
mv public "$doc/share/doc/${finalAttrs.pname}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Task runner with DAG-based parallelism";
|
||||
mainProgram = "engage";
|
||||
homepage = "https://gitlab.computer.surgery/charles/engage";
|
||||
changelog = "https://gitlab.computer.surgery/charles/engage/-/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://charles.gitlab-pages.computer.surgery/engage/changelog.html";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ CobaltCause ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
buildGo125Module,
|
||||
exiftool,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "f2";
|
||||
version = "2.1.2";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayoisaiah";
|
||||
repo = "f2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Roectcq8jMtw9bFnojJBq4+8dG7V4AGxclfqVSTdl4A=";
|
||||
hash = "sha256-eIsy7YYWAiP4Oqla/wsJW2hQ1LgG+QkFxtUPagbmAuM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-i6hgLj1zu8D0mrO0f+SZ4wAkmMKIPtzOKpu9zMAEML0=";
|
||||
vendorHash = "sha256-DHUX+8gw+pmjEQRUeukzTimfYo0iHyN90MjrOlpjoJg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -53,6 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
# minimal replacement for systemd notification library
|
||||
"--with-libsystemd"
|
||||
|
||||
# monitor kernel events, like ac power status
|
||||
"--with-keventd"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
|
|
|
|||
139
pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
Normal file
139
pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
wrapGAppsHook3,
|
||||
autoPatchelfHook,
|
||||
alsa-lib,
|
||||
curl,
|
||||
dbus-glib,
|
||||
gtk3,
|
||||
libXtst,
|
||||
libva,
|
||||
pciutils,
|
||||
pipewire,
|
||||
adwaita-icon-theme,
|
||||
patchelfUnstable, # have to use patchelfUnstable to support --no-clobber-old-sections
|
||||
undmg,
|
||||
writeText,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib.importJSON ./sources.json) version sources;
|
||||
|
||||
binaryName = "floorp";
|
||||
policies = {
|
||||
DisableAppUpdate = true;
|
||||
};
|
||||
|
||||
policiesJson = writeText "floorp-policies.json" (builtins.toJSON { inherit policies; });
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "floorp-bin-unwrapped";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
inherit (sources.${stdenv.hostPlatform.system}) url sha256;
|
||||
};
|
||||
|
||||
sourceRoot = lib.optional stdenv.hostPlatform.isDarwin ".";
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
autoPatchelfHook
|
||||
patchelfUnstable
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
undmg
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
gtk3
|
||||
adwaita-icon-theme
|
||||
alsa-lib
|
||||
dbus-glib
|
||||
libXtst
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
curl
|
||||
pciutils
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
libva.out
|
||||
];
|
||||
|
||||
appendRunpaths = lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
"${pipewire}/lib"
|
||||
];
|
||||
|
||||
# Firefox uses "relrhack" to manually process relocations from a fixed offset
|
||||
patchelfFlags = [ "--no-clobber-old-sections" ];
|
||||
|
||||
# don't break code signing
|
||||
dontFixup = stdenv.hostPlatform.isDarwin;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
''
|
||||
+ (
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
# it's disabled, so remove these unused files
|
||||
rm -v \
|
||||
Floorp.app/Contents/Resources/updater.ini \
|
||||
Floorp.app/Contents/Library/LaunchServices/org.mozilla.updater
|
||||
rm -rvf Floorp.app/Contents/MacOS/updater.app
|
||||
|
||||
mkdir -p $out/Applications
|
||||
mv Floorp.app $out/Applications/
|
||||
''
|
||||
else
|
||||
''
|
||||
# it's disabled, so remove these unused files
|
||||
rm -v updater icons/updater.png updater.ini update-settings.ini
|
||||
|
||||
mkdir -p "$prefix/lib" "$prefix/bin"
|
||||
cp -r . "$prefix/lib/floorp-bin-${finalAttrs.version}"
|
||||
ln -s "$prefix/lib/floorp-bin-${finalAttrs.version}/floorp" "$out/bin/${binaryName}"
|
||||
|
||||
# See: https://github.com/mozilla/policy-templates/blob/master/README.md
|
||||
mkdir -p "$out/lib/floorp-bin-${finalAttrs.version}/distribution";
|
||||
ln -s ${policiesJson} "$out/lib/floorp-bin-${finalAttrs.version}/distribution/policies.json";
|
||||
''
|
||||
)
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit binaryName;
|
||||
applicationName = "Floorp";
|
||||
libName = "floorp-bin-${finalAttrs.version}";
|
||||
ffmpegSupport = true;
|
||||
gssSupport = true;
|
||||
gtk3 = gtk3;
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://blog.floorp.app/en/release/${finalAttrs.version}.html";
|
||||
description = "Fork of Firefox that seeks balance between versatility, privacy and web openness";
|
||||
homepage = "https://floorp.app/";
|
||||
# https://github.com/Floorp-Projects/Floorp#-floorp-license-notices-
|
||||
license = with lib.licenses; [
|
||||
mpl20
|
||||
mit
|
||||
];
|
||||
platforms = builtins.attrNames sources;
|
||||
hydraPlatforms = [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
christoph-heiss
|
||||
];
|
||||
mainProgram = "floorp";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
21
pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
Normal file
21
pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"version": "12.1.4",
|
||||
"sources": {
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "3221bc1299edacf061f0c66a3543532fd67ef0b7f998f4c41b4c7f062f79685b"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-linux-amd64.tar.xz",
|
||||
"sha256": "86a5d86a52f3778ca3d3b7b250c3e36820ab792232e8dd8cd4482586e9c1f2f1"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-macOS-universal.dmg",
|
||||
"sha256": "482723722b6bab68ce5353d49502b1db6d3d43d3f918de273ef8de77c5d7f03a"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-macOS-universal.dmg",
|
||||
"sha256": "482723722b6bab68ce5353d49502b1db6d3d43d3f918de273ef8de77c5d7f03a"
|
||||
}
|
||||
}
|
||||
}
|
||||
44
pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
Executable file
44
pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
Executable file
|
|
@ -0,0 +1,44 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq gnused gawk
|
||||
|
||||
set -e
|
||||
|
||||
dirname="$(dirname "$0")"
|
||||
currentVersion=$(nix eval --raw -f . floorp-bin-unwrapped.version)
|
||||
|
||||
owner=Floorp-Projects
|
||||
repo=Floorp
|
||||
|
||||
release=$(curl -s "https://api.github.com/repos/$owner/$repo/releases/latest")
|
||||
|
||||
latestTag=$(jq -r ".tag_name" <<<"$release")
|
||||
latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "Floorp is up-to-date: ${currentVersion}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
jq '
|
||||
{
|
||||
version: .tag_name[1:],
|
||||
sources: (
|
||||
.assets
|
||||
| map(
|
||||
select(.name | (endswith(".tar.xz") or endswith(".dmg")))
|
||||
| {url: .browser_download_url, sha256: (.digest | split(":").[1])}
|
||||
)
|
||||
| map(
|
||||
if .url | contains("linux-aarch64") then
|
||||
{key: "aarch64-linux", value: .}
|
||||
elif .url | contains("linux-amd64") then
|
||||
{key: "x86_64-linux", value: .}
|
||||
elif .url | contains("macOS-universal") then
|
||||
[{key: "aarch64-darwin", value: .}, {key: "x86_64-darwin", value: .}]
|
||||
else null end
|
||||
)
|
||||
| flatten
|
||||
| from_entries
|
||||
)
|
||||
}
|
||||
' <<<"$release" > "$dirname/sources.json"
|
||||
8
pkgs/by-name/fl/floorp-bin/package.nix
Normal file
8
pkgs/by-name/fl/floorp-bin/package.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
wrapFirefox,
|
||||
floorp-bin-unwrapped,
|
||||
}:
|
||||
|
||||
wrapFirefox floorp-bin-unwrapped {
|
||||
pname = "floorp-bin";
|
||||
}
|
||||
|
|
@ -47,6 +47,7 @@
|
|||
libgudev,
|
||||
libjcat,
|
||||
libmbim,
|
||||
libmnl,
|
||||
libqmi,
|
||||
libuuid,
|
||||
libxmlb,
|
||||
|
|
@ -133,7 +134,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwupd";
|
||||
version = "2.0.14";
|
||||
version = "2.0.15";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
|
|
@ -151,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "fwupd";
|
||||
repo = "fwupd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VUpLYl7SKJqwbM3Lna22txTeMwqtpQieiw1DLX/4xtA=";
|
||||
hash = "sha256-p0ZpbthjUaEKAn1UwzoW2gxqiBTsC4GMoXTmV3zKN2o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -234,6 +235,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libgudev
|
||||
libjcat
|
||||
libmbim
|
||||
libmnl
|
||||
libqmi
|
||||
libuuid
|
||||
libxmlb
|
||||
|
|
|
|||
|
|
@ -2,34 +2,18 @@
|
|||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
|
||||
cmake,
|
||||
doxygen,
|
||||
extra-cmake-modules,
|
||||
graphviz,
|
||||
kdoctools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
autoPatchelfHook,
|
||||
|
||||
akonadi,
|
||||
kdePackages,
|
||||
alkimia,
|
||||
aqbanking,
|
||||
gmp,
|
||||
gwenhywfar,
|
||||
karchive,
|
||||
kcmutils,
|
||||
kcontacts,
|
||||
qtwebengine,
|
||||
kdiagram,
|
||||
kholidays,
|
||||
kidentitymanagement,
|
||||
kitemmodels,
|
||||
libical,
|
||||
libofx,
|
||||
plasma-activities,
|
||||
qgpgme,
|
||||
|
||||
sqlcipher,
|
||||
|
||||
# Needed for running tests:
|
||||
|
|
@ -38,12 +22,12 @@
|
|||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kmymoney";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kmymoney/${version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://kde/stable/kmymoney/${finalAttrs.version}/kmymoney-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-/q30C21MkNd+MnFqhY3SN2kIGGMQTYzqYpELHsPkM2s=";
|
||||
};
|
||||
|
||||
|
|
@ -54,21 +38,28 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
extra-cmake-modules
|
||||
graphviz
|
||||
kdoctools
|
||||
pkg-config
|
||||
python3.pkgs.wrapPython
|
||||
]
|
||||
++ (with kdePackages; [
|
||||
extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
kdoctools
|
||||
autoPatchelfHook
|
||||
];
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
akonadi
|
||||
alkimia
|
||||
aqbanking
|
||||
gmp
|
||||
gwenhywfar
|
||||
libical
|
||||
libofx
|
||||
sqlcipher
|
||||
]
|
||||
++ (with kdePackages; [
|
||||
akonadi
|
||||
karchive
|
||||
kcmutils
|
||||
kcontacts
|
||||
|
|
@ -77,12 +68,10 @@ stdenv.mkDerivation rec {
|
|||
kholidays
|
||||
kidentitymanagement
|
||||
kitemmodels
|
||||
libical
|
||||
libofx
|
||||
plasma-activities
|
||||
qgpgme
|
||||
sqlcipher
|
||||
|
||||
])
|
||||
++ [
|
||||
# Put it into buildInputs so that CMake can find it, even though we patch
|
||||
# it into the interface later.
|
||||
python3.pkgs.woob
|
||||
|
|
@ -117,4 +106,4 @@ stdenv.mkDerivation rec {
|
|||
das-g
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -1,81 +1,83 @@
|
|||
{
|
||||
"@esbuild/aix-ppc64@npm:0.25.0": "468ba76b20f43118a11fd589ef162ff12c3c9f988a861045cc421b3100f9ade27103a0743fa9e9882c54dfe2ec647ca9b209cfc17ef61b5c9bc48be95e5856c1",
|
||||
"@esbuild/aix-ppc64@npm:0.25.2": "e25252d47d27d5e15a09ba7e7e906fe35d90a363e1eec7bc1e054c066bea6f89364139385008f78e8b4523ebaecb1f7a678213c8fcc2cd0309d539bbc455fd05",
|
||||
"@esbuild/aix-ppc64@npm:0.25.9": "b5c49f119424bb3f7be30b652ef87bf881824ace02cc2327ba6f7e0f86d04d2afe2087086985f4220dfdbb816acb67e6dfcf00da9eb8b028babfac43df3adac8",
|
||||
"@esbuild/android-arm64@npm:0.25.0": "599fcb6b815a9bc8f83687663653c15ceb1c0f9ea0587da03976972281cd040c23b551a9f772d459809c22f7e218e04f1b159f8da1298b9c79b822f5636eff59",
|
||||
"@esbuild/android-arm64@npm:0.25.2": "b387ab30ec70902c81ca1231a7838ccc993ad8dff9561a5ec7d7d4e5f03426153d42e496985a02539bce55f6d1048156f36e24a29f61fa5fd8e0587f62696703",
|
||||
"@esbuild/android-arm64@npm:0.25.9": "afe76da072b16e355f546d1d9023b814ead0487d9fa5e393eeb4bb3f6f76e5542e14b82396ca37c38e868ed64deef6b25f1c47e2564141fe5ecfe0eb7543f3f8",
|
||||
"@esbuild/android-arm@npm:0.25.0": "ff6124350b732afe0f59087d5a50afb0c05d0d3951b4fc0f7c52c19ccacef504d7998217d8d7594dcfd4872748350a49ba611e8f2de3fe9e47a3df4393cb67eb",
|
||||
"@esbuild/android-arm@npm:0.25.2": "8e7efb22407ad9a985ff5a09dc0d2b895126c6ccca470db671ca0a3e3026f79666af20ce5d296311f5d056e95ca71e743feeae526f94dcaacb5a6969f9963283",
|
||||
"@esbuild/android-arm@npm:0.25.9": "0d4c724b84043db6597736865a4fe86640c88f21dc0ebe93a2298b4a0e0f0a5d1530a821dd1c18a2b39a6ca9abe8ff714b8ed5de496045a67150ea47c86a39d7",
|
||||
"@esbuild/android-x64@npm:0.25.0": "7015f561e36c4fe142a4047184776344def5f25369c0bce8abd1de3d623d84cf7ddc09e5f7bac8294a8aea457ec23414e169648579382e6fd1aa39590ffe6e01",
|
||||
"@esbuild/android-x64@npm:0.25.2": "66256eee6168c2f903c45c82863f1377f525dc7de0fc902fca412a44d0abbb8a25761fb9e10c8663b25b0f816d86b7e353d2b77ab39eae95234333f9d233ddc4",
|
||||
"@esbuild/android-x64@npm:0.25.9": "9da8b1ede5670c2c9e644e0fedf1dd0747081272b296d3f80b53b44b637744d836efee00dc767b81940eb285524a5e3149d8045787f6281ee2bd53f61a9c8717",
|
||||
"@esbuild/darwin-arm64@npm:0.25.0": "ba18b48c2c652a930a436a872b40cb0999fc0c4788dcda908f467d47555b080043e9ba1f9a7f080eb8d91ea8a3a399216aeea95539829a58885c412131025597",
|
||||
"@esbuild/darwin-arm64@npm:0.25.2": "36a568a779000133d077e2272181232f52939c3e0b0b986ad3f3fd6ab29628c148e88cd857f6de41a16e22e6a252bb16680f91c00c7d813690fa9bc060f58386",
|
||||
"@esbuild/darwin-arm64@npm:0.25.9": "84a88a8f72fcc66381518d5821e4ed276aeea17c76559bee4fcb472b19456da630ad84d8d74b3e4c297ef7b1ec5bd5037d55ac6ef5c515a77fb94a1bd891dece",
|
||||
"@esbuild/darwin-x64@npm:0.25.0": "83470576dc815364e8f2a6f2ed9c62496fa8112ee4905ccc3b142e36d28c9c90310ad179055d87e2e880e1bf9a3be0e9eb2129d6a88fdacf38181bfab6cf75c0",
|
||||
"@esbuild/darwin-x64@npm:0.25.2": "b761a20f8db7bf0499f6cba51c72104e733d9186d6f34a7f5e4590c02ecc2f9b84cd02c4e7bd3dade4156b7f92015cdbddc516dd1e4859233e3155cb0fecda58",
|
||||
"@esbuild/darwin-x64@npm:0.25.9": "c500bcd0c1a8f66d19cf575299a7da7f29dbdb56beac95bb6ddc570291e3e9da4e7d31db6453fc19ea5ac7f85662f40c9a3965c3e1f49657efeb292a6f601a26",
|
||||
"@esbuild/freebsd-arm64@npm:0.25.0": "646f3abba09e87c4555359200af913bbda9fac43629f6ade6adefdbd0d915707a375314e1d25ed0d951e6024d7d19fe0ecdd10caf4ff6177f3f6450e7132a6a9",
|
||||
"@esbuild/freebsd-arm64@npm:0.25.2": "8f869d6200dba388ac4c008c7a5b6522f44797370a12f94fd19e37b6cd76bdbdf48d0fa893b5ce200a538a151281e9f71e985f82ec8b8c96f16075e45266c718",
|
||||
"@esbuild/freebsd-arm64@npm:0.25.9": "fb4951968ad62e5316ffd08c037bb2396e8119a0c2289e968421bb277bdbffe23d89c92dcd2d7eb680f31be2b05e36406211b141b9b89378b424e4b5193c3d7f",
|
||||
"@esbuild/freebsd-x64@npm:0.25.0": "4b769e23981e5ec010f9c4670b1194e26e8bf98cc0bb70962fe8c160da508b40561c0b97911072c5de82954a4164af9d885e45e597e39ae379b5cad2d0a8c69e",
|
||||
"@esbuild/freebsd-x64@npm:0.25.2": "6cdfb6c6d6f6ead324a9ee75ab1068305672207cf1d3189bcf5599ec158e0eb07d74ff63597e389777163b4399da1cc6164b918a7ea9e798e7fd45eee6aad9bb",
|
||||
"@esbuild/freebsd-x64@npm:0.25.9": "0c71856891d5cea255f9bcb4482c70347a39198da2769a273afbd16bc9db7176bc1d28c41dd569b8b8f98cfd14b10a728c79f54311037d702bb7dffd95f27740",
|
||||
"@esbuild/linux-arm64@npm:0.25.0": "508ca15315c4d7b7db28fc8e17247ebe5c816c270496d1354f0d97baafdf774ec055c2d9ac51e06fb02fed93ce4f94d109b92fe80a62e42bf51a2c5046fc76c8",
|
||||
"@esbuild/linux-arm64@npm:0.25.2": "a0d51ec6e91e97461916eb6c25b12a8ea6b58ec2f3d91199c0c3f02ec569e98ff1389700250d4664d8394d3d5b5a051d695b34bfe77ab4a12985dfc18f315b73",
|
||||
"@esbuild/linux-arm64@npm:0.25.9": "6c64bf50dfb709d4000b022558293764a20ff8ba0b6638e8abb3bd0806cab25ac971f1910eaf2a4d73f92080afdb296d57175b2199647de019c2f419365f839d",
|
||||
"@esbuild/linux-arm@npm:0.25.0": "3756d3974f5b5a6453f2ece2fa012f530b32b6af78cc0b6466bf0582b3da718803dae41bdb5cc4cdc360882bd791b63bb79e5f4a6f8c44ee053fc93b8dd6ea7f",
|
||||
"@esbuild/linux-arm@npm:0.25.2": "5a4cf4045a2a5949dc8875dbad9a82fde7333d3f59b66d8cb614b34b76a7fb715a8d74e41f0788104bcef0436108ca548d71a543f582073e0458e20370dbb802",
|
||||
"@esbuild/linux-arm@npm:0.25.9": "b9a473988dadbe98f1c6ade2597e5967371d929ac83bb9f888d726d4f0e5cc4b8fe5020332adb26d61748619bf3e62c831d9c80b3bf815a6dd90dab76283d533",
|
||||
"@esbuild/linux-ia32@npm:0.25.0": "d220829704167772688a93568738d0887fc45d88cce7a4f2e4de992f161e9aa679294bfdf2dd3d70fa6549b548a023d98a90f19270cd8ebd5b365efe04b7027c",
|
||||
"@esbuild/linux-ia32@npm:0.25.2": "535c1755ed95a47b05b865361d2efbef3490f05815743c0d2372f55a2e14f0cc1d5ed6e5dd6f91c7aea871ea2f64cea021eea6e714027148489c54edc6e2b19f",
|
||||
"@esbuild/linux-ia32@npm:0.25.9": "51f458a7038e2ee014b994f7f216821194b00716ae5abe78fe828d9cefd47575dc0ff703f95c18017e59b7bcb63c13ac6d551e8ab64522cce8af89bc33a689d6",
|
||||
"@esbuild/linux-loong64@npm:0.25.0": "e7f1a54ea77c9307f54d7172a03b1e77ec18b3f6622077fe3dcb4d53435ea47fc60e82b9da7b8efe375c0e46f4c07169686262af2eaea6557cf033c973f6fbcd",
|
||||
"@esbuild/linux-loong64@npm:0.25.2": "8ff82f5cdd7a9490dfb3be64c990841d2a8e1a0ce83d76fa8d5e9b0ba7aa91ca725f338ff43b4d69a18744905f1730adf87a7f8359ae839030663e0bbe2807e2",
|
||||
"@esbuild/linux-loong64@npm:0.25.9": "81478bff0f6d54e06fa96ec120c2dc92e47c3a1392397a121cf50a83496156f9abebd46f93e35a496f4f305c8af7cd430e4fe723474a2420cc21d39257852210",
|
||||
"@esbuild/linux-mips64el@npm:0.25.0": "d51dc06bc3da38fb046986019c6b1a8aa1b43a835089f1f8d8ce4242c9417e1d3d25fa593708cd61f66f8665be27829316b37ecf9e08dc48718aacc00608aac1",
|
||||
"@esbuild/linux-mips64el@npm:0.25.2": "382520bf655329d04f65e041f9bf774d11a2232bdf5125934732db915c179b1172ec3429722d9f02f46ee5bad7b70372872bfd003d7c1cc5ec95b7ca6ec8a983",
|
||||
"@esbuild/linux-mips64el@npm:0.25.9": "78709795d663461c54168719517c4c38b2a51861af0f97a91003ea6fe2c2b67dca77f57c2a2c4eb2c6481a8660b5fe477c72e46e90154cb72f1f235e683b2d0f",
|
||||
"@esbuild/linux-ppc64@npm:0.25.0": "a19514e5b21c5f70e6b5b6ccdacb09922e9c397e80e3b1ac8e55ed283f9f3a5325a9e4dcf284d033954f3c51a88411fa95473c83b2b69990e02e351fa971b63f",
|
||||
"@esbuild/linux-ppc64@npm:0.25.2": "c5736195867e9c441cabd0a2cbaa62f91c4e4963ed7490018d09a932d549e1d281411ddf9dbd4a4b68f0c0298c1321ba15fd4e493cdc3dea3e14b7a6207b12f8",
|
||||
"@esbuild/linux-ppc64@npm:0.25.9": "4a43e167f7f9659a5ca34678cb6fee53fbdba8b14a9a45f323abf33d9e141fd268984b0a18445db84cbada5ed2ac211ef318d5c44af0fbc0c7eea31c0c82321f",
|
||||
"@esbuild/linux-riscv64@npm:0.25.0": "4b275bb4d2442a68b62a93926a4da04bde06795fc7f5719555c7a9d2cf0e8a2cd6a50c0e574f1285e55e126f0be29cf6017d829c571c2fb31728fb1961c45f70",
|
||||
"@esbuild/linux-riscv64@npm:0.25.2": "c72879775daded232fb2e36a6fe26058ec1ccd1f5dd6a76b4e8da700c6dd20cb15b684bce34569cadd41f25a0a53bd2037994279856bb3148f8c16055adcaf68",
|
||||
"@esbuild/linux-riscv64@npm:0.25.9": "e71027660a884b5bbcb6e9e84ed439b3ef19466cd9f6d16c1bdfe2db6dbe9a40e8fc19ad429749102d1c15f015372f7f9f8ab7f82d506efffbd143fe8ab28aa9",
|
||||
"@esbuild/linux-s390x@npm:0.25.0": "7bd0fefc75c72d6d657aa9fec2322f1b8744936fc77da7e32027f0f1aff4b5fdaa8ae19a060fa4d465a79f14e13a4e10f3eeaf1ca64dc4c3cf08494b3e26100b",
|
||||
"@esbuild/linux-s390x@npm:0.25.2": "d8810561312c4c7705f3c580ef8cd38e2768feb19ebf2899595a227f59dfb6ca35182f8ad7ca65d503cc5d9c688fe742002243387aa09b98b8c32aabc522ac4e",
|
||||
"@esbuild/linux-s390x@npm:0.25.9": "7004c5852a3cbd1bd1d727e13b2f2be0747861ceab840ab8492ddff80b3d34dd41398681016cda3748c697e1b384bf4d4c1ad588538df38eba599ba935ecbd09",
|
||||
"@esbuild/linux-x64@npm:0.25.0": "f9562d7e1d25b9a69faa40aaa7dd607b820836f88733b26b27a48b14b8a526cc5ec033c1869386419bd609c96442974c339ccbb03b4a23ea205927b2243d3b6c",
|
||||
"@esbuild/linux-x64@npm:0.25.2": "32c8a5f7d0640655ebf60f379ee2b037fe83f3f0edad911a9098505e6ac589c5f2873ff441017183626a19d334e3bb59f58411f2d5474eb7222917575593abea",
|
||||
"@esbuild/linux-x64@npm:0.25.9": "3bab69aa63d5ef65e9eaa229963ee3a3c868a06badf019277af06d4f7c52ea3a30abafad361e5bcce71032abd8b6fb666607977a627fa2def8db6756cf99b2ee",
|
||||
"@esbuild/netbsd-arm64@npm:0.25.0": "4f2502bbcf5967cf2a07c712f9fd87a0ec1e60356ea115dc8b69ea7364e88edae5758bb7cba4049065bb8e78d69d0f6bce09f42f146a50b2dcc6069e14ba66d5",
|
||||
"@esbuild/netbsd-arm64@npm:0.25.2": "0b7f77ec46163feac839b17b94e7db87edf61441bd9a67115722bf72781021c8220576a2e2c70bbca45b89a1e69a6b132f5489b59e84241b197272c1ee080304",
|
||||
"@esbuild/netbsd-arm64@npm:0.25.9": "02b82c6773ad09082e3b18f01dbf4b9f72519a9e93995b479e4bd4bb28c8a4088972fd0e9304881d09775429dc388a3625249096426349dc3adc2208ee408a4a",
|
||||
"@esbuild/netbsd-x64@npm:0.25.0": "82e3e256ac495620890867e85b63f4327e3f5cd5876c868dd4690094c7e4c233bc2359835e512443b8a44f44fc15d98ef3e63914efae8128d3a348d0ebaa66ec",
|
||||
"@esbuild/netbsd-x64@npm:0.25.2": "6d6686f5d2eb79b042bd4f38dc95e73a8e290a057be1b6afc42867830c9cf2313600b4fd53287f2f418c9f454bf5df02154b16dcfbfc33a6eb2ce9722a4eecc1",
|
||||
"@esbuild/netbsd-x64@npm:0.25.9": "51a576cb8ad7f43e43f76b25273735646eefa0d2a5bdaa3bd6387ab89512940bee49e91f7051b3d08d143d5cd6b4501f72a9462f30e242f0dff931c4ebe40363",
|
||||
"@esbuild/openbsd-arm64@npm:0.25.0": "6c8de60d94a53fa4c37f7cbfca04baf06a14bb4b4360ab711b2235ec33b624e268cd39aad84382648eabae4db5727495806221211d663c36f1710579f504f967",
|
||||
"@esbuild/openbsd-arm64@npm:0.25.2": "8a08c16440c6389623bbacb717412635aff61a1552c917e707d71da1dc92c618eea9a9aa1606a4a4f322216f100ede658523baec2e82b1f11b4efd523d491173",
|
||||
"@esbuild/openbsd-arm64@npm:0.25.9": "9bf0e7a535304f0d3c700d6e4ef536fe94b17e05bf5f9a4cc308ffc8c3d3cd642ee7debcf7f649a845610b1c706675af903f785ef14f320ee918faa61bf79bb5",
|
||||
"@esbuild/openbsd-x64@npm:0.25.0": "ed2beae58658aa2146a9cae2152a38f52f34e2dd929e79a298f8ce4b3c2c6fcf8e2ac98b458fb0fe5baf87c08df12b162c74b52b4c95f5f54f5a073da1668ebe",
|
||||
"@esbuild/openbsd-x64@npm:0.25.2": "43baf3248bb460e169cb1b5f26f5eb720088fa0d467c77f4f72c6cfa8e6d7b7794c52ed5e4a9a2113db53313c5fec86e352c94939abf601ab22d5e6e9addc4e5",
|
||||
"@esbuild/openbsd-x64@npm:0.25.9": "bb9bb4c5f095575f267d30c9e65f8e64c3f425d24904f6e22112c305ee5f1503aea750f510252e4b862f366e5efac678b71cc848cda72c587be8af4119d28f80",
|
||||
"@esbuild/openharmony-arm64@npm:0.25.9": "130f08d72a018aceef14b8534b9910bd2c0852fc074467ad0adf54d339584277326c7ffc8cd8126be08a530184c51d8de11d06971d1cc44545162bfb8428bcc3",
|
||||
"@esbuild/sunos-x64@npm:0.25.0": "9a0d0569ea65171983b0daadbf8ec6dd31341db7bee50fc4c2b85521eb09ff7597279d9dda4b4f25c3bfd6f4f77d558b6a6f36dcfb6794e7fc2177df9770a17e",
|
||||
"@esbuild/sunos-x64@npm:0.25.2": "0babbb99d3bc3ed818b2b01fbf65ebbf5930defb850e5a5a94a3ba5fc7bc2463d561c07af0d3ac6d6d0197c86682750ceb47abf7d293dd3222b1bd33da9f8aa5",
|
||||
"@esbuild/sunos-x64@npm:0.25.9": "a86fca2baaaffcaed419bdc6569cf4a88b4ae830034f8deb4d83ba781b989e25b03696cfe05a482e24710191abc53479b70491f3f157eff37ed2b486d88c897b",
|
||||
"@esbuild/win32-arm64@npm:0.25.0": "5484d8ad74479f8cc8c7b5d14d5f8ced3e50d6ef7fc12a45406ae6c6e5199784267bfccbe0173b598c1b512ea20ecd5de20579cf04d3e07848df3db7ccffd8e6",
|
||||
"@esbuild/win32-arm64@npm:0.25.2": "205aab6fc7b0ca7ee992cd24d73550110c1f79dc2ca724384bb52aa95111248df022375cd648314bd7eeb42083d576c55572f3d39d4ddcd82fc7372f1e7688b0",
|
||||
"@esbuild/win32-arm64@npm:0.25.9": "cd32c8fe88511e413f6161480ea3b6fc2ed7cb4bd2febb455e7bc45842880c752ba71772f289908ded50d8cfd3207e6730c8fdec2e811af1f65e97d1ee53b4ef",
|
||||
"@esbuild/win32-ia32@npm:0.25.0": "206eb14fd607c5a5116a49eaf4ed3ca7c34c0372729d7d34aa07bbc2a5792afabfd62873212213b17607165bd4ecbe4366066de0ddedd50a46a27a3c5cb830e5",
|
||||
"@esbuild/win32-ia32@npm:0.25.2": "aa38c0e082e3111e84929a64638cce1c3e1114218726e41c99bf239f2c05be94fb6fe1083366aa342bbd8e75fd449a6a3bcae9b6b3b84066a3a3882dcbaa0090",
|
||||
"@esbuild/win32-ia32@npm:0.25.9": "c374576d857dfa3c8dc5bdeef598ffc0e3adfcb8b7986a2b78ce61d2aa3c3d1f1cd15cb685f52b88411403d974f657c3fd44cf9b4fadb94e8ed69d75e9e3e0ef",
|
||||
"@esbuild/win32-x64@npm:0.25.0": "a129e6ad07bbcc791fda365e71634aa45cf3989ded1f05ed1ecb99efa625b09081ef410d236fdd279037d001f2e5e5049c98bfbe6a2242c818463222df85cc54",
|
||||
"@esbuild/win32-x64@npm:0.25.2": "2f2d147c610a3c3ab0f0f97132e4421464d3d38b835d989e8c324b7397e2592cd05485ec1998ae352f06d3191dd1d71c24f94f63f7c70cd8ea8a4c85441502a9",
|
||||
"@rollup/rollup-android-arm-eabi@npm:4.34.8": "1d21d3ba13ed2cff8b4955b9d7c5fb91fa954be9cdd8f4e5bedc4e1d95733af3249bb7f3f000b9c69e89128a9439bb35990fd5c737372bc9b7fdbea906ac63dd",
|
||||
"@rollup/rollup-android-arm64@npm:4.34.8": "b3c44e5aaab2b429716d58b93353b0429a131a0b7e08ee39f25ceca1faf3cc453346c9cb91dd1cc278eb5621fb701da87608cc3ce323c24d5f3d191781694ec3",
|
||||
"@rollup/rollup-darwin-arm64@npm:4.34.8": "a117920a3f06b6fb3e57f3a240a38ea3184811f931105185942e1cb9865d609662e3849ee53bdf7265d4555b9c9d2b6723fb4c94a9b1e494b522253246767b72",
|
||||
"@rollup/rollup-darwin-x64@npm:4.34.8": "70862e22270122f61690fcf69f07a32f3cce9028c7c296cc6a37bd5ae2fe2e021cf86df877274acf07a927889faf3ffc8721871d749087ea86941853c66a1f27",
|
||||
"@rollup/rollup-freebsd-arm64@npm:4.34.8": "42e5a9a8fb20585ee5fc1a94f758fdfe4d1dde03a4f6476686b1a8835167e2e210192fb8ffd733dd12baaec928a3fc753bf05609798df99bb4d8b2f6ea44f997",
|
||||
"@rollup/rollup-freebsd-x64@npm:4.34.8": "984baffa0968907090146b0237697ee76b64eb18dbde512304e83d793030f2cec01bb08658ccb2e12ff6ecd88dccc4886acaaf8117345e564c9b7752c20a7d51",
|
||||
"@rollup/rollup-linux-arm-gnueabihf@npm:4.34.8": "3a7fe8a7c80608ee54bc2c5b40424b15b0a3da8ec8201e3303f56bedbf3a34f8446b9968da849705373c02c3bd35c56ca22117c3549c8968b2cd1ad54f2d82ed",
|
||||
"@rollup/rollup-linux-arm-musleabihf@npm:4.34.8": "27fbc7ec1a8ac9d44661d4024d704bc1af8c257bd454b3b56cbcf43afe60a617ac4dec50e6c5906a07945d2bed60c8d44b972aee9f53186b24b7df2b9c99e3f3",
|
||||
"@rollup/rollup-linux-arm64-gnu@npm:4.34.8": "7ce7073fa830540fc67616b44b3155bacfe84463268ba948aa68719a197684da4ef60882ac1623d168597c3178f936262386de67425c60d645bf66eabf743351",
|
||||
"@rollup/rollup-linux-arm64-musl@npm:4.34.8": "1acb2a29e1a190c2df27c5e1a30424f22ca98dd5c4e12c2103e2810659c95b8e027b5b34dd0127e55b8c818bb28c49dfc9fe6586c508f85b98350ded6bb60717",
|
||||
"@rollup/rollup-linux-loongarch64-gnu@npm:4.34.8": "50c416ca41ed0df3d54ccf11c7e5487c64f9e2fee97deb21741086c61a99007ee3dc011d34a6261a3d32cff3f46483bce930ae92e96d54abe607576095bc3906",
|
||||
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.8": "b80e0473848b7d26ab845368e75fd834f71fe6b03f1753450a9c521fe99024a5caa40a85ce8bce1bce079971b31dc2266c718e05ff950143f98a3310944863f4",
|
||||
"@rollup/rollup-linux-riscv64-gnu@npm:4.34.8": "1efd1e6142b2bbaa986f5c9edc1caee98f3fbd18160da02fd6c05b324b683eec0d8a9b0d4525b67de70873375988d1a4986dfdaf94ec847d9f30a82e5bac1bcd",
|
||||
"@rollup/rollup-linux-s390x-gnu@npm:4.34.8": "d536c327ad26cf9ad586ad68e146f4cbd64b6bb1daf146f8124f6257f70f42e1d05e37afab902f97049cf8d0b7e60458480a8cf2e49379f1efa1568ac13f6107",
|
||||
"@rollup/rollup-linux-x64-gnu@npm:4.34.8": "9c8e0c8ae968e8400641d782d7cb0b9b06cdec0c0a366c20259e49da0984ffea2a6af15de3e1fdfc92c1906a97044ea676195b945750848c8ddf34abf675eebf",
|
||||
"@rollup/rollup-linux-x64-musl@npm:4.34.8": "994b3a904c79fa72a3c331c983c27296ebb302b08f6c624ecbbf91cfa136f03cbdad4be904fd1a80b44d521e49399aff6e7902b594146a8c73cb6d1ad13dce08",
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.34.8": "5d09e6b59d1b08bb85922170aad0b8ada8bff7a5d63bed3b1ba49d4bbe32fd2557527d85c1bb97bf8d7f20778c2266b35c86bb4b0c035835099a3f6b222bc26c",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.34.8": "d4817c6e0744f2a53c24ea6855ed061fb03437fa0187f86363768d0edffc7e1bd281f9003e684779ac5662627daab1f2816084a257a13ade5bc0fd7e63912d94",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.34.8": "47679da18b7676a91d123a73298047fca019b4a9dfc4e026c43ba0dfea763ed972a9ce0cd46766317af45ef4d2a09cccc6284c4226a006b05d2e6fb712dad29c",
|
||||
"lightningcss-darwin-arm64@npm:1.29.3": "599581a267d180e23c3a08652666a62c1a47b2c7d2cff892f22675a3705886f728c596c7fe51867649736b15ac29a79cb97d7aba58a9fd8c75b3cb73d10a8c85",
|
||||
"lightningcss-darwin-x64@npm:1.29.3": "c9868e863c72d8e60edbb21c88146928da1ad89e8a6f642ec8cc14d20b1d623961270707a94bca0332ef3d2b57d3ef8346523ec619b587db655d204341677ced",
|
||||
"lightningcss-freebsd-x64@npm:1.29.3": "f04a9f4b401db4879134c6b7e96c56301f485fb0c65bc2ef753d89e3ba40c5eeefdc006cd4787e5a40efb7409555a400f469898133ad7d947a09eb5bfa20f9c0",
|
||||
"lightningcss-linux-arm-gnueabihf@npm:1.29.3": "2ebd119afe472d0e43bcb530fa87a23124716f9134d34b03b73ff71a0b145d39c350780ab630b0dbdafdd420b08159dc3f672623099c07b072417c5c8216c18f",
|
||||
"lightningcss-linux-arm64-gnu@npm:1.29.3": "617df6a4bf3f76db3e2ed826120ecfc81db270947a785db57a63633a9e14e7e8d55e2e35adabb3ef98db4a5f572b7a2eadcf31f93ae08182e949480f9c1c9c83",
|
||||
"lightningcss-linux-arm64-musl@npm:1.29.3": "f31c4f11fafee941f7077df9a7669f4eb7e299f0ef8e194b6fbe91d4847fe90dcb16eff5b245520bc56e1486377ff95a2a53dfdb5cb36fd0d4aeb1828b7b53e3",
|
||||
"lightningcss-linux-x64-gnu@npm:1.29.3": "95872955cdc86a3401e36a7871a050e84908b27c1809277c2f86e3bb8fc5ba10d11c442f0df6c6ba5a5b2ec64ffeffd1b941135d515e8b37d873ce342a0a7f2c",
|
||||
"lightningcss-linux-x64-musl@npm:1.29.3": "6dc4817256841b7b98da88833c9575d87339f6c3b56d16b25cef0eddbe3b03cb7d12121187a1ac4443d6b5f52161bb6177a50e017a86d320278e7524b4394179",
|
||||
"lightningcss-win32-arm64-msvc@npm:1.29.3": "64ed3c716814064ef13f804468dc4def41f86695b0131fb8fa1cfd295036b885ca92122e488758c8ff88feb61e5a8ce05371281cb18e3d77b92abeb434d61857",
|
||||
"lightningcss-win32-x64-msvc@npm:1.29.3": "84b8711c3371d96d096c826cbfca21d253bc4de6f40afec951f64a457154feeed8c57fcca9835977c907b208015b0635b035c5a0fbb78852947e4f8f6bfc5806"
|
||||
"@esbuild/win32-x64@npm:0.25.9": "41f2ba9101f4a9a28e3287026a32a05e8fdffcb4a4e41cfaf9f94b41093c6882f46ef80f12854b67b7ad78e47d1df492f3e8a71d41813a61500ace4a574af851",
|
||||
"@rollup/rollup-android-arm-eabi@npm:4.46.2": "d7d021a87cd3504c8d71b00a94199e13c4e07c14fe20ed7300cf1e6436a5f3fe8496c9e5f206e023b15f9b6f8991b2d95a48b47fa41d5c00b44f37fe5f4d5eb8",
|
||||
"@rollup/rollup-android-arm64@npm:4.46.2": "ca901edbf95bbdd2505c979f777e2a01e2e885a597b6daeed5362dac523ea2a1eb9c0c0d22b9b436f3613c22abdd442bd2764491948890930333a9e40ade35be",
|
||||
"@rollup/rollup-darwin-arm64@npm:4.46.2": "ed2b07c4803915d46ff642abd659e179fae524dcd3cb88c810a5b71290d16b498e0371dcb91fe98f6301b8c6600d579a099be1e9450278326281002df4a80019",
|
||||
"@rollup/rollup-darwin-x64@npm:4.46.2": "c53e31df756cb8d44e179c167db1ec5d321225561a1aff2b320091c226c2dfafd080a98a1466f2dc697ff0173b52c41d89c60cae97f73b41fbd128d4c87fde66",
|
||||
"@rollup/rollup-freebsd-arm64@npm:4.46.2": "9495d87e670bbea87e43d06df53ae83fcd46e2c82a80927556f3516ac76613b8b7739bbd4b43c3f264bbab57a50a3b6cd2dfa6c1b2741bd3acdeba8af7c47018",
|
||||
"@rollup/rollup-freebsd-x64@npm:4.46.2": "890a965b45f4c4b9beb4696912ee30472180a040dafb24ce32f8811aed4d0d0ee90bf675d234abc6d8e66266d2966a72483fff7e6f1dbd116424b23e18fe38a9",
|
||||
"@rollup/rollup-linux-arm-gnueabihf@npm:4.46.2": "ce9720f61b4f7d9a791ba78e13cbbea67ef5f46c465e054c08f009cd06de8c1e4518df8e8578366a27cc9ae4280d37528dd0762906a19e820ca1a95158b47090",
|
||||
"@rollup/rollup-linux-arm-musleabihf@npm:4.46.2": "b884f568a681d8c13ffdfa77ad6183ed6f7f9fe5bc952b1c82dc21e36b4bc8eb7ee292168929a2575ff5ff14582060d7d73c583aef7edf04fd0bddd67140f4b0",
|
||||
"@rollup/rollup-linux-arm64-gnu@npm:4.46.2": "519477372d8358a4d3f1f1245bc2b5b57b65960f9a7d02bc5795ba68aed471fe87b20391a63c334bf0abb94085ad8c89d8d3b2e4d79ca0fed702537e9a0949eb",
|
||||
"@rollup/rollup-linux-arm64-musl@npm:4.46.2": "a5dec7799dd832b5374171a73a6b57cffef8be317482dd9ea4e6554db6fc8afb4bdb91ec725502f1b378aa9cb9a1333684056d55c9120262cb7744a33b961a76",
|
||||
"@rollup/rollup-linux-loongarch64-gnu@npm:4.46.2": "76ebbf40535f68c6922edf7d866dad00608cd475c8436d199653341ea09124cb4478f67c12d32b5363634f3f811926acb14a086eb146a1fe6b310fdbde01f2c8",
|
||||
"@rollup/rollup-linux-ppc64-gnu@npm:4.46.2": "31b62a51393e0f2608e1133701523e894ff5d04038e3d9af95abf595ab7fbe827167a651b200e9975d0e76904699cde3428aa1afbf46bf939f836f8ef90b1d88",
|
||||
"@rollup/rollup-linux-riscv64-gnu@npm:4.46.2": "4f22bc5fe58730026085d1a5372b51d9ed933b314cde2d3dec1d73ad76106406915c313d331f094176ed917863c0041667e63184d9730da7107b11266dad477f",
|
||||
"@rollup/rollup-linux-riscv64-musl@npm:4.46.2": "1bc37b77ac38d7e82e7d661b67fc043a1db01272a0566e5432c61e3c7a5e6c11b5ecb4a49547da2de33a8e0a7b0d685f3c7341572fa77c90e9b71e515f753e86",
|
||||
"@rollup/rollup-linux-s390x-gnu@npm:4.46.2": "1b1821a848d8bf86fa5e01ae57f60ebe5566cbcb0c605b5d05050821e94b8b45a72515ef302a3021196018b289aaffade5c41a5f89b3f8324d509a25d28dcfc4",
|
||||
"@rollup/rollup-linux-x64-gnu@npm:4.46.2": "66231802689c1ac1d6ecec6fd65d14c01c900537e588808e0a2c92ba34e322665bb6df3853500717cf600f40a93de4c490838290e21bb10eed4249f587a08109",
|
||||
"@rollup/rollup-linux-x64-musl@npm:4.46.2": "064ed54e9ddb05eec1b5da5ac8366f3290b7b65e63959a76a26d6940ce44d741c30488e39ce94c51a2679b2c56217c2e0aaf74e123a1c0928503712c115d6047",
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.46.2": "b59089cddf652e3da278744f6b8b2105360d1219833e54791380322913d40073ed4197ccd06d6091e83e1e12a5290d7a2e4aeae7947ff20c45943d07d1f0af0c",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.46.2": "d0aae1f80a64d9148426a7ff25b9df7f3abf7aca912c358a952f4b3bc541e030b5959f52e0b67abe01b9c8c8fb6567d1bbd30e31daabb7e2c4dc0488faf875f7",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.46.2": "740ca3c1d07f5af76fc9c2db917edbf6d0c1cf3eeee8330a0c571db4990ec44f0b272696a215ab118e8a32d7529f84bd47225e85dfab458a989b4b18d0bbea49",
|
||||
"lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a",
|
||||
"lightningcss-darwin-x64@npm:1.30.1": "6b88c182be0de82858983ec374093c2cb13cd58139456e25be215fc55a7a8cbfcd6f7487bee1507fc024988a1f324d7cb26b3f195893d5a69ccaf252dc9094eb",
|
||||
"lightningcss-freebsd-x64@npm:1.30.1": "731a96282db6afff3f57e8cbb73f51d06455231868b3b311a772ee11ead9c57538fc217d0956df4f177dbb805fa4fc761734440f6d2bb8965963b21f06bf63c1",
|
||||
"lightningcss-linux-arm-gnueabihf@npm:1.30.1": "fcf07f54c4d7d056f9b57d39e6df1c6f60c02ef4ebd51eda76056d35d89b1307af8737e44076d2b1f85348d2b1b9c61bf2220c5347389a6d40ad8bb12f34b5cf",
|
||||
"lightningcss-linux-arm64-gnu@npm:1.30.1": "bc82ce2e96ffab4b0ba1f9adacf63f461c3f6221bcbc955104c05e6e8c2c6ed8863421663e0e4148a682b143868d07190c38e9f990915a80ce9692f963132320",
|
||||
"lightningcss-linux-arm64-musl@npm:1.30.1": "2ae25a764b8ed9fcc1977dc1786011e68db23bf3343168fa2d4a9a4bcbb73c7aae258cdcb879d68a3a28e22343705ee435517d3f045e49b15fbb65816d74a91d",
|
||||
"lightningcss-linux-x64-gnu@npm:1.30.1": "190ac9ba1b9a4bf658a9e5b3c5702546ec779a7a5ccf5a4e06e5d46012ce6cad1842a9b1e717498bc759e103ba7390f42c9b8ba3e67157adec8e7162225633b4",
|
||||
"lightningcss-linux-x64-musl@npm:1.30.1": "fab6ed75d747024fcf46212b9edc7d1daccfbe4e7a06dcd0f9e841c6a023e61e716751747f9e8aecba18495adc9ef6bc20b24616d5c15c87f5dc1ff9ce1fd859",
|
||||
"lightningcss-win32-arm64-msvc@npm:1.30.1": "2cc285e89f66323ecae5ec41a6b1a57500d74a549fb392829c99708d5a5254d709c0ccd2d8fef4f6c1fc9a55c5bd51eca633fa1f2228563f884545668adc1b17",
|
||||
"lightningcss-win32-x64-msvc@npm:1.30.1": "60bd930e71fab0fbf0250406d4791bf27f0b9c8daf095c8d5fce9f3e120d24753e309eb6fed956043fc6a6cbb6d1da30fb0862acb54fa046b5f9a2e69908b6f9"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,20 +23,20 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "learn6502";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JumpLink";
|
||||
repo = "Learn6502";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2c8dUhxCNaDlvQlYwqebfAAlClrnJpGFs9EukdiVgy0=";
|
||||
hash = "sha256-Aoj4Z9uraBEH3BW0hrhuV3Hu7cnRxvjbpzm4pUziWS4=";
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-nbahJ+nwpHVvw8pCqhg1W+4lmgSH7o7BjjhujF7yyQs=";
|
||||
hash = "sha256-0r+SRVx8b238SVm+XM4+uw7Ge3rFtsNwD/+uNfBA7eM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,31 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lintspec";
|
||||
version = "0.7.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beeb";
|
||||
repo = "lintspec";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TMiUOrDsKXi+d/CbJauo2FT9WEWnztMYqrZZHpS8i7M=";
|
||||
hash = "sha256-5jNOMAohfzq/S+1LASQh0hvzqdMLQGdPYSb6rcGxmD8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-K8zx+dW6RXcbX2ZqNdfnv7WjbvjA8ZdJBitdDOi8hxE=";
|
||||
cargoHash = "sha256-m9n9r3SJtGx3/MURmZak2XRCLkmQZU06nPMQpROfvVs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd lintspec \
|
||||
--bash <($out/bin/lintspec completions -s bash) \
|
||||
--fish <($out/bin/lintspec completions -s fish) \
|
||||
--zsh <($out/bin/lintspec completions -s zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Blazingly fast linter for NatSpec comments in Solidity code";
|
||||
|
|
|
|||
|
|
@ -73,13 +73,13 @@ let
|
|||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "6210";
|
||||
version = "6442";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-yPlFw3fuXvf4+IhOv0nVI9hnuZq73Br6INn8wdOmCOs=";
|
||||
hash = "sha256-YNH7gvFtkHaZDnABg9pxJjnsASQfrRU4iqKqVa79MO8=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ma";
|
||||
version = "11";
|
||||
version = "13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20250511210225/http://call-with-current-continuation.org/ma/ma.tar.gz";
|
||||
hash = "sha256-1UVxXbN2jSNm13BjyoN3jbKtkO3DUEEHaDOC2Ibbxf4=";
|
||||
url = "https://web.archive.org/web/20250829110226/http://call-with-current-continuation.org/ma/ma.tar.gz";
|
||||
hash = "sha256-QNt4ctcu4/xJY2eud+kp5paPUnLsRhK7D2nJ0LBIvIo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./build --replace-fail gcc ${lib.getExe stdenv.cc}
|
||||
substituteInPlace ./build --replace-fail cc ${lib.getExe stdenv.cc}
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -43,6 +43,7 @@ stdenv.mkDerivation {
|
|||
description = "Minimalistic variant of the Acme editor";
|
||||
homepage = "http://call-with-current-continuation.org/ma/ma.html";
|
||||
mainProgram = "ma";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
# Per the README:
|
||||
# > All of MA's source code is hereby placed in the public domain
|
||||
license = lib.licenses.publicDomain;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "msolve";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algebraic-solving";
|
||||
repo = "msolve";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6TU/h6ewQreomjStHZRViYTrrDG3+MZXa8mLg1NvvZg=";
|
||||
hash = "sha256-Th5Kd8AWg+xF5nnoHTJkz1wDjywQztUzXvE0NmYxC/E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -37,13 +37,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openomf";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omf2097";
|
||||
repo = "openomf";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9vd/LirurXFtmcG0U5SG8Oa66kcJ1EiaBmzfMxgnaqQ=";
|
||||
hash = "sha256-8MkjngOVE+Bt+hyYO0ch0/QIbje4gV6nAYt4lf5nhX8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,19 +21,19 @@ let
|
|||
opentelemetry-proto = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-proto";
|
||||
rev = "v1.5.0";
|
||||
hash = "sha256-PkG0npG3nKQwq6SxWdIliIQ/wrYAOG9qVb26IeVkBfc=";
|
||||
rev = "v1.7.0";
|
||||
hash = "sha256-3SFf/7fStrglxcpwEya7hDp8Sr3wBG9OYyBoR78IUgs=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opentelemetry-cpp";
|
||||
version = "1.20.0";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-cpp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ibLuHIg01wGYPhLRz+LVYA34WaWzlUlNtg7DSONLe9g=";
|
||||
hash = "sha256-vprHCexKtXvbiHz7JfuTbVFyLy0VL1s4e/hNyaN3nY0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -85,11 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"dev"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp*-target.cmake \
|
||||
--replace-quiet "\''${_IMPORT_PREFIX}/include" "$dev/include"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -35,11 +35,13 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
libbpf
|
||||
libcap_ng
|
||||
numactl
|
||||
openssl
|
||||
unbound
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isStatic) [
|
||||
libbpf
|
||||
xdp-tools
|
||||
];
|
||||
|
||||
|
|
@ -58,7 +60,8 @@ stdenv.mkDerivation rec {
|
|||
"--with-dbdir=/var/lib/ovn"
|
||||
"--sbindir=$(out)/bin"
|
||||
"--enable-ssl"
|
||||
];
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isStatic "--with-openssl=${lib.getLib openssl.dev}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pico-sdk";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
|
|
@ -26,11 +26,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fetchSubmodules = withSubmodules;
|
||||
hash =
|
||||
if withSubmodules then
|
||||
"sha256-8ru1uGjs11S2yQ+aRAvzU53K8mreZ+CC3H+ijfctuqg="
|
||||
"sha256-8ubZW6yQnUTYxQqYI6hi7s3kFVQhe5EaxVvHmo93vgk="
|
||||
else
|
||||
"sha256-epO7yw6/21/ess3vMCkXvXEqAn6/4613zmH/hbaBbUw=";
|
||||
"sha256-hQdEZD84/cnLSzP5Xr9vbOGROQz4BjeVOnvbyhe6rfM=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "PIOASM_VERSION_STRING" finalAttrs.version)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# SDK contains libraries and build-system to develop projects for RP2040 chip
|
||||
|
|
|
|||
109
pkgs/by-name/pr/prek/package.nix
Normal file
109
pkgs/by-name/pr/prek/package.nix
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
git,
|
||||
uv,
|
||||
python312,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "prek";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "j178";
|
||||
repo = "prek";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MVdd67ssP64aEV6rjNA3fxypqKn0lJe/UN2waCEkLJM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XW8na9kXgn7gKaN7OYlEGTv8cgtzKXggj1uXlvQh4N4=";
|
||||
|
||||
preBuild = ''
|
||||
version312_str=$(${python312}/bin/python -c 'import sys; print(sys.version_info[:3])')
|
||||
|
||||
substituteInPlace ./tests/languages/python.rs \
|
||||
--replace '(3, 12, 11)' "$version312_str"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
python312
|
||||
uv
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export TEMP="$(mktemp -d)"
|
||||
export TMP=$TEMP
|
||||
export TMPDIR=$TEMP
|
||||
export PREK_INTERNAL__TEST_DIR=$TEMP
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
useNextest = true;
|
||||
|
||||
# some python tests use uv, which in turn needs python
|
||||
UV_PYTHON = "${python312}/bin/python";
|
||||
|
||||
checkFlags = builtins.map (t: "--skip ${t}") [
|
||||
# these tests require internet access
|
||||
"check_added_large_files_hook"
|
||||
"check_json_hook"
|
||||
"end_of_file_fixer_hook"
|
||||
"mixed_line_ending_hook"
|
||||
"install_hooks_only"
|
||||
"install_with_hooks"
|
||||
"golang"
|
||||
"node"
|
||||
"script"
|
||||
"check_useless_excludes_remote"
|
||||
# "meta_hooks"
|
||||
"reuse_env"
|
||||
"docker::docker"
|
||||
"docker_image::docker_image"
|
||||
"pygrep::basic_case_sensitive"
|
||||
"pygrep::case_insensitive"
|
||||
"pygrep::case_insensitive_multiline"
|
||||
"pygrep::complex_regex_patterns"
|
||||
"pygrep::invalid_args"
|
||||
"pygrep::invalid_regex"
|
||||
"pygrep::multiline_mode"
|
||||
"pygrep::negate_mode"
|
||||
"pygrep::negate_multiline_mode"
|
||||
"pygrep::pattern_not_found"
|
||||
"pygrep::python_regex_quirks"
|
||||
"python::additional_dependencies"
|
||||
"python::can_not_download"
|
||||
"python::hook_stderr"
|
||||
"python::language_version"
|
||||
# can't checkout pre-commit-hooks
|
||||
"cjk_hook_name"
|
||||
"fail_fast"
|
||||
"file_types"
|
||||
"files_and_exclude"
|
||||
"git_commit_a"
|
||||
"log_file"
|
||||
"merge_conflicts"
|
||||
"pass_env_vars"
|
||||
"restore_on_interrupt"
|
||||
"run_basic"
|
||||
"run_last_commit"
|
||||
"same_repo"
|
||||
"skips"
|
||||
"staged_files_only"
|
||||
"subdirectory"
|
||||
"check_yaml_hook"
|
||||
"check_yaml_multiple_document"
|
||||
# does not properly use TMP
|
||||
"hook_impl"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/j178/prek";
|
||||
description = "Better `pre-commit`, re-engineered in Rust ";
|
||||
changelog = "https://github.com/j178/prek/releases/tag/${finalAttrs.src.tag}";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = [ lib.maintainers.knl ];
|
||||
};
|
||||
})
|
||||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "questdb";
|
||||
version = "9.0.2";
|
||||
version = "9.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
|
||||
hash = "sha256-uLkBjG6aBUaV273hX2Q/ZHWAroyzuK1mSxHzopa/Zgo=";
|
||||
hash = "sha256-/EkqBK/mero219VUylNLVGD1ZzxBMAYpJ7NcU7BC+aw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
which,
|
||||
zip,
|
||||
|
|
@ -21,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rehex";
|
||||
version = "0.63.2";
|
||||
version = "0.63.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = "rehex";
|
||||
tag = version;
|
||||
hash = "sha256-de92lBnn0tp7Awm6PLJw12GfYohXY9m59XPmw7npvOg=";
|
||||
hash = "sha256-o/ff0V0pMomXRu1DrD/m+M6364NisUI+8+RwryIsSLc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
}:
|
||||
let
|
||||
pname = "remnote";
|
||||
version = "1.20.0";
|
||||
version = "1.20.8";
|
||||
src = fetchurl {
|
||||
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
|
||||
hash = "sha256-H17jPk1wDDuygXyrcVg5WLwVPYt3yG/57ec8n1GJmHg=";
|
||||
hash = "sha256-P2fUPYn/ZMBOGZKytrMPPKh4KLbGhQ1jR+dLG5JNfVo=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
|
|
|||
|
|
@ -78,7 +78,11 @@ python3Packages.buildPythonApplication rec {
|
|||
homepage = "https://github.com/canonical/rockcraft";
|
||||
changelog = "https://github.com/canonical/rockcraft/releases/tag/${version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [
|
||||
adhityaravi
|
||||
bepri
|
||||
dstathis
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,14 +29,14 @@ in
|
|||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "sbomnix";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tiiuae";
|
||||
repo = "sbomnix";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Vtrxpb6nTTR5a9sFi1NrhEflhPOwv1gt6i7DnggJwMs=";
|
||||
hash = "sha256-eN0dn2TNVEPSfIiJM0NA+HT1l4DnFq1mrSOOUF0h9xY=";
|
||||
|
||||
# Remove documentation as it contains references to nix store
|
||||
postFetch = ''
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "scalingo";
|
||||
version = "1.38.0";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-+f4bDn5JAjSGjtdwdZjZoKg7lvvIRUug93vdZbb0tJE=";
|
||||
hash = "sha256-5La3k6DXCYpnTgtnHolJ5pL7EPjkO+bXgT48gcRsbsc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "slint-viewer";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-KasOZia9bIgMi+haXYMbu+fRrM5ZLtaC4rwHZEQOtcY=";
|
||||
hash = "sha256-I3iwnxft0z6kXdlHIaZUqufqJP3XrF2h+l5Y4EgLPr0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0NuwxRR2BrA9j0uKYfDVFyDZEtx1byRVnLB3TZbAAP0=";
|
||||
cargoHash = "sha256-lxxiNa1xqZDtSx19h1MxGOhK/N14fv5k+miaaNpskFc=";
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "snac2";
|
||||
version = "2.81";
|
||||
version = "2.82";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "grunfink";
|
||||
repo = "snac2";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ozK+T8V4KNqNhkLYw4yJd0u56I3wsxl9ctWFmfJplos=";
|
||||
hash = "sha256-iYBxx1QqjK1fsrADIiyAzftpNoH33vKRbjkeppHL39k=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -203,7 +203,11 @@ python312Packages.buildPythonApplication rec {
|
|||
homepage = "https://github.com/canonical/snapcraft";
|
||||
changelog = "https://github.com/canonical/snapcraft/releases/tag/${version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [
|
||||
adhityaravi
|
||||
bepri
|
||||
dstathis
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
38
pkgs/by-name/sp/spit/package.nix
Normal file
38
pkgs/by-name/sp/spit/package.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
installShellFiles,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spit";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leahneukirchen";
|
||||
repo = "spit";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bvcx+bQyi5tWDwuqdOv2h6q1ZSEHO9bHV2lfvRhL7iw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 spit -t "$out/bin"
|
||||
installManPage spit.1
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Atomically create a file with content";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.cc0;
|
||||
homepage = "https://git.vuxu.org/spit/";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
mainProgram = "spit";
|
||||
};
|
||||
}
|
||||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sslh";
|
||||
version = "2.2.4";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yrutschle";
|
||||
repo = "sslh";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jG2+CT+Zcfkp+RLKcVfCTozgNuldfxKw7YaJLGKIZzE=";
|
||||
hash = "sha256-qGOOqEe9wlR3pXmYEwMQTxuMcNLLX2i/39AIAb6I4jU=";
|
||||
};
|
||||
|
||||
postPatch = "patchShebangs *.sh";
|
||||
|
|
|
|||
|
|
@ -35,8 +35,7 @@
|
|||
gperf,
|
||||
withGrpc ? true,
|
||||
grpc,
|
||||
# see https://github.com/syslog-ng/syslog-ng/pull/5263
|
||||
protobuf_29,
|
||||
protobuf,
|
||||
}:
|
||||
let
|
||||
python-deps =
|
||||
|
|
@ -111,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
rdkafka
|
||||
]
|
||||
++ (lib.optionals withGrpc [
|
||||
protobuf_29
|
||||
protobuf
|
||||
grpc
|
||||
]);
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation {
|
|||
dontInstall = true;
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-twc8mtBPizQrA9kRtQpSXG8Q404sbGVs5ay4MHitPgg=";
|
||||
outputHash = "sha256-UdNvUSz86E1W1gVPQrxt5g3Z3JIX/tq8rI5E8+h20PI=";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ let
|
|||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes.
|
||||
*/
|
||||
version = "0.35.0";
|
||||
version = "0.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = "tilt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IXmycwZFeDbCNFtLh126FvVSuugFoElj1TfU5Bdl5rc=";
|
||||
hash = "sha256-rM5INMOECbnuWd4ealBcIuMwZij7MthrXfohOBavl8Y=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,21 @@
|
|||
qt5,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
let
|
||||
version = "7.0.1";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "tortoisehg";
|
||||
version = "6.9";
|
||||
format = "setuptools";
|
||||
inherit version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
|
||||
hash = "sha256-j+HuAq/elnXIOoX4eoqMeOyGq3qjbdoJw6pcZsSa+AI=";
|
||||
hash = "sha256-rCDLZ2ppD3Y71c31UNir/1pW1QBJViMP9JdoJiWf0nk=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
|
@ -39,6 +44,7 @@ python3Packages.buildPythonApplication rec {
|
|||
# Convenient alias
|
||||
postInstall = ''
|
||||
ln -s $out/bin/thg $out/bin/tortoisehg
|
||||
install -D --mode=0644 contrib/thg.desktop --target-directory $out/share/applications/
|
||||
'';
|
||||
|
||||
# In python3Packages.buildPythonApplication doCheck is always true, and we
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tracexec";
|
||||
version = "0.13.0-unstable-2025-09-07";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kxxt";
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff a/config.h b/config.h
|
||||
--- a/config.h
|
||||
+++ b/config.h
|
||||
@@ -124,6 +124,8 @@
|
||||
#define CONFIG_CPU "__ppc64__"
|
||||
#elif defined(__ARM__)
|
||||
#define CONFIG_CPU "__ARM__"
|
||||
+#elif defined(__aarch64__)
|
||||
+#define CONFIG_CPU "__aarch64__"
|
||||
#else
|
||||
/* let it go */
|
||||
#endif
|
||||
|
|
@ -2,32 +2,29 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoconf,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tradcpp";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/${pname}-${version}.tar.gz";
|
||||
sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc";
|
||||
url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-4XufQs90s2DVaRvFn7U/N+QVgcRbdfzWS7ll5eL+TF4=";
|
||||
};
|
||||
|
||||
# tradcpp only comes with BSD-make Makefile; the patch adds configure support
|
||||
patches = [ ./tradcpp-configure.patch ];
|
||||
|
||||
strictDeps = true;
|
||||
# tradcpp only comes with BSD-make Makefile; the patch adds configure support
|
||||
nativeBuildInputs = [ autoconf ];
|
||||
preConfigure = "autoconf";
|
||||
patches = [
|
||||
./tradcpp-configure.patch
|
||||
./aarch64.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = {
|
||||
description = "Traditional (K&R-style) C macro preprocessor";
|
||||
mainProgram = "tradcpp";
|
||||
platforms = platforms.all;
|
||||
license = licenses.bsd2;
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.bsd2;
|
||||
};
|
||||
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
shaderc,
|
||||
protobuf,
|
||||
libzip,
|
||||
|
||||
testers,
|
||||
warzone2100,
|
||||
|
|
@ -47,11 +49,11 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname;
|
||||
version = "4.5.5";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz";
|
||||
hash = "sha256-B/YbrnIWh+3rYtpId+hQMKA6BTpZPWRRlPxld44EgP8=";
|
||||
hash = "sha256-kL8dfXN6ku6778Yu3M969ZMGSU5sQm6mp1k+MQKSk48=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -69,6 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
freetype
|
||||
harfbuzz
|
||||
sqlite
|
||||
protobuf
|
||||
libzip
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
vulkan-headers
|
||||
|
|
|
|||
|
|
@ -3,16 +3,18 @@
|
|||
buildGoModule,
|
||||
fetchFromGitLab,
|
||||
}:
|
||||
buildGoModule {
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "webtunnel";
|
||||
version = "0-unstable-2024-07-06"; # package is not versioned upstream
|
||||
version = "0.0.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
group = "tpo";
|
||||
owner = "anti-censorship/pluggable-transports";
|
||||
repo = "webtunnel";
|
||||
rev = "e64b1b3562f3ab50d06141ecd513a21ec74fe8c6";
|
||||
hash = "sha256-25ZtoCe1bcN6VrSzMfwzT8xSO3xw2qzE4Me3Gi4GbVs=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HB95GCIJeO5fKUW23VHrtNZdc9x9fk2vnmI9JogDWSQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3AAPySLAoMimXUOiy8Ctl+ghG5q+3dWRNGXHpl9nfG0=";
|
||||
|
|
@ -22,7 +24,5 @@ buildGoModule {
|
|||
homepage = "https://community.torproject.org/relay/setup/webtunnel/";
|
||||
maintainers = [ lib.maintainers.gbtb ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@
|
|||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
nix-update-script,
|
||||
|
||||
# Deps
|
||||
installShellFiles,
|
||||
pkg-config,
|
||||
scdoc,
|
||||
|
|
@ -10,19 +13,22 @@
|
|||
glib,
|
||||
gtk4,
|
||||
gtk4-layer-shell,
|
||||
libadwaita,
|
||||
librsvg,
|
||||
libxml2,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wleave";
|
||||
version = "0.5.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AMNatty";
|
||||
repo = "wleave";
|
||||
rev = version;
|
||||
hash = "sha256-xl0JOepQDvYdeTv0LFYzp8QdufKXkayJcHklLBjupeA=";
|
||||
hash = "sha256-+0EKnaxRaHRxRvhASuvfpUijEZJFimR4zSzOyC3FOkQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-csnArsVk/Ifhi3aO3bSG0mkSA81KACxR/xC1L8JJfmc=";
|
||||
cargoHash = "sha256-MRVWiQNzETFbWeKwYeoXSUY9gncRCsYdPEZhpOKcTvA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
@ -36,18 +42,21 @@ rustPlatform.buildRustPackage rec {
|
|||
glib
|
||||
gtk4
|
||||
gtk4-layer-shell
|
||||
libadwaita
|
||||
librsvg
|
||||
libxml2
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace style.css \
|
||||
--replace-fail "/usr/share/wleave" "$out/share/${pname}"
|
||||
|
||||
substituteInPlace src/main.rs \
|
||||
substituteInPlace src/config.rs \
|
||||
--replace-fail "/etc/wleave" "$out/etc/${pname}"
|
||||
|
||||
substituteInPlace layout.json \
|
||||
--replace-fail "/usr/share/wleave" "$out/share/${pname}"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 -t "$out/etc/wleave" {"style.css","layout"}
|
||||
install -Dm644 -t "$out/etc/wleave" {"style.css","layout.json"}
|
||||
install -Dm644 -t "$out/share/wleave/icons" icons/*
|
||||
|
||||
for f in man/*.scd; do
|
||||
|
|
@ -62,6 +71,8 @@ rustPlatform.buildRustPackage rec {
|
|||
--zsh <(cat completions/_wleave)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wayland-native logout script written in GTK4";
|
||||
homepage = "https://github.com/AMNatty/wleave";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
acl,
|
||||
nix-update-script,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
|
@ -22,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
checkInputs = [ acl ];
|
||||
checkInputs = lib.optionals stdenv.isLinux [ acl ];
|
||||
|
||||
# disable tests depending on special filesystem features
|
||||
checkNoDefaultFeatures = true;
|
||||
|
|
@ -35,6 +36,29 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
"test_no_perms"
|
||||
];
|
||||
|
||||
# had concurrency issues on 64 cores, also tests are quite fast compared to build
|
||||
dontUseCargoParallelTests = true;
|
||||
checkFlags = lib.optionals stdenv.isDarwin [
|
||||
# ---- test_socket_file::test_with_parallel_file_driver stdout ----
|
||||
# STDOUT: 12:20:56 [WARN] Socket copy not supported by this OS: /private/tmp/nix-build-xcp-0.24.1.drv-0/source/targ>
|
||||
#
|
||||
# STDERR:
|
||||
#
|
||||
# thread 'test_socket_file::test_with_parallel_file_driver' panicked at tests/common.rs:1149:5:
|
||||
# assertion failed: to.exists()
|
||||
# note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
|
||||
"--skip=test_socket_file::test_with_parallel_file_driver"
|
||||
|
||||
# ---- test_sockets_dir::test_with_parallel_file_driver stdout ----
|
||||
# STDOUT: 12:20:56 [WARN] Socket copy not supported by this OS: /private/tmp/nix-build-xcp-0.24.1.drv-0/source/targ>
|
||||
#
|
||||
# STDERR:
|
||||
#
|
||||
# thread 'test_sockets_dir::test_with_parallel_file_driver' panicked at tests/common.rs:1178:5:
|
||||
# assertion failed: to.exists()
|
||||
"--skip=test_sockets_dir::test_with_parallel_file_driver"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd xcp \
|
||||
--bash completions/xcp.bash \
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "elementary-dock";
|
||||
version = "8.1.2";
|
||||
version = "8.2.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "elementary";
|
||||
repo = "dock";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-hZ1xfEBN+pGj0TxNy5dSQrYuba2I0dmXl0p65rU73H4=";
|
||||
hash = "sha256-aKRWb/xtusb9Q2xq6GdM7WzNSweBqWbYUejQq4Or86s=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -35,10 +35,10 @@
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "unstable-2025-09-06";
|
||||
version = "unstable-2025-09-09";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/fe1b21c9fb01f3f8a9028744499f20b7799cad38.tar.gz";
|
||||
sha256 = "0g9pa8914mdnbbhy3far689xckfblavwv0ylmzi0h4p7v8alrjx7";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/987474e0b0ed1c6b0e3fd0d07313f6996ec98b7e.tar.gz";
|
||||
sha256 = "0nixn8incqypsfyfclj40p8bdx2yn4783kzwpqfp19ql2sbc57dc";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@ in
|
|||
|
||||
self: super: {
|
||||
|
||||
llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC 9.0.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC core libraries
|
||||
array = null;
|
||||
base = null;
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ in
|
|||
with haskellLib;
|
||||
|
||||
{
|
||||
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC core libraries
|
||||
array = null;
|
||||
base = null;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ let
|
|||
in
|
||||
|
||||
self: super: {
|
||||
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC core libraries
|
||||
array = null;
|
||||
base = null;
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@ in
|
|||
|
||||
self: super: {
|
||||
|
||||
llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC 9.2.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ in
|
|||
|
||||
with haskellLib;
|
||||
self: super: {
|
||||
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC core libraries
|
||||
array = null;
|
||||
base = null;
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ in
|
|||
|
||||
{
|
||||
|
||||
llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
|
||||
# Disable GHC core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
|
|
|
|||
|
|
@ -523,8 +523,22 @@ builtins.intersectAttrs super {
|
|||
)
|
||||
);
|
||||
|
||||
# Needs help finding LLVM.
|
||||
spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe;
|
||||
# Forces the LLVM backend; upstream signalled intent to remove this
|
||||
# in 2017: <https://github.com/SeanRBurton/spaceprobe/issues/1>.
|
||||
spaceprobe = overrideCabal (drv: {
|
||||
postPatch = ''
|
||||
substituteInPlace spaceprobe.cabal \
|
||||
--replace-fail '-fllvm ' ""
|
||||
'';
|
||||
}) super.spaceprobe;
|
||||
|
||||
# Forces the LLVM backend.
|
||||
GlomeVec = overrideCabal (drv: {
|
||||
postPatch = ''
|
||||
substituteInPlace GlomeVec.cabal \
|
||||
--replace-fail '-fllvm ' ""
|
||||
'';
|
||||
}) super.GlomeVec;
|
||||
|
||||
# Tries to run GUI in tests
|
||||
leksah = dontCheck (
|
||||
|
|
|
|||
|
|
@ -16266,7 +16266,6 @@ self: {
|
|||
mkDerivation,
|
||||
array,
|
||||
base,
|
||||
llvm,
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "GlomeVec";
|
||||
|
|
@ -16276,11 +16275,10 @@ self: {
|
|||
array
|
||||
base
|
||||
];
|
||||
libraryPkgconfigDepends = [ llvm ];
|
||||
description = "Simple 3D vector library";
|
||||
license = "GPL";
|
||||
}
|
||||
) { inherit (self.llvmPackages) llvm; };
|
||||
) { };
|
||||
|
||||
"GlomeView" = callPackage (
|
||||
{
|
||||
|
|
@ -27647,9 +27645,9 @@ self: {
|
|||
base,
|
||||
bytestring,
|
||||
c2hs,
|
||||
clang,
|
||||
filepath,
|
||||
hashable,
|
||||
libclang,
|
||||
mtl,
|
||||
ncurses,
|
||||
resourcet,
|
||||
|
|
@ -27676,7 +27674,7 @@ self: {
|
|||
transformers-base
|
||||
vector
|
||||
];
|
||||
librarySystemDepends = [ clang ];
|
||||
librarySystemDepends = [ libclang ];
|
||||
libraryPkgconfigDepends = [ ncurses ];
|
||||
libraryToolDepends = [ c2hs ];
|
||||
description = "Haskell bindings for libclang (a C++ parsing library)";
|
||||
|
|
@ -27686,7 +27684,7 @@ self: {
|
|||
}
|
||||
)
|
||||
{
|
||||
inherit (self.llvmPackages) clang;
|
||||
inherit (pkgs) libclang;
|
||||
inherit (pkgs) ncurses;
|
||||
};
|
||||
|
||||
|
|
@ -141306,11 +141304,11 @@ self: {
|
|||
base,
|
||||
bytestring,
|
||||
Cabal,
|
||||
clang,
|
||||
containers,
|
||||
contravariant,
|
||||
inline-c,
|
||||
lens,
|
||||
libclang,
|
||||
microlens,
|
||||
microlens-contra,
|
||||
process,
|
||||
|
|
@ -141344,7 +141342,7 @@ self: {
|
|||
template-haskell
|
||||
vector
|
||||
];
|
||||
librarySystemDepends = [ clang ];
|
||||
librarySystemDepends = [ libclang ];
|
||||
testHaskellDepends = [
|
||||
base
|
||||
bytestring
|
||||
|
|
@ -141355,7 +141353,7 @@ self: {
|
|||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}
|
||||
) { inherit (self.llvmPackages) clang; };
|
||||
) { inherit (pkgs) libclang; };
|
||||
|
||||
"clanki" = callPackage (
|
||||
{
|
||||
|
|
@ -267231,7 +267229,7 @@ self: {
|
|||
haskell-gi-overloading,
|
||||
text,
|
||||
transformers,
|
||||
vte_291,
|
||||
vte,
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "gi-vte";
|
||||
|
|
@ -267270,12 +267268,12 @@ self: {
|
|||
text
|
||||
transformers
|
||||
];
|
||||
libraryPkgconfigDepends = [ vte_291 ];
|
||||
libraryPkgconfigDepends = [ vte ];
|
||||
description = "Vte bindings";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
}
|
||||
) { vte_291 = pkgs.vte; };
|
||||
) { inherit (pkgs) vte; };
|
||||
|
||||
"gi-webkit" = callPackage (
|
||||
{
|
||||
|
|
@ -664371,7 +664369,7 @@ self: {
|
|||
text,
|
||||
transformers,
|
||||
unordered-containers,
|
||||
vte_291,
|
||||
vte,
|
||||
xml-conduit,
|
||||
xml-html-qq,
|
||||
yaml,
|
||||
|
|
@ -664421,7 +664419,7 @@ self: {
|
|||
libraryPkgconfigDepends = [
|
||||
gtk3
|
||||
pcre2
|
||||
vte_291
|
||||
vte
|
||||
];
|
||||
executableHaskellDepends = [ base ];
|
||||
testHaskellDepends = [
|
||||
|
|
@ -664441,7 +664439,7 @@ self: {
|
|||
{
|
||||
inherit (pkgs) gtk3;
|
||||
inherit (pkgs) pcre2;
|
||||
vte_291 = pkgs.vte;
|
||||
inherit (pkgs) vte;
|
||||
};
|
||||
|
||||
"termplot" = callPackage (
|
||||
|
|
|
|||
|
|
@ -734,6 +734,6 @@ package-set { inherit pkgs lib callPackage; } self
|
|||
*/
|
||||
forceLlvmCodegenBackend = overrideCabal (drv: {
|
||||
configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ];
|
||||
buildTools = drv.buildTools or [ ] ++ [ self.llvmPackages.llvm ];
|
||||
buildTools = drv.buildTools or [ ] ++ [ self.ghc.llvmPackages.llvm ];
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ selectPackages:
|
|||
# fi
|
||||
|
||||
let
|
||||
inherit (haskellPackages) llvmPackages ghc;
|
||||
inherit (haskellPackages) ghc;
|
||||
|
||||
hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null;
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ let
|
|||
# CLang is needed on Darwin for -fllvm to work:
|
||||
# https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
|
||||
llvm = lib.makeBinPath (
|
||||
[ llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang
|
||||
[ ghc.llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin ghc.llvmPackages.clang
|
||||
);
|
||||
in
|
||||
|
||||
|
|
@ -178,7 +178,7 @@ else
|
|||
+ postBuild;
|
||||
preferLocalBuild = true;
|
||||
passthru = {
|
||||
inherit (ghc) version meta;
|
||||
inherit (ghc) version meta targetPrefix;
|
||||
|
||||
hoogle = hoogleWithPackages';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "26.2.5.14";
|
||||
sha256 = "sha256-/m76FtCJvIjNuvM96XV3ngFMgKF8C5uCH89YQklJKpo=";
|
||||
version = "26.2.5.15";
|
||||
sha256 = "sha256-D2JfB7D9mhbmYvJfjSMbcdNrlYNWa/BfqAeqsbjTZlE=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "27.3.4.2";
|
||||
sha256 = "sha256-wbaRSTwTrNADbShNHoWorWyD+2ul6NZbRs6isP3g+OI=";
|
||||
version = "27.3.4.3";
|
||||
sha256 = "sha256-p4M1PPrbpNq6la4kgTTCOa2f5/oYxNwMaSi59mhlM4o=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "28.0.2";
|
||||
sha256 = "sha256-4+Jv7MUX4KAwasNyU7AiV9+Qd9NginYXTN0fDteTFEM=";
|
||||
version = "28.0.4";
|
||||
sha256 = "sha256-xJXrV0DfYPLunkIg8jtHZNQYEH278cSeh+uR/vGw18k=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "indilib";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ceDuWnIeHTpXyQRXDEQxCDM1pdfz5rEDMyJIcCu6OaM=";
|
||||
hash = "sha256-mbY3iDLRcQ+pis26u6pHzB43ureaKH7KYPkV0CwHU/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ let
|
|||
owner = "indilib";
|
||||
repo = "indi-3rdparty";
|
||||
rev = "v${indilib.version}";
|
||||
hash = "sha256-zd88QHYhqxAQlzozXZMKXCFWKYqvGsPHhNxmkdexOOE=";
|
||||
hash = "sha256-+WBQdu1iWleHf6xC4SK69y505wqZ36IUM4xnh1fnc6s=";
|
||||
};
|
||||
|
||||
buildIndi3rdParty =
|
||||
|
|
@ -552,6 +552,14 @@ in
|
|||
indi-astarbox = buildIndi3rdParty {
|
||||
pname = "indi-astarbox";
|
||||
buildInputs = [ indilib ];
|
||||
# TODO patch already upstream, remove with version > 2.1.5.1
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/indilib/indi-3rdparty/commit/c347000ec227a5ef98911aab34c7b08a91509cba.patch";
|
||||
hash = "sha256-M3b4ySoGJRpfNmBaagjDaeEPKqwaVgRUWaQY626SGBI=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
indi-astroasis = buildIndi3rdParty {
|
||||
|
|
@ -688,6 +696,7 @@ in
|
|||
indi-fli = buildIndi3rdParty {
|
||||
pname = "indi-fli";
|
||||
buildInputs = [
|
||||
libusb1
|
||||
cfitsio
|
||||
indilib
|
||||
zlib
|
||||
|
|
@ -705,6 +714,15 @@ in
|
|||
glib
|
||||
zlib
|
||||
];
|
||||
# TODO patch already upstream, remove with version > 2.1.5.1
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/indilib/indi-3rdparty/commit/c33c08b50093698e2aa73d73783d96f85df488a9.patch";
|
||||
hash = "sha256-EQ2G9gTexf9FESCAR28f2cwzvH4TOAA8bvyJCxFv/E8=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
indi-gphoto = buildIndi3rdParty {
|
||||
|
|
@ -972,14 +990,6 @@ in
|
|||
indi-shelyak = buildIndi3rdParty {
|
||||
pname = "indi-shelyak";
|
||||
buildInputs = [ indilib ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/indilib/indi-3rdparty/commit/db8106a9a03e0cfb700e02841d46f8b97b5513e0.patch";
|
||||
hash = "sha256-JJatmu/dxFEni6CdR6QUn7+EiPe18EwE7OmrCT8Nk2c=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
indi-starbook = buildIndi3rdParty {
|
||||
|
|
|
|||
|
|
@ -42,6 +42,10 @@ buildPythonPackage rec {
|
|||
description = "Library for retrieving information about catkin packages";
|
||||
homepage = "http://wiki.ros.org/catkin_pkg";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [
|
||||
adhityaravi
|
||||
bepri
|
||||
dstathis
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,11 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/canonical/craft-application";
|
||||
changelog = "https://github.com/canonical/craft-application/blob/${src.tag}/docs/reference/changelog.rst";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [
|
||||
adhityaravi
|
||||
bepri
|
||||
dstathis
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,11 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/canonical/craft-archives";
|
||||
changelog = "https://github.com/canonical/craft-archives/releases/tag/${version}";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [
|
||||
adhityaravi
|
||||
bepri
|
||||
dstathis
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,11 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/canonical/craft-cli";
|
||||
changelog = "https://github.com/canonical/craft-cli/releases/tag/${version}";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [
|
||||
adhityaravi
|
||||
bepri
|
||||
dstathis
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue