colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2024-05-07 00:13:05 +00:00 committed by GitHub
commit c322bd66b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
298 changed files with 6879 additions and 3468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.git-blame-ignore-revs
View File

@ -108,3 +108,6 @@ fb0e5be84331188a69b3edd31679ca6576edb75a
# postgresql: move packages.nix to ext/default.nix
719034f6f6749d624faa28dff259309fc0e3e730
# pkgs/os-specific/bsd: Reformat with nixfmt-rfc-style 2024-03-01
3fe3b055adfc020e6a923c466b6bcd978a13069a

1
.github/workflows/check-nix-format.yml vendored
View File

@ -32,6 +32,7 @@ jobs:
# Each environment variable beginning with NIX_FMT_PATHS_ is a list of
# paths to check with nixfmt.
env:
NIX_FMT_PATHS_BSD: pkgs/os-specific/bsd
NIX_FMT_PATHS_MPVSCRIPTS: pkgs/applications/video/mpv/scripts
# Format paths related to the Nixpkgs CUDA ecosystem.
NIX_FMT_PATHS_CUDA: |

30
maintainers/maintainer-list.nix
View File

@ -780,6 +780,12 @@
github = "akgrant43";
githubId = 2062166;
};
akhilmhdh = {
email = "akhilmhdh@infisical.com";
github = "akhilmhdh";
githubId = 31166322;
name = "Akhil Mohan";
};
akho = {
name = "Alexander Khodyrev";
email = "a@akho.name";
@ -5694,6 +5700,11 @@
githubId = 54799;
name = "Edward Tjörnhammar";
};
eeedean = {
github = "eeedean";
githubId = 8173116;
name = "Dean Eckert";
};
eelco = {
email = "edolstra+nixpkgs@gmail.com";
github = "edolstra";
@ -9421,12 +9432,6 @@
githubId = 6445082;
name = "Joseph Lukasik";
};
jgoux = {
email = "hi@jgoux.dev";
github = "jgoux";
githubId = 1443499;
name = "Julien Goux";
};
jhh = {
email = "jeff@j3ff.io";
github = "jhh";
@ -13399,6 +13404,12 @@
matrix = "@mjm:beeper.com";
name = "Matt Moriarity";
};
mjoerg = {
name = "Martin Joerg";
email = "martin.joerg@gmail.com";
github = "mjoerg";
githubId = 147256;
};
mjp = {
email = "mike@mythik.co.uk";
github = "MikePlayle";
@ -14106,6 +14117,7 @@
};
nazarewk = {
name = "Krzysztof Nazarewski";
email = "nixpkgs@kdn.im";
matrix = "@nazarewk:matrix.org";
github = "nazarewk";
githubId = 3494992;
@ -15394,6 +15406,12 @@
githubId = 72527881;
name = "PassiveLemon";
};
patka = {
email = "patka@patka.dev";
github = "patka-123";
githubId = 69802930;
name = "patka";
};
patricksjackson = {
email = "patrick@jackson.dev";
github = "patricksjackson";

8
maintainers/team-list.nix
View File

@ -460,6 +460,14 @@ with lib.maintainers; {
shortName = "Home Assistant";
};
infisical = {
members = [
akhilmhdh
];
scope = "Maintain Infisical";
shortName = "Infisical";
};
iog = {
members = [
cleverca22

24
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -282,6 +282,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
"mysecret"` becomes `services.aria2.rpcSecretFile = "/path/to/secret_file"`
where the file `secret_file` contains the string `mysecret`.
- The `system.forbiddenDependenciesRegex` option has been renamed to `system.forbiddenDependenciesRegexes` and now has the type of `listOf string` instead of `string` to accept multiple regexes.
- `openssh`, `openssh_hpn` and `openssh_gssapi` are now compiled without support for the DSA signature algorithm as it is being deprecated upstream. Users still relying on DSA keys should consider upgrading
to another signature algorithm. However, for the time being it is possible to restore DSA key support using `override` to set `dsaKeysSupport = true`.
@ -321,9 +323,11 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- Proxies are now defined with a new option `settings.proxies` which takes a list of proxies.
- Consult the [upstream documentation](https://github.com/fatedier/frp#example-usage) for more details on the changes.
- `mkosi` was updated to v20. Parts of the user interface have changed. Consult the
release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19) and
[v20](https://github.com/systemd/mkosi/releases/tag/v20) for a list of changes.
- `mkosi` was updated to v22. Parts of the user interface have changed. Consult the
release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19),
[v20](https://github.com/systemd/mkosi/releases/tag/v20),
[v21](https://github.com/systemd/mkosi/releases/tag/v21) and
[v22](https://github.com/systemd/mkosi/releases/tag/v22) for a list of changes.
- `gonic` has been updated to v0.16.4. Config now requires `playlists-path` to be set. See the rest of the [v0.16.0 release notes](https://github.com/sentriz/gonic/releases/tag/v0.16.0) for more details.
@ -370,7 +374,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud29` will be installed by default.
- If [`system.stateVersion`](#opt-system.stateVersion) is >=23.11, `pkgs.nextcloud27` will be installed by default.
- Please note that an upgrade from v27 (or older) to v29 directly is not possible. Please upgrade to `nextcloud28` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud28;`](options.html#opt-services.nextcloud.package).
- Known warnings after the upgrade are documented in [](#module-services-nextcloud-known-warnings).
- Known warnings after the upgrade are documented in [](#module-services-nextcloud-known-warnings) from now on.
- The "Photos" app only displays Media from inside the `Photos` directory. This can be changed manually in the "Photos" tab below "Photos settings".
- The vendored third party libraries have been mostly removed from `cudaPackages.nsight_systems`, which we now only ship for `cudaPackages_11_8` and later due to outdated dependencies. Users comfortable with the vendored dependencies may use `overrideAttrs` to amend the `postPatch` phase and the `meta.broken` correspondingly. Alternatively, one could package the deprecated `boost170` locally, as required for `cudaPackages_11_4.nsight_systems`.
@ -533,6 +538,17 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `services.postgresql.extraPlugins` changed its type from just a list of packages to also a function that returns such a list.
For example a config line like ``services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ postgis ];`` is recommended to be changed to ``services.postgresql.extraPlugins = ps: with ps; [ postgis ];``;
- `services.openssh` now has an option `authorizedKeysInHomedir`, controlling whether `~/.ssh/authorizedKeys` is
added to `authorizedKeysFiles`.
::: {.note}
This option currently defaults to `true` for NixOS 24.05, preserving the previous behaviour.
This is expected to change in NixOS 24.11.
:::
::: {.warning}
Users should check that their SSH keys are in `users.users.*.openssh`, or that they have another way to access
and administer the system, before setting this option to `false`.
:::
- [`matrix-synapse`](https://element-hq.github.io/synapse/) homeserver module now supports configuring UNIX domain socket [`listeners`](#opt-services.matrix-synapse.settings.listeners) through the `path` option.
The default replication worker on the main instance has been migrated away from TCP sockets to UNIX domain sockets.

2
nixos/modules/config/terminfo.nix
View File

@ -31,7 +31,7 @@ with lib;
# attrNames (filterAttrs
# (_: drv: (builtins.tryEval (isDerivation drv && drv ? terminfo)).value)
# pkgs)
environment.systemPackages = mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs; [
environment.systemPackages = mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs.pkgsBuildBuild; [
alacritty
contour
foot

2
nixos/modules/profiles/perlless.nix
View File

@ -26,6 +26,6 @@
# Check that the system does not contain a Nix store path that contains the
# string "perl".
system.forbiddenDependenciesRegex = "perl";
system.forbiddenDependenciesRegexes = ["perl"];
}

2
nixos/modules/services/misc/zoneminder.nix
View File

@ -350,7 +350,7 @@ in {
RestartSec = "10s";
CacheDirectory = dirs cacheDirs;
RuntimeDirectory = dirName;
ReadWriteDirectories = lib.mkIf useCustomDir [ cfg.storageDir ];
ReadWritePaths = lib.mkIf useCustomDir [ cfg.storageDir ];
StateDirectory = dirs (lib.optionals (!useCustomDir) libDirs);
LogsDirectory = dirName;
PrivateTmp = true;

13
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -296,6 +296,17 @@ in
'';
};
authorizedKeysInHomedir = mkOption {
type = types.bool;
default = true;
description = ''
Enables the use of the `~/.ssh/authorized_keys` file.
Otherwise, the only files trusted by default are those in `/etc/ssh/authorized_keys.d`,
*i.e.* SSH keys from [](#opt-users.users._name_.openssh.authorizedKeys.keys).
'';
};
authorizedKeysCommand = mkOption {
type = types.str;
default = "none";
@ -635,7 +646,7 @@ in
# https://github.com/NixOS/nixpkgs/pull/10155
# https://github.com/NixOS/nixpkgs/pull/41745
services.openssh.authorizedKeysFiles =
[ "%h/.ssh/authorized_keys" "/etc/ssh/authorized_keys.d/%u" ];
lib.optional cfg.authorizedKeysInHomedir "%h/.ssh/authorized_keys" ++ [ "/etc/ssh/authorized_keys.d/%u" ];
services.openssh.settings.AuthorizedPrincipalsFile = mkIf (authPrincipalsFiles != {}) "/etc/ssh/authorized_principals.d/%u";

2
nixos/modules/services/security/oauth2-proxy.nix
View File

@ -17,7 +17,7 @@ let
inherit (cfg.github) org team;
}; };
google = cfg: { google = with cfg.google; optionalAttrs (groups != []) {
google = cfg: { google = with cfg.google; lib.optionalAttrs (groups != []) {
admin-email = adminEmail;
service-account = serviceAccountJSON;
group = groups;

2
nixos/modules/services/security/step-ca.nix
View File

@ -107,7 +107,7 @@ in
UMask = "0077";
Environment = "HOME=%S/step-ca";
WorkingDirectory = ""; # override upstream
ReadWriteDirectories = ""; # override upstream
ReadWritePaths = ""; # override upstream
# LocalCredential handles file permission problems arising from the use of DynamicUser.
LoadCredential = "intermediate_password:${cfg.intermediatePasswordFile}";

5
nixos/modules/services/web-apps/nextcloud.md
View File

@ -205,11 +205,6 @@ it complains loudly now. So nothing actionable here by default. Alternatively yo
* set [](#opt-services.nextcloud.settings.log_type) to "file" to be able to view logs
from the admin panel.
### Your web server is not properly set up to resolve `.well-known` URLs, failed on: `/.well-known/caldav` {#module-services-nextcloud-warning-wellknown-caldav}
This warning appearing seems to be an upstream issue and is being sorted out
in [nextcloud/server#45033](https://github.com/nextcloud/server/issues/45033).
## Maintainer information {#module-services-nextcloud-maintainer-info}
As stated in the previous paragraph, we must provide a clean upgrade-path for Nextcloud

4
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -1105,10 +1105,10 @@ in {
extraConfig = ''
absolute_redirect off;
location = /.well-known/carddav {
return 301 /remote.php/dav;
return 301 /remote.php/dav/;
}
location = /.well-known/caldav {
return 301 /remote.php/dav;
return 301 /remote.php/dav/;
}
location ~ ^/\.well-known/(?!acme-challenge|pki-validation) {
return 301 /index.php$request_uri;

3
nixos/modules/services/web-servers/caddy/default.nix
View File

@ -360,6 +360,7 @@ in
serviceConfig = let
runOptions = ''--config ${configPath} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"}'';
in {
# Override the `ExecStart` line from upstream's systemd unit file by our own:
# https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart=
# If the empty string is assigned to this option, the list of commands to start is reset, prior assignments of this option will have no effect.
ExecStart = [ "" ''${cfg.package}/bin/caddy run ${runOptions} ${optionalString cfg.resume "--resume"}'' ];
@ -367,7 +368,7 @@ in
ExecReload = [ "" ''${cfg.package}/bin/caddy reload ${runOptions} --force'' ];
User = cfg.user;
Group = cfg.group;
ReadWriteDirectories = cfg.dataDir;
ReadWritePaths = [ cfg.dataDir ];
StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ];
LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ];
Restart = "on-failure";

2
nixos/modules/services/web-servers/traefik.nix
View File

@ -170,7 +170,7 @@ in {
PrivateDevices = true;
ProtectHome = true;
ProtectSystem = "full";
ReadWriteDirectories = cfg.dataDir;
ReadWritePaths = [ cfg.dataDir ];
RuntimeDirectory = "traefik";
};
};

4
nixos/modules/system/activation/test.nix
View File

@ -5,7 +5,7 @@
}:
let
node-forbiddenDependencies-fail = nixos ({ ... }: {
system.forbiddenDependenciesRegex = "-dev$";
system.forbiddenDependenciesRegexes = ["-dev$"];
environment.etc."dev-dependency" = {
text = "${expect.dev}";
};
@ -14,7 +14,7 @@ let
boot.loader.grub.enable = false;
});
node-forbiddenDependencies-succeed = nixos ({ ... }: {
system.forbiddenDependenciesRegex = "-dev$";
system.forbiddenDependenciesRegexes = ["-dev$"];
system.extraDependencies = [ expect.dev ];
documentation.enable = false;
fileSystems."/".device = "ignore-root-device";

23
nixos/modules/system/activation/top-level.nix
View File

@ -86,6 +86,7 @@ in
../build.nix
(mkRemovedOptionModule [ "nesting" "clone" ] "Use `specialisation.«name» = { inheritParentConfig = true; configuration = { ... }; }` instead.")
(mkRemovedOptionModule [ "nesting" "children" ] "Use `specialisation.«name».configuration = { ... }` instead.")
(mkRenamedOptionModule [ "system" "forbiddenDependenciesRegex" ] [ "system" "forbiddenDependenciesRegexes" ])
];
options = {
@ -160,12 +161,12 @@ in
'';
};
system.forbiddenDependenciesRegex = mkOption {
default = "";
example = "-dev$";
type = types.str;
system.forbiddenDependenciesRegexes = mkOption {
default = [];
example = ["-dev$"];
type = types.listOf types.str;
description = ''
A POSIX Extended Regular Expression that matches store paths that
POSIX Extended Regular Expressions that match store paths that
should not appear in the system closure, with the exception of {option}`system.extraDependencies`, which is not checked.
'';
};
@ -289,15 +290,14 @@ in
"$out/configuration.nix"
'' +
optionalString
(config.system.forbiddenDependenciesRegex != "")
''
if [[ $forbiddenDependenciesRegex != "" && -n $closureInfo ]]; then
if forbiddenPaths="$(grep -E -- "$forbiddenDependenciesRegex" $closureInfo/store-paths)"; then
(config.system.forbiddenDependenciesRegexes != []) (lib.concatStringsSep "\n" (map (regex: ''
if [[ ${regex} != "" && -n $closureInfo ]]; then
if forbiddenPaths="$(grep -E -- "${regex}" $closureInfo/store-paths)"; then
echo -e "System closure $out contains the following disallowed paths:\n$forbiddenPaths"
exit 1
fi
fi
'';
'') config.system.forbiddenDependenciesRegexes));
system.systemBuilderArgs = {
@ -319,8 +319,7 @@ in
# option, as opposed to `system.extraDependencies`.
passedChecks = concatStringsSep " " config.system.checks;
}
// lib.optionalAttrs (config.system.forbiddenDependenciesRegex != "") {
inherit (config.system) forbiddenDependenciesRegex;
// lib.optionalAttrs (config.system.forbiddenDependenciesRegexes != []) {
closureInfo = pkgs.closureInfo { rootPaths = [
# override to avoid infinite recursion (and to allow using extraDependencies to add forbidden dependencies)
(config.system.build.toplevel.overrideAttrs (_: { extraDependencies = []; closureInfo = null; }))

2
nixos/tests/patroni.nix
View File

@ -155,7 +155,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
print(node.succeed("patronictl list cluster1"))
node.wait_until_succeeds(f"[ $(patronictl list -f json cluster1 | jq 'length') == {expected_replicas + 1} ]")
node.wait_until_succeeds("[ $(patronictl list -f json cluster1 | jq 'map(select(.Role | test(\"^Leader$\"))) | map(select(.State | test(\"^running$\"))) | length') == 1 ]")
node.wait_until_succeeds(f"[ $(patronictl list -f json cluster1 | jq 'map(select(.Role | test(\"^Replica$\"))) | map(select(.State | test(\"^running$\"))) | length') == {expected_replicas} ]")
node.wait_until_succeeds(f"[ $(patronictl list -f json cluster1 | jq 'map(select(.Role | test(\"^Replica$\"))) | map(select(.State | test(\"^streaming$\"))) | length') == {expected_replicas} ]")
print(node.succeed("patronictl list cluster1"))
client.wait_until_succeeds("psql -h 127.0.0.1 -U postgres --command='select 1;'")

58
pkgs/applications/audio/lollypop/default.nix
View File

@ -21,11 +21,12 @@
, wrapGAppsHook3
, lastFMSupport ? true
, youtubeSupport ? true
, kid3Support ? true
}:
python3.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
version = "1.4.37";
version = "1.4.39";
format = "other";
@ -35,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
repo = pname;
rev = version;
fetchSubmodules = true;
sha256 = "sha256-3GPmGNbbSxvLq0t3F9q1x64BwNQCEvFQWLb0bSO9KUY=";
sha256 = "sha256-VPHQwy2+XR9R7toIN5sNFB91ddROlL7Scr8AKLgUzuo=";
};
nativeBuildInputs = [
@ -48,32 +49,29 @@ python3.pkgs.buildPythonApplication rec {
wrapGAppsHook3
];
buildInputs = with gst_all_1; [
gdk-pixbuf
glib
glib-networking
gst-libav
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gstreamer
gtk3
libhandy
libsoup_3
pango
totem-pl-parser
] ++ lib.optional lastFMSupport libsecret;
buildInputs = with gst_all_1;
[
gdk-pixbuf
glib
glib-networking
gst-libav
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gstreamer
gtk3
libhandy
libsoup_3
pango
totem-pl-parser
] ++ lib.optional lastFMSupport libsecret;
propagatedBuildInputs = with python3.pkgs; [
beautifulsoup4
pillow
pycairo
pygobject3
]
++ lib.optional lastFMSupport pylast
++ lib.optional youtubeSupport youtube-dl
;
propagatedBuildInputs = with python3.pkgs;
[ beautifulsoup4 pillow pycairo pygobject3 ]
++ lib.optional lastFMSupport pylast
++ lib.optional youtubeSupport youtube-dl
++ lib.optional kid3Support pkgs.kid3;
postPatch = ''
chmod +x meson_post_install.py
@ -95,9 +93,7 @@ python3.pkgs.buildPythonApplication rec {
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru = {
updateScript = nix-update-script { };
};
passthru = { updateScript = nix-update-script { }; };
meta = with lib; {
changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}";

11
pkgs/applications/audio/mixxx/default.nix
View File

@ -52,6 +52,7 @@
, upower
, vamp-plugin-sdk
, wavpack
, wrapGAppsHook3
}:
mkDerivation rec {
@ -65,7 +66,9 @@ mkDerivation rec {
hash = "sha256-JSWUzerm7D6AKq6g/9eRrt3EE2movRdM+VLUg07sLHo=";
};
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ];
dontWrapGApps = true;
buildInputs = [
chromaprint
@ -118,9 +121,9 @@ mkDerivation rec {
wavpack
];
qtWrapperArgs = [
"--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
];
preFixup=''
qtWrapperArgs+=(--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive ''${gappsWrapperArgs[@]})
'';
# mixxx installs udev rules to DATADIR instead of SYSCONFDIR
# let's disable this and install udev rules manually via postInstall

4
pkgs/applications/audio/tidal-hifi/default.nix
View File

@ -36,11 +36,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tidal-hifi";
version = "5.10.0";
version = "5.11.0";
src = fetchurl {
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
sha256 = "sha256-+sRXpRAtbLpQlyJUhbc1Cuzh6aV8HRvYH/ja9sfvKoA=";
sha256 = "sha256-vuvL6yYF43++De5RLsMgoSpmIjfLzvq5QpRfdJTESuw=";
};
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];

2136
pkgs/applications/blockchains/polkadot/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
pkgs/applications/blockchains/polkadot/default.nix
View File

@ -1,5 +1,7 @@
{ fetchFromGitHub
, lib
, openssl
, pkg-config
, protobuf
, rocksdb_8_3
, rust-jemalloc-sys-unprefixed
@ -15,13 +17,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot-sdk";
rev = "polkadot-v${version}";
hash = "sha256-xRuV/1+OZeoth/lb5OXwVzHl2IWK1G0GgIN0E8EZlYg=";
hash = "sha256-q8u2L7CUDUPZrU/i8K5jsqG4Ib0Wh5e/LIUc6Z4SFfY=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@ -48,6 +50,7 @@ rustPlatform.buildRustPackage rec {
"ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc=";
"common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o=";
"fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo=";
"litep2p-0.3.0" = "sha256-IiJmmSb1+8+HbT/LP/zvhioVBeeGAncf4zo7Czuq6qY=";
"sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8=";
"sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI=";
};
@ -63,13 +66,15 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
nativeBuildInputs = [
pkg-config
rustPlatform.bindgenHook
rustc
rustc.llvmPackages.lld
];
# NOTE: jemalloc is used by default on Linux with unprefixed enabled
buildInputs = lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++
buildInputs = [ openssl ] ++
lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++
lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
# NOTE: disable building `core`/`std` in wasm environment since rust-src isn't
@ -78,6 +83,7 @@ rustPlatform.buildRustPackage rec {
# NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target
CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
OPENSSL_NO_VENDOR = 1;
PROTOC = "${protobuf}/bin/protoc";
ROCKSDB_LIB_DIR = "${rocksdb}/lib";

2
pkgs/applications/editors/vim/plugins/deprecated.json
View File

@ -48,7 +48,7 @@
"new": "sqlite-lua"
},
"vim-fsharp": {
"date": "2024-04-21",
"date": "2024-05-06",
"new": "zarchive-vim-fsharp"
},
"vim-jade": {

1062
pkgs/applications/editors/vim/plugins/generated.nix
View File

File diff suppressed because it is too large Load Diff

508
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -1048,6 +1048,8 @@
mkdir $target/bin
ln -s ${dbee-go}/bin/dbee $target/bin/dbee
'';
meta.platforms = lib.platforms.linux;
});
nvim-navic = super.nvim-navic.overrideAttrs {
@ -1061,7 +1063,7 @@
inherit (old) version src;
sourceRoot = "${old.src.name}/spectre_oxi";
cargoHash = "sha256-UxOAIyVlJWlp5RUFVU3Ib539D5pm6Z+3edjHLerkIRU=";
cargoHash = "sha256-seBq1zJNzNVfCQckIHq7rHI/Y8MyxP88cee3NO7NYgo=";
preCheck = ''

4
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -73,7 +73,7 @@ https://github.com/ray-x/aurora/,,
https://github.com/hotwatermorning/auto-git-diff/,,
https://github.com/asiryk/auto-hlsearch.nvim/,HEAD,
https://github.com/jiangmiao/auto-pairs/,,
https://github.com/pocco81/auto-save.nvim/,HEAD,
https://github.com/okuuva/auto-save.nvim/,HEAD,
https://github.com/rmagatti/auto-session/,,
https://github.com/m4xshen/autoclose.nvim/,HEAD,
https://github.com/gaoDean/autolist.nvim/,,
@ -938,7 +938,7 @@ https://github.com/xiyaowong/transparent.nvim/,HEAD,
https://github.com/Wansmer/treesj/,main,
https://github.com/tremor-rs/tremor-vim/,,
https://github.com/cappyzawa/trim.nvim/,,
https://github.com/simonclean/triptych.nvim/,HEAD,
https://github.com/simonmclean/triptych.nvim/,HEAD,
https://github.com/folke/trouble.nvim/,,
https://github.com/Pocco81/true-zen.nvim/,,
https://github.com/tesaguri/trust.vim/,HEAD,

4
pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
View File

@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
publisher = "myriad-dreamin";
# Please update the corresponding binary (tinymist) when updating
# this extension.
version = "0.11.6";
hash = "sha256-qS+QY9RmJYXWRcohMcorF3SxoniBPE8SFcg0Ka1vvOE=";
version = "0.11.7";
hash = "sha256-pL61pu8xTsjOOn4vYBwrWc6JKhrzRyNjQmJmrezUcyk=";
};
nativeBuildInputs = [

24
pkgs/applications/misc/electrum/default.nix
View File

@ -2,6 +2,7 @@
, stdenv
, fetchurl
, fetchFromGitHub
, fetchpatch
, wrapQtAppsHook
, python3
, zbar
@ -109,7 +110,30 @@ python.pkgs.buildPythonApplication {
pyqt6
];
patches = [
# aiorpcx 0.23.1 compatibility
# Note: this patches `/run_electrum`.
# In the source repo, `/electrum/electrum`
# is a symlink to `../run_electrum`,
# so that path would also be affected by the patch.
# However, in the distribution tarball used here,
# `/electrum/electrum` is simply an exact copy of
# `/run_electrum` and is thereby *not* affected.
# So we have to manually copy the patched `/run_electrum`
# over `/electrum/electrum` after the patching (see below).
# XXX remove the copy command in `postPatch`
# as soon as the patch itself is removed!
(fetchpatch {
url = "https://github.com/spesmilo/electrum/commit/5f95d919dfa9868eaf82889903b94faa8c6443e0.patch";
hash = "sha256-cEkduLsL6A8qPhXS2KPQWzVtkQPYQhHSbuwQ2SnanHw=";
})
];
postPatch = ''
# copy the patched `/run_electrum` over `/electrum/electrum`
# so the aiorpcx compatibility patch is used
cp run_electrum electrum/electrum
# make compatible with protobuf4 by easing dependencies ...
substituteInPlace ./contrib/requirements/requirements.txt \
--replace "protobuf>=3.20,<4" "protobuf>=3.20"

76
pkgs/applications/misc/kdbplus/default.nix
View File

@ -1,76 +0,0 @@
{ lib, stdenv, requireFile, unzip, rlwrap, bash, zlib }:
assert (stdenv.hostPlatform.system == "i686-linux");
let
libPath = lib.makeLibraryPath
[ stdenv.cc.libc stdenv.cc.cc zlib ];
in
stdenv.mkDerivation rec {
pname = "kdbplus";
version = "3.6";
src = requireFile rec {
message = ''
Nix can't download kdb+ for you automatically. Go to
http://kx.com and download the free, 32-bit version for
Linux. Then run "nix-prefetch-url file://\$PWD/${name}" in
the directory where you saved it. Note you need version ${version}.
'';
name = "linuxx86.zip";
sha256 = "0w6znd9warcqx28vf648n0vgmxyyy9kvsfpsfw37d1kp5finap4p";
};
dontStrip = true;
nativeBuildInputs = [ unzip ];
phases = "unpackPhase installPhase";
unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}";
installPhase = ''
mkdir -p $out/bin $out/libexec
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${libPath} \
./q/l32/q
mv ./q/l32/q $out/libexec/q
# Shell script wrappers to make things more convenient...
cat > $out/bin/q-install <<- EOF
#!${bash}/bin/bash
if [ -f \$HOME/q/q.k ]; then
echo "kdb has already been unpacked in \$HOME. Skipping..."
exit 0
fi
echo -n "Unzipping ${src} into \$HOME... "
cd \$HOME && ${unzip}/bin/unzip -qq ${src}
echo "Done"
EOF
cat > $out/bin/q <<- EOF
#!${bash}/bin/bash
if [ ! -f \$HOME/q/q.k ]; then
echo "ERROR: You need to unzip the Q sources into \$HOME before running q."
echo
echo "Try:"
echo " cd \$HOME && unzip ${src}"
echo "(or run q-install)"
exit 1
fi
exec ${rlwrap}/bin/rlwrap $out/libexec/q \$@
EOF
chmod +x $out/bin/q $out/bin/q-install
'';
meta = {
description = "Analytics and time-series database";
homepage = "http://www.kx.com/";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
platforms = [ "i686-linux" ];
maintainers = [ lib.maintainers.thoughtpolice ];
};
}

4
pkgs/applications/misc/mainsail/default.nix
View File

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "mainsail";
version = "2.11.0";
version = "2.11.2";
src = fetchzip {
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
hash = "sha256-RQBSNfJQx3D07frYhKdNlRFMJYXiOC9NAT3bbqCr2Ls=";
hash = "sha256-RdBgGE/EUzb1/6PjQ34UjXjxt686s9May7npFtRocXE=";
stripRoot = false;
};

4
pkgs/applications/networking/gnome-network-displays/default.nix
View File

@ -28,11 +28,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-network-displays";
version = "0.92.1";
version = "0.92.2";
src = fetchurl {
url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
sha256 = "sha256-aoH9SpD7AfM6c6moMCCuQ1igkcrKgqAf1iLlpuXtaic=";
sha256 = "sha256-df35UJnRolVSiYcArpnrglxNKbTKA3LAGsNwlDF7cj4=";
};
nativeBuildInputs = [

22
pkgs/applications/networking/remote/remmina/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3
, curl, fuse3
, desktopToDarwinBundle
, glib, gtk3, gettext, libxkbfile, libX11, python3
, freerdp, libssh, libgcrypt, gnutls, vte
, freerdp3, libssh, libgcrypt, gnutls, vte
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core
@ -16,22 +17,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "remmina";
version = "1.4.33";
version = "1.4.35";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v.${finalAttrs.version}";
sha256 = "sha256-3HyG2PBnTq/fVsvWA81fQ2gCOoAxINWeUDwzKcOuECk=";
owner = "Remmina";
repo = "Remmina";
rev = "v${finalAttrs.version}";
hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ]
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
buildInputs = [
curl fuse3
gsettings-desktop-schemas
glib gtk3 gettext libxkbfile libX11
freerdp libssh libgcrypt gnutls
freerdp3 libssh libgcrypt gnutls
pcre2
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsoup_3 spice-protocol
@ -46,15 +48,12 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals withVte [ vte ];
cmakeFlags = [
"-DWITH_FREERDP3=ON"
"-DWITH_VTE=${if withVte then "ON" else "OFF"}"
"-DWITH_TELEPATHY=OFF"
"-DWITH_AVAHI=OFF"
"-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}"
"-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}"
"-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2"
] ++ lib.optionals stdenv.isDarwin [
"-DHAVE_LIBAPPINDICATOR=OFF"
"-DWITH_CUPS=OFF"
@ -82,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
license = licenses.gpl2Plus;
homepage = "https://gitlab.com/Remmina/Remmina";
changelog = "https://gitlab.com/Remmina/Remmina/-/blob/master/CHANGELOG.md#${lib.replaceStrings ["."] [""] finalAttrs.src.rev}";
description = "Remote desktop client written in GTK";
mainProgram = "remmina";
maintainers = with maintainers; [ bbigras melsigl ryantm ];

2
pkgs/applications/networking/trayscale/default.nix
View File

@ -50,7 +50,7 @@ buildGoModule rec {
description = "An unofficial GUI wrapper around the Tailscale CLI client";
homepage = "https://github.com/DeedleFake/trayscale";
license = licenses.mit;
maintainers = [ ];
maintainers = with maintainers; [ patka ];
mainProgram = "trayscale";
};
}

6
pkgs/applications/office/treesheets/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "0-unstable-2024-04-27";
version = "0-unstable-2024-05-04";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "fee4de37933f60895f78f45eb192d27bcdf0640e";
hash = "sha256-ej8Pjz7gvVP8gVsC68h60/uy+CkrcrBflhW/PjsxCvM=";
rev = "f29512886514410fa68d2debdb9389a8f81f3aaa";
hash = "sha256-Uq8G2lSVTj1JmiLnn5FZd/WKS+wjZxoaliOyghVZg34=";
};
nativeBuildInputs = [

6
pkgs/applications/radio/chirp/default.nix
View File

@ -10,13 +10,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "chirp";
version = "0.4.0-unstable-2024-02-08";
version = "0.4.0-unstable-2024-05-03";
src = fetchFromGitHub {
owner = "kk7ds";
repo = "chirp";
rev = "902043a937ee3611744f2a4e35cd902c7b0a8d0b";
hash = "sha256-oDUtR1xD73rfBRKkbE1f68siO/4oxoLxw16w1qa9fEo=";
rev = "e95140ff433b805ca16df04cba501b7332a9ec95";
hash = "sha256-UU3Ve6Yb7UK2nOLTfJasrlMX4iu1cpLBLScvhRhTUJ0=";
};
buildInputs = [
glib

25
pkgs/applications/science/biology/dssp/default.nix
View File

@ -3,39 +3,20 @@
, cmake
, eigen
, fetchFromGitHub
, fetchpatch
, libcifpp
, libmcfp
, zlib
}:
let
libcifpp' = libcifpp.overrideAttrs (oldAttrs: {
# dssp 4.4.3 requires specific version "5.2.0" of libcifpp
version = "5.2.0";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo rev;
hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs=";
};
patches = [
(fetchpatch {
# https://github.com/PDB-REDO/libcifpp/issues/51
name = "fix-build-on-darwin.patch";
url = "https://github.com/PDB-REDO/libcifpp/commit/641f06a7e7c0dc54af242b373820f2398f59e7ac.patch";
hash = "sha256-eWNfp9nA/+2J6xjZR6Tj+5OM3L5MxdfRi0nBzyaqvS0=";
})
];
});
in
stdenv.mkDerivation (finalAttrs: {
pname = "dssp";
version = "4.4.5";
version = "4.4.7";
src = fetchFromGitHub {
owner = "PDB-REDO";
repo = "dssp";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-X0aMWqoMhmQVRHWKVm2S6JAOYiBuBBMzMoivMdpNx0M=";
hash = "sha256-qePoZYkzzWuK6j1NM+q6fPuWVRDEe4OkPmXc9Nbqobo=";
};
nativeBuildInputs = [
@ -44,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
eigen
libcifpp'
libcifpp
libmcfp
zlib
];

4
pkgs/applications/science/biology/messer-slim/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }:
stdenv.mkDerivation rec {
version = "4.2.1";
version = "4.2.2";
pname = "messer-slim";
src = fetchFromGitHub {
owner = "MesserLab";
repo = "SLiM";
rev = "v${version}";
sha256 = "sha256-ba5I/bsDNAhDb1Kq0lWTC6YgpZ1PpeHPmB/vXx/JRK0=";
sha256 = "sha256-TlB7Hj4pVN4p4VanACWjQBeTxP9/DvRvdCdgelrXx60=";
};
nativeBuildInputs = [ cmake gcc gcc-unwrapped ];

8
pkgs/applications/version-management/gitnuro/default.nix
View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "gitnuro";
version = "1.1.1";
version = "1.3.1";
src = fetchurl {
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar";
hash = "sha256-ugZBk/aQ2pjL9xY66g20MorAQ02GHIdJTv8ejadaBgY=";
url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar";
hash = "sha256-7yne9dD/7VT+H4tIBJvpOf8ksECCpoNAa8TSmFmjYMw=";
};
icon = fetchurl {
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
description = "A FOSS Git multiplatform client based on Compose and JGit";
homepage = "https://gitnuro.com/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ zendo ];
mainProgram = "gitnuro";
};

6
pkgs/applications/version-management/stgit/default.nix
View File

@ -18,15 +18,15 @@
rustPlatform.buildRustPackage rec {
pname = "stgit";
version = "2.4.6";
version = "2.4.7";
src = fetchFromGitHub {
owner = "stacked-git";
repo = "stgit";
rev = "v${version}";
hash = "sha256-ZQU9AkemAMpMb2GhdfHaF6r6r6MbMXnmA0pq6Zq9Sek=";
hash = "sha256-TfCmVN7oHOgMyreJo58r6qaQYAXqmekpZt2WyTMGLvQ=";
};
cargoHash = "sha256-DHTo0jRZlLmw/B042uqzpMLUhBwm+sbFj9pze5l1Kpk=";
cargoHash = "sha256-kH7YrjoNkpoUdzcWtVqpWtmw+FIMrJYbo0ye30/VeVk=";
nativeBuildInputs = [
pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl

4
pkgs/applications/video/open-in-mpv/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "open-in-mpv";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "Baldomo";
repo = "open-in-mpv";
rev = "v${version}";
hash = "sha256-+sP8/wILBkT3NnhENDYZbOwqOufkFyMJFpQxquuUBEs=";
hash = "sha256-Fa6oZMaR0ctZgYWoOXLaobc+pDRDZbDCFvRZUR+Fda4=";
};
vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c=";

10
pkgs/applications/virtualization/crosvm/default.nix
View File

@ -5,20 +5,18 @@
rustPlatform.buildRustPackage rec {
pname = "crosvm";
version = "123.0";
version = "124.0";
src = fetchgit {
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
# This is actually one commit before release 123, because the final
# commit breaks the build and gets reverted in future releases.
rev = "7c75ad6185893b4cc26676b6a0eb9fbdf9ed5b72";
hash = "sha256-1Jj8TAgYxIGLJeTtiZBcXw0n/mTbh/uC8EFM0IYD5VY=";
rev = "bc2900b9ccbdf37b780a63888ca94437fd7dd6af";
hash = "sha256-t/47u5BlSC5vbRc7OQSbGBF+wnhcDFOMjrRQc/p2HcQ=";
fetchSubmodules = true;
};
separateDebugInfo = true;
cargoHash = "sha256-f3w+msG7m6valf/I1puMrpiVgk0J1bdyp+rw3KQ/7ys=";
cargoHash = "sha256-7zx0k7HXequpwcURHx+Ml3cDhdvLkXTg+V71F6TO/d0=";
nativeBuildInputs = [
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner

6
pkgs/applications/virtualization/distrobox/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "distrobox";
version = "1.7.1";
version = "1.7.2.1";
src = fetchFromGitHub {
owner = "89luca89";
repo = "distrobox";
rev = finalAttrs.version;
hash = "sha256-mSka8QyoLjnaVEP23TtyzbPTBHDlnrSomVZdfw4PPng=";
hash = "sha256-H2jeKs0h4ZAcP33HB5jptlubq62cwnjPK2wSlEIfFWA=";
};
dontConfigure = true;
@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# https://github.com/89luca89/distrobox/issues/408
substituteInPlace ./distrobox-generate-entry \
--replace 'icon_default="''${HOME}/.local' "icon_default=\"$out"
--replace-fail 'icon_default="''${HOME}/.local' "icon_default=\"$out"
./install -P $out
runHook postInstall

2
pkgs/applications/virtualization/dumb-init/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Yelp/dumb-init";
license = licenses.mit;
maintainers = [ ];
platforms = platforms.linux;
platforms = platforms.unix;
mainProgram = "dumb-init";
};
}

10
pkgs/build-support/dotnet/build-dotnet-module/default.nix
View File

@ -185,6 +185,10 @@ stdenvNoCC.mkDerivation (args // {
inherit selfContainedBuild useAppHost useDotnetFromEnv;
# propagate the runtime sandbox profile since the contents apply to published
# executables
propagatedSandboxProfile = toString dotnet-runtime.__propagatedSandboxProfile;
passthru = {
inherit nuget-source;
} // lib.optionalAttrs (!lib.isDerivation nugetDeps) {
@ -316,8 +320,4 @@ stdenvNoCC.mkDerivation (args // {
} // args.passthru or { };
meta = (args.meta or { }) // { inherit platforms; };
}
# ICU tries to unconditionally load files from /usr/share/icu on Darwin, which makes builds fail
# in the sandbox, so disable ICU on Darwin. This, as far as I know, shouldn't cause any built packages
# to behave differently, just the dotnet build tool.
// lib.optionalAttrs stdenvNoCC.isDarwin { DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1; })
})

0
pkgs/development/compilers/assemblyscript/default.nix → pkgs/by-name/as/assemblyscript/package.nix
View File

6
pkgs/by-name/at/atac/package.nix
View File

@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "atac";
version = "0.14.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "Julien-cpsn";
repo = "ATAC";
rev = "v${version}";
hash = "sha256-d5qUleQrwWWTIEDj3VvJKpINHpc0rko18if4pv5GonU=";
hash = "sha256-WDO6HDmjlXU4uelAJIWJN2sOJTioR7i2WzQpqg6dtKo=";
};
cargoHash = "sha256-vlrllbcf5Y9DFwdekAHE5xtGlloKxTExXkp1LySEUK0=";
cargoHash = "sha256-+dBEl1qk1/3WuSypsxV4x7DEmnMxa2z0MC03IZaON3s=";
nativeBuildInputs = [
pkg-config

0
pkgs/development/tools/rust/cargo-profiler/default.nix → pkgs/by-name/ca/cargo-profiler/package.nix
View File

6
pkgs/by-name/ca/cargo-shear/package.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-shear";
version = "0.0.24";
version = "0.0.25";
src = fetchFromGitHub {
owner = "Boshen";
repo = "cargo-shear";
rev = "v${version}";
sha256 = "sha256-7eBFDmeFOXqZhNE4RDlIq991xEoCGL6XLMmUQuLJvrE=";
sha256 = "sha256-4NnCUe4DrnSeveicxvvDF49hrc4NdRx/N10PH7Q0k8k=";
};
cargoSha256 = "sha256-DQjLW6NtUPERT82zIlrGRk3FffU/EfLBMgAeFfFdDxE=";
cargoHash = "sha256-gHXJz3Xw9vC04q001kd6AgEKKaRtAK3oGMn7JJh+Neo=";
meta = with lib; {
description = "Detect and remove unused dependencies from Cargo.toml";

4
pkgs/development/tools/rust/cargo-wasi/default.nix → pkgs/by-name/ca/cargo-wasi/package.nix
View File

@ -4,7 +4,7 @@
, pkg-config
, stdenv
, openssl
, Security
, darwin
}:
rustPlatform.buildRustPackage rec {
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]);
# Checks need to be disabled here because the current test suite makes assumptions
# about the surrounding environment that aren't Nix friendly. See these lines for specifics:

4
pkgs/by-name/cl/clash-verge-rev/package.nix
View File

@ -5,11 +5,11 @@
clash-verge.overrideAttrs (old: rec {
pname = "clash-verge-rev";
version = "1.6.0";
version = "1.6.1";
src = fetchurl {
url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb";
hash = "sha256-wSpWTQ+AuDG3zKocDVatRqVW5yhrOtcbNI+jfMOaXvg=";
hash = "sha256-V6W7IJFa8UrbPWPS2tReecZ41oYvAqV4q0NBkkhUHbQ=";
};
meta = old.meta // (with lib; {

4
pkgs/by-name/co/codux/package.nix
View File

@ -5,11 +5,11 @@
let
pname = "codux";
version = "15.25.0";
version = "15.25.1";
src = fetchurl {
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
sha256 = "sha256-9hO0n+ARAqwYWCbDAKpna1zS3pjHykB3+c6wunWrc6o=";
sha256 = "sha256-MdA/NAlIRyKJNiqYvoxACc+WgS0ZAt+tbqaQRzTT/Xc=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };

0
pkgs/development/tools/dapr/cli/default.nix → pkgs/by-name/da/dapr-cli/package.nix
View File

0
pkgs/tools/security/doppler/default.nix → pkgs/by-name/do/doppler/package.nix
View File

0
pkgs/development/tools/eclint/default.nix → pkgs/by-name/ec/eclint/package.nix
View File

43
pkgs/by-name/fa/fastahack/package.nix Normal file
View File

@ -0,0 +1,43 @@
{
lib,
stdenv,
fetchFromGitHub,
runCommand,
fastahack,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fastahack";
version = "1.0.0";
src = fetchFromGitHub {
owner = "ekg";
repo = "fastahack";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-SWu2iRwNgdhsn4sH9/3jPNG3+l1xFAHXPq5/ODVd4WY=";
};
installFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.tests = {
simple = runCommand "${finalAttrs.pname}-test" { } ''
mkdir $out
cp ${fastahack.src}/tests/* $out
grep -v ERROR <(${lib.getExe fastahack} $out/correct.fasta 2>&1)
grep -v ERROR <(${lib.getExe fastahack} $out/crlf.fasta 2>&1)
grep "ERROR: embedded newline " <(${lib.getExe fastahack} $out/embedded_newline.fasta 2>&1)
grep "ERROR: mismatched line lengths" <(${lib.getExe fastahack} $out/mismatched_lines.fasta 2>&1)
grep -v ERROR <(${lib.getExe fastahack} $out/trailing_newlines.fasta 2>&1)
'';
};
meta = {
description = "Utilities for indexing and sequence extraction from FASTA files";
homepage = "https://github.com/ekg/fastahack";
changelog = "https://github.com/ekg/fastahack/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
mainProgram = "fastahack";
platforms = lib.platforms.unix;
};
})

10
pkgs/by-name/fl/flashprog/package.nix
View File

@ -12,14 +12,14 @@
, withGpio ? stdenv.isLinux
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "flashprog";
version = "1.0.1";
version = "1.1";
src = fetchgit {
url = "https://review.sourcearcade.org/flashprog";
rev = "2ca11f9a4101ea230081d448ab2b570425b7f0bd";
hash = "sha256-pm9g9iOJAKnzzY9couzt8RmqZFbIpKcO++zsUJ9o49U=";
rev = "v${finalAttrs.version}";
hash = "sha256-CLwaGxVOo8FJaWfvrJ2hAm7XonP5nHT6YTsaw7scKCM=";
};
nativeBuildInputs = [
@ -60,4 +60,4 @@ stdenv.mkDerivation {
platforms = platforms.all;
mainProgram = "flashprog";
};
}
})

4
pkgs/applications/misc/flowtime/default.nix → pkgs/by-name/fl/flowtime/package.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "flowtime";
version = "6.1";
version = "6.5";
src = fetchFromGitHub {
owner = "Diego-Ivan";
repo = "Flowtime";
rev = "v${version}";
hash = "sha256-wTqHTkt1O3Da2fzxf6DiQjrqOt65ZEhLOkGK5C6HzIk=";
hash = "sha256-J0Pscv0ZOpA/LV2mPTLOmDPQpfZhizTghatGnrJHToE=";
};
nativeBuildInputs = [

50
pkgs/by-name/gr/greenmask/package.nix Normal file
View File

@ -0,0 +1,50 @@
{
lib,
buildGoModule,
coreutils,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "greenmask";
version = "0.1.12";
src = fetchFromGitHub {
owner = "GreenmaskIO";
repo = "greenmask";
rev = "refs/tags/v${version}";
hash = "sha256-RotNZnmOYZfrukg0OPGnxCf0nbspqUdSJ53P9cmFlOA=";
};
vendorHash = "sha256-WCsZ5DU+mZk9M1lldBY4q2PXI8DDFytPojzGJ6wqXsg=";
subPackages = [ "cmd/greenmask/" ];
ldflags = [
"-s"
"-w"
"-X=github.com/greenmaskio/greenmask/cmd/greenmask/cmd.Version=${version}"
];
nativeCheckInputs = [ coreutils ];
preCheck = ''
substituteInPlace internal/db/postgres/transformers/custom/dynamic_definition_test.go \
--replace-fail "/bin/echo" "${coreutils}/bin/echo"
substituteInPlace tests/integration/greenmask/main_test.go \
--replace-fail "TestTocLibrary" "SkipTestTocLibrary" \
--replace-fail "TestGreenmaskBackwardCompatibility" "SkipTestGreenmaskBackwardCompatibility"
substituteInPlace tests/integration/storages/main_test.go \
--replace-fail "TestS3Storage" "SkipTestS3Storage"
'';
meta = with lib; {
description = "PostgreSQL database anonymization tool";
homepage = "https://github.com/GreenmaskIO/greenmask";
changelog = "https://github.com/GreenmaskIO/greenmask/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
mainProgram = "greenmask";
};
}

6
pkgs/by-name/ho/home-manager/package.nix
View File

@ -16,14 +16,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2024-04-29";
version = "0-unstable-2024-05-05";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "9fe79591c1005ce6f93084ae7f7dab0a2891440d";
hash = "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=";
rev = "3dfe05aa9b5646995ace887931fa60269a039777";
hash = "sha256-QXpLmgmisNK2Zgpnu9DiO9ScrKJuJ4zmiMTNpObVIuk=";
};
nativeBuildInputs = [

0
pkgs/applications/logging/humioctl/default.nix → pkgs/by-name/hu/humioctl/package.nix
View File

6
pkgs/by-name/ir/ironbar/package.nix
View File

@ -29,16 +29,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ironbar";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "JakeStanger";
repo = "ironbar";
rev = "v${version}";
hash = "sha256-SowZ3qo06x32+A02Wmq4N/rU/yxyKqkn407qHzJLU0M=";
hash = "sha256-TPbvKQdoGfZMzp+fl72vy6MtRV1yGcOG/es67VOA0xw=";
};
cargoHash = "sha256-DaF669mOnICTnUzH4mc640xIecin/UEZSk7PWDjQbr0=";
cargoHash = "sha256-+9R505xyEycv5Dav4ZCh1BiYRp3U1I9yBDqSPefo9uY=";
buildInputs =
[

4
pkgs/by-name/li/libmediainfo/package.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmediainfo";
version = "24.03";
version = "24.04";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
hash = "sha256-zCu0TkB8iQq1ZpNMVnY5GFBatYwUE0tT8NHanuokLI0=";
hash = "sha256-dqb/BgiHdz8ll3tYiuUISEuxLRHLeivjMi2qnG5T8bI=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

4
pkgs/by-name/li/livi/package.nix
View File

@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "livi";
version = "0.0.6";
version = "0.1.0";
src = fetchFromGitLab {
owner = "guidog";
repo = "livi";
domain = "gitlab.gnome.org";
rev = "v${version}";
sha256 = "sha256-DaIbBCJT4Da5noW6Q5z1yzTZ256HNqrvdXgwSY7p/D8=";
sha256 = "sha256-FJ43BDRsZUFuRrNFWuEJ/nSO+suWad2QvqhwzuXWBtY=";
};
nativeBuildInputs = [
meson

28
pkgs/by-name/lm/lmstudio/darwin.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv
, fetchurl
, undmg
, lib
, meta
, pname
, version
}:
stdenv.mkDerivation {
inherit meta pname version;
src = fetchurl {
url = "https://releases.lmstudio.ai/mac/arm64/${version}/b/latest/LM-Studio-${version}-arm64.dmg";
hash = "sha256-kb1XoTZjhCL1+CsV+r3/EN0srzIJ43H2VMZ779dVq1k=";
};
nativeBuildInputs = [ undmg ];
sourceRoot = ".";
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r *.app $out/Applications
runHook postInstall
'';
}

29
pkgs/by-name/lm/lmstudio/linux.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib
, appimageTools
, fetchurl
, version
, pname
, meta
}:
let
src = fetchurl {
url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage";
hash = "sha256-hcV8wDhulFAxHDBDKicpEGovwcsn9RaIi/idUz+YzD8=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit meta pname version src;
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ];
extraInstallCommands = ''
mkdir -p $out/share/applications
cp -r ${appimageContents}/usr/share/icons $out/share
install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications
substituteInPlace $out/share/applications/lm-studio.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio'
'';
}

38
pkgs/by-name/lm/lmstudio/package.nix
View File

@ -1,38 +1,22 @@
{ lib
, appimageTools
, fetchurl
, stdenv
, callPackage
, ...
}:
let
pname = "lmstudio";
version = "0.2.20";
src = fetchurl {
url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage";
hash = "sha256-T92ZDqGvxJfBkAWsK8EgHdQZnLefK3gDP2vCTL8X+eM=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit pname version src;
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ];
extraInstallCommands = ''
mkdir -p $out/share/applications
cp -r ${appimageContents}/usr/share/icons $out/share
install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications
substituteInPlace $out/share/applications/lm-studio.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio'
'';
version = "0.2.22";
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
homepage = "https://lmstudio.ai/";
license = lib.licenses.unfree;
mainProgram = "lmstudio";
maintainers = with lib.maintainers; [ drupol ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ drupol eeedean ];
platforms = lib.platforms.linux ++ [ "aarch64-darwin" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}
in
if stdenv.isDarwin
then callPackage ./darwin.nix { inherit pname version meta; }
else callPackage ./linux.nix { inherit pname version meta; }

26
pkgs/by-name/lo/local-ai/module.nix
View File

@ -28,25 +28,33 @@ in
type = types.either types.package types.str;
default = "models";
};
parallelRequests = mkOption {
type = types.int;
default = 1;
};
logLevel = mkOption {
type = types.enum [ "error" "warn" "info" "debug" "trace" ];
default = "warn";
};
};
config = lib.mkIf cfg.enable {
systemd.services.local-ai = {
wantedBy = [ "multi-user.target" ];
environment.LLAMACPP_PARALLEL = toString cfg.parallelRequests;
serviceConfig = {
DynamicUser = true;
ExecStart = lib.escapeShellArgs ([
"${cfg.package}/bin/local-ai"
"--debug"
"--address"
":${toString cfg.port}"
"--threads"
(toString cfg.threads)
"--localai-config-dir"
"."
"--models-path"
(toString cfg.models)
"--address=:${toString cfg.port}"
"--threads=${toString cfg.threads}"
"--localai-config-dir=."
"--models-path=${cfg.models}"
"--log-level=${cfg.logLevel}"
]
++ lib.optional (cfg.parallelRequests > 1) "--parallel-requests"
++ cfg.extraArgs);
RuntimeDirectory = "local-ai";
WorkingDirectory = "%t/local-ai";

20
pkgs/by-name/lo/local-ai/package.nix
View File

@ -100,8 +100,8 @@ let
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "784e11dea1f5ce9638851b2b0dddb107e2a609c8";
hash = "sha256-yAQAUo5J+a6O2kTqhFL1UH0tANxpQn3JhAd3MByaC6I=";
rev = "6ecf3189e00a1e8e737a78b6d10e1d7006e050a2";
hash = "sha256-JS287UdCzj6Es134cbhr8y/AoejMEux0w++/pZ5NejY=";
fetchSubmodules = true;
};
postPatch = prev.postPatch + ''
@ -254,8 +254,8 @@ let
src = fetchFromGitHub {
owner = "ggerganov";
repo = "whisper.cpp";
rev = "858452d58dba3acdc3431c9bced2bb8cfd9bf418";
hash = "sha256-2fT3RgGpBex1mF6GJsVDo4rb0F31YqxTymsXcrpQAZk=";
rev = "8fac6455ffeb0a0950a84e790ddb74f7290d33c4";
hash = "sha256-Dez/Q2vMvSmscS+BJwkgZ4QG+ebM/N8s1Okd5my0CWI=";
};
nativeBuildInputs = [ cmake pkg-config ]
@ -305,8 +305,8 @@ let
src = fetchFromGitHub {
owner = "mudler";
repo = "go-stable-diffusion";
rev = "362df9da29f882dbf09ade61972d16a1f53c3485";
hash = "sha256-A5KvMZOviPsIpPHxM8cacT+qE2x1iFJAbPsRs4sLijY=";
rev = "4a3cd6aeae6f66ee57eae9a0075f8c58c3a6a38f";
hash = "sha256-KXUvMP6cDyWib4rG0RmVRm3pgrdsfKXaH3k0v5/mTe8=";
fetchSubmodules = true;
};
buildFlags = [ "libstablediffusion.a" ];
@ -342,8 +342,8 @@ let
src = fetchFromGitHub {
owner = "M0Rf30";
repo = "go-tiny-dream";
rev = "22a12a4bc0ac5455856f28f3b771331a551a4293";
hash = "sha256-DAVHD6E0OKHf4C2ldoI0Mm7813DIrmWFONUhSCQPCfc=";
rev = "c04fa463ace9d9a6464313aa5f9cd0f953b6c057";
hash = "sha256-uow3vbAI4F/fTGjYOKOLqTpKq7NgGYSZhGlEhn7h6s0=";
fetchSubmodules = true;
};
postUnpack = ''
@ -373,12 +373,12 @@ let
stdenv;
pname = "local-ai";
version = "2.13.0";
version = "2.14.0";
src = fetchFromGitHub {
owner = "go-skynet";
repo = "LocalAI";
rev = "v${version}";
hash = "sha256-jZE8Ow9FFhnx/jvsURLYlYtSuKpE4UWBezxg/mpHs9g=";
hash = "sha256-wr7sTMjGofGiZZbRJ+RfgXx9TM9Adu2NBAXeB3P5Ep0=";
};
self = buildGoModule.override { stdenv = effectiveStdenv; } {

21
pkgs/by-name/lo/local-ai/tests.nix
View File

@ -6,6 +6,7 @@
, writers
, symlinkJoin
, jq
, prom2json
}:
let
common-config = { config, ... }: {
@ -14,6 +15,7 @@ let
enable = true;
package = self;
threads = config.virtualisation.cores;
logLevel = "debug";
};
};
@ -36,6 +38,10 @@ in
''
machine.wait_for_open_port(${port})
machine.succeed("curl -f http://localhost:${port}/readyz")
machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
machine.copy_from_vm("metrics.json")
'';
});
@ -80,6 +86,10 @@ in
machine.succeed("${jq}/bin/jq --exit-status 'debug | .data[].id == \"${model}\"' models.json")
machine.succeed("curl -f http://localhost:${port}/embeddings --json @${writers.writeJSON "request.json" requests.request} --output embeddings.json")
machine.succeed("${jq}/bin/jq --exit-status 'debug | .model == \"${model}\"' embeddings.json")
machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
machine.copy_from_vm("metrics.json")
'';
};
@ -92,6 +102,7 @@ in
# https://localai.io/advanced/#full-config-model-file-reference
model-configs.${model} = rec {
context_size = 8192;
backend = "llama-cpp";
parameters = {
# https://huggingface.co/lmstudio-community/Meta-Llama-3-8B-Instruct-GGUF
# https://ai.meta.com/blog/meta-llama-3/
@ -157,6 +168,8 @@ in
virtualisation.cores = 4;
virtualisation.memorySize = 8192;
services.local-ai.models = models;
# TODO: Add test case parallel requests
services.local-ai.parallelRequests = 2;
};
passthru = { inherit models requests; };
testScript =
@ -180,6 +193,10 @@ in
machine.succeed("curl -f http://localhost:${port}/v1/completions --json @${writers.writeJSON "request-completions.json" requests.completions} --output completions.json")
machine.succeed("${jq}/bin/jq --exit-status 'debug | .object ==\"text_completion\"' completions.json")
machine.succeed("${jq}/bin/jq --exit-status '.usage.completion_tokens | debug == ${toString model-configs.${model}.parameters.max_tokens}' completions.json")
machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
machine.copy_from_vm("metrics.json")
'';
};
@ -243,6 +260,10 @@ in
machine.succeed("curl -f http://localhost:${port}/tts --json @${writers.writeJSON "request.json" requests.request} --output out.wav")
machine.succeed("curl -f http://localhost:${port}/v1/audio/transcriptions --header 'Content-Type: multipart/form-data' --form file=@out.wav --form model=${model-stt} --output transcription.json")
machine.succeed("${jq}/bin/jq --exit-status 'debug | .segments | first.text == \"${requests.request.input}\"' transcription.json")
machine.succeed("${prom2json}/bin/prom2json http://localhost:${port}/metrics > metrics.json")
machine.copy_from_vm("metrics.json")
'';
};
}

4
pkgs/by-name/me/mediainfo/package.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mediainfo";
version = "24.03";
version = "24.04";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
hash = "sha256-b/jx+i+FmhMJH3Wiz5E0hmRPbiWa0cJa+5qT5IRExWM=";
hash = "sha256-6+sctwGiMFnHNsszuRoxcsT5jnNB5EoLMKEZGRkaJ00=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

6
pkgs/by-name/me/melonDS/package.nix
View File

@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "melonDS";
version = "0.9.5-unstable-2024-04-18";
version = "0.9.5-unstable-2024-05-05";
src = fetchFromGitHub {
owner = "melonDS-emu";
repo = "melonDS";
rev = "ba8d547dfa81539f4e8474152d92e866ad89241b";
hash = "sha256-va4KegM2z0GSA43goUynRPNPvQnrV2b8oNOfLKPE+Zc=";
rev = "10798c3464ca0e199087960fda918ed99acc2e21";
hash = "sha256-5GbJKhICrbVfnfZt6Ni4uNbodH3rJY5lKoQRgiPXWCg=";
};
nativeBuildInputs = [

33
pkgs/by-name/mi/misconfig-mapper/package.nix Normal file
View File

@ -0,0 +1,33 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "misconfig-mapper";
version = "1.1.0";
src = fetchFromGitHub {
owner = "intigriti";
repo = "misconfig-mapper";
rev = "refs/tags/v${version}";
hash = "sha256-5FzXtqC8C4iDC8xBalKHlNeSIJ0msMVC7jUXZxSLkLY=";
};
vendorHash = "sha256-b2AVWjZXNQPV84sS2wu5xUadZEme/T96O4dGiV5G0dA=";
ldflags = [
"-s"
"-w"
];
meta = with lib; {
description = "Tool to uncover security misconfigurations on popular third-party services";
homepage = "https://github.com/intigriti/misconfig-mapper";
changelog = "https://github.com/intigriti/misconfig-mapper/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "misconfig-mapper";
};
}

0
pkgs/development/tools/oh-my-posh/default.nix → pkgs/by-name/oh/oh-my-posh/package.nix
View File

99
pkgs/by-name/op/openturns/package.nix Normal file
View File

@ -0,0 +1,99 @@
{
lib,
boost,
ceres-solver,
cmake,
cminpack,
darwin,
dlib,
fetchFromGitHub,
fetchpatch,
hdf5,
hmat-oss,
ipopt,
libxml2,
nlopt,
pagmo2,
primesieve,
python3Packages,
spectra,
stdenv,
swig,
tbb,
# Boolean flags
runTests ? false, # tests take an hour to build on a 48-core machine
enablePython ? false,
}:
let
inherit (darwin.apple_sdk.frameworks) Accelerate;
in
stdenv.mkDerivation (finalAttrs: {
pname = "openturns";
version = "1.22";
src = fetchFromGitHub {
owner = "openturns";
repo = "openturns";
rev = "v${finalAttrs.version}";
hash = "sha256-ku3/mPoa1YJVJB99R/kWlOubIO+OZAiKfPqS/DrtJQk=";
};
nativeBuildInputs = [
cmake
]
++ lib.optionals enablePython [ python3Packages.sphinx ];
buildInputs = [
(lib.getLib primesieve)
boost
ceres-solver
cminpack
dlib
hdf5
hmat-oss
ipopt
libxml2
nlopt
pagmo2
spectra
swig
tbb
]
++ lib.optionals enablePython [
python3Packages.dill
python3Packages.matplotlib
python3Packages.psutil
python3Packages.python
]
++ lib.optionals stdenv.isDarwin [
Accelerate
];
cmakeFlags = [
(lib.cmakeBool "BUILD_PYTHON" enablePython)
(lib.cmakeBool "CMAKE_UNITY_BUILD" true)
(lib.cmakeBool "USE_SPHINX" enablePython)
(lib.cmakeFeature "CMAKE_UNITY_BUILD_BATCH_SIZE" "32")
(lib.cmakeFeature "SWIG_COMPILE_FLAGS" "-O1")
(lib.cmakeOptionType "PATH" "OPENTURNS_SYSCONFIG_PATH" "$out/etc")
];
checkTarget = lib.concatStringsSep " " [
"tests"
"check"
];
strictDeps = true;
doCheck = runTests;
meta = {
homepage = "https://openturns.github.io/www/";
description = "Multivariate probabilistic modeling and uncertainty treatment library";
changelog = "https://github.com/openturns/openturns/raw/v${finalAttrs.version}/ChangeLog";
license = with lib.licenses; [ lgpl3Plus gpl3Plus ];
maintainers = with lib.maintainers; [ gdinh ];
platforms = lib.platforms.unix;
};
})

2
pkgs/by-name/pa/paratest/package.nix
View File

@ -23,6 +23,6 @@
homepage = "https://github.com/paratestphp/paratest";
license = lib.licenses.mit;
mainProgram = "paratest";
maintainers = [ ];
maintainers = with lib.maintainers; [ patka ];
};
})

2
pkgs/by-name/pe/pest/package.nix
View File

@ -21,6 +21,6 @@ php.buildComposerProject (finalAttrs: {
homepage = "https://pestphp.com";
license = lib.licenses.mit;
mainProgram = "pest";
maintainers = [ ];
maintainers = with lib.maintainers; [ patka ];
};
})

2
pkgs/by-name/ph/phpactor/package.nix
View File

@ -30,6 +30,6 @@ php.buildComposerProject (finalAttrs: {
homepage = "https://github.com/phpactor/phpactor";
license = lib.licenses.mit;
mainProgram = "phpactor";
maintainers = lib.teams.php.members;
maintainers = [ lib.maintainers.patka ] ++ lib.teams.php.members;
};
})

9
pkgs/by-name/ph/phpunit/package.nix
View File

@ -1,27 +1,30 @@
{ lib
, fetchFromGitHub
, nix-update-script
, php
}:
php.buildComposerProject (finalAttrs: {
pname = "phpunit";
version = "11.1.1";
version = "11.1.3";
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
rev = finalAttrs.version;
hash = "sha256-aS2mQeE8WnEaTexl8qhhfGyi1MP48s6fjrTXkVLq1LU=";
hash = "sha256-Wq2k44WpUhDhSyIx8ofn/jUR7FS3zn2CCe4OiFKHXEA=";
};
vendorHash = "sha256-kjMJCrMG08AXX662GAR5+V6w1+WOv8F9r6ONIOowP8Q=";
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md";
description = "PHP Unit Testing framework";
homepage = "https://phpunit.de";
license = lib.licenses.bsd3;
mainProgram = "phpunit";
maintainers = [ lib.maintainers.onny ] ++ lib.teams.php.members;
maintainers = with lib.maintainers; [ onny patka ] ++ lib.teams.php.members;
};
})

5
pkgs/by-name/pr/pretix/package.nix
View File

@ -213,6 +213,11 @@ python.pkgs.buildPythonApplication rec {
"--reruns" "3"
];
disabledTests = [
# unreliable around day changes
"test_order_create_invoice"
];
preCheck = ''
export PYTHONPATH=$(pwd)/src:$PYTHONPATH
export DJANGO_SETTINGS_MODULE=tests.settings

4
pkgs/by-name/pr/primesieve/package.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "primesieve";
version = "12.1";
version = "12.3";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primesieve";
rev = "v${finalAttrs.version}";
hash = "sha256-AHl2GfZ1oJ8ZyjJzvg10AqN7TA7HFZ+qa6N2v51Qa78=";
hash = "sha256-jULYLJK3iwPKgWpdTEetmSz1Nv2md1XUfR9A9mTQu9M=";
};
outputs = [ "out" "dev" "lib" "man" ];

6
pkgs/by-name/pr/proto/package.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "proto";
version = "0.34.4";
version = "0.35.0";
src = fetchFromGitHub {
owner = "moonrepo";
repo = pname;
rev = "v${version}";
hash = "sha256-sh4EeK9LGY1t7BDWV31pOjp6CYhOIRR/wCb6LAv68ok=";
hash = "sha256-kUoiERpkAVxow6YWEIkmF2A9oRrdqMnZLsFJOLf5Ucc=";
};
cargoHash = "sha256-PU6r6Iwv00TLhAZSt9hERWvCgpC27Cuf3rrsjN1gO5k=";
cargoHash = "sha256-3Jh5vPi/dNIVrxkibWe70eiZ54/wf6USTV+VV+H9mtk=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration

0
pkgs/development/tools/protoc-gen-rust/default.nix → pkgs/by-name/pr/protoc-gen-rust/package.nix
View File

0
pkgs/development/tools/refinery-cli/default.nix → pkgs/by-name/re/refinery-cli/package.nix
View File

6
pkgs/by-name/re/renode-dts2repl/package.nix
View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication {
pname = "renode-dts2repl";
version = "0-unstable-2024-04-16";
version = "0-unstable-2024-04-30";
pyproject = true;
src = fetchFromGitHub {
owner = "antmicro";
repo = "dts2repl";
rev = "83e2d743202684eb1f89a1b93e859c69cd736455";
hash = "sha256-iD+59mrFNVRu6g58XXLR2Pg8oDpNIiI/+TyCdbRbjtM=";
rev = "dc2212318aec6c2aa6920795e16fab7dfcb8796e";
hash = "sha256-XY2rQqu2CSKRImx0GmC5ggTZTyvrtX+LvqkYj0sEBuU=";
};
nativeBuildInputs = [

4
pkgs/by-name/si/sispmctl/package.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "sispmctl";
version = "4.11";
version = "4.12";
src = fetchurl {
url = "mirror://sourceforge/sispmctl/sispmctl-${version}.tar.gz";
hash = "sha256-dLlKNxAEaxUHDHMR8MrLgVVMhrQidxnMJzPLlscFJXg=";
hash = "sha256-51eGOkg42m4cpypXrcWspvxH/73ccqaQUtir10PVcII=";
};
nativeBuildInputs = [

35
pkgs/by-name/tt/tt/package.nix Normal file
View File

@ -0,0 +1,35 @@
{
lib,
fetchFromGitHub,
buildGoModule,
installShellFiles,
}:
buildGoModule rec {
pname = "tt";
version = "0.4.2";
src = fetchFromGitHub {
owner = "lemnos";
repo = "tt";
rev = "v${version}";
hash = "sha256-vKh19xYBeNqvVFilvA7NeQ34RM5VnwDs+Hu/pe3J0y4=";
};
vendorHash = "sha256-edY2CcZXOIed0+7IA8kr4lAfuSJx/nHtmc734XzT4z4=";
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
mv $out/bin/src $out/bin/tt
installManPage tt.1.gz
'';
meta = {
description = "Typing test in the terminal written in Go";
homepage = "https://github.com/lemnos/tt";
license = lib.licenses.mit;
mainProgram = "tt";
maintainers = with lib.maintainers; [ vinetos ];
};
}

0
pkgs/development/tools/twiggy/default.nix → pkgs/by-name/tw/twiggy/package.nix
View File

5
pkgs/by-name/tw/twitch-dl/package.nix
View File

@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "twitch-dl";
version = "2.2.2";
version = "2.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "ihabunek";
repo = "twitch-dl";
rev = "refs/tags/${version}";
hash = "sha256-Os27uqH3MA3v9+8WzfL5KIEUewAzf8JUyRtsWSzw81o=";
hash = "sha256-0uOOc3ANXleQlENB+gdWheafBiOOcyZsFvYj7r+WMCY=";
};
pythonRelaxDeps = [
@ -42,6 +42,7 @@ python3Packages.buildPythonApplication rec {
disabledTestPaths = [
# Requires network access
"tests/test_api.py"
"tests/test_cli.py"
];
pythonImportsCheck = [

0
pkgs/development/tools/upbound/default.nix → pkgs/by-name/up/upbound/package.nix
View File

4
pkgs/by-name/up/updatecli/package.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "updatecli";
version = "0.76.0";
version = "0.76.1";
src = fetchFromGitHub {
owner = "updatecli";
repo = pname;
rev = "v${version}";
hash = "sha256-UfiwagyE3w+kcPJnDDNTCGrxghnag/RPz6SSdAglyYA=";
hash = "sha256-C+PWuFjTxmD+/qUsuJDueNrhFXKqu0PZnLPlQ3KJQlE=";
};
vendorHash = "sha256-STiVtzA78zeo5wywwzvA0dqmBW3REUvcpOXuWjpxReY=";

4
pkgs/by-name/vu/vunnel/package.nix
View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "vunnel";
version = "0.22.0";
version = "0.22.2";
pyproject = true;
src = fetchFromGitHub {
owner = "anchore";
repo = "vunnel";
rev = "refs/tags/v${version}";
hash = "sha256-+L1MUD9IKPnbh/yjRuF3aOszeMvkILuqHHWj949SrMo=";
hash = "sha256-g/dlo2M7TJRYAbk3HtGQlMUZhORxt+OsDgP8W7rf+NE=";
};
pythonRelaxDeps = [

5
pkgs/tools/package-management/wapm/cli/default.nix → pkgs/by-name/wa/wapm/package.nix
View File

@ -4,9 +4,8 @@
, libiconv
, openssl
, rustPlatform
, Security
, stdenv
, SystemConfiguration
, darwin
}:
rustPlatform.buildRustPackage rec {
@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ perl ];
buildInputs = [ libiconv openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
doCheck = false;

250
pkgs/by-name/wa/waybar/package.nix
View File

@ -1,71 +1,71 @@
{ lib
, stdenv
, bash
, fetchFromGitHub
, fetchFromGitLab
, SDL2
, alsa-lib
, catch2_3
, fftw
, glib
, gobject-introspection
, gtk-layer-shell
, gtkmm3
, howard-hinnant-date
, hyprland
, iniparser
, jsoncpp
, libdbusmenu-gtk3
, libevdev
, libinotify-kqueue
, libinput
, libjack2
, libmpdclient
, libnl
, libpulseaudio
, libsigcxx
, libxkbcommon
, meson
, ncurses
, ninja
, pipewire
, pkg-config
, playerctl
, portaudio
, python3
, scdoc
, sndio
, spdlog
, sway
, udev
, upower
, wayland
, wayland-scanner
, wireplumber
, wrapGAppsHook3
{
lib,
stdenv,
bash,
fetchFromGitHub,
SDL2,
alsa-lib,
catch2_3,
fftw,
glib,
gobject-introspection,
gtk-layer-shell,
gtkmm3,
howard-hinnant-date,
hyprland,
iniparser,
jsoncpp,
libdbusmenu-gtk3,
libevdev,
libinotify-kqueue,
libinput,
libjack2,
libmpdclient,
libnl,
libpulseaudio,
libsigcxx,
libxkbcommon,
meson,
ncurses,
ninja,
pipewire,
pkg-config,
playerctl,
portaudio,
python3,
scdoc,
sndio,
spdlog,
sway,
udev,
upower,
wayland,
wayland-scanner,
wireplumber,
wrapGAppsHook3,
, cavaSupport ? true
, enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
, evdevSupport ? true
, experimentalPatches ? true
, hyprlandSupport ? true
, inputSupport ? true
, jackSupport ? true
, mpdSupport ? true
, mprisSupport ? stdenv.isLinux
, nlSupport ? true
, pipewireSupport ? true
, pulseSupport ? true
, rfkillSupport ? true
, runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
, sndioSupport ? true
, swaySupport ? true
, traySupport ? true
, udevSupport ? true
, upowerSupport ? true
, wireplumberSupport ? true
, withMediaPlayer ? mprisSupport && false
, nix-update-script
cavaSupport ? true,
enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
evdevSupport ? true,
experimentalPatches ? true,
hyprlandSupport ? true,
inputSupport ? true,
jackSupport ? true,
mpdSupport ? true,
mprisSupport ? stdenv.isLinux,
nlSupport ? true,
pipewireSupport ? true,
pulseSupport ? true,
rfkillSupport ? true,
runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
sndioSupport ? true,
swaySupport ? true,
traySupport ? true,
udevSupport ? true,
upowerSupport ? true,
wireplumberSupport ? true,
withMediaPlayer ? mprisSupport && false,
nix-update-script,
}:
let
@ -79,13 +79,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "waybar";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = finalAttrs.version;
hash = "sha256-xinTLjZJhL4048jpAbN3i6nSxKAqnbesbK/GBX+1CkE=";
hash = "sha256-LUageV0xC42MldMmYY1njkm95icBsqID1tEGy3wwrRM=";
};
postUnpack = lib.optional cavaSupport ''
@ -101,8 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
wayland-scanner
wrapGAppsHook3
] ++ lib.optional withMediaPlayer gobject-introspection
++ lib.optional enableManpages scdoc;
] ++ lib.optional withMediaPlayer gobject-introspection ++ lib.optional enableManpages scdoc;
propagatedBuildInputs = lib.optionals withMediaPlayer [
glib
@ -110,63 +109,66 @@ stdenv.mkDerivation (finalAttrs: {
python3.pkgs.pygobject3
];
buildInputs = [
gtk-layer-shell
gtkmm3
howard-hinnant-date
jsoncpp
libsigcxx
libxkbcommon
spdlog
wayland
]
++ lib.optionals cavaSupport [
SDL2
alsa-lib
fftw
iniparser
ncurses
portaudio
]
++ lib.optional evdevSupport libevdev
++ lib.optional hyprlandSupport hyprland
++ lib.optional inputSupport libinput
++ lib.optional jackSupport libjack2
++ lib.optional mpdSupport libmpdclient
++ lib.optional mprisSupport playerctl
++ lib.optional nlSupport libnl
++ lib.optional pulseSupport libpulseaudio
++ lib.optional sndioSupport sndio
++ lib.optional swaySupport sway
++ lib.optional traySupport libdbusmenu-gtk3
++ lib.optional udevSupport udev
++ lib.optional upowerSupport upower
++ lib.optional wireplumberSupport wireplumber
++ lib.optional (cavaSupport || pipewireSupport) pipewire
++ lib.optional (!stdenv.isLinux) libinotify-kqueue;
buildInputs =
[
gtk-layer-shell
gtkmm3
howard-hinnant-date
jsoncpp
libsigcxx
libxkbcommon
spdlog
wayland
]
++ lib.optionals cavaSupport [
SDL2
alsa-lib
fftw
iniparser
ncurses
portaudio
]
++ lib.optional evdevSupport libevdev
++ lib.optional hyprlandSupport hyprland
++ lib.optional inputSupport libinput
++ lib.optional jackSupport libjack2
++ lib.optional mpdSupport libmpdclient
++ lib.optional mprisSupport playerctl
++ lib.optional nlSupport libnl
++ lib.optional pulseSupport libpulseaudio
++ lib.optional sndioSupport sndio
++ lib.optional swaySupport sway
++ lib.optional traySupport libdbusmenu-gtk3
++ lib.optional udevSupport udev
++ lib.optional upowerSupport upower
++ lib.optional wireplumberSupport wireplumber
++ lib.optional (cavaSupport || pipewireSupport) pipewire
++ lib.optional (!stdenv.isLinux) libinotify-kqueue;
nativeCheckInputs = [ catch2_3 ];
doCheck = runTests;
mesonFlags = (lib.mapAttrsToList lib.mesonEnable {
"cava" = cavaSupport;
"dbusmenu-gtk" = traySupport;
"jack" = jackSupport;
"libinput" = inputSupport;
"libnl" = nlSupport;
"libudev" = udevSupport;
"man-pages" = enableManpages;
"mpd" = mpdSupport;
"mpris" = mprisSupport;
"pipewire" = pipewireSupport;
"pulseaudio" = pulseSupport;
"rfkill" = rfkillSupport;
"sndio" = sndioSupport;
"systemd" = false;
"tests" = runTests;
"upower_glib" = upowerSupport;
"wireplumber" = wireplumberSupport;
}) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true);
mesonFlags =
(lib.mapAttrsToList lib.mesonEnable {
"cava" = cavaSupport;
"dbusmenu-gtk" = traySupport;
"jack" = jackSupport;
"libinput" = inputSupport;
"libnl" = nlSupport;
"libudev" = udevSupport;
"man-pages" = enableManpages;
"mpd" = mpdSupport;
"mpris" = mprisSupport;
"pipewire" = pipewireSupport;
"pulseaudio" = pulseSupport;
"rfkill" = rfkillSupport;
"sndio" = sndioSupport;
"systemd" = false;
"tests" = runTests;
"upower_glib" = upowerSupport;
"wireplumber" = wireplumberSupport;
})
++ lib.optional experimentalPatches (lib.mesonBool "experimental" true);
postPatch = ''
substituteInPlace include/util/command.hpp \

0
pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/add-extension.patch → pkgs/by-name/we/webcord-vencord/add-extension.patch
View File

19
pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix → pkgs/by-name/we/webcord-vencord/package.nix
View File

@ -1,9 +1,11 @@
{ webcord
, substituteAll
, lib
, vencord-web-extension
{
webcord,
substituteAll,
lib,
vencord-web-extension,
}:
# nixpkgs-update: no auto update
webcord.overrideAttrs (old: {
pname = "webcord-vencord";
@ -14,8 +16,13 @@ webcord.overrideAttrs (old: {
})
];
meta = with lib; old.meta // {
meta = {
inherit (old.meta) license mainProgram platforms;
description = "Webcord with Vencord web extension";
maintainers = with maintainers; [ FlafyDev NotAShelf ];
maintainers = with lib.maintainers; [
FlafyDev
NotAShelf
];
};
})

60
pkgs/applications/networking/instant-messengers/webcord/default.nix → pkgs/by-name/we/webcord/package.nix
View File

@ -1,12 +1,12 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, copyDesktopItems
, python3
, xdg-utils
, electron_29
, makeDesktopItem
, nix-update-script
{
lib,
buildNpmPackage,
fetchFromGitHub,
copyDesktopItems,
python3,
xdg-utils,
electron,
makeDesktopItem,
}:
buildNpmPackage rec {
@ -16,7 +16,7 @@ buildNpmPackage rec {
src = fetchFromGitHub {
owner = "SpacingBat3";
repo = "WebCord";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-x9Ejb8yxgQhlEfUUfoqbgSffNNtOoFeAyb3OISR+Jz4=";
};
@ -41,25 +41,25 @@ buildNpmPackage rec {
let
binPath = lib.makeBinPath [ xdg-utils ];
in
''
runHook preInstall
''
runHook preInstall
# Remove dev deps that aren't necessary for running the app
npm prune --omit=dev
# Remove dev deps that aren't necessary for running the app
npm prune --omit=dev
mkdir -p $out/lib/node_modules/webcord
cp -r app node_modules sources package.json $out/lib/node_modules/webcord/
mkdir -p $out/lib/node_modules/webcord
cp -r app node_modules sources package.json $out/lib/node_modules/webcord/
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
# Add xdg-utils to path via suffix, per PR #181171
makeWrapper '${lib.getExe electron_29}' $out/bin/webcord \
--suffix PATH : "${binPath}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags $out/lib/node_modules/webcord/
# Add xdg-utils to path via suffix, per PR #181171
makeWrapper '${lib.getExe electron}' $out/bin/webcord \
--suffix PATH : "${binPath}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags $out/lib/node_modules/webcord/
runHook postInstall
'';
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
@ -68,11 +68,14 @@ buildNpmPackage rec {
icon = "webcord";
desktopName = "WebCord";
comment = meta.description;
categories = [ "Network" "InstantMessaging" ];
categories = [
"Network"
"InstantMessaging"
];
})
];
passthru.updateScript = nix-update-script { };
passthru.updateScript = ./update.sh;
meta = {
description = "A Discord and SpaceBar electron-based client implemented without Discord API";
@ -81,7 +84,10 @@ buildNpmPackage rec {
changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}";
license = lib.licenses.mit;
mainProgram = "webcord";
maintainers = with lib.maintainers; [ eclairevoyant huantian ];
maintainers = with lib.maintainers; [
eclairevoyant
huantian
];
platforms = lib.platforms.linux;
};
}

15
pkgs/by-name/we/webcord/update.sh Executable file
View File

@ -0,0 +1,15 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p curl jq nix-update
set -ex
curl_github() {
curl -L ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@"
}
latestTag=$(curl_github https://api.github.com/repos/SpacingBat3/Webcord/releases/latest | jq -r ".tag_name")
latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
nix-update --version "$latestVersion" webcord
electronVersion=$(curl_github "https://raw.githubusercontent.com/SpacingBat3/WebCord/v$latestVersion/package.json" | jq -r ".devDependencies.electron" | sed -r 's|^\^([0-9]+).*|\1|')
sed -r "/webcord = / s|(electron_)[0-9]+|\1$electronVersion|" -i pkgs/top-level/all-packages.nix

36
pkgs/by-name/wi/windows10-icons/package.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "windows10-icons";
version = "1.0";
src = fetchFromGitHub {
owner = "B00merang-Artwork";
repo = "Windows-10";
rev = "${finalAttrs.version}";
hash = "sha256-Yz6a7FcgPfzz4w8cKp8oq7/usIBUUZV7qhVmDewmzrI=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons/windows10
find . \
! -path ./README.md \
-mindepth 1 -maxdepth 1 \
-exec cp -r {} $out/share/icons/windows10 \;
runHook postInstall
'';
dontConfigure = true;
dontBuild = true;
meta = with lib; {
description = "Windows 10 icon theme";
homepage = "http://b00merang.weebly.com/windows-10.html";
license = licenses.unfree;
maintainers = with maintainers; [ mib ];
platforms = platforms.linux;
};
})

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