Merge branch 'staging-next' into staging

; Conflicts:
;	pkgs/development/libraries/nss/generic.nix

- bb53634671 removed the conditionals since firefox-esr-91 and nss <3.69 has been dropped a while ago.
- cb3762857d updated the conditionals to always partition the tests based on the nss_latest version. Chosen that since it will remain future proof.
This commit is contained in:
Jan Tojnar 2023-07-05 02:22:26 +02:00
commit 2819e547d3
96 changed files with 9911 additions and 847 deletions

View File

@ -34,10 +34,6 @@ jobs:
pairs:
- from: master
into: haskell-updates
- from: release-22.11
into: staging-next-22.11
- from: staging-next-22.11
into: staging-22.11
- from: release-23.05
into: staging-next-23.05
- from: staging-next-23.05

View File

@ -168,7 +168,7 @@ rec {
mkKeyValue ? mkKeyValueDefault {} "=",
# allow lists as values for duplicate keys
listsAsDuplicateKeys ? false
}: { globalSection, sections }:
}: { globalSection, sections ? {} }:
( if globalSection == {}
then ""
else (toKeyValue { inherit mkKeyValue listsAsDuplicateKeys; } globalSection)

View File

@ -3,8 +3,15 @@
rec {
# gcc.arch to its features (as in /proc/cpuinfo)
features = {
# x86_64 Generic
# Spec: https://gitlab.com/x86-psABIs/x86-64-ABI/
default = [ ];
x86-64 = [ ];
x86-64-v2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ];
x86-64-v3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "avx" "avx2" "fma" ];
x86-64-v4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "avx" "avx2" "avx512" "fma" ];
# x86_64 Intel
nehalem = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" ];
westmere = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" ];
sandybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
ivybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ];
@ -41,22 +48,32 @@ rec {
# a superior CPU has all the features of an inferior and is able to build and test code for it
inferiors = {
# x86_64 Generic
default = [ ];
x86-64 = [ ];
x86-64-v2 = [ "x86-64" ];
x86-64-v3 = [ "x86-64-v2" ] ++ inferiors.x86-64-v2;
x86-64-v4 = [ "x86-64-v3" ] ++ inferiors.x86-64-v3;
# x86_64 Intel
# https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
default = [ ];
westmere = [ ];
sandybridge = [ "westmere" ] ++ inferiors.westmere;
ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge;
haswell = [ "ivybridge" ] ++ inferiors.ivybridge;
broadwell = [ "haswell" ] ++ inferiors.haswell;
skylake = [ "broadwell" ] ++ inferiors.broadwell;
skylake-avx512 = [ "skylake" ] ++ inferiors.skylake;
nehalem = [ "x86-64-v2" ] ++ inferiors.x86-64-v2;
westmere = [ "nehalem" ] ++ inferiors.nehalem;
sandybridge = [ "westmere" ] ++ inferiors.westmere;
ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge;
haswell = lib.unique ([ "ivybridge" "x86-64-v3" ] ++ inferiors.ivybridge ++ inferiors.x86-64-v3);
broadwell = [ "haswell" ] ++ inferiors.haswell;
skylake = [ "broadwell" ] ++ inferiors.broadwell;
skylake-avx512 = lib.unique ([ "skylake" "x86-64-v4" ] ++ inferiors.skylake ++ inferiors.x86-64-v4);
cannonlake = [ "skylake-avx512" ] ++ inferiors.skylake-avx512;
icelake-client = [ "cannonlake" ] ++ inferiors.cannonlake;
icelake-server = [ "icelake-client" ] ++ inferiors.icelake-client;
cascadelake = [ "skylake-avx512" ] ++ inferiors.cannonlake;
cascadelake = [ "cannonlake" ] ++ inferiors.cannonlake;
cooperlake = [ "cascadelake" ] ++ inferiors.cascadelake;
tigerlake = [ "icelake-server" ] ++ inferiors.icelake-server;
# CX16 does not exist on alderlake, while it does on nearly all other intel CPUs
alderlake = [ ];
@ -87,10 +104,10 @@ rec {
# https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
# https://en.wikichip.org/wiki/amd/microarchitectures/zen
# https://en.wikichip.org/wiki/intel/microarchitectures/skylake
znver1 = [ "skylake" ] ++ inferiors.skylake;
znver1 = [ "skylake" ] ++ inferiors.skylake; # Includes haswell and x86-64-v3
znver2 = [ "znver1" ] ++ inferiors.znver1;
znver3 = [ "znver2" ] ++ inferiors.znver2;
znver4 = [ "znver3" ] ++ inferiors.znver3;
znver4 = lib.unique ([ "znver3" "x86-64-v4" ] ++ inferiors.znver3 ++ inferiors.x86-64-v4);
# other
armv5te = [ ];

View File

@ -179,7 +179,7 @@ rec {
they take effect as soon as the oldest release reaches end of life. */
oldestSupportedRelease =
# Update on master only. Do not backport.
2211;
2305;
/* Whether a feature is supported in all supported releases (at the time of
release branch-off, if applicable). See `oldestSupportedRelease`. */

View File

@ -3770,6 +3770,12 @@
githubId = 49904992;
name = "Dawid Sowa";
};
dbalan = {
email = "nix@dbalan.in";
github = "dbalan";
githubId = 223910;
name = "Dhananjay Balan";
};
dbeckwith = {
email = "djbsnx@gmail.com";
github = "dbeckwith";
@ -7435,6 +7441,12 @@
githubId = 8685505;
name = "Jen-Chieh Shen";
};
jcspeegs = {
email = "justin@speegs.com";
github = "jcspeegs";
githubId = 34928409;
name = "Justin Speegle";
};
jcumming = {
email = "jack@mudshark.org";
github = "jcumming";
@ -14696,6 +14708,13 @@
githubId = 1286668;
name = "Thilo Uttendorfer";
};
sents = {
email = "finn@krein.moe";
github = "sents";
githubId = 26575793;
matrix = "@sents:matrix.org";
name = "Finn Krein";
};
sephalon = {
email = "me@sephalon.net";
github = "sephalon";

View File

@ -64,6 +64,8 @@
- `spamassassin` no longer supports the `Hashcash` module. The module needs to be removed from the `loadplugin` list if it was copied over from the default `initPreConf` option.
- The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely.
## Other Notable Changes {#sec-release-23.11-notable-changes}
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
@ -84,6 +86,10 @@
- `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets.
- The module [services.ankisyncd](#opt-services.ankisyncd.package) has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs) from the old python version, which was difficult to update, had not been updated in a while, and did not support recent versions of anki.
Unfortunately all servers supporting new clients (newer version of anki-sync-server, anki's built in sync server and this new rust package) do not support the older sync protocol that was used in the old server, so such old clients will also need updating and in particular the anki package in nixpkgs is also being updated in this release.
The module update takes care of the new config syntax and the data itself (user login and cards) are compatible, so users of the module will be able to just log in again after updating both client and server without any extra action.
- `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts.<name>.listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details.
- `services.prometheus.exporters` has a new exporter to monitor electrical power consumption based on PowercapRAPL sensor called [Scaphandre](https://github.com/hubblo-org/scaphandre), see [#239803](https://github.com/NixOS/nixpkgs/pull/239803) for more details.

View File

@ -9,22 +9,16 @@ let
stateDir = "/var/lib/${name}";
authDbPath = "${stateDir}/auth.db";
toml = pkgs.formats.toml {};
sessionDbPath = "${stateDir}/session.db";
configFile = pkgs.writeText "ankisyncd.conf" (lib.generators.toINI {} {
sync_app = {
configFile = toml.generate "ankisyncd.conf" {
listen = {
host = cfg.host;
port = cfg.port;
data_root = stateDir;
auth_db_path = authDbPath;
session_db_path = sessionDbPath;
base_url = "/sync/";
base_media_url = "/msync/";
};
});
paths.root_dir = stateDir;
# encryption.ssl_enable / cert_file / key_file
};
in
{
options.services.ankisyncd = {
@ -59,8 +53,6 @@ in
config = mkIf cfg.enable {
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
environment.etc."ankisyncd/ankisyncd.conf".source = configFile;
systemd.services.ankisyncd = {
description = "ankisyncd - Anki sync server";
after = [ "network.target" ];
@ -71,7 +63,7 @@ in
Type = "simple";
DynamicUser = true;
StateDirectory = name;
ExecStart = "${cfg.package}/bin/ankisyncd";
ExecStart = "${cfg.package}/bin/ankisyncd --config ${configFile}";
Restart = "always";
};
};

View File

@ -1644,6 +1644,7 @@ in {
nodejs
procps
gnupg
gzip
];
serviceConfig = {
Type = "notify";

View File

@ -41,6 +41,10 @@ let
in
"${if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile}/Caddyfile";
etcConfigFile = "caddy/caddy_config";
configPath = "/etc/${etcConfigFile}";
acmeHosts = unique (catAttrs "useACMEHost" acmeVHosts);
mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix;
@ -155,11 +159,16 @@ in
description = lib.mdDoc ''
Override the configuration file used by Caddy. By default,
NixOS generates one automatically.
The configuration file is exposed at {file}`${configPath}`.
'';
};
adapter = mkOption {
default = null;
default = if (builtins.baseNameOf cfg.configFile) == "Caddyfile" then "caddyfile" else null;
defaultText = literalExpression ''
if (builtins.baseNameOf cfg.configFile) == "Caddyfile" then "caddyfile" else null
'';
example = literalExpression "nginx";
type = with types; nullOr str;
description = lib.mdDoc ''
@ -275,6 +284,21 @@ in
'';
};
enableReload = mkOption {
default = true;
type = types.bool;
description = lib.mdDoc ''
Reload Caddy instead of restarting it when configuration file changes.
Note that enabling this option requires the [admin API](https://caddyserver.com/docs/caddyfile/options#admin)
to not be turned off.
If you enable this option, consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period)
to a non-infinite value in {option}`services.caddy.globalConfig`
to prevent Caddy waiting for active connections to finish,
which could delay the reload essentially indefinitely.
'';
};
};
# implementation
@ -311,13 +335,16 @@ in
wantedBy = [ "multi-user.target" ];
startLimitIntervalSec = 14400;
startLimitBurst = 10;
reloadTriggers = optional cfg.enableReload cfg.configFile;
serviceConfig = {
serviceConfig = let
runOptions = ''--config ${configPath} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"}'';
in {
# 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 --config ${cfg.configFile} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"} ${optionalString cfg.resume "--resume"}'' ];
ExecReload = [ "" ''${cfg.package}/bin/caddy reload --config ${cfg.configFile} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"} --force'' ];
ExecStartPre = ''${cfg.package}/bin/caddy validate --config ${cfg.configFile} ${optionalString (cfg.adapter != null) "--adapter ${cfg.adapter}"}'';
ExecStart = [ "" ''${cfg.package}/bin/caddy run ${runOptions} ${optionalString cfg.resume "--resume"}'' ];
# Validating the configuration before applying it ensures well get a proper error that will be reported when switching to the configuration
ExecReload = [ "" ''${cfg.package}/bin/caddy reload ${runOptions} --force'' ];
User = cfg.user;
Group = cfg.group;
ReadWriteDirectories = cfg.dataDir;
@ -353,5 +380,6 @@ in
in
listToAttrs certCfg;
environment.etc.${etcConfigFile}.source = cfg.configFile;
};
}

View File

@ -725,7 +725,7 @@ in
systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
systemd.services.display-manager =
{ description = "X11 Server";
{ description = "Display Manager";
after = [ "acpid.service" "systemd-logind.service" "systemd-user-sessions.service" ];

View File

@ -267,6 +267,7 @@ in {
firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; };
firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job
firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; };
firefox-esr-115 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-115; };
firejail = handleTest ./firejail.nix {};
firewall = handleTest ./firewall.nix { nftables = false; };
firewall-nftables = handleTest ./firewall.nix { nftables = true; };

View File

@ -20,6 +20,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
}
}
'';
services.caddy.enableReload = true;
specialisation.etag.configuration = {
services.caddy.extraConfig = lib.mkForce ''
@ -54,9 +55,9 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = { nodes, ... }:
let
etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etag";
justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/config-reload";
multipleConfigs = "${nodes.webserver.config.system.build.toplevel}/specialisation/multiple-configs";
etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etag";
justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/config-reload";
multipleConfigs = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-configs";
in
''
url = "http://localhost/example.html"
@ -96,6 +97,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"${justReloadSystem}/bin/switch-to-configuration test >&2"
)
webserver.wait_for_open_port(8080)
webserver.fail("journalctl -u caddy | grep -q -i stopped")
webserver.succeed("journalctl -u caddy | grep -q -i reloaded")
with subtest("multiple configs are correctly merged"):
webserver.succeed(

View File

@ -39,13 +39,13 @@
stdenv.mkDerivation rec {
pname = "sonic-pi";
version = "4.3.0";
version = "4.4.0";
src = fetchFromGitHub {
owner = "sonic-pi-net";
repo = pname;
rev = "v${version}";
hash = "sha256-R+nmjIIDLoGOoCkDvJqejE1DaweHSAV8M2RvdwN5qAQ=";
hash = "sha256-rXMCaI9zvWIXmT7ZqIArsvZmEkEEbs+5jYDYsSGeCXc=";
};
mixFodDeps = beamPackages.fetchMixDeps {
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
pname = "mix-deps-${pname}";
mixEnv = "test";
src = "${src}/app/server/beam/tau";
hash = "sha256-MvwUyVTS23vQKLpGxz46tEVCs/OyYk5dDaBlv+kYg1M=";
hash = "sha256-YbYe+hljnoWFgV72OQ2YaUcnhucEtVb+TCLcMYzqUWU=";
};
strictDeps = true;

View File

@ -22,11 +22,11 @@ let
in
stdenv.mkDerivation rec {
pname = "clightning";
version = "23.05.1";
version = "23.05.2";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
sha256 = "sha256-q0ZPsuvDgXbhxebBIRkGTE7sH7K6c96Iu6RqeBT3NEk=";
sha256 = "sha256-Tj5ybVaxpk5wmOw85LkeU4pgM9NYl6SnmDG2gyXrTHw=";
};
# when building on darwin we need dawin.cctools to provide the correct libtool

View File

@ -3,10 +3,10 @@
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
"version": "2023.1.3",
"sha256": "7ea6a7d18cac5c7c89a3e1dd4d3870f74762d4c9378c31a3753fd37f50cf2832",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.3.tar.gz",
"build_number": "231.9011.31"
"version": "2023.1.4",
"sha256": "03830bd8c32eca51d2cb54aafbb74ce46003eaab9601465876c84107c0a19a23",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.4.tar.gz",
"build_number": "231.9161.40"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
@ -19,26 +19,26 @@
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "5d53853577b2679cccdd6a409d239a4bc0c1b5c612234b40dbab78d9e3d2a446",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.2.tar.gz",
"build_number": "231.9011.36"
"version": "2023.1.3",
"sha256": "7c0a19d740e3be8307a4487427347e2d5a7d4ab12ec44f1866e8c5f08e97d323",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.3.tar.gz",
"build_number": "231.9161.44"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "fab46521e7a4558a166e3b11d86ca2312a9807e69419925ed5743ab4f421ab96",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.2.tar.gz",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "32d97c9935e4825d5f395e5039033121649838a3811e25301d70f32315a2e106",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3.tar.gz",
"build_number": "231.9161.32"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "e1f16726a864f4ff9f0a48bd60a6983a664030df5e5456023d76b8fb8ac9df9d",
"url": "https://download.jetbrains.com/go/goland-2023.1.2.tar.gz",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "f456024e1b5de405ada9bd570483ffca1126edec9c81bfa02b077f81434b5719",
"url": "https://download.jetbrains.com/go/goland-2023.1.3.tar.gz",
"build_number": "231.9161.41"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@ -67,61 +67,61 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "889f531bbe5c6dda9fb4805dbbccd25d3aa4262a97f4ad14cf184db3eaf2d980",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.2.tar.gz",
"build_number": "231.9011.38",
"version": "2023.1.3",
"sha256": "c12c99b39615bd2d37eec93ed29faee2387294624eaed7fabd5c7cc8de9faf9f",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.3.tar.gz",
"build_number": "231.9161.47",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "1445b48b091469176644cb85a0a6f953783920fb1ec9a53bcbdd932ad8c947b0",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.2.tar.gz",
"build_number": "231.9011.38"
"version": "2023.1.3",
"sha256": "40682c61bf21c66dd861ee47f12b6895a36d99b9ce676b13cb5dc7e5b4bd3f46",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.3.tar.gz",
"build_number": "231.9161.41"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "e57eae7a3c99983b8dc5c5aa036579d7ac73cae33aeb4c5f7f80517f2040c385",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.2.tar.gz",
"build_number": "231.9011.38"
"version": "2023.1.3",
"sha256": "4cdf85c01854d7f74c9fa9efda67453356f1120e49cc5aed1168f0f32d8ee016",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.3.tar.gz",
"build_number": "231.9161.41"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "50eb2deb303162dc77c802c4402c2734bdae38a47ab534921e064a107dc284ae",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.2.tar.gz",
"build_number": "231.9011.39"
"version": "2023.1.3",
"sha256": "192be48828cb7515e8158cec8aa6ba4d320d3b65ebd09a921e85085143e9bd56",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3.tar.gz",
"build_number": "231.9161.46"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "f7f40e03571d485a7b6e36b98c8a3e3b534456fb351389347927a800e1b2fc74",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.2.tar.gz",
"build_number": "231.9011.41"
"version": "2023.1.3",
"sha256": "0eda257d349b9e24ade016af94a2cbca669b719f0a79d5720dfc9a54c7415901",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.3.tar.gz",
"build_number": "231.9161.40"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "934986d682857e8529588cdc6f4f125ff7e13ee0a1060fa41af2bb9d4a620444",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.2.tar.gz",
"build_number": "231.9011.35"
"version": "2023.1.3",
"sha256": "1cef18a6d80e063b520dd8e9a0cf5b27a9cb05bbfa5b680e97c54a7cb435c9c6",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.3.tar.gz",
"build_number": "231.9161.29"
}
},
"x86_64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
"version": "2023.1.3",
"sha256": "74e65171daeec11ee8e45db14fefa72f141ebe4f8f40fe5172c24aaacac1d2fd",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.3.dmg",
"build_number": "231.9011.31"
"version": "2023.1.4",
"sha256": "fdb801c7c42e87fa0db94b68192e09319583118461385e4133ce9cd01125cb41",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.4.dmg",
"build_number": "231.9161.40"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
@ -134,26 +134,26 @@
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
"version": "2023.1.2",
"sha256": "5f4375f653ce28b45e17c972ca71b8b34866e76e9a324a6cc3bd482ad4421b04",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.2.dmg",
"build_number": "231.9011.36"
"version": "2023.1.3",
"sha256": "5d57d35ea08bc3ef9519b9669771a6d36a22424298e05dc82b18df787b52c79c",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.3.dmg",
"build_number": "231.9161.44"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
"version": "2023.1.2",
"sha256": "320beadb9eb50f48eb431bcd2c88ec1c2e7e0ef2f1f2414aa3842de5930d79ff",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.2.dmg",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "18d9bcce099d9f78ff4990f93c9ffc6819d7e789f4372659a3ea3bf0f1a2f85a",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3.dmg",
"build_number": "231.9161.32"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
"version": "2023.1.2",
"sha256": "8ea923b48a6a34991902689062c96d9bd7524591dfad0e47ace937ae5762d051",
"url": "https://download.jetbrains.com/go/goland-2023.1.2.dmg",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "6f7173843e157f24001b837f4d50827bf55b629df4d82f9b95c08ec29dc2ff3b",
"url": "https://download.jetbrains.com/go/goland-2023.1.3.dmg",
"build_number": "231.9161.41"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@ -182,61 +182,61 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
"version": "2023.1.2",
"sha256": "42d4e946ff7f40a52a47f121be8a08a0fa46786f773b7cee28e51b12f2f296e6",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.2.dmg",
"build_number": "231.9011.38",
"version": "2023.1.3",
"sha256": "d181a8c9ff92f183f1ce68c1867de61b17e5a82f5b16ec472baa99f5a5f9ce83",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.3.dmg",
"build_number": "231.9161.47",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
"version": "2023.1.2",
"sha256": "7a947104f38cdb3a8e1a3466808add60a3c3d41545ae2fe84c1467dcc91973e8",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.2.dmg",
"build_number": "231.9011.38"
"version": "2023.1.3",
"sha256": "4e6ca940a47b8c5d93f6392339a0e9497f8b132bbb61d62bc5559fc62ddc9f73",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.3.dmg",
"build_number": "231.9161.41"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
"version": "2023.1.2",
"sha256": "46d8c03dd18de5a87837f3a437ae05ad7ad1ba3d61d742cef5124a30f5aa1109",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.2.dmg",
"build_number": "231.9011.38"
"version": "2023.1.3",
"sha256": "70ee1bbdb2cb214be048174bba4b0f6ba969e0f257f74fb5adee951b517adb0e",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.3.dmg",
"build_number": "231.9161.41"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
"version": "2023.1.2",
"sha256": "f784a5a9d909bf671d6680807a451c761f44cba3a0f49cfc9b74c4bca1d7c1f1",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.2.dmg",
"build_number": "231.9011.39"
"version": "2023.1.3",
"sha256": "f7727c5f1b38352ca6ce7ad5ee410152b733bb72b98416d54b7b3e627fd6f2a9",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3.dmg",
"build_number": "231.9161.46"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
"version": "2023.1.2",
"sha256": "28eb6505d37d5821507985cbd7ddd60787b7f3fa9966b3a67187938c3b7f153f",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.2.dmg",
"build_number": "231.9011.41"
"version": "2023.1.3",
"sha256": "b6a92e6451d12c618c5489e554d06e24a0967edb6ebf194cf244b9e1f23d4ca5",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.3.dmg",
"build_number": "231.9161.40"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
"version": "2023.1.2",
"sha256": "0a8dbf63ce61bd24a1037a967cc27b45d4b467a0c39c6e4625704a8fba3add71",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.2.dmg",
"build_number": "231.9011.35"
"version": "2023.1.3",
"sha256": "ac8a4edbc2d846e2ac205ebf62ad0d883df5eac812b226b1b99c4f19764df005",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.3.dmg",
"build_number": "231.9161.29"
}
},
"aarch64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
"version": "2023.1.3",
"sha256": "a167a2fe88cecf422edc32f981cd01736d154f3c284d1cd9cc85f68e0aa7e50b",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.3-aarch64.dmg",
"build_number": "231.9011.31"
"version": "2023.1.4",
"sha256": "f3aa638dbf08df9763d557c02c5408be864442af25c7e4b0dce7889a800f3a49",
"url": "https://download.jetbrains.com/cpp/CLion-2023.1.4-aarch64.dmg",
"build_number": "231.9161.40"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
@ -249,26 +249,26 @@
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "f9ef32141d044c371de6f410f8d53f8b45bc7339aea45c29bfc345d1c54d9198",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.2-aarch64.dmg",
"build_number": "231.9011.36"
"version": "2023.1.3",
"sha256": "9dde75ec9fbccc9bfe7c390fd1f46a81fb153f226da7d3ca96bdeef5e60c51e1",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.3-aarch64.dmg",
"build_number": "231.9161.44"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "338edd281715b14193834ed01947c6161865e58d1416557316c2b298401a0272",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.2-aarch64.dmg",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "3564f680ff11ac66722e970491d37d3f1faeb09354095f2086bf0bf4a0897e5b",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.3-aarch64.dmg",
"build_number": "231.9161.32"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "8674cb075b41db52b2a5f3698659b8e0480bcb9d81b4e3112bb7e5c23259200e",
"url": "https://download.jetbrains.com/go/goland-2023.1.2-aarch64.dmg",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "d0b923a44305ef3ce113cabd2a19e1f2bfd0adec0cdc0571765851206aad5160",
"url": "https://download.jetbrains.com/go/goland-2023.1.3-aarch64.dmg",
"build_number": "231.9161.41"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@ -297,51 +297,51 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "871147496e828a9f28b02a3226eca6127a7b0837f6ca872c51590696fc52f7fc",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.2-aarch64.dmg",
"build_number": "231.9011.38",
"version": "2023.1.3",
"sha256": "49ca043ee6119ae31c5f3fd12aa085f22dc0117c95bf70fca8afe29960c1a546",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.3-aarch64.dmg",
"build_number": "231.9161.47",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "d816ad095094dc5cc5b91ede9f1d41654fc90f8925b9e421f9aac0325de0e366",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.2-aarch64.dmg",
"build_number": "231.9011.38"
"version": "2023.1.3",
"sha256": "989112fe6aae4be2e84712fe1def61589865b57daf7c67d01f81e452b46de252",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.1.3-aarch64.dmg",
"build_number": "231.9161.41"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "9387e383f9d70d1b5e4e8e4b64061678c94a8329cafc9df5d342ac0f346a31fe",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.2-aarch64.dmg",
"build_number": "231.9011.38"
"version": "2023.1.3",
"sha256": "fa2403fd138dc013929ebf0a1054f8a55639666f2d4e4b14fa6f904467e74ba0",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.3-aarch64.dmg",
"build_number": "231.9161.41"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "896a70b5807683acec70e77620ccc9f1c1e1801257678de0531a5f3c1bccffb7",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.2-aarch64.dmg",
"build_number": "231.9011.39"
"version": "2023.1.3",
"sha256": "d8477d115836913063996abc43ecc531cf08b10f3fb8fc21f58d385743895337",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.3-aarch64.dmg",
"build_number": "231.9161.46"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "ecd3aeba77455d90a10b2ad4dc0939a66d8b70d1c43125fb76132c0af72bba31",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.2-aarch64.dmg",
"build_number": "231.9011.41"
"version": "2023.1.3",
"sha256": "f367b80a7bfe5ceffee0af865a9722de195823b1049df3afc2301fc6ede66878",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.3-aarch64.dmg",
"build_number": "231.9161.40"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "c72e249d38ba1fbfece680545d4714e73d73e9933cbbab8e85c0da2bab37142e",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.2-aarch64.dmg",
"build_number": "231.9011.35"
"version": "2023.1.3",
"sha256": "c5cc29db9a12515892beed79e1970e628a816f78c629045795ea16c6e5629a2b",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.3-aarch64.dmg",
"build_number": "231.9161.29"
}
}
}

View File

@ -28,13 +28,13 @@
buildDotnetModule rec {
pname = "ryujinx";
version = "1.1.942"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
version = "1.1.952"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "6e28a4dd13df0ab866e6a178086abe36ca4a2b25";
sha256 = "0890gh0907wcdzx4ci2jd75a72b3kllwavkcwz56ls0vaqymqxda";
rev = "1c7a90ef359d9974e5bd257c4d8e9bf526a6966c";
sha256 = "0yx8gw31vfvmfwmbkckgpbyyzk3kkgm0q124wf6c9i8sqiyqmpp1";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

View File

@ -58,12 +58,12 @@
}:
stdenv.mkDerivation rec {
version = "4.2.1";
version = "4.4.0";
pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
sha256 = "603a39c6074291a601f7feb16ebb453fd0c5b02a6f5d3c7ab6db612eadc97bac";
sha256 = "8887fc34abd97c4998b0888c3197e0c509d63bdeab2238906915319811f3b080";
};
nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ];

View File

@ -3,13 +3,13 @@
, kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons
, libarchive, libzip
# Archive tools
, p7zip, lrzip
, p7zip, lrzip, unar
# Unfree tools
, unfreeEnableUnrar ? false, unrar
}:
let
extraTools = [ p7zip lrzip ] ++ lib.optional unfreeEnableUnrar unrar;
extraTools = [ p7zip lrzip unar ] ++ lib.optional unfreeEnableUnrar unrar;
in
mkDerivation {

View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "nwg-dock-hyprland";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7vdfxE3X2J7bDLzose0dKmjxNQhS5+/ROky9wkK1gc0=";
sha256 = "sha256-5RPp/CZgEkQDg+xn1xQDpLOCzfgWWdTl12aE+SRRPvE=";
};
vendorHash = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q=";

View File

@ -239,14 +239,12 @@ buildStdenv.mkDerivation {
hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A=";
})
]
++ lib.optionals (lib.versionOlder version "109") [
++ lib.optionals (lib.versionOlder version "102.13") [
# cherry-pick bindgen change to fix build with clang 16
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/community/firefox-esr/bindgen.patch?id=4c4b0c01c808657fffc5b796c56108c57301b28f";
hash = "sha256-lTvgT358M4M2vedZ+A6xSKsBYhSN+McdmEeR9t75MLU=";
})
]
++ lib.optionals (lib.versionOlder version "111") [
# cherry-pick mp4parse change fixing build with Rust 1.70+
# original change: https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100
# vendored to update checksums

View File

@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "114.0.2";
version = "115.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1d514d09c6b964b96c6d52d54b89a89a92d53a6fe669e16a6370346c980db4d0ac6c502fa89219c71b680566b9eb982e9b3191c21f81d7326f34f6c837c0a872";
sha512 = "ed5d150e4dfdc01026beb3ae502a0b04321dd130084fdef63afce79a8a7a4898741d08f77716ba720c24f31b9c732c00ad0f1cd408b35b5eb6601a10014fb1a2";
};
meta = {
@ -85,11 +85,11 @@
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
version = "102.12.0esr";
version = "102.13.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "2a85cf1e1c83a862c2886a63dcf3e3e8bca9dd3ed72c5d0223db52387fff3796bc0dcbb508adb8c10a30729f20554c5aac37f8ad045b0088a593d28e39d77fe5";
sha512 = "745f4a77e4c898313f11118274d27513f4baa16bb42d5b71d9bd0dbe8957dbf39a5f7ae8442cd711aca9b597bc909c04b44cb8d9094c57aa34e285e64f834fde";
};
meta = {
@ -110,4 +110,32 @@
versionSuffix = "esr";
};
};
firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115";
version = "115.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "377ab48989ec17b64bd06fed8dd80dde50c06dd4120a6ca1c2fe90a20c85d1c0ef6143a73daeb0271fb20a04b0fb53d837e116b56c63718d517b07ed4243a3e9";
};
meta = {
changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
description = "A web browser built from Firefox Extended Support Release source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
maintainers = with lib.maintainers; [ hexa ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
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.
license = lib.licenses.mpl20;
};
tests = [ nixosTests.firefox-esr-115 ];
updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-115-unwrapped";
versionPrefix = "115";
versionSuffix = "esr";
};
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubecm";
version = "0.23.0";
version = "0.24.1";
src = fetchFromGitHub {
owner = "sunny0826";
repo = "kubecm";
rev = "v${version}";
hash = "sha256-BywtQ6YVGPz5A0GE2q0zRoBZNU6HZgVbr6H0OMR05wM=";
hash = "sha256-njib9gfCay3DYRUBvc6Hi6khtzqU/Qit1/jBfISY3gI=";
};
vendorHash = "sha256-WZxjv4v2nfJjbzFfaDh2kE7ZBREB+Q8BmHhUrAiDd7g=";
vendorHash = "sha256-MIb4vJh2r5T3oJAtpoTd/yT3r+BXfxv0qxfRPcNMDko=";
ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
doCheck = false;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,67 @@
{ lib
, stdenv
, darwin
, fetchFromGitHub
, libxkbcommon
, openssl
, pkg-config
, rustPlatform
, vulkan-loader
, wayland
, xorg
}:
rustPlatform.buildRustPackage rec {
pname = "halloy";
version = "23.1-alpha1";
src = fetchFromGitHub {
owner = "squidowl";
repo = "halloy";
rev = "refs/tags/${version}";
hash = "sha256-Aq+mKctmc1RwpnUEIi+Zmr4o8n6wgQchGCunPWouLsE=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"cosmic-text-0.8.0" = "sha256-p8PtXcFH+T3z6wWPFYbHFkxrkJpK4oHJ1aJvq4zld/4=";
"glyphon-0.2.0" = "sha256-7h5W82zPMw9PVZiF5HCo7HyRiVhGR8MsfgGuIjo+Kfg=";
"iced-0.9.0" = "sha256-KEBm62lDjSKXvXZssLoBfUYDSW+OpTXutxsKZMz8SE0=";
"irc-0.15.0" = "sha256-ZlwfyX4tmQr9D+blY4jWl85bwJ2tXUYp3ryLqoungII=";
"winit-0.28.6" = "sha256-szB1LCOPmPqhZNIWbeO8JMfRMcMRr0+Ze0f4uqyR8AE=";
};
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libxkbcommon
openssl
vulkan-loader
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.CoreGraphics
darwin.apple_sdk.frameworks.Foundation
darwin.apple_sdk.frameworks.Metal
darwin.apple_sdk.frameworks.QuartzCore
darwin.apple_sdk.frameworks.Security
] ++ lib.optionals stdenv.isLinux [
wayland
];
meta = with lib; {
description = "IRC application";
homepage = "https://github.com/squidowl/halloy";
changelog = "https://github.com/squidowl/halloy/blob/${version}/CHANGELOG.md";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "iroh";
version = "0.4.1";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
sha256 = "bNuTEsbOx7ERH/TigLKVOV6eUF+5C2w3PDH9KkfajBo=";
};
cargoSha256 = "WgpX8hz19mnmDmqErSuNDUiFUpr7/K46g4ylhvDIqVw=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [
Security
SystemConfiguration
]
);
# Some tests require network access which is not available in nix build sandbox.
doCheck = false;
meta = with lib; {
description = "Efficient IPFS for the whole world right now";
homepage = "https://iroh.computer";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ cameronfyfe ];
};
}

View File

@ -64,15 +64,28 @@ let
systemd
];
in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
version = "2023.4";
selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
platform = selectSystem {
x86_64-linux = "amd64";
aarch64-linux = "arm64";
};
hash = selectSystem {
x86_64-linux = "sha256-7NoifrX1/3pUJHTYK+2dVos/oFsKiYwyhCGi07SsEhM=";
aarch64-linux = "sha256-e0lp+SpBUmtYBcJPvql8ALeCkVtneZ1Cd3IFMVX6R2Q=";
};
in
stdenv.mkDerivation {
pname = "mullvad-vpn";
inherit version;
src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
sha256 = "sha256-7NoifrX1/3pUJHTYK+2dVos/oFsKiYwyhCGi07SsEhM=";
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_${platform}.deb";
inherit hash;
};
nativeBuildInputs = [
@ -114,13 +127,15 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = ./update.sh;
meta = with lib; {
homepage = "https://github.com/mullvad/mullvadvpn-app";
description = "Client for Mullvad VPN";
changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.gpl3Only;
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ Br1ght0ne ymarkus ataraxiasjel ];
};

View File

@ -0,0 +1,36 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused gawk jq nix-prefetch
set -euo pipefail
ROOT="$(dirname "$(readlink -f "$0")")"
NIX_DRV="$ROOT/default.nix"
if [ ! -f "$NIX_DRV" ]; then
echo "ERROR: cannot find default.nix in $ROOT"
exit 1
fi
fetch_arch() {
VER="$1"; ARCH="$2"
URL="https://github.com/mullvad/mullvadvpn-app/releases/download/${VER}/MullvadVPN-${VER}_${ARCH}.deb"
nix-prefetch "{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
pname = \"mullvad-vpn\"; version = \"${VER}\";
src = fetchurl { url = \"$URL\"; };
}
"
}
replace_sha() {
sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV"
}
MULLVAD_VER=$(curl -s https://api.mullvad.net/app/v1/releases/linux/2022.5 | jq -r '.latest_stable')
MULLVAD_LINUX_X64_SHA256=$(fetch_arch "$MULLVAD_VER" "amd64")
MULLVAD_LINUX_AARCH64_SHA256=$(fetch_arch "$MULLVAD_VER" "arm64")
sed -i "s/version = \".*\"/version = \"$MULLVAD_VER\"/" "$NIX_DRV"
replace_sha "x86_64-linux" "$MULLVAD_LINUX_X64_SHA256"
replace_sha "aarch64-linux" "$MULLVAD_LINUX_AARCH64_SHA256"

View File

@ -0,0 +1,81 @@
{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat
, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm
, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango
, udev, }:
let
libPath = lib.makeLibraryPath [
alsa-lib
atk
cairo
cups
dbus
expat
gdk-pixbuf
glib
gtk3
libX11
libXcomposite
libXdamage
libXext
libXfixes
libXi
libXrandr
libdrm
libxcb
libxkbcommon
libxshmfence
mesa
nspr
nss
pango
stdenv.cc.cc
libXScrnSaver
libXcursor
libXrender
libXtst
libpulseaudio
udev
];
in stdenv.mkDerivation rec {
pname = "roam-research";
version = "0.0.18";
src = fetchurl {
url =
"https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb";
sha256 = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ=";
};
nativeBuildInputs = [ dpkg ];
unpackPhase = ''
mkdir pkg
dpkg-deb -x $src pkg
sourceRoot=pkg
'';
installPhase = ''
mkdir -p "$out/bin"
mv opt "$out/"
ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research"
mv usr/* "$out/"
substituteInPlace $out/share/applications/roam-research.desktop \
--replace "/opt/Roam Research/roam-research" "roam-research"
'';
dontPatchELF = true;
meta = with lib; {
description = "A note-taking tool for networked thought.";
homepage = "https://roamresearch.com/";
maintainers = with lib.maintainers; [ dbalan ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
};
}

View File

@ -11,13 +11,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "autodock-vina";
version = "1.2.3";
version = "1.2.5";
src = fetchFromGitHub {
owner = "ccsb-scripps";
repo = "autodock-vina";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-oOpwhRmpS5WfnuqxkjxGsGtrofPxUt8bH9ggzm5rrR8=";
hash = "sha256-yguUMEX0tn75wKrPKyqlCYbBFaEwC5b1s3k9xept1Fw=";
};
sourceRoot =

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "git-codereview";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "golang";
repo = "review";
rev = "v${version}";
sha256 = "sha256-vh2XFzvGEMutlaHKNhpuYdlnNl49zoNPkLYNUA1lWwc=";
hash = "sha256-GZ1qdFjWhEO1fd+G5qWaV7OTUaalBZFbLTrIO58hKOQ=";
};
vendorSha256 = null;
vendorHash = null;
ldflags = [ "-s" "-w" ];

View File

@ -106,7 +106,12 @@ let
isGccArchSupported = arch:
if targetPlatform.isPower then false else # powerpc does not allow -march=
if isGNU then
{ # Intel
{ # Generic
x86-64-v2 = versionAtLeast ccVersion "11.0";
x86-64-v3 = versionAtLeast ccVersion "11.0";
x86-64-v4 = versionAtLeast ccVersion "11.0";
# Intel
skylake = versionAtLeast ccVersion "6.0";
skylake-avx512 = versionAtLeast ccVersion "6.0";
cannonlake = versionAtLeast ccVersion "8.0";
@ -117,6 +122,7 @@ let
tigerlake = versionAtLeast ccVersion "10.0";
knm = versionAtLeast ccVersion "8.0";
alderlake = versionAtLeast ccVersion "12.0";
# AMD
znver1 = versionAtLeast ccVersion "6.0";
znver2 = versionAtLeast ccVersion "9.0";
@ -124,12 +130,18 @@ let
znver4 = versionAtLeast ccVersion "13.0";
}.${arch} or true
else if isClang then
{ # Intel
{ #Generic
x86-64-v2 = versionAtLeast ccVersion "12.0";
x86-64-v3 = versionAtLeast ccVersion "12.0";
x86-64-v4 = versionAtLeast ccVersion "12.0";
# Intel
cannonlake = versionAtLeast ccVersion "5.0";
icelake-client = versionAtLeast ccVersion "7.0";
icelake-server = versionAtLeast ccVersion "7.0";
knm = versionAtLeast ccVersion "7.0";
alderlake = versionAtLeast ccVersion "16.0";
# AMD
znver1 = versionAtLeast ccVersion "4.0";
znver2 = versionAtLeast ccVersion "9.0";

View File

@ -0,0 +1,61 @@
{ lib
, stdenv
, fetchFromGitHub
, qtgraphicaleffects
, themeConfig ? { }
}:
let
customToString = x: if builtins.isBool x then lib.boolToString x else toString x;
configLines = lib.mapAttrsToList (name: value: lib.nameValuePair name value) themeConfig;
configureTheme = "cp theme.conf theme.conf.orig \n" +
(lib.concatMapStringsSep "\n"
(configLine:
"grep -q '^${configLine.name}=' theme.conf || echo '${configLine.name}=' >> \"$1\"\n" +
"sed -i -e 's/^${configLine.name}=.*$/${configLine.name}=${
lib.escape [ "/" "&" "\\"] (customToString configLine.value)
}/' theme.conf"
)
configLines);
in
stdenv.mkDerivation {
pname = "sddm-chili-theme";
version = "0.1.5";
src = fetchFromGitHub {
owner = "MarianArlt";
repo = "sddm-chili";
rev = "6516d50176c3b34df29003726ef9708813d06271";
sha256 = "036fxsa7m8ymmp3p40z671z163y6fcsa9a641lrxdrw225ssq5f3";
};
propagatedBuildInputs = [
qtgraphicaleffects
];
dontWrapQtApps = true;
preInstall = configureTheme;
postInstall = ''
mkdir -p $out/share/sddm/themes/chili
mv * $out/share/sddm/themes/chili/
'';
postFixup = ''
mkdir -p $out/nix-support
echo ${qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages
'';
meta = with lib; {
license = licenses.gpl3;
maintainers = with lib.maintainers; [ sents ];
homepage = "https://github.com/MarianArlt/sddm-chili";
description = "The chili login theme for SDDM";
longDescription = ''
Chili is hot, just like a real chili!
Spice up the login experience for your users, your family and yourself.
Chili reduces all the clutter and leaves you with a clean, easy to use, login interface with a modern yet classy touch.
'';
};
}

View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
bin = "source/macos/fasmg";
asm = "source/macos/fasmg.asm";
};
}.${system} or (throw "Unsopported system: ${system}");
}.${system} or (throw "Unsupported system: ${system}");
in ''
chmod +x ${path.bin}

View File

@ -1,7 +1,6 @@
{ lib
, rustPlatform
, fetchCrate
, fetchpatch
, stdenv
, darwin
}:
@ -17,18 +16,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-RQnyVRHWrqnKcI3Jy593jDTydG1nGyrScsqSNyJTDJk=";
patches = [
# see https://github.com/higherorderco/hvm/pull/220
# this commit removes the feature to fix build with rust nightly
# but this feature is required with rust stable
(fetchpatch {
name = "revert-fix-remove-feature-automic-mut-ptr.patch";
url = "https://github.com/higherorderco/hvm/commit/c0e35c79b4e31c266ad33beadc397c428e4090ee.patch";
hash = "sha256-9xxu7NOtz3Tuzf5F0Mi4rw45Xnyh7h9hbTrzq4yfslg=";
revert = true;
})
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.IOKit
];

View File

@ -3,7 +3,6 @@
, fetchCrate
, stdenv
, darwin
, fetchpatch
}:
rustPlatform.buildRustPackage rec {
@ -21,33 +20,6 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk_11_0.frameworks.Security
];
postPatch =
let
hvmPatch = fetchpatch {
name = "revert-fix-remove-feature-automic-mut-ptr.patch";
url = "https://github.com/higherorderco/hvm/commit/c0e35c79b4e31c266ad33beadc397c428e4090ee.patch";
hash = "sha256-9xxu7NOtz3Tuzf5F0Mi4rw45Xnyh7h9hbTrzq4yfslg=";
revert = true;
};
in
''
pushd $cargoDepsCopy/hvm
oldLibHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
oldMainHash=$(sha256sum src/main.rs | cut -d " " -f 1)
patch -p1 < ${hvmPatch}
newLibHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
newMainHash=$(sha256sum src/main.rs | cut -d " " -f 1)
substituteInPlace .cargo-checksum.json \
--replace "$oldLibHash" "$newLibHash" \
--replace "$oldMainHash" "$newMainHash"
popd
'';
# requires nightly features
RUSTC_BOOTSTRAP = true;

View File

@ -225,7 +225,7 @@ stdenv.mkDerivation (rec {
meta = with lib; {
homepage = "https://www.perl.org/";
description = "The standard implementation of the Perl 5 programmming language";
description = "The standard implementation of the Perl 5 programming language";
license = licenses.artistic1;
maintainers = [ maintainers.eelco ];
platforms = platforms.all;

View File

@ -1,4 +1,4 @@
import ./common.nix {
version = "102.12.0";
hash = "sha512-KoXPHhyDqGLCiGpj3PPj6Lyp3T7XLF0CI9tSOH//N5a8Dcu1CK24wQowcp8gVUxarDf4rQRbAIilk9KOOdd/5Q==";
version = "102.13.0";
hash = "sha512-dF9Kd+TImDE/ERGCdNJ1E/S6oWu0LVtx2b0NvolX2/OaX3roRCzXEayptZe8kJwEtEy42QlMV6o04oXmT4NP3g==";
}

View File

@ -0,0 +1,50 @@
{ lib
, buildGoModule
, fetchFromGitHub
, testers
, wazero
}:
buildGoModule rec {
pname = "wazero";
version = "1.2.1";
src = fetchFromGitHub {
owner = "tetratelabs";
repo = "wazero";
rev = "v${version}";
hash = "sha256-u9VsSV+pdyBnAmT910SOL1I8tpDCYAWFTfWkWTNWQVs=";
};
vendorHash = null;
subPackages = [
"cmd/wazero"
];
ldflags = [
"-s"
"-w"
"-X=github.com/tetratelabs/wazero/internal/version.version=${version}"
];
checkFlags = [
# fails when version is specified
"-skip=TestCompile|TestRun"
];
passthru.tests = {
version = testers.testVersion {
package = wazero;
command = "wazero version";
};
};
meta = with lib; {
description = "A zero dependency WebAssembly runtime for Go developers";
homepage = "https://github.com/tetratelabs/wazero";
changelog = "https://github.com/tetratelabs/wazero/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
};
}

View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.tests = {
inherit (nixosTests) firefox firefox-esr-91 firefox-esr-102;
inherit (nixosTests) firefox firefox-esr-102 firefox-esr-115;
};
meta = with lib; {

View File

@ -16,6 +16,7 @@
# https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6
enableFIPS ? false
, nixosTests
, nss_latest
}:
let
@ -180,8 +181,10 @@ stdenv.mkDerivation rec {
passthru.updateScript = ./update.sh;
passthru.tests = {
inherit (nixosTests) firefox firefox-esr-102;
passthru.tests = lib.optionalAttrs (lib.versionOlder version nss_latest.version) {
inherit (nixosTests) firefox-esr-102;
} // lib.optionalAttrs (lib.versionAtLeast version nss_latest.version) {
inherit (nixosTests) firefox firefox-esr-115;
};
meta = with lib; {

View File

@ -9,14 +9,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sexp";
version = "0.8.6";
pname = "sexpp";
version = "0.8.7";
src = fetchFromGitHub {
owner = "rnpgp";
repo = "sexp";
repo = "sexpp";
rev = "v${finalAttrs.version}";
hash = "sha256-NpDSoBxEM8g/SugLmT8E5+YZPDFIGHa4eXLjdzQxaiw=";
hash = "sha256-E1ESN3JKCWYBt1o37d7EVcgARnwGKS6mxua+0m1RMlM=";
};
buildInputs = [ zlib bzip2 ];

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, mock
, parameterized
, pyelftools
@ -12,7 +11,7 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.28.0";
version = "1.34.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,22 +20,13 @@ buildPythonPackage rec {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "refs/tags/v${version}";
hash = "sha256-JSN51zwIh9N/Id3fhBXjmwGa2tLK/LoyPlHPl2rbVU4=";
hash = "sha256-MjX0im9GX0mdWkumUoJUIBjPZl/Ok5+sR6Dgq6vVGKM=";
};
propagatedBuildInputs = [
six
];
patches = [
# This patch can be removed once https://github.com/aws/aws-lambda-builders/pull/475 has been merged.
(fetchpatch {
name = "setuptools-66-support";
url = "https://patch-diff.githubusercontent.com/raw/aws/aws-lambda-builders/pull/475.patch";
sha256 = "sha256-EkYQ6DNzbSnvkOads0GFwpGzeuBoLVU42THlSZNOHMc=";
})
];
nativeCheckInputs = [
mock
parameterized

View File

@ -24,7 +24,7 @@ buildPythonPackage rec {
'';
meta = with lib; {
description = "Click params for commmand line interfaces to GeoJSON";
description = "Click params for command line interfaces to GeoJSON";
homepage = "https://github.com/mapbox/cligj";
license = licenses.bsd3;
maintainers = with maintainers; [ knedlsepp ];

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "django-simple-captcha";
version = "0.5.17";
version = "0.5.18";
src = fetchPypi {
inherit pname version;
hash = "sha256-lknmbatOce+sv+8C9IuDuRaEiYNSoatW8Whs5xAzsyg=";
hash = "sha256-bh/MT0AF99ae56Llmn6GO105GPNqhaTYEUmJhK7MSM4=";
};
nativeCheckInputs = [

View File

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyheck
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dotwiz";
version = "0.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "rnag";
repo = "dotwiz";
rev = "refs/tags/v${version}";
hash = "sha256-ABmkwpJ40JceNJieW5bhg0gqWNrR6Wxj84nLCjKU11A=";
};
propagatedBuildInputs = [
pyheck
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dotwiz"
];
pytestFlagsArray = [
"--ignore=benchmarks"
"--ignore-glob=*integration*"
];
meta = with lib; {
description = "Dict subclass that supports dot access notation";
homepage = "https://github.com/rnag/dotwiz";
changelog = "https://github.com/rnag/dotwiz/blob/v${version}/HISTORY.rst";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
# build-system
, cython
, setuptools
# tests
, numpy
, unittestCheckHook
}:
buildPythonPackage rec {
pname = "faster-fifo";
version = "1.4.5";
format = "pyproject";
src = fetchFromGitHub {
owner = "alex-petrenko";
repo = "faster-fifo";
rev = "v${version}";
hash = "sha256-35kD+RWXwUXHG5leTVj4wY6hJAjDka69YczgSTIbCeg=";
};
nativeBuildInputs = [
cython
setuptools
];
pythonImportsCheck = [
"faster_fifo"
];
nativeCheckInputs = [
numpy
unittestCheckHook
];
meta = with lib; {
description = "Faster alternative to Python's multiprocessing.Queue (IPC FIFO queue";
homepage = "https://github.com/alex-petrenko/faster-fifo";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "hcloud";
version = "1.23.1";
version = "1.24.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-rIaGcAMZZRd4BeLYmHAtfCCY6b5a+HDu5GO87/wNLkU=";
hash = "sha256-VqC9ckhVW4ypLnF2aKCN8yDAkflaXu7MlS5hZChWJdw=";
};
propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "immutabledict";
version = "2.2.4";
version = "2.2.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "corenting";
repo = "immutabledict";
rev = "v${version}";
hash = "sha256-cykTZw3p6P35rHaJmfmiXIqybc+ZeqUkxneoPot7E9Q=";
hash = "sha256-7b/iSFQ4817XmDA40cQ/iqEuUegeg8Cypl85ntux6CI=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,26 @@
{ lib, buildPythonPackage, fetchPypi, wirelesstools, cffi, pytest }:
buildPythonPackage rec {
pname = "iwlib";
version = "1.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "a805f6597a70ee3001aba8f039fb7b2dcb75dc15c4e7852f5594fd6379196da1";
};
propagatedBuildInputs = [ wirelesstools cffi ];
nativeBuildInputs = [ pytest ];
pythonImportsCheck = [ "iwlib" ];
doCheck = true;
checkInputs = [ pytest ];
checkPhase = "python iwlib/_iwlib_build.py; pytest -v";
meta = with lib; {
homepage = "https://github.com/nhoad/python-iwlib";
description = "Python interface for the Wireless Tools utility collection";
changelog = "https://github.com/nhoad/python-iwlib#change-history";
maintainers = with maintainers; [ jcspeegs ];
license = licenses.gpl2Only;
};
}

View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "nlpcloud";
version = "1.0.42";
version = "1.0.43";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-XT3aadYrdYZk8EEkUTdFtTMR1LociO0jQo/QCFcJcWw=";
hash = "sha256-WLbmPFBiZ7utFo0cqiBKsetlhtgun/YMGTEIvMUhRnc=";
};
propagatedBuildInputs = [

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "phonopy";
version = "2.19.1";
version = "2.20.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ObQuPCDjpjjz4mq831IsU0muNMlDZVoNFAX6PUCTVbU=";
hash = "sha256-peL50b1u+tBRxt/U2SloRvS9LTeMXEjrF5F3ZWhJmZ4=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,377 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "crossbeam-channel"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-deque"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
dependencies = [
"cfg-if",
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
version = "0.9.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
"memoffset",
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if",
]
[[package]]
name = "either"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "hermit-abi"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
[[package]]
name = "indoc"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
dependencies = [
"indoc-impl",
"proc-macro-hack",
]
[[package]]
name = "indoc-impl"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote",
"syn",
"unindent",
]
[[package]]
name = "instant"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
"cfg-if",
]
[[package]]
name = "libc"
version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "lock_api"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
dependencies = [
"autocfg",
"scopeguard",
]
[[package]]
name = "memoffset"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
[[package]]
name = "num_cpus"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi",
"libc",
]
[[package]]
name = "once_cell"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "parking_lot"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [
"instant",
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
dependencies = [
"cfg-if",
"instant",
"libc",
"redox_syscall",
"smallvec",
"winapi",
]
[[package]]
name = "paste"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
dependencies = [
"paste-impl",
"proc-macro-hack",
]
[[package]]
name = "paste-impl"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
dependencies = [
"proc-macro-hack",
]
[[package]]
name = "proc-macro-hack"
version = "0.5.20+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pyheck"
version = "0.1.5"
dependencies = [
"heck",
"pyo3",
"rayon",
]
[[package]]
name = "pyo3"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
dependencies = [
"cfg-if",
"indoc",
"libc",
"parking_lot",
"paste",
"pyo3-build-config",
"pyo3-macros",
"unindent",
]
[[package]]
name = "pyo3-build-config"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
dependencies = [
"once_cell",
]
[[package]]
name = "pyo3-macros"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
dependencies = [
"pyo3-macros-backend",
"quote",
"syn",
]
[[package]]
name = "pyo3-macros-backend"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
dependencies = [
"proc-macro2",
"pyo3-build-config",
"quote",
"syn",
]
[[package]]
name = "quote"
version = "1.0.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rayon"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
dependencies = [
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
"num_cpus",
]
[[package]]
name = "redox_syscall"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags",
]
[[package]]
name = "scopeguard"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "smallvec"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "unicode-ident"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
[[package]]
name = "unicode-segmentation"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "unindent"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

View File

@ -0,0 +1,57 @@
{ lib
, buildPythonPackage
, cargo
, fetchFromGitHub
, poetry-core
, pytestCheckHook
, pythonOlder
, rustc
, rustPlatform
}:
buildPythonPackage rec {
pname = "pyheck";
version = "0.1.5";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "kevinheavey";
repo = "pyheck";
rev = "refs/tags/${version}";
hash = "sha256-mfXkrCbBaJ0da+taKJvfyU5NS43tYJWqtTUXiCLVoGQ=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = [
cargo
poetry-core
rustc
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pyheck"
];
meta = with lib; {
description = "Python bindings for heck, the Rust case conversion library";
homepage = "https://github.com/kevinheavey/pyheck";
changelog = "https://github.com/kevinheavey/pyheck/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -48,7 +48,7 @@ buildPythonPackage rec {
++ lib.optional withCryptography cryptography
++ lib.optional withVoipSupport sox
++ lib.optional withPlottingSupport matplotlib
++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ];
++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-basic graphviz imagemagick ];
# Running the tests seems too complicated:
doCheck = false;

View File

@ -9,15 +9,16 @@
buildPythonPackage rec {
pname = "shellingham";
version = "1.5.0.post1";
version = "1.5.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "sarugaku";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-nAXI1GxSpmmpJuatPYUeAClA88B9c/buPEWhq7RKvs8=";
hash = "sha256-7hMlKw9oSGp57FQmbxdAgUsm5cFRr1oTW1ymJyYsgOg=";
};
nativeBuildInputs = [
@ -29,11 +30,14 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "shellingham" ];
pythonImportsCheck = [
"shellingham"
];
meta = with lib; {
description = "Tool to detect the surrounding shell";
homepage = "https://github.com/sarugaku/shellingham";
changelog = "https://github.com/sarugaku/shellingham/blob/${version}/CHANGELOG.rst";
license = licenses.isc;
maintainers = with maintainers; [ mbode ];
};

View File

@ -58,8 +58,8 @@ buildPythonPackage rec {
disabledTests = [
"test_scripts"
] ++ lib.optionals stdenv.isDarwin [
# likely related to https://github.com/sarugaku/shellingham/issues/35
# Likely related to https://github.com/sarugaku/shellingham/issues/35
# fails also on Linux
"test_show_completion"
"test_install_completion"
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [

View File

@ -0,0 +1,48 @@
{ fetchFromGitHub
, lib
, Security
, openssl
, pkg-config
, rustPlatform
, stdenv
}:
rustPlatform.buildRustPackage rec {
pname = "dynein";
version = "0.2.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = "dynein";
rev = "v${version}";
sha256 = "sha256-QhasTFGOFOjzNKdQtA+eBhKy51O4dFt6vpeIAIOM2rQ=";
};
# Use system openssl.
OPENSSL_NO_VENDOR = 1;
cargoHash = "sha256-QyhoYgqBfK6LCdtLuo0feVCgIMPueYeA8MMGspGLbGQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [ Security ];
preBuild = ''
export OPENSSL_DIR=${lib.getDev openssl}
export OPENSSL_LIB_DIR=${lib.getLib openssl}/lib
'';
# The integration tests will start downloading docker image of DynamoDB, which
# will naturally fail for nix build. The CLI tests do not need DynamoDB.
cargoTestFlags = [ "cli_tests" ];
meta = with lib; {
description = "DynamoDB CLI written in Rust";
homepage = "https://github.com/awslabs/dynein";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ pimeys ];
};
}

View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "konstraint";
version = "0.29.1";
version = "0.30.0";
src = fetchFromGitHub {
owner = "plexsystems";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2MPCbR834wIZhIMbizuB5Twt5364BwkBjSnLEylmcA0=";
sha256 = "sha256-lO9yXIqasVYf+FHQeodS9nlqEPp+rpU/NckSMhQ5wqY=";
};
vendorHash = "sha256-DlB4PsWTjOuiJ7ZJB2LC8O9RkjqIcppTg/enD5degxw=";
vendorHash = "sha256-MWg0RHKXxkZ52MqRglBuR5P9bRDg8RKG9XRux1PjJ1g=";
# Exclude go within .github folder
excludedPackages = ".github";

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.33";
version = "0.0.34";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "v${version}";
hash = "sha256-0XJYd4mgPbbl/WbeztvJlqB9mc2DFougQi8JCJ0DMK8=";
hash = "sha256-arrhKskf3McXx8er6AyUIT1ZM3Rzwo10qTswpF+1klw=";
};
cargoHash = "sha256-5yaySCuEZ78EUbewMH/pgahUGEFfUIH2P/liUm9nd0A=";
cargoHash = "sha256-m9/cIdmDqoUCeZnP7YezgCB/i8UGTcCCWDD/Qwhzg9E=";
nativeBuildInputs = [
git

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.29.0";
version = "1.30.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-oHGs1Bx5k02k6mp9WAe8wIQ4FjMOREcUYv0DKZaXGdE=";
hash = "sha256-mDjBu25hOhm3FrUDsFq1rjBn58K91Bao8gqN2heZ9ps=";
};
vendorHash = "sha256-I2vL4uRmUbgaf3KGUHSQV2jWozStKHyjek3BQlxyY/c=";
vendorHash = "sha256-QfTWjSsWpbbGgKrv4U2E6jA6eAT4wnj0ixpUqDxtsY8=";
nativeBuildInputs = [
makeWrapper

View File

@ -2,17 +2,17 @@
let
pname = "cargo-pgrx";
version = "0.9.6";
version = "0.9.7";
in
rustPlatform.buildRustPackage rec {
inherit version pname;
src = fetchCrate {
inherit version pname;
hash = "sha256-YTDgPvfsTdHGs4iBPR5Mzk1Q5d+MGpQmXzp6QHAPfmc=";
hash = "sha256-uDBq7tUZ9f8h5nlRFR1mv4+Ty1OFtAk5P7OTNQPI1gI=";
};
cargoHash = "sha256-XdpNOXGprJRZvgm573X8NqePPfYexA/hM5Uzoo7W93c=";
cargoHash = "sha256-YTkjqMNF+cz5XtELh7+l8KwvRoVKQP7t98nkJwkW218=";
nativeBuildInputs = [ pkg-config ];

View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "1.73.0";
version = "1.75.6";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-Gl5jIMh0zH7BWFKny4cT3QpwM0/W9Bd9ycRYbNPxXAQ=";
sha256 = "sha256-kFndbCQgS9cyByPayCuN9b0+3Np76z4HhmasRfqP0cM=";
};
vendorSha256 = "sha256-6wJxAD3s5UcAqPJy6CzHe1aP097+aXHjBNG4BJ0zhmQ=";
vendorSha256 = "sha256-Z499rGTsgsYgrTtAcwwhE39wgMFCl44iEZ0feIZBc9A=";
ldflags = [
"-s"

4005
pkgs/servers/ankisyncd/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,68 +1,52 @@
{ lib
, fetchFromGitHub
, python3
}:
{ lib, runCommand, fetchFromGitHub, rustPlatform, protobuf }:
python3.pkgs.buildPythonApplication rec {
let
pname = "ankisyncd";
version = "2.2.0";
src = fetchFromGitHub {
owner = "ankicommunity";
repo = "anki-sync-server";
rev = version;
hash = "sha256-RXrdJGJ+HMSpDGQBuVPPqsh3+uwAgE6f7ZJ0yFRMI8I=";
version = "1.1.4";
# anki-sync-server-rs expects anki sources in the 'anki' folder
# of its own source tree, with a patch applied (mostly to make
# some modules public): prepare our own 'src' manually
src = runCommand "anki-sync-server-rs-src" {
src = fetchFromGitHub {
owner = "ankicommunity";
repo = "anki-sync-server-rs";
rev = version;
hash = "sha256-iL4lJJAV4SrNeRX3s0ZpJ//lrwoKjLsltlX4d2wP6O0=";
};
} ''
cp -r "$src/." "$out"
chmod +w "$out"
cp -r "${ankiSrc}" "$out/anki"
chmod -R +w "$out/anki"
patch -d "$out/anki" -Np1 < "$src/anki_patch/d9d36078f17a2b4b8b44fcb802eb274911ebabe7_anki_rslib.patch"
'';
# Note we do not use anki.src because the patch in ankisyncd's
# sources expect a fixed version, so we pin it here.
ankiSrc = fetchFromGitHub {
owner = "ankitects";
repo = "anki";
rev = "2.1.60";
hash = "sha256-hNrf6asxF7r7QK2XO150yiRjyHAYKN8OFCFYX0SAiwA=";
fetchSubmodules = true;
};
format = "other";
in rustPlatform.buildRustPackage {
inherit pname version src;
installPhase = ''
runHook preInstall
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"csv-1.1.6" = "sha256-w728ffOVkI+IfK6FbmkGhr0CjuyqgJnPB1kutMJIUYg=";
};
};
mkdir -p $out/${python3.sitePackages}
cp -r ankisyncd utils ankisyncd.conf $out/${python3.sitePackages}
cp -r anki-bundled/anki $out/${python3.sitePackages}
mkdir $out/share
cp ankisyncctl.py $out/share/
runHook postInstall
'';
fixupPhase = ''
PYTHONPATH="$PYTHONPATH:$out/${python3.sitePackages}"
makeWrapper "${python3.interpreter}" "$out/bin/ankisyncd" \
--set PYTHONPATH $PYTHONPATH \
--add-flags "-m ankisyncd"
makeWrapper "${python3.interpreter}" "$out/bin/ankisyncctl" \
--set PYTHONPATH $PYTHONPATH \
--add-flags "$out/share/ankisyncctl.py"
'';
nativeCheckInputs = with python3.pkgs; [
pytest
webtest
];
buildInputs = [ ];
propagatedBuildInputs = with python3.pkgs; [
decorator
requests
];
checkPhase = ''
# skip these tests, our files are too young:
# tests/test_web_media.py::SyncAppFunctionalMediaTest::test_sync_mediaChanges ValueError: ZIP does not support timestamps before 1980
pytest --ignore tests/test_web_media.py tests/
'';
nativeBuildInputs = [ protobuf ];
meta = with lib; {
description = "Self-hosted Anki sync server";
maintainers = with maintainers; [ matt-snider ];
homepage = "https://github.com/ankicommunity/anki-sync-server";
license = licenses.agpl3Only;
platforms = platforms.linux;
description = "Standalone unofficial anki sync server";
homepage = "https://github.com/ankicommunity/anki-sync-server-rs";
license = with licenses; [ agpl3Only ];
maintainers = with maintainers; [ martinetd ];
};
}

View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.21.341";
version = "0.21.364";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha512-VLLiLw5AQAvOhJkEqcvR4lwmk7twkkNSlh10JBIbMIGzy7uq7EI+1Yx8ahi3MYQyVGPhXRzQuds5ThEnE4cLgA==";
hash = "sha512-PILqSKjuc0XinumQ0D255zOh/S35Xe9qdBMpcUok0b0YoFt25h7kE5FSucBOOBXL9f9tXyL2RI+o/Dxb2CvyLQ==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fastly-exporter";
version = "7.5.1";
version = "7.6.0";
src = fetchFromGitHub {
owner = "peterbourgon";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eMmnPxjtEYpVHm4reJYBkJ3kkkqmAAhyZot020Stb4E=";
sha256 = "sha256-55yqt1F/jBoWHhq/Q9qOiCxg9naGrCFxGyfLseg9R/w=";
};
vendorHash = null;
vendorHash = "sha256-lEaMhJL/sKNOXx0W+QHMG4QUUE6Pc4AqulhgyCMQQNY=";
meta = with lib; {
description = "Prometheus exporter for the Fastly Real-time Analytics API";

View File

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "uptime-kuma";
version = "1.22.0";
version = "1.22.1";
src = fetchFromGitHub {
owner = "louislam";
repo = "uptime-kuma";
rev = version;
hash = "sha256-fy+r0DBiH1u9Ub7Fpgk9YuB2EdkDClk67zyxLMqMk3E=";
hash = "sha256-thLhJF6+DS4plqKWYidb1e/KW5PvPf/Gc2iH2SEooYw=";
};
npmDepsHash = "sha256-nuYwHk+pOJL1DaepVRO8kmFvjsrQ0n5z5d0fS2ayb+8=";
npmDepsHash = "sha256-CZfWsjtooxa6BJ5ieptUuYSQ7Ve/uVbdMPLEn2+WAX4=";
patches = [
# Fixes the permissions of the database being not set correctly

View File

@ -39,14 +39,14 @@ let
in
stdenv.mkDerivation rec {
version = "4.1.1";
pname = "shairport-sync";
version = "4.2";
src = fetchFromGitHub {
rev = version;
repo = "shairport-sync";
owner = "mikebrady";
hash = "sha256-EKt5mH9GmzeR4zdPDFOt26T9STpG1khVrY4DFIv5Maw=";
rev = "refs/tags/${version}";
hash = "sha256-ru2iaXSgS+w2ktqGLGC9SiYztkmmOQVzHaeLwMqvMzk=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View File

@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
passthru.tests = { inherit (nixosTests) static-web-server; };
meta = with lib; {
description = "An asynchronus web server for static files-serving";
description = "An asynchronous web server for static files-serving";
homepage = "https://static-web-server.net/";
changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit /* or */ asl20 ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "syft";
version = "0.84.0";
version = "0.84.1";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
hash = "sha256-1/8M4z/ezyyZRG+amzErOGIv2kRZ/sfx7AAB7V7aPX8=";
hash = "sha256-3BQuFEQhzX4TnPiNdbIatuvuXZVDBGQUyJ7+2d5rIRU=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -22,7 +22,7 @@ buildGoModule rec {
};
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-WDxHDf+F0QdM/kK2WrStjgzq6h4IPFdsZFbO5qpILp4=";
vendorHash = "sha256-/95AL+BlvtQkwlnbHBGx1rTU3VYHIdw1bqGxwBsLMcA=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -0,0 +1,40 @@
{ lib
, fetchFromGitHub
, nix-update-script
, python3
}:
let
pname = "whisper-ctranslate2";
version = "0.2.7";
in
python3.pkgs.buildPythonApplication {
inherit pname version;
format = "setuptools";
disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Softcatala";
repo = pname;
rev = version;
hash = "sha256-dUmQNKgH+SIlLhUEiaEGXUHZQDr3fidsAU2vATJiXBU=";
};
propagatedBuildInputs = with python3.pkgs; [
numpy
faster-whisper
ctranslate2
tqdm
sounddevice
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Whisper command line client compatible with original OpenAI client based on CTranslate2";
homepage = "https://github.com/Softcatala/whisper-ctranslate2";
changelog = "https://github.com/Softcatala/whisper-ctranslate2/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ happysalada ];
};
}

View File

@ -0,0 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "dysk";
version = "2.6.1";
src = fetchFromGitHub {
owner = "Canop";
repo = "dysk";
rev = "v${version}";
hash = "sha256-rSnj38U4Rt5Wh+3A610tTeT2Q1BVGvpMa7rpDf4YzTI=";
};
cargoHash = "sha256-or1vLbtA2tPnGJ3tYWrmaXmPCIutojBlIWMLRNpxpY4=";
meta = with lib; {
description = "Get information on your mounted disks";
homepage = "https://github.com/Canop/dysk";
changelog = "https://github.com/Canop/dysk/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda koral ];
};
}

View File

@ -1,25 +0,0 @@
{ lib
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "lfs";
version = "2.6.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+BkHE4vl1oYNR5SX2y7Goly7OwGDXRoZex6YL7Xv2QI=";
};
cargoSha256 = "sha256-njrjuLHDmcubw8lLPpS9K5la0gRIKq4OrP+MXs1Ro/o=";
meta = with lib; {
description = "Get information on your mounted disks";
homepage = "https://github.com/Canop/lfs";
license = licenses.mit;
maintainers = with maintainers; [ koral ];
};
}

View File

@ -16,14 +16,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2023.6.3";
version = "2023.6.4";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-QI4Vt9JXKdvfCARwvPLaecP7vd157SL7ZJJ91HargV0=";
hash = "sha256-kiqEpNhtxEgwzAfJDaxHqN9lN+0BFEPhs3WMJoac5z0=";
};
postPatch = ''

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tgpt";
version = "1.6.11";
version = "1.6.12";
src = fetchFromGitHub {
owner = "aandrew-me";
repo = "tgpt";
rev = "refs/tags/v${version}";
hash = "sha256-WcHPryzdFFS8eXaLPtwRd3xZwZ/x+MfwsA8wO2tRSYI=";
hash = "sha256-+D8elnJEDiHhInVHxFNTEfq9DewuuIc4e+gX4kIv7E0=";
};
vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM=";

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wayshot";
version = "1.2.2";
version = "1.3.0";
src = fetchFromGitHub {
owner = "waycrate";
repo = pname;
rev = version;
hash = "sha256-/uZ98ICdPTilUD3vBEbJ4AxGWY1xIbkK6O+bkhqIUKA=";
hash = "sha256-WN1qlV6vpIn0uNiE+rXeQTMscNYqkgFytVBc6gJzvyU=";
};
cargoHash = "sha256-j/gSrXY5n/zW3IogHewyrupTKtEm5EtOzfOzglyTP9A=";
cargoHash = "sha256-Hfgr+wWC5zUdHhFMwOBt57h2r94OpdJ1MQpckhYgKQQ=";
meta = with lib; {
description = "A native, blazing-fast screenshot tool for wlroots based compositors such as sway and river";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.50.2";
version = "0.51.0";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-phMR6c18tWYZeJVOHqixfH9Kz1zZDndsUD/dF/xQ8kM=";
sha256 = "sha256-82RBNMCcEe2gB1Ygbm1S6UgMPUQ+Lm37zc1JM3Ca/gg=";
};
vendorHash = null;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "frp";
version = "0.49.0";
version = "0.50.0";
src = fetchFromGitHub {
owner = "fatedier";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6bBLgMh9Hf+UWYcF6oypK62VmeZwXsP7wz5PizeiRcc=";
sha256 = "sha256-QEVrABDFdHd7DdKLs/mOEmOPvNjHLBFjgdMVi3ooNv0=";
};
vendorHash = "sha256-zQMm3qOBDJuL4w/BDGKH3DbfAFn0pwuvjltYnuxxvzk=";

View File

@ -18,7 +18,7 @@
, nixosTests
#
# By default unbound will not be built with systemd support. Unbound is a very
# commmon dependency. The transitive dependency closure of systemd also
# common dependency. The transitive dependency closure of systemd also
# contains unbound.
# Since most (all?) (lib)unbound users outside of the unbound daemon usage do
# not need the systemd integration it is likely best to just default to no

View File

@ -1,28 +1,35 @@
{ lib
, fetchFromGitHub
, python3
, buildPythonApplication
, poetry-core
, httpx
, rich
, typer
, packaging
}:
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
name = "pacup";
version = "1.1.0";
version = "2.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "pacstall";
repo = name;
rev = version;
hash = "sha256-Hl/Gq/cZz4RGYKTuyDlrhATAUYEzKEuYIm0JdToN/ZY=";
rev = "refs/tags/${version}";
hash = "sha256-ItO38QyxNHftKPQZAPO7596ddBfX0a1nfVVqgx7BfwI=";
};
nativeBuildInputs = with python3; [ poetry-core ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'httpx = ">=0.24,<0.25"' 'httpx = "*"'
'';
propagatedBuildInputs = with python3; [ httpx rich typer packaging ];
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
httpx
rich
typer
packaging
];
meta = with lib; {
description = "Help maintainers update pacscripts";
@ -31,6 +38,7 @@ buildPythonApplication rec {
It semi-automates the tedious task of updating pacscripts, and aims to make it a fun process for the maintainer!
'';
homepage = "https://github.com/pacstall/pacup";
changelog = "https://github.com/pacstall/pacup/releases/tag/${version}";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ zahrun ];
};

View File

@ -0,0 +1,50 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "deepsecrets";
version = "1.0.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "avito-tech";
repo = "deepsecrets";
rev = "refs/tags/v${version}";
hash = "sha256-VfIsPgStHcIYGbfrOs1mvgoq0ZoVSZwILFVBeMt/5Jc=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'pyyaml = "^5.4.1"' 'pyyaml = "*"' \
--replace 'regex = "^2023.3.23"' 'regex = "*"' \
--replace 'mmh3 = "^3.0.0"' 'mmh3 = "*"'
'';
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
dotwiz
mmh3
ordered-set
pydantic
pygments
pyyaml
regex
];
pythonImportsCheck = [
"deepsecrets"
];
meta = with lib; {
description = "Secrets scanner that understands code";
homepage = "https://github.com/avito-tech/deepsecrets";
changelog = "https://github.com/avito-tech/deepsecrets/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "doppler";
version = "3.62.0";
version = "3.63.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
sha256 = "sha256-Li/eDD5v4b+DHlScZIIrwvlu8KgHQadwxDrS9P4wVP0=";
sha256 = "sha256-7M/ZdeaiOWJEXEhZ0Sj8oxvMgo0mgSNmpUBWm9qxafA=";
};
vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE=";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hcxdumptool";
version = "6.3.0";
version = "6.3.1";
src = fetchFromGitHub {
owner = "ZerBea";
repo = "hcxdumptool";
rev = version;
sha256 = "sha256-29AG5vzWgVOzJvlx1TiYA/veXaQvOwfHa8QYq+qMnq0=";
sha256 = "sha256-FWBr0uDpefu2MCWQZrMfPJ/MUJcmk9fWMzhtTDmC0L0=";
};
buildInputs = [ openssl ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hcxtools";
version = "6.3.0";
version = "6.3.1";
src = fetchFromGitHub {
owner = "ZerBea";
repo = pname;
rev = version;
sha256 = "sha256-p1G+Kxh0OfTRDTSBl2NxhRrQYsehGuCxmGU87CBjyW0=";
sha256 = "sha256-EDTxzstQwQy7MSkdi1nQis8qEm8ZPblkeOkM8B48IRE=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -10,7 +10,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-0rviTlnsI4BfWDJMgbkma44xauDhlZB2d15uel4/Y3M=";
};

View File

@ -10,7 +10,7 @@
, json_c
, pkg-config
, python3
, sexp
, sexpp
, zlib
}:
@ -25,9 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-4fB7Sl9+ATrJTRnhbNG5BoW3XLxR7IP167RK96+gxj0=";
};
buildInputs = [ zlib bzip2 json_c botan2 sexp ];
buildInputs = [ zlib bzip2 json_c botan2 sexpp ];
patches = [ ./unbundle-sexp.patch ];
patches = [
./unbundle-sexpp.patch
./sexp_sexpp_rename.patch
];
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"

View File

@ -0,0 +1,50 @@
diff --git i/src/lib/CMakeLists.txt w/src/lib/CMakeLists.txt
index 086ac57d..2ce59ca1 100755
--- i/src/lib/CMakeLists.txt
+++ w/src/lib/CMakeLists.txt
@@ -328,7 +328,7 @@ elseif (CRYPTO_BACKEND_OPENSSL)
target_link_libraries(librnp-obj PRIVATE OpenSSL::Crypto)
endif()
-target_link_libraries(librnp-obj PRIVATE sexp)
+target_link_libraries(librnp-obj PRIVATE sexpp)
set_target_properties(librnp-obj PROPERTIES CXX_VISIBILITY_PRESET hidden)
if (TARGET BZip2::BZip2)
@@ -384,7 +384,7 @@ foreach (prop LINK_LIBRARIES INTERFACE_LINK_LIBRARIES INCLUDE_DIRECTORIES INTERF
get_target_property(val librnp-obj ${prop})
if (BUILD_SHARED_LIBS)
set_property(TARGET librnp-static PROPERTY ${prop} ${val})
- list(REMOVE_ITEM val "$<LINK_ONLY:sexp>")
+ list(REMOVE_ITEM val "$<LINK_ONLY:sexpp>")
set_property(TARGET librnp PROPERTY ${prop} ${val})
else()
set_property(TARGET librnp PROPERTY ${prop} ${val})
diff --git i/src/librekey/g23_sexp.hpp w/src/librekey/g23_sexp.hpp
index b888680f..b062c52f 100644
--- i/src/librekey/g23_sexp.hpp
+++ w/src/librekey/g23_sexp.hpp
@@ -27,8 +27,8 @@
#ifndef RNP_G23_SEXP_HPP
#define RNP_G23_SEXP_HPP
-#include "sexp/sexp.h"
-#include "sexp/ext-key-format.h"
+#include "sexpp/sexp.h"
+#include "sexpp/ext-key-format.h"
#define SXP_MAX_DEPTH 30
diff --git i/src/tests/CMakeLists.txt w/src/tests/CMakeLists.txt
index 7d2a6b0c..88aeaf9f 100644
--- i/src/tests/CMakeLists.txt
+++ w/src/tests/CMakeLists.txt
@@ -176,7 +176,7 @@ target_link_libraries(rnp_tests
PRIVATE
librnp-static
JSON-C::JSON-C
- sexp
+ sexpp
${GTestMain}
)
if (CRYPTO_BACKEND_LOWERCASE STREQUAL "openssl")

View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Enables common unix utlities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines";
description = "Enables common unix utilities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines";
homepage = "https://github.com/dbro/csvquote";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gucci";
version = "1.6.6";
version = "1.6.10";
src = fetchFromGitHub {
owner = "noqcks";
repo = "gucci";
rev = "refs/tags/${version}";
sha256 = "sha256-0ZVRjzU/KTqhaQC6zubbcNp1jX2pgFSGyyIYcWaHzeU=";
sha256 = "sha256-bwPQQtaPHby96C5ZHZhBTok+m8GPPS40U1CUPVYqCa4=";
};
vendorHash = "sha256-/4OnbtxxhXQnmSV6UbjgzXdL7szhL9rKiG5BR8FsyqI=";

View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-katex";
version = "0.5.3";
version = "0.5.4";
src = fetchCrate {
inherit pname version;
hash = "sha256-QfimccchYkOfGxYXZQ4iR3tGDfyj3ZhvWCuVteLncpE=";
hash = "sha256-PbnoTqVgo3qypnC1GT4pmvAmYbWV0F+FvEiaL3D9MmE=";
};
cargoHash = "sha256-bER9N9qkoxmIaM4nZNJe8UarMFb+WeHIjJqL/EH/C/U=";
cargoHash = "sha256-H+yb6h3ipXZwD96GxI8Ep0PMxkd7EfAyVZvi25/U3YA=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "kanshi";
version = "1.3.1";
version = "1.4.0";
src = fetchFromSourcehut {
owner = "~emersion";
repo = "kanshi";
rev = "v${version}";
sha256 = "sha256-eGcgqj214fcfOrKqrAsxLG9LiNlAsWu0sgjxBB01u6Q=";
sha256 = "sha256-5dIBQBA3OMlmaSYswwggFuedsb3i4uy9bcTZahIS2gQ=";
};
strictDeps = true;

View File

@ -843,6 +843,7 @@ mapAliases ({
lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01
latinmodern-math = lmmath;
letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22
lfs = dysk; # Added 2023-07-03
libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22
libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22
libayatana-indicator-gtk2 = throw "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18
@ -1543,6 +1544,7 @@ mapAliases ({
sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11
session-desktop-appimage = session-desktop;
sequoia = sequoia-sq; # Added 2023-06-26
sexp = sexpp; # Added 2023-07-03
sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26
shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22
inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17

View File

@ -240,9 +240,7 @@ with pkgs;
anders = callPackage ../applications/science/logic/anders { };
ankisyncd = callPackage ../servers/ankisyncd {
python3 = python39;
};
ankisyncd = callPackage ../servers/ankisyncd { };
ariang = callPackage ../servers/ariang { };
@ -561,6 +559,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
dynein = callPackage ../development/tools/database/dynein {
inherit (darwin.apple_sdk.frameworks) Security;
};
ea = callPackage ../tools/misc/ea { };
each = callPackage ../tools/text/each { };
@ -935,7 +937,7 @@ with pkgs;
pacproxy = callPackage ../tools/networking/pacproxy { };
pacup = python3Packages.callPackage ../tools/package-management/pacup { };
pacup = callPackage ../tools/package-management/pacup { };
perseus-cli = callPackage ../development/tools/perseus-cli {
inherit (darwin.apple_sdk.frameworks) CoreServices;
@ -1597,6 +1599,8 @@ with pkgs;
dwarfs = callPackage ../tools/filesystems/dwarfs { };
dysk = callPackage ../tools/filesystems/dysk { };
etlegacy = callPackage ../games/etlegacy { lua = lua5_4; };
fscan = callPackage ../tools/security/fscan { };
@ -8416,6 +8420,8 @@ with pkgs;
halftone = callPackage ../applications/graphics/halftone { };
halloy = callPackage ../applications/networking/irc/halloy { };
harminv = callPackage ../development/libraries/science/chemistry/harminv { };
igrep = callPackage ../tools/text/igrep {
@ -9034,6 +9040,8 @@ with pkgs;
irker = callPackage ../servers/irker { };
iroh = callPackage ../applications/networking/iroh { };
ised = callPackage ../tools/misc/ised { };
isl = isl_0_20;
@ -9456,8 +9464,6 @@ with pkgs;
ffmpeg = ffmpeg-full;
};
lfs = callPackage ../tools/filesystems/lfs { };
linuxwave = callPackage ../tools/audio/linuxwave { };
littlefs-fuse = callPackage ../tools/filesystems/littlefs-fuse { };
@ -12228,6 +12234,8 @@ with pkgs;
rnv = callPackage ../tools/text/xml/rnv { };
roam-research = callPackage ../applications/office/roam-research { };
rosie = callPackage ../tools/text/rosie { };
rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { };
@ -12514,7 +12522,7 @@ with pkgs;
sewer = callPackage ../tools/admin/sewer { };
sexp = callPackage ../development/libraries/sexp { };
sexpp = callPackage ../development/libraries/sexpp { };
sfeed = callPackage ../tools/misc/sfeed { };
@ -17059,6 +17067,8 @@ with pkgs;
vyper = with python3Packages; toPythonApplication vyper;
wazero = callPackage ../development/interpreters/wazero { };
wcc = callPackage ../development/compilers/wcc { };
wla-dx = callPackage ../development/compilers/wla-dx { };
@ -28058,6 +28068,8 @@ with pkgs;
schedtool = callPackage ../os-specific/linux/schedtool { };
sddm-chili-theme = libsForQt5.callPackage ../data/themes/chili-sddm { };
sdparm = callPackage ../os-specific/linux/sdparm { };
sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { };
@ -31203,6 +31215,7 @@ with pkgs;
firefox-beta-unwrapped = firefoxPackages.firefox-beta;
firefox-devedition-unwrapped = firefoxPackages.firefox-devedition;
firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102;
firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115;
firefox-esr-unwrapped = firefoxPackages.firefox-esr-102;
firefox = wrapFirefox firefox-unwrapped { };
@ -31213,6 +31226,7 @@ with pkgs;
firefox-esr = firefox-esr-102;
firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { };
firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { };
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
inherit (gnome) adwaita-icon-theme;
@ -35634,6 +35648,8 @@ with pkgs;
whispers = with python3Packages; toPythonApplication whispers;
whisper-ctranslate2 = callPackage ../tools/audio/whisper-ctranslate2 { };
waon = callPackage ../applications/audio/waon { };
warp = callPackage ../applications/networking/warp { };
@ -38164,6 +38180,10 @@ with pkgs;
deepsea = callPackage ../tools/security/deepsea { };
deepsecrets = callPackage ../tools/security/deepsecrets {
python3 = python311;
};
deeptools = callPackage ../applications/science/biology/deeptools { python = python3; };
deep-translator = with python3Packages; toPythonApplication deep-translator;

View File

@ -3031,6 +3031,8 @@ self: super: with self; {
inherit (pkgs) graphviz;
};
dotwiz = callPackage ../development/python-modules/dotwiz { };
dotmap = callPackage ../development/python-modules/dotmap { };
downloader-cli = callPackage ../development/python-modules/downloader-cli { };
@ -3538,6 +3540,8 @@ self: super: with self; {
fastentrypoints = callPackage ../development/python-modules/fastentrypoints { };
faster-fifo = callPackage ../development/python-modules/faster-fifo { };
faster-whisper = callPackage ../development/python-modules/faster-whisper { };
fastimport = callPackage ../development/python-modules/fastimport { };
@ -5141,6 +5145,8 @@ self: super: with self; {
itypes = callPackage ../development/python-modules/itypes { };
iwlib = callPackage ../development/python-modules/iwlib { };
j2cli = callPackage ../development/python-modules/j2cli { };
jaconv = callPackage ../development/python-modules/jaconv { };
@ -7843,6 +7849,8 @@ self: super: with self; {
pygti = callPackage ../development/python-modules/pygti { };
pyheck = callPackage ../development/python-modules/pyheck { };
pyheos = callPackage ../development/python-modules/pyheos { };
pyhiveapi = callPackage ../development/python-modules/pyhiveapi { };