b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-06-22 00:13:26 +00:00 committed by GitHub
parent 35e763373d 3fb3ce0b6b
commit 0312d8f750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
188 changed files with 5339 additions and 4104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
lib/path/default.nix
View file

@ -7,6 +7,7 @@ let
isPath
split
match
typeOf
;
inherit (lib.lists)
@ -18,6 +19,7 @@ let
all
concatMap
foldl'
take
;
inherit (lib.strings)
@ -100,6 +102,22 @@ let
# An empty string is not a valid relative path, so we need to return a `.` when we have no components
(if components == [] then "." else concatStringsSep "/" components);
# Type: Path -> { root :: Path, components :: [ String ] }
#
# Deconstruct a path value type into:
# - root: The filesystem root of the path, generally `/`
# - components: All the path's components
#
# This is similar to `splitString "/" (toString path)` but safer
# because it can distinguish different filesystem roots
deconstructPath =
let
recurse = components: base:
# If the parent of a path is the path itself, then it's a filesystem root
if base == dirOf base then { root = base; inherit components; }
else recurse ([ (baseNameOf base) ] ++ components) (dirOf base);
in recurse [];
in /* No rec! Add dependencies on this file at the top. */ {
/* Append a subpath string to a path.
@ -108,6 +126,12 @@ in /* No rec! Add dependencies on this file at the top. */ {
More specifically, it checks that the first argument is a [path value type](https://nixos.org/manual/nix/stable/language/values.html#type-path"),
and that the second argument is a valid subpath string (see `lib.path.subpath.isValid`).
Laws:
- Not influenced by subpath normalisation
append p s == append p (subpath.normalise s)
Type:
append :: Path -> String -> Path
@ -149,6 +173,51 @@ in /* No rec! Add dependencies on this file at the top. */ {
${subpathInvalidReason subpath}'';
path + ("/" + subpath);
/*
Whether the first path is a component-wise prefix of the second path.
Laws:
- `hasPrefix p q` is only true if `q == append p s` for some subpath `s`.
- `hasPrefix` is a [non-strict partial order](https://en.wikipedia.org/wiki/Partially_ordered_set#Non-strict_partial_order) over the set of all path values
Type:
hasPrefix :: Path -> Path -> Bool
Example:
hasPrefix /foo /foo/bar
=> true
hasPrefix /foo /foo
=> true
hasPrefix /foo/bar /foo
=> false
hasPrefix /. /foo
=> true
*/
hasPrefix =
path1:
assert assertMsg
(isPath path1)
"lib.path.hasPrefix: First argument is of type ${typeOf path1}, but a path was expected";
let
path1Deconstructed = deconstructPath path1;
in
path2:
assert assertMsg
(isPath path2)
"lib.path.hasPrefix: Second argument is of type ${typeOf path2}, but a path was expected";
let
path2Deconstructed = deconstructPath path2;
in
assert assertMsg
(path1Deconstructed.root == path2Deconstructed.root) ''
lib.path.hasPrefix: Filesystem roots must be the same for both paths, but paths with different roots were given:
first argument: "${toString path1}" with root "${toString path1Deconstructed.root}"
second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"'';
take (length path1Deconstructed.components) path2Deconstructed.components == path1Deconstructed.components;
/* Whether a value is a valid subpath string.
- The value is a string

19
lib/path/tests/unit.nix
View file

@ -3,7 +3,7 @@
{ libpath }:
let
lib = import libpath;
inherit (lib.path) append subpath;
inherit (lib.path) hasPrefix append subpath;
cases = lib.runTests {
# Test examples from the lib.path.append documentation
@ -40,6 +40,23 @@ let
expected = false;
};
testHasPrefixExample1 = {
expr = hasPrefix /foo /foo/bar;
expected = true;
};
testHasPrefixExample2 = {
expr = hasPrefix /foo /foo;
expected = true;
};
testHasPrefixExample3 = {
expr = hasPrefix /foo/bar /foo;
expected = false;
};
testHasPrefixExample4 = {
expr = hasPrefix /. /foo;
expected = true;
};
# Test examples from the lib.path.subpath.isValid documentation
testSubpathIsValidExample1 = {
expr = subpath.isValid null;

3
lib/strings.nix
View file

@ -264,7 +264,8 @@ rec {
lib.strings.hasPrefix: The first argument (${toString pref}) is a path value, but only strings are supported.
There is almost certainly a bug in the calling code, since this function always returns `false` in such a case.
This function also copies the path to the Nix store, which may not be what you want.
This behavior is deprecated and will throw an error in the future.''
This behavior is deprecated and will throw an error in the future.
You might want to use `lib.path.hasPrefix` instead, which correctly supports paths.''
(substring 0 (stringLength pref) str == pref);
/* Determine whether a string has given suffix.

46
maintainers/maintainer-list.nix
View file

@ -1794,6 +1794,16 @@
fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE";
}];
};
bastaynav = {
name = "Ivan Bastrakov";
email = "bastaynav@proton.me";
matrix = "@bastaynav:matrix.org";
github = "bastaynav";
githubId = 6987136;
keys = [{
fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940";
}];
};
basvandijk = {
email = "v.dijk.bas@gmail.com";
github = "basvandijk";
@ -4466,6 +4476,15 @@
githubId = 1516017;
name = "Ed Cragg";
};
eddsteel = {
email = "edd@eddsteel.com";
github = "eddsteel";
githubId = 206872;
name = "Edd Steel";
keys = [{
fingerprint = "1BE8 48D7 6C7C 4C51 349D DDCC 3362 0159 D403 85A0";
}];
};
edef = {
email = "edef@edef.eu";
github = "edef1c";
@ -5825,15 +5844,6 @@
githubId = 3217744;
name = "Peter Ferenczy";
};
ggwpaiushtha = {
name = "Ivan";
email = "ggwpaiushtha@gmail.com";
github = "GGwpAiushtha";
githubId = 6987136;
keys = [{
fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940";
}];
};
ghostbuster91 = {
name = "Kasper Kondzielski";
email = "kghost0@gmail.com";
@ -5933,6 +5943,15 @@
githubId = 25820499;
name = "Roman Kretschmer";
};
gobidev = {
email = "adrian.groh@t-online.de";
github = "Gobidev";
githubId = 50576978;
name = "Adrian Groh";
keys = [{
fingerprint = "62BD BF30 83E9 7076 9665 B60B 3AA3 153E 98B0 D771";
}];
};
goertzenator = {
email = "daniel.goertzen@gmail.com";
github = "goertzenator";
@ -10679,6 +10698,15 @@
githubId = 1776903;
name = "Andrew Abbott";
};
Misaka13514 = {
name = "Misaka13514";
email = "Misaka13514@gmail.com";
matrix = "@misaka13514:matrix.org";
github = "Misaka13514";
githubId = 54669781;
keys =
[{ fingerprint = "293B 93D8 A471 059F 85D7 16A6 5BA9 2099 D9BE 2DAA"; }];
};
mislavzanic = {
email = "mislavzanic3@gmail.com";
github = "mislavzanic";

2
nixos/doc/manual/configuration/gpu-accel.chapter.md
View file

@ -189,7 +189,7 @@ Older Intel GPUs use the i965 driver, which can be installed with:
```nix
hardware.opengl.extraPackages = [
vaapiIntel
intel-vaapi-driver
];
```

8
nixos/modules/hardware/opengl.nix
View file

@ -87,13 +87,13 @@ in
extraPackages = mkOption {
type = types.listOf types.package;
default = [];
example = literalExpression "with pkgs; [ intel-media-driver intel-ocl vaapiIntel ]";
example = literalExpression "with pkgs; [ intel-media-driver intel-ocl intel-vaapi-driver ]";
description = lib.mdDoc ''
Additional packages to add to OpenGL drivers.
This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc.
::: {.note}
intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver.
intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained intel-vaapi-driver driver.
:::
'';
};
@ -101,13 +101,13 @@ in
extraPackages32 = mkOption {
type = types.listOf types.package;
default = [];
example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver vaapiIntel ]";
example = literalExpression "with pkgs.pkgsi686Linux; [ intel-media-driver intel-vaapi-driver ]";
description = lib.mdDoc ''
Additional packages to add to 32-bit OpenGL drivers on 64-bit systems.
Used when {option}`driSupport32Bit` is set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc.
::: {.note}
intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained vaapiIntel driver.
intel-media-driver supports hardware Broadwell (2014) or newer. Older hardware should use the mostly unmaintained intel-vaapi-driver driver.
:::
'';
};

2
nixos/modules/module-list.nix
View file

@ -625,7 +625,6 @@
./services/misc/etcd.nix
./services/misc/etebase-server.nix
./services/misc/etesync-dav.nix
./services/misc/exhibitor.nix
./services/misc/felix.nix
./services/misc/freeswitch.nix
./services/misc/fstrim.nix
@ -754,6 +753,7 @@
./services/monitoring/munin.nix
./services/monitoring/nagios.nix
./services/monitoring/netdata.nix
./services/monitoring/opentelemetry-collector.nix
./services/monitoring/parsedmarc.nix
./services/monitoring/prometheus/alertmanager-irc-relay.nix
./services/monitoring/prometheus/alertmanager.nix

1
nixos/modules/rename.nix
View file

@ -55,6 +55,7 @@ in
(mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
(mkRemovedOptionModule [ "services" "exhibitor" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.")
(mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed")

417
nixos/modules/services/misc/exhibitor.nix
View file

@ -1,417 +0,0 @@
{ config, lib, options, pkgs, ... }:
with lib;
let
cfg = config.services.exhibitor;
opt = options.services.exhibitor;
exhibitorConfig = ''
zookeeper-install-directory=${cfg.baseDir}/zookeeper
zookeeper-data-directory=${cfg.zkDataDir}
zookeeper-log-directory=${cfg.zkLogDir}
zoo-cfg-extra=${cfg.zkExtraCfg}
client-port=${toString cfg.zkClientPort}
connect-port=${toString cfg.zkConnectPort}
election-port=${toString cfg.zkElectionPort}
cleanup-period-ms=${toString cfg.zkCleanupPeriod}
servers-spec=${concatStringsSep "," cfg.zkServersSpec}
auto-manage-instances=${toString cfg.autoManageInstances}
${cfg.extraConf}
'';
# NB: toString rather than lib.boolToString on cfg.autoManageInstances is intended.
# Exhibitor tests if it's an integer not equal to 0, so the empty string (toString false)
# will operate in the same fashion as a 0.
configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig;
cliOptionsCommon = {
configtype = cfg.configType;
defaultconfig = "${configDir}/exhibitor.properties";
port = toString cfg.port;
hostname = cfg.hostname;
headingtext = if (cfg.headingText != null) then (lib.escapeShellArg cfg.headingText) else null;
nodemodification = lib.boolToString cfg.nodeModification;
configcheckms = toString cfg.configCheckMs;
jquerystyle = cfg.jqueryStyle;
loglines = toString cfg.logLines;
servo = lib.boolToString cfg.servo;
timeout = toString cfg.timeout;
};
s3CommonOptions = { s3region = cfg.s3Region; s3credentials = cfg.s3Credentials; };
cliOptionsPerConfig = {
s3 = {
s3config = "${cfg.s3Config.bucketName}:${cfg.s3Config.objectKey}";
s3configprefix = cfg.s3Config.configPrefix;
};
zookeeper = {
zkconfigconnect = concatStringsSep "," cfg.zkConfigConnect;
zkconfigexhibitorpath = cfg.zkConfigExhibitorPath;
zkconfigpollms = toString cfg.zkConfigPollMs;
zkconfigretry = "${toString cfg.zkConfigRetry.sleepMs}:${toString cfg.zkConfigRetry.retryQuantity}";
zkconfigzpath = cfg.zkConfigZPath;
zkconfigexhibitorport = toString cfg.zkConfigExhibitorPort; # NB: This might be null
};
file = {
fsconfigdir = cfg.fsConfigDir;
fsconfiglockprefix = cfg.fsConfigLockPrefix;
fsConfigName = fsConfigName;
};
none = {
noneconfigdir = configDir;
};
};
cliOptions = concatStringsSep " " (mapAttrsToList (k: v: "--${k} ${v}") (filterAttrs (k: v: v != null && v != "") (cliOptionsCommon //
cliOptionsPerConfig.${cfg.configType} //
s3CommonOptions //
optionalAttrs cfg.s3Backup { s3backup = "true"; } //
optionalAttrs cfg.fileSystemBackup { filesystembackup = "true"; }
)));
in
{
options = {
services.exhibitor = {
enable = mkEnableOption (lib.mdDoc "exhibitor server");
# See https://github.com/soabase/exhibitor/wiki/Running-Exhibitor for what these mean
# General options for any type of config
port = mkOption {
type = types.port;
default = 8080;
description = lib.mdDoc ''
The port for exhibitor to listen on and communicate with other exhibitors.
'';
};
baseDir = mkOption {
type = types.str;
default = "/var/exhibitor";
description = lib.mdDoc ''
Baseline directory for exhibitor runtime config.
'';
};
configType = mkOption {
type = types.enum [ "file" "s3" "zookeeper" "none" ];
description = lib.mdDoc ''
Which configuration type you want to use. Additional config will be
required depending on which type you are using.
'';
};
hostname = mkOption {
type = types.nullOr types.str;
description = lib.mdDoc ''
Hostname to use and advertise
'';
default = null;
};
nodeModification = mkOption {
type = types.bool;
description = lib.mdDoc ''
Whether the Explorer UI will allow nodes to be modified (use with caution).
'';
default = true;
};
configCheckMs = mkOption {
type = types.int;
description = lib.mdDoc ''
Period (ms) to check for shared config updates.
'';
default = 30000;
};
headingText = mkOption {
type = types.nullOr types.str;
description = lib.mdDoc ''
Extra text to display in UI header
'';
default = null;
};
jqueryStyle = mkOption {
type = types.enum [ "red" "black" "custom" ];
description = lib.mdDoc ''
Styling used for the JQuery-based UI.
'';
default = "red";
};
logLines = mkOption {
type = types.int;
description = lib.mdDoc ''
Max lines of logging to keep in memory for display.
'';
default = 1000;
};
servo = mkOption {
type = types.bool;
description = lib.mdDoc ''
ZooKeeper will be queried once a minute for its state via the 'mntr' four
letter word (this requires ZooKeeper 3.4.x+). Servo will be used to publish
this data via JMX.
'';
default = false;
};
timeout = mkOption {
type = types.int;
description = lib.mdDoc ''
Connection timeout (ms) for ZK connections.
'';
default = 30000;
};
autoManageInstances = mkOption {
type = types.bool;
description = lib.mdDoc ''
Automatically manage ZooKeeper instances in the ensemble
'';
default = false;
};
zkDataDir = mkOption {
type = types.str;
default = "${cfg.baseDir}/zkData";
defaultText = literalExpression ''"''${config.${opt.baseDir}}/zkData"'';
description = lib.mdDoc ''
The Zookeeper data directory
'';
};
zkLogDir = mkOption {
type = types.path;
default = "${cfg.baseDir}/zkLogs";
defaultText = literalExpression ''"''${config.${opt.baseDir}}/zkLogs"'';
description = lib.mdDoc ''
The Zookeeper logs directory
'';
};
extraConf = mkOption {
type = types.str;
default = "";
description = lib.mdDoc ''
Extra Exhibitor configuration to put in the ZooKeeper config file.
'';
};
zkExtraCfg = mkOption {
type = types.str;
default = "initLimit=5&syncLimit=2&tickTime=2000";
description = lib.mdDoc ''
Extra options to pass into Zookeeper
'';
};
zkClientPort = mkOption {
type = types.int;
default = 2181;
description = lib.mdDoc ''
Zookeeper client port
'';
};
zkConnectPort = mkOption {
type = types.int;
default = 2888;
description = lib.mdDoc ''
The port to use for followers to talk to each other.
'';
};
zkElectionPort = mkOption {
type = types.int;
default = 3888;
description = lib.mdDoc ''
The port for Zookeepers to use for leader election.
'';
};
zkCleanupPeriod = mkOption {
type = types.int;
default = 0;
description = lib.mdDoc ''
How often (in milliseconds) to run the Zookeeper log cleanup task.
'';
};
zkServersSpec = mkOption {
type = types.listOf types.str;
default = [];
description = lib.mdDoc ''
Zookeeper server spec for all servers in the ensemble.
'';
example = [ "S:1:zk1.example.com" "S:2:zk2.example.com" "S:3:zk3.example.com" "O:4:zk-observer.example.com" ];
};
# Backup options
s3Backup = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether to enable backups to S3
'';
};
fileSystemBackup = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Enables file system backup of ZooKeeper log files
'';
};
# Options for using zookeeper configType
zkConfigConnect = mkOption {
type = types.listOf types.str;
description = lib.mdDoc ''
The initial connection string for ZooKeeper shared config storage
'';
example = ["host1:2181" "host2:2181"];
};
zkConfigExhibitorPath = mkOption {
type = types.str;
description = lib.mdDoc ''
If the ZooKeeper shared config is also running Exhibitor, the URI path for the REST call
'';
default = "/";
};
zkConfigExhibitorPort = mkOption {
type = types.nullOr types.int;
description = lib.mdDoc ''
If the ZooKeeper shared config is also running Exhibitor, the port that
Exhibitor is listening on. IMPORTANT: if this value is not set it implies
that Exhibitor is not being used on the ZooKeeper shared config.
'';
};
zkConfigPollMs = mkOption {
type = types.int;
description = lib.mdDoc ''
The period in ms to check for changes in the config ensemble
'';
default = 10000;
};
zkConfigRetry = {
sleepMs = mkOption {
type = types.int;
default = 1000;
description = lib.mdDoc ''
Retry sleep time connecting to the ZooKeeper config
'';
};
retryQuantity = mkOption {
type = types.int;
default = 3;
description = lib.mdDoc ''
Retries connecting to the ZooKeeper config
'';
};
};
zkConfigZPath = mkOption {
type = types.str;
description = lib.mdDoc ''
The base ZPath that Exhibitor should use
'';
example = "/exhibitor/config";
};
# Config options for s3 configType
s3Config = {
bucketName = mkOption {
type = types.str;
description = lib.mdDoc ''
Bucket name to store config
'';
};
objectKey = mkOption {
type = types.str;
description = lib.mdDoc ''
S3 key name to store the config
'';
};
configPrefix = mkOption {
type = types.str;
description = lib.mdDoc ''
When using AWS S3 shared config files, the prefix to use for values such as locks
'';
default = "exhibitor-";
};
};
# The next two are used for either s3backup or s3 configType
s3Credentials = mkOption {
type = types.nullOr types.path;
description = lib.mdDoc ''
Optional credentials to use for s3backup or s3config. Argument is the path
to an AWS credential properties file with two properties:
com.netflix.exhibitor.s3.access-key-id and com.netflix.exhibitor.s3.access-secret-key
'';
default = null;
};
s3Region = mkOption {
type = types.nullOr types.str;
description = lib.mdDoc ''
Optional region for S3 calls
'';
default = null;
};
# Config options for file config type
fsConfigDir = mkOption {
type = types.path;
description = lib.mdDoc ''
Directory to store Exhibitor properties (cannot be used with s3config).
Exhibitor uses file system locks so you can specify a shared location
so as to enable complete ensemble management.
'';
};
fsConfigLockPrefix = mkOption {
type = types.str;
description = lib.mdDoc ''
A prefix for a locking mechanism used in conjunction with fsconfigdir
'';
default = "exhibitor-lock-";
};
fsConfigName = mkOption {
type = types.str;
description = lib.mdDoc ''
The name of the file to store config in
'';
default = "exhibitor.properties";
};
};
};
config = mkIf cfg.enable {
systemd.services.exhibitor = {
description = "Exhibitor Daemon";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
environment = {
ZOO_LOG_DIR = cfg.baseDir;
};
serviceConfig = {
/***
Exhibitor is a bit un-nixy. It wants to present to you a user interface in order to
mutate the configuration of both itself and ZooKeeper, and to coordinate changes
among the members of the Zookeeper ensemble. I'm going for a different approach here,
which is to manage all the configuration via nix and have it write out the configuration
files that exhibitor will use, and to reduce the amount of inter-exhibitor orchestration.
***/
ExecStart = ''
${pkgs.exhibitor}/bin/startExhibitor.sh ${cliOptions}
'';
User = "zookeeper";
PermissionsStartOnly = true;
};
# This is a bit wonky, but the reason for this is that Exhibitor tries to write to
# ${cfg.baseDir}/zookeeper/bin/../conf/zoo.cfg
# I want everything but the conf directory to be in the immutable nix store, and I want defaults
# from the nix store
# If I symlink the bin directory in, then bin/../ will resolve to the parent of the symlink in the
# immutable nix store. Bind mounting a writable conf over the existing conf might work, but it gets very
# messy with trying to copy the existing out into a mutable store.
# Another option is to try to patch upstream exhibitor, but the current package just pulls down the
# prebuild JARs off of Maven, rather than building them ourselves, as Maven support in Nix isn't
# very mature. So, it seems like a reasonable compromise is to just copy out of the immutable store
# just before starting the service, so we're running binaries from the immutable store, but we work around
# Exhibitor's desire to mutate its current installation.
preStart = ''
mkdir -m 0700 -p ${cfg.baseDir}/zookeeper
# Not doing a chown -R to keep the base ZK files owned by root
chown zookeeper ${cfg.baseDir} ${cfg.baseDir}/zookeeper
cp -Rf ${pkgs.zookeeper}/* ${cfg.baseDir}/zookeeper
chown -R zookeeper ${cfg.baseDir}/zookeeper/conf
chmod -R u+w ${cfg.baseDir}/zookeeper/conf
replace_what=$(echo ${pkgs.zookeeper} | sed 's/[\/&]/\\&/g')
replace_with=$(echo ${cfg.baseDir}/zookeeper | sed 's/[\/&]/\\&/g')
sed -i 's/'"$replace_what"'/'"$replace_with"'/g' ${cfg.baseDir}/zookeeper/bin/zk*.sh
'';
};
users.users.zookeeper = {
uid = config.ids.uids.zookeeper;
description = "Zookeeper daemon user";
home = cfg.baseDir;
};
};
}

99
nixos/modules/services/monitoring/grafana.nix
View file

@ -10,7 +10,26 @@ let
useMysql = cfg.settings.database.type == "mysql";
usePostgresql = cfg.settings.database.type == "postgres";
settingsFormatIni = pkgs.formats.ini { };
# Prefer using the values from the default config file[0] directly. This way,
# people reading the NixOS manual can see them without cross-referencing the
# official documentation.
#
# However, if there is no default entry or if the setting is optional, use
# `null` as the default value. It will be turned into the empty string.
#
# If a setting is a list, always allow setting it as a plain string as well.
#
# [0]: https://github.com/grafana/grafana/blob/main/conf/defaults.ini
settingsFormatIni = pkgs.formats.ini {
listToValue = concatMapStringsSep " " (generators.mkValueStringDefault { });
mkKeyValue = generators.mkKeyValueDefault
{
mkValueString = v:
if v == null then ""
else generators.mkValueStringDefault { } v;
}
"=";
};
configFile = settingsFormatIni.generate "config.ini" cfg.settings;
mkProvisionCfg = name: attr: provisionCfg:
@ -405,7 +424,6 @@ in
This setting is also important if you have a reverse proxy in front of Grafana that exposes it through a subpath.
In that case add the subpath to the end of this URL setting.
'';
# https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L54
default = "%(protocol)s://%(domain)s:%(http_port)s/";
type = types.str;
};
@ -453,16 +471,16 @@ in
description = lib.mdDoc ''
Path to the certificate file (if `protocol` is set to `https` or `h2`).
'';
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
cert_key = mkOption {
description = lib.mdDoc ''
Path to the certificate key file (if `protocol` is set to `https` or `h2`).
'';
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
socket_gid = mkOption {
@ -505,8 +523,8 @@ in
For example, given a cdn url like `https://cdn.myserver.com`
grafana will try to load a javascript file from `http://cdn.myserver.com/grafana-oss/7.4.0/public/build/app.<hash>.js`.
'';
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
read_timeout = mkOption {
@ -572,7 +590,7 @@ in
max_open_conn = mkOption {
description = lib.mdDoc "The maximum number of open connections to the database.";
default = 0; # https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L123-L124
default = 0;
type = types.int;
};
@ -606,7 +624,7 @@ in
For Postgres, use either `disable`, `require` or `verify-full`.
For MySQL, use either `true`, `false`, or `skip-verify`.
'';
default = "disable"; # https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L134
default = "disable";
type = types.enum [ "disable" "require" "verify-full" "true" "false" "skip-verify" ];
};
@ -621,20 +639,20 @@ in
ca_cert_path = mkOption {
description = lib.mdDoc "The path to the CA certificate to use.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
client_key_path = mkOption {
description = lib.mdDoc "The path to the client key. Only if server requires client authentication.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
client_cert_path = mkOption {
description = lib.mdDoc "The path to the client cert. Only if server requires client authentication.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
server_cert_name = mkOption {
@ -642,8 +660,8 @@ in
The common name field of the certificate used by the `mysql` or `postgres` server.
Not necessary if `ssl_mode` is set to `skip-verify`.
'';
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
path = mkOption {
@ -751,8 +769,8 @@ in
Format: `ip_or_domain:port` separated by spaces.
PostgreSQL, MySQL, and MSSQL data sources do not use the proxy and are therefore unaffected by this setting.
'';
default = "";
type = types.str;
default = [ ];
type = types.oneOf [ types.str (types.listOf types.str) ];
};
disable_brute_force_login_protection = mkOption {
@ -870,6 +888,27 @@ in
# how exactly the quoting of the default value works. See also
# https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L364
# https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L373
# These two options are lists joined with spaces:
# https://github.com/grafana/grafana/blob/916d9793aa81c2990640b55a15dee0db6b525e41/pkg/middleware/csrf/csrf.go#L37-L38
csrf_trusted_origins = mkOption {
description = lib.mdDoc ''
List of additional allowed URLs to pass by the CSRF check.
Suggested when authentication comes from an IdP.
'';
default = [ ];
type = types.oneOf [ types.str (types.listOf types.str) ];
};
csrf_additional_headers = mkOption {
description = lib.mdDoc ''
List of allowed headers to be set by the user.
Suggested to use for if authentication lives behind reverse proxies.
'';
default = [ ];
type = types.oneOf [ types.str (types.listOf types.str) ];
};
};
smtp = {
@ -887,8 +926,8 @@ in
user = mkOption {
description = lib.mdDoc "User used for authentication.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
password = mkOption {
@ -905,14 +944,14 @@ in
cert_file = mkOption {
description = lib.mdDoc "File path to a cert file.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
key_file = mkOption {
description = lib.mdDoc "File path to a key file.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
skip_verify = mkOption {
@ -933,6 +972,12 @@ in
type = types.str;
};
ehlo_identity = mkOption {
description = lib.mdDoc "Name to be used as client identity for EHLO in SMTP dialog.";
default = null;
type = types.nullOr types.str;
};
startTLS_policy = mkOption {
description = lib.mdDoc "StartTLS policy when connecting to server.";
default = null;
@ -1050,6 +1095,8 @@ in
type = types.str;
};
# Lists are joined via space, so this option can't be a list.
# Users have to manually join their values.
hidden_users = mkOption {
description = lib.mdDoc ''
This is a comma-separated list of usernames.

73
nixos/modules/services/monitoring/opentelemetry-collector.nix Normal file
View file

@ -0,0 +1,73 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkEnableOption mkIf mkOption types getExe;
cfg = config.services.opentelemetry-collector;
opentelemetry-collector = cfg.package;
settingsFormat = pkgs.formats.yaml {};
in {
options.services.opentelemetry-collector = {
enable = mkEnableOption (lib.mdDoc "Opentelemetry Collector");
package = mkOption {
type = types.package;
default = pkgs.opentelemetry-collector;
defaultText = lib.literalExpression "pkgs.opentelemetry-collector";
description = lib.mdDoc "The opentelemetry-collector package to use.";
};
settings = mkOption {
type = settingsFormat.type;
default = {};
description = lib.mdDoc ''
Specify the configuration for Opentelemetry Collector in Nix.
See https://opentelemetry.io/docs/collector/configuration/ for available options.
'';
};
configFile = mkOption {
type = types.nullOr types.path;
default = null;
description = lib.mdDoc ''
Specify a path to a configuration file that Opentelemetry Collector should use.
'';
};
};
config = mkIf cfg.enable {
assertions = [{
assertion = (
(cfg.settings == {}) != (cfg.configFile == null)
);
message = ''
Please specify a configuration for Opentelemetry Collector with either
'services.opentelemetry-collector.settings' or
'services.opentelemetry-collector.configFile'.
'';
}];
systemd.services.opentelemetry-collector = {
description = "Opentelemetry Collector Service Daemon";
wantedBy = [ "multi-user.target" ];
serviceConfig = let
conf = if cfg.configFile == null
then settingsFormat.generate "config.yaml" cfg.settings
else cfg.configFile;
in
{
ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}";
DynamicUser = true;
Restart = "always";
ProtectSystem = "full";
DevicePolicy = "closed";
NoNewPrivileges = true;
WorkingDirectory = "/var/lib/opentelemetry-collector";
StateDirectory = "opentelemetry-collector";
};
};
};
}

36
nixos/modules/system/boot/loader/grub/grub.nix
View file

@ -352,10 +352,6 @@ in
default = "";
type = types.lines;
example = ''
# GRUB 1 example (not GRUB 2 compatible)
title Windows
chainloader (hd0,1)+1
# GRUB 2 example
menuentry "Windows 7" {
chainloader (hd0,4)+1
@ -410,14 +406,6 @@ in
Set to `null` to run GRUB in text mode.
::: {.note}
For grub 1:
It must be a 640x480,
14-colour image in XPM format, optionally compressed with
{command}`gzip` or {command}`bzip2`.
:::
::: {.note}
For grub 2:
File must be one of .png, .tga, .jpg, or .jpeg. JPEG images must
not be progressive.
The image will be scaled if necessary to fit the screen.
@ -431,10 +419,6 @@ in
default = null;
description = lib.mdDoc ''
Background color to be used for GRUB to fill the areas the image isn't filling.
::: {.note}
This options has no effect for GRUB 1.
:::
'';
};
@ -443,10 +427,6 @@ in
type = types.nullOr types.str;
description = lib.mdDoc ''
Options applied to the primary NixOS menu entry.
::: {.note}
This options has no effect for GRUB 1.
:::
'';
};
@ -455,10 +435,6 @@ in
type = types.nullOr types.str;
description = lib.mdDoc ''
Options applied to the secondary NixOS submenu entry.
::: {.note}
This options has no effect for GRUB 1.
:::
'';
};
@ -468,10 +444,6 @@ in
default = null;
description = lib.mdDoc ''
Grub theme to be used.
::: {.note}
This options has no effect for GRUB 1.
:::
'';
};
@ -480,10 +452,6 @@ in
default = "stretch";
description = lib.mdDoc ''
Whether to stretch the image or show the image in the top-left corner unstretched.
::: {.note}
This options has no effect for GRUB 1.
:::
'';
};
@ -592,8 +560,6 @@ in
type = types.bool;
description = lib.mdDoc ''
Whether GRUB should be built against libzfs.
ZFS support is only available for GRUB v2.
This option is ignored for GRUB v1.
'';
};
@ -602,8 +568,6 @@ in
type = types.bool;
description = lib.mdDoc ''
Whether GRUB should be built with EFI support.
EFI support is only available for GRUB v2.
This option is ignored for GRUB v1.
'';
};

3
nixos/tests/all-tests.nix
View file

@ -108,7 +108,7 @@ in {
alps = handleTest ./alps.nix {};
amazon-init-shell = handleTest ./amazon-init-shell.nix {};
apcupsd = handleTest ./apcupsd.nix {};
apfs = handleTest ./apfs.nix {};
apfs = runTest ./apfs.nix;
apparmor = handleTest ./apparmor.nix {};
atd = handleTest ./atd.nix {};
atop = handleTest ./atop.nix {};
@ -560,6 +560,7 @@ in {
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
opentabletdriver = handleTest ./opentabletdriver.nix {};
opentelemetry-collector = handleTest ./opentelemetry-collector.nix {};
owncast = handleTest ./owncast.nix {};
outline = handleTest ./outline.nix {};
image-contents = handleTest ./image-contents.nix {};

8
nixos/tests/apfs.nix
View file

@ -1,8 +1,8 @@
import ./make-test-python.nix ({ pkgs, ... }: {
{ lib, ... }: {
name = "apfs";
meta.maintainers = with pkgs.lib.maintainers; [ Luflosi ];
meta.maintainers = with lib.maintainers; [ Luflosi ];
nodes.machine = { pkgs, ... }: {
nodes.machine = {
virtualisation.emptyDiskImages = [ 1024 ];
boot.supportedFilesystems = [ "apfs" ];
@ -62,4 +62,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"apfsck /dev/vdb",
)
'';
})
}

76
nixos/tests/opentelemetry-collector.nix Normal file
View file

@ -0,0 +1,76 @@
import ./make-test-python.nix ({ pkgs, ...} : let
port = 4318;
in {
name = "opentelemetry-collector";
meta = with pkgs.lib.maintainers; {
maintainers = [ tylerjl ];
};
nodes.machine = { ... }: {
networking.firewall.allowedTCPPorts = [ port ];
services.opentelemetry-collector = {
enable = true;
settings = {
exporters.logging.verbosity = "detailed";
receivers.otlp.protocols.http = {};
service = {
pipelines.logs = {
receivers = [ "otlp" ];
exporters = [ "logging" ];
};
};
};
};
virtualisation.forwardPorts = [{
host.port = port;
guest.port = port;
}];
};
extraPythonPackages = p: [
p.requests
p.types-requests
];
# Send a log event through the OTLP pipeline and check for its
# presence in the collector logs.
testScript = /* python */ ''
import requests
import time
from uuid import uuid4
flag = str(uuid4())
machine.wait_for_unit("opentelemetry-collector.service")
machine.wait_for_open_port(${toString port})
event = {
"resourceLogs": [
{
"resource": {"attributes": []},
"scopeLogs": [
{
"logRecords": [
{
"timeUnixNano": str(time.time_ns()),
"severityNumber": 9,
"severityText": "Info",
"name": "logTest",
"body": {
"stringValue": flag
},
"attributes": []
},
]
}
]
}
]
}
response = requests.post("http://localhost:${toString port}/v1/logs", json=event)
assert response.status_code == 200
assert flag in machine.execute("journalctl -u opentelemetry-collector")[-1]
'';
})

3
pkgs/applications/blockchains/oxen/default.nix
View file

@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.viric ];
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/oxen.x86_64-darwin
# Fails to build on gcc-10 due to boost being built with gcc-12.
broken = true;
};
}

72
pkgs/applications/editors/jetbrains/versions.json
View file

@ -19,10 +19,10 @@
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
"version": "2023.1",
"sha256": "12856b7571ff789a427361cfcb4cb1743e7f3af77f611ceda57aafe847328865",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.tar.gz",
"build_number": "231.8109.197"
"version": "2023.1.2",
"sha256": "5d53853577b2679cccdd6a409d239a4bc0c1b5c612234b40dbab78d9e3d2a446",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.2.tar.gz",
"build_number": "231.9011.36"
},
"gateway": {
"update-channel": "Gateway RELEASE",
@ -43,18 +43,18 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "f222f0282bebe2e8c3fef6a27b160c760c118e45a0cdb7c9053d645a8e00844a",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.2.tar.gz",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "336ec81b78645349e0b476047e2d1993ed3f1c571f8961565a3e47fe5c9c02bf",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.3.tar.gz",
"build_number": "231.9161.38"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
"version": "2023.1.2",
"sha256": "e1a26070e91bdc6a7d262aeda316a72908d1ffbb8b500f086665bfcd29de249a",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.2.tar.gz",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "a58954ed6732eb799502e14b250ead8b21e00c3f064e196ada34dcd6a3a3f399",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.3.tar.gz",
"build_number": "231.9161.38"
},
"mps": {
"update-channel": "MPS RELEASE",
@ -134,10 +134,10 @@
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
"version": "2023.1",
"sha256": "dc118f466b6e5fa3e6c449f25977d5d1fc6746c004a000464802c535a1bdaa90",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.dmg",
"build_number": "231.8109.197"
"version": "2023.1.2",
"sha256": "5f4375f653ce28b45e17c972ca71b8b34866e76e9a324a6cc3bd482ad4421b04",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.2.dmg",
"build_number": "231.9011.36"
},
"gateway": {
"update-channel": "Gateway RELEASE",
@ -158,18 +158,18 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
"version": "2023.1.2",
"sha256": "d313f3308788e2a6646c67c4c00afbf4dd848889009de32b93e1ef8bf80a529b",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.2.dmg",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "a7a71c941df436b8b5e78b679f1810cb9395663a788a114c1bbaeb99054e0ccf",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.3.dmg",
"build_number": "231.9161.38"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
"version": "2023.1.2",
"sha256": "7242ff72b56a0337f0bbc20b0dea4675759e1228f86bcb1c0dab3311f9f8d709",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.2.dmg",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "d460609c97d970a9cbbe753067bb7d829ef2d124a6494ae1e4aa3b4ec44191f6",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.3.dmg",
"build_number": "231.9161.38"
},
"mps": {
"update-channel": "MPS RELEASE",
@ -249,10 +249,10 @@
"dataspell": {
"update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
"version": "2023.1",
"sha256": "7b5b4388303bf7d381597995e3f4d5684c0f60a4e5ad5a4481ab4e451be6e2cf",
"url": "https://download.jetbrains.com/python/dataspell-2023.1-aarch64.dmg",
"build_number": "231.8109.197"
"version": "2023.1.2",
"sha256": "f9ef32141d044c371de6f410f8d53f8b45bc7339aea45c29bfc345d1c54d9198",
"url": "https://download.jetbrains.com/python/dataspell-2023.1.2-aarch64.dmg",
"build_number": "231.9011.36"
},
"gateway": {
"update-channel": "Gateway RELEASE",
@ -273,18 +273,18 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "f269422723105de9c28c61c95f7c74cc4481032abaf980ace7e4fd2d7f00dca5",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.2-aarch64.dmg",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "c815f1f1af1e4c781b4cb8fda629e83b40e12b6f18485a2bf3a5cfce8a9a78dc",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.1.3-aarch64.dmg",
"build_number": "231.9161.38"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
"version": "2023.1.2",
"sha256": "d8ae93ade97ddd30c91fd2a828763b1c952e8c206f04fbdb9d79ea2207955a8e",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.2-aarch64.dmg",
"build_number": "231.9011.34"
"version": "2023.1.3",
"sha256": "7b9d9d69378d6fb256bede3e6feac39a0f3b0600c25f5a891c6ade73f7273b72",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.1.3-aarch64.dmg",
"build_number": "231.9161.38"
},
"mps": {
"update-channel": "MPS RELEASE",

262
pkgs/applications/editors/vim/plugins/generated.nix
View file

@ -173,12 +173,12 @@ final: prev:
LazyVim = buildVimPluginFrom2Nix {
pname = "LazyVim";
version = "2023-06-19";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "LazyVim";
repo = "LazyVim";
rev = "428bdf768fa89f3507a9c96a81dfedae69fc93a4";
sha256 = "0qacnlbcb4z978v8wzsfq9w74lqhps096c4pk2z5p1aalyxanr1b";
rev = "47111bd2db140aac32422752e07db7a1c5b74659";
sha256 = "1c10kj7f3512j62nwhnlqxf8y4frx24k0j1vvyw226rv7cla0vyq";
};
meta.homepage = "https://github.com/LazyVim/LazyVim/";
};
@ -305,12 +305,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
version = "2023-06-19";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "c665a19d1d2b1676553b246b7147390d749c7308";
sha256 = "02ibkdcjb3lyrb8l7y0a191g3scb2f4x98a6byyfd5d7nknr4xjc";
rev = "4f96b7bb1a0d5973a249e654f02adf2973422dcc";
sha256 = "0nc5sbdkhahyf80ng9g3gysp385m347lw2djr46fwcmkmlypllg2";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@ -1963,12 +1963,12 @@ final: prev:
codeium-vim = buildVimPluginFrom2Nix {
pname = "codeium.vim";
version = "2023-06-15";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "Exafunction";
repo = "codeium.vim";
rev = "99714b06b85e79d9247066f7612e9cc55458bcf1";
sha256 = "0g629r1103dxjzpi906xswkp5vilhkgyjz66avvm6m5j64xs5f8w";
rev = "c620cea17f898c6c66961f09d05cb2c0fa5ffcd8";
sha256 = "1h2972cffs0qacjcsq3sl99935633bcg7rgygazg1qga96a47si3";
};
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
};
@ -2239,12 +2239,12 @@ final: prev:
copilot-lua = buildVimPluginFrom2Nix {
pname = "copilot.lua";
version = "2023-05-28";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "zbirenbaum";
repo = "copilot.lua";
rev = "77e3a4907928f0813024e573b882dc879dfc0c6b";
sha256 = "0spirmbjbqj2gnjl1843czyai8f5xdk2afwns5gqgvcdqzqd454c";
rev = "9cb5396205faf609bc9df0e841e133ccb1b70540";
sha256 = "11c68lx8grzksl215dhsi813s0svryx7a90d60vxjmwgxw9c3abx";
};
meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
};
@ -2335,12 +2335,12 @@ final: prev:
crates-nvim = buildVimPluginFrom2Nix {
pname = "crates.nvim";
version = "2023-05-19";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "saecki";
repo = "crates.nvim";
rev = "3648f8787656d7572740560331553abdaa8cb982";
sha256 = "1acvfwm533sqalbgai16jir9cya0c6jzyiq8bsq2wk7xcgdm9ida";
rev = "258961973c2cbef5717d4a726c68a0730fb0f94b";
sha256 = "0dl6651qvf2cjnkgqxvw0ypffrqblvx0xw0mpymsws07wblml9ac";
};
meta.homepage = "https://github.com/saecki/crates.nvim/";
};
@ -2551,12 +2551,12 @@ final: prev:
denops-vim = buildVimPluginFrom2Nix {
pname = "denops.vim";
version = "2023-05-29";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "vim-denops";
repo = "denops.vim";
rev = "3b489d50ba2e034c829a09475a4002176bffbef7";
sha256 = "19r312fl7gavd3zgi1si1yh0s9pwbh7sz64spqbsqvrlzsjm7zxb";
rev = "df65c22ed88264aa3e264cace46a29d1a1263842";
sha256 = "080rh2fnnpgxfzcgfq4dwkrbz69ba8qnwdcqbr4fb54cg67zj13x";
};
meta.homepage = "https://github.com/vim-denops/denops.vim/";
};
@ -2925,12 +2925,12 @@ final: prev:
dropbar-nvim = buildVimPluginFrom2Nix {
pname = "dropbar.nvim";
version = "2023-06-19";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "Bekaboo";
repo = "dropbar.nvim";
rev = "c4ca1cd78917bc28269278f92a791e819803576b";
sha256 = "14ymbknhsa198mywcz5ph4aj16z89cqmc381a3an26s3a3xbmk07";
rev = "15f32c0b1c646b5608b52440599577799ce20425";
sha256 = "05zhsjbndlklxlnb9dv3pj790r0ck91c4sv1svpclaim8mjhv9ch";
};
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
};
@ -2973,12 +2973,12 @@ final: prev:
edgy-nvim = buildVimPluginFrom2Nix {
pname = "edgy.nvim";
version = "2023-06-20";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "folke";
repo = "edgy.nvim";
rev = "a93f3111301ce6e059cdd1a66f108e58a0e5f0ef";
sha256 = "03lrqdizwhf9yvs8x097y6h04x44gmdvs5w1ipcgk6psj1iy83l0";
rev = "c2a056a72e59d239218dd5d50848851fba33a378";
sha256 = "14ibg69jbwz67fflhlvay15csy6l3py0j8mhjd6nc7xghp4pnpcp";
};
meta.homepage = "https://github.com/folke/edgy.nvim/";
};
@ -3010,12 +3010,12 @@ final: prev:
elixir-tools-nvim = buildVimPluginFrom2Nix {
pname = "elixir-tools.nvim";
version = "2023-06-15";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "elixir-tools";
repo = "elixir-tools.nvim";
rev = "a2392bf076ffa9f06a66c81ebc0dfe90bec87863";
sha256 = "1ys997z0q6ic3pn3i2ifvdzvbw0bin4v2fdy9q5wmghki0bsjsgn";
rev = "d8f953511167b60694a2922c2d00dc9b87d572df";
sha256 = "1s0mxybqx50nzd18v4v7p4yw29hi4mfqk07b4x6iz3vcq9vbbn90";
};
meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
};
@ -3215,12 +3215,12 @@ final: prev:
firenvim = buildVimPluginFrom2Nix {
pname = "firenvim";
version = "2023-05-29";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "glacambre";
repo = "firenvim";
rev = "e2d5a0f97d1f41e03c8d2a3c71ee60b1a4a6bb83";
sha256 = "0rsrjqml5dsczkn560a3lcicq9k9szc45j2zmdnz07j25zamp5w7";
rev = "3c4babfa0a561d1dc3640a902e67ca0b8af70927";
sha256 = "196f3wcjhlc93pibqacaw5pr755yrm1ssdjvn5irclfzi8rr4lpp";
};
meta.homepage = "https://github.com/glacambre/firenvim/";
};
@ -3348,12 +3348,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2023-06-19";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "91dc01efa4cbb6d6a2b77eb98953b9a1d5c78f5f";
sha256 = "1hvwn1k57lzc2lpdfr1sgyqpd6qhjj6vaad0ybi9p8ifjbmmc68y";
rev = "01f80274100fe3ff6c9183b9c0674a520141be4d";
sha256 = "1pxbbdjq25ri5jhwl953020xwbzhy564m35xz9vhnv8i2wz8kg2l";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -3684,12 +3684,12 @@ final: prev:
go-nvim = buildVimPluginFrom2Nix {
pname = "go.nvim";
version = "2023-06-08";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "ray-x";
repo = "go.nvim";
rev = "a8095eb334495caec3099b717cc7f5b1fbc3e628";
sha256 = "1f21zyj875m4hk39ar2cd48mcw3z74wy436nkdfgiamibk03k77a";
rev = "97b76f3188c64d4dacfc17c7c1543f775a3fb8e8";
sha256 = "0pp5p9fwy7jwwk8k7vz8y4irggnxhzfqs1c7ka98cmxdy8234lrs";
};
meta.homepage = "https://github.com/ray-x/go.nvim/";
};
@ -3887,12 +3887,12 @@ final: prev:
haskell-tools-nvim = buildNeovimPlugin {
pname = "haskell-tools.nvim";
version = "2023-06-19";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
rev = "8b2f24298a175f41543372dcbdc2b29319260376";
sha256 = "1ax3nx1zc3wra7xc2lrrrz8wspfxhzxdpm958027xpg0yjsv3l43";
rev = "ce1d69acb193ce49448ea121dc775e2a84316a6c";
sha256 = "1k0fkay5bk9a2g72c1xp8azczjqfr8zcc1k6m0wkyav23zafccgg";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@ -4415,12 +4415,12 @@ final: prev:
kanagawa-nvim = buildVimPluginFrom2Nix {
pname = "kanagawa.nvim";
version = "2023-05-25";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "rebelot";
repo = "kanagawa.nvim";
rev = "14a7524a8b259296713d4d77ef3c7f4dec501269";
sha256 = "1d9r29352bi9a4rzhxji1j3vj89swydsayszs621f0917zwpml87";
rev = "1749cea392acb7d1548a946fcee1e6f1304cd3cb";
sha256 = "0ycypsagk3aq9rf5y234bwrj2fw9h1hd73phavjbazi3zhi8yb6y";
};
meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
};
@ -4583,24 +4583,24 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
version = "2023-06-17";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "96f0f60baf037a3f91c8c725a0aad56094a73808";
sha256 = "0qgqiiw2cmm60cxnil2cvkh5h6p8kx3zvcyw60ia7n4s93yqzbkx";
rev = "2d7d35ea0da1b4478436dfbbb7440be91605b503";
sha256 = "0ihy5xpxzdg603dd31vbzcdj48gc5khr2d72r97ryc57afmriy28";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
version = "2023-06-01";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
rev = "6a3b2411146432f83ef44c7980d7a2b20f7a39ce";
sha256 = "0hl6ax2j9k0vfjxra6lvh01v1bid9y4yzdhj56h27iafhd321i14";
rev = "6530106e93a0196437111678d6681c3121be7362";
sha256 = "0ybzk88xs1095216ipki8s4ws4h3bpbrpi1cqqndclpxplhn06wg";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@ -4931,12 +4931,12 @@ final: prev:
lsp-zero-nvim = buildVimPluginFrom2Nix {
pname = "lsp-zero.nvim";
version = "2023-06-05";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "VonHeikemen";
repo = "lsp-zero.nvim";
rev = "4c8ebf2e5f2b5ae10cd4347020bb0bb2e7e02384";
sha256 = "0q6gm4vk2r5csl2dyg8pj4m438d8m104slp12m0ycrl4bfxvnwj2";
rev = "de0e7d7c75cb032107d4a728aa0a63a61d8e5909";
sha256 = "04x9hmshjfy11fsxjk51w0axafm05iiw3gja2jyj4mrh95lpzrwl";
};
meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
};
@ -5099,12 +5099,12 @@ final: prev:
magma-nvim-goose = buildVimPluginFrom2Nix {
pname = "magma-nvim-goose";
version = "2023-06-11";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "WhiteBlackGoose";
repo = "magma-nvim-goose";
rev = "d7931d773efcedc9c92337b8d500e32a3725fe26";
sha256 = "06yfff5yipda1frabria28kby9q1hf485gzij0cgn7s7b035dp4x";
rev = "5aafbbd5309e9089d39528f7d982377363c002a2";
sha256 = "1ycir5zw7f9i69di3m0ir82qngjv75hgjp7xp2s02klsikswb3kh";
};
meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/";
};
@ -5171,12 +5171,12 @@ final: prev:
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
version = "2023-06-18";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
rev = "f7f81ab41b153e2902ebded401a8a0a6abe28607";
sha256 = "15g4vfb0py5v1cckv8f6asl6v0pn4wgczywkc4fr7yn0chdjxiwr";
rev = "e706d305fbcc8701bd30e31dd727aee2853b9db9";
sha256 = "0kibx5p9f7zc4mp4rpihablfrrzrahhj777pjhjb0i46p3y0hx4r";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@ -5603,12 +5603,12 @@ final: prev:
neo-tree-nvim = buildVimPluginFrom2Nix {
pname = "neo-tree.nvim";
version = "2023-06-06";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "nvim-neo-tree";
repo = "neo-tree.nvim";
rev = "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa";
sha256 = "1hmfajbj61gh6jjrj0gbanhshp4ajp2jbi00h5lgzwwr9abv1gn6";
rev = "8324fd52f7880bf17142f56b45f544d64eff5ac9";
sha256 = "0ff7xvhlfsrcwyqin29d6h4n0ra0x671x413g8i756g5w8301p16";
};
meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
};
@ -5843,12 +5843,12 @@ final: prev:
neotest-dotnet = buildVimPluginFrom2Nix {
pname = "neotest-dotnet";
version = "2023-06-04";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "Issafalcon";
repo = "neotest-dotnet";
rev = "2f3a5244fbbff24885dc4b09cdea538417867ca4";
sha256 = "1xrwipnhwhmjj7q78m8n0fq5rx10jq3mk1zldg7xlb34wl7aabzh";
rev = "9de0e49f6ea3b0bb2891bfa85b40b4f94ce4c9ae";
sha256 = "1lvy4assjgaj13mpcnz6ywim7cncsy489ak5483304cn2s6cf9q3";
};
meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/";
};
@ -5963,12 +5963,12 @@ final: prev:
neotest-rust = buildVimPluginFrom2Nix {
pname = "neotest-rust";
version = "2023-06-19";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "rouge8";
repo = "neotest-rust";
rev = "cb788ceeae9a0d336b1c9d325a835129868c3f65";
sha256 = "1d8y5pdw7a9x79555wr8kvhzz0d5kggxc8hji6l815dx6ckvij9k";
rev = "e4baa0b02be7a7b9271da0a98eb82fb278a0c1e7";
sha256 = "0rdl0a93qp01ldrmb98bz93yadadving2isksxz0m015cijrdf2s";
};
meta.homepage = "https://github.com/rouge8/neotest-rust/";
};
@ -6071,12 +6071,12 @@ final: prev:
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
version = "2022-06-13";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdtree";
rev = "fc85a6f07c2cd694be93496ffad75be126240068";
sha256 = "02z32hrh4ykv4waq22y9ng8hwxxm8s5f2kxqm57pkixyy6b8zvzi";
rev = "c46e12a886b4a6618a9e834c90f6245952567115";
sha256 = "032sinxv3dq6wfk3rm1rya6fd4ygpl7xwglrn2q4qha0qm9avyvi";
};
meta.homepage = "https://github.com/preservim/nerdtree/";
};
@ -6443,12 +6443,12 @@ final: prev:
nvim-cmp = buildNeovimPlugin {
pname = "nvim-cmp";
version = "2023-06-19";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
rev = "fa492591fecdc41798cd5d3d1713232a5088fba0";
sha256 = "0a7szf6lfgadlxrsg34qjc6hyz2ca9k0z0xfyvdcqnibfhlbgg0l";
rev = "8a1694ff330ed58ed29716686fcef79c28090354";
sha256 = "00zxvwc244njvkbwbvxffrcqam37xi93r0pvcvzin4kc9npaygaq";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@ -6467,12 +6467,12 @@ final: prev:
nvim-cokeline = buildVimPluginFrom2Nix {
pname = "nvim-cokeline";
version = "2023-06-06";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "willothy";
repo = "nvim-cokeline";
rev = "7fb6753c8fb90eebb6b56f86fc6e65468a23c81c";
sha256 = "18japvpc1rrvsb6ycjzixqgrcabwyd8aq94a35k271liyk3i5i7g";
rev = "cb4bbdf9bb6c8a070a655f04842bb86a101e040d";
sha256 = "0wrjqlyhyxfrd3g1c2gh6qzysc0v6n9nfgpgx19j8r0icxribsvq";
};
meta.homepage = "https://github.com/willothy/nvim-cokeline/";
};
@ -6995,12 +6995,12 @@ final: prev:
nvim-pqf = buildVimPluginFrom2Nix {
pname = "nvim-pqf";
version = "2023-04-20";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "yorickpeterse";
repo = "nvim-pqf";
rev = "0c83602f9b3de057c5d4bf76e849c3d589a1d836";
sha256 = "1rjxxv2k67xb0zk599h4bmyi9qipagaa82fgx0g8ma19kvqqn28a";
rev = "90c7e33245e807eea85fadc6360a1d053406bc2c";
sha256 = "1rcvp90ipsgv33if63a0fivfp5gi5qrgk6z8s7kycwdqkcf2fzrq";
};
meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/";
};
@ -7035,8 +7035,8 @@ final: prev:
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "e8a92cf4952c35644ae420d3ba1f04c609db303c";
sha256 = "0mcm6r3if5h5wx6kr2mcj0c4263vy27iwxdrws2n0brh7k7chs8k";
rev = "8a04e2043f1d2582a5de1a7d97ff53e9e87c9d5f";
sha256 = "123mxy80fmjvnk2bcaddkbnbf855xjqqzn2c69z5ym0bbydlkjld";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@ -7151,12 +7151,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-06-20";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "19385830ab737f5c49a4cd44d0cdab5e5ee697d1";
sha256 = "0mz6m1xh4pzqipniawdkslpwk3kaqnlf6drrfbsygljh32fqbl6s";
rev = "c9d5812ba358ce9e5ae2df322550cc6bc1678538";
sha256 = "1s6gxdg0f1wq8kw2x0frjbqq78h7ymdm91jv14ldsasagn7szmjb";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -7259,23 +7259,23 @@ final: prev:
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2";
version = "2023-06-18";
version = "2023-06-21";
src = fetchgit {
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
rev = "09214437d00b2e6863f95578d72abe5bca2d0f6b";
sha256 = "1gah3fvxvw1iy75y3srl0f8lbv53b9dqqnkqy8b9s0bjb73psl18";
rev = "3edad7f978513499651d8b068880948f42c16d79";
sha256 = "0dlsrzfs3kqkcls5y5zp8sfigazhy821yqbkhz5qln6mzvv7sr43";
};
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
};
nvim-ufo = buildVimPluginFrom2Nix {
pname = "nvim-ufo";
version = "2023-05-06";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-ufo";
rev = "45aede6f5c4981156df3ddeeae01c4290e43e104";
sha256 = "184zlg2glhmv3b3cik9xlj0x3xcs5g30hnwrsczjb5ihs2xzm4ba";
rev = "43e39ec74cd57c45ca9d8229a796750f6083b850";
sha256 = "0sq8fnbvys14b98w8qjdcypkw2mibv8hvz7b19l8f4hyd2nwl3l4";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
};
@ -7390,12 +7390,12 @@ final: prev:
oil-nvim = buildVimPluginFrom2Nix {
pname = "oil.nvim";
version = "2023-06-17";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "stevearc";
repo = "oil.nvim";
rev = "6f8bf067c09e96d6bff548b5e6addb6d9c25a678";
sha256 = "0j7y2i84535c85na1z7l0ph0li0r668vxbdqrf1ib78dnv9nfnxf";
rev = "2a63f9224f8cb1349da4cf89844a161a285b18e9";
sha256 = "0ipyc8frgfk1mhmmn78nix264bdcn9fcsz39syv61ay20iljm8fk";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/oil.nvim/";
@ -7451,12 +7451,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
version = "2023-06-19";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
rev = "89b919f6904e441bf450cf0ae0c40c4410a2d875";
sha256 = "0nka0fjhxllvmbc8iaa3jcipchx96cmlz0879b1nb6hskd67i2fj";
rev = "47fbac24ecf4e75e5860c93242fbfc71234c3d4f";
sha256 = "08zwnvw20afb574ksr89vkndf88fc5qif1942pn0rv56d0i7ppaw";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@ -7509,6 +7509,18 @@ final: prev:
meta.homepage = "https://github.com/tyru/open-browser.vim/";
};
openingh-nvim = buildVimPluginFrom2Nix {
pname = "openingh.nvim";
version = "2023-06-19";
src = fetchFromGitHub {
owner = "Almo7aya";
repo = "openingh.nvim";
rev = "2719e5759ecf4b9a2d492fbf52d03d2e6fc6126a";
sha256 = "0646wmi4z0yrdrmy96zq5q7f2vl0030scwbh4ywrhwzfk6rjjmxa";
};
meta.homepage = "https://github.com/Almo7aya/openingh.nvim/";
};
openscad-nvim = buildVimPluginFrom2Nix {
pname = "openscad.nvim";
version = "2023-06-19";
@ -7535,12 +7547,12 @@ final: prev:
other-nvim = buildVimPluginFrom2Nix {
pname = "other.nvim";
version = "2023-06-03";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "rgroli";
repo = "other.nvim";
rev = "3cce281cac955cf3a097945432e2057f79183dff";
sha256 = "1wwb2x4gri48lpbji0bxqw71njyxfhaz288rd5mmqys79c8znygb";
rev = "ca6f3c7f10598e38f49194b7e60088a252d96d3b";
sha256 = "00zrs29ypqjh9sv8010k5dg0h6a1q42fgcv4nvmb0gk4hila5p52";
};
meta.homepage = "https://github.com/rgroli/other.nvim/";
};
@ -8197,12 +8209,12 @@ final: prev:
satellite-nvim = buildVimPluginFrom2Nix {
pname = "satellite.nvim";
version = "2023-05-25";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "satellite.nvim";
rev = "de3b6e70d033a0ddc2d2040fd9e0af76ad16c63e";
sha256 = "0ynqd9lzqwk3gvi3q57lij4mvl0k13za6fm17yzfzl52n9qwc2a0";
rev = "22c8cc5283c9533677e4b86b9d25d3beeca04667";
sha256 = "1s1y3z7kw5w2gnq96zfah3zy6m43rwvd9gaxpy5a2nr1alniwcjw";
};
meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
};
@ -8329,12 +8341,12 @@ final: prev:
sg-nvim = buildVimPluginFrom2Nix {
pname = "sg.nvim";
version = "2023-05-30";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "sg.nvim";
rev = "f79128f29ae501a54794fc99858e3e771f20a7ba";
sha256 = "1xmj05i4bw2cx9d18mm85ynkn29dkngn5090r71wssvan6dm3fb4";
rev = "11b21cdefab45895c2b585fa816dbf98831ff0f9";
sha256 = "0ql4rrv2z36y2md12nqj5bydvymf6kkqwjj9ipnrh4c5ywbyh65x";
};
meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
};
@ -9560,12 +9572,12 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
version = "2023-06-20";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
rev = "9a0deaa85219b18a9b7544098d1a1b16d396d856";
sha256 = "1xmhl38n4kjzv7irq5vjdy0dr8jg7snnjp4islq46ly6y53kapj8";
rev = "a0a7bfbc4c54348b56880a162afac9d103c618c1";
sha256 = "0qc3fb18l73qbf38ml4122fbbcka9qab81jmacg73ryw8ifpsn20";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@ -9764,12 +9776,12 @@ final: prev:
unison = buildVimPluginFrom2Nix {
pname = "unison";
version = "2023-06-16";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "1f3a1ac6917da3c0868dd3d0ca52176a3ea2d399";
sha256 = "1frkhq5n60ycm0jyca4ak4gg6scpklp2r6bipbyxim1qv8ryf1ym";
rev = "677c4d935007bbe1e016f858d3e1f951b00796c5";
sha256 = "148kwk9q5rp2pmcc4cnir8aaiq4y7r62dxggis12nk13lnpmrbxn";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@ -14809,12 +14821,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2023-06-13";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "28c71043604271d37be9582c89128d2acedff065";
sha256 = "1fnq4fgslmc95hmm3j491688krg4hx8k7hrj66z3fzjh2ly45q9x";
rev = "2b31261b20e44c4b3c79ca7e42e2f9a5cdbe8cd3";
sha256 = "1iv1qmbbz1q48x04l2d9cm10wrb4kf8xw9qnp2z2s4niy36w5345";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -14965,12 +14977,12 @@ final: prev:
wiki-vim = buildVimPluginFrom2Nix {
pname = "wiki.vim";
version = "2023-06-08";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "lervag";
repo = "wiki.vim";
rev = "4f0bc3db6ffdd0529766f1c4ba6ab658e8a25a4d";
sha256 = "0y8ajgdjlyk6csv44y6yydkjczyyp19ky70l1vihp2dy07garl80";
rev = "c8ed0931bebce817a97a4dd0963066781b30462a";
sha256 = "0iflfly5wwhvk3xp2ndbsiimidk0djnjkcw1a43659qi8kgba18f";
};
meta.homepage = "https://github.com/lervag/wiki.vim/";
};
@ -15206,12 +15218,12 @@ final: prev:
zig-vim = buildVimPluginFrom2Nix {
pname = "zig.vim";
version = "2023-05-03";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
rev = "a9633f5f5905e448049933bfcdaab632447c4394";
sha256 = "1bi82sdq7x46f6z9xv24x3ahhsg7bxcm2wabjfw5wmlpp6m13csa";
rev = "82d03f445fc8db80ef7842874d155956c1136432";
sha256 = "0rpkhnf7fk39gpzryxnig04hxdl7c28x06vnh1r2mvzxs3c46c55";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
@ -15254,12 +15266,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
version = "2023-06-20";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "71b7a866e092bc2605d790c8d43c4aeb032d0a1c";
sha256 = "10gj36pf2hd5x4rpxwmjqlx129q5i59acdfjyc3dxmx7xxp6qpvi";
rev = "d32b0bb5b1033920de5026e326869838aba856ee";
sha256 = "15yc9ld6nybs9cfb2gncygxif1qd0g69nfppp2qcwgyhw7kynnij";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@ -15410,12 +15422,12 @@ final: prev:
rose-pine = buildVimPluginFrom2Nix {
pname = "rose-pine";
version = "2023-06-19";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "rose-pine";
repo = "neovim";
rev = "894acd0f4bf70ee23344867100c76bf4bd68976d";
sha256 = "0376nc1hfmjap38x80m2sqi0w6gd6dwx177rdpynggpnpd6qlmbz";
rev = "932adb0d9351186db047302de021bb2976756a07";
sha256 = "1kfq83vr483cizx14gghvckwnh44x20jbvqjac1y60fmk8b18plb";
};
meta.homepage = "https://github.com/rose-pine/neovim/";
};

60
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View file

@ -137,12 +137,12 @@
};
c_sharp = buildGrammar {
language = "c_sharp";
version = "0.0.0+rev=03b9b62";
version = "0.0.0+rev=8acd38d";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "03b9b6272ef3df674f9c54507cc042412f257eed";
hash = "sha256-LS+NJ+oQDQ78lu7ozCh/E5dQuDprtb3e73MrJutX8P0=";
rev = "8acd38dae01bea4157f729325f5c69d0b47a75f2";
hash = "sha256-BaFM4bN0yAEKyYF0wQ+ZBDsSK1ObdOXA3sZ/9ZlD88w=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
@ -469,12 +469,12 @@
};
firrtl = buildGrammar {
language = "firrtl";
version = "0.0.0+rev=572ac53";
version = "0.0.0+rev=2b5adae";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-firrtl";
rev = "572ac53752252c4b77bd7cf0ce6a07a2db177ab7";
hash = "sha256-TzToUf/9H4JQoE3BN81ELCp+F86fP64bF1bCo6ctZ3k=";
rev = "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5";
hash = "sha256-If34GymYMJpSNtzSGpcq4dMxj8djKZ3B5uMHGx9uCnM=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-firrtl";
};
@ -546,12 +546,12 @@
};
gdscript = buildGrammar {
language = "gdscript";
version = "0.0.0+rev=a4b57cc";
version = "0.0.0+rev=03f20b9";
src = fetchFromGitHub {
owner = "PrestonKnopp";
repo = "tree-sitter-gdscript";
rev = "a4b57cc3bcbfc24550e858159647e9238e7ad1ac";
hash = "sha256-31FQlLVn5T/9858bPsZQkvejGVjO0ok5T5A13a+S91Y=";
rev = "03f20b94707a21bed90bb95101684bc4036139ce";
hash = "sha256-im87Rws9PPcBWNN0M8PNqnthJZlWKzn3iPLMGR+jtGo=";
};
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
};
@ -953,12 +953,12 @@
};
julia = buildGrammar {
language = "julia";
version = "0.0.0+rev=e2f449e";
version = "0.0.0+rev=4d4dc7d";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-julia";
rev = "e2f449e2bcc95f1d07ceb62d67f986005f73a6be";
hash = "sha256-ZXnEvHtheP8rI/lwPf94lVCF5S5rw38bewuZ0GHxjr8=";
rev = "4d4dc7d8a4ad3856200a9ef151f9056fc14cec8b";
hash = "sha256-v61uykCKr7QAeqex3JIbnv1EOTEGdOssfNcMrwlkLwI=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
};
@ -1030,12 +1030,12 @@
};
lua = buildGrammar {
language = "lua";
version = "0.0.0+rev=d8360bc";
version = "0.0.0+rev=7268c1c";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "tree-sitter-lua";
rev = "d8360bc472ca1d55d437624ee7299152b693e1a0";
hash = "sha256-Gc8EHDeduNhJueB6beqonoJ81+63wXKFp+Ds6Aj4JPw=";
rev = "7268c1cea5df56ac0c779cd37d6631d4e6f41d4f";
hash = "sha256-GrRHbNVKijYNeICeopVW6OtHquqKhKtDDa7dK5sEMNQ=";
};
meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";
};
@ -1063,12 +1063,12 @@
};
luau = buildGrammar {
language = "luau";
version = "0.0.0+rev=4f8fc20";
version = "0.0.0+rev=6953cd4";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-luau";
rev = "4f8fc207b3a25b07cba1d3b4066f2872dcfe201f";
hash = "sha256-vDkexlebgg/biif3MJ1c+OD8hy+4uvghIWZlqE9cQXg=";
rev = "6953cd4fa5967c9aa3c769b4e4c7e69c904b9fa9";
hash = "sha256-QGJgbwDSgkiiE7yt6HHkGH2t3ZNoY1+0VieX7Ccn/Z4=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-luau";
};
@ -1120,12 +1120,12 @@
};
matlab = buildGrammar {
language = "matlab";
version = "0.0.0+rev=5a047c1";
version = "0.0.0+rev=138f2ee";
src = fetchFromGitHub {
owner = "acristoffers";
repo = "tree-sitter-matlab";
rev = "5a047c1572792ae943b51af7cf9307097b2fcce0";
hash = "sha256-KFNHhOJv+ZO1FXoI88c5MIrLNsL0HIOOnHiNL7syUkM=";
rev = "138f2ee2eaadcff53ef1fce944713942af92c097";
hash = "sha256-fVAchZULNxp8Jtl632hRClaR2FKWF5C5OW0QpjihGf0=";
};
meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
};
@ -1322,12 +1322,12 @@
};
php = buildGrammar {
language = "php";
version = "0.0.0+rev=a17c0ca";
version = "0.0.0+rev=d38adb2";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "a17c0caaf133f7bb37b3531dadcfd0879bea23f1";
hash = "sha256-gXJYJ5tkhjh6KgdLfaKcg5EkaiZmY4hAe2MkW68z98M=";
rev = "d38adb26304d9b9d38e9a3b4aae0ec4b29bf9462";
hash = "sha256-s+NoJefmr1gyyLZNX9jUxiJR61VXXa2MNuECn+t2JBA=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};
@ -1707,23 +1707,23 @@
};
squirrel = buildGrammar {
language = "squirrel";
version = "0.0.0+rev=3fefc6b";
version = "0.0.0+rev=e8b5835";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-squirrel";
rev = "3fefc6b9bb2b4de1b1c461783f675918cd957546";
hash = "sha256-gxj6HCO1ALbQWgadmR93Ot8hxkxsQuAw5D1o8f8mo48=";
rev = "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034";
hash = "sha256-wKefWCqcQcg7zLT6abaDC9lWoJiJp7EbbsBOWRRsWFQ=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel";
};
starlark = buildGrammar {
language = "starlark";
version = "0.0.0+rev=80516b3";
version = "0.0.0+rev=504ddd7";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-starlark";
rev = "80516b3a8c2cf058b896d3481309bacf7497f933";
hash = "sha256-sjgJDe2TkGogRztgjNIKyFjlrf9yRulHVn54s2IPfDU=";
rev = "504ddd75ecc78fbbce22aa6facd70375d3f8854a";
hash = "sha256-ourTH45q4X0CxDAVGhwK5XgeWNhS4SRtc4qyUF+H+RQ=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-starlark";
};

2
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -929,7 +929,7 @@ self: super: {
pname = "sg-nvim-rust";
inherit (old) version src;
cargoHash = "sha256-9iXKVlhoyyRXCP4Bx9rCHljETdE9UD9PNWqPYDurQnI=";
cargoHash = "sha256-lYyIWNn10wFU97k6c2F5fCtHKMP5Y5tW41cvMRWXzTk=";
nativeBuildInputs = [ pkg-config ];

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -632,6 +632,7 @@ https://github.com/sonph/onehalf/,,
https://github.com/rmehri01/onenord.nvim/,main,
https://github.com/tyru/open-browser-github.vim/,,
https://github.com/tyru/open-browser.vim/,,
https://github.com/Almo7aya/openingh.nvim/,,
https://github.com/salkin-mada/openscad.nvim/,HEAD,
https://github.com/nvim-orgmode/orgmode/,,
https://github.com/rgroli/other.nvim/,HEAD,

2
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -3445,7 +3445,7 @@ let
downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscode-icons-team.vscode-icons";
homepage = "https://github.com/vscode-icons/vscode-icons";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ggwpaiushtha ];
maintainers = [ lib.maintainers.bastaynav ];
};
};

252
pkgs/applications/file-managers/felix-fm/Cargo.lock generated
View file

@ -10,15 +10,21 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aes"
version = "0.8.2"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
dependencies = [
"cfg-if",
"cipher",
"cpufeatures",
]
[[package]]
name = "android-tzdata"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]]
name = "android_system_properties"
version = "0.1.5"
@ -126,12 +132,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.24"
version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
"android-tzdata",
"iana-time-zone",
"num-integer",
"num-traits",
"winapi",
]
@ -169,9 +175,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "cpufeatures"
version = "0.2.7"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
dependencies = [
"libc",
]
@ -217,22 +223,22 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
version = "0.9.14"
version = "0.9.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
"memoffset 0.8.0",
"memoffset 0.9.0",
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.15"
version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if",
]
@ -255,9 +261,9 @@ dependencies = [
[[package]]
name = "crossterm_winapi"
version = "0.9.0"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
dependencies = [
"winapi",
]
@ -317,7 +323,7 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "felix"
version = "2.4.0"
version = "2.4.1"
dependencies = [
"chrono",
"content_inspector",
@ -349,8 +355,8 @@ checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"windows-sys 0.48.0",
"redox_syscall 0.2.16",
"windows-sys",
]
[[package]]
@ -381,9 +387,9 @@ dependencies = [
[[package]]
name = "getrandom"
version = "0.2.9"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
"libc",
@ -416,9 +422,9 @@ dependencies = [
[[package]]
name = "iana-time-zone"
version = "0.1.56"
version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@ -473,18 +479,18 @@ dependencies = [
[[package]]
name = "js-sys"
version = "0.3.63"
version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "libc"
version = "0.2.144"
version = "0.2.146"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
[[package]]
name = "line-wrap"
@ -503,9 +509,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "lock_api"
version = "0.4.9"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
dependencies = [
"autocfg",
"scopeguard",
@ -513,12 +519,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.17"
version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if",
]
checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]]
name = "lzma-rs"
@ -547,9 +550,9 @@ dependencies = [
[[package]]
name = "memoffset"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
@ -565,14 +568,14 @@ dependencies = [
[[package]]
name = "mio"
version = "0.8.6"
version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
"log",
"wasi",
"windows-sys 0.45.0",
"windows-sys",
]
[[package]]
@ -595,16 +598,6 @@ dependencies = [
"pin-utils",
]
[[package]]
name = "num-integer"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
"autocfg",
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.15"
@ -635,9 +628,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.17.1"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "onig"
@ -673,15 +666,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
version = "0.9.7"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"redox_syscall 0.3.5",
"smallvec",
"windows-sys 0.45.0",
"windows-targets",
]
[[package]]
@ -735,9 +728,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.58"
version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8"
checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
dependencies = [
"unicode-ident",
]
@ -753,9 +746,9 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.27"
version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
dependencies = [
"proc-macro2",
]
@ -797,6 +790,15 @@ dependencies = [
"bitflags",
]
[[package]]
name = "redox_syscall"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
dependencies = [
"bitflags",
]
[[package]]
name = "redox_users"
version = "0.4.3"
@ -804,15 +806,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom",
"redox_syscall",
"redox_syscall 0.2.16",
"thiserror",
]
[[package]]
name = "regex-syntax"
version = "0.6.29"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "ryu"
@ -843,18 +845,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.163"
version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.163"
version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
dependencies = [
"proc-macro2",
"quote",
@ -863,9 +865,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.96"
version = "1.0.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
dependencies = [
"itoa",
"ryu",
@ -898,9 +900,9 @@ dependencies = [
[[package]]
name = "sha2"
version = "0.10.6"
version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
dependencies = [
"cfg-if",
"cpufeatures",
@ -962,9 +964,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
[[package]]
name = "syn"
version = "2.0.16"
version = "2.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
dependencies = [
"proc-macro2",
"quote",
@ -974,7 +976,7 @@ dependencies = [
[[package]]
name = "syntect"
version = "5.0.0"
source = "git+https://github.com/kyoheiu/syntect#b5212417475f678706bdc243d7adbf99b26923bd"
source = "git+https://github.com/kyoheiu/syntect#f0ece85c5a2dc4436442558babd9fc159dca372b"
dependencies = [
"bincode",
"bitflags",
@ -1033,9 +1035,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.21"
version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
dependencies = [
"itoa",
"libc",
@ -1108,9 +1110,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@ -1118,9 +1120,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
"log",
@ -1133,9 +1135,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -1143,9 +1145,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
@ -1156,9 +1158,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.86"
version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "winapi"
@ -1197,16 +1199,7 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
"windows-targets 0.48.0",
]
[[package]]
name = "windows-sys"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
"windows-targets 0.42.2",
"windows-targets",
]
[[package]]
@ -1215,22 +1208,7 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.0",
]
[[package]]
name = "windows-targets"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
"windows-targets",
]
[[package]]
@ -1239,93 +1217,51 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
dependencies = [
"windows_aarch64_gnullvm 0.48.0",
"windows_aarch64_msvc 0.48.0",
"windows_i686_gnu 0.48.0",
"windows_i686_msvc 0.48.0",
"windows_x86_64_gnu 0.48.0",
"windows_x86_64_gnullvm 0.48.0",
"windows_x86_64_msvc 0.48.0",
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.0"

6
pkgs/applications/file-managers/felix-fm/default.nix
View file

@ -9,19 +9,19 @@
rustPlatform.buildRustPackage rec {
pname = "felix";
version = "2.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yaAjw0Ayg0FuR5GVpmjwA7P1KfWFkXP0YsjNLhSl1FI=";
sha256 = "sha256-F2Zw72RdKarrwM47a+Wqe1R1TOK97Ek5AnmAe/0MheY=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"syntect-5.0.0" = "sha256-Ql3zpfjZ5nopmqZyVOJ8qcRA8eXm6ZYzLsAnGA1+upY=";
"syntect-5.0.0" = "sha256-RMdO5+oHLpNlAynvNIbCI0ia4KzaOO9IYwpiX6ZTwno=";
};
};

6
pkgs/applications/graphics/artem/default.nix
View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "artem";
version = "1.1.7";
version = "1.2.1";
src = fetchFromGitHub {
owner = "finefindus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wd8csdt7qOWFhUBRjqfJSEGnNDyHD7lJA8CtW+q4Kxg=";
sha256 = "sha256-T652cdKVZqoZ+EwXmTSs9x+ftjvWOELjy37trCP7V+0=";
};
cargoSha256 = "sha256-zFXQUQVPqTur7m+aL0JhSiZI+EEFo9nCTVu1yAOgp/I=";
cargoSha256 = "sha256-2LXpvAbkpk2sJHZJvytwLYksZK4coVYyKvuNRiDK0Gg=";
nativeBuildInputs = [ installShellFiles pkg-config ];

4
pkgs/applications/misc/electrum/default.nix
View file

@ -11,7 +11,7 @@
}:
let
version = "4.4.4";
version = "4.4.5";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.{v}"
@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "sha256-a0In9PARV3xSJCXggKicgmBBWjiUxGF/LbP4jLZTvxc=";
sha256 = "sha256-rTQcnEfHaFrLvPnI1IZl9uk2D0NFLn0PSaGsI9KyLr4=";
};
postUnpack = ''

40
pkgs/applications/misc/obs-cli/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, makeWrapper
}:
buildGoModule rec {
pname = "obs-cli";
version = "0.5.0";
src = fetchFromGitHub {
owner = "muesli";
repo = "obs-cli";
rev = "refs/tags/v${version}";
hash = "sha256-4tjS+PWyP/T0zs4IGE6VQ5c+3tuqxlBwfpPBVEcim6c=";
};
vendorHash = "sha256-tjQOHvmhHyVMqIJQvFaisEqci1wkB4ke/a+GSgwXzCo=";
proxyVendor = true;
nativeBuildInputs = [
makeWrapper
];
ldflags = [
"-s"
"-w"
];
meta = with lib; {
description = "OBS-cli is a command-line remote control for OBS";
homepage = "https://github.com/muesli/obs-cli";
changelog = "https://github.com/muesli/obs-cli/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ flexiondotorg ];
platforms = platforms.linux ++ platforms.darwin;
};
}

7
pkgs/applications/misc/protonup-qt/default.nix
View file

@ -1,14 +1,14 @@
{ appimageTools, fetchurl, lib }:
let
pname = "protonup-qt";
version = "2.7.7";
version = "2.8.0";
src = fetchurl {
url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage";
sha256 = "sha256-eDi13DYS4Rtj3ouuhRoET1Ctc4D7p50khqXNOSBIvto=";
hash = "sha256-o3Tsrdrj5qDcTqhdgdf4Lcpp9zfBQY+/l3Ohm1A/pm4=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 rec {
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
@ -27,6 +27,7 @@ appimageTools.wrapType2 rec {
license = licenses.gpl3;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
mainProgram = "protonup-qt";
changelog = "https://github.com/DavidoTek/ProtonUp-Qt/releases/tag/v${version}";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ michaelBelsanti ];
};

15
pkgs/applications/misc/taizen/default.nix
View file

@ -10,18 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "taizen";
version = "unstable-2020-05-02";
version = "unstable-2023-06-05";
src = fetchFromGitHub {
owner = "NerdyPepper";
repo = pname;
rev = "5e88a55abaa2bf4356aa5bc783c2957e59c63216";
sha256 = "sha256-cMykIh5EDGYZMJ5EPTU6G8YDXxfUzzfRfEICWmDUdrA=";
rev = "5486cd4f4c5aa4e0abbcee180ad2ec22839abd31";
hash = "sha256-pGcD3+3Ds3U8NuNySaDnz0zzAvZlSDte1jRPdM5qrZA=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
cargoHash = "sha256-2X9ZhqaQ6Y+mwXTMbvBQWLR24+KYYqjIqQy/8XqGi18=";
nativeBuildInputs = [ pkg-config ];
@ -32,11 +30,6 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.Security
];
# update Cargo.lock to work with openssl 3
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
meta = with lib; {
description = "curses based mediawiki browser";
homepage = "https://github.com/nerdypepper/taizen";

10
pkgs/applications/misc/todoist-electron/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_21, libsecret }:
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_24, libsecret }:
stdenv.mkDerivation rec {
pname = "todoist-electron";
version = "1.0.9";
version = "8.3.3";
src = fetchurl {
url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage";
sha256 = "sha256-DfNFDiGYTFGetVRlAjpV/cdWcGzRDEGZjR0Dc9aAtXc=";
url = "https://electron-dl.todoist.com/linux/Todoist-linux-x86_64-${version}.AppImage";
hash = "sha256-X928hCrYVOBTEZq1hmZWgWlabtOzQrLUuptF/SJcAto=";
};
appimageContents = appimageTools.extractType2 {
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
makeWrapper ${electron_21}/bin/electron $out/bin/${pname} \
makeWrapper ${electron_24}/bin/electron $out/bin/todoist-electron \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"

40
pkgs/applications/misc/watershot/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, wayland
, libxkbcommon
, fontconfig
, makeWrapper
, grim
}:
rustPlatform.buildRustPackage rec {
pname = "watershot";
version = "0.1.2";
src = fetchFromGitHub {
owner = "Kirottu";
repo = "watershot";
rev = "v${version}";
hash = "sha256-8GqO7Y0d+AoYr3Us3FEfNobrQNSw7XyGwmZz5HkVvDg=";
};
cargoHash = "sha256-yJD7c/I3rwzczcrxbD8sinzP7bjMzhWWAVcCFCsTdeo=";
nativeBuildInputs = [ pkg-config wayland makeWrapper ];
buildInputs = [ wayland fontconfig libxkbcommon ];
postInstall = ''
wrapProgram $out/bin/watershot \
--prefix PATH : ${lib.makeBinPath [ grim ]}
'';
meta = with lib; {
platforms = with platforms; linux;
description = "A simple wayland native screenshot tool";
homepage = "https://github.com/Kirottu/watershot";
license = licenses.gpl3Only;
maintainers = with maintainers; [ lord-valen ];
};
}

1
pkgs/applications/networking/browsers/elinks/default.nix
View file

@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
"--enable-finger"
"--enable-html-highlight"
"--enable-gopher"
"--enable-gemini"
"--enable-cgi"
"--enable-bittorrent"
"--enable-nntp"

810
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "114.0.1";
version = "114.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f";
sha512 = "1d514d09c6b964b96c6d52d54b89a89a92d53a6fe669e16a6370346c980db4d0ac6c502fa89219c71b680566b9eb982e9b3191c21f81d7326f34f6c837c0a872";
};
meta = {

10
pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix Normal file
View file

@ -0,0 +1,10 @@
{
traefik-crd = {
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz";
sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn";
};
traefik = {
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz";
sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6";
};
}

127
pkgs/applications/networking/cluster/k3s/1_27/update.sh Executable file
View file

@ -0,0 +1,127 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnugrep gnused jq yq-go nix-prefetch
set -x -eu -o pipefail
WORKDIR=$(mktemp -d)
trap "rm -rf ${WORKDIR}" EXIT
NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/
NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
cd ${NIXPKGS_K3S_PATH}
LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE}
LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \
grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | head -n1)
K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//')
K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
https://api.github.com/repos/k3s-io/k3s/tags \
| jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha")
K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz)
FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download
curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD
FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh
curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION
FILE_TRAEFIK_MANIFEST=${WORKDIR}/traefik.yml
curl --silent -f -o "$FILE_TRAEFIK_MANIFEST" https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml
CHART_FILES=( $(yq eval --no-doc .spec.chart "$FILE_TRAEFIK_MANIFEST" | xargs -n1 basename) )
# These files are:
# 1. traefik-crd-20.3.1+up20.3.0.tgz
# 2. traefik-20.3.1+up20.3.0.tgz
# at the time of writing
if [[ "${#CHART_FILES[@]}" != "2" ]]; then
echo "New manifest charts added, the packaging scripts will need to be updated: ${CHART_FILES}"
exit 1
fi
CHARTS_URL=https://k3s.io/k3s-charts/assets
# Get metadata for both files
rm -f chart-versions.nix.update
cat > chart-versions.nix.update <<EOF
{
traefik-crd = {
url = "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}";
sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}")";
};
traefik = {
url = "${CHARTS_URL}/traefik/${CHART_FILES[1]}";
sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik/${CHART_FILES[1]}")";
};
}
EOF
mv chart-versions.nix.update chart-versions.nix
FILE_GO_MOD=${WORKDIR}/go.mod
curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/go.mod > $FILE_GO_MOD
K3S_ROOT_VERSION=$(grep 'VERSION_ROOT=' ${FILE_SCRIPTS_VERSION} \
| cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//')
K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \
"https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar")
CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \
| cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//')
CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
"https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz")
CONTAINERD_VERSION=$(grep 'VERSION_CONTAINERD=' ${FILE_SCRIPTS_VERSION} \
| cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//')
CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \
"https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz")
CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \
| head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//')
setKV () {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_PATH}default.nix
}
FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
cat >versions.nix <<EOF
{
k3sVersion = "${K3S_VERSION}";
k3sCommit = "${K3S_COMMIT}";
k3sRepoSha256 = "${K3S_REPO_SHA256}";
k3sVendorSha256 = "${FAKE_HASH}";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "${K3S_ROOT_VERSION}";
k3sRootSha256 = "${K3S_ROOT_SHA256}";
k3sCNIVersion = "${CNIPLUGINS_VERSION}";
k3sCNISha256 = "${CNIPLUGINS_SHA256}";
containerdVersion = "${CONTAINERD_VERSION}";
containerdSha256 = "${CONTAINERD_SHA256}";
criCtlVersion = "${CRI_CTL_VERSION}";
}
EOF
set +e
K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })")
set -e
if [ -n "${K3S_VENDOR_SHA256:-}" ]; then
sed "s|${FAKE_HASH}|${K3S_VENDOR_SHA256}|g" ./versions.nix
else
echo "Update failed. K3S_VENDOR_SHA256 is empty."
exit 1
fi
# `git` flag here is to be used by local maintainers to speed up the bump process
if [ $# -eq 1 ] && [ "$1" = "git" ]; then
OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s.version or (builtins.parseDrvName k3s.name).version" | tr -d '"')"
git switch -c "package-k3s-${K3S_VERSION}"
git add "$NIXPKGS_K3S_PATH"/default.nix
git commit -m "k3s: ${OLD_VERSION} -> ${K3S_VERSION}"
fi

14
pkgs/applications/networking/cluster/k3s/1_27/versions.nix Normal file
View file

@ -0,0 +1,14 @@
{
k3sVersion = "1.27.1+k3s1";
k3sCommit = "bc5b42c27908ab430101eff0db0a0b22f870bd7a";
k3sRepoSha256 = "1xj3blfayrsfbcsljjdaswy49hhz8yiwf1d85arnsgbn8fidswpm";
k3sVendorSha256 = "sha256-+sM2fjS88kxMQzra2t+jU1IaKCoJpW7p3w7lCOv5mMU=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.1";
k3sRootSha256 = "0724yx3zk89m2239fmdgwzf9w672pik71xqrvgb7pdmknmmdn9f4";
k3sCNIVersion = "1.1.1-k3s1";
k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl";
containerdVersion = "1.6.19-k3s1";
containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr";
criCtlVersion = "1.26.0-rc.0-k3s1";
}

66
pkgs/applications/networking/cluster/k3s/1_26/default.nix → pkgs/applications/networking/cluster/k3s/builder.nix
View file

@ -1,5 +1,10 @@
{ stdenv
, lib
# builder.nix contains a "builder" expression that, given k3s version and hash
# variables, creates a package for that version.
# Due to variance in k3s's build process, this builder only works for k3s 1.26+
# currently.
# It is likely we will have to split out additional builders for additional
# versions in the future, or customize this one further.
{ lib
, makeWrapper
, socat
, iptables
@ -27,6 +32,30 @@
, pkgsBuildBuild
}:
{
# git tag
k3sVersion,
# commit hash
k3sCommit,
k3sRepoSha256 ? lib.fakeHash,
k3sVendorSha256 ? lib.fakeHash,
# taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47
k3sRootVersion,
k3sRootSha256 ? lib.fakeHash,
# Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32
# see also https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/manifests/traefik.yaml#L8
chartVersions,
# taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45
k3sCNIVersion,
k3sCNISha256 ? lib.fakeHash,
# taken from ./scripts/version.sh VERSION_CONTAINERD
containerdVersion,
containerdSha256 ? lib.fakeHash,
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
criCtlVersion,
updateScript ? null,
}:
# k3s is a kinda weird derivation. One of the main points of k3s is the
# simplicity of it being one binary that can perform several tasks.
# However, when you have a good package manager (like nix), that doesn't
@ -47,31 +76,6 @@
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.26.4+k3s1"; # k3s git tag
k3sCommit = "8d0255af07e95b841952563253d27b0d10bd72f0"; # k3s git commit at the above version
k3sRepoSha256 = "0qlszdnlsvj3hzx2p0wl3zhaw908w8a62z6vlf2g69a3c75f55cs";
k3sVendorSha256 = "sha256-JXTsZYtTspu/pWMRSS2BcegktawBJ6BK7YEKbz1J/ao=";
# nix generated by update.sh
# Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32
# see also https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/manifests/traefik.yaml#L8
# At the time of writing, there are two traefik charts, and that's it
charts = import ./chart-versions.nix;
# taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47
k3sRootVersion = "0.12.1";
k3sRootSha256 = "0724yx3zk89m2239fmdgwzf9w672pik71xqrvgb7pdmknmmdn9f4";
# taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45
k3sCNIVersion = "1.1.1-k3s1";
k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl";
# taken from ./scripts/version.sh VERSION_CONTAINERD
containerdVersion = "1.6.19-k3s1";
containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr";
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
criCtlVersion = "1.26.0-rc.0-k3s1";
baseMeta = with lib; {
description = "A lightweight Kubernetes distribution";
@ -99,8 +103,8 @@ let
];
# bundled into the k3s binary
traefikChart = fetchurl charts.traefik;
traefik-crdChart = fetchurl charts.traefik-crd;
traefikChart = fetchurl chartVersions.traefik;
traefik-crdChart = fetchurl chartVersions.traefik-crd;
# so, k3s is a complicated thing to package
# This derivation attempts to avoid including any random binaries from the
@ -168,7 +172,7 @@ let
# derivation when we've built all the binaries, but haven't bundled them in
# with generated bindata yet.
k3sServer = buildGoModule rec {
k3sServer = buildGoModule {
pname = "k3s-server";
version = k3sVersion;
@ -322,7 +326,7 @@ buildGoModule rec {
$out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null
'';
passthru.updateScript = ./update.sh;
passthru.updateScript = updateScript;
passthru.mkTests = version:
let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version);

26
pkgs/applications/networking/cluster/k3s/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib, stdenv, callPackage }:
let
k3s_builder = import ./builder.nix;
in
{
k3s_1_26 = (callPackage k3s_builder { }) {
k3sVersion = "1.26.4+k3s1";
k3sCommit = "8d0255af07e95b841952563253d27b0d10bd72f0";
k3sRepoSha256 = "0qlszdnlsvj3hzx2p0wl3zhaw908w8a62z6vlf2g69a3c75f55cs";
k3sVendorSha256 = "sha256-JXTsZYtTspu/pWMRSS2BcegktawBJ6BK7YEKbz1J/ao=";
chartVersions = import ./1_26/chart-versions.nix;
k3sRootVersion = "0.12.1";
k3sRootSha256 = "0724yx3zk89m2239fmdgwzf9w672pik71xqrvgb7pdmknmmdn9f4";
k3sCNIVersion = "1.1.1-k3s1";
k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl";
containerdVersion = "1.6.19-k3s1";
containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr";
criCtlVersion = "1.26.0-rc.0-k3s1";
};
# 1_27 can be built with the same builder as 1_26
k3s_1_27 = (callPackage k3s_builder { }) (import ./1_27/versions.nix) // {
updateScript = ./1_27/update-script.sh;
};
}

4
pkgs/applications/networking/cluster/kubernetes/default.nix
View file

@ -20,13 +20,13 @@
buildGoModule rec {
pname = "kubernetes";
version = "1.27.2";
version = "1.27.3";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
hash = "sha256-9Xeehm9E9ZZheS1Wgl4INAIIa0mZc+MMyr/0d81dsSg=";
hash = "sha256-g/YRwhhGjeBhbSFS/6xJbljTTMiwJHE3WRySwJlzKys=";
};
vendorHash = null;

26
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -46,11 +46,11 @@
"vendorHash": "sha256-Z7HlUJ5VuQ7rBhoprmvS6HwNZ53iUoBnfXzKTV43bzE="
},
"alicloud": {
"hash": "sha256-fmVu1YYHKy6cW5/CTyYcdvk7Srhpbnz0CGk6GAMRKCU=",
"hash": "sha256-RtxWaEcDSC2lZX6eiqEnJJMj/spvFjqjUP1Ao0p8S2Q=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.206.0",
"rev": "v1.207.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -446,24 +446,24 @@
"vendorHash": "sha256-KD9X7EOH1btgLtssuz1FFOGtmfNao8HBcKJDty1wtpY="
},
"google": {
"hash": "sha256-ShfbbVo53EughhmflIJgiLkW2J6VJHqUJ4tgoCIcJ0w=",
"hash": "sha256-a0ReG2hwsPG6h93df+yRrhFSNXv0EOsxoSU7B+S90jA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.69.1",
"rev": "v4.70.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-xMnkZYZikJX0aCvRc07ONMsXTv9DUgGArge+6evTyCE="
"vendorHash": "sha256-0ZCyJiFzfWvmV+dNNUWKopdEHreXyjRFpaCA8BWil3k="
},
"google-beta": {
"hash": "sha256-QvW1BRZn0d0uzPw385w7FTrlVkRIQ0Qz3ImlF7L+sE4=",
"hash": "sha256-p8RnKNSa5qugzNUlYmoMy+m/Gy0m3yO+GLfDwALduvM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.69.1",
"rev": "v4.70.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-xMnkZYZikJX0aCvRc07ONMsXTv9DUgGArge+6evTyCE="
"vendorHash": "sha256-0ZCyJiFzfWvmV+dNNUWKopdEHreXyjRFpaCA8BWil3k="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -593,11 +593,11 @@
"vendorHash": null
},
"infoblox": {
"hash": "sha256-mfRhS+GP7ygAY6SsD2p4jj+C7iZ8SbxHOLGeZVm7a8M=",
"hash": "sha256-655WGpwE1BmWRdikvHtxxX8u4kOZ9cSLCZDr6QGfn5Y=",
"homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox",
"owner": "infobloxopen",
"repo": "terraform-provider-infoblox",
"rev": "v2.4.0",
"rev": "v2.4.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -674,13 +674,13 @@
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="
},
"linode": {
"hash": "sha256-wv45KDeCLQgQH7m22PM8Wm4aWGrXQd/n72bSoDkJtkE=",
"hash": "sha256-9Z1FxCWNDlQ64ZY7UBQkQQJJpZeshw7kkeyjFCt/Fos=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
"rev": "v2.4.0",
"rev": "v2.5.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-mYsX74Zcs16LAjCpOa33H/Im/52uJeIPsJNOThW8/w8="
"vendorHash": "sha256-n9ZZsTNE4E3T3SjF3+JjElDq5PVaD9o2Q2ATexRS/q0="
},
"linuxbox": {
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",

4
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -166,8 +166,8 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.5.0";
hash = "sha256-QLCmA4u0br9EyQ244VcpLW5GkZm+bhq2/vvxSbYolCY=";
version = "1.5.1";
hash = "sha256-dqnJGIoUJP37Z77TR2RBxP94Hx3AZbx90m8z1FoYdw0=";
vendorHash = "sha256-tfCfJj39VP+P4qhJTpEIAi4XB+6VYtVKkV/bTrtnFA0=";
patches = [ ./provider-path-0_15.patch ];
passthru = {

6
pkgs/applications/networking/cluster/weave-gitops/default.nix
View file

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "weave-gitops";
version = "0.23.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nXFR+X63yp9IFTeW41ncBt77bCD3QFTs4phJMMLWrxs=";
sha256 = "sha256-sHk9ULh/792BEjPRcaeY3umx3pcLb41urrrouunm9nw=";
};
ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ];
vendorSha256 = "sha256-3CgR9F3Bz4k1MVOufaF/E2GD6+bTOnnUqOXkNO9ZFrc=";
vendorSha256 = "sha256-Q9LjKgaFUx4txJlPcrG/YIbHV4hh5oWHVXIBDDgKYRg=";
subPackages = [ "cmd/gitops" ];

4
pkgs/applications/networking/flexget/default.nix
View file

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.7.5";
version = "3.7.7";
format = "pyproject";
# Fetch from GitHub in order to use `requirements.in`
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-abnCXRlpGp3+6zjKVOtlxjcC5VdaHjMyPC9PRlABJIA=";
hash = "sha256-NBuiAaD7V4qTujsN8hoBYWzCCEmOTQb5qbpE0erh4oI=";
};
postPatch = ''

10
pkgs/applications/networking/instant-messengers/fluffychat/default.nix
View file

@ -1,24 +1,24 @@
{ lib
, fetchFromGitLab
, imagemagick
, flutter37
, flutter
, makeDesktopItem
, gnome
}:
flutter37.buildFlutterApplication rec {
version = "1.11.2";
flutter.buildFlutterApplication rec {
version = "1.12.1";
name = "fluffychat";
src = fetchFromGitLab {
owner = "famedly";
repo = "fluffychat";
rev = "v${version}";
hash = "sha256-vHzZDkSgxcZf3y/+A645hxBverm34J5xNnNwyxnSVUA=";
hash = "sha256-F4oVscw5L8iQZtz5K+yo4tlPYYv1wfs88oyq5Uds20I=";
};
depsListFile = ./deps.json;
vendorHash = "sha256-u8YI4UBnEfPpvjBfhbo4LGolb56w94EiUlnLlYITdXQ=";
vendorHash = "sha256-u0cQ5ejyxhw4du3jXRB8oWsAlMtbw5nX+SMUUCuwklE=";
desktopItem = makeDesktopItem {
name = "Fluffychat";

671
pkgs/applications/networking/instant-messengers/fluffychat/deps.json generated
View file

File diff suppressed because it is too large Load diff

65
pkgs/applications/networking/instant-messengers/wavebox/default.nix
View file

@ -1,59 +1,80 @@
{ alsa-lib, autoPatchelfHook, fetchurl, gtk3, libnotify
, makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg-utils
{ alsa-lib
, autoPatchelfHook
, fetchurl
, gtk3
, gtk4
, libnotify
, makeDesktopItem
, makeWrapper
, mesa
, nss
, lib
, libdrm
, qt5
, stdenv
, udev
, xdg-utils
, xorg
}:
let
bits = "x86_64";
version = "4.11.3";
version = "10.114.26-2";
desktopItem = makeDesktopItem rec {
name = "Wavebox";
exec = "wavebox";
icon = "wavebox";
desktopName = name;
genericName = name;
categories = [ "Network" ];
categories = [ "Network" "WebBrowser" ];
};
tarball = "Wavebox_${lib.replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz";
tarball = "Wavebox_${version}.tar.gz";
in stdenv.mkDerivation {
in
stdenv.mkDerivation {
pname = "wavebox";
inherit version;
src = fetchurl {
url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
sha256 = "0z04071lq9bfyrlg034fmvd4346swgfhxbmsnl12m7c2m2b9z784";
url = "https://download.wavebox.app/stable/linux/tar/${tarball}";
sha256 = "1yk664zgahjg6n98n3kc9avcay0nqwcyq8wq231p7kvd79zazk0r";
};
# don't remove runtime deps
dontPatchELF = true;
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
nativeBuildInputs = [ autoPatchelfHook makeWrapper qt5.wrapQtAppsHook ];
buildInputs = with xorg; [
libXdmcp libXScrnSaver libXtst
libXdmcp
libXScrnSaver
libXtst
libxshmfence
libXdamage
] ++ [
alsa-lib gtk3 nss
alsa-lib
gtk3
nss
libdrm
mesa
gtk4
qt5.qtbase
];
runtimeDependencies = [ (lib.getLib udev) libnotify ];
runtimeDependencies = [ (lib.getLib udev) libnotify gtk4 ];
installPhase = ''
mkdir -p $out/bin $out/opt/wavebox
cp -r * $out/opt/wavebox
# provide desktop item and icon
mkdir -p $out/share/applications $out/share/pixmaps
mkdir -p $out/share/applications $out/share/icons/hicolor/128x128/apps
ln -s ${desktopItem}/share/applications/* $out/share/applications
ln -s $out/opt/wavebox/Wavebox-linux-x64/wavebox_icon.png $out/share/pixmaps/wavebox.png
ln -s $out/opt/wavebox/product_logo_128.png $out/share/icons/hicolor/128x128/apps/wavebox.png
'';
postFixup = ''
# make xdg-open overrideable at runtime
makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \
--suffix PATH : ${xdg-utils}/bin
makeWrapper $out/opt/wavebox/wavebox-launcher $out/bin/wavebox \
--prefix PATH : ${xdg-utils}/bin
'';
meta = with lib; {
@ -61,7 +82,7 @@ in stdenv.mkDerivation {
homepage = "https://wavebox.io";
license = licenses.mpl20;
maintainers = with maintainers; [ rawkode ];
platforms = ["x86_64-linux"];
hydraPlatforms = [];
platforms = [ "x86_64-linux" ];
hydraPlatforms = [ ];
};
}

6
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file

@ -50,7 +50,7 @@ let
# find where to edit them.
versions.aarch64-darwin = "5.14.10.19202";
versions.x86_64-darwin = "5.14.10.19202";
versions.x86_64-linux = "5.14.10.3738";
versions.x86_64-linux = "5.15.0.4063";
srcs = {
aarch64-darwin = fetchurl {
@ -64,7 +64,7 @@ let
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-ccuTzvsbygifFVCp5LJkMmKBZK2amMbAesXDlNXxoco=";
hash = "sha256-DhP6LZt/G3K9YDs7iXABsJMuhpzITP4aJ0PWXrFAL3I=";
};
};
@ -194,6 +194,6 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = builtins.attrNames srcs;
maintainers = with maintainers; [ danbst tadfisher doronbehar ];
maintainers = with maintainers; [ danbst tadfisher ];
};
}

6
pkgs/applications/networking/shellhub-agent/default.nix
View file

@ -11,18 +11,18 @@
buildGo120Module rec {
pname = "shellhub-agent";
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
sha256 = "dOqBisB2nxJPvlB9BA69a0ODk5eFrjPnfMBCGFBig3s=";
sha256 = "9ZOLbws2jRjUK3IK2HnRF6TDk3ZXAtE/oCjAR5BjqlM=";
};
modRoot = "./agent";
vendorSha256 = "sha256-gVW0vyfQ8i3HaTAJMZLWZvSjuRZcPPCj+BLPL5A6uzM=";
vendorSha256 = "sha256-7T2MWwcq99AF8d/DM2n8xROroRSqiEKY+58x9UZ3fow=";
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];

2
pkgs/applications/networking/sniffers/wireshark/default.nix
View file

@ -82,7 +82,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ]
++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.stdenv.cc ];
buildInputs = [
gettext

14
pkgs/applications/networking/wgcf/default.nix
View file

@ -2,23 +2,23 @@
buildGoModule rec {
pname = "wgcf";
version = "2.2.14";
version = "2.2.18";
src = fetchFromGitHub {
owner = "ViRb3";
repo = pname;
rev = "v${version}";
hash = "sha256-6V4fIoFB0fuCEu1Rj8QWGDNdgystrD/gefjbshvxVsw=";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-MTh92TlMQeIMmysQLcdsz45JHGJdOyR4oABjJUPobfE=";
};
subPackages = ".";
vendorSha256 = "sha256-NGlV/qcnUlNLvt3uVRdfx+lUDgqAEBEowW9WIHBY+AI=";
vendorHash = "sha256-4VOjxGboYO00tJ17LNAYXiKQVUSUoveEYG/L+idYY6s=";
meta = with lib; {
description = "Cross-platform, unofficial CLI for Cloudflare Warp";
homepage = "https://github.com/ViRb3/wgcf";
license = licenses.mit;
homepage = "https://github.com/ViRb3/wgcf";
license = licenses.mit;
maintainers = with maintainers; [ yureien ];
};
}

4
pkgs/applications/science/electronics/verilator/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "verilator";
version = "5.010";
version = "5.012";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-NaWatK4sAc+MJolbQs4TDaD9TvY6VAj/KVZBkIq++sQ=";
hash = "sha256-Y6GkIgkauayJmGhOQg2kWjbcxYVIob6InMopv555Lb8=";
};
enableParallelBuilding = true;

6
pkgs/applications/version-management/gh/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.30.0";
version = "2.31.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
hash = "sha256-eS0TrN/WWJvXzyDhGg4waNpRYp/Kt9kXmIfFs0F4oFQ=";
hash = "sha256-HZ64Dz2vluRkrwOe1oXwBm/hATsqxlFq4VC9L758cwE=";
};
vendorHash = "sha256-bTAg3HKX+m5/sDtXU5h2965T9xaosRmhKKixp84xPdk=";
vendorHash = "sha256-eq/2w16KL2Mrt7jZJStRFosLVpw6qfnGLAhes0iZAdg=";
nativeBuildInputs = [ installShellFiles ];

12
pkgs/applications/video/obs-studio/plugins/default.nix
View file

@ -20,6 +20,8 @@
obs-command-source = callPackage ./obs-command-source.nix { };
obs-gradient-source = callPackage ./obs-gradient-source.nix { };
obs-gstreamer = callPackage ./obs-gstreamer.nix { };
obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { };
@ -38,16 +40,26 @@
obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { };
obs-scale-to-sound = callPackage ./obs-scale-to-sound.nix { };
obs-shaderfilter = qt6Packages.callPackage ./obs-shaderfilter.nix { };
obs-source-clone = callPackage ./obs-source-clone.nix { };
obs-source-record = callPackage ./obs-source-record.nix { };
obs-source-switcher = callPackage ./obs-source-switcher.nix { };
obs-teleport = callPackage ./obs-teleport { };
obs-text-pthread = callPackage ./obs-text-pthread.nix { };
obs-transition-table = qt6Packages.callPackage ./obs-transition-table.nix { };
obs-vaapi = callPackage ./obs-vaapi { };
obs-vertical-canvas = qt6Packages.callPackage ./obs-vertical-canvas.nix { };
obs-vintage-filter = callPackage ./obs-vintage-filter.nix { };
obs-vkcapture = callPackage ./obs-vkcapture.nix {

37
pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, obs-studio
}:
stdenv.mkDerivation rec {
pname = "obs-gradient-source";
version = "0.3.1";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-gradient-source";
rev = version;
sha256 = "sha256-4u7RzF2b7EWwsfEtRvGDifue34jJM4MaYpwumu0MFpQ=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
cmakeFlags = [
"-DBUILD_OUT_OF_TREE=On"
];
postInstall = ''
rm -rf $out/obs-plugins $out/data
'';
meta = with lib; {
description = "Plugin for adding a gradient Source to OBS Studio";
homepage = "https://github.com/exeldro/obs-gradient-source";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

40
pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, obs-studio
}:
stdenv.mkDerivation rec {
pname = "obs-scale-to-sound";
version = "1.2.3";
src = fetchFromGitHub {
owner = "dimtpap";
repo = "obs-scale-to-sound";
rev = version;
sha256 = "sha256-q/zNHPazNwmd7GHXrxNgajtOhcW+oTgH9rkIBzJpdpA=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
cmakeFlags = [
"-DBUILD_OUT_OF_TREE=On"
];
postInstall = ''
mkdir $out/lib $out/share
mv $out/obs-plugins/64bit $out/lib/obs-plugins
rm -rf $out/obs-plugins
mv $out/data $out/share/obs
'';
meta = with lib; {
description = "OBS filter plugin that scales a source reactively to sound levels";
homepage = "https://github.com/dimtpap/obs-scale-to-sound";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

37
pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, obs-studio
}:
stdenv.mkDerivation rec {
pname = "obs-source-switcher";
version = "0.4.1";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-source-switcher";
rev = "8babf207d140e52114b6db63d98749d7a0a2758b";
sha256 = "sha256-J/NdIGsSXCtSOGF72pJZqqN5Y73eJfrA72LgZcTlP5o=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
cmakeFlags = [
"-DBUILD_OUT_OF_TREE=On"
];
postInstall = ''
rm -rf $out/obs-plugins $out/data
'';
meta = with lib; {
description = "Plugin for OBS Studio to switch between a list of sources";
homepage = "https://github.com/exeldro/obs-source-switcher";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

39
pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix Normal file
View file

@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, cairo
, obs-studio
, pango
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "obs-text-pthread";
version = "2.0.2";
src = fetchFromGitHub {
owner = "norihiro";
repo = "obs-text-pthread";
rev = version;
sha256 = "sha256-HN8tSagxmk6FusDrp7d0fi15ardFgUCZBiYkeBqUI34=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ cairo obs-studio pango ];
postInstall = ''
mkdir $out/lib $out/share
mv $out/obs-plugins/64bit $out/lib/obs-plugins
rm -rf $out/obs-plugins
mv $out/data $out/share/obs
'';
meta = with lib; {
description = "Rich text source plugin for OBS Studio";
homepage = "https://github.com/norihiro/obs-text-pthread";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

40
pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, obs-studio
, qtbase
}:
stdenv.mkDerivation rec {
pname = "obs-transition-table";
version = "0.2.6";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-transition-table";
rev = version;
sha256 = "sha256-Is2XWMPhqd/rd6cXc40eSZTvSRpbroTBzM4SPfHOWPg=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio qtbase ];
cmakeFlags = [
"-DBUILD_OUT_OF_TREE=On"
];
dontWrapQtApps = true;
postInstall = ''
rm -rf $out/obs-plugins $out/data
'';
meta = with lib; {
description = "Plugin for OBS Studio to add a Transition Table to the tools menu.";
homepage = "https://github.com/exeldro/obs-transition-table";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

42
pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, curl
, obs-studio
, qtbase
}:
stdenv.mkDerivation rec {
pname = "obs-vertical-canvas";
version = "1.2.2";
src = fetchFromGitHub {
owner = "Aitum";
repo = "obs-vertical-canvas";
rev = version;
sha256 = "sha256-9NXIJPF6ubd9M3t5pmSQvADoLmm+XolRhIvhbqw9R04=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ curl obs-studio qtbase ];
cmakeFlags = [
"-DBUILD_OUT_OF_TREE=On"
];
dontWrapQtApps = true;
postInstall = ''
rm -rf $out/data
rm -rf $out/obs-plugins
'';
meta = with lib; {
description = "Plugin for OBS Studio to add vertical canvas";
homepage = "https://github.com/Aitum/obs-vertical-canvas";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

4
pkgs/applications/video/streamlink/default.nix
View file

@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "5.3.0";
version = "5.5.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-+9MSSzPYZ8gwOeQLehR41SklfdcUn8Pa6TI//lh9twE=";
hash = "sha256-srT+jWQ22+e87HjeLUu3gBVjiFYUNbYaGWMVbp/F+9A=";
};
nativeCheckInputs = with python3Packages; [

11
pkgs/applications/video/ustreamer/default.nix
View file

@ -2,23 +2,20 @@
stdenv.mkDerivation rec {
pname = "ustreamer";
version = "5.38";
version = "5.41";
src = fetchFromGitHub {
owner = "pikvm";
repo = "ustreamer";
rev = "v${version}";
sha256 = "sha256-pc1Pf8KnjGPb74GbcmHaj/XCD0wjgiglaAKjnZUa6Ag=";
hash = "sha256-N70wBKiKfOhlAR9qOSkc6dlO44lJXHWiUYb8nwXMKxo=";
};
buildInputs = [ libbsd libevent libjpeg ];
enableParallelBuilding = true;
makeFlags = [ "PREFIX=${placeholder "out"}" ];
installPhase = ''
mkdir -p $out/bin
cp ustreamer $out/bin/
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://github.com/pikvm/ustreamer";

22
pkgs/build-support/fetchgit/nix-prefetch-git
View file

@ -206,27 +206,7 @@ checkout_ref(){
# Update submodules
init_submodules(){
# Add urls into .git/config file
clean_git submodule init
# list submodule directories and their hashes
git submodule status |
while read -r l; do
local hash
local dir
local name
local url
# checkout each submodule
hash=$(echo "$l" | awk '{print $1}' | tr -d '-')
dir=$(echo "$l" | sed -n 's/^.[0-9a-f]\+ \(.*[^)]*\)\( (.*)\)\?$/\1/p')
name=$(
git config -f .gitmodules --get-regexp submodule\..*\.path |
sed -n "s,^\(.*\)\.path $dir\$,\\1,p")
url=$(git config --get "${name}.url")
clone "$dir" "$url" "$hash" ""
done
clean_git submodule update --init --recursive -j $NIX_BUILD_CORES
}
clone(){

4
pkgs/data/fonts/noto-fonts/default.nix
View file

@ -228,14 +228,14 @@ rec {
noto-fonts-emoji-blob-bin =
let
pname = "noto-fonts-emoji-blob-bin";
version = "14.0.1";
version = "15.0";
in
stdenvNoCC.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf";
hash = "sha256-w9s7uF6E6nomdDmeKB4ATcGB/5A4sTwDvwHT3YGXz8g=";
hash = "sha256-3MPWZ1A2ups171dNIiFTJ3C1vZiGy6I8ZF70aUfrePk=";
};
dontUnpack = true;

4
pkgs/data/themes/catppuccin-gtk/default.nix
View file

@ -28,13 +28,13 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "0.4.1";
version = "0.6.1";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "gtk";
rev = "v${version}";
sha256 = "sha256-dzRXt9/OdPyiy3mu9pmPYeu69OXCnR+zEqbD1C5BKqM=";
sha256 = "sha256-b03V/c2do5FSm4Q0yN7V0RuoQX1fYsBd//Hj3R5MESI=";
};
nativeBuildInputs = [ gtk3 sassc ];

2
pkgs/data/themes/catppuccin-kvantum/default.nix
View file

@ -33,6 +33,6 @@ in
homepage = "https://github.com/catppuccin/Kvantum";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ggwpaiushtha];
maintainers = with maintainers; [ bastaynav ];
};
}

5
pkgs/data/themes/fluent-gtk-theme/default.nix
View file

@ -23,13 +23,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborde
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-12-15";
version = "2023-06-20";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-lGT6MIpc7cdAznZlbSJJ7aBzZPHucyfR8ZNMdJI0LP8=";
hash = "sha256-hUXlzLdcWeOHEJx3+vCMpxvJst6Rr8ISvlzlsUgCrhg=";
};
nativeBuildInputs = [
@ -57,6 +57,7 @@ stdenvNoCC.mkDerivation rec {
${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \
${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \
${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
--icon nixos \
--dest $out/share/themes
jdupes --quiet --link-soft --recurse $out/share

4
pkgs/data/themes/vimix/default.nix
View file

@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "flat" "grey" "mix" "translucent" ] twe
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2023-01-25";
version = "2023-06-21";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "4IJMLSUsZvtPfuMS+NYkKo8K3laec2YJk20d5tL0vKI=";
sha256 = "/LZj7iVWJI4U66XC15TuLnqXVEIF/lOlV+Jujf54NV0=";
};
nativeBuildInputs = [

2
pkgs/desktops/plasma-5/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.5/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.6/ -A '*.tar.xz' )

2
pkgs/desktops/plasma-5/flatpak-kcm.nix
View file

@ -4,6 +4,7 @@
, kcmutils
, kconfig
, kdeclarative
, kitemmodels
}:
mkDerivation {
@ -14,5 +15,6 @@ mkDerivation {
kcmutils
kconfig
kdeclarative
kitemmodels
];
}

2
pkgs/desktops/plasma-5/plasma-sdk.nix
View file

@ -16,11 +16,11 @@
, ktexteditor
, kwidgetsaddons
, kdoctools
, qtbase
}:
mkDerivation {
pname = "plasma-sdk";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
karchive

54
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
View file

@ -1,20 +1,21 @@
From 65ed69a38a9ffee21f0eb36de1f7a3f152111cad Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Mon, 7 Sep 2020 18:09:52 +0100
Subject: [PATCH] startkde
---
startkde/plasma-session/startup.cpp | 2 +-
startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +-
startkde/startplasma.cpp | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
index 46363ddcb..d787f9993 100644
--- a/kcms/krdb/krdb.cpp
+++ b/kcms/krdb/krdb.cpp
@@ -468,7 +468,7 @@ void runRdb(unsigned int flags)
proc.execute();
// Needed for applications that don't set their own cursor.
- QProcess::execute(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
+ QProcess::execute(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
applyGtkStyles(1);
applyGtkStyles(2);
diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
index 270744053..356160e96 100644
index ffec07ebf..11e70fef8 100644
--- a/startkde/plasma-session/startup.cpp
+++ b/startkde/plasma-session/startup.cpp
@@ -179,7 +179,7 @@ Startup::Startup(QObject *parent)
@@ -176,7 +176,7 @@ Startup::Startup(QObject *parent)
}
// Keep for KF5; remove in KF6 (KInit will be gone then)
@ -24,10 +25,10 @@ index 270744053..356160e96 100644
KJob *phase1 = nullptr;
m_lock.reset(new QEventLoopLocker);
diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
index 3a054a04f..b2e7ab3fb 100644
index 04875c358..5822af37c 100644
--- a/startkde/startplasma-wayland.cpp
+++ b/startkde/startplasma-wayland.cpp
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
out << "startplasma-wayland: Shutting down...\n";
// Keep for KF5; remove in KF6 (KInit will be gone then)
@ -37,10 +38,10 @@ index 3a054a04f..b2e7ab3fb 100644
out << "startplasmacompositor: Shutting down...\n";
cleanupPlasmaEnvironment(oldSystemdEnvironment);
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
index d6b2c5439..534eeb0e5 100644
index 8e82e29c3..1ed176706 100644
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
out << "startkde: Shutting down...\n";
// Keep for KF5; remove in KF6 (KInit will be gone then)
@ -50,10 +51,10 @@ index d6b2c5439..534eeb0e5 100644
cleanupPlasmaEnvironment(oldSystemdEnvironment);
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index 008fdfcaf..72468f21c 100644
index b0158c97d..c8f7fe223 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -50,7 +50,7 @@ QTextStream out(stderr);
@@ -50,7 +50,7 @@ void sigtermHandler(int signalNumber)
void messageBox(const QString &text)
{
out << text;
@ -62,16 +63,7 @@ index 008fdfcaf..72468f21c 100644
}
QStringList allServices(const QLatin1String &prefix)
@@ -412,7 +412,7 @@ void setupX11()
// If the user has overwritten fonts, the cursor font may be different now
// so don't move this up.
- runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
+ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
}
void cleanupPlasmaEnvironment(const std::optional<QProcessEnvironment> &oldSystemdEnvironment)
@@ -501,7 +501,7 @@ QProcess *setupKSplash()
@@ -484,7 +484,7 @@ QProcess *setupKSplash()
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
p->setProcessChannelMode(QProcess::ForwardedChannels);
@ -80,5 +72,3 @@ index 008fdfcaf..72468f21c 100644
}
}
return p;
--
2.33.0

472
pkgs/desktops/plasma-5/srcs.nix
View file

@ -4,475 +4,475 @@
{
aura-browser = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/aura-browser-5.27.5.tar.xz";
sha256 = "0vqw9kxskx3d6wfgrfbhrsw2vy71zr3cwhmfk7qj4vfpmilmsvy5";
name = "aura-browser-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/aura-browser-5.27.6.tar.xz";
sha256 = "1ppsxzy6hdnnsrrhlx5b7vq1f8v2d1rhfg5j5ypa77ixvi1yglh2";
name = "aura-browser-5.27.6.tar.xz";
};
};
bluedevil = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/bluedevil-5.27.5.tar.xz";
sha256 = "1vadllkv4fjjwqb30jyawi56jflslw5nc391r0bixg55cpk5llv1";
name = "bluedevil-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/bluedevil-5.27.6.tar.xz";
sha256 = "0x6zfcdw03kggd4mhkhva2b2v2w2ajzs7svslm1p1p8f41vzivvw";
name = "bluedevil-5.27.6.tar.xz";
};
};
breeze = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/breeze-5.27.5.tar.xz";
sha256 = "0s68zr21wniqsdkb14lzqz0hj7hb4mbvcwrq7sf8yxf0z1ds7n3h";
name = "breeze-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/breeze-5.27.6.tar.xz";
sha256 = "0v3cz9phdalvawfjrg3yirn2n4z6h872p12g7hcf8706bdz8v6jx";
name = "breeze-5.27.6.tar.xz";
};
};
breeze-grub = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/breeze-grub-5.27.5.tar.xz";
sha256 = "0kkrsda7ml3cbvfxb0ng3np1bk61fnl1jndk3c13lyi0jj97na7f";
name = "breeze-grub-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/breeze-grub-5.27.6.tar.xz";
sha256 = "0lg2fba5v22z666wkbm5a6gzlq79jxski1cqnpp1z5laj7nrh8mv";
name = "breeze-grub-5.27.6.tar.xz";
};
};
breeze-gtk = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/breeze-gtk-5.27.5.tar.xz";
sha256 = "0s69alp490yhm2v42vkngz99ji4b10n6fd36ybf72m6nnkd6v5f4";
name = "breeze-gtk-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/breeze-gtk-5.27.6.tar.xz";
sha256 = "1nkbhcsb359sqjampyc7cyl0hfnrx6gsrnqgaskdwk92p49snamc";
name = "breeze-gtk-5.27.6.tar.xz";
};
};
breeze-plymouth = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/breeze-plymouth-5.27.5.tar.xz";
sha256 = "0k014dvx2sw4hd63n74vjglg8dgyjjlvipxhb5cfp44x7ch52wii";
name = "breeze-plymouth-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/breeze-plymouth-5.27.6.tar.xz";
sha256 = "0gjg3ddc3g45dnj0lv5k52bf1v403qpgv2nhqrx9z3x43kidb3vc";
name = "breeze-plymouth-5.27.6.tar.xz";
};
};
discover = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/discover-5.27.5.tar.xz";
sha256 = "06xk780a60f4a1n2052q1wxydjvvb8nlw9r2cj7x4rg02s57hpvq";
name = "discover-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/discover-5.27.6.tar.xz";
sha256 = "1ici6p7bvvfszcy79lrr5xa6q1kfskxyijfr2pq9lkdhn8sdfq8n";
name = "discover-5.27.6.tar.xz";
};
};
drkonqi = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/drkonqi-5.27.5.tar.xz";
sha256 = "0mmcp5fzlygcchv5v10mn39iqfxjxig9x8h74n3hq0rw7arax3a4";
name = "drkonqi-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/drkonqi-5.27.6.tar.xz";
sha256 = "04yam1xjwxi6jbh4r2k0ci7vdjc5cwfg4nn36lb64f5gj2bicppr";
name = "drkonqi-5.27.6.tar.xz";
};
};
flatpak-kcm = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/flatpak-kcm-5.27.5.tar.xz";
sha256 = "16ms8l7cncbmll808mb0hfjsfjpg1m3f1j38y9zh1hal0rw42xbv";
name = "flatpak-kcm-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/flatpak-kcm-5.27.6.tar.xz";
sha256 = "0ykzjaz45qxq7bl05chh3fg5b3qd0vdva5jf61dxnn7bksxr9vpw";
name = "flatpak-kcm-5.27.6.tar.xz";
};
};
kactivitymanagerd = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kactivitymanagerd-5.27.5.tar.xz";
sha256 = "06dn0cnspp2qsjxa10vz81vrhhb6przr9lcfyia4gi65gdrg82d2";
name = "kactivitymanagerd-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kactivitymanagerd-5.27.6.tar.xz";
sha256 = "0bdhqn809jxgrq6j4jx1vf4q3xicqj3yi6557qpqxy34mlr0n606";
name = "kactivitymanagerd-5.27.6.tar.xz";
};
};
kde-cli-tools = {
version = "5.27.5.1";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kde-cli-tools-5.27.5.1.tar.xz";
sha256 = "sha256-E13W626S1tKdeL6Ls/ag1eBcJrPP2kmLJIB8HihEiIU=";
name = "kde-cli-tools-5.27.5.1.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kde-cli-tools-5.27.6.tar.xz";
sha256 = "1ahgpaa073lg6n7xnrkflqz9cj8sl7f77sla93415hc2pz1v3qmm";
name = "kde-cli-tools-5.27.6.tar.xz";
};
};
kde-gtk-config = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kde-gtk-config-5.27.5.tar.xz";
sha256 = "0a0hbif6xvlfg6jm2kmzsfjr2f73c7pxbn8amam6z4h1171bfys7";
name = "kde-gtk-config-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kde-gtk-config-5.27.6.tar.xz";
sha256 = "087qj3c46f5wn7vh3nvf0pg40rspja3113phbzapf2sk09b3mwmk";
name = "kde-gtk-config-5.27.6.tar.xz";
};
};
kdecoration = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kdecoration-5.27.5.tar.xz";
sha256 = "0hmy621b8zb8jvanw6w6y8mgrfspkl5d92sgl5zx00lqqz2zdyzg";
name = "kdecoration-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kdecoration-5.27.6.tar.xz";
sha256 = "1rllab85yzx9s3vfm2j31wxwi1s0js0a6jz7bcy8cv4sk91rpdlx";
name = "kdecoration-5.27.6.tar.xz";
};
};
kdeplasma-addons = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kdeplasma-addons-5.27.5.tar.xz";
sha256 = "1y8gaqmbqcjvzpxk6bb7bjgycrmsnw3cjk741csb0xbw66q1ldf9";
name = "kdeplasma-addons-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kdeplasma-addons-5.27.6.tar.xz";
sha256 = "11zhpb4gcz4yy2v0j8mfzihi9rj35f83i8bi7iirix0vm100sfrl";
name = "kdeplasma-addons-5.27.6.tar.xz";
};
};
kgamma5 = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kgamma5-5.27.5.tar.xz";
sha256 = "1nadx1fgpz1k7c2j93wk4ipzp6pydz8ak1p9p2pv9a24753jcrkv";
name = "kgamma5-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kgamma5-5.27.6.tar.xz";
sha256 = "14nn3wsk9w9x8m0mbdmdi86xh6x2946zhzhwdbsfgynjrkn13wb1";
name = "kgamma5-5.27.6.tar.xz";
};
};
khotkeys = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/khotkeys-5.27.5.tar.xz";
sha256 = "087cws4g8p0fzalspnizsd8fxk3745g9ar03pl746fqyvqk57s43";
name = "khotkeys-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/khotkeys-5.27.6.tar.xz";
sha256 = "0zixhdnsm3956w2bff6fk1ksvk61ywjkylg690b90l041rhfriyv";
name = "khotkeys-5.27.6.tar.xz";
};
};
kinfocenter = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kinfocenter-5.27.5.tar.xz";
sha256 = "0j6w9b4pf353l0dfv8b8a90q4swylqxwx818271abs1bkq271s8b";
name = "kinfocenter-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kinfocenter-5.27.6.tar.xz";
sha256 = "06whh4wzc292xvzabv7q6x8wm0gkyd2nsy50vlvk7iy85jayk5nd";
name = "kinfocenter-5.27.6.tar.xz";
};
};
kmenuedit = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kmenuedit-5.27.5.tar.xz";
sha256 = "09qiydq3v4yl51cn0l2ndsr54m33n6x3ngz9q18j4nf4pk266qj4";
name = "kmenuedit-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kmenuedit-5.27.6.tar.xz";
sha256 = "15j63b2vg5dmgqfin4irv3pz3ws6wvji0b5fdi82fml5hgx4y549";
name = "kmenuedit-5.27.6.tar.xz";
};
};
kpipewire = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kpipewire-5.27.5.tar.xz";
sha256 = "166xggr22k2ksnsx97kngc02r8fy0fagd2m7zghdbl5axvf6lcj1";
name = "kpipewire-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kpipewire-5.27.6.tar.xz";
sha256 = "12rjwkk272r9r583vgxb64p5nylkcqsfyvbn0lpa6ap8q2zm7mky";
name = "kpipewire-5.27.6.tar.xz";
};
};
kscreen = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kscreen-5.27.5.tar.xz";
sha256 = "0s24halra8gnczmlj8kvbqvls1njck2abxbdsvn7gm3rkg1sm5vj";
name = "kscreen-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kscreen-5.27.6.tar.xz";
sha256 = "0m7jidcs9xf5xzlnhx2s9qnzn6z80fxhssrxz8i2zqk7xhg6bl6y";
name = "kscreen-5.27.6.tar.xz";
};
};
kscreenlocker = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kscreenlocker-5.27.5.tar.xz";
sha256 = "14pch0w4cgsx1q18hssdnjxdbdcparyrqqr9kd5a33zdqbqhg22c";
name = "kscreenlocker-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kscreenlocker-5.27.6.tar.xz";
sha256 = "0pgmy4dw41kim7syk4xb2n4g4iz3jjikhwnh3bjianl9h87rc12x";
name = "kscreenlocker-5.27.6.tar.xz";
};
};
ksshaskpass = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/ksshaskpass-5.27.5.tar.xz";
sha256 = "1mqckg3j5flx02fji7lcqv2iip4nblrzf2wqq23q7six7rljdvgn";
name = "ksshaskpass-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/ksshaskpass-5.27.6.tar.xz";
sha256 = "1ig8qvjvrl27q1bg34c4lg34yx4pdvcjzxn4jxg6h9wbxdwssk45";
name = "ksshaskpass-5.27.6.tar.xz";
};
};
ksystemstats = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/ksystemstats-5.27.5.tar.xz";
sha256 = "1y6w6v1vf2bphspk7a3lgwgmz6ahdycbbsrr6qn8mkf9z36q97fm";
name = "ksystemstats-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/ksystemstats-5.27.6.tar.xz";
sha256 = "0xi3z8pk1byc4wcds0an2ndnw8j5zgq3wr0gm517rc8vck30m0gi";
name = "ksystemstats-5.27.6.tar.xz";
};
};
kwallet-pam = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kwallet-pam-5.27.5.tar.xz";
sha256 = "144ijabyj9w2yi9j5r0m945l6ysccwyq27cc0mc21mjyqa6sm6ka";
name = "kwallet-pam-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kwallet-pam-5.27.6.tar.xz";
sha256 = "0c38s7iqha94vz2d8dfch4qfb7zpc6k5z7wm33f5x190bw3g1bdp";
name = "kwallet-pam-5.27.6.tar.xz";
};
};
kwayland-integration = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kwayland-integration-5.27.5.tar.xz";
sha256 = "1y8qrdyvz61zcxsp9ylz7bg6hp7wk7is5p0n3s25650dlx0grqcs";
name = "kwayland-integration-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kwayland-integration-5.27.6.tar.xz";
sha256 = "10rc14ggbs86bq0sky4i3kdwarwk8mh2yx4g77if8vr7z96xpdqh";
name = "kwayland-integration-5.27.6.tar.xz";
};
};
kwin = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kwin-5.27.5.tar.xz";
sha256 = "1si01jrhxa6sfqgl2ljl5czyls5mli7b4n6yy6jiws0rb6qjc4mv";
name = "kwin-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kwin-5.27.6.tar.xz";
sha256 = "1v4r4h2zbandg43iyww5p66sgv2z90lrri1gijnwjlg9j5gbvmb2";
name = "kwin-5.27.6.tar.xz";
};
};
kwrited = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kwrited-5.27.5.tar.xz";
sha256 = "14fcby31017mmplcp5v2mfmfnlds5mgn35b725d06z584xcfrfpj";
name = "kwrited-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kwrited-5.27.6.tar.xz";
sha256 = "153q38msna94wy8qbss02hzw7vabfghxs90bq9g9qjsr28428r86";
name = "kwrited-5.27.6.tar.xz";
};
};
layer-shell-qt = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/layer-shell-qt-5.27.5.tar.xz";
sha256 = "088xilf31485mqxw09v2h7v3dayzd19c6yipmlxpyhzhg6jnmpyc";
name = "layer-shell-qt-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/layer-shell-qt-5.27.6.tar.xz";
sha256 = "14w7kr5d5s9fg2qkybk5axg11cafc6rrxkivynj5v55zcp52jp76";
name = "layer-shell-qt-5.27.6.tar.xz";
};
};
libkscreen = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/libkscreen-5.27.5.tar.xz";
sha256 = "0rgbdlchhks5bxicdc8v7388wlg5b6ms9phlp5jfh1l7iprg7br9";
name = "libkscreen-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/libkscreen-5.27.6.tar.xz";
sha256 = "1ywyg1i9bg0nawndl4hzivd4yfsqk5snls8ak1vyr9xmm8zkgaf1";
name = "libkscreen-5.27.6.tar.xz";
};
};
libksysguard = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/libksysguard-5.27.5.tar.xz";
sha256 = "052yx04sihlvf7j94y140g9hldq9fjad9ziqdgmczvszy0xbazky";
name = "libksysguard-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/libksysguard-5.27.6.tar.xz";
sha256 = "1nqv0gxq011acvmqc2rpqrw4l928mcmg4rq2g45qzfmnmas2rjwy";
name = "libksysguard-5.27.6.tar.xz";
};
};
milou = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/milou-5.27.5.tar.xz";
sha256 = "1602imffywir1il1xsq3n413fjxg4s3w9c49z20yn1igcwz0l6qv";
name = "milou-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/milou-5.27.6.tar.xz";
sha256 = "1il1sg7xi9p7snz9w3mygpydl6y02r5n24wa14yk23qhphwsgbpy";
name = "milou-5.27.6.tar.xz";
};
};
oxygen = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/oxygen-5.27.5.tar.xz";
sha256 = "1gby4a9sf666i10nwjv4wswsbi34idcczz0cknfan08ahal4wxpv";
name = "oxygen-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/oxygen-5.27.6.tar.xz";
sha256 = "01h9vh8gk4ncgwa1p25ps5rm6m180081vh0ryw9x3z1qw893j1m9";
name = "oxygen-5.27.6.tar.xz";
};
};
oxygen-sounds = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/oxygen-sounds-5.27.5.tar.xz";
sha256 = "0rl55k6h34bcf5pk71942m3bf831ymh4kk89xkimczq4qki33yr1";
name = "oxygen-sounds-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/oxygen-sounds-5.27.6.tar.xz";
sha256 = "0zijzkr6xqx3lqfccr9fkhmzmvqp5c8025nlh8sy94fi846g7smg";
name = "oxygen-sounds-5.27.6.tar.xz";
};
};
plank-player = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plank-player-5.27.5.tar.xz";
sha256 = "0anws5npjdqq0p94fdrqmvyc55x3vwfx8v59l10k8qmj6habarph";
name = "plank-player-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plank-player-5.27.6.tar.xz";
sha256 = "1mjn2qvzav3c2sxfnfv2h9bj7cd00vidl85zmljm17nflv9cvwa8";
name = "plank-player-5.27.6.tar.xz";
};
};
plasma-bigscreen = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-bigscreen-5.27.5.tar.xz";
sha256 = "1wab0l0cz5a82lgq83s9ipmjqmj5nzzfk689lbz3swxns71qx03n";
name = "plasma-bigscreen-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-bigscreen-5.27.6.tar.xz";
sha256 = "097f5whppwla0y7zil7ykyp97glx2wdc05mwd7pk6y2l6d60fhl7";
name = "plasma-bigscreen-5.27.6.tar.xz";
};
};
plasma-browser-integration = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-browser-integration-5.27.5.tar.xz";
sha256 = "09frs7yxaiqi10j9f7vnr05nk53mvx0jshjk9wlz1cibcwflb45l";
name = "plasma-browser-integration-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-browser-integration-5.27.6.tar.xz";
sha256 = "12hrd6mvhmi649n4jc9pmv116f2cpzd3j90hxlhljixnw4g6vy3j";
name = "plasma-browser-integration-5.27.6.tar.xz";
};
};
plasma-desktop = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-desktop-5.27.5.tar.xz";
sha256 = "1c8wx4al96vnz9p02ml8ax6dzna1xvm6gvnn2w3n93v56hqmfasg";
name = "plasma-desktop-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-desktop-5.27.6.tar.xz";
sha256 = "10x68lqg6zxb8fajd277lm0qfrdg2jz7m58l3wna4nv9bni5wj72";
name = "plasma-desktop-5.27.6.tar.xz";
};
};
plasma-disks = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-disks-5.27.5.tar.xz";
sha256 = "02s8n7da2i2zjqi2q9k8fddqr4868dqyx9bf1lyfag3bb64y447a";
name = "plasma-disks-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-disks-5.27.6.tar.xz";
sha256 = "09v4hwx2q8sz0b4qak8xaxnyqj6ccjlgk28fijvmnv61nxb49h1w";
name = "plasma-disks-5.27.6.tar.xz";
};
};
plasma-firewall = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-firewall-5.27.5.tar.xz";
sha256 = "0hav4d2pgsvzvr9lw93v3zm473gii44x012fs1gx6dgcaam90b73";
name = "plasma-firewall-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-firewall-5.27.6.tar.xz";
sha256 = "1jbcyz92q63gh1ihkrvs4ffp1xjav9miy6n5adhqik9qxpgkqqn8";
name = "plasma-firewall-5.27.6.tar.xz";
};
};
plasma-integration = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-integration-5.27.5.tar.xz";
sha256 = "0ywzz2s46kaidzg5cagx2wp4kqndynfssz6a29czpw1811iwbvcd";
name = "plasma-integration-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-integration-5.27.6.tar.xz";
sha256 = "1awd9l874gxxkbcfzb76xga1f6firaqpshrapg0492vq33r5vzd5";
name = "plasma-integration-5.27.6.tar.xz";
};
};
plasma-mobile = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-mobile-5.27.5.tar.xz";
sha256 = "0h61q8nkwl5adrgm0353l2kada76760rqzwb94xdc7r9cjxjy6yc";
name = "plasma-mobile-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-mobile-5.27.6.tar.xz";
sha256 = "16djcga7ljq7zv979im8zd1l1fz7qfw9g2ya6kvdn9mf8li0l98j";
name = "plasma-mobile-5.27.6.tar.xz";
};
};
plasma-nano = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-nano-5.27.5.tar.xz";
sha256 = "1w6pq6wrnb3lq2jyfx9lpn11vmfka5rw4mn52cdz8997g4zyrhlj";
name = "plasma-nano-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-nano-5.27.6.tar.xz";
sha256 = "02qig2zh6py0i5phcyjln0yawbd6sdx4cm13l2kgi3bl1826kklb";
name = "plasma-nano-5.27.6.tar.xz";
};
};
plasma-nm = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-nm-5.27.5.tar.xz";
sha256 = "0bm6ihcg5cgfzz1pcj7zg2bjm8gik3rcjj4mp03ac1v29gj4hbqm";
name = "plasma-nm-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-nm-5.27.6.tar.xz";
sha256 = "1jfrd3xi4hyivkwrif6s87f9jasrnsihd7c80sqhwd1k2kl9wr0a";
name = "plasma-nm-5.27.6.tar.xz";
};
};
plasma-pa = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-pa-5.27.5.tar.xz";
sha256 = "1241v4igi3d1n2x46vp9qgqvw2gngsk75gx3rnjnivfypxrkzay2";
name = "plasma-pa-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-pa-5.27.6.tar.xz";
sha256 = "0kvfhpsiv0nkilirjwsplx67m5zdqc5w6zmp9gkgyym46ax0hxjf";
name = "plasma-pa-5.27.6.tar.xz";
};
};
plasma-remotecontrollers = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-remotecontrollers-5.27.5.tar.xz";
sha256 = "04d0rp4jpavn999lbvfni007l98i1zglwv7byrkb494zs40gqylc";
name = "plasma-remotecontrollers-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-remotecontrollers-5.27.6.tar.xz";
sha256 = "0ibngr1qy0vpdi6sx071225g354cdsag7j0gv3b6vrhq7s0z66b0";
name = "plasma-remotecontrollers-5.27.6.tar.xz";
};
};
plasma-sdk = {
version = "5.27.5";
version = "5.27.6.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-sdk-5.27.5.tar.xz";
sha256 = "05b9n2h7qkxm5yws4mi4f929dassi6hng0p730dx5fw7fsr4a0pi";
name = "plasma-sdk-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-sdk-5.27.6.1.tar.xz";
sha256 = "1byfknk60j4hajy1ibh25dv96irkpl4b5hyrrdg39m6fdx30wjrf";
name = "plasma-sdk-5.27.6.1.tar.xz";
};
};
plasma-systemmonitor = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-systemmonitor-5.27.5.tar.xz";
sha256 = "0d1ficiqv7zjcc1fkh7jx4f7pcpkygk1pyfm8gsp10i0iwwm3rc2";
name = "plasma-systemmonitor-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-systemmonitor-5.27.6.tar.xz";
sha256 = "07cwzcy7qd3b6rlyqjwhc2z567dn5j8gx701b57cs18z0rgv4vkr";
name = "plasma-systemmonitor-5.27.6.tar.xz";
};
};
plasma-thunderbolt = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-thunderbolt-5.27.5.tar.xz";
sha256 = "1mchvgh180m8anjznpwihay934c331fqc88l1wyiqqn6072n819i";
name = "plasma-thunderbolt-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-thunderbolt-5.27.6.tar.xz";
sha256 = "1ikcbn9awh5zh9ivdm3ysi1dw208byj8d4ls5c9ckclvylkfx7v6";
name = "plasma-thunderbolt-5.27.6.tar.xz";
};
};
plasma-vault = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-vault-5.27.5.tar.xz";
sha256 = "1s176masmip1qzv5am3phkwvb7yalmiasgzbx7r2rq705bh2pwkl";
name = "plasma-vault-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-vault-5.27.6.tar.xz";
sha256 = "0wxa80m2ppjp8l8nchwcvrmx20j0rgm9ydn93x4w4d4rmi6mypr4";
name = "plasma-vault-5.27.6.tar.xz";
};
};
plasma-welcome = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-welcome-5.27.5.tar.xz";
sha256 = "1ddfyi1a2ccs8ny9is0x8fjz0yh2v65sin85nrv6j483n3qqxjfb";
name = "plasma-welcome-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-welcome-5.27.6.tar.xz";
sha256 = "0lvvxllhshawj7pjx3d9l53clcnr73x519khgf27fpblil1x0hm8";
name = "plasma-welcome-5.27.6.tar.xz";
};
};
plasma-workspace = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-workspace-5.27.5.tar.xz";
sha256 = "05rayz8n3qgpnddr4wpzjwgvk3if4vnnwb1ccpm841zxxsr9a2zd";
name = "plasma-workspace-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-workspace-5.27.6.tar.xz";
sha256 = "10w8ix9c29gvykr9970aax7jcz2fi99cafr1kknvj2drgc7zgrhw";
name = "plasma-workspace-5.27.6.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-workspace-wallpapers-5.27.5.tar.xz";
sha256 = "0h6871pwn000jzilhh4w5wa3s017cgkphhj4sxxpqds7q7f5x013";
name = "plasma-workspace-wallpapers-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-workspace-wallpapers-5.27.6.tar.xz";
sha256 = "018vvxhs0rlc25hd5kafhzk6anl1yabggby7b5vsqvip2rsma0qk";
name = "plasma-workspace-wallpapers-5.27.6.tar.xz";
};
};
plymouth-kcm = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plymouth-kcm-5.27.5.tar.xz";
sha256 = "0r00kmqzkzpjvp3s02h7vjiiyzfpvzn5j158jf6khvb4vywljqjr";
name = "plymouth-kcm-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plymouth-kcm-5.27.6.tar.xz";
sha256 = "03qkrdin7s4kx14f518f6amvgd5adavgirjy8mk1zj62mz4f1sy5";
name = "plymouth-kcm-5.27.6.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.27.5";
version = "1-5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/polkit-kde-agent-1-5.27.5.tar.xz";
sha256 = "0brab8hn2qdnxzzx0q37m40h67s00s0zpc2wx1gzbnbl1kzv9qra";
name = "polkit-kde-agent-1-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/polkit-kde-agent-1-5.27.6.tar.xz";
sha256 = "0k7d9jz49fp4h7gxakqsmj16h5xdv8jw69068sz5mazzczi7lwyz";
name = "polkit-kde-agent-1-5.27.6.tar.xz";
};
};
powerdevil = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/powerdevil-5.27.5.tar.xz";
sha256 = "03jhzcwg1kjhm8ly3w12slgdxbyycqymijgnh3llrvzgawn8cy83";
name = "powerdevil-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/powerdevil-5.27.6.tar.xz";
sha256 = "1dbz479ikjy6fi3l701hvhkwhbll1gkibay3vzimb13kyamhy8vb";
name = "powerdevil-5.27.6.tar.xz";
};
};
qqc2-breeze-style = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/qqc2-breeze-style-5.27.5.tar.xz";
sha256 = "0vcq59m074zvcivlhk0jp7k5vywmamfdq4bsacvsjzxhlvzkvjlh";
name = "qqc2-breeze-style-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/qqc2-breeze-style-5.27.6.tar.xz";
sha256 = "02hxczlhyy2vwrsrw7hncmhcidany4xirlrw9caxsq4rylp7vszj";
name = "qqc2-breeze-style-5.27.6.tar.xz";
};
};
sddm-kcm = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/sddm-kcm-5.27.5.tar.xz";
sha256 = "16hrmbl413zy89if8yj9jsvnzv58rvs7w6y5isq33drkzvgz41an";
name = "sddm-kcm-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/sddm-kcm-5.27.6.tar.xz";
sha256 = "1qmmsvfs22byx5i48icgqh0cdh228yk40946yymacm39iwbsnw6w";
name = "sddm-kcm-5.27.6.tar.xz";
};
};
systemsettings = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/systemsettings-5.27.5.tar.xz";
sha256 = "1nxla37vr1j1h2vklm6cdzr5h5my9d3m05nr9dr1wcxsmaq4wifm";
name = "systemsettings-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/systemsettings-5.27.6.tar.xz";
sha256 = "17bqdsaih11wpcmv7qzk701l67431pf2nm8nnrix1s8k3qglfb5w";
name = "systemsettings-5.27.6.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/xdg-desktop-portal-kde-5.27.5.tar.xz";
sha256 = "1aqsiwfhca7nimdflwnq86fai4lhjqpi4pi4xyp8pcgrrwj3zykw";
name = "xdg-desktop-portal-kde-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/xdg-desktop-portal-kde-5.27.6.tar.xz";
sha256 = "0wzp21l521d9z9mnfgiapzljqpg5qc5ghyzndpr8cz54c2bf9mdf";
name = "xdg-desktop-portal-kde-5.27.6.tar.xz";
};
};
}

11
pkgs/development/compilers/gcc/11/default.nix
View file

@ -50,7 +50,7 @@ with lib;
with builtins;
let majorVersion = "11";
version = "${majorVersion}.3.0";
version = "${majorVersion}.4.0";
disableBootstrap = !stdenv.hostPlatform.isDarwin;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -58,7 +58,6 @@ let majorVersion = "11";
patches = [
# Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431
../fix-bug-80431.patch
./fix-struct-redefinition-on-glibc-2.36.patch
../install-info-files-serially.patch
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
@ -75,9 +74,9 @@ let majorVersion = "11";
++ optionals stdenv.isDarwin [
(fetchpatch {
# There are no upstream release tags in https://github.com/iains/gcc-11-branch.
# 2d280e7 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.3.0
url = "https://github.com/iains/gcc-11-branch/compare/2d280e7eafc086e9df85f50ed1a6526d6a3a204d..gcc-11.3-darwin-r2.diff";
sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg=";
# ff4bf32 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-11.4.0
url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff";
hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4=";
})
]
# https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808
@ -167,7 +166,7 @@ lib.pipe (stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk=";
hash = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk=";
};
inherit patches;

4
pkgs/development/compilers/ligo/default.nix
View file

@ -15,12 +15,12 @@
ocamlPackages.buildDunePackage rec {
pname = "ligo";
version = "0.67.1";
version = "0.68.0";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = version;
sha256 = "sha256-trLl4suIu2b+naw99Fwr+iEZrfYV3s4Sedg2lX3uUcA=";
sha256 = "sha256-NGjys54VWzgy1SE93/zt8xooJhnZTst3jsjU36yp7Uk=";
fetchSubmodules = true;
};

8
pkgs/development/compilers/scala/2.x.nix
View file

@ -18,14 +18,14 @@ let
};
"2.12" = {
version = "2.12.15";
sha256 = "F5RePKlHjQaoQ2BWqsa5r99g3q/cPjgsbAi2A5IberY=";
version = "2.12.18";
sha256 = "naIJCET+YPrbXln39F9aU3DBdnjcn7PYMmhDxETOA5g=";
pname = "scala_2_12";
};
"2.13" = {
version = "2.13.10";
sha256 = "sha256-sBRhWZzQeGBCxktTN5D0XlG6u5HFLcRl2EaDjpcBnMQ=";
version = "2.13.11";
sha256 = "YYLdgdICPM5SczPteFsaojqY6H3IVauji6SJLcaq8eM=";
pname = "scala_2_13";
};
};

4
pkgs/development/compilers/scala/bare.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
stdenv.mkDerivation rec {
version = "3.2.2";
version = "3.3.0";
pname = "scala-bare";
src = fetchurl {
url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";
hash = "sha256-t8Xt70LozePoDXE3IHejWOTWCEYcOZytRDKz/QxgmZg=";
hash = "sha256-Bk7lCKjjucaYQxAsg2qomJQUgCK/N688JqlGTfoQFHU=";
};
propagatedBuildInputs = [ jre ncurses.dev ] ;

7
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -348,11 +348,14 @@ self: super: builtins.intersectAttrs super {
src = assert super.nix-serve-ng.version == "1.0.0";
# Workaround missing files in sdist
# https://github.com/aristanetworks/nix-serve-ng/issues/10
#
# Workaround for libstore incompatibility with Nix 2.13
# https://github.com/aristanetworks/nix-serve-ng/issues/22
pkgs.fetchFromGitHub {
repo = "nix-serve-ng";
owner = "aristanetworks";
rev = "433f70f4daae156b84853f5aaa11987aa5ce7277";
sha256 = "0mqp67z5mi8rsjahdh395n7ppf0b65k8rd3pvnl281g02rbr69y2";
rev = "dabf46d65d8e3be80fa2eacd229eb3e621add4bd";
hash = "sha256-SoJJ3rMtDMfUzBSzuGMY538HDIj/s8bPf8CjIkpqY2w=";
};
} (addPkgconfigDepend pkgs.boost.dev super.nix-serve-ng);

4
pkgs/development/interpreters/python/default.nix
View file

@ -96,9 +96,9 @@ in {
major = "3";
minor = "12";
patch = "0";
suffix = "b2";
suffix = "b3";
};
hash = "sha256-jfxC3abk0GR8+Kb3zZAHBN6p/YZkAqKCgpvS5uJxuBg=";
hash = "sha256-kWDGBl6YhbN8LleGXQuyf8flSqqcGGx2HaMNK928ye4=";
inherit (darwin) configd;
inherit passthruFun;
};

12
pkgs/development/libraries/vaapi-intel/default.nix → pkgs/development/libraries/intel-vaapi-driver/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3
, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext
, intel-gpu-tools, libdrm, libva
, enableHybridCodec ? false, vaapi-intel-hybrid
, enableGui ? true, libX11, libGL, wayland, libXext
}:
stdenv.mkDerivation rec {
@ -22,13 +23,14 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
"--enable-x11"
"--enable-wayland"
(lib.enableFeature enableGui "x11")
(lib.enableFeature enableGui "wayland")
] ++ lib.optional enableHybridCodec "--enable-hybrid-codec";
nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ];
buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]
buildInputs = [ intel-gpu-tools libdrm libva ]
++ lib.optionals enableGui [ libX11 libXext libGL wayland ]
++ lib.optional enableHybridCodec vaapi-intel-hybrid;
enableParallelBuilding = true;
@ -48,6 +50,6 @@ stdenv.mkDerivation rec {
backends for each supported hardware vendor.
'';
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

5
pkgs/development/libraries/librealsense/default.nix
View file

@ -78,7 +78,10 @@ stdenv.mkDerivation rec {
# script does not do this, and it's questionable if intel knows it should be
# done
# ( https://github.com/IntelRealSense/meta-intel-realsense/issues/20 )
postInstall = lib.optionalString enablePython ''
postInstall = ''
substituteInPlace $out/lib/cmake/realsense2/realsense2Targets.cmake \
--replace "\''${_IMPORT_PREFIX}/include" "$dev/include"
'' + lib.optionalString enablePython ''
cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2
'';

24
pkgs/development/libraries/libressl/default.nix
View file

@ -91,29 +91,13 @@ let
};
in {
libressl_3_4 = generic {
version = "3.4.3";
hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
knownVulnerabilities = [ "Support ended 2022-10-14." ];
patches = [
(fetchpatch {
# https://marc.info/?l=libressl&m=167582148932407&w=2
name = "backport-type-confusion-fix.patch";
url = "https://raw.githubusercontent.com/libressl/portable/30dc760ed1d7c70766b135500950d8ca9d17b13a/patches/x509_genn.c.diff";
sha256 = "sha256-N9jsOueqposDWZwaR+n/v/cHgNiZbZ644d8/wKjN2/M=";
stripLen = 2;
extraPrefix = "crypto/";
})
];
};
libressl_3_6 = generic {
version = "3.6.2";
hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM=";
version = "3.6.3";
hash = "sha256-h7G7426e7I0K5fBMg9NrLFsOWBeEx+sIFwJe0p6t6jc=";
};
libressl_3_7 = generic {
version = "3.7.2";
hash = "sha256-sGqlOP78nGszxNtJMaCaX1LZ0jVyGa/L/32T/hLr9vc=";
version = "3.7.3";
hash = "sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM=";
};
}

4
pkgs/development/libraries/libva/default.nix
View file

@ -7,7 +7,7 @@
, intel-compute-runtime
, intel-media-driver
, mpv
, vaapiIntel
, intel-vaapi-driver
, vlc
}:
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
passthru.tests = {
# other drivers depending on libva and selected application users.
# Please get a confirmation from the maintainer before adding more applications.
inherit intel-compute-runtime intel-media-driver vaapiIntel mpv vlc;
inherit intel-compute-runtime intel-media-driver intel-vaapi-driver mpv vlc;
};
meta = with lib; {

4
pkgs/development/libraries/nghttp3/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "nghttp3";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
rev = "v${version}";
hash = "sha256-fZMFSQ8RCVxuoLrisa8lLqjNVe4fIuGqbyKtkC/u02M=";
hash = "sha256-jbD//8BNqzX2T2F0JH+Vsoi/D+8HZIPXGnHoj3hzqPk=";
};
outputs = [ "out" "dev" "doc" ];

12
pkgs/development/libraries/nvidia-vaapi-driver/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "nvidia-vaapi-driver";
version = "0.0.9";
version = "0.0.10";
src = fetchFromGitHub {
owner = "elFarto";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mQtprgm6QonYiMUPPIcCbWxPQ/b2XuQiOkROZNPYaQk=";
sha256 = "sha256-j6AIleVZCgV7CD7nP/dKz5we3sUW9pldy0QKi8xwXB0=";
};
nativeBuildInputs = [
@ -39,14 +39,6 @@ stdenv.mkDerivation rec {
libva
];
# Note: Attempt to remove on next release after 0.0.9
# nixpkgs reference: https://github.com/NixOS/nixpkgs/pull/221978#issuecomment-1483892437
# upstream: https://github.com/elFarto/nvidia-vaapi-driver/issues/188
NIX_CFLAGS_COMPILE = [
"-Wno-error=format="
"-Wno-error=int-conversion"
];
postFixup = ''
addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so"
'';

2
pkgs/development/libraries/opae/default.nix
View file

@ -45,5 +45,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ thoughtpolice ];
# Needs a major update, not compatible with gcc-11.
broken = true;
};
}

27
pkgs/development/libraries/serf/default.nix
View file

@ -1,14 +1,24 @@
{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5
, pkg-config, libiconv
, fetchpatch }:
{ lib
, stdenv
, fetchurl
, apr
, scons
, openssl
, aprutil
, zlib
, libkrb5
, pkg-config
, libiconv
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "serf";
version = "1.3.9";
version = "1.3.10";
src = fetchurl {
url = "mirror://apache/serf/${pname}-${version}.tar.bz2";
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
hash = "sha256-voHvCLqiUW7Np2p3rffe97wyJ+61eLmjO0X3tB3AZOY=";
};
nativeBuildInputs = [ pkg-config scons ];
@ -17,11 +27,7 @@ stdenv.mkDerivation rec {
patches = [
./scons.patch
# https://issues.apache.org/jira/projects/SERF/issues/SERF-198
(fetchpatch {
url = "https://issues.apache.org/jira/secure/attachment/13019945/serf.patch";
hash = "sha256-3djDGG30R/gq74KJL8OJ/upMh1zDpqtwGylRzN0lXpY=";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch";
hash = "sha256-FQJvXOIZ0iItvbbcu4kR88j74M7fOi7C/0NN3o1/ub4=";
@ -44,6 +50,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "HTTP client library based on APR";
homepage = "https://serf.apache.org/";
license = licenses.asl20;
maintainers = with maintainers; [ orivej raskin ];
platforms = platforms.linux ++ platforms.darwin;

31
pkgs/development/libraries/serf/scons.patch
View file

@ -2,15 +2,6 @@ diff --git a/SConstruct b/SConstruct
index 4358a23..6ce7776 100644
--- a/SConstruct
+++ b/SConstruct
@@ -55,7 +55,7 @@ def RawListVariable(key, help, default):
# To be used to ensure a PREFIX directory is only created when installing.
def createPathIsDirCreateWithTarget(target):
def my_validator(key, val, env):
- build_targets = (map(str, BUILD_TARGETS))
+ build_targets = (list(map(str, BUILD_TARGETS)))
if target in build_targets:
return PathVariable.PathIsDirCreate(key, val, env)
else:
@@ -155,6 +155,8 @@ if sys.platform == 'win32':
env = Environment(variables=opts,
tools=('default', 'textfile',),
@ -20,25 +11,3 @@ index 4358a23..6ce7776 100644
)
env.Append(BUILDERS = {
@@ -163,9 +164,9 @@ env.Append(BUILDERS = {
suffix='.def', src_suffix='.h')
})
-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
- 'SERF_MINOR_VERSION ([0-9]+).*'
- 'SERF_PATCH_VERSION ([0-9]+)',
+match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
+ b'SERF_MINOR_VERSION ([0-9]+).*'
+ b'SERF_PATCH_VERSION ([0-9]+)',
env.File('serf.h').get_contents(),
re.DOTALL)
MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
@@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
unknown = opts.UnknownVariables()
if unknown:
- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
+ print('Warning: Used unknown variables:', ', '.join(list(unknown.keys())))
apr = str(env['APR'])
apu = str(env['APU'])

4
pkgs/development/python-modules/ailment/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.55";
version = "9.2.56";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-qv6u8QGJ31+BRqYIS2D7zedZPXhjSq8ATi48t63hTko=";
hash = "sha256-J2O/g9q7xeEiP/XMMiOrTbA1IHBaxRFT3WASI+StG9E=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aioairzone/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.6.3";
version = "0.6.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-grUfhUc8U7d7GgUa8TfvSPYOYr4IW1mZM0tl6I5gUdg=";
hash = "sha256-kOx28JmtB5hpCwsNk00bMLrU4K2tU/JY/ZWn6KmPDP4=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/angr/default.nix
View file

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.55";
version = "9.2.56";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Kg3kBE+Ra8efYTdovLnI+xG6sxoUeXetBPR3dF6qvEc=";
hash = "sha256-LjXQG5L8VwrxC5WJupBS9eqKnQ7t8gi7ug9uTG2v8W4=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/ansible/default.nix
View file

@ -20,17 +20,17 @@
let
pname = "ansible";
version = "7.2.0";
version = "8.0.0";
in
buildPythonPackage {
inherit pname version;
format = "setuptools";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w=";
hash = "sha256-hnDHxGAhwYjKwjXp/eetrbs8OAwkNqOwwcSTxLoQvKs=";
};
postPatch = ''

4
pkgs/development/python-modules/archinfo/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.55";
version = "9.2.56";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-GjuQw/5cWlm2TtJ1x6HTT9os75nXG68MMqYtbfSK/i4=";
hash = "sha256-t2zhQz+IaWm4Y5BDkKwNk9ptAyA7Prs5m7v8HJ8Aob4=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/can/default.nix
View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "can";
version = "4.2.1";
version = "4.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "hardbyte";
repo = "python-can";
rev = "refs/tags/v${version}";
hash = "sha256-3luuff/yAAERaptMsKCYISwWrzqDJClm+dnoJpjBkVY=";
hash = "sha256-MyVGjAy13Ne0PkVufB0JDNEZHhVBzeUYWWlH72ib/pI=";
};
postPatch = ''

22
pkgs/development/python-modules/celery-redbeat/default.nix
View file

@ -1,38 +1,48 @@
{ stdenv
, lib
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, python-dateutil
, celery
, redis
, tenacity
, pytestCheckHook
, pytz
, fakeredis
, mock
}:
buildPythonPackage rec {
pname = "celery-redbeat";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "sibson";
repo = "redbeat";
rev = "v${version}";
hash = "sha256-pu4umhfNFZ30bQu5PcT2LYN4WGzFj4p4/qHm3pVIV+c=";
hash = "sha256-WW/OYa7TWEKkata1eULir29wHaCnavBJebn4GrBzmWY=";
};
patches = [
(fetchpatch {
# celery 5.3.0 support
url = "https://github.com/sibson/redbeat/commit/4240e17172a4d9d2744d5c4da3cfca0e0a024e2e.patch";
hash = "sha256-quEfSFhv0sIpsKHX1CpFhbMC8LYXA8NASWYU8MMYPSk=";
})
];
propagatedBuildInputs = [
python-dateutil
celery
python-dateutil
redis
tenacity
];
nativeCheckInputs = [
pytestCheckHook
fakeredis
mock
pytestCheckHook
pytz
];
pythonImportsCheck = [ "redbeat" ];

35
pkgs/development/python-modules/celery/default.nix
View file

@ -1,5 +1,6 @@
{ stdenv
, lib
, backports-zoneinfo
, billiard
, boto3
, buildPythonPackage
@ -10,50 +11,33 @@
, click-repl
, dnspython
, fetchPypi
, fetchpatch
, kombu
, moto
, pymongo
, pytest-celery
, pytest-click
, pytest-subtests
, pytest-timeout
, pytestCheckHook
, python-dateutil
, pythonOlder
, pytz
, tzdata
, vine
, nixosTests
}:
buildPythonPackage rec {
pname = "celery";
version = "5.2.7";
version = "5.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+vvYKTTTD4oAT4Ho96Bi4xQToj1ES+juMyZVORWVjG0=";
hash = "sha256-Hqul7hTYyMC+2PYGPl4Q2r288jUDqGHPDhC3Ih2Zyw0=";
};
patches = [
(fetchpatch {
name = "billiard-4.0-compat.patch";
url = "https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch";
hash = "sha256-NWB/UB0fE7A/vgMRYz6QGmqLmyN1ninAMyL4V2tpzto=";
})
(fetchpatch {
name = "billiard-4.1-compat.patch";
url = "https://github.com/celery/celery/pull/7781/commits/879af6341974c3778077d8212d78f093b2d77a4f.patch";
hash = "sha256-+m8/YkeAPPjwm0WF7dw5XZzf7MImVBLXT0/FS+fk0FE=";
})
];
postPatch = ''
substituteInPlace requirements/default.txt \
--replace "billiard>=3.6.4.0,<4.0" "billiard>=3.6.4.0"
'';
propagatedBuildInputs = [
billiard
click
@ -61,8 +45,12 @@ buildPythonPackage rec {
click-plugins
click-repl
kombu
pytz
python-dateutil
tzdata
vine
]
++ lib.optionals (pythonOlder "3.9") [
backports-zoneinfo
];
nativeCheckInputs = [
@ -72,6 +60,7 @@ buildPythonPackage rec {
moto
pymongo
pytest-celery
pytest-click
pytest-subtests
pytest-timeout
pytestCheckHook

4
pkgs/development/python-modules/claripy/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.55";
version = "9.2.56";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-D1XkRzOt3yMUEZul74rREptvmyoKwG+wentRMMA5dfE=";
hash = "sha256-QhbXcvO3HR9ffrI7KwSIQeVPfs6RIWoHllCaS6hC3JI=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/cle/default.nix
View file

@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.55";
version = "9.2.56";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-X/3ByWxKQJg233GkW0dqSNrInVjy8k1+prjmKPYOupg=";
hash = "sha256-c4uuM7ZZPfykGkYrpuE2JJqe5/pTZuR+IvPC+HA7laA=";
};
nativeBuildInputs = [

79
pkgs/development/python-modules/clr-loader/default.nix Normal file
View file

@ -0,0 +1,79 @@
{ lib
, fetchPypi
, buildPythonPackage
, pytestCheckHook
, dotnetCorePackages
, setuptools
, buildDotnetModule
, cffi
}:
let
pname = "clr_loader";
version = "0.2.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-gu1ftlRynRT9iCludLtrhOss+5dv9LfUnU5En9eKIms=";
};
# This buildDotnetModule is used only to get nuget sources, the actual
# build is done in `buildPythonPackage` below.
dotnet-build = buildDotnetModule {
inherit pname version src;
projectFile = [ "netfx_loader/ClrLoader.csproj" "example/example.csproj" ];
nugetDeps = ./deps.nix;
};
in
buildPythonPackage {
inherit pname version src;
format = "pyproject";
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'dynamic = ["version"]' 'version = "${version}"'
'';
nativeBuildInputs = [
setuptools
dotnetCorePackages.sdk_6_0
];
propagatedBuildInputs = [
cffi
];
nativeCheckInputs = [
pytestCheckHook
];
disabledTests = [
# TODO: mono does not work due to https://github.com/NixOS/nixpkgs/issues/7307
"test_mono"
"test_mono_debug"
"test_mono_signal_chaining"
"test_mono_set_dir"
];
# Perform dotnet restore based on the nuget-source
preConfigure = ''
dotnet restore "netfx_loader/ClrLoader.csproj" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
--source "${dotnet-build.nuget-source}"
dotnet restore "example/example.csproj" \
-p:ContinuousIntegrationBuild=true \
-p:Deterministic=true \
--source "${dotnet-build.nuget-source}"
'';
passthru.fetch-deps = dotnet-build.fetch-deps;
meta = with lib; {
description = "Generic pure Python loader for .NET runtimes";
homepage = "https://pythonnet.github.io/clr-loader/";
license = licenses.mit;
maintainers = with maintainers; [ mdarocha ];
};
}

11
pkgs/development/python-modules/clr-loader/deps.nix generated Normal file
View file

@ -0,0 +1,11 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; })
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; })
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net47"; version = "1.0.0"; sha256 = "00v56phfn01ahf4fq7zanz6hjyzpp00hkkk4a190l0dywrv387i6"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
(fetchNuGet { pname = "NXPorts"; version = "1.0.0"; sha256 = "02zva596c3vsnlhi1b1391vbfl8a6142dvm61r8j1c70b07916lj"; })
]

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