dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2024-09-02 00:15:49 +00:00 committed by GitHub
commit b35ed50e47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
394 changed files with 9518 additions and 2948 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/languages-frameworks/python.section.md
View File

@ -214,9 +214,6 @@ because their behaviour is different:
paths included in this list. Items listed in `install_requires` go here. paths included in this list. Items listed in `install_requires` go here.
* `optional-dependencies ? { }`: Optional feature flagged dependencies. Items listed in `extras_requires` go here. * `optional-dependencies ? { }`: Optional feature flagged dependencies. Items listed in `extras_requires` go here.
Aside from propagating dependencies,
`buildPythonPackage` also injects code into and wraps executables with the
paths included in this list. Items listed in `extras_requires` go here.
##### Overriding Python packages {#overriding-python-packages} ##### Overriding Python packages {#overriding-python-packages}
@ -2049,8 +2046,8 @@ no maintainer, so maintenance falls back to the package set maintainers.
### Updating packages in bulk {#python-package-bulk-updates} ### Updating packages in bulk {#python-package-bulk-updates}
There is a tool to update alot of python libraries in bulk, it exists at A tool to bulk-update numerous Python libraries is available in the
`maintainers/scripts/update-python-libraries` with this repository. repository at `maintainers/scripts/update-python-libraries`.
It can quickly update minor or major versions for all packages selected It can quickly update minor or major versions for all packages selected
and create update commits, and supports the `fetchPypi`, `fetchurl` and and create update commits, and supports the `fetchPypi`, `fetchurl` and

19
maintainers/maintainer-list.nix
View File

@ -2447,6 +2447,13 @@
github = "beezow"; github = "beezow";
githubId = 42082156; githubId = 42082156;
}; };
benaryorg = {
name = "benaryorg";
email = "binary@benary.org";
github = "benaryorg";
githubId = 6145260;
keys = [ { fingerprint = "804B 6CB8 AED5 61D9 3DAD 4DC5 E2F2 2C5E DF20 119D"; } ];
};
bendlas = { bendlas = {
email = "herwig@bendlas.net"; email = "herwig@bendlas.net";
matrix = "@bendlas:matrix.org"; matrix = "@bendlas:matrix.org";
@ -15631,6 +15638,12 @@
githubId = 5948762; githubId = 5948762;
name = "Berk Özkütük"; name = "Berk Özkütük";
}; };
ozwaldorf = {
email = "self@ossian.dev";
github = "ozwaldorf";
githubId = 8976745;
name = "Ossian Mapes";
};
p3psi = { p3psi = {
name = "Elliot Boo"; name = "Elliot Boo";
email = "p3psi.boo@gmail.com"; email = "p3psi.boo@gmail.com";
@ -15789,6 +15802,12 @@
githubId = 4580157; githubId = 4580157;
name = "Patrick Hobusch"; name = "Patrick Hobusch";
}; };
patka = {
email = "patka@patka.dev";
github = "patka-123";
githubId = 69802930;
name = "patka";
};
patrickdag = { patrickdag = {
email = "patrick-nixos@failmail.dev"; email = "patrick-nixos@failmail.dev";
github = "PatrickDaG"; github = "PatrickDaG";

1
maintainers/team-list.nix
View File

@ -753,6 +753,7 @@ with lib.maintainers;
members = [ members = [
SuperSandro2000 SuperSandro2000
anthonyroussel anthonyroussel
vinetos
]; ];
scope = "Maintain the ecosystem around OpenStack"; scope = "Maintain the ecosystem around OpenStack";
shortName = "OpenStack"; shortName = "OpenStack";

4
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -119,6 +119,8 @@
- `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected. - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.
- `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust. - `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust.
The module was updated to accommodate for breaking changes. The module was updated to accommodate for breaking changes.
Breaking changes to the module API were minimised as much as possible, Breaking changes to the module API were minimised as much as possible,
@ -173,6 +175,8 @@
- All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`). - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`).
- All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`).
- `services.cgit` now runs as the cgit user by default instead of root. - `services.cgit` now runs as the cgit user by default instead of root.
This change requires granting access to the repositories to this user or This change requires granting access to the repositories to this user or
setting the appropriate one through `services.cgit.some-instance.user`. setting the appropriate one through `services.cgit.some-instance.user`.

2
nixos/modules/config/fonts/fontconfig.nix
View File

@ -183,7 +183,7 @@ let
# horrible sed hack to add the line that was accidentally removed # horrible sed hack to add the line that was accidentally removed
# from the default config in #324516 # from the default config in #324516
# FIXME: fix that, revert this # FIXME: fix that, revert this
sed "5i <include ignore_missing="yes">/etc/fonts/conf.d</include>" -i $dst/../fonts.conf sed '5i <include ignore_missing="yes">/etc/fonts/conf.d</include>' -i $dst/../fonts.conf
# TODO: remove this legacy symlink once people stop using packages built before #95358 was merged # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged
mkdir -p $out/etc/fonts/2.11 mkdir -p $out/etc/fonts/2.11

2
nixos/modules/config/xdg/portal.nix
View File

@ -83,7 +83,7 @@ in
configPackages = mkOption { configPackages = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = [ ]; default = [ ];
example = lib.literalExpression "[ pkgs.gnome.gnome-session ]"; example = lib.literalExpression "[ pkgs.gnome-session ]";
description = '' description = ''
List of packages that provide XDG desktop portal configuration, usually in List of packages that provide XDG desktop portal configuration, usually in
the form of `share/xdg-desktop-portal/$desktop-portals.conf`. the form of `share/xdg-desktop-portal/$desktop-portals.conf`.

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix
View File

@ -25,7 +25,7 @@
sleep-inactive-battery-type='nothing' sleep-inactive-battery-type='nothing'
''; '';
extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ]; extraGSettingsOverridePackages = [ pkgs.gnome-settings-daemon ];
enable = true; enable = true;
}; };

6
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@ -64,7 +64,7 @@ let
} // lib.optionalAttrs (cfg.tlsCertFile != null) { tlsCertFile = cfg.tlsCertFile; } } // lib.optionalAttrs (cfg.tlsCertFile != null) { tlsCertFile = cfg.tlsCertFile; }
// lib.optionalAttrs (cfg.tlsKeyFile != null) { tlsPrivateKeyFile = cfg.tlsKeyFile; } // lib.optionalAttrs (cfg.tlsKeyFile != null) { tlsPrivateKeyFile = cfg.tlsKeyFile; }
// lib.optionalAttrs (cfg.clusterDomain != "") { clusterDomain = cfg.clusterDomain; } // lib.optionalAttrs (cfg.clusterDomain != "") { clusterDomain = cfg.clusterDomain; }
// lib.optionalAttrs (cfg.clusterDns != "") { clusterDNS = [ cfg.clusterDns ] ; } // lib.optionalAttrs (cfg.clusterDns != []) { clusterDNS = cfg.clusterDns; }
// lib.optionalAttrs (cfg.featureGates != {}) { featureGates = cfg.featureGates; } // lib.optionalAttrs (cfg.featureGates != {}) { featureGates = cfg.featureGates; }
)); ));
@ -112,8 +112,8 @@ in
clusterDns = mkOption { clusterDns = mkOption {
description = "Use alternative DNS."; description = "Use alternative DNS.";
default = "10.1.0.1"; default = [ "10.1.0.1" ];
type = str; type = listOf str;
}; };
clusterDomain = mkOption { clusterDomain = mkOption {

229
nixos/modules/services/databases/neo4j.nix
View File

@ -1,34 +1,31 @@
{ config, options, lib, pkgs, ... }: { config, options, lib, pkgs, ... }:
with lib;
let let
cfg = config.services.neo4j; cfg = config.services.neo4j;
opt = options.services.neo4j; opt = options.services.neo4j;
certDirOpt = options.services.neo4j.directories.certificates; certDirOpt = options.services.neo4j.directories.certificates;
isDefaultPathOption = opt: isOption opt && opt.type == types.path && opt.highestPrio >= 1500; isDefaultPathOption = opt: lib.isOption opt && opt.type == lib.types.path && opt.highestPrio >= 1500;
sslPolicies = mapAttrsToList ( sslPolicies = lib.mapAttrsToList (
name: conf: '' name: conf: ''
dbms.ssl.policy.${name}.allow_key_generation=${boolToString conf.allowKeyGeneration} dbms.ssl.policy.${name}.allow_key_generation=${lib.boolToString conf.allowKeyGeneration}
dbms.ssl.policy.${name}.base_directory=${conf.baseDirectory} dbms.ssl.policy.${name}.base_directory=${conf.baseDirectory}
${optionalString (conf.ciphers != null) '' ${lib.optionalString (conf.ciphers != null) ''
dbms.ssl.policy.${name}.ciphers=${concatStringsSep "," conf.ciphers} dbms.ssl.policy.${name}.ciphers=${lib.concatStringsSep "," conf.ciphers}
''} ''}
dbms.ssl.policy.${name}.client_auth=${conf.clientAuth} dbms.ssl.policy.${name}.client_auth=${conf.clientAuth}
${if length (splitString "/" conf.privateKey) > 1 then ${if lib.length (lib.splitString "/" conf.privateKey) > 1 then
"dbms.ssl.policy.${name}.private_key=${conf.privateKey}" "dbms.ssl.policy.${name}.private_key=${conf.privateKey}"
else else
"dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}" "dbms.ssl.policy.${name}.private_key=${conf.baseDirectory}/${conf.privateKey}"
} }
${if length (splitString "/" conf.privateKey) > 1 then ${if lib.length (lib.splitString "/" conf.privateKey) > 1 then
"dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}" "dbms.ssl.policy.${name}.public_certificate=${conf.publicCertificate}"
else else
"dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}" "dbms.ssl.policy.${name}.public_certificate=${conf.baseDirectory}/${conf.publicCertificate}"
} }
dbms.ssl.policy.${name}.revoked_dir=${conf.revokedDir} dbms.ssl.policy.${name}.revoked_dir=${conf.revokedDir}
dbms.ssl.policy.${name}.tls_versions=${concatStringsSep "," conf.tlsVersions} dbms.ssl.policy.${name}.tls_versions=${lib.concatStringsSep "," conf.tlsVersions}
dbms.ssl.policy.${name}.trust_all=${boolToString conf.trustAll} dbms.ssl.policy.${name}.trust_all=${lib.boolToString conf.trustAll}
dbms.ssl.policy.${name}.trusted_dir=${conf.trustedDir} dbms.ssl.policy.${name}.trusted_dir=${conf.trustedDir}
'' ''
) cfg.ssl.policies; ) cfg.ssl.policies;
@ -36,8 +33,8 @@ let
serverConfig = pkgs.writeText "neo4j.conf" '' serverConfig = pkgs.writeText "neo4j.conf" ''
# General # General
server.default_listen_address=${cfg.defaultListenAddress} server.default_listen_address=${cfg.defaultListenAddress}
server.databases.default_to_read_only=${boolToString cfg.readOnly} server.databases.default_to_read_only=${lib.boolToString cfg.readOnly}
${optionalString (cfg.workerCount > 0) '' ${lib.optionalString (cfg.workerCount > 0) ''
dbms.threads.worker_count=${toString cfg.workerCount} dbms.threads.worker_count=${toString cfg.workerCount}
''} ''}
@ -45,7 +42,7 @@ let
# dbms.directories.certificates=${cfg.directories.certificates} # dbms.directories.certificates=${cfg.directories.certificates}
server.directories.plugins=${cfg.directories.plugins} server.directories.plugins=${cfg.directories.plugins}
server.directories.lib=${cfg.package}/share/neo4j/lib server.directories.lib=${cfg.package}/share/neo4j/lib
${optionalString (cfg.constrainLoadCsv) '' ${lib.optionalString (cfg.constrainLoadCsv) ''
server.directories.import=${cfg.directories.imports} server.directories.import=${cfg.directories.imports}
''} ''}
@ -55,25 +52,25 @@ let
server.directories.run=${cfg.directories.home}/run server.directories.run=${cfg.directories.home}/run
# HTTP Connector # HTTP Connector
${optionalString (cfg.http.enable) '' ${lib.optionalString (cfg.http.enable) ''
server.http.enabled=${boolToString cfg.http.enable} server.http.enabled=${lib.boolToString cfg.http.enable}
server.http.listen_address=${cfg.http.listenAddress} server.http.listen_address=${cfg.http.listenAddress}
server.http.advertised_address=${cfg.http.listenAddress} server.http.advertised_address=${cfg.http.listenAddress}
''} ''}
# HTTPS Connector # HTTPS Connector
server.https.enabled=${boolToString cfg.https.enable} server.https.enabled=${lib.boolToString cfg.https.enable}
server.https.listen_address=${cfg.https.listenAddress} server.https.listen_address=${cfg.https.listenAddress}
server.https.advertised_address=${cfg.https.listenAddress} server.https.advertised_address=${cfg.https.listenAddress}
# BOLT Connector # BOLT Connector
server.bolt.enabled=${boolToString cfg.bolt.enable} server.bolt.enabled=${lib.boolToString cfg.bolt.enable}
server.bolt.listen_address=${cfg.bolt.listenAddress} server.bolt.listen_address=${cfg.bolt.listenAddress}
server.bolt.advertised_address=${cfg.bolt.listenAddress} server.bolt.advertised_address=${cfg.bolt.listenAddress}
server.bolt.tls_level=${cfg.bolt.tlsLevel} server.bolt.tls_level=${cfg.bolt.tlsLevel}
# SSL Policies # SSL Policies
${concatStringsSep "\n" sslPolicies} ${lib.concatStringsSep "\n" sslPolicies}
# Default retention policy from neo4j.conf # Default retention policy from neo4j.conf
db.tx_log.rotation.retention_policy=1 days db.tx_log.rotation.retention_policy=1 days
@ -101,33 +98,33 @@ let
in { in {
imports = [ imports = [
(mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ]) (lib.mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ]) (lib.mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ]) (lib.mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ])
(mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ]) (lib.mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ])
(mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ]) (lib.mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ])
(mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ]) (lib.mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ])
(mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.") (lib.mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.") (lib.mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.") (lib.mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "shell" "enabled" ] "shell.enabled was removed upstream") (lib.mkRemovedOptionModule [ "services" "neo4j" "shell" "enabled" ] "shell.enabled was removed upstream")
(mkRemovedOptionModule [ "services" "neo4j" "udc" "enabled" ] "udc.enabled was removed upstream") (lib.mkRemovedOptionModule [ "services" "neo4j" "udc" "enabled" ] "udc.enabled was removed upstream")
]; ];
###### interface ###### interface
options.services.neo4j = { options.services.neo4j = {
enable = mkOption { enable = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Whether to enable Neo4j Community Edition. Whether to enable Neo4j Community Edition.
''; '';
}; };
constrainLoadCsv = mkOption { constrainLoadCsv = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
Sets the root directory for file URLs used with the Cypher Sets the root directory for file URLs used with the Cypher
@ -141,8 +138,8 @@ in {
''; '';
}; };
defaultListenAddress = mkOption { defaultListenAddress = lib.mkOption {
type = types.str; type = lib.types.str;
default = "127.0.0.1"; default = "127.0.0.1";
description = '' description = ''
Default network interface to listen for incoming connections. To Default network interface to listen for incoming connections. To
@ -155,8 +152,8 @@ in {
''; '';
}; };
extraServerConfig = mkOption { extraServerConfig = lib.mkOption {
type = types.lines; type = lib.types.lines;
default = ""; default = "";
description = '' description = ''
Extra configuration for Neo4j Community server. Refer to the Extra configuration for Neo4j Community server. Refer to the
@ -165,18 +162,18 @@ in {
''; '';
}; };
package = mkPackageOption pkgs "neo4j" { }; package = lib.mkPackageOption pkgs "neo4j" { };
readOnly = mkOption { readOnly = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Only allow read operations from this Neo4j instance. Only allow read operations from this Neo4j instance.
''; '';
}; };
workerCount = mkOption { workerCount = lib.mkOption {
type = types.ints.between 0 44738; type = lib.types.ints.between 0 44738;
default = 0; default = 0;
description = '' description = ''
Number of Neo4j worker threads, where the default of Number of Neo4j worker threads, where the default of
@ -186,8 +183,8 @@ in {
}; };
bolt = { bolt = {
enable = mkOption { enable = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
Enable the BOLT connector for Neo4j. Setting this option to Enable the BOLT connector for Neo4j. Setting this option to
@ -196,8 +193,8 @@ in {
''; '';
}; };
listenAddress = mkOption { listenAddress = lib.mkOption {
type = types.str; type = lib.types.str;
default = ":7687"; default = ":7687";
description = '' description = ''
Neo4j listen address for BOLT traffic. The listen address is Neo4j listen address for BOLT traffic. The listen address is
@ -205,8 +202,8 @@ in {
''; '';
}; };
sslPolicy = mkOption { sslPolicy = lib.mkOption {
type = types.str; type = lib.types.str;
default = "legacy"; default = "legacy";
description = '' description = ''
Neo4j SSL policy for BOLT traffic. Neo4j SSL policy for BOLT traffic.
@ -223,8 +220,8 @@ in {
''; '';
}; };
tlsLevel = mkOption { tlsLevel = lib.mkOption {
type = types.enum [ "REQUIRED" "OPTIONAL" "DISABLED" ]; type = lib.types.enum [ "REQUIRED" "OPTIONAL" "DISABLED" ];
default = "OPTIONAL"; default = "OPTIONAL";
description = '' description = ''
SSL/TSL requirement level for BOLT traffic. SSL/TSL requirement level for BOLT traffic.
@ -233,10 +230,10 @@ in {
}; };
directories = { directories = {
certificates = mkOption { certificates = lib.mkOption {
type = types.path; type = lib.types.path;
default = "${cfg.directories.home}/certificates"; default = "${cfg.directories.home}/certificates";
defaultText = literalExpression ''"''${config.${opt.directories.home}}/certificates"''; defaultText = lib.literalExpression ''"''${config.${opt.directories.home}}/certificates"'';
description = '' description = ''
Directory for storing certificates to be used by Neo4j for Directory for storing certificates to be used by Neo4j for
TLS connections. TLS connections.
@ -256,10 +253,10 @@ in {
''; '';
}; };
data = mkOption { data = lib.mkOption {
type = types.path; type = lib.types.path;
default = "${cfg.directories.home}/data"; default = "${cfg.directories.home}/data";
defaultText = literalExpression ''"''${config.${opt.directories.home}}/data"''; defaultText = lib.literalExpression ''"''${config.${opt.directories.home}}/data"'';
description = '' description = ''
Path of the data directory. You must not configure more than one Path of the data directory. You must not configure more than one
Neo4j installation to use the same data directory. Neo4j installation to use the same data directory.
@ -270,8 +267,8 @@ in {
''; '';
}; };
home = mkOption { home = lib.mkOption {
type = types.path; type = lib.types.path;
default = "/var/lib/neo4j"; default = "/var/lib/neo4j";
description = '' description = ''
Path of the Neo4j home directory. Other default directories are Path of the Neo4j home directory. Other default directories are
@ -281,10 +278,10 @@ in {
''; '';
}; };
imports = mkOption { imports = lib.mkOption {
type = types.path; type = lib.types.path;
default = "${cfg.directories.home}/import"; default = "${cfg.directories.home}/import";
defaultText = literalExpression ''"''${config.${opt.directories.home}}/import"''; defaultText = lib.literalExpression ''"''${config.${opt.directories.home}}/import"'';
description = '' description = ''
The root directory for file URLs used with the Cypher The root directory for file URLs used with the Cypher
`LOAD CSV` clause. Only meaningful when `LOAD CSV` clause. Only meaningful when
@ -297,10 +294,10 @@ in {
''; '';
}; };
plugins = mkOption { plugins = lib.mkOption {
type = types.path; type = lib.types.path;
default = "${cfg.directories.home}/plugins"; default = "${cfg.directories.home}/plugins";
defaultText = literalExpression ''"''${config.${opt.directories.home}}/plugins"''; defaultText = lib.literalExpression ''"''${config.${opt.directories.home}}/plugins"'';
description = '' description = ''
Path of the database plugin directory. Compiled Java JAR files that Path of the database plugin directory. Compiled Java JAR files that
contain database procedures will be loaded if they are placed in contain database procedures will be loaded if they are placed in
@ -314,8 +311,8 @@ in {
}; };
http = { http = {
enable = mkOption { enable = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
Enable the HTTP connector for Neo4j. Setting this option to Enable the HTTP connector for Neo4j. Setting this option to
@ -324,8 +321,8 @@ in {
''; '';
}; };
listenAddress = mkOption { listenAddress = lib.mkOption {
type = types.str; type = lib.types.str;
default = ":7474"; default = ":7474";
description = '' description = ''
Neo4j listen address for HTTP traffic. The listen address is Neo4j listen address for HTTP traffic. The listen address is
@ -335,8 +332,8 @@ in {
}; };
https = { https = {
enable = mkOption { enable = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = true; default = true;
description = '' description = ''
Enable the HTTPS connector for Neo4j. Setting this option to Enable the HTTPS connector for Neo4j. Setting this option to
@ -345,8 +342,8 @@ in {
''; '';
}; };
listenAddress = mkOption { listenAddress = lib.mkOption {
type = types.str; type = lib.types.str;
default = ":7473"; default = ":7473";
description = '' description = ''
Neo4j listen address for HTTPS traffic. The listen address is Neo4j listen address for HTTPS traffic. The listen address is
@ -354,8 +351,8 @@ in {
''; '';
}; };
sslPolicy = mkOption { sslPolicy = lib.mkOption {
type = types.str; type = lib.types.str;
default = "legacy"; default = "legacy";
description = '' description = ''
Neo4j SSL policy for HTTPS traffic. Neo4j SSL policy for HTTPS traffic.
@ -370,8 +367,8 @@ in {
}; };
shell = { shell = {
enable = mkOption { enable = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Enable a remote shell server which Neo4j Shell clients can log in to. Enable a remote shell server which Neo4j Shell clients can log in to.
@ -380,12 +377,12 @@ in {
}; };
}; };
ssl.policies = mkOption { ssl.policies = lib.mkOption {
type = with types; attrsOf (submodule ({ name, config, options, ... }: { type = with lib.types; attrsOf (submodule ({ name, config, options, ... }: {
options = { options = {
allowKeyGeneration = mkOption { allowKeyGeneration = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Allows the generation of a private key and associated self-signed Allows the generation of a private key and associated self-signed
@ -402,10 +399,10 @@ in {
''; '';
}; };
baseDirectory = mkOption { baseDirectory = lib.mkOption {
type = types.path; type = lib.types.path;
default = "${cfg.directories.certificates}/${name}"; default = "${cfg.directories.certificates}/${name}";
defaultText = literalExpression ''"''${config.${opt.directories.certificates}}/''${name}"''; defaultText = lib.literalExpression ''"''${config.${opt.directories.certificates}}/''${name}"'';
description = '' description = ''
The mandatory base directory for cryptographic objects of this The mandatory base directory for cryptographic objects of this
policy. This path is only automatically generated when this policy. This path is only automatically generated when this
@ -420,8 +417,8 @@ in {
''; '';
}; };
ciphers = mkOption { ciphers = lib.mkOption {
type = types.nullOr (types.listOf types.str); type = lib.types.nullOr (lib.types.listOf lib.types.str);
default = null; default = null;
description = '' description = ''
Restrict the allowed ciphers of this policy to those defined Restrict the allowed ciphers of this policy to those defined
@ -429,16 +426,16 @@ in {
''; '';
}; };
clientAuth = mkOption { clientAuth = lib.mkOption {
type = types.enum [ "NONE" "OPTIONAL" "REQUIRE" ]; type = lib.types.enum [ "NONE" "OPTIONAL" "REQUIRE" ];
default = "REQUIRE"; default = "REQUIRE";
description = '' description = ''
The client authentication stance for this policy. The client authentication stance for this policy.
''; '';
}; };
privateKey = mkOption { privateKey = lib.mkOption {
type = types.str; type = lib.types.str;
default = "private.key"; default = "private.key";
description = '' description = ''
The name of private PKCS #8 key file for this policy to be found The name of private PKCS #8 key file for this policy to be found
@ -447,8 +444,8 @@ in {
''; '';
}; };
publicCertificate = mkOption { publicCertificate = lib.mkOption {
type = types.str; type = lib.types.str;
default = "public.crt"; default = "public.crt";
description = '' description = ''
The name of public X.509 certificate (chain) file in PEM format The name of public X.509 certificate (chain) file in PEM format
@ -462,10 +459,10 @@ in {
''; '';
}; };
revokedDir = mkOption { revokedDir = lib.mkOption {
type = types.path; type = lib.types.path;
default = "${config.baseDirectory}/revoked"; default = "${config.baseDirectory}/revoked";
defaultText = literalExpression ''"''${config.${options.baseDirectory}}/revoked"''; defaultText = lib.literalExpression ''"''${config.${options.baseDirectory}}/revoked"'';
description = '' description = ''
Path to directory of CRLs (Certificate Revocation Lists) in Path to directory of CRLs (Certificate Revocation Lists) in
PEM format. Must be an absolute path. The existence of this PEM format. Must be an absolute path. The existence of this
@ -478,8 +475,8 @@ in {
''; '';
}; };
tlsVersions = mkOption { tlsVersions = lib.mkOption {
type = types.listOf types.str; type = lib.types.listOf lib.types.str;
default = [ "TLSv1.2" ]; default = [ "TLSv1.2" ];
description = '' description = ''
Restrict the TLS protocol versions of this policy to those Restrict the TLS protocol versions of this policy to those
@ -487,8 +484,8 @@ in {
''; '';
}; };
trustAll = mkOption { trustAll = lib.mkOption {
type = types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Makes this policy trust all remote parties. Enabling this is not Makes this policy trust all remote parties. Enabling this is not
@ -498,10 +495,10 @@ in {
''; '';
}; };
trustedDir = mkOption { trustedDir = lib.mkOption {
type = types.path; type = lib.types.path;
default = "${config.baseDirectory}/trusted"; default = "${config.baseDirectory}/trusted";
defaultText = literalExpression ''"''${config.${options.baseDirectory}}/trusted"''; defaultText = lib.literalExpression ''"''${config.${options.baseDirectory}}/trusted"'';
description = '' description = ''
Path to directory of X.509 certificates in PEM format for Path to directory of X.509 certificates in PEM format for
trusted parties. Must be an absolute path. The existence of this trusted parties. Must be an absolute path. The existence of this
@ -518,8 +515,8 @@ in {
''; '';
}; };
directoriesToCreate = mkOption { directoriesToCreate = lib.mkOption {
type = types.listOf types.path; type = lib.types.listOf lib.types.path;
internal = true; internal = true;
readOnly = true; readOnly = true;
description = '' description = ''
@ -532,9 +529,9 @@ in {
}; };
config.directoriesToCreate = optionals config.directoriesToCreate = lib.optionals
(certDirOpt.highestPrio >= 1500 && options.baseDirectory.highestPrio >= 1500) (certDirOpt.highestPrio >= 1500 && options.baseDirectory.highestPrio >= 1500)
(map (opt: opt.value) (filter isDefaultPathOption (attrValues options))); (map (opt: opt.value) (lib.filter isDefaultPathOption (lib.attrValues options)));
})); }));
default = {}; default = {};
@ -555,22 +552,22 @@ in {
config = config =
let let
# Assertion helpers # Assertion helpers
policyNameList = attrNames cfg.ssl.policies; policyNameList = lib.attrNames cfg.ssl.policies;
validPolicyNameList = [ "legacy" ] ++ policyNameList; validPolicyNameList = [ "legacy" ] ++ policyNameList;
validPolicyNameString = concatStringsSep ", " validPolicyNameList; validPolicyNameString = lib.concatStringsSep ", " validPolicyNameList;
# Capture various directories left at their default so they can be created. # Capture various directories left at their default so they can be created.
defaultDirectoriesToCreate = map (opt: opt.value) (filter isDefaultPathOption (attrValues options.services.neo4j.directories)); defaultDirectoriesToCreate = map (opt: opt.value) (lib.filter isDefaultPathOption (lib.attrValues options.services.neo4j.directories));
policyDirectoriesToCreate = concatMap (pol: pol.directoriesToCreate) (attrValues cfg.ssl.policies); policyDirectoriesToCreate = lib.concatMap (pol: pol.directoriesToCreate) (lib.attrValues cfg.ssl.policies);
in in
mkIf cfg.enable { lib.mkIf cfg.enable {
assertions = [ assertions = [
{ assertion = !elem "legacy" policyNameList; { assertion = !lib.elem "legacy" policyNameList;
message = "The policy 'legacy' is special to Neo4j, and its name is reserved."; } message = "The policy 'legacy' is special to Neo4j, and its name is reserved."; }
{ assertion = elem cfg.bolt.sslPolicy validPolicyNameList; { assertion = lib.elem cfg.bolt.sslPolicy validPolicyNameList;
message = "Invalid policy assigned: `services.neo4j.bolt.sslPolicy = \"${cfg.bolt.sslPolicy}\"`, defined policies are: ${validPolicyNameString}"; } message = "Invalid policy assigned: `services.neo4j.bolt.sslPolicy = \"${cfg.bolt.sslPolicy}\"`, defined policies are: ${validPolicyNameString}"; }
{ assertion = elem cfg.https.sslPolicy validPolicyNameList; { assertion = lib.elem cfg.https.sslPolicy validPolicyNameList;
message = "Invalid policy assigned: `services.neo4j.https.sslPolicy = \"${cfg.https.sslPolicy}\"`, defined policies are: ${validPolicyNameString}"; } message = "Invalid policy assigned: `services.neo4j.https.sslPolicy = \"${cfg.https.sslPolicy}\"`, defined policies are: ${validPolicyNameString}"; }
]; ];
@ -595,7 +592,7 @@ in {
mkdir -m 0700 -p ${cfg.directories.home}/{conf,logs} mkdir -m 0700 -p ${cfg.directories.home}/{conf,logs}
# Create other sub-directories and policy directories that have been left at their default. # Create other sub-directories and policy directories that have been left at their default.
${concatMapStringsSep "\n" ( ${lib.concatMapStringsSep "\n" (
dir: '' dir: ''
mkdir -m 0700 -p ${dir} mkdir -m 0700 -p ${dir}
'') (defaultDirectoriesToCreate ++ policyDirectoriesToCreate)} '') (defaultDirectoriesToCreate ++ policyDirectoriesToCreate)}

6
nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
View File

@ -32,15 +32,15 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ environment.systemPackages = [
pkgs.gnome.gnome-settings-daemon pkgs.gnome-settings-daemon
]; ];
services.udev.packages = [ services.udev.packages = [
pkgs.gnome.gnome-settings-daemon pkgs.gnome-settings-daemon
]; ];
systemd.packages = [ systemd.packages = [
pkgs.gnome.gnome-settings-daemon pkgs.gnome-settings-daemon
]; ];
systemd.user.targets."gnome-session-x11-services".wants = [ systemd.user.targets."gnome-session-x11-services".wants = [

2
nixos/modules/services/hardware/kanata.nix
View File

@ -115,7 +115,7 @@ let
--cfg ${keyboard.configFile} \ --cfg ${keyboard.configFile} \
--symlink-path ''${RUNTIME_DIRECTORY}/${name} \ --symlink-path ''${RUNTIME_DIRECTORY}/${name} \
${lib.optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \ ${lib.optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \
${utils.lib.escapeSystemdExecArgs keyboard.extraArgs} ${utils.escapeSystemdExecArgs keyboard.extraArgs}
''; '';
DynamicUser = true; DynamicUser = true;

2
nixos/modules/services/x11/desktop-managers/gnome.md
View File

@ -167,7 +167,7 @@ You can use `dconf-editor` tool to explore which GSettings you can set.
extraGSettingsOverridePackages = [ extraGSettingsOverridePackages = [
pkgs.gsettings-desktop-schemas # for org.gnome.desktop pkgs.gsettings-desktop-schemas # for org.gnome.desktop
pkgs.gnome.gnome-shell # for org.gnome.shell pkgs.gnome-shell # for org.gnome.shell
]; ];
}; };
} }

58
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -108,7 +108,7 @@ in
favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ] favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ]
''' '''
''; '';
description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally."; description = "List of desktop files to put as favorite apps into pkgs.gnome-shell. These need to be installed somehow globally.";
}; };
extraGSettingsOverrides = mkOption { extraGSettingsOverrides = mkOption {
@ -123,7 +123,7 @@ in
description = "List of packages for which gsettings are overridden."; description = "List of packages for which gsettings are overridden.";
}; };
debug = mkEnableOption "gnome-session debug messages"; debug = mkEnableOption "pkgs.gnome-session debug messages";
flashback = { flashback = {
enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity"; enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity";
@ -162,11 +162,11 @@ in
}; };
panelModulePackages = mkOption { panelModulePackages = mkOption {
default = [ pkgs.gnome.gnome-applets ]; default = [ pkgs.gnome-applets ];
defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]"; defaultText = literalExpression "[ pkgs.gnome-applets ]";
type = types.listOf types.package; type = types.listOf types.package;
description = '' description = ''
Packages containing modules that should be made available to `gnome-panel` (usually for applets). Packages containing modules that should be made available to `pkgs.gnome-panel` (usually for applets).
If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`. If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`.
''; '';
@ -196,7 +196,7 @@ in
services.gnome.core-shell.enable = true; services.gnome.core-shell.enable = true;
services.gnome.core-utilities.enable = mkDefault true; services.gnome.core-utilities.enable = mkDefault true;
services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ]; services.displayManager.sessionPackages = [ pkgs.gnome-session.sessions ];
environment.extraInit = '' environment.extraInit = ''
${lib.concatMapStrings (p: '' ${lib.concatMapStrings (p: ''
@ -228,7 +228,7 @@ in
assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique."); assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique.");
map map
(wm: (wm:
pkgs.gnome.gnome-flashback.mkSessionForWm { pkgs.gnome-flashback.mkSessionForWm {
inherit (wm) wmName wmLabel wmCommand; inherit (wm) wmName wmLabel wmCommand;
} }
) flashbackWms; ) flashbackWms;
@ -237,20 +237,20 @@ in
enableGnomeKeyring = true; enableGnomeKeyring = true;
}; };
systemd.packages = with pkgs.gnome; [ systemd.packages = [
gnome-flashback pkgs.gnome-flashback
] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms; ] ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms;
environment.systemPackages = with pkgs.gnome; [ environment.systemPackages = [
gnome-flashback pkgs.gnome-flashback
(gnome-panel-with-modules.override { (pkgs.gnome-panel-with-modules.override {
panelModulePackages = cfg.flashback.panelModulePackages; panelModulePackages = cfg.flashback.panelModulePackages;
}) })
] ]
# For /share/applications/${wmName}.desktop # For /share/applications/${wmName}.desktop
++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms) ++ (map (wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)
# For /share/gnome-session/sessions/gnome-flashback-${wmName}.session # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms); ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);
}) })
(lib.mkIf serviceCfg.core-os-services.enable { (lib.mkIf serviceCfg.core-os-services.enable {
@ -287,7 +287,7 @@ in
buildPortalsInGnome = false; buildPortalsInGnome = false;
}) })
]; ];
xdg.portal.configPackages = mkDefault [ pkgs.gnome.gnome-session ]; xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ];
networking.networkmanager.enable = mkDefault true; networking.networkmanager.enable = mkDefault true;
@ -309,7 +309,7 @@ in
services.xserver.desktopManager.gnome.sessionPath = services.xserver.desktopManager.gnome.sessionPath =
let let
mandatoryPackages = [ mandatoryPackages = [
pkgs.gnome.gnome-shell pkgs.gnome-shell
]; ];
optionalPackages = [ optionalPackages = [
pkgs.gnome-shell-extensions pkgs.gnome-shell-extensions
@ -329,15 +329,15 @@ in
services.gvfs.enable = true; services.gvfs.enable = true;
services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true)); services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true));
systemd.packages = with pkgs.gnome; [ systemd.packages = [
gnome-session pkgs.gnome-session
gnome-shell pkgs.gnome-shell
]; ];
services.udev.packages = with pkgs.gnome; [ services.udev.packages = [
# Force enable KMS modifiers for devices that require them. # Force enable KMS modifiers for devices that require them.
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 # https://gitlab.gnome.org/GNOME/pkgs.mutter/-/merge_requests/1443
mutter pkgs.mutter
]; ];
services.avahi.enable = mkDefault true; services.avahi.enable = mkDefault true;
@ -368,16 +368,16 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = environment.systemPackages =
let let
mandatoryPackages = with pkgs.gnome; [ mandatoryPackages = [
gnome-shell pkgs.gnome-shell
]; ];
optionalPackages = with pkgs.gnome; [ optionalPackages = [
pkgs.adwaita-icon-theme pkgs.adwaita-icon-theme
nixos-background-info nixos-background-info
pkgs.gnome-backgrounds pkgs.gnome-backgrounds
gnome-bluetooth pkgs.gnome-bluetooth
pkgs.gnome-color-manager pkgs.gnome-color-manager
gnome-control-center pkgs.gnome-control-center
pkgs.gnome-shell-extensions pkgs.gnome-shell-extensions
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
pkgs.gnome-user-docs pkgs.gnome-user-docs

2
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -177,7 +177,7 @@ in
pkgs.pantheon.mutter pkgs.pantheon.mutter
]; ];
systemd.packages = with pkgs; [ systemd.packages = with pkgs; [
gnome.gnome-session gnome-session
pantheon.gala pantheon.gala
pantheon.gnome-settings-daemon pantheon.gnome-settings-daemon
pantheon.elementary-session-settings pantheon.elementary-session-settings

10
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -153,7 +153,7 @@ in
XDG_DATA_DIRS = lib.makeSearchPath "share" [ XDG_DATA_DIRS = lib.makeSearchPath "share" [
gdm # for gnome-login.session gdm # for gnome-login.session
config.services.displayManager.sessionData.desktops config.services.displayManager.sessionData.desktops
pkgs.gnome.gnome-control-center # for accessibility icon pkgs.gnome-control-center # for accessibility icon
pkgs.adwaita-icon-theme pkgs.adwaita-icon-theme
pkgs.hicolor-icon-theme # empty icon theme as a base pkgs.hicolor-icon-theme # empty icon theme as a base
]; ];
@ -181,7 +181,11 @@ in
]; ];
# Otherwise GDM will not be able to start correctly and display Wayland sessions # Otherwise GDM will not be able to start correctly and display Wayland sessions
systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; systemd.packages = with pkgs.gnome; [
gdm
pkgs.gnome-session
pkgs.gnome-shell
];
environment.systemPackages = [ pkgs.adwaita-icon-theme ]; environment.systemPackages = [ pkgs.adwaita-icon-theme ];
# We dont use the upstream gdm service # We dont use the upstream gdm service
@ -232,7 +236,7 @@ in
EnvironmentFile = "-/etc/locale.conf"; EnvironmentFile = "-/etc/locale.conf";
}; };
systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ]; systemd.services.display-manager.path = [ pkgs.gnome-session ];
# Allow choosing an user account # Allow choosing an user account
services.accounts-daemon.enable = true; services.accounts-daemon.enable = true;

7
nixos/tests/ceph-single-node-bluestore-dmcrypt.nix
View File

@ -16,8 +16,11 @@ import ./make-test-python.nix (
in in
{ {
name = "basic-single-node-ceph-cluster-bluestore-dmcrypt"; name = "basic-single-node-ceph-cluster-bluestore-dmcrypt";
meta = with pkgs.lib.maintainers; { meta = {
maintainers = [ nh2 ]; maintainers = with lib.maintainers; [
benaryorg
nh2
];
}; };
nodes = { nodes = {

2
nixos/tests/gnome-extensions.nix
View File

@ -45,7 +45,7 @@ import ./make-test-python.nix (
# Eval API is now internal so Shell needs to run in unsafe mode. # Eval API is now internal so Shell needs to run in unsafe mode.
# TODO: improve test driver so that it supports openqa-like manipulation # TODO: improve test driver so that it supports openqa-like manipulation
# that would allow us to drop this mess. # that would allow us to drop this mess.
"${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
]; ];
}; };
}; };

2
nixos/tests/gnome-xorg.nix
View File

@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
# Eval API is now internal so Shell needs to run in unsafe mode. # Eval API is now internal so Shell needs to run in unsafe mode.
# TODO: improve test driver so that it supports openqa-like manipulation # TODO: improve test driver so that it supports openqa-like manipulation
# that would allow us to drop this mess. # that would allow us to drop this mess.
"${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
]; ];
}; };
}; };

2
nixos/tests/gnome.nix
View File

@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
# Eval API is now internal so Shell needs to run in unsafe mode. # Eval API is now internal so Shell needs to run in unsafe mode.
# TODO: improve test driver so that it supports openqa-like manipulation # TODO: improve test driver so that it supports openqa-like manipulation
# that would allow us to drop this mess. # that would allow us to drop this mess.
"${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
]; ];
}; };
}; };

4
nixos/tests/matrix/mjolnir.nix
View File

@ -109,8 +109,8 @@ import ../make-test-python.nix (
environment.systemPackages = [ environment.systemPackages = [
(pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir" (pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir"
{ libraries = with pkgs.python3Packages; [ { libraries = with pkgs.python3Packages; [
matrix-nio (matrix-nio.override { withOlm = true; })
] ++ matrix-nio.optional-dependencies.e2e; ];
} '' } ''
import asyncio import asyncio

16
nixos/tests/plotinus.nix
View File

@ -2,6 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
name = "plotinus"; name = "plotinus";
meta = { meta = {
maintainers = pkgs.plotinus.meta.maintainers; maintainers = pkgs.plotinus.meta.maintainers;
timeout = 600;
}; };
nodes.machine = nodes.machine =
@ -9,20 +10,23 @@ import ./make-test-python.nix ({ pkgs, ... }: {
{ imports = [ ./common/x11.nix ]; { imports = [ ./common/x11.nix ];
programs.plotinus.enable = true; programs.plotinus.enable = true;
environment.systemPackages = [ pkgs.gnome-calculator pkgs.xdotool ]; environment.systemPackages = [
pkgs.gnome-pomodoro
pkgs.xdotool
];
}; };
testScript = '' testScript = ''
machine.wait_for_x() machine.wait_for_x()
machine.succeed("gnome-calculator >&2 &") machine.succeed("gnome-pomodoro >&2 &")
machine.wait_for_window("gnome-calculator") machine.wait_for_window("Pomodoro", timeout=120)
machine.succeed( machine.succeed(
"xdotool search --sync --onlyvisible --class gnome-calculator " "xdotool search --sync --onlyvisible --class gnome-pomodoro "
+ "windowfocus --sync key --clearmodifiers --delay 1 'ctrl+shift+p'" + "windowfocus --sync key --clearmodifiers --delay 1 'ctrl+shift+p'"
) )
machine.sleep(5) # wait for the popup machine.sleep(5) # wait for the popup
machine.screenshot("popup")
machine.succeed("xdotool key --delay 100 p r e f e r e n c e s Return") machine.succeed("xdotool key --delay 100 p r e f e r e n c e s Return")
machine.wait_for_window("Preferences") machine.wait_for_window("Preferences", timeout=120)
machine.screenshot("screen")
''; '';
}) })

2
nixos/tests/systemd-initrd-luks-fido2.nix
View File

@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
# Booting off the encrypted disk requires having a Nix store available for the init script # Booting off the encrypted disk requires having a Nix store available for the init script
mountHostNixStore = true; mountHostNixStore = true;
useEFIBoot = true; useEFIBoot = true;
qemu.options = [ "-device canokey,file=/tmp/canokey-file" ]; qemu.options = [ "-device pci-ohci,id=usb-bus" "-device canokey,bus=usb-bus.0,file=/tmp/canokey-file" ];
}; };
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

4
pkgs/applications/audio/ft2-clone/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ft2-clone"; pname = "ft2-clone";
version = "1.84"; version = "1.85";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "8bitbubsy"; owner = "8bitbubsy";
repo = "ft2-clone"; repo = "ft2-clone";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-RPrNpm+0N//CpVtG6cJD+m+0G6ca75hZwdEdHsGadEg="; hash = "sha256-1iIwfZVRumlZn67xEhlef6Gm2Hb52CHFAq9RPU4M13M=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

27
pkgs/applications/audio/termusic/default.nix
View File

@ -6,11 +6,13 @@
, dbus , dbus
, Foundation , Foundation
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, glib , glib
, gst_all_1 , gst_all_1
, IOKit , IOKit
, lib , lib
, MediaPlayer , MediaPlayer
, mpv-unwrapped
, openssl , openssl
, pkg-config , pkg-config
, protobuf , protobuf
@ -22,26 +24,42 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "termusic"; pname = "termusic";
version = "0.9.0"; version = "0.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tramhao"; owner = "tramhao";
repo = "termusic"; repo = "termusic";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-FOFZg32hrWpKVsjkMDkiqah7jmUZw0HRWGqOvsN0t8Q="; hash = "sha256-aEkg1j6R86QGn21HBimtZwmjmW1K9Wo+67G4DlpY960=";
}; };
cargoPatches = [
# both following patches can be removed with the follow up release to 0.9.1 as they are cherry-picked from `termusic/master` branch
# fix build issue with 0.9.1 release and vendoring producing wrong hash for soundtouch-ffi
(fetchpatch {
url = "https://github.com/tramhao/termusic/commit/211fc3fe008932d052d31d3b836e8a80eade3cfe.patch";
hash = "sha256-11kSI28YonoTe5W31+R76lGhNiN1ZLAg94FrfYiZUAY=";
})
# fix a bug through previous patch
(fetchpatch {
url = "https://github.com/tramhao/termusic/commit/2a40b2f366dfa5c1f008c79a3ff5c1bbf53fe10f.patch";
hash = "sha256-b7CJ5SqxrU1Jr4GDaJe9sFutDHMqIQxGhXbBFGB6y84=";
})
];
postPatch = '' postPatch = ''
pushd $cargoDepsCopy/stream-download pushd $cargoDepsCopy/stream-download
oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
substituteInPlace $cargoDepsCopy/stream-download/src/lib.rs \ substituteInPlace $cargoDepsCopy/stream-download/src/lib.rs \
--replace-warn '#![doc = include_str!("../README.md")]' "" --replace-warn '#![doc = include_str!("../README.md")]' ""
substituteInPlace .cargo-checksum.json \ substituteInPlace .cargo-checksum.json \
--replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) --replace-warn $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1)
popd popd
''; '';
cargoHash = "sha256-r5FOl3Bp3GYhOhvWj/y6FXsuG2wvuFcMcYKBzVBVqiM="; cargoHash = "sha256-4PprZdTIcYa8y7FwQVrG0ZBg7N/Xe6HDt/z6ZmaHd5Y=";
useNextest = true;
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -53,6 +71,7 @@ rustPlatform.buildRustPackage rec {
dbus dbus
glib glib
gst_all_1.gstreamer gst_all_1.gstreamer
mpv-unwrapped
openssl openssl
sqlite sqlite
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [

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

@ -4,6 +4,7 @@
, autoPatchelfHook , autoPatchelfHook
, dpkg , dpkg
, makeWrapper , makeWrapper
, wrapGAppsHook3
, alsa-lib , alsa-lib
, at-spi2-atk , at-spi2-atk
, at-spi2-core , at-spi2-core
@ -37,14 +38,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "tidal-hifi"; pname = "tidal-hifi";
version = "5.15.0"; version = "5.16.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
sha256 = "sha256-0OXNynf56On+emLO0ZfNIcoT3GEhSXdoQhfxapLYYic="; sha256 = "sha256-gDinm7kILm4SKlWmaJ1grwRuketGs/aWlJfNEF+AIRo=";
}; };
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ];
buildInputs = [ buildInputs = [
alsa-lib alsa-lib

224
pkgs/applications/editors/jetbrains/bin/versions.json
View File

@ -27,10 +27,10 @@
"dataspell": { "dataspell": {
"update-channel": "DataSpell RELEASE", "update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
"version": "2024.2", "version": "2024.2.1",
"sha256": "fcf6d8269ef1e652da003b3cdb212b4bd06a66d6432c574b0b99f47c27eea950", "sha256": "7854a303ad5f3bb9300f515baaed34e4362c59c631b117ea49eaa81f75ef485d",
"url": "https://download.jetbrains.com/python/dataspell-2024.2.tar.gz", "url": "https://download.jetbrains.com/python/dataspell-2024.2.1.tar.gz",
"build_number": "242.20224.354" "build_number": "242.21829.112"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
@ -51,18 +51,18 @@
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
"version": "2024.2.0.2", "version": "2024.2.1",
"sha256": "acca1c3dde049895a11069f1c3245f69cfe64fdfc520ab0a0ea8b684b53b50cd", "sha256": "781cc03526d5811061c6ffd211942698b3d18ed2f055a04f384956686a7aa0a6",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2.tar.gz", "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1.tar.gz",
"build_number": "242.20224.419" "build_number": "242.21829.142"
}, },
"idea-ultimate": { "idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
"version": "2024.2.0.2", "version": "2024.2.1",
"sha256": "cf2159b9ea61ea910d27ad0e661cdd93575f65cdb443f99bd15600f5960b7f4b", "sha256": "aa817431cfad5b814d356211e4826358c647a8a550938829aef9fb9eec61366d",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2.tar.gz", "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1.tar.gz",
"build_number": "242.20224.419" "build_number": "242.21829.142"
}, },
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
@ -84,26 +84,26 @@
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "d9befc260f48b9809f84cefd05761848ee8be643b49c595e13fd1443c967eb25", "sha256": "232ddc3c15b138264534820a40049ea4b0108647ba2972294616bc2a3f22234b",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1.tar.gz",
"build_number": "242.20224.428" "build_number": "242.21829.153"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "7d2bfb2449e85ca66ffaf40901a2c4b1498d43c16229bdad08c51a5b0571dc02", "sha256": "01802b2e4892a81c197cc1be08e036ea2c1dd84307a71337531b6cb2213e248a",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1.tar.gz",
"build_number": "242.20224.428" "build_number": "242.21829.153"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"version": "2024.2.1", "version": "2024.2.2",
"sha256": "2d14917d527120a98c1d71b94ba430fe9bb7f2358290710d74fd121426cffa4e", "sha256": "69eb9b7078d192d8f353e24fc88845d912f0056c165b1b0f01faf036889b48a1",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1.tar.gz", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.2.tar.gz",
"build_number": "242.20224.418" "build_number": "242.20224.431"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
@ -124,10 +124,10 @@
"webstorm": { "webstorm": {
"update-channel": "WebStorm RELEASE", "update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "52a196f8f144b1445e3345285762acb1d2f87c29cb7f4a9005bcde4289443258", "sha256": "a598c2686a6c8e4d6b19e1a0a54c78c2c77a772c35ef041244fece64940d8b93",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1.tar.gz", "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1.tar.gz",
"build_number": "242.20224.426" "build_number": "242.21829.149"
}, },
"writerside": { "writerside": {
"update-channel": "Writerside EAP", "update-channel": "Writerside EAP",
@ -166,10 +166,10 @@
"dataspell": { "dataspell": {
"update-channel": "DataSpell RELEASE", "update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
"version": "2024.2", "version": "2024.2.1",
"sha256": "aa9fda7ffdd7348bd34b98fee8f4d0904edf30ea08ae57e64ac7b6e247b567a8", "sha256": "2d6e0ed778d9697f80ed38c2cb2976df179e5b24144dc42558fd3ca3ba7e54c9",
"url": "https://download.jetbrains.com/python/dataspell-2024.2-aarch64.tar.gz", "url": "https://download.jetbrains.com/python/dataspell-2024.2.1-aarch64.tar.gz",
"build_number": "242.20224.354" "build_number": "242.21829.112"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
@ -190,18 +190,18 @@
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
"version": "2024.2.0.2", "version": "2024.2.1",
"sha256": "1f8bc10d63e0878fcc95aa787f7859e106f144fae2334bc71b2514a5189f7b45", "sha256": "de1b3e5af326131a4131dde5cfa219a98c7d1e9397083e99a1613b935b351247",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2-aarch64.tar.gz", "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1-aarch64.tar.gz",
"build_number": "242.20224.419" "build_number": "242.21829.142"
}, },
"idea-ultimate": { "idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
"version": "2024.2.0.2", "version": "2024.2.1",
"sha256": "0da7909451157394d190b5041aaa61475ab30afd7af16a77651b40b90b78ef0e", "sha256": "12757b81db19b31311f356921961e3cbd34d1aec98d03865402a0053c6129228",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2-aarch64.tar.gz", "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1-aarch64.tar.gz",
"build_number": "242.20224.419" "build_number": "242.21829.142"
}, },
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
@ -223,26 +223,26 @@
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "3c954950fb616dc85dc0da6475feee6d67363a537df451ee8fe25aeb6e473b86", "sha256": "1f4ba170363bfce4d434d2b39aa0ef645c2841ece58b0225243dc9136a37e378",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1-aarch64.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1-aarch64.tar.gz",
"build_number": "242.20224.428" "build_number": "242.21829.153"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "84cb34fd2ae9d96dc544f7e326015081e6186dbf7fc3f67a271d76107494f933", "sha256": "76dd1747a5072d736129311c596ed6d5f4a628ebbbce136a5810b9ecee091953",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1-aarch64.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1-aarch64.tar.gz",
"build_number": "242.20224.428" "build_number": "242.21829.153"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
"version": "2024.2.1", "version": "2024.2.2",
"sha256": "cd969fc84eaa87dfa1de2587b3ba974e6d8961895541732e9c1617c260ce8450", "sha256": "ad60928941054d4e7171fc90b93bc63d007dbc200cef4896518b9aac0815629f",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1-aarch64.tar.gz", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.2-aarch64.tar.gz",
"build_number": "242.20224.418" "build_number": "242.20224.431"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
@ -263,10 +263,10 @@
"webstorm": { "webstorm": {
"update-channel": "WebStorm RELEASE", "update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "c83491b11662beeda45df0fb333034a9e875d61e6bb6790f102186d218934ca0", "sha256": "7ad8a2a81f1d0cf3f4cc17eb988189133f9d3f250fe62aa31bff2d8a10e29ce1",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1-aarch64.tar.gz", "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1-aarch64.tar.gz",
"build_number": "242.20224.426" "build_number": "242.21829.149"
}, },
"writerside": { "writerside": {
"update-channel": "Writerside EAP", "update-channel": "Writerside EAP",
@ -305,10 +305,10 @@
"dataspell": { "dataspell": {
"update-channel": "DataSpell RELEASE", "update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
"version": "2024.2", "version": "2024.2.1",
"sha256": "3e066588e8123c1842a03a0030c8d5a72c60a9710a759d5f10f89ae1a9633772", "sha256": "fe47cf2258d935316f5c47fb68dbe68ea612a5b14668d4755c1580d3a32bda5c",
"url": "https://download.jetbrains.com/python/dataspell-2024.2.dmg", "url": "https://download.jetbrains.com/python/dataspell-2024.2.1.dmg",
"build_number": "242.20224.354" "build_number": "242.21829.112"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
@ -329,18 +329,18 @@
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
"version": "2024.2.0.2", "version": "2024.2.1",
"sha256": "3b5d0f9de135e681cbbe06fc3e1ed00a798102174a7baba6edf7061582ea8d7b", "sha256": "3b6884d12979977530b642a473d4337e724340e0a8448b218e98d733fc35a166",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2.dmg", "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1.dmg",
"build_number": "242.20224.419" "build_number": "242.21829.142"
}, },
"idea-ultimate": { "idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
"version": "2024.2.0.2", "version": "2024.2.1",
"sha256": "fde5ffcba501bd94139115266b71dff76ec199ea35ff0673e7b7afea73aeb80b", "sha256": "f6c1b20855bd49764c7b039407ae8bb8b029a59cd7f280cccdea19309538910f",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2.dmg", "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1.dmg",
"build_number": "242.20224.419" "build_number": "242.21829.142"
}, },
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
@ -362,26 +362,26 @@
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "2735841aa3d5544a53bcc2d9bac86e1a452c8e29b434b0591c0db13f40347868", "sha256": "bfc1f6d282ef67b62385f48cc119743de15e2776ec8cbe0cfe938a51b89e54b4",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1.dmg", "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1.dmg",
"build_number": "242.20224.428" "build_number": "242.21829.153"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "e98c3d13f67ed3ad3abf512189a1d3e331ee48ac1beefb2843e652f2c4b59878", "sha256": "d20348dfa6393719fc193c6f1fae96be3e52cd795f65eda021501267027e6c1d",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1.dmg", "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1.dmg",
"build_number": "242.20224.428" "build_number": "242.21829.153"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
"version": "2024.2.1", "version": "2024.2.2",
"sha256": "5631e697ed41713df06c1fe71d6d5e0b39360afb2a1babd103b876f83dff7aa1", "sha256": "dbaf051c31fb04ddca31c38b1bf76b9f4332db67dd414dca56369a63203a42a2",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1.dmg", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.2.dmg",
"build_number": "242.20224.418" "build_number": "242.20224.431"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
@ -402,10 +402,10 @@
"webstorm": { "webstorm": {
"update-channel": "WebStorm RELEASE", "update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "2533f260a7ac04ffc4e0711a21e6cdb2819ab2e1e99f3d02ce447efd3c4dc5b6", "sha256": "b2fd1750c80d3568906f9f4ab098584be836092bafb97eee3c79acc9a36d626f",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1.dmg", "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1.dmg",
"build_number": "242.20224.426" "build_number": "242.21829.149"
}, },
"writerside": { "writerside": {
"update-channel": "Writerside EAP", "update-channel": "Writerside EAP",
@ -444,10 +444,10 @@
"dataspell": { "dataspell": {
"update-channel": "DataSpell RELEASE", "update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
"version": "2024.2", "version": "2024.2.1",
"sha256": "a575b901eb706e197d05d2523f74a66528a225eb50ead1d43c2fbbc2231584b0", "sha256": "d64d0a1c53f06aecc16f24c3203c662576ad89dc5939e5bc94417a2991b23c63",
"url": "https://download.jetbrains.com/python/dataspell-2024.2-aarch64.dmg", "url": "https://download.jetbrains.com/python/dataspell-2024.2.1-aarch64.dmg",
"build_number": "242.20224.354" "build_number": "242.21829.112"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
@ -468,18 +468,18 @@
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
"version": "2024.2.0.2", "version": "2024.2.1",
"sha256": "fbf6e1f8dd19d5a467426c1ca174b21cb71deaaf1f4dd5a3cfdf6cf2a54ba5ce", "sha256": "b898426542106785d79fc1412191895f2096118b61633258b381426f5dbcec11",
"url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2-aarch64.dmg", "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.1-aarch64.dmg",
"build_number": "242.20224.419" "build_number": "242.21829.142"
}, },
"idea-ultimate": { "idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
"version": "2024.2.0.2", "version": "2024.2.1",
"sha256": "03866cf637bc0698e6764fe18d2af98a7065c9c9ca0b847953df0ccc42d65b3d", "sha256": "2546d5b396aaa2d80626175327b2d6f6f1d4494ececbd115b236b40bbb4aec45",
"url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2-aarch64.dmg", "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.1-aarch64.dmg",
"build_number": "242.20224.419" "build_number": "242.21829.142"
}, },
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
@ -501,26 +501,26 @@
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "53ed528b86e7f0eeeefbbe590fb5918ad6b4a1b9f750843c2ac0dbebc7a96d5c", "sha256": "479cfd05514df177bca56cf3406a944ef6bbdbdffb78adddec024e7209a7452f",
"url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1-aarch64.dmg", "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.1-aarch64.dmg",
"build_number": "242.20224.428" "build_number": "242.21829.153"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "f3ecb2fc630d357e5e3879c6ba1361d78fd45714cc9311a19ac754f70fd79e68", "sha256": "0f50296747f198383154747da4dae6f2a6cd6cc51dba077ee5dbceac062e197b",
"url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1-aarch64.dmg", "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.1-aarch64.dmg",
"build_number": "242.20224.428" "build_number": "242.21829.153"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
"version": "2024.2.1", "version": "2024.2.2",
"sha256": "2e6307f1d4f5456ce8660331f16127111b819d41c907f9cd1134180828edc4a4", "sha256": "ccc84f707e576b836e188dbe4d816d0643a685f81f433f795b0e3d5125963b16",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1-aarch64.dmg", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.2-aarch64.dmg",
"build_number": "242.20224.418" "build_number": "242.20224.431"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
@ -541,10 +541,10 @@
"webstorm": { "webstorm": {
"update-channel": "WebStorm RELEASE", "update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
"version": "2024.2.0.1", "version": "2024.2.1",
"sha256": "6d7a12184f46f3693b9f33ececeed0dde272fdd5ba8e06107869ae1731b694ff", "sha256": "744e7c654c3c0bafbea85b2fc48a581cd2ad44e2384f481e3183eb835262150a",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1-aarch64.dmg", "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1-aarch64.dmg",
"build_number": "242.20224.426" "build_number": "242.21829.149"
}, },
"writerside": { "writerside": {
"update-channel": "Writerside EAP", "update-channel": "Writerside EAP",

216
pkgs/applications/editors/jetbrains/plugins/plugins.json
View File

@ -21,13 +21,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "241.18968.39": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.20224.385": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.20224.413": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.20224.424": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.20224.425": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", "242.20224.427": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" "242.20224.431": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip"
}, },
"name": "ideavim" "name": "ideavim"
}, },
@ -36,7 +36,7 @@
"idea-ultimate" "idea-ultimate"
], ],
"builds": { "builds": {
"242.20224.419": "https://plugins.jetbrains.com/files/631/590930/python-242.20224.419.zip" "242.21829.142": "https://plugins.jetbrains.com/files/631/595102/python-242.21829.142.zip"
}, },
"name": "python" "name": "python"
}, },
@ -46,7 +46,7 @@
"idea-ultimate" "idea-ultimate"
], ],
"builds": { "builds": {
"242.20224.419": "https://plugins.jetbrains.com/files/1347/581524/scala-intellij-bin-2024.2.20.zip" "242.21829.142": "https://plugins.jetbrains.com/files/1347/581524/scala-intellij-bin-2024.2.20.zip"
}, },
"name": "scala" "name": "scala"
}, },
@ -71,13 +71,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "241.18968.39": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.20224.385": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.20224.413": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.20224.424": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.20224.425": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", "242.20224.427": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" "242.20224.431": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip"
}, },
"name": "string-manipulation" "name": "string-manipulation"
}, },
@ -102,13 +102,13 @@
"241.18968.39": null, "241.18968.39": null,
"242.20224.385": null, "242.20224.385": null,
"242.20224.413": null, "242.20224.413": null,
"242.20224.418": null,
"242.20224.419": null,
"242.20224.424": null, "242.20224.424": null,
"242.20224.425": null, "242.20224.425": null,
"242.20224.426": null,
"242.20224.427": null, "242.20224.427": null,
"242.20224.428": null "242.20224.431": null,
"242.21829.142": null,
"242.21829.149": null,
"242.21829.153": null
}, },
"name": "kotlin" "name": "kotlin"
}, },
@ -133,13 +133,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/6981/582754/ini-241.18968.32.zip", "241.18968.39": "https://plugins.jetbrains.com/files/6981/582754/ini-241.18968.32.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", "242.20224.385": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", "242.20224.413": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", "242.20224.424": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", "242.20224.425": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", "242.20224.427": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip" "242.20224.431": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/6981/590484/ini-242.21829.40.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/6981/590484/ini-242.21829.40.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/6981/590484/ini-242.21829.40.zip"
}, },
"name": "ini" "name": "ini"
}, },
@ -164,13 +164,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "241.18968.39": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.20224.385": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.20224.413": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.20224.424": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.20224.425": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", "242.20224.427": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" "242.20224.431": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip"
}, },
"name": "acejump" "name": "acejump"
}, },
@ -180,8 +180,8 @@
"phpstorm" "phpstorm"
], ],
"builds": { "builds": {
"242.20224.419": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip", "242.20224.427": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip" "242.21829.142": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip"
}, },
"name": "symfony-support" "name": "symfony-support"
}, },
@ -191,8 +191,8 @@
"phpstorm" "phpstorm"
], ],
"builds": { "builds": {
"242.20224.419": "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip", "242.20224.427": "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip" "242.21829.142": "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip"
}, },
"name": "php-annotations" "name": "php-annotations"
}, },
@ -205,16 +205,18 @@
"idea-ultimate", "idea-ultimate",
"pycharm-community", "pycharm-community",
"rider", "rider",
"rust-rover" "rust-rover",
"webstorm"
], ],
"builds": { "builds": {
"241.18968.39": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", "241.18968.39": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", "242.20224.385": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", "242.20224.413": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", "242.20224.424": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip" "242.20224.431": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip"
}, },
"name": "python-community-edition" "name": "python-community-edition"
}, },
@ -239,13 +241,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", "241.18968.39": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.20224.385": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.20224.413": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.20224.424": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.20224.425": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", "242.20224.427": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip" "242.20224.431": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip"
}, },
"name": "asciidoc" "name": "asciidoc"
}, },
@ -268,13 +270,13 @@
"241.18034.1093": null, "241.18034.1093": null,
"242.20224.385": null, "242.20224.385": null,
"242.20224.413": null, "242.20224.413": null,
"242.20224.418": null,
"242.20224.419": null,
"242.20224.424": null, "242.20224.424": null,
"242.20224.425": null, "242.20224.425": null,
"242.20224.426": null,
"242.20224.427": null, "242.20224.427": null,
"242.20224.428": null "242.20224.431": null,
"242.21829.142": null,
"242.21829.149": null,
"242.21829.153": null
}, },
"name": "-deprecated-rust" "name": "-deprecated-rust"
}, },
@ -297,13 +299,13 @@
"241.18034.1093": null, "241.18034.1093": null,
"242.20224.385": null, "242.20224.385": null,
"242.20224.413": null, "242.20224.413": null,
"242.20224.418": null,
"242.20224.419": null,
"242.20224.424": null, "242.20224.424": null,
"242.20224.425": null, "242.20224.425": null,
"242.20224.426": null,
"242.20224.427": null, "242.20224.427": null,
"242.20224.428": null "242.20224.431": null,
"242.21829.142": null,
"242.21829.149": null,
"242.21829.153": null
}, },
"name": "-deprecated-rust-beta" "name": "-deprecated-rust-beta"
}, },
@ -317,10 +319,10 @@
"ruby-mine" "ruby-mine"
], ],
"builds": { "builds": {
"242.20224.419": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip", "242.20224.424": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip", "242.20224.425": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip" "242.21829.142": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip"
}, },
"name": "ide-features-trainer" "name": "ide-features-trainer"
}, },
@ -345,13 +347,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "241.18968.39": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.20224.385": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.20224.413": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.20224.424": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.20224.425": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", "242.20224.427": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip" "242.20224.431": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip"
}, },
"name": "nixidea" "name": "nixidea"
}, },
@ -361,8 +363,8 @@
"idea-ultimate" "idea-ultimate"
], ],
"builds": { "builds": {
"242.20224.419": "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip", "242.20224.424": "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip" "242.21829.142": "https://plugins.jetbrains.com/files/9568/595080/go-plugin-242.21829.142.zip"
}, },
"name": "go" "name": "go"
}, },
@ -387,13 +389,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", "241.18968.39": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.20224.385": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.20224.413": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.20224.424": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.20224.425": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", "242.20224.427": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip" "242.20224.431": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip"
}, },
"name": "csv-editor" "name": "csv-editor"
}, },
@ -414,17 +416,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"241.18034.1093": "https://plugins.jetbrains.com/files/11349/589129/aws-toolkit-jetbrains-standalone-3.23-241.zip", "241.18034.1093": "https://plugins.jetbrains.com/files/11349/592121/aws-toolkit-jetbrains-standalone-3.24-241.zip",
"241.18968.39": "https://plugins.jetbrains.com/files/11349/589129/aws-toolkit-jetbrains-standalone-3.23-241.zip", "241.18968.39": "https://plugins.jetbrains.com/files/11349/592121/aws-toolkit-jetbrains-standalone-3.24-241.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", "242.20224.385": "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", "242.20224.413": "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", "242.20224.424": "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", "242.20224.425": "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", "242.20224.427": "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", "242.20224.431": "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", "242.21829.142": "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", "242.21829.149": "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip" "242.21829.153": "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip"
}, },
"name": "aws-toolkit" "name": "aws-toolkit"
}, },
@ -449,13 +451,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", "241.18968.39": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.20224.385": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.20224.413": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.20224.424": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.20224.425": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", "242.20224.427": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip" "242.20224.431": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip"
}, },
"name": "vscode-keymap" "name": "vscode-keymap"
}, },
@ -480,13 +482,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", "241.18968.39": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.20224.385": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.20224.413": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.20224.424": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.20224.425": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", "242.20224.427": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip" "242.20224.431": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip"
}, },
"name": "eclipse-keymap" "name": "eclipse-keymap"
}, },
@ -511,13 +513,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", "241.18968.39": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", "242.20224.385": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", "242.20224.413": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", "242.20224.424": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", "242.20224.425": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", "242.20224.427": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip" "242.20224.431": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip"
}, },
"name": "visual-studio-keymap" "name": "visual-studio-keymap"
}, },
@ -542,13 +544,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", "241.18968.39": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", "242.20224.385": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", "242.20224.413": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", "242.20224.424": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", "242.20224.425": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", "242.20224.427": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip" "242.20224.431": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip"
}, },
"name": "protocol-buffers" "name": "protocol-buffers"
}, },
@ -573,13 +575,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "241.18968.39": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.20224.385": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.20224.385": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.20224.413": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.20224.413": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.20224.418": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.20224.419": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.20224.424": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.20224.424": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.20224.425": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.20224.425": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.20224.426": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.20224.427": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "242.20224.427": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.20224.428": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" "242.20224.431": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.21829.142": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.21829.149": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.21829.153": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
}, },
"name": "darcula-pitch-black" "name": "darcula-pitch-black"
}, },
@ -604,13 +606,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", "241.18968.39": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", "242.20224.385": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", "242.20224.413": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", "242.20224.424": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", "242.20224.425": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", "242.20224.427": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip" "242.20224.431": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip"
}, },
"name": "github-copilot" "name": "github-copilot"
}, },
@ -635,13 +637,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "241.18968.39": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.20224.385": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.20224.413": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.20224.424": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.20224.425": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "242.20224.427": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" "242.20224.431": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
}, },
"name": "netbeans-6-5-keymap" "name": "netbeans-6-5-keymap"
}, },
@ -666,13 +668,13 @@
"241.18968.39": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "241.18968.39": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.20224.385": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.20224.385": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.20224.413": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.20224.418": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.20224.424": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.20224.424": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.20224.425": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.20224.425": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.20224.426": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.20224.427": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", "242.20224.427": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.20224.428": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" "242.20224.431": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.21829.142": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.21829.149": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.21829.153": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip"
}, },
"name": "mermaid" "name": "mermaid"
}, },
@ -684,8 +686,8 @@
], ],
"builds": { "builds": {
"241.18968.39": "https://plugins.jetbrains.com/files/22407/591052/intellij-rust-241.38968.39.zip", "241.18968.39": "https://plugins.jetbrains.com/files/22407/591052/intellij-rust-241.38968.39.zip",
"242.20224.413": "https://plugins.jetbrains.com/files/22407/591053/intellij-rust-242.20224.421.zip", "242.20224.413": "https://plugins.jetbrains.com/files/22407/594487/intellij-rust-242.21829.114.zip",
"242.20224.419": "https://plugins.jetbrains.com/files/22407/591053/intellij-rust-242.20224.421.zip" "242.21829.142": "https://plugins.jetbrains.com/files/22407/594487/intellij-rust-242.21829.114.zip"
}, },
"name": "rust" "name": "rust"
} }
@ -693,17 +695,19 @@
"files": { "files": {
"https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=", "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=",
"https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip": "sha256-CpIsmOIblkC5xMnKidbI+G+2QcZtXczu0rOSMtUcJPs=", "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip": "sha256-CpIsmOIblkC5xMnKidbI+G+2QcZtXczu0rOSMtUcJPs=",
"https://plugins.jetbrains.com/files/11349/589129/aws-toolkit-jetbrains-standalone-3.23-241.zip": "sha256-0aom3D5qpgh4Z1wicsK8881JVt+0r/vTocm/ysxzJZs=", "https://plugins.jetbrains.com/files/11349/592121/aws-toolkit-jetbrains-standalone-3.24-241.zip": "sha256-rxNwHsQ0ZMksN8uw2eXcWWbIi/k213w371/ED5ePRks=",
"https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip": "sha256-g2LhztIyWeG4u7HtOTPLeoY8B0K+LRJgFVNoSWdrAfI=", "https://plugins.jetbrains.com/files/11349/592123/aws-toolkit-jetbrains-standalone-3.24-242.zip": "sha256-mXGb/pQmxTqST51eMKvnW+YVIAVjpTnKZzEWJSUJPtE=",
"https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=", "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=",
"https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip": "sha256-LpooujwYaX339yZJVe7HPYIOw+YdJLeEtRgwPxLJ9eI=", "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip": "sha256-LpooujwYaX339yZJVe7HPYIOw+YdJLeEtRgwPxLJ9eI=",
"https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=", "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=",
"https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip": "sha256-bAN0ifNiUqj51TYc7RLKwTMtv9OxjzqEQwXa6KtFlsU=", "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip": "sha256-bAN0ifNiUqj51TYc7RLKwTMtv9OxjzqEQwXa6KtFlsU=",
"https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=",
"https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip": "sha256-xpH8/hUkz73t3q/F5AgWaZpMi7QEBu/gyGMPC/Gkkfo=", "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip": "sha256-xpH8/hUkz73t3q/F5AgWaZpMi7QEBu/gyGMPC/Gkkfo=",
"https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip": "sha256-aIwiMT30L3KCvbrkMUdgDdUdyBqGmT4w6c4pZEnMGNo=",
"https://plugins.jetbrains.com/files/1347/581524/scala-intellij-bin-2024.2.20.zip": "sha256-lBj8IKW1dC586hd/Z9happeoj2rV4x4Y/hbtrw/xCxQ=", "https://plugins.jetbrains.com/files/1347/581524/scala-intellij-bin-2024.2.20.zip": "sha256-lBj8IKW1dC586hd/Z9happeoj2rV4x4Y/hbtrw/xCxQ=",
"https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip": "sha256-cltbHY5OOvf29otDNsF9Q2shJHDdW6UMbzDdZ6OATtI=", "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip": "sha256-cltbHY5OOvf29otDNsF9Q2shJHDdW6UMbzDdZ6OATtI=",
"https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip": "sha256-z3y3mcQRScZY4VD/9onMCvgHD/xECldBogX5VxMiR0c=", "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip": "sha256-z3y3mcQRScZY4VD/9onMCvgHD/xECldBogX5VxMiR0c=",
"https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip": "sha256-Y6xplTjA9bmhwLS9clcu/4znltSgDsga8Na5BmOWX5E=",
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
"https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=", "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=",
"https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip": "sha256-QNVo6sLKwj+jJ2PMcJ3P5cAr1LwhFpH2+uglWO9ncQE=", "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip": "sha256-QNVo6sLKwj+jJ2PMcJ3P5cAr1LwhFpH2+uglWO9ncQE=",
@ -711,19 +715,23 @@
"https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=", "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=",
"https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=", "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=",
"https://plugins.jetbrains.com/files/22407/591052/intellij-rust-241.38968.39.zip": "sha256-Pgtj1czuScTmog7oh/2aME9jv4KlhT/ep6hwjSB73Ak=", "https://plugins.jetbrains.com/files/22407/591052/intellij-rust-241.38968.39.zip": "sha256-Pgtj1czuScTmog7oh/2aME9jv4KlhT/ep6hwjSB73Ak=",
"https://plugins.jetbrains.com/files/22407/591053/intellij-rust-242.20224.421.zip": "sha256-Ux89pA9Gi9iVC3AWfVunW3vrzRbFc1Oyk9plFgo9ync=", "https://plugins.jetbrains.com/files/22407/594487/intellij-rust-242.21829.114.zip": "sha256-PjYe2beW7iQmYBwPWBcD7Z9R04yeK6S+1ofETagj5Po=",
"https://plugins.jetbrains.com/files/631/590930/python-242.20224.419.zip": "sha256-zZIHP2qhUy6uG506H05/zBGHEdQhS+dVRRvtmoPjgnQ=", "https://plugins.jetbrains.com/files/631/595102/python-242.21829.142.zip": "sha256-dj4iIATUB3PqS0d07VHeYB7jFGWVi5c/kChBUoqk9mI=",
"https://plugins.jetbrains.com/files/6981/582754/ini-241.18968.32.zip": "sha256-GrWML6iPJ9Vp20T5ftNaPqAzhrqsDiV7zkWQDevSXFY=", "https://plugins.jetbrains.com/files/6981/582754/ini-241.18968.32.zip": "sha256-GrWML6iPJ9Vp20T5ftNaPqAzhrqsDiV7zkWQDevSXFY=",
"https://plugins.jetbrains.com/files/6981/590484/ini-242.21829.40.zip": "sha256-8bpnOlliZsYsn8lVv1rOW7mcMNacg5/G8wthmpe2bLI=",
"https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip": "sha256-jE51Cj9R2DcKm0aT2O8Kbq8MEDHlfr60D5vJdfXt+Cc=", "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip": "sha256-jE51Cj9R2DcKm0aT2O8Kbq8MEDHlfr60D5vJdfXt+Cc=",
"https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=",
"https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip": "sha256-2E3Hk8JdhZH+JFHF725Z9vGncx6HSKgd+LYlCpmh1KY=", "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip": "sha256-2E3Hk8JdhZH+JFHF725Z9vGncx6HSKgd+LYlCpmh1KY=",
"https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip": "sha256-zQ/nEESHNiNyXwKyohy8ENWVkRavDVJpqmHvkzD3VjE=", "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip": "sha256-zQ/nEESHNiNyXwKyohy8ENWVkRavDVJpqmHvkzD3VjE=",
"https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip": "sha256-e+MewymlNWzbut8eADe8jwqco921ULe83eLEGpDf1GY=", "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip": "sha256-e+MewymlNWzbut8eADe8jwqco921ULe83eLEGpDf1GY=",
"https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip": "sha256-bkjB/o5gnDAuyuGxtMQsr1lH9fohwVbDV27gRj1rCr0=", "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip": "sha256-bkjB/o5gnDAuyuGxtMQsr1lH9fohwVbDV27gRj1rCr0=",
"https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip": "sha256-DwQNhbNO1zk75lcf35spNnzo0u103UAhXignhO+grek=",
"https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=", "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=",
"https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip": "sha256-AGP8YY6NG/hy7xIDoiJy3GZHRB9stVNYYoHtqOmYCx0=", "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip": "sha256-AGP8YY6NG/hy7xIDoiJy3GZHRB9stVNYYoHtqOmYCx0=",
"https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip": "sha256-5gYFQjYWFro/nDxCn8q51GkLLv3JkJDS7jr70xhM0Q0=", "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip": "sha256-5gYFQjYWFro/nDxCn8q51GkLLv3JkJDS7jr70xhM0Q0=",
"https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip": "sha256-pL+j0K6U0DZibnmcIE6kY9Kj/+5g8akuHeuppuZiEII=",
"https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip": "sha256-j5/LgTrFJ4OEIlocX4jcjgYzHlBId1nh1NfE2qLc1HQ=", "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip": "sha256-j5/LgTrFJ4OEIlocX4jcjgYzHlBId1nh1NfE2qLc1HQ=",
"https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip": "sha256-cbbAfatj1KkByLrLKZVNoIZSLjaSregK+0eany4pYWY=" "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip": "sha256-cbbAfatj1KkByLrLKZVNoIZSLjaSregK+0eany4pYWY=",
"https://plugins.jetbrains.com/files/9568/595080/go-plugin-242.21829.142.zip": "sha256-FPwS5+ERGgGhIgHTZYzlKox3FpNbJoq288ZSviqQlR0="
} }
} }

6
pkgs/applications/editors/molsketch/default.nix
View File

@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
--replace "CXX_STANDARD 14" "CXX_STANDARD 17" --replace "CXX_STANDARD 14" "CXX_STANDARD 17"
''; '';
preConfigure = '' cmakeFlags = [
cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out" "-DMSK_PREFIX=${placeholder "out"}"
''; ];
postFixup = '' postFixup = ''
ln -s $out/lib/molsketch/* $out/lib/. ln -s $out/lib/molsketch/* $out/lib/.

16
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -2675,6 +2675,22 @@ let
}; };
}; };
jgclark.vscode-todo-highlight = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-todo-highlight";
publisher = "jgclark";
version = "2.0.8";
hash = "sha256-/CctaLcG+dA2Cf69/ACeDKdRLsu/VUGbAxUbyhI0VyA=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/wayou.vscode-todo-highlight/changelog";
description = "highlight TODOs, FIXMEs, and any keywords, annotations...";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jgclark.vscode-todo-highlight";
homepage = "https://github.com/jgclark/vscode-todo-highlight";
license = lib.licenses.mit;
};
};
julialang.language-julia = buildVscodeMarketplaceExtension { julialang.language-julia = buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "language-julia"; name = "language-julia";

2
pkgs/applications/file-managers/browsr/default.nix
View File

@ -85,7 +85,7 @@ python3.pkgs.buildPythonApplication rec {
description = "File explorer in your terminal"; description = "File explorer in your terminal";
mainProgram = "browsr"; mainProgram = "browsr";
homepage = "https://juftin.com/browsr"; homepage = "https://juftin.com/browsr";
changelog = "https://github.com/juftin/browsr/releases/tag/${src.rev}"; changelog = "https://github.com/juftin/browsr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ figsoda ]; maintainers = with maintainers; [ figsoda ];
}; };

2
pkgs/applications/graphics/brlcad/default.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://brlcad.org"; homepage = "https://brlcad.org";
description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system"; description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system";
changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${src.rev}"; changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
license = with licenses; [ lgpl21 bsd2 ]; license = with licenses; [ lgpl21 bsd2 ];
maintainers = with maintainers; [ GaetanLepage ]; maintainers = with maintainers; [ GaetanLepage ];
platforms = platforms.linux; platforms = platforms.linux;

4
pkgs/applications/graphics/pymeshlab/default.nix
View File

@ -88,12 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace src/meshlab/src/external/ssynth.cmake \ substituteInPlace src/meshlab/src/external/ssynth.cmake \
--replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \ --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
--replace-warn "MD5 ''${SSYNTH_MD5}" "" --replace-warn "MD5 ''${SSYNTH_MD5}" ""
export cmakeFlags="cmakeFlags
-DCMAKE_INSTALL_PREFIX=$out/${python3Packages.python.sitePackages}/pymeshlab
"
''; '';
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python3Packages.python.sitePackages}/pymeshlab"
"-DVCGDIR=${vcg.src}" "-DVCGDIR=${vcg.src}"
]; ];

118
pkgs/applications/misc/keeweb/default.nix
View File

@ -1,118 +0,0 @@
{ lib
, stdenv
, fetchurl
, undmg
, dpkg
, autoPatchelfHook
, wrapGAppsHook3
, makeWrapper
, alsa-lib
, at-spi2-atk
, gdk-pixbuf
, glibc
, nss
, udev
, xorg
, gnome-keyring
, mesa
, gtk3
, libusb1
, libsecret
, libappindicator
, xdotool
}:
let
pname = "keeweb";
version = "1.18.7";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb";
hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg";
hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU=";
};
aarch64-darwin = fetchurl {
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg";
hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4=";
};
};
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
libraries = [
alsa-lib
at-spi2-atk
gdk-pixbuf
nss
udev
xorg.libX11
xorg.libXcomposite
xorg.libXext
xorg.libXrandr
xorg.libXScrnSaver
xorg.libXtst
xorg.libxshmfence
gnome-keyring
mesa
gtk3
libusb1
libsecret
libappindicator
xdotool
];
meta = with lib; {
description = "Free cross-platform password manager compatible with KeePass";
mainProgram = "keeweb";
homepage = "https://keeweb.info/";
changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
platforms = builtins.attrNames srcs;
};
in
if stdenv.isDarwin
then stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = ".";
installPhase = ''
mkdir -p $out/Applications
cp -r *.app $out/Applications
'';
}
else stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook3
makeWrapper
];
buildInputs = libraries;
unpackPhase = ''
${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r usr/share $out/share
makeWrapper $out/share/keeweb-desktop/keeweb $out/bin/keeweb \
--argv0 "keeweb" \
--add-flags "$out/share/keeweb-desktop/resources/app.asar" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}"
runHook postInstall
'';
}

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

@ -19,13 +19,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "p2pool"; pname = "p2pool";
version = "4.0"; version = "4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SChernykh"; owner = "SChernykh";
repo = "p2pool"; repo = "p2pool";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ="; hash = "sha256-eMg8DXFtVfYhl6vpg/KRUZUgMU/XsCS29Af1CSIbUsY=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

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

@ -10,7 +10,7 @@
, wrapGAppsHook3 , wrapGAppsHook3
, libinput , libinput
, gobject-introspection , gobject-introspection
, gnome , mutter
, gnome-desktop , gnome-desktop
, glib , glib
, gtk3 , gtk3
@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk3 gtk3
gnome-desktop gnome-desktop
# For keybindings settings schemas # For keybindings settings schemas
gnome.mutter mutter
json-glib json-glib
wayland wayland
finalAttrs.wlroots finalAttrs.wlroots

6
pkgs/applications/misc/redshift/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchFromGitLab { lib, stdenv, fetchFromGitHub, fetchFromGitLab
, autoconf, automake, gettext, intltool , autoconf, automake, gettext, intltool
, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection , libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection, wayland-scanner
, gtk3, python, pygobject3, pyxdg , gtk3, python, pygobject3, pyxdg
, withQuartz ? stdenv.isDarwin, ApplicationServices , withQuartz ? stdenv.isDarwin, ApplicationServices
@ -26,6 +26,8 @@ let
strictDeps = true; strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ nativeBuildInputs = [
autoconf autoconf
automake automake
@ -37,7 +39,7 @@ let
wrapPython wrapPython
gobject-introspection gobject-introspection
python python
]; ] ++ lib.optionals (pname == "gammastep") [ wayland-scanner ];
configureFlags = [ configureFlags = [
"--enable-randr=${if withRandr then "yes" else "no"}" "--enable-randr=${if withRandr then "yes" else "no"}"

4
pkgs/applications/networking/browsers/eolie/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchgit, meson, ninja, pkg-config, nix-update-script { lib, fetchgit, meson, ninja, pkg-config, nix-update-script
, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
, glib-networking, gtkspell3, hunspell, desktop-file-utils , glib-networking, gtkspell3, hunspell, desktop-file-utils
, gobject-introspection, wrapGAppsHook3, gnome }: , gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "eolie"; pname = "eolie";
@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-base gst-plugins-base
gst-plugins-ugly gst-plugins-ugly
gstreamer gstreamer
gnome.gnome-settings-daemon gnome-settings-daemon
gtk3 gtk3
gtkspell3 gtkspell3
hunspell hunspell

6
pkgs/applications/networking/cluster/zarf/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "zarf"; pname = "zarf";
version = "0.37.0"; version = "0.38.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "defenseunicorns"; owner = "defenseunicorns";
repo = "zarf"; repo = "zarf";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-GgvpBYFPH1corqNCA6NQCg6Rkbdez9mFwv5HlmOCKvE="; hash = "sha256-tnxLktz8tc8ceWirThPR5eqlk5W3jnliiKka6feeX38=";
}; };
vendorHash = "sha256-gLnUvNxuxrMu6i+b0jgindgcbGOA+tk4N5N4owGV7B8="; vendorHash = "sha256-y4A3A6zTgZaFjy6B31BAIpyRDp+pYdc/dkFpZq2NQ2c=";
proxyVendor = true; proxyVendor = true;
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/go-graft/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "go-graft"; pname = "go-graft";
version = "0.2.18"; version = "0.2.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mzz2017"; owner = "mzz2017";
repo = "gg"; repo = "gg";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8="; sha256 = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU=";
}; };
CGO_ENABLED = 0; CGO_ENABLED = 0;

28
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -2,22 +2,22 @@
let let
versions = versions =
if stdenv.isLinux then { if stdenv.isLinux then {
stable = "0.0.65"; stable = "0.0.66";
ptb = "0.0.101"; ptb = "0.0.101";
canary = "0.0.475"; canary = "0.0.479";
development = "0.0.24"; development = "0.0.25";
} else { } else {
stable = "0.0.316"; stable = "0.0.317";
ptb = "0.0.130"; ptb = "0.0.131";
canary = "0.0.583"; canary = "0.0.587";
development = "0.0.46"; development = "0.0.47";
}; };
version = versions.${branch}; version = versions.${branch};
srcs = rec { srcs = rec {
x86_64-linux = { x86_64-linux = {
stable = fetchurl { stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-kzYLZcjuG7k8RSjc5ooDlMKaAlMHvm0yCl5Krnhqq8A="; hash = "sha256-tbpo1+fbziJk2JdaMyAW5Ynb0wuWkLdcDnzQbiZJ47A=";
}; };
ptb = fetchurl { ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
@ -25,29 +25,29 @@ let
}; };
canary = fetchurl { canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-suVIDCZhI6DwUVizBmTm104Clr6pH/olAIbOMNzFNss="; hash = "sha256-mirioiRpwQB07sL1avGYk2+Cnmdw7PW808AAA6p2Y0U=";
}; };
development = fetchurl { development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
hash = "sha256-rSlGL2BwtUxLJltSD2Ms94qmZ4kuX5i9jFqyYC30jyQ="; hash = "sha256-9dwZ89YOs2iNOeoVrGfNHwr4mvfXmPk1SrJYoteYakY=";
}; };
}; };
x86_64-darwin = { x86_64-darwin = {
stable = fetchurl { stable = fetchurl {
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
hash = "sha256-ZJ2ybvKGGCm8CZhwGxmLXZWNUD1eAyg17zD/sBwViB4="; hash = "sha256-SX6a2qPSFURL00dMLrHSI4+964Xc76ada4PUMlG1V9U=";
}; };
ptb = fetchurl { ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
hash = "sha256-mLfeMx5dQNpoLUyoOSCj8XtNxWjsBpVWdFv1obtHJak="; hash = "sha256-/wuYPjGh/RJZSDeo8r78YEbCYj+qZWTaIDIfKuSH+r0=";
}; };
canary = fetchurl { canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
hash = "sha256-eIjkXOW07sR26iBttT0mGDxNnpLFKlVJtzSAtFcicBg="; hash = "sha256-6m6wmGzVOEY2oVAHsSMsAtgQK5zqC0D7U3s28pcH0ss=";
}; };
development = fetchurl { development = fetchurl {
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
hash = "sha256-nMihtf/xLIxwqAVrF1BSRewdS2WThx0LZ5HZUI+OzM0="; hash = "sha256-mgVCuTE2zYFRUW6Ukw7mUmPnOR4g/QUFYlWI3bux0es=";
}; };
}; };
aarch64-darwin = x86_64-darwin; aarch64-darwin = x86_64-darwin;

10
pkgs/applications/networking/instant-messengers/feishu/default.nix
View File

@ -65,12 +65,12 @@
let let
sources = { sources = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/88a232d5/Feishu-linux_x64-7.18.11.deb"; url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/bfdb886c/Feishu-linux_x64-7.22.9.deb";
sha256 = "sha256-EneDVW8eQ6J+M49hn9xLtvlqiDOx4Rs8VMLt1cqSbak="; sha256 = "sha256-4lLCQeW6ZRzmzrHPQ91RxKEqJCxqqa4iGuJ8snZqvkQ=";
}; };
aarch64-linux = fetchurl { aarch64-linux = fetchurl {
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f29ac73d/Feishu-linux_arm64-7.18.11.deb"; url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/c3f495d6/Feishu-linux_arm64-7.22.9.deb";
sha256 = "sha256-ghAWPQgVEBSom7zBHUKb56O3EZR4rOnQlz9BRSJBNp4="; sha256 = "sha256-cT9n1p220ya1T21fWy4b7b7dIx3hqw7lConGaSZ2+UA=";
}; };
}; };
@ -131,7 +131,7 @@ let
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
version = "7.18.11"; version = "7.22.9";
pname = "feishu"; pname = "feishu";
src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

4
pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
View File

@ -41,7 +41,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
cacert cacert
setuptools setuptools
matrix-nio (matrix-nio.override { withOlm = true; })
python-magic python-magic
markdown markdown
pillow pillow
@ -51,7 +51,7 @@ buildPythonApplication rec {
pyxdg pyxdg
python-olm python-olm
emoji emoji
] ++ matrix-nio.optional-dependencies.e2e; ];
meta = with lib; { meta = with lib; {
description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; description = "Simple but convenient CLI-based Matrix client app for sending and receiving";

3
pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
View File

@ -39,11 +39,10 @@ python3Packages.buildPythonApplication rec {
janus janus
keyring keyring
logbook logbook
matrix-nio (matrix-nio.override { withOlm = true; })
peewee peewee
prompt-toolkit prompt-toolkit
] ]
++ matrix-nio.optional-dependencies.e2e
++ lib.optionals enableDbusUi optional-dependencies.ui; ++ lib.optionals enableDbusUi optional-dependencies.ui;
optional-dependencies.ui = with python3Packages; [ optional-dependencies.ui = with python3Packages; [

4
pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
View File

@ -56,10 +56,10 @@ in buildPythonPackage {
attrs attrs
logbook logbook
pygments pygments
matrix-nio (matrix-nio.override { withOlm = true; })
aiohttp aiohttp
requests requests
] ++ matrix-nio.optional-dependencies.e2e; ];
passthru.scripts = [ "matrix.py" ]; passthru.scripts = [ "matrix.py" ];

81
pkgs/applications/networking/opsdroid/default.nix
View File

@ -18,48 +18,45 @@ python3Packages.buildPythonPackage rec {
build-system = with python3Packages; [ setuptools ]; build-system = with python3Packages; [ setuptools ];
dependencies = dependencies = with python3Packages; [
with python3Packages; aiohttp
[ aiohttp-middlewares
aiohttp aioredis
aiohttp-middlewares aiosqlite
aioredis appdirs
aiosqlite arrow
appdirs babel
arrow bitstring
babel bleach
bitstring # botbuilder-core, connector for teams
bleach certifi
# botbuilder-core, connector for teams click
certifi # dialogflow, connector for Dialogflow
click dnspython
# dialogflow, connector for Dialogflow emoji
dnspython get-video-properties
emoji ibm-watson
get-video-properties (matrix-nio.override { withOlm = true; })
ibm-watson mattermostdriver
matrix-nio motor
mattermostdriver multidict
motor nbconvert
multidict nbformat
nbconvert opsdroid-get-image-size
nbformat parse
opsdroid-get-image-size puremagic
parse pycron
puremagic python-olm
pycron pyyaml
python-olm regex
pyyaml rich
regex slack-sdk
rich tailer
slack-sdk voluptuous
tailer watchgod
voluptuous webexteamssdk
watchgod wrapt
webexteamssdk ];
wrapt
]
++ matrix-nio.optional-dependencies.e2e;
passthru.python = python3Packages.python; passthru.python = python3Packages.python;

14
pkgs/applications/networking/remote/freerdp/3.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, docbook-xsl-nons , docbook-xsl-nons
, libxslt , libxslt
@ -70,15 +71,24 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "freerdp"; pname = "freerdp";
version = "3.7.0"; version = "3.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FreeRDP"; owner = "FreeRDP";
repo = "FreeRDP"; repo = "FreeRDP";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-o/Sp9mMEIxtXa0oIpxYG9Fm8YejStUYcW/jkdPwyE5I="; hash = "sha256-zqqPfAXHjY4IV18mgbNxWDw7ZP/7SvoYn1u0FahpcNk=";
}; };
patches = [
(fetchpatch {
name = "clang-fix-unwind-getlanguagespecificdata.patch";
url = "https://github.com/FreeRDP/FreeRDP/commit/6fb7bfd043d159d3819486fb601b598102cca823.patch";
hash = "sha256-U2Oz+IVvlIdg7kJ4rgAWhJVdzthY50YaCYKMMc2he7Y=";
})
];
postPatch = '' postPatch = ''
export HOME=$TMP export HOME=$TMP

4
pkgs/applications/office/zotero/default.nix
View File

@ -20,11 +20,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zotero"; pname = "zotero";
version = "7.0"; version = "7.0.3";
src = fetchurl { src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
hash = "sha256-0CAiK8HY/udup51zB6I2o4jvOHvSJGm+5JehHk8F/Io="; hash = "sha256-W5/j5ohrx/X0qlOiWWtB/FEF9aZCnbbAA3pcL8R6yy0=";
}; };
dontPatchELF = true; dontPatchELF = true;

2
pkgs/applications/science/biology/bamtools/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "C++ API & command-line toolkit for working with BAM data"; description = "C++ API & command-line toolkit for working with BAM data";
mainProgram = "bamtools"; mainProgram = "bamtools";
homepage = "https://github.com/pezmaster31/bamtools"; homepage = "https://github.com/pezmaster31/bamtools";
changelog = "https://github.com/pezmaster31/bamtools/releases/tag/${finalAttrs.src.rev}"; changelog = "https://github.com/pezmaster31/bamtools/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ natsukium ]; maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix; platforms = platforms.unix;

2
pkgs/applications/science/biology/bowtie2/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; description = "Ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
homepage = "http://bowtie-bio.sf.net/bowtie2"; homepage = "http://bowtie-bio.sf.net/bowtie2";
changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${finalAttrs.src.rev}"; changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
maintainers = with maintainers; [ rybern ]; maintainers = with maintainers; [ rybern ];
platforms = platforms.all; platforms = platforms.all;
mainProgram = "bowtie2"; mainProgram = "bowtie2";

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

@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein"; description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein";
mainProgram = "mkdssp"; mainProgram = "mkdssp";
homepage = "https://github.com/PDB-REDO/dssp"; homepage = "https://github.com/PDB-REDO/dssp";
changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${finalAttrs.src.rev}"; changelog = "https://github.com/PDB-REDO/dssp/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ natsukium ]; maintainers = with maintainers; [ natsukium ];
platforms = platforms.unix; platforms = platforms.unix;

2
pkgs/applications/science/biology/kalign/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Fast multiple sequence alignment program"; description = "Fast multiple sequence alignment program";
mainProgram = "kalign"; mainProgram = "kalign";
homepage = "https://github.com/TimoLassmann/kalign"; homepage = "https://github.com/TimoLassmann/kalign";
changelog = "https://github.com/TimoLassmann/kalign/releases/tag/${finalAttrs.src.rev}"; changelog = "https://github.com/TimoLassmann/kalign/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
license = lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ natsukium ]; maintainers = with lib.maintainers; [ natsukium ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;

2
pkgs/applications/science/biology/paml/default.nix
View File

@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc."; longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html"; homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html";
changelog = "https://github.com/abacus-gene/paml/releases/tag/${finalAttrs.src.rev}"; changelog = "https://github.com/abacus-gene/paml/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
}) })

4
pkgs/applications/science/robotics/yarp/default.nix
View File

@ -18,11 +18,9 @@ stdenv.mkDerivation rec {
"-DYARP_COMPILE_UNMAINTAINED:BOOL=ON" "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON"
"-DCREATE_YARPC:BOOL=ON" "-DCREATE_YARPC:BOOL=ON"
"-DCREATE_YARPCXX:BOOL=ON" "-DCREATE_YARPCXX:BOOL=ON"
"-DCMAKE_INSTALL_LIBDIR=${placeholder "out"}/lib"
]; ];
# since we cant expand $out in cmakeFlags
preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_LIBDIR=$out/lib"'';
postInstall = "mv ./$out/lib/*.so $out/lib/"; postInstall = "mv ./$out/lib/*.so $out/lib/";
meta = { meta = {

334
pkgs/applications/video/handbrake/default.nix
View File

@ -1,334 +0,0 @@
# Upstream distributes HandBrake with bundle of according versions of libraries
# and patches to them. This derivation patches HandBrake to use Nix closure
# dependencies.
#
# NOTE: 2019-07-19: This derivation does not currently support the native macOS
# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would
# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
# requires invoking the Xcode build system, which is non-trivial for now.
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
# For tests
, testers
, runCommand
, fetchurl
# Main build tools
, pkg-config
, autoconf
, automake
, libtool
, m4
, xz
, python3
, numactl
, writeText
# Processing, video codecs, containers
, ffmpeg_7-full
, nv-codec-headers
, libogg
, x264
, x265
, libvpx
, libtheora
, dav1d
, zimg
, svt-av1
# Codecs, audio
, libopus
, lame
, libvorbis
, a52dec
, speex
, libsamplerate
# Text processing
, libiconv
, fribidi
, fontconfig
, freetype
, libass
, jansson
, libxml2
, harfbuzz
, libjpeg_turbo
# Optical media
, libdvdread
, libdvdnav
, libdvdcss
, libbluray
# Darwin-specific
, AudioToolbox
, Foundation
, libobjc
, VideoToolbox
# GTK
# NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus,
# which in turn depends on systemd. systemd is not supported on Darwin, so
# for now we disable GTK GUI support on Darwin. (It may be possible to remove
# this restriction later.)
, useGtk ? !stdenv.isDarwin
, appstream
, desktop-file-utils
, meson
, ninja
, wrapGAppsHook4
, intltool
, glib
, gtk4
, libappindicator-gtk3
, libnotify
, gst_all_1
, dbus-glib
, udev
, libgudev
, hicolor-icon-theme
# FDK
, useFdk ? false
, fdk_aac
}:
let
version = "1.8.1";
src = fetchFromGitHub {
owner = "HandBrake";
repo = "HandBrake";
# uses version commit for logic in version.txt
rev = "e9ff2bdf1ac670eb9c6d6170e27c999c05535127";
hash = "sha256-grbT+oRIyLnyJowhdqw7qGRg11HzWGIU9yTwUQhCWtg=";
};
# Handbrake maintains a set of ffmpeg patches. In particular, these
# patches are required for subtitle timing to work correctly. See:
# https://github.com/HandBrake/HandBrake/issues/4029
# base ffmpeg version is specified in:
# https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs
ffmpeg-version = "7.0.1";
ffmpeg-hb = (ffmpeg_7-full.override {
version = ffmpeg-version;
hash = "sha256-HiCT6bvLx4zmJ6ffutoimdz5ENQ55CRF64WBT3HeXMA=";
}).overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [
"${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch"
"${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch"
"${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch"
"${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch"
"${src}/contrib/ffmpeg/A05-dvdsubdec-fix-processing-of-partial-packets.patch"
"${src}/contrib/ffmpeg/A06-dvdsubdec-return-number-of-bytes-used.patch"
"${src}/contrib/ffmpeg/A07-dvdsubdec-use-pts-of-initial-packet.patch"
"${src}/contrib/ffmpeg/A08-dvdsubdec-do-not-discard-zero-sized-rects.patch"
"${src}/contrib/ffmpeg/A09-ccaption_dec-fix-pts-in-real_time-mode.patch"
"${src}/contrib/ffmpeg/A10-matroskaenc-aac-extradata-updated.patch"
"${src}/contrib/ffmpeg/A11-videotoolbox-disable-H.264-10-bit-on-Intel-macOS.patch"
# patch to fix <https://github.com/HandBrake/HandBrake/issues/5011>
# commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail.
# "${src}/contrib/ffmpeg/A12-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch"
"${src}/contrib/ffmpeg/A13-qsv-fix-decode-10bit-hdr.patch"
"${src}/contrib/ffmpeg/A14-amfenc-Add-support-for-pict_type-field.patch"
"${src}/contrib/ffmpeg/A15-amfenc-Fixes-the-color-information-in-the-ou.patch"
"${src}/contrib/ffmpeg/A16-amfenc-HDR-metadata.patch"
"${src}/contrib/ffmpeg/A17-av1dec-dovi-rpu.patch"
"${src}/contrib/ffmpeg/A18-avformat-mov-add-support-audio-fallback-track-ref.patch"
"${src}/contrib/ffmpeg/A19-fix-qsv-on-gcc-14.patch"
];
});
x265-hb = x265.overrideAttrs (old: {
# nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches
# are written with respect to the parent directory instead of that source directory.
# patches which don't cleanly apply are commented out.
postPatch = (old.postPatch or "") + ''
pushd ..
patch -p1 < ${src}/contrib/x265/A01-threads-priority.patch
patch -p1 < ${src}/contrib/x265/A02-threads-pool-adjustments.patch
patch -p1 < ${src}/contrib/x265/A03-sei-length-crash-fix.patch
patch -p1 < ${src}/contrib/x265/A04-ambient-viewing-enviroment-sei.patch
# patch -p1 < ${src}/contrib/x265/A05-memory-leaks.patch
# patch -p1 < ${src}/contrib/x265/A06-crosscompile-fix.patch
popd
'';
});
versionFile = writeText "version.txt" ''
URL=${src.meta.homepage}.git
HASH=${src.rev}
SHORTHASH=${lib.substring 0 9 src.rev}
TAG=${version}
TAG_HASH=${src.rev}
REV=0
BRANCH=
REMOTE=${src.meta.homepage}.git
DATE=1970-01-01 00:00:01 +0000
'';
inherit (lib) optional optionals optionalString versions;
self = stdenv.mkDerivation rec {
pname = "handbrake";
inherit version src;
postPatch = ''
install -Dm444 ${versionFile} ${versionFile.name}
patchShebangs scripts
patchShebangs gtk/data/
substituteInPlace libhb/hb.c \
--replace-fail 'return hb_version;' 'return "${version}";'
# Force using nixpkgs dependencies
sed -i '/MODULES += contrib/d' make/include/main.defs
sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \
-e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \
-i make/configure.py
'' + optionalString stdenv.isDarwin ''
# Prevent the configure script from failing if xcodebuild isn't available,
# which it isn't in the Nix context. (The actual build goes fine without
# xcodebuild.)
sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py
'' + optionalString useGtk ''
substituteInPlace gtk/module.rules \
--replace-fail '$(MESON.exe)' 'meson' \
--replace-fail '$(NINJA.exe)' 'ninja' \
# Force using nixpkgs dependencies
substituteInPlace gtk/meson.build \
--replace-fail \
"hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')" \
"hb_incdirs = include_directories(hb_dir / 'libhb')"
substituteInPlace gtk/ghb.spec \
--replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
substituteInPlace gtk/data/post_install.py \
--replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
'';
nativeBuildInputs = [
autoconf
automake
libtool
m4
pkg-config
python3
]
++ optionals useGtk [ appstream desktop-file-utils intltool meson ninja wrapGAppsHook4 ];
buildInputs = [
a52dec
dav1d
ffmpeg-hb
fontconfig
freetype
fribidi
harfbuzz
jansson
lame
libass
libbluray
libdvdcss
libdvdnav
libdvdread
libiconv
libjpeg_turbo
libogg
libopus
libsamplerate
libtheora
libvorbis
libvpx
libxml2
speex
svt-av1
x264
x265-hb
xz
zimg
]
++ optional (!stdenv.isDarwin) numactl
++ optionals useGtk [
dbus-glib
glib
gst_all_1.gst-libav
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gstreamer
gtk4
hicolor-icon-theme
libappindicator-gtk3
libgudev
libnotify
udev
]
++ optional useFdk fdk_aac
++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ]
# NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only,
# look at ./make/configure.py search "enable_nvenc"
++ optional stdenv.isLinux nv-codec-headers;
configureFlags = [
"--disable-df-fetch"
"--disable-df-verify"
]
++ optional (!useGtk) "--disable-gtk"
++ optional useFdk "--enable-fdk-aac"
++ optional stdenv.isDarwin "--disable-xcode"
++ optional stdenv.hostPlatform.isx86 "--harden";
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing
NIX_LDFLAGS = [ "-lx265" ];
# meson/ninja are used only for the subprojects, not the toplevel
dontUseMesonConfigure = true;
dontUseMesonInstall = true;
dontUseNinjaBuild = true;
dontUseNinjaInstall = true;
makeFlags = [ "--directory=build" ];
passthru = {
# for convenience
inherit ffmpeg-hb x265-hb;
tests.basic-conversion =
let
# Big Buck Bunny example, licensed under CC Attribution 3.0.
testMkv = fetchurl {
url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true";
sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9";
};
in
runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } ''
mkdir -p $out
cd $out
HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160
test -e test.mp4
HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160
test -e test.mkv
'';
tests.version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; };
};
meta = with lib; {
homepage = "https://handbrake.fr/";
description = "Tool for converting video files and ripping DVDs";
longDescription = ''
Tool for converting and remuxing video files
into selection of modern and widely supported codecs
and containers. Very versatile and customizable.
Package provides:
CLI - `HandbrakeCLI`
GTK GUI - `ghb`
'';
license = licenses.gpl2Only;
maintainers = with maintainers; [ Anton-Latukha wmertens ];
platforms = with platforms; unix;
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434
};
};
in
self

6
pkgs/applications/virtualization/singularity/packages.nix
View File

@ -47,20 +47,20 @@ let
callPackage callPackage
(import ./generic.nix rec { (import ./generic.nix rec {
pname = "singularity-ce"; pname = "singularity-ce";
version = "4.1.4"; version = "4.1.5";
projectName = "singularity"; projectName = "singularity";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sylabs"; owner = "sylabs";
repo = "singularity"; repo = "singularity";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-+qwPzgwfF6A1c/rmSM/5T2N9/wVeWhMoAthj3eSQmh8="; hash = "sha256-klOnQAJfVsohJKeQbNaW6PzQ7ejhO281+vcDMoJ4WMk=";
}; };
# Update by running # Update by running
# nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules"
# at the root directory of the Nixpkgs repository # at the root directory of the Nixpkgs repository
vendorHash = "sha256-dTqOSk8APLOsqwEiZ/IL8Zu1SR48MyEYPgRe6PC2nd8="; vendorHash = "sha256-NyNNTe2X5OuDun6xNiRLGzvUxcRM4S7fD68I+I6IMKs=";
# Do not build conmon and squashfuse from the Git submodule sources, # Do not build conmon and squashfuse from the Git submodule sources,
# Use Nixpkgs provided version # Use Nixpkgs provided version

11
pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, cairo , cairo
, expat , expat
@ -22,6 +23,7 @@
, util-linux , util-linux
, wayland , wayland
, wayland-protocols , wayland-protocols
, wayland-scanner
, hyprwayland-scanner , hyprwayland-scanner
, hyprutils , hyprutils
}: }:
@ -37,10 +39,19 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-HIK7XJWQCM0BAnwW5uC7P0e7DAkVTy5jlxQ0NwoSy4M="; hash = "sha256-HIK7XJWQCM0BAnwW5uC7P0e7DAkVTy5jlxQ0NwoSy4M=";
}; };
patches = [
# CMakeLists: look for wayland.xml protocol in wayland-scanner pkgdata
(fetchpatch {
url = "https://github.com/hyprwm/hyprpaper/commit/6c6e54faa84d2de94d2321eda43a8a669ebf3312.patch";
hash = "sha256-Ns7HlUPVgBDIocZRGR6kIW58Mt92kJPQRMSKTvp6Vik=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
hyprwayland-scanner hyprwayland-scanner
wayland-scanner
]; ];
buildInputs = [ buildInputs = [

15
pkgs/applications/window-managers/phosh/default.nix
View File

@ -17,8 +17,11 @@
, evince , evince
, glib , glib
, gtk4 , gtk4
, gnome , gnome-bluetooth
, gnome-control-center
, gnome-desktop , gnome-desktop
, gnome-session
, gnome-shell
, gcr , gcr
, pam , pam
, systemd , systemd
@ -71,10 +74,10 @@ stdenv.mkDerivation (finalAttrs: {
networkmanager networkmanager
polkit polkit
gmobile gmobile
gnome.gnome-bluetooth gnome-bluetooth
gnome.gnome-control-center gnome-control-center
gnome-desktop gnome-desktop
gnome.gnome-session gnome-session
gtk4 gtk4
pam pam
systemd systemd
@ -109,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: {
# Depends on GSettings schemas in gnome-shell # Depends on GSettings schemas in gnome-shell
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}"
--set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session" --set GNOME_SESSION "${gnome-session}/bin/gnome-session"
) )
''; '';

4
pkgs/applications/window-managers/xmonad/log-applet/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib
, desktopSupport ? "gnomeflashback", xorg , desktopSupport ? "gnomeflashback", xorg
, gtk2 , gtk2
, gtk3, gnome, mate , gtk3, gnome-panel, mate
, libxfce4util, xfce4-panel , libxfce4util, xfce4-panel
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ glib dbus-glib xorg.xcbutilwm ] buildInputs = [ glib dbus-glib xorg.xcbutilwm ]
++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ] ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome-panel ]
++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]
++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
; ;

2
pkgs/by-name/ab/abpoa/package.nix
View File

@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; { meta = with lib; {
description = "SIMD-based C library for fast partial order alignment using adaptive band"; description = "SIMD-based C library for fast partial order alignment using adaptive band";
homepage = "https://github.com/yangao07/abPOA"; homepage = "https://github.com/yangao07/abPOA";
changelog = "https://github.com/yangao07/abPOA/releases/tag/${finalAttrs.src.rev}"; changelog = "https://github.com/yangao07/abPOA/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ natsukium ]; maintainers = with maintainers; [ natsukium ];
mainProgram = "abpoa"; mainProgram = "abpoa";

2
pkgs/tools/system/acpica-tools/default.nix → pkgs/by-name/ac/acpica-tools/package.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.acpica.org/"; homepage = "https://www.acpica.org/";
description = "ACPICA Tools"; description = "ACPICA Tools";
license = with licenses; [ iasl gpl2Only bsd3 ]; license = with licenses; [ iasl gpl2Only bsd3 ];
maintainers = with maintainers; [ tadfisher ]; maintainers = with maintainers; [ tadfisher felixsinger ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

6
pkgs/development/tools/misc/act/default.nix → pkgs/by-name/ac/act/package.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "act"; pname = "act";
version = "0.2.65"; version = "0.2.66";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nektos"; owner = "nektos";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-b2CJMjQr6Eez1xijGpXNkKeYeO87o1a13rB9bA2ShV0="; hash = "sha256-84ssbd0qF0p2x+cFYwYNW4P79KSZqhvF4Zd6wlRhgLo=";
}; };
vendorHash = "sha256-AqzhDEan0tdjfbP/nmpfa2e842zR6RyymllNR02zjlM="; vendorHash = "sha256-fzGnswfzvKhzs7iYnsiQb1c+TTk9+113uj7ryOAvUJk=";
doCheck = false; doCheck = false;

6
pkgs/by-name/ad/adrs/package.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "adrs"; pname = "adrs";
version = "0.2.8"; version = "0.2.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "joshrotenberg"; owner = "joshrotenberg";
repo = "adrs"; repo = "adrs";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-5rvdW2UntseSsKFndrDj9ogH/qYN+KymuOsuqS0/C3M="; hash = "sha256-a1vxo2Zw2fvCJeGaatNqf2h74t7pvWppYS2l2gbCF5k=";
}; };
cargoHash = "sha256-WqsZ+ICfKrackQ5dMs/WvF3inJX+k9LhxAJkXmaVAtY="; cargoHash = "sha256-eVADcCXf6hl9o9pApp3inU7kZAKA3k5mM3+vy7cq5u8=";
meta = { meta = {
description = "Command-line tool for managing Architectural Decision Records"; description = "Command-line tool for managing Architectural Decision Records";

4
pkgs/by-name/ag/ags/package.nix
View File

@ -8,7 +8,7 @@
gobject-introspection, gobject-introspection,
gjs, gjs,
glib-networking, glib-networking,
gnome, gnome-bluetooth,
gtk-layer-shell, gtk-layer-shell,
libpulseaudio, libpulseaudio,
libsoup_3, libsoup_3,
@ -50,7 +50,7 @@ buildNpmPackage rec {
buildInputs = [ buildInputs = [
gjs gjs
glib-networking glib-networking
gnome.gnome-bluetooth gnome-bluetooth
gtk-layer-shell gtk-layer-shell
libpulseaudio libpulseaudio
libsoup_3 libsoup_3

5
pkgs/by-name/an/ansel/package.nix
View File

@ -170,6 +170,11 @@ stdenv.mkDerivation {
hardcodeZeroVersion = true; hardcodeZeroVersion = true;
}; };
# cmake can't find the binary itself
cmakeFlags = [
(lib.cmakeFeature "Xsltproc_BIN" (lib.getExe' libxslt "xsltproc"))
];
meta = { meta = {
description = "Darktable fork minus the bloat plus some design vision"; description = "Darktable fork minus the bloat plus some design vision";
homepage = "https://ansel.photos/"; homepage = "https://ansel.photos/";

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

@ -9,16 +9,16 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "atac"; pname = "atac";
version = "0.16.0"; version = "0.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Julien-cpsn"; owner = "Julien-cpsn";
repo = "ATAC"; repo = "ATAC";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PTslXzgZCzmy45zI2omv4Ef5h4gJdfWcK5ko7ulHnXo="; hash = "sha256-FSZGpV+dREwjst84TT1aBm/H+VqkjI8XDPo3usJ7UeI=";
}; };
cargoHash = "sha256-ZQyj2+gsZnayWD29dYZDh1zYTstaQluzzF7pXf0yoY4="; cargoHash = "sha256-sNgtqvFiwHSYMDf0379i8Yl9NrkCRVLo/ogjbHFgKBY=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

4
pkgs/by-name/ay/ayatana-indicator-session/package.nix
View File

@ -7,7 +7,7 @@
cmake, cmake,
dbus, dbus,
glib, glib,
gnome, gnome-settings-daemon,
gsettings-desktop-schemas, gsettings-desktop-schemas,
gtest, gtest,
intltool, intltool,
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
# TODO these bloat the closure size alot, just so the indicator doesn't have the potential to crash. # TODO these bloat the closure size alot, just so the indicator doesn't have the potential to crash.
# is there a better way to give it access to DE-specific schemas as needed? # is there a better way to give it access to DE-specific schemas as needed?
# https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413 # https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413
gnome.gnome-settings-daemon gnome-settings-daemon
mate.mate-settings-daemon mate.mate-settings-daemon
]; ];

2
pkgs/by-name/ba/badkeys/package.nix
View File

@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
meta = { meta = {
description = "Tool to find common vulnerabilities in cryptographic public keys"; description = "Tool to find common vulnerabilities in cryptographic public keys";
homepage = "https://badkeys.info/"; homepage = "https://badkeys.info/";
changelog = "https://github.com/badkeys/badkeys/releases/tag/${src.rev}"; changelog = "https://github.com/badkeys/badkeys/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
mainProgram = "badkeys"; mainProgram = "badkeys";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ]; maintainers = with lib.maintainers; [ getchoo ];

4
pkgs/by-name/bi/bitrise/package.nix
View File

@ -6,13 +6,13 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "bitrise"; pname = "bitrise";
version = "2.20.0"; version = "2.20.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitrise-io"; owner = "bitrise-io";
repo = "bitrise"; repo = "bitrise";
rev = version; rev = version;
hash = "sha256-kwM3TqXxkVq45oN9T+G7wmsBMdIJ/FN6ZoUysoM5PNY="; hash = "sha256-M1OAMppeY13fXclycUXwp2H1GSLVJRNV11QxAvNLQuQ=";
}; };
# many tests rely on writable $HOME/.bitrise and require network access # many tests rely on writable $HOME/.bitrise and require network access

11
pkgs/by-name/bu/budgie-control-center/package.nix
View File

@ -21,9 +21,11 @@
glib-networking, glib-networking,
glibc, glibc,
gnome, gnome,
gnome-bluetooth_1_0,
gnome-color-manager, gnome-color-manager,
gnome-desktop, gnome-desktop,
gnome-remote-desktop, gnome-remote-desktop,
gnome-settings-daemon,
gnome-user-share, gnome-user-share,
gsettings-desktop-schemas, gsettings-desktop-schemas,
gsound, gsound,
@ -46,6 +48,7 @@
libxslt, libxslt,
meson, meson,
modemmanager, modemmanager,
mutter,
networkmanager, networkmanager,
networkmanagerapplet, networkmanagerapplet,
ninja, ninja,
@ -116,11 +119,11 @@ stdenv.mkDerivation (finalAttrs: {
gnome-desktop gnome-desktop
adwaita-icon-theme adwaita-icon-theme
cheese cheese
gnome.gnome-bluetooth_1_0 gnome-bluetooth_1_0
gnome-remote-desktop gnome-remote-desktop
gnome.gnome-settings-daemon gnome-settings-daemon
gnome-user-share gnome-user-share
gnome.mutter mutter
gsettings-desktop-schemas gsettings-desktop-schemas
gsound gsound
gtk3 gtk3
@ -174,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: {
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
--prefix XDG_DATA_DIRS : "${librsvg}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share"
# WM keyboard shortcuts # WM keyboard shortcuts
--prefix XDG_DATA_DIRS : "${gnome.mutter}/share" --prefix XDG_DATA_DIRS : "${mutter}/share"
) )
''; '';

7
pkgs/by-name/bu/budgie-desktop/package.nix
View File

@ -7,8 +7,8 @@
budgie-screensaver, budgie-screensaver,
docbook-xsl-nons, docbook-xsl-nons,
glib, glib,
gnome,
gnome-desktop, gnome-desktop,
gnome-settings-daemon,
graphene, graphene,
gst_all_1, gst_all_1,
gtk-doc, gtk-doc,
@ -26,6 +26,7 @@
magpie, magpie,
mesa, mesa,
meson, meson,
mutter,
ninja, ninja,
nix-update-script, nix-update-script,
nixosTests, nixosTests,
@ -79,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
budgie-screensaver budgie-screensaver
glib glib
gnome-desktop gnome-desktop
gnome.gnome-settings-daemon gnome-settings-daemon
gnome.mutter mutter
zenity zenity
graphene graphene
gst_all_1.gstreamer gst_all_1.gstreamer

4
pkgs/by-name/bu/budgie-gsettings-overrides/package.nix
View File

@ -5,7 +5,7 @@
budgie-desktop-view, budgie-desktop-view,
glib, glib,
gsettings-desktop-schemas, gsettings-desktop-schemas,
gnome, mutter,
nixos-artwork, nixos-artwork,
nixos-background-light ? nixos-artwork.wallpapers.nineish, nixos-background-light ? nixos-artwork.wallpapers.nineish,
nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray, nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray,
@ -59,7 +59,7 @@ let
budgie-desktop budgie-desktop
budgie-desktop-view budgie-desktop-view
gsettings-desktop-schemas gsettings-desktop-schemas
gnome.mutter mutter
] ++ extraGSettingsOverridePackages; ] ++ extraGSettingsOverridePackages;
in in

6
pkgs/by-name/bu/budgie-session/package.nix
View File

@ -6,12 +6,12 @@
meson, meson,
ninja, ninja,
pkg-config, pkg-config,
gnome,
adwaita-icon-theme, adwaita-icon-theme,
glib, glib,
gtk3, gtk3,
gsettings-desktop-schemas, gsettings-desktop-schemas,
gnome-desktop, gnome-desktop,
gnome-settings-daemon,
dbus, dbus,
json-glib, json-glib,
libICE, libICE,
@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
json-glib json-glib
xorg.xtrans xorg.xtrans
adwaita-icon-theme adwaita-icon-theme
gnome.gnome-settings-daemon gnome-settings-daemon
gsettings-desktop-schemas gsettings-desktop-schemas
systemd systemd
libepoxy libepoxy
@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
wrapProgram "$out/libexec/budgie-session-binary" \ wrapProgram "$out/libexec/budgie-session-binary" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
''; '';
separateDebugInfo = true; separateDebugInfo = true;

2
pkgs/by-name/ca/cartridges/package.nix
View File

@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec {
You can sort and hide games or download cover art from SteamGridDB. You can sort and hide games or download cover art from SteamGridDB.
''; '';
homepage = "https://apps.gnome.org/Cartridges/"; homepage = "https://apps.gnome.org/Cartridges/";
changelog = "https://github.com/kra-mo/cartridges/releases/tag/${src.rev}"; changelog = "https://github.com/kra-mo/cartridges/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
license = lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ getchoo ]; maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "cartridges"; mainProgram = "cartridges";

7
pkgs/by-name/ca/catppuccin-cursors/package.nix
View File

@ -5,6 +5,7 @@
, just , just
, xcursorgen , xcursorgen
, hyprcursor , hyprcursor
, xcur2png
}: }:
let let
@ -14,7 +15,7 @@ let
}; };
variantName = { palette, color }: palette + color; variantName = { palette, color }: palette + color;
variants = lib.mapCartesianProduct variantName dimensions; variants = lib.mapCartesianProduct variantName dimensions;
version = "0.3.0"; version = "0.3.1";
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "catppuccin-cursors"; pname = "catppuccin-cursors";
@ -24,10 +25,10 @@ stdenvNoCC.mkDerivation {
owner = "catppuccin"; owner = "catppuccin";
repo = "cursors"; repo = "cursors";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-LJyBnXDUGBLOD4qPI7l0YC0CcqYTtgoMJc1H2yLqk9g="; hash = "sha256-CuzD6O/RImFKLWzJoiUv7nlIdoXNvwwl+k5mTeVIY10=";
}; };
nativeBuildInputs = [ just inkscape xcursorgen hyprcursor ]; nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ];
outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage

6
pkgs/development/tools/continuous-integration/cirrus-cli/default.nix → pkgs/by-name/ci/cirrus-cli/package.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "cirrus-cli"; pname = "cirrus-cli";
version = "0.122.4"; version = "0.124.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cirruslabs"; owner = "cirruslabs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-YpdzwGThmc9r4I+Rx8nxTZToi+J3UbqwZD+F2hYEG8M="; hash = "sha256-S57ApSuO3Mo/GpoaXx0dKOU3CfdQXmPM8AWi8fZ9MfY=";
}; };
vendorHash = "sha256-WAYjYIHsBkQiTUmMDRXnx3Q1UAFVfXmZDFxzw7Kh0ds="; vendorHash = "sha256-BbBwia47E6EtoEzO2c2fhjg6WHGHTnzl5VyVYxIMu6E=";
ldflags = [ ldflags = [
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

30
pkgs/by-name/cs/csvtk/package.nix Normal file
View File

@ -0,0 +1,30 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
let
version = "0.30.0";
in
buildGoModule {
pname = "csvtk";
inherit version;
src = fetchFromGitHub {
owner = "shenwei356";
repo = "csvtk";
rev = "refs/tags/v${version}";
hash = "sha256-xq56dErO0vjG9bZ5aISIFWX4IOHaQksE9W1is2HiFuQ=";
};
vendorHash = "sha256-wJedDF7QIg8oWc/QX+rZDyq/nkAW+PMb8EYb0RGJxQM=";
meta = {
description = "Cross-platform, efficient and practical CSV/TSV toolkit in Golang";
changelog = "https://github.com/shenwei356/csvtk/releases/tag/v${version}";
homepage = "https://github.com/shenwei356/csvtk";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
mainProgram = "csvtk";
};
}

5
pkgs/by-name/do/docfd/package.nix
View File

@ -21,7 +21,7 @@ let
in in
buildDunePackage' rec { buildDunePackage' rec {
pname = "docfd"; pname = "docfd";
version = "7.0.0"; version = "8.0.1";
minimalOCamlVersion = "5.1"; minimalOCamlVersion = "5.1";
@ -29,7 +29,7 @@ buildDunePackage' rec {
owner = "darrenldl"; owner = "darrenldl";
repo = "docfd"; repo = "docfd";
rev = version; rev = version;
hash = "sha256-R/UOA1rf9NnEQQWn/ToCZuUSC48DPqglrb+5ZjCdpb0="; hash = "sha256-0VeUT9i3/eEA64XsrpUi3oXyrinEFSJWzsEXrsUly30=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -41,6 +41,7 @@ buildDunePackage' rec {
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [
cmdliner cmdliner
containers-data containers-data
decompress
digestif digestif
eio_main eio_main
lwd lwd

4
pkgs/by-name/ff/fflogs/package.nix
View File

@ -5,10 +5,10 @@
let let
pname = "fflogs"; pname = "fflogs";
version = "8.12.19"; version = "8.13.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
hash = "sha256-/TGmUHMNowQFIw09OGw1ybiYE7ADPLbsZpAMPw3G5NE="; hash = "sha256-NSLJo+6o30bF2+1c1mHdHGC5GoZUjzC0JYJ5x/tY4uQ=";
}; };
extracted = appimageTools.extractType2 { inherit pname version src; }; extracted = appimageTools.extractType2 { inherit pname version src; };
in in

4
pkgs/by-name/fl/flashmq/package.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flashmq"; pname = "flashmq";
version = "1.17.0"; version = "1.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "halfgaar"; owner = "halfgaar";
repo = "FlashMQ"; repo = "FlashMQ";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-HcpNPkG1gd5Gb5z//DrU8Rxf+dZWKMwHtj62k4N1S3U="; hash = "sha256-T9ecw+UHe/DM8TSDda140lxG3oaf/wf+TEySOz6tboA=";
}; };
nativeBuildInputs = [ cmake installShellFiles ]; nativeBuildInputs = [ cmake installShellFiles ];

6
pkgs/by-name/gi/gitlab-ci-local/package.nix
View File

@ -6,16 +6,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "gitlab-ci-local"; pname = "gitlab-ci-local";
version = "4.52.2"; version = "4.53.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "firecow"; owner = "firecow";
repo = "gitlab-ci-local"; repo = "gitlab-ci-local";
rev = version; rev = version;
hash = "sha256-x63am8FIfczA4CkoBkDeZTkp2sqc7nN5CV1hiq+vvjU="; hash = "sha256-VLBVfA4x4gaj7e37W7EqehJpYhmEgTatIL2IrO4i+Z8=";
}; };
npmDepsHash = "sha256-t26QoIBw5XGqHn8FHSL2MSfFV2wGuQWf3GH2GvSYByg="; npmDepsHash = "sha256-HAat2D45XeIjDW207Fn5M7O1sqjHOV2gxm2Urzxw+PU=";
postPatch = '' postPatch = ''
# remove cleanup which runs git commands # remove cleanup which runs git commands

37
pkgs/desktops/gnome/games/gnome-2048/default.nix → pkgs/by-name/gn/gnome-2048/package.nix
View File

@ -1,26 +1,27 @@
{ lib {
, stdenv lib,
, fetchurl stdenv,
, fetchpatch fetchurl,
, wrapGAppsHook3 fetchpatch,
, meson wrapGAppsHook3,
, vala meson,
, pkg-config vala,
, ninja pkg-config,
, itstool ninja,
, clutter-gtk itstool,
, libgee clutter-gtk,
, libgnome-games-support libgee,
, gnome libgnome-games-support,
, gtk3 gnome,
gtk3,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-twenty-forty-eight"; pname = "gnome-twenty-forty-eight";
version = "3.38.2"; version = "3.38.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz";
sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"; sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2";
}; };
@ -63,4 +64,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

53
pkgs/desktops/gnome/misc/gnome-applets/default.nix → pkgs/by-name/gn/gnome-applets/package.nix
View File

@ -1,32 +1,34 @@
{ lib, stdenv {
, fetchurl lib,
, gettext stdenv,
, itstool fetchurl,
, libxml2 gettext,
, pkg-config itstool,
, gnome-panel libxml2,
, gtk3 pkg-config,
, glib gnome-panel,
, libwnck gtk3,
, libgtop glib,
, libnotify libwnck,
, upower libgtop,
, wirelesstools libnotify,
, linuxPackages upower,
, adwaita-icon-theme wirelesstools,
, libgweather linuxPackages,
, gucharmap adwaita-icon-theme,
, tracker libgweather,
, polkit gucharmap,
, gnome tracker,
polkit,
gnome,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-applets"; pname = "gnome-applets";
version = "3.52.0"; version = "3.52.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz";
hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw="; hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw=";
}; };
@ -64,8 +66,7 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = "gnome-applets";
attrPath = "gnome.${pname}";
versionPolicy = "odd-unstable"; versionPolicy = "odd-unstable";
}; };
}; };
@ -78,4 +79,4 @@ stdenv.mkDerivation rec {
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

66
pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix → pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix
View File

@ -1,38 +1,44 @@
{ stdenv {
, lib stdenv,
, fetchurl lib,
, fetchpatch fetchurl,
, gnome fetchpatch,
, adwaita-icon-theme gnome,
, meson adwaita-icon-theme,
, ninja meson,
, pkg-config ninja,
, gtk3 pkg-config,
, gettext gtk3,
, glib gettext,
, udev glib,
, itstool udev,
, libxml2 itstool,
, wrapGAppsHook3 libxml2,
, libnotify wrapGAppsHook3,
, libcanberra-gtk3 libnotify,
, gobject-introspection libcanberra-gtk3,
, gtk-doc gobject-introspection,
, docbook-xsl-nons gtk-doc,
, docbook_xml_dtd_43 docbook-xsl-nons,
, python3 docbook_xml_dtd_43,
, gsettings-desktop-schemas python3,
gsettings-desktop-schemas,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-bluetooth"; pname = "gnome-bluetooth";
version = "3.34.5"; version = "3.34.5";
# TODO: split out "lib" # TODO: split out "lib"
outputs = [ "out" "dev" "devdoc" "man" ]; outputs = [
"out"
"dev"
"devdoc"
"man"
];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.majorMinor finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz";
sha256 = "bJSeUsi+zCBU2qzWBJAfZs5c9wml+pHEu3ysyTm1Pqk="; sha256 = "bJSeUsi+zCBU2qzWBJAfZs5c9wml+pHEu3ysyTm1Pqk=";
}; };
@ -82,8 +88,8 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = "gnome-bluetooth";
attrPath = "gnome.gnome-bluetooth_1_0"; attrPath = "gnome-bluetooth_1_0";
freeze = true; freeze = true;
}; };
}; };
@ -96,4 +102,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

7
pkgs/desktops/gnome/core/gnome-bluetooth/default.nix → pkgs/by-name/gn/gnome-bluetooth/package.nix
View File

@ -26,7 +26,7 @@
gsettings-desktop-schemas, gsettings-desktop-schemas,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-bluetooth"; pname = "gnome-bluetooth";
version = "46.1"; version = "46.1";
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
]; ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major version}/gnome-bluetooth-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz";
hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw="; hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw=";
}; };
@ -74,7 +74,6 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = "gnome-bluetooth"; packageName = "gnome-bluetooth";
attrPath = "gnome.gnome-bluetooth";
}; };
}; };
@ -86,4 +85,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

167
pkgs/desktops/gnome/core/gnome-control-center/default.nix → pkgs/by-name/gn/gnome-control-center/package.nix
View File

@ -1,74 +1,75 @@
{ fetchurl {
, lib fetchurl,
, stdenv lib,
, substituteAll stdenv,
, accountsservice substituteAll,
, adwaita-icon-theme accountsservice,
, colord adwaita-icon-theme,
, colord-gtk4 colord,
, cups colord-gtk4,
, dbus cups,
, docbook-xsl-nons dbus,
, fontconfig docbook-xsl-nons,
, gdk-pixbuf fontconfig,
, gettext gdk-pixbuf,
, glib gettext,
, glib-networking glib,
, gcr_4 glib-networking,
, glibc gcr_4,
, gnome-bluetooth glibc,
, gnome-color-manager gnome-bluetooth,
, gnome-desktop gnome-color-manager,
, gnome-online-accounts gnome-desktop,
, gnome-settings-daemon gnome-online-accounts,
, gnome-tecla gnome-settings-daemon,
, gnome gnome-tecla,
, gsettings-desktop-schemas gnome,
, gsound gsettings-desktop-schemas,
, gst_all_1 gsound,
, gtk4 gst_all_1,
, ibus gtk4,
, json-glib ibus,
, libgtop json-glib,
, libgudev libgtop,
, libadwaita libgudev,
, libkrb5 libadwaita,
, libjxl libkrb5,
, libpulseaudio libjxl,
, libpwquality libpulseaudio,
, librsvg libpwquality,
, webp-pixbuf-loader librsvg,
, libsecret webp-pixbuf-loader,
, libsoup_3 libsecret,
, libwacom libsoup_3,
, libXi libwacom,
, libxml2 libXi,
, libxslt libxml2,
, meson libxslt,
, modemmanager meson,
, mutter modemmanager,
, networkmanager mutter,
, networkmanagerapplet networkmanager,
, libnma-gtk4 networkmanagerapplet,
, ninja libnma-gtk4,
, pkg-config ninja,
, polkit pkg-config,
, python3 polkit,
, samba python3,
, setxkbmap samba,
, shadow setxkbmap,
, shared-mime-info shadow,
, sound-theme-freedesktop shared-mime-info,
, tracker sound-theme-freedesktop,
, tracker-miners tracker,
, tzdata tracker-miners,
, udisks2 tzdata,
, upower udisks2,
, libepoxy upower,
, gnome-user-share libepoxy,
, gnome-remote-desktop gnome-user-share,
, wrapGAppsHook4 gnome-remote-desktop,
, xorgserver wrapGAppsHook4,
xorgserver,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -147,11 +148,10 @@ stdenv.mkDerivation (finalAttrs: {
tracker-miners # for search locations dialog tracker-miners # for search locations dialog
udisks2 udisks2
upower upower
] ++ (with gst_all_1; [
# For animations in Mouse panel. # For animations in Mouse panel.
gst-plugins-base gst_all_1.gst-plugins-base
gst-plugins-good gst_all_1.gst-plugins-good
]); ];
nativeCheckInputs = [ nativeCheckInputs = [
dbus dbus
@ -177,13 +177,15 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = '' postInstall = ''
# Pull in WebP and JXL support for gnome-backgrounds. # Pull in WebP and JXL support for gnome-backgrounds.
# In postInstall to run before gappsWrapperArgsHook. # In postInstall to run before gappsWrapperArgsHook.
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { export GDK_PIXBUF_MODULE_FILE="${
extraLoaders = [ gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
libjxl extraLoaders = [
librsvg libjxl
webp-pixbuf-loader librsvg
]; webp-pixbuf-loader
}}" ];
}
}"
''; '';
preFixup = '' preFixup = ''
@ -205,7 +207,6 @@ stdenv.mkDerivation (finalAttrs: {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = "gnome-control-center"; packageName = "gnome-control-center";
attrPath = "gnome.gnome-control-center";
}; };
}; };

0
pkgs/desktops/gnome/core/gnome-control-center/paths.patch → pkgs/by-name/gn/gnome-control-center/paths.patch
View File

3
pkgs/by-name/gn/gnome-disk-utility/package.nix
View File

@ -15,6 +15,7 @@
, libnotify , libnotify
, itstool , itstool
, gnome , gnome
, gnome-settings-daemon
, adwaita-icon-theme , adwaita-icon-theme
, libxml2 , libxml2
, gsettings-desktop-schemas , gsettings-desktop-schemas
@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
udisks2 udisks2
adwaita-icon-theme adwaita-icon-theme
systemd systemd
gnome.gnome-settings-daemon gnome-settings-daemon
gsettings-desktop-schemas gsettings-desktop-schemas
]; ];

222
pkgs/by-name/gn/gnome-flashback/package.nix Normal file
View File

@ -0,0 +1,222 @@
{
stdenv,
lib,
autoreconfHook,
fetchurl,
gettext,
glib,
gnome-bluetooth,
gnome-desktop,
gnome-panel,
gnome-session,
gnome,
gsettings-desktop-schemas,
gtk3,
ibus,
libcanberra-gtk3,
libpulseaudio,
libxkbfile,
libxml2,
pkg-config,
polkit,
gdm,
systemd,
upower,
pam,
wrapGAppsHook3,
writeTextFile,
xkeyboard_config,
xorg,
nixosTests,
runCommand,
buildEnv,
}:
let
# From data/sessions/Makefile.am
requiredComponentsCommon = enableGnomePanel: [ ] ++ lib.optional enableGnomePanel "gnome-panel";
requiredComponentsGsd = [
"org.gnome.SettingsDaemon.A11ySettings"
"org.gnome.SettingsDaemon.Color"
"org.gnome.SettingsDaemon.Datetime"
"org.gnome.SettingsDaemon.Housekeeping"
"org.gnome.SettingsDaemon.Keyboard"
"org.gnome.SettingsDaemon.MediaKeys"
"org.gnome.SettingsDaemon.Power"
"org.gnome.SettingsDaemon.PrintNotifications"
"org.gnome.SettingsDaemon.Rfkill"
"org.gnome.SettingsDaemon.ScreensaverProxy"
"org.gnome.SettingsDaemon.Sharing"
"org.gnome.SettingsDaemon.Smartcard"
"org.gnome.SettingsDaemon.Sound"
"org.gnome.SettingsDaemon.UsbProtection"
"org.gnome.SettingsDaemon.Wacom"
"org.gnome.SettingsDaemon.XSettings"
];
requiredComponents =
wmName: enableGnomePanel:
"RequiredComponents=${
lib.concatStringsSep ";" (
[ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd
)
};";
in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-flashback";
version = "3.52.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz";
hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo=";
};
# make .desktop Execs absolute
postPatch = ''
patch -p0 <<END_PATCH
+++ data/applications/gnome-flashback.desktop.in
@@ -4 +4 @@
-Exec=gnome-flashback
+Exec=$out/bin/gnome-flashback
END_PATCH
'';
postInstall = ''
# Check that our expected RequiredComponents match the stock session files, but then don't install them.
# They can be installed using mkSessionForWm.
grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false)
rm -r $out/share/gnome-session
rm -r $out/share/xsessions
rm $out/libexec/gnome-flashback-metacity
'';
nativeBuildInputs = [
autoreconfHook
gettext
libxml2
pkg-config
wrapGAppsHook3
];
buildInputs = [
glib
gnome-bluetooth
gnome-desktop
gsettings-desktop-schemas
gtk3
ibus
libcanberra-gtk3
libpulseaudio
libxkbfile
xorg.libXxf86vm
polkit
gdm
gnome-panel
systemd
upower
pam
xkeyboard_config
];
doCheck = true;
enableParallelBuilding = true;
PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts";
PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules";
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-flashback";
versionPolicy = "odd-unstable";
};
mkWmApplication =
{
wmName,
wmLabel,
wmCommand,
}:
writeTextFile {
name = "gnome-flashback-${wmName}-wm";
destination = "/share/applications/${wmName}.desktop";
text = ''
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=${wmLabel}
Exec=${wmCommand}
NoDisplay=true
X-GNOME-WMName=${wmLabel}
X-GNOME-Autostart-Phase=WindowManager
X-GNOME-Provides=windowmanager
X-GNOME-Autostart-Notify=false
'';
};
mkGnomeSession =
{
wmName,
wmLabel,
enableGnomePanel,
}:
writeTextFile {
name = "gnome-flashback-${wmName}-gnome-session";
destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";
text = ''
[GNOME Session]
Name=GNOME Flashback (${wmLabel})
${requiredComponents wmName enableGnomePanel}
'';
};
mkSessionForWm =
{
wmName,
wmLabel,
wmCommand,
}:
writeTextFile {
name = "gnome-flashback-${wmName}-xsession";
destination = "/share/xsessions/gnome-flashback-${wmName}.desktop";
text = ''
[Desktop Entry]
Name=GNOME Flashback (${wmLabel})
Comment=This session logs you into GNOME Flashback with ${wmLabel}
Exec=${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName}
TryExec=${wmCommand}
Type=Application
DesktopNames=GNOME-Flashback;GNOME;
'';
}
// {
providedSessions = [ "gnome-flashback-${wmName}" ];
};
mkSystemdTargetForWm =
{
wmName,
wmLabel,
wmCommand,
enableGnomePanel,
}:
runCommand "gnome-flashback-${wmName}.target" { } ''
mkdir -p $out/lib/systemd/user
cp -r "${finalAttrs.gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
"$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
'';
tests = {
inherit (nixosTests) gnome-flashback;
};
};
meta = with lib; {
description = "GNOME 2.x-like session for GNOME 3";
mainProgram = "gnome-flashback";
homepage = "https://gitlab.gnome.org/GNOME/gnome-flashback";
license = licenses.gpl2;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
})

0
pkgs/desktops/gnome/misc/gnome-panel/modulesdir-env-var.patch → pkgs/by-name/gn/gnome-panel/modulesdir-env-var.patch
View File

60
pkgs/desktops/gnome/misc/gnome-panel/default.nix → pkgs/by-name/gn/gnome-panel/package.nix
View File

@ -1,35 +1,40 @@
{ stdenv {
, lib stdenv,
, fetchurl lib,
, autoreconfHook fetchurl,
, dconf autoreconfHook,
, evolution-data-server dconf,
, gdm evolution-data-server,
, geocode-glib_2 gdm,
, gettext geocode-glib_2,
, glib gettext,
, gnome-desktop glib,
, gnome-menus gnome-desktop,
, gnome gnome-menus,
, gtk3 gnome,
, itstool gtk3,
, libgweather itstool,
, libwnck libgweather,
, libxml2 libwnck,
, pkg-config libxml2,
, polkit pkg-config,
, systemd polkit,
, wrapGAppsHook3 systemd,
wrapGAppsHook3,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-panel"; pname = "gnome-panel";
version = "3.52.0"; version = "3.52.0";
outputs = [ "out" "dev" "man" ]; outputs = [
"out"
"dev"
"man"
];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz";
hash = "sha256-nim6iHPN5A1AwpNKRk+PQ7ousbUisZFEfKon3XhTxdQ="; hash = "sha256-nim6iHPN5A1AwpNKRk+PQ7ousbUisZFEfKon3XhTxdQ=";
}; };
@ -91,8 +96,7 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = "gnome-panel";
attrPath = "gnome.${pname}";
versionPolicy = "odd-unstable"; versionPolicy = "odd-unstable";
}; };
}; };
@ -105,4 +109,4 @@ stdenv.mkDerivation rec {
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

34
pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix → pkgs/by-name/gn/gnome-panel/wrapper.nix
View File

@ -1,17 +1,22 @@
{ stdenv {
, lib stdenv,
, buildEnv lib,
, gnome-panel buildEnv,
, gnome-flashback gnome,
, xorg gnome-panel,
, glib gnome-flashback,
, wrapGAppsHook3 xorg,
, panelModulePackages ? [ ] glib,
wrapGAppsHook3,
panelModulePackages ? [ ],
}: }:
let let
# We always want to find the built-in panel applets. # We always want to find the built-in panel applets.
selectedPanelModulePackages = [ gnome-panel gnome-flashback ] ++ panelModulePackages; selectedPanelModulePackages = [
gnome-panel
gnome-flashback
] ++ panelModulePackages;
panelModulesEnv = buildEnv { panelModulesEnv = buildEnv {
name = "gnome-panel-modules-env"; name = "gnome-panel-modules-env";
@ -28,8 +33,9 @@ stdenv.mkDerivation {
wrapGAppsHook3 wrapGAppsHook3
]; ];
buildInputs = selectedPanelModulePackages ++ buildInputs =
lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]); selectedPanelModulePackages
++ lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]);
dontUnpack = true; dontUnpack = true;
dontConfigure = true; dontConfigure = true;
@ -62,5 +68,7 @@ stdenv.mkDerivation {
) )
''; '';
meta = gnome-panel.meta // { outputsToInstall = [ "out" ]; }; meta = gnome-panel.meta // {
outputsToInstall = [ "out" ];
};
} }

19
pkgs/desktops/gnome/core/gnome-session/ctl.nix → pkgs/by-name/gn/gnome-session/ctl.nix
View File

@ -1,12 +1,13 @@
{ lib {
, stdenv lib,
, fetchFromGitHub stdenv,
, meson fetchFromGitHub,
, ninja meson,
, pkg-config ninja,
, glib pkg-config,
, systemd glib,
, wrapGAppsHook3 systemd,
wrapGAppsHook3,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

0
pkgs/desktops/gnome/core/gnome-session/fix-paths.patch → pkgs/by-name/gn/gnome-session/fix-paths.patch
View File

77
pkgs/desktops/gnome/core/gnome-session/default.nix → pkgs/by-name/gn/gnome-session/package.nix
View File

@ -1,42 +1,48 @@
{ fetchurl {
, lib fetchurl,
, stdenv lib,
, substituteAll stdenv,
, meson substituteAll,
, ninja meson,
, pkg-config ninja,
, gnome pkg-config,
, adwaita-icon-theme gnome,
, glib adwaita-icon-theme,
, gtk3 glib,
, gsettings-desktop-schemas gtk3,
, gnome-desktop gsettings-desktop-schemas,
, dbus gnome-desktop,
, json-glib gnome-settings-daemon,
, libICE gnome-shell,
, xmlto dbus,
, docbook_xsl json-glib,
, docbook_xml_dtd_412 libICE,
, python3 xmlto,
, libxslt docbook_xsl,
, gettext docbook_xml_dtd_412,
, makeWrapper python3,
, systemd libxslt,
, xorg gettext,
, libepoxy makeWrapper,
, bash systemd,
, gnome-session-ctl xorg,
libepoxy,
bash,
gnome-session-ctl,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-session"; pname = "gnome-session";
# Also bump ./ctl.nix when bumping major version. # Also bump ./ctl.nix when bumping major version.
version = "46.0"; version = "46.0";
outputs = [ "out" "sessions" ]; outputs = [
"out"
"sessions"
];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ="; hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ=";
}; };
@ -71,7 +77,7 @@ stdenv.mkDerivation rec {
json-glib json-glib
xorg.xtrans xorg.xtrans
adwaita-icon-theme adwaita-icon-theme
gnome.gnome-settings-daemon gnome-settings-daemon
gsettings-desktop-schemas gsettings-desktop-schemas
systemd systemd
libepoxy libepoxy
@ -109,8 +115,8 @@ stdenv.mkDerivation rec {
wrapProgram "$out/libexec/gnome-session-binary" \ wrapProgram "$out/libexec/gnome-session-binary" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \ --suffix XDG_DATA_DIRS : "${gnome-shell}/share" \
--suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
''; '';
separateDebugInfo = true; separateDebugInfo = true;
@ -118,7 +124,6 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = "gnome-session"; packageName = "gnome-session";
attrPath = "gnome.gnome-session";
}; };
providedSessions = [ providedSessions = [
"gnome" "gnome"
@ -133,4 +138,4 @@ stdenv.mkDerivation rec {
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

89
pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix → pkgs/by-name/gn/gnome-settings-daemon/43/default.nix
View File

@ -1,52 +1,53 @@
{ stdenv {
, lib stdenv,
, fetchpatch lib,
, substituteAll fetchpatch,
, fetchurl substituteAll,
, meson fetchurl,
, ninja meson,
, pkg-config ninja,
, gnome pkg-config,
, perl gnome,
, gettext perl,
, gtk3 gettext,
, glib gtk3,
, libnotify glib,
, libgnomekbd libnotify,
, lcms2 libgnomekbd,
, libpulseaudio lcms2,
, alsa-lib libpulseaudio,
, libcanberra-gtk3 alsa-lib,
, upower libcanberra-gtk3,
, colord upower,
, libgweather colord,
, polkit libgweather,
, gsettings-desktop-schemas polkit,
, geoclue2 gsettings-desktop-schemas,
, systemd geoclue2,
, libgudev systemd,
, libwacom libgudev,
, libxslt libwacom,
, libxml2 libxslt,
, modemmanager libxml2,
, networkmanager modemmanager,
, gnome-desktop networkmanager,
, geocode-glib_2 gnome-desktop,
, docbook_xsl geocode-glib_2,
, wrapGAppsHook3 docbook_xsl,
, python3 wrapGAppsHook3,
, tzdata python3,
, nss tzdata,
, gcr_4 nss,
, gnome-session-ctl gcr_4,
gnome-session-ctl,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-settings-daemon"; pname = "gnome-settings-daemon";
version = "43.0"; version = "43.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A="; sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A=";
}; };
@ -125,4 +126,4 @@ stdenv.mkDerivation rec {
maintainers = teams.pantheon.members; maintainers = teams.pantheon.members;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

0
pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch → pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch
View File

0
pkgs/desktops/gnome/core/gnome-settings-daemon/add-gnome-session-ctl-option.patch → pkgs/by-name/gn/gnome-settings-daemon/add-gnome-session-ctl-option.patch
View File

0
pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch → pkgs/by-name/gn/gnome-settings-daemon/fix-paths.patch
View File

87
pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix → pkgs/by-name/gn/gnome-settings-daemon/package.nix
View File

@ -1,49 +1,50 @@
{ stdenv {
, lib stdenv,
, substituteAll lib,
, fetchurl substituteAll,
, meson fetchurl,
, ninja meson,
, pkg-config ninja,
, gnome pkg-config,
, perl gnome,
, gettext perl,
, gtk3 gettext,
, glib gtk3,
, libnotify glib,
, libgnomekbd libnotify,
, libpulseaudio libgnomekbd,
, alsa-lib libpulseaudio,
, libcanberra-gtk3 alsa-lib,
, upower libcanberra-gtk3,
, colord upower,
, libgweather colord,
, polkit libgweather,
, gsettings-desktop-schemas polkit,
, geoclue2 gsettings-desktop-schemas,
, systemd geoclue2,
, libgudev systemd,
, libwacom libgudev,
, libxslt libwacom,
, libxml2 libxslt,
, modemmanager libxml2,
, networkmanager modemmanager,
, gnome-desktop networkmanager,
, geocode-glib_2 gnome-desktop,
, docbook_xsl geocode-glib_2,
, wrapGAppsHook3 docbook_xsl,
, python3 wrapGAppsHook3,
, tzdata python3,
, gcr_4 tzdata,
, gnome-session-ctl gcr_4,
gnome-session-ctl,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-settings-daemon"; pname = "gnome-settings-daemon";
version = "46.0"; version = "46.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c="; hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c=";
}; };
@ -103,7 +104,6 @@ stdenv.mkDerivation rec {
# we're using plain # we're using plain
env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
postPatch = '' postPatch = ''
for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do
chmod +x $f chmod +x $f
@ -113,8 +113,7 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = "gnome-settings-daemon";
attrPath = "gnome.${pname}";
}; };
}; };
@ -123,4 +122,4 @@ stdenv.mkDerivation rec {
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} })

0
pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch → pkgs/by-name/gn/gnome-shell/fix-paths.patch
View File

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