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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-03 00:15:42 +00:00
committed by GitHub
parent 0fc2bbcb38 9f813c8d20
commit 2ca883171c
85 changed files with 1498 additions and 2813 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/languages-frameworks/java.section.md
+1 -2
View File
@@ -33,8 +33,7 @@ stdenv.mkDerivation {
```
Note that `jdk` is an alias for the OpenJDK (self-built where available,
or pre-built via Zulu). Platforms with OpenJDK not (yet) in Nixpkgs
(`Aarch32`, `Aarch64`) point to the (unfree) `oraclejdk`.
or pre-built via Zulu).
Also note that not using `stripJavaArchivesHook` will likely cause the
generated `.jar` files to be non-deterministic, which is not optimal.
maintainers/maintainer-list.nix
+6 -6
View File
@@ -4368,6 +4368,12 @@
githubId = 18414241;
name = "Andreas Erdes";
};
computerdane = {
email = "danerieber@gmail.com";
github = "computerdane";
githubId = 6487079;
name = "Dane Rieber";
};
confus = {
email = "con-f-use@gmx.net";
github = "con-f-use";
@@ -4766,12 +4772,6 @@
githubId = 24708079;
name = "Dan Eads";
};
danerieber = {
email = "danerieber@gmail.com";
github = "danerieber";
githubId = 6487079;
name = "Dane Rieber";
};
danid3v = {
email = "sch220233@spengergasse.at";
github = "DaniD3v";
nixos/doc/manual/release-notes/rl-2411.section.md
+23
View File
@@ -333,6 +333,11 @@
This change requires granting access to the repositories to this user or
setting the appropriate one through `services.cgit.some-instance.user`.
- All Oracle JDKs and JREs (`oraclejdk`, `oraclejdk8`, `oraclejre`, `oraclejre8`,
`jrePlugin`, `jre8Plugin`, `jdkdistro`, `oraclejdk8distro`, and `oraclejdk11`)
were dropped due to being unmaintained and heavily insecure. OpenJDK provides
compatible replacements for JDKs and JREs.
- `gradle_6` was removed due to being [unsupported upstream as of 10 Feb 2023](https://endoflife.date/gradle).
Additionally, it had numerous security vulnerabilities that were only patched
in later versions, such as [CVE-2021-29429](https://nvd.nist.gov/vuln/detail/CVE-2021-32751),
@@ -342,6 +347,9 @@
nvimpager settings: user commands in `-c` and `--cmd` now override the
respective default settings because they are executed later.
- `javacard-devkit` was dropped due to having a dependency on the Oracle JDK,
as well as being several years out-of-date.
- Kubernetes `featureGates` have changed from a `listOf str` to `attrsOf bool`.
This refactor makes it possible to also disable feature gates, without having
to use `extraOpts` flags.
@@ -388,6 +396,9 @@
- `services.pgbouncer` systemd service is configured with `Type=notify-reload` and allows reloading configuration without process restart. PgBouncer configuration options were moved to the free-form type option named [`services.pgbouncer.settings`](#opt-services.pgbouncer.settings) according to the NixOS RFC 0042.
- Docear was removed because it was unmaintained upstream.
JabRef, Zotero, or Mendeley are potential replacements.
- `nodePackages.coc-metals` was removed due to being deprecated upstream.
`vimPlugins.nvim-metals` is its official replacement.
@@ -492,6 +503,9 @@
- PPD files for Utax printers got renamed (spaces replaced by underscores) in newest `foomatic-db` package; users of Utax printers might need to adapt their `hardware.printers.ensurePrinters.*.model` value.
- `sqldeveloper` was dropped due to being severely out-of-date and having a dependency on
JavaFX for Java 8, which we do not support.
- The `kvdo` kernel module package was removed, because it was upstreamed in kernel version 6.9, where it is called `dm-vdo`.
- `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details.
@@ -663,6 +677,15 @@
lists by default. Backwards-compatible behavior can be enabled with
`atomsCoercedToLists`.
- Atlassian Server products have been removed, as support for the Atlassian Server
products ended in February 2024 and there was insufficient interest in
maintaining the Atlassian Data Center replacements:
- The `atlassian-bamboo` package
- The `atlassian-confluence` package and its `services.confluence` NixOS module
- The `atlassian-crowd` package and its `services.crowd` NixOS module
- The `atlassian-jira` package and its `services.jira` NixOS module
- `python3Packages.nose` has been removed, as it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12.
Please switch to `pytest` or another test runner/framework.
nixos/modules/module-list.nix
-3
View File
@@ -1390,9 +1390,6 @@
./services/web-apps/alps.nix
./services/web-apps/anuko-time-tracker.nix
./services/web-apps/artalk.nix
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
./services/web-apps/audiobookshelf.nix
./services/web-apps/bluemap.nix
./services/web-apps/bookstack.nix
nixos/modules/rename.nix
+3
View File
@@ -62,7 +62,9 @@ in
(mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed")
(mkRemovedOptionModule [ "services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "confluence" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements")
(mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "crowd" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements")
(mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
(mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] ''
@@ -82,6 +84,7 @@ in
(mkRemovedOptionModule [ "services" "homeassistant-satellite"] "The `services.homeassistant-satellite` module has been replaced by `services.wyoming-satellite`.")
(mkRemovedOptionModule [ "services" "hydron" ] "The `services.hydron` module has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability.")
(mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer")
(mkRemovedOptionModule [ "services" "jira" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements")
(mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "lshd" ] "The corresponding package was removed from nixpkgs as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decades.")
(mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.")
nixos/modules/services/web-apps/atlassian/confluence.nix
-224
View File
@@ -1,224 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.confluence;
pkg = cfg.package.override (optionalAttrs cfg.sso.enable {
enableSSO = cfg.sso.enable;
});
crowdProperties = pkgs.writeText "crowd.properties" ''
application.name ${cfg.sso.applicationName}
application.password ${if cfg.sso.applicationPassword != null then cfg.sso.applicationPassword else "@NIXOS_CONFLUENCE_CROWD_SSO_PWD@"}
application.login.url ${cfg.sso.crowd}/console/
crowd.server.url ${cfg.sso.crowd}/services/
crowd.base.url ${cfg.sso.crowd}/
session.isauthenticated session.isauthenticated
session.tokenkey session.tokenkey
session.validationinterval ${toString cfg.sso.validationInterval}
session.lastvalidation session.lastvalidation
'';
in
{
options = {
services.confluence = {
enable = mkEnableOption "Atlassian Confluence service";
user = mkOption {
type = types.str;
default = "confluence";
description = "User which runs confluence.";
};
group = mkOption {
type = types.str;
default = "confluence";
description = "Group which runs confluence.";
};
home = mkOption {
type = types.str;
default = "/var/lib/confluence";
description = "Home directory of the confluence instance.";
};
listenAddress = mkOption {
type = types.str;
default = "127.0.0.1";
description = "Address to listen on.";
};
listenPort = mkOption {
type = types.port;
default = 8090;
description = "Port to listen on.";
};
catalinaOptions = mkOption {
type = types.listOf types.str;
default = [];
example = [ "-Xms1024m" "-Xmx2048m" "-Dconfluence.disable.peopledirectory.all=true" ];
description = "Java options to pass to catalina/tomcat.";
};
proxy = {
enable = mkEnableOption "proxy support";
name = mkOption {
type = types.str;
example = "confluence.example.com";
description = "Virtual hostname at the proxy";
};
port = mkOption {
type = types.port;
default = 443;
example = 80;
description = "Port used at the proxy";
};
scheme = mkOption {
type = types.str;
default = "https";
example = "http";
description = "Protocol used at the proxy.";
};
};
sso = {
enable = mkEnableOption "SSO with Atlassian Crowd";
crowd = mkOption {
type = types.str;
example = "http://localhost:8095/crowd";
description = "Crowd Base URL without trailing slash";
};
applicationName = mkOption {
type = types.str;
example = "jira";
description = "Exact name of this Confluence instance in Crowd";
};
applicationPassword = mkOption {
type = types.nullOr types.str;
default = null;
description = "Application password of this Confluence instance in Crowd";
};
applicationPasswordFile = mkOption {
type = types.nullOr types.str;
default = null;
description = "Path to the application password for Crowd of Confluence.";
};
validationInterval = mkOption {
type = types.int;
default = 2;
example = 0;
description = ''
Set to 0, if you want authentication checks to occur on each
request. Otherwise set to the number of minutes between request
to validate if the user is logged in or out of the Crowd SSO
server. Setting this value to 1 or higher will increase the
performance of Crowd's integration.
'';
};
};
package = mkPackageOption pkgs "atlassian-confluence" { };
jrePackage = mkPackageOption pkgs "oraclejre8" {
extraDescription = ''
::: {.note }
Atlassian only supports the Oracle JRE (JRASERVER-46152).
:::
'';
};
};
};
config = mkIf cfg.enable {
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
assertions = [
{ assertion = cfg.sso.enable -> ((cfg.sso.applicationPassword == null) != (cfg.sso.applicationPasswordFile));
message = "Please set either applicationPassword or applicationPasswordFile";
}
];
warnings = mkIf (cfg.sso.enable && cfg.sso.applicationPassword != null) [
"Using `services.confluence.sso.applicationPassword` is deprecated! Use `applicationPasswordFile` instead!"
];
users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} - - -"
"d /run/confluence - - - - -"
"L+ /run/confluence/home - - - - ${cfg.home}"
"L+ /run/confluence/logs - - - - ${cfg.home}/logs"
"L+ /run/confluence/temp - - - - ${cfg.home}/temp"
"L+ /run/confluence/work - - - - ${cfg.home}/work"
"L+ /run/confluence/server.xml - - - - ${cfg.home}/server.xml"
];
systemd.services.confluence = {
description = "Atlassian Confluence";
wantedBy = [ "multi-user.target" ];
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
path = [ cfg.jrePackage pkgs.bash ];
environment = {
CONF_USER = cfg.user;
JAVA_HOME = "${cfg.jrePackage}";
CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions;
JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties";
};
preStart = ''
mkdir -p ${cfg.home}/{logs,work,temp,deploy}
sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
'' + (lib.optionalString cfg.proxy.enable ''
-e 's,protocol="org.apache.coyote.http11.Http11NioProtocol",protocol="org.apache.coyote.http11.Http11NioProtocol" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}",' \
'') + ''
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
${optionalString cfg.sso.enable ''
install -m660 ${crowdProperties} ${cfg.home}/crowd.properties
${optionalString (cfg.sso.applicationPasswordFile != null) ''
${pkgs.replace-secret}/bin/replace-secret \
'@NIXOS_CONFLUENCE_CROWD_SSO_PWD@' \
${cfg.sso.applicationPasswordFile} \
${cfg.home}/crowd.properties
''}
''}
'';
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
Restart = "on-failure";
RestartSec = "10";
ExecStart = "${pkg}/bin/start-confluence.sh -fg";
ExecStop = "${pkg}/bin/stop-confluence.sh";
};
};
};
}
nixos/modules/services/web-apps/atlassian/crowd.nix
-193
View File
@@ -1,193 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.crowd;
pkg = cfg.package.override {
home = cfg.home;
port = cfg.listenPort;
openidPassword = cfg.openidPassword;
} // (optionalAttrs cfg.proxy.enable {
proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
});
crowdPropertiesFile = pkgs.writeText "crowd.properties" ''
application.name crowd-openid-server
application.password @NIXOS_CROWD_OPENID_PW@
application.base.url http://localhost:${toString cfg.listenPort}/openidserver
application.login.url http://localhost:${toString cfg.listenPort}/openidserver
application.login.url.template http://localhost:${toString cfg.listenPort}/openidserver?returnToUrl=''${RETURN_TO_URL}
crowd.server.url http://localhost:${toString cfg.listenPort}/crowd/services/
session.isauthenticated session.isauthenticated
session.tokenkey session.tokenkey
session.validationinterval 0
session.lastvalidation session.lastvalidation
'';
in
{
options = {
services.crowd = {
enable = mkEnableOption "Atlassian Crowd service";
user = mkOption {
type = types.str;
default = "crowd";
description = "User which runs Crowd.";
};
group = mkOption {
type = types.str;
default = "crowd";
description = "Group which runs Crowd.";
};
home = mkOption {
type = types.str;
default = "/var/lib/crowd";
description = "Home directory of the Crowd instance.";
};
listenAddress = mkOption {
type = types.str;
default = "127.0.0.1";
description = "Address to listen on.";
};
listenPort = mkOption {
type = types.port;
default = 8092;
description = "Port to listen on.";
};
openidPassword = mkOption {
type = types.str;
default = "WILL_NEVER_BE_SET";
description = "Application password for OpenID server.";
};
openidPasswordFile = mkOption {
type = types.nullOr types.str;
default = null;
description = "Path to the file containing the application password for OpenID server.";
};
catalinaOptions = mkOption {
type = types.listOf types.str;
default = [];
example = [ "-Xms1024m" "-Xmx2048m" ];
description = "Java options to pass to catalina/tomcat.";
};
proxy = {
enable = mkEnableOption "reverse proxy support";
name = mkOption {
type = types.str;
example = "crowd.example.com";
description = "Virtual hostname at the proxy";
};
port = mkOption {
type = types.port;
default = 443;
example = 80;
description = "Port used at the proxy";
};
scheme = mkOption {
type = types.str;
default = "https";
example = "http";
description = "Protocol used at the proxy.";
};
secure = mkOption {
type = types.bool;
default = true;
description = "Whether the connections to the proxy should be considered secure.";
};
};
package = mkPackageOption pkgs "atlassian-crowd" { };
jrePackage = mkPackageOption pkgs "oraclejre8" {
extraDescription = ''
::: {.note }
Atlassian only supports the Oracle JRE (JRASERVER-46152).
:::
'';
};
};
};
config = mkIf cfg.enable {
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} ${cfg.group} - -"
"d /run/atlassian-crowd - - - - -"
"L+ /run/atlassian-crowd/database - - - - ${cfg.home}/database"
"L+ /run/atlassian-crowd/logs - - - - ${cfg.home}/logs"
"L+ /run/atlassian-crowd/work - - - - ${cfg.home}/work"
"L+ /run/atlassian-crowd/server.xml - - - - ${cfg.home}/server.xml"
];
systemd.services.atlassian-crowd = {
description = "Atlassian Crowd";
wantedBy = [ "multi-user.target" ];
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
path = [ cfg.jrePackage ];
environment = {
JAVA_HOME = "${cfg.jrePackage}";
CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions;
CATALINA_TMPDIR = "/tmp";
JAVA_OPTS = mkIf (cfg.openidPasswordFile != null) "-Dcrowd.properties=${cfg.home}/crowd.properties";
};
preStart = ''
rm -rf ${cfg.home}/work
mkdir -p ${cfg.home}/{logs,database,work}
sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
'' + (lib.optionalString cfg.proxy.enable ''
-e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \
'') + ''
${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
${optionalString (cfg.openidPasswordFile != null) ''
install -m660 ${crowdPropertiesFile} ${cfg.home}/crowd.properties
${pkgs.replace-secret}/bin/replace-secret \
'@NIXOS_CROWD_OPENID_PW@' \
${cfg.openidPasswordFile} \
${cfg.home}/crowd.properties
''}
'';
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
Restart = "on-failure";
RestartSec = "10";
ExecStart = "${pkg}/start_crowd.sh -fg";
};
};
};
}
nixos/modules/services/web-apps/atlassian/jira.nix
-219
View File
@@ -1,219 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.jira;
pkg = cfg.package.override (optionalAttrs cfg.sso.enable {
enableSSO = cfg.sso.enable;
});
crowdProperties = pkgs.writeText "crowd.properties" ''
application.name ${cfg.sso.applicationName}
application.password @NIXOS_JIRA_CROWD_SSO_PWD@
application.login.url ${cfg.sso.crowd}/console/
crowd.server.url ${cfg.sso.crowd}/services/
crowd.base.url ${cfg.sso.crowd}/
session.isauthenticated session.isauthenticated
session.tokenkey session.tokenkey
session.validationinterval ${toString cfg.sso.validationInterval}
session.lastvalidation session.lastvalidation
'';
in
{
options = {
services.jira = {
enable = mkEnableOption "Atlassian JIRA service";
user = mkOption {
type = types.str;
default = "jira";
description = "User which runs JIRA.";
};
group = mkOption {
type = types.str;
default = "jira";
description = "Group which runs JIRA.";
};
home = mkOption {
type = types.str;
default = "/var/lib/jira";
description = "Home directory of the JIRA instance.";
};
listenAddress = mkOption {
type = types.str;
default = "127.0.0.1";
description = "Address to listen on.";
};
listenPort = mkOption {
type = types.port;
default = 8091;
description = "Port to listen on.";
};
catalinaOptions = mkOption {
type = types.listOf types.str;
default = [];
example = [ "-Xms1024m" "-Xmx2048m" ];
description = "Java options to pass to catalina/tomcat.";
};
proxy = {
enable = mkEnableOption "reverse proxy support";
name = mkOption {
type = types.str;
example = "jira.example.com";
description = "Virtual hostname at the proxy";
};
port = mkOption {
type = types.port;
default = 443;
example = 80;
description = "Port used at the proxy";
};
scheme = mkOption {
type = types.str;
default = "https";
example = "http";
description = "Protocol used at the proxy.";
};
secure = mkOption {
type = types.bool;
default = true;
description = "Whether the connections to the proxy should be considered secure.";
};
};
sso = {
enable = mkEnableOption "SSO with Atlassian Crowd";
crowd = mkOption {
type = types.str;
example = "http://localhost:8095/crowd";
description = "Crowd Base URL without trailing slash";
};
applicationName = mkOption {
type = types.str;
example = "jira";
description = "Exact name of this JIRA instance in Crowd";
};
applicationPasswordFile = mkOption {
type = types.str;
description = "Path to the file containing the application password of this JIRA instance in Crowd";
};
validationInterval = mkOption {
type = types.int;
default = 2;
example = 0;
description = ''
Set to 0, if you want authentication checks to occur on each
request. Otherwise set to the number of minutes between request
to validate if the user is logged in or out of the Crowd SSO
server. Setting this value to 1 or higher will increase the
performance of Crowd's integration.
'';
};
};
package = mkPackageOption pkgs "atlassian-jira" { };
jrePackage = mkPackageOption pkgs "oraclejre8" {
extraDescription = ''
::: {.note }
Atlassian only supports the Oracle JRE (JRASERVER-46152).
:::
'';
};
};
};
config = mkIf cfg.enable {
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
home = cfg.home;
};
users.groups.${cfg.group} = {};
systemd.tmpfiles.rules = [
"d '${cfg.home}' - ${cfg.user} - - -"
"d /run/atlassian-jira - - - - -"
"L+ /run/atlassian-jira/home - - - - ${cfg.home}"
"L+ /run/atlassian-jira/logs - - - - ${cfg.home}/logs"
"L+ /run/atlassian-jira/work - - - - ${cfg.home}/work"
"L+ /run/atlassian-jira/temp - - - - ${cfg.home}/temp"
"L+ /run/atlassian-jira/server.xml - - - - ${cfg.home}/server.xml"
];
systemd.services.atlassian-jira = {
description = "Atlassian JIRA";
wantedBy = [ "multi-user.target" ];
requires = [ "postgresql.service" ];
after = [ "postgresql.service" ];
path = [ cfg.jrePackage pkgs.bash ];
environment = {
JIRA_USER = cfg.user;
JIRA_HOME = cfg.home;
JAVA_HOME = "${cfg.jrePackage}";
CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions;
JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties";
};
preStart = ''
mkdir -p ${cfg.home}/{logs,work,temp,deploy}
sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
'' + (lib.optionalString cfg.proxy.enable ''
-e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \
'') + ''
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
${optionalString cfg.sso.enable ''
install -m660 ${crowdProperties} ${cfg.home}/crowd.properties
${pkgs.replace-secret}/bin/replace-secret \
'@NIXOS_JIRA_CROWD_SSO_PWD@' \
${cfg.sso.applicationPasswordFile} \
${cfg.home}/crowd.properties
''}
'';
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
Restart = "on-failure";
RestartSec = "10";
ExecStart = "${pkg}/bin/start-jira.sh -fg";
ExecStop = "${pkg}/bin/stop-jira.sh";
};
};
};
imports = [
(mkRemovedOptionModule [ "services" "jira" "sso" "applicationPassword" ] ''
Use `applicationPasswordFile` instead!
'')
];
}
pkgs/applications/audio/mympd/default.nix
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
version = "18.0.0";
version = "18.1.2";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-h88wqKwkxY/5uOU0SQp8vb4ri3Ndi3ezHPTDFJGVE2Q=";
sha256 = "sha256-4BGW7jDeqwhbAi1LODeiFrmBIzv0qAMKT3IVRgYn87E=";
};
nativeBuildInputs = [
pkgs/applications/networking/browsers/chromium/upstream-info.nix
+10 -10
View File
@@ -1,11 +1,11 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-SZfl93TcaD9j59zGflPFmHgIP5NaS8bgDi3l3SRRFiI=";
hash_darwin = "sha256-4uE34f99fTiG5FJq0xnEodqQvNT2Aa8kesYOxY44xXA=";
hash_darwin_aarch64 =
"sha256-wLX63aA8l+23ehdBHPcXtoZ2WEhrmYVKzqUDBbrhSRw=";
hash_linux = "sha256-kP6N7fM+7+S3JwT2JvqfWDRCfAQiNc/rQlHxjJ8DNuo=";
version = "130.0.6723.69";
"sha256-gDrfR5EgBx3YRxf3/08gayOhmEqSw4G/QcuNtfHmRHk=";
hash_linux = "sha256-qMlM6ilsIqm8G5KLE4uGVb/s2bNyZSyQmxsq+EHKX/c=";
version = "130.0.6723.91";
};
deps = {
gn = {
@@ -15,8 +15,8 @@
version = "2024-09-09";
};
};
hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8=";
version = "130.0.6723.69";
hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M=";
version = "130.0.6723.91";
};
ungoogled-chromium = {
deps = {
@@ -27,11 +27,11 @@
version = "2024-09-09";
};
ungoogled-patches = {
hash = "sha256-usNlX/ol8Zn3lQTvp311DuyYbSHF/HN0r7k8qeUIJmU=";
rev = "130.0.6723.69-1";
hash = "sha256-LhCrwOwPmEn5xlBLTgp2NMfQLxYbSg0pdZxshoqQAGw=";
rev = "130.0.6723.91-1";
};
};
hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8=";
version = "130.0.6723.69";
hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M=";
version = "130.0.6723.91";
};
}
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
+29 -156
View File
@@ -1,49 +1,34 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, callPackage
, pkg-config
, cmake
, ninja
, clang
, lld
, python3
, wrapQtAppsHook
, removeReferencesTo
, qtbase
, qtimageformats
, qtsvg
, qtwayland
, kcoreaddons
, lz4
, xxHash
, ffmpeg
, openalSoft
, minizip
, libopus
, alsa-lib
, libpulseaudio
, range-v3
, tl-expected
, hunspell
, gobject-introspection
, jemalloc
, rnnoise
, microsoft-gsl
, boost
, libicns
, darwin
, libsForQt5
, yasm
}:
let
tg_owt = callPackage ./tg_owt.nix {
(libsForQt5.callPackage ../telegram-desktop/default.nix {
inherit stdenv;
tg_owt = (callPackage ../telegram-desktop/tg_owt.nix {
# tg_owt should use the same compiler
inherit stdenv;
};
}).overrideAttrs(oldAttrs: {
version = "0-unstable-2024-06-15";
mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram";
in
stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b";
hash = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY=";
fetchSubmodules = true;
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ];
});
withWebKitGTK = false;
}).overrideAttrs {
pname = "kotatogram-desktop";
version = "1.4.9-unstable-2024-09-27";
@@ -59,128 +44,15 @@ stdenv.mkDerivation rec {
./macos.patch
./macos-opengl.patch
./macos-qt5.patch
(fetchpatch {
url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch";
stripLen = 1;
extraPrefix = "cmake/external/glib/cppgir/";
hash = "sha256-8B4h3BTG8dIlt3+uVgBI569E9eCebcor9uohtsrZpnI=";
})
];
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
--replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \
--replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
--replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \
--replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
'';
# Wrapping the inside of the app bundles, avoiding double-wrapping
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
nativeBuildInputs = [
pkg-config
cmake
ninja
python3
wrapQtAppsHook
removeReferencesTo
] ++ lib.optionals stdenv.hostPlatform.isLinux [
# to build bundled libdispatch
clang
gobject-introspection
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
lld
];
buildInputs = [
qtbase
qtimageformats
qtsvg
lz4
xxHash
ffmpeg
openalSoft
minizip
libopus
range-v3
tl-expected
rnnoise
tg_owt
microsoft-gsl
boost
] ++ lib.optionals stdenv.hostPlatform.isLinux [
qtwayland
kcoreaddons
alsa-lib
libpulseaudio
hunspell
jemalloc
] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
Cocoa
CoreFoundation
CoreServices
CoreText
CoreGraphics
CoreMedia
OpenGL
AudioUnit
ApplicationServices
Foundation
AGL
Security
SystemConfiguration
Carbon
AudioToolbox
VideoToolbox
VideoDecodeAcceleration
AVFoundation
CoreAudio
CoreVideo
CoreMediaIO
QuartzCore
AppKit
CoreWLAN
WebKit
IOKit
GSS
MediaPlayer
IOSurface
Metal
NaturalLanguage
libicns
]);
enableParallelBuilding = true;
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_CFLAGS_LINK = "-fuse-ld=lld";
};
cmakeFlags = [
"-DTDESKTOP_API_TEST=ON"
];
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
cp -r ${mainProgram}.app $out/Applications
ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}
'';
preFixup = ''
remove-references-to -t ${stdenv.cc.cc} $out/bin/${mainProgram}
remove-references-to -t ${microsoft-gsl} $out/bin/${mainProgram}
remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram}
'';
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram}
'';
passthru = {
inherit tg_owt;
};
meta = with lib; {
inherit mainProgram;
description = "Kotatogram – experimental Telegram Desktop fork";
longDescription = ''
Unofficial desktop client for the Telegram messenger, based on Telegram Desktop.
@@ -192,5 +64,6 @@ stdenv.mkDerivation rec {
homepage = "https://kotatogram.github.io";
changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}";
maintainers = with maintainers; [ ilya-fedin ];
mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram";
};
}
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix
-115
View File
@@ -1,115 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch2
, pkg-config
, cmake
, ninja
, yasm
, libjpeg
, openssl
, libopus
, ffmpeg
, protobuf
, openh264
, crc32c
, libvpx
, libX11
, libXtst
, libXcomposite
, libXdamage
, libXext
, libXrender
, libXrandr
, libXi
, glib
, abseil-cpp
, pipewire
, mesa
, libdrm
, libGL
, darwin
}:
stdenv.mkDerivation {
pname = "tg_owt";
version = "0-unstable-2024-06-15";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b";
sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY=";
fetchSubmodules = true;
};
patches = [
# Remove usage of AVCodecContext::reordered_opaque
(fetchpatch2 {
name = "webrtc-ffmpeg-7.patch";
url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT";
decode = "base64 -d";
stripLen = 1;
extraPrefix = "src/";
hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU=";
})
];
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
--replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \
--replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \
--replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \
--replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"'
'';
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
propagatedBuildInputs = [
libjpeg
openssl
libopus
ffmpeg
protobuf
openh264
crc32c
libvpx
abseil-cpp
] ++ lib.optionals stdenv.hostPlatform.isLinux [
libX11
libXtst
libXcomposite
libXdamage
libXext
libXrender
libXrandr
libXi
glib
pipewire
mesa
libdrm
libGL
] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
Cocoa
AppKit
IOKit
IOSurface
Foundation
AVFoundation
CoreMedia
VideoToolbox
CoreGraphics
CoreVideo
OpenGL
Metal
MetalKit
CoreFoundation
ApplicationServices
]);
enableParallelBuilding = true;
meta.license = lib.licenses.bsd3;
}
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_6_0, makeWrapper }:
{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_4_1, makeWrapper }:
stdenv.mkDerivation {
pname = "${kotatogram-desktop.pname}-with-webkit";
@@ -8,12 +8,13 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out
cp -r ${kotatogram-desktop}/share $out
substituteInPlace $out/share/dbus-1/services/* --replace-fail ${kotatogram-desktop} $out
'';
postFixup = ''
mkdir -p $out/bin
makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \
--prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_6_0 ]}
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_4_1 ]}
'';
meta = kotatogram-desktop.meta // {
platforms = lib.platforms.linux;
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+36 -61
View File
@@ -1,48 +1,44 @@
{ lib
, stdenv
, fetchFromGitHub
, callPackage
, pkg-config
, cmake
, ninja
, clang
, lld
, python3
, gobject-introspection
, wrapGAppsHook3
, wrapQtAppsHook
, extra-cmake-modules
, tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; }
, qtbase
, qtwayland
, qtsvg
, qtimageformats
, gtk3
, glib-networking
, boost
, fmt
, libdbusmenu
, qtsvg
, qtwayland
, kcoreaddons
, lz4
, xxHash
, ffmpeg
, protobuf
, openalSoft
, minizip
, libopus
, alsa-lib
, libpulseaudio
, pipewire
, range-v3
, tl-expected
, hunspell
, webkitgtk_6_0
, gobject-introspection
, jemalloc
, rnnoise
, protobuf
, abseil-cpp
, xdg-utils
, microsoft-gsl
, rlottie
, boost
, ada
, stdenv
, darwin
, lld
, withWebKitGTK ? true
, wrapGAppsHook3
, glib-networking
, webkitgtk_4_1
, libicns
, darwin
, nix-update-script
}:
@@ -53,14 +49,6 @@
# - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD
# - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template
let
tg_owt = callPackage ./tg_owt.nix {
inherit stdenv;
abseil-cpp = abseil-cpp.override {
cxxStandard = "20";
};
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "telegram-desktop";
version = "5.6.3";
@@ -75,10 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./macos.patch
# the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling
# and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary
# see https://github.com/NixOS/nixpkgs/issues/218370
./scheme.patch
];
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -88,16 +72,19 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
--replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
'' + lib.optionalString (stdenv.hostPlatform.isLinux && withWebKitGTK) ''
substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \
--replace-fail '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"'
--replace-fail '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"'
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \
--replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
'';
# We want to run wrapProgram manually (with additional parameters)
# Avoid double-wrapping
dontWrapGApps = true;
dontWrapQtApps = true;
# Wrapping the inside of the app bundles, avoiding double-wrapping
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
nativeBuildInputs = [
pkg-config
@@ -106,18 +93,19 @@ stdenv.mkDerivation (finalAttrs: {
python3
wrapQtAppsHook
] ++ lib.optionals stdenv.hostPlatform.isLinux [
# to build bundled libdispatch
clang
gobject-introspection
] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [
wrapGAppsHook3
extra-cmake-modules
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
lld
];
buildInputs = [
qtbase
qtsvg
qtimageformats
boost
qtsvg
lz4
xxHash
ffmpeg
@@ -127,23 +115,21 @@ stdenv.mkDerivation (finalAttrs: {
range-v3
tl-expected
rnnoise
protobuf
tg_owt
microsoft-gsl
rlottie
boost
ada
] ++ lib.optionals stdenv.hostPlatform.isLinux [
protobuf
qtwayland
gtk3
glib-networking
fmt
libdbusmenu
kcoreaddons
alsa-lib
libpulseaudio
pipewire
hunspell
webkitgtk_6_0
jemalloc
] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [
glib-networking
webkitgtk_4_1
] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
Cocoa
CoreFoundation
@@ -185,33 +171,22 @@ stdenv.mkDerivation (finalAttrs: {
};
cmakeFlags = [
(lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true)
# We're allowed to used the API ID of the Snap package:
(lib.cmakeFeature "TDESKTOP_API_ID" "611335")
(lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c")
# See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
(lib.cmakeBool "DESKTOP_APP_USE_PACKAGED_FONTS" false)
];
preBuild = ''
# for cppgir to locate gir files
export GI_GIR_PATH="$XDG_DATA_DIRS"
'';
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications
ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin}
'';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
# This is necessary to run Telegram in a pure environment.
# We also use gappsWrapperArgs from wrapGAppsHook.
wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \
"''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
preFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withWebKitGTK) ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram}
'';
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch
-12
View File
@@ -1,12 +0,0 @@
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index e3e0de6c6..d5851bd6e 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -421,7 +421,6 @@ void Application::run() {
void Application::autoRegisterUrlScheme() {
if (!OptionSkipUrlSchemeRegister.value()) {
- InvokeQueued(this, [] { RegisterUrlScheme(); });
}
}
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+29 -24
View File
@@ -5,29 +5,31 @@
fetchpatch2,
pkg-config,
cmake,
crc32c,
ninja,
python3,
libjpeg,
openssl,
libopus,
ffmpeg,
openh264,
crc32c,
libvpx,
libXi,
libXfixes,
libX11,
libXtst,
libXcomposite,
libXdamage,
libXext,
libXrender,
libXrandr,
libXi,
glib,
abseil-cpp,
pipewire,
mesa,
libdrm,
libGL,
unstableGitUpdater,
darwin,
unstableGitUpdater,
}:
stdenv.mkDerivation {
@@ -38,7 +40,7 @@ stdenv.mkDerivation {
owner = "desktop-app";
repo = "tg_owt";
rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8";
sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o=";
hash = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o=";
fetchSubmodules = true;
};
@@ -54,36 +56,50 @@ stdenv.mkDerivation {
})
];
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
--replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \
--replace-fail '"libGL.so.1"' '"${lib.getLib libGL}/lib/libGL.so.1"' \
--replace-fail '"libgbm.so.1"' '"${lib.getLib mesa}/lib/libgbm.so.1"' \
--replace-fail '"libdrm.so.2"' '"${lib.getLib libdrm}/lib/libdrm.so.2"'
'';
outputs = [
"out"
"dev"
];
nativeBuildInputs = [
cmake
pkg-config
cmake
ninja
python3
];
buildInputs =
propagatedBuildInputs =
[
openssl
libjpeg
openssl
libopus
ffmpeg
openh264
crc32c
libvpx
abseil-cpp
]
++ lib.optionals stdenv.hostPlatform.isLinux [
glib
libXi
libX11
libXtst
libXcomposite
libXdamage
libXext
libXfixes
libXrender
libXrandr
libXtst
libXi
glib
pipewire
mesa
libdrm
libGL
]
++ lib.optionals stdenv.hostPlatform.isDarwin (
@@ -99,6 +115,7 @@ stdenv.mkDerivation {
VideoToolbox
CoreGraphics
CoreVideo
OpenGL
Metal
MetalKit
CoreFoundation
@@ -106,18 +123,6 @@ stdenv.mkDerivation {
]
);
propagatedBuildInputs = [
abseil-cpp
crc32c
openh264
libvpx
];
cmakeFlags = [
# Building as a shared library isn't officially supported and may break at any time.
(lib.cmakeBool "BUILD_SHARED_LIBS" false)
];
passthru.updateScript = unstableGitUpdater { };
meta = {
pkgs/applications/office/docear/default.nix
-45
View File
@@ -1,45 +0,0 @@
{lib, stdenv, fetchurl, runtimeShell, makeWrapper
, oraclejre
, antialiasFont ? true
}:
stdenv.mkDerivation {
pname = "docear";
version = "1.2";
src = fetchurl {
url = "http://docear.org/downloads/docear_linux.tar.gz";
sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ oraclejre ];
buildPhase = "";
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share
cp -R * $out/share
chmod 0755 $out/share/ -R
# The wrapper ensures oraclejre is used
makeWrapper ${runtimeShell} $out/bin/docear \
--set _JAVA_OPTIONS "${lib.optionalString antialiasFont "-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on"}" \
--set JAVA_HOME ${oraclejre.home} \
--add-flags "$out/share/docear.sh"
chmod 0755 $out/bin/docear
'';
meta = with lib; {
description = "Unique solution to academic literature management";
homepage = "http://www.docear.org/";
# Licenses at: http://www.docear.org/software/download/
license = with licenses; [
gpl2 # for the main software and some dependencies
bsd3 # for one of its dependencies
];
maintainers = with maintainers; [ unode ];
platforms = platforms.all;
};
}
pkgs/applications/science/math/clp/default.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }:
stdenv.mkDerivation rec {
version = "1.17.9";
version = "1.17.10";
pname = "clp";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Clp";
rev = "releases/${version}";
hash = "sha256-kHCDji+yIf5mCoxKB2b/HaATGmwwIAPEV74tthIMeMY=";
hash = "sha256-9IlBT6o1aHAaYw2/39XrUis72P9fesmG3B6i/e+v3mM=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/applications/video/go-chromecast/default.nix
-25
View File
@@ -1,25 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "go-chromecast";
version = "0.3.1";
src = fetchFromGitHub {
owner = "vishen";
repo = pname;
rev = "v${version}";
hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI=";
};
vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og=";
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ];
meta = with lib; {
homepage = "https://github.com/vishen/go-chromecast";
description = "CLI for Google Chromecast, Home devices and Cast Groups";
license = licenses.asl20;
maintainers = [ ];
mainProgram = "go-chromecast";
};
}
pkgs/applications/video/mlv-app/aarch64-flags.patch
+4 -4
View File
@@ -2,12 +2,12 @@ diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro
index ebdc552..3e37573 100644
--- a/platform/qt/MLVApp.pro
+++ b/platform/qt/MLVApp.pro
@@ -84,7 +84,7 @@ win32{
@@ -120,7 +120,7 @@ win32{
# Linux
linux-g++*{
- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99
+ QMAKE_CFLAGS += -O3 -fopenmp -std=c99
QMAKE_CXXFLAGS += -fopenmp
- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize
+ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize
QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize
LIBS += -lgomp
}
pkgs/applications/video/mlv-app/default.nix
+4 -1
View File
@@ -18,7 +18,10 @@ mkDerivation rec {
sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU=";
};
patches = if stdenv.hostPlatform.isAarch64 then ./aarch64-flags.patch else null;
patches = lib.optionals stdenv.hostPlatform.isAarch64 [
# remove optimization flags with x86 only instruction sets
./aarch64-flags.patch
];
installPhase = ''
runHook preInstall
pkgs/applications/virtualization/distrobox/default.nix
+7 -5
View File
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "distrobox";
version = "1.7.2.1";
version = "1.8.0";
src = fetchFromGitHub {
owner = "89luca89";
repo = "distrobox";
rev = finalAttrs.version;
hash = "sha256-H2jeKs0h4ZAcP33HB5jptlubq62cwnjPK2wSlEIfFWA=";
hash = "sha256-e9oSTk+UlkrkRSipqjjMqwtxEvEZffVBmlSTmsIT7cU=";
};
dontConfigure = true;
@@ -16,12 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
nativeBuildInputs = [ makeWrapper ];
patches = [
# https://github.com/89luca89/distrobox/issues/408
./relative-default-icon.patch
];
installPhase = ''
runHook preInstall
# https://github.com/89luca89/distrobox/issues/408
substituteInPlace ./distrobox-generate-entry \
--replace-fail 'icon_default="''${HOME}/.local' "icon_default=\"$out"
./install -P $out
runHook postInstall
pkgs/applications/virtualization/distrobox/relative-default-icon.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/distrobox-generate-entry b/distrobox-generate-entry
index 65fcea0..8d57e4e 100755
--- a/distrobox-generate-entry
+++ b/distrobox-generate-entry
@@ -51,7 +51,7 @@ container_manager="autodetect"
container_name_default="my-distrobox"
delete=0
icon="auto"
-icon_default="${XDG_DATA_HOME:-${HOME}/.local/share}/icons/terminal-distrobox-icon.svg"
+icon_default="terminal-distrobox-icon"
verbose=0
online=0
version="1.8.0"
@@ -335,12 +335,6 @@ if [ "${icon}" = "auto" ]; then
icon_url="$(echo "${DISTRO_ICON_MAP}" | grep "${container_distro}:" | cut -d':' -f2-)"
- # Distro not found in our map, fallback to generic icon
- if [ -z "${icon_url}" ]; then
- icon_url="https://raw.githubusercontent.com/89luca89/distrobox/main/icons/terminal-distrobox-icon.svg"
- container_distro="terminal-distrobox-icon"
- fi
-
if [ -n "${icon_url}" ] && [ "${download}" != "null" ]; then
icon_extension="${icon_url##*.}"
pkgs/build-support/trivial-builders/default.nix
+12 -3
View File
@@ -82,6 +82,7 @@ rec {
, destination ? ""
, checkPhase ? ""
, meta ? { }
, passthru ? { }
, allowSubstitutes ? false
, preferLocalBuild ? true
, derivationArgs ? { }
@@ -105,7 +106,8 @@ rec {
{
mainProgram = lib.head matches;
} // meta // derivationArgs.meta or {};
} // removeAttrs derivationArgs [ "passAsFile" "meta" ])
passthru = passthru // derivationArgs.passthru or {};
} // removeAttrs derivationArgs [ "passAsFile" "meta" "passthru" ])
''
target=$out${lib.escapeShellArg destination}
mkdir -p "$(dirname "$target")"
@@ -220,6 +222,12 @@ rec {
Type: AttrSet
*/
meta ? { },
/*
`stdenv.mkDerivation`'s `passthru` argument.
Type: AttrSet
*/
passthru ? { },
/*
The `checkPhase` to run. Defaults to `shellcheck` on supported
platforms and `bash -n`.
@@ -263,7 +271,7 @@ rec {
derivationArgs ? { },
}:
writeTextFile {
inherit name meta derivationArgs;
inherit name meta passthru derivationArgs;
executable = true;
destination = "/bin/${name}";
allowSubstitutes = true;
@@ -366,9 +374,10 @@ rec {
, destination ? "" # relative path appended to $out eg "/bin/foo"
, checkPhase ? "" # syntax checks, e.g. for scripts
, meta ? { }
, passthru ? { }
}:
runCommandLocal name
{ inherit files executable checkPhase meta destination; }
{ inherit files executable checkPhase meta passthru destination; }
''
file=$out$destination
mkdir -p "$(dirname "$file")"
pkgs/by-name/_6/_64gram/package.nix
+1
View File
@@ -28,6 +28,7 @@ telegram-desktop.overrideAttrs (old: rec {
];
cmakeFlags = (old.cmakeFlags or []) ++ [
(lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true)
(lib.cmakeBool "disable_autoupdate" true)
];
pkgs/by-name/cl/clever-tools/package.nix
+22 -16
View File
@@ -4,13 +4,14 @@
fetchFromGitHub,
nodejs_18,
installShellFiles,
makeWrapper,
stdenv,
}:
buildNpmPackage rec {
pname = "clever-tools";
version = "3.8.3";
version = "3.9.0";
nodejs = nodejs_18;
@@ -18,27 +19,32 @@ buildNpmPackage rec {
owner = "CleverCloud";
repo = "clever-tools";
rev = version;
hash = "sha256-70wyu8+Jb9kR5lIucBZG9UWIufMhsgMBMkT2ohGvE50=";
hash = "sha256-nSTcJIZO/CMliAYFUGu/oA+VdtONDPwyj6vCr5Ry6ac=";
};
npmDepsHash = "sha256-LljwS6Rd/8WnGpxSHwCr87KWLaRR2i7sMdUuuprYiOE=";
npmDepsHash = "sha256-+3/zSsO5+s1MUome3CQ1p1tN3OtWp+XE9Z6GSdDiRh8=";
dontNpmBuild = true;
nativeBuildInputs = [
installShellFiles
makeWrapper
];
nativeBuildInputs = [ installShellFiles ];
installPhase = ''
mkdir -p $out/bin $out/lib/clever-tools
cp build/clever.cjs $out/lib/clever-tools/clever.cjs
makeWrapperArgs = [ "--set NO_UPDATE_NOTIFIER true" ];
makeWrapper ${nodejs}/bin/node $out/bin/clever \
--add-flags "$out/lib/clever-tools/clever.cjs" \
--set NO_UPDATE_NOTIFIER true
postInstall =
lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd clever \
--bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \
--zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever)
''
+ ''
rm $out/bin/install-clever-completion
rm $out/bin/uninstall-clever-completion
'';
runHook postInstall
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd clever \
--bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \
--zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever)
'';
meta = with lib; {
homepage = "https://github.com/CleverCloud/clever-tools";
pkgs/by-name/ea/earlyoom/package.nix
+1 -1
View File
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.mit;
mainProgram = "earlyoom";
maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/ge/geoserver/extensions.nix
+102 -102
View File
@@ -29,325 +29,325 @@ in
{
app-schema = mkGeoserverExtension {
name = "app-schema";
version = "2.25.3"; # app-schema
hash = "sha256-IvcJAu62wXAh5OQkG3cTUB/X7dc/2q6Le7GSwfJL/sA="; # app-schema
version = "2.26.0"; # app-schema
hash = "sha256-HOjhM9WI7lsqUNrozLB2oI6szqm+Cb7VqC0Hy9NlNMU="; # app-schema
};
authkey = mkGeoserverExtension {
name = "authkey";
version = "2.25.3"; # authkey
hash = "sha256-4tEu9JOomMN/ntDHLqEwrn9lPrJ4LjTM/VuMsjARbF0="; # authkey
version = "2.26.0"; # authkey
hash = "sha256-34U3zq/SKm21fZV80+04N/0ygqShdYVMeQNuqtMSXgQ="; # authkey
};
cas = mkGeoserverExtension {
name = "cas";
version = "2.25.3"; # cas
hash = "sha256-Am8tgF5APKuTa7XI7aI9Oq9jAiDPfJhGCXErtyPpDS8="; # cas
version = "2.26.0"; # cas
hash = "sha256-mosawsZkCKOm03CFg9poJ+XwbbGhvNt8AsxnegW59H4="; # cas
};
charts = mkGeoserverExtension {
name = "charts";
version = "2.25.3"; # charts
hash = "sha256-0Vu9ldBYWe4vFQ6ftEO/WsmNz3Sf3W8iPS7t9W/+5fY="; # charts
version = "2.26.0"; # charts
hash = "sha256-rPnY9zYgdRoud2I2hcxnODDE/2gsBTMgTPrGAwDdrbM="; # charts
};
control-flow = mkGeoserverExtension {
name = "control-flow";
version = "2.25.3"; # control-flow
hash = "sha256-zH+Hz7SySKRdrrmMBukXkaCziszIwOqzSmGYXWZGxs4="; # control-flow
version = "2.26.0"; # control-flow
hash = "sha256-4Kl0SgKW8MifMVY1+Aa9Ve0WufjHFQejobhQfnwGwbw="; # control-flow
};
css = mkGeoserverExtension {
name = "css";
version = "2.25.3"; # css
hash = "sha256-c3VDxTGZebGCPfYhwUyENoGiDmVa1zttJEi/879RPsc="; # css
version = "2.26.0"; # css
hash = "sha256-CUG5cBxW/PyP/M2I5/1wC1UndzWSIg8aKeETtUnrH5A="; # css
};
csw = mkGeoserverExtension {
name = "csw";
version = "2.25.3"; # csw
hash = "sha256-8G7GY5n0bV/xvwUkTijHLnsXBD4MczIastdeGmFcfSc="; # csw
version = "2.26.0"; # csw
hash = "sha256-ABNFf6grpU97nd81H/s8Gfd1G9mxMwVdUduubLWrsRE="; # csw
};
csw-iso = mkGeoserverExtension {
name = "csw-iso";
version = "2.25.3"; # csw-iso
hash = "sha256-cSY981K9QiY3YJJR1zBCQArJESZO+80oIa/uj+qTsTM="; # csw-iso
version = "2.26.0"; # csw-iso
hash = "sha256-dKyVP5FuJ0Tl2z4veMeIJO66dBucfZo6qH+WvSBQ1Es="; # csw-iso
};
db2 = mkGeoserverExtension {
name = "db2";
version = "2.25.3"; # db2
hash = "sha256-0eRiLoPIWv5Bddi9RxRkxAVMSolZCpv1kKEK7FkQrXs="; # db2
version = "2.26.0"; # db2
hash = "sha256-L0Xrc0MuSiezKk7l4P4lm3phRou79neQds4Yu2VG5DY="; # db2
};
# Needs wps extension.
dxf = mkGeoserverExtension {
name = "dxf";
version = "2.25.3"; # dxf
hash = "sha256-0i2F9343IhN6LZMdTj/dSP5k5QXd7Si/8ZWbxmkcdD4="; # dxf
version = "2.26.0"; # dxf
hash = "sha256-OtpYej/MxqeoMBw17Ltr9l5iOGUa91L30hgBz6ZbD+Y="; # dxf
};
excel = mkGeoserverExtension {
name = "excel";
version = "2.25.3"; # excel
hash = "sha256-N7OCXq1HRwV1poPImct7T9ZWdbWWYprSBMarGXx33OI="; # excel
version = "2.26.0"; # excel
hash = "sha256-UHIVJnUJnzPDJWsrQw9YasUedpLujKr9s3VJtSgESHY="; # excel
};
feature-pregeneralized = mkGeoserverExtension {
name = "feature-pregeneralized";
version = "2.25.3"; # feature-pregeneralized
hash = "sha256-R1jv7GPT3f7D18gQoWcLXqhtULtUvA3wEeXC2Q0+eQg="; # feature-pregeneralized
version = "2.26.0"; # feature-pregeneralized
hash = "sha256-WT1TsHcYoxJK0LWsF4h8VdUGxIecx9SuIqWoA9JjZfA="; # feature-pregeneralized
};
# Note: The extension name ("gdal") clashes with pkgs.gdal.
gdal = mkGeoserverExtension {
name = "gdal";
version = "2.25.3"; # gdal
version = "2.26.0"; # gdal
buildInputs = [ pkgs.gdal ];
hash = "sha256-n6B/FHpul29MTYuBsg0XNfTTANBXw/cSEolzIabhHA8="; # gdal
hash = "sha256-lGyBxRCz5DvDQUNQmsk1+DfArwx3kcMoSgQq+O/DqZc="; # gdal
};
# Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box.
#geofence = mkGeoserverExtension {
# name = "geofence";
# version = "2.25.3"; # geofence
# hash = "sha256-298rEz0JmFhXxfv0tpdsDOrFLyS7GcuFwp/tX/m+SyI="; # geofence
# version = "2.26.0"; # geofence
# hash = "sha256-Io71mNpUu15klMWFHCaFfRmxPUGGTASZE7MZWyv2TDQ="; # geofence
#};
#geofence-server = mkGeoserverExtension {
# name = "geofence-server";
# version = "2.25.3"; # geofence-server
# hash = "sha256-PHP6OmulBbUJ1Q7qliYXX6fAA2C8q4h4i7qCXJpVUCQ="; # geofence-server
# version = "2.26.0"; # geofence-server
# hash = "sha256-UPRupgj9La/JWAneGeM+UdCvnkcW3ZTe7c1bYZRURGI="; # geofence-server
#};
#geofence-wps = mkGeoserverExtension {
# name = "geofence-wps";
# version = "2.25.3"; # geofence-wps
# hash = "sha256-vH7gQsjfAEcpcM+JVRfbw5sH4eJz+051FBrmoS7MyYo="; # geofence-wps
# version = "2.26.0"; # geofence-wps
# hash = "sha256-SA7nWTyawzDZVsOATRLW/MQQfyXWhHQif3/4MdVogBM="; # geofence-wps
#};
geopkg-output = mkGeoserverExtension {
name = "geopkg-output";
version = "2.25.3"; # geopkg-output
hash = "sha256-frcNjS+phsyuRo4PlmcSUu2Ylp3kHA8OYm+WCBAU/UI="; # geopkg-output
version = "2.26.0"; # geopkg-output
hash = "sha256-SKIInEC9TI2FBtduGHi3apZip5ubA4/ip58+w0O1a38="; # geopkg-output
};
grib = mkGeoserverExtension {
name = "grib";
version = "2.25.3"; # grib
hash = "sha256-uQ7xe3sokrE89QTfTLynHSHE0W6LmiICO3XKkWKEJBU="; # grib
version = "2.26.0"; # grib
hash = "sha256-5Hn6LUxsCP5YvVsMgh6m/oMBJuIo2Y9XdbSRQAJm+vI="; # grib
buildInputs = [ netcdf ];
};
gwc-s3 = mkGeoserverExtension {
name = "gwc-s3";
version = "2.25.3"; # gwc-s3
hash = "sha256-1cc3JywXaCCQUojnTVYmkq9Gz5Y1atBJmd0GDhyGAIE="; # gwc-s3
version = "2.26.0"; # gwc-s3
hash = "sha256-www+MTFlkmJ6GeGd3v8uGTYV7PYVg5pIS9/2s1D6YeU="; # gwc-s3
};
h2 = mkGeoserverExtension {
name = "h2";
version = "2.25.3"; # h2
hash = "sha256-Cp/3qrjNSKztAaMrxPoZo2YfGBEezLQp6/ZGOehkixM="; # h2
version = "2.26.0"; # h2
hash = "sha256-+Y7pILmnz51c5eO+OdqHGLD05fEqaM3vkFU7s0UiA2g="; # h2
};
iau = mkGeoserverExtension {
name = "iau";
version = "2.25.3"; # iau
hash = "sha256-MV/XYF61rQjuOJSU6n0ADauFYJGF0cZk4lMSoHs9drg="; # iau
version = "2.26.0"; # iau
hash = "sha256-5oM3JxD6HKVhq1/IxXWck1MtQ8KwsLtf+LQACpvdKMA="; # iau
};
importer = mkGeoserverExtension {
name = "importer";
version = "2.25.3"; # importer
hash = "sha256-T6PGv3zfiwA8DE2XZ2CusaQ0vRGZ75mO4nxONsCQU+g="; # importer
version = "2.26.0"; # importer
hash = "sha256-HFBIEB8pgVaCMF34Z0Clp3+nk2h4Va0xV2ptSZUSx9I="; # importer
};
inspire = mkGeoserverExtension {
name = "inspire";
version = "2.25.3"; # inspire
hash = "sha256-A4BBd0Q8NVjPLI6e8HTCg5zd4QOLQ6Ho3/2hnRXCeTM="; # inspire
version = "2.26.0"; # inspire
hash = "sha256-uIryr4WQbWdAMjqATGf0txp1sZWWABSMv8o2xiKaWiI="; # inspire
};
# Needs Kakadu plugin from
# https://github.com/geosolutions-it/imageio-ext
#jp2k = mkGeoserverExtension {
# name = "jp2k";
# version = "2.25.3"; # jp2k
# hash = "sha256-0df5vPLYqxPAxqINwdWZ5RRJQVm/79sUcj8fB4RwMKY="; # jp2k
# version = "2.26.0"; # jp2k
# hash = "sha256-gPipm6hnkIyEU3a8NbSCm5QUSF+IKNHgt5DNFsvC++c="; # jp2k
#};
libjpeg-turbo = mkGeoserverExtension {
name = "libjpeg-turbo";
version = "2.25.3"; # libjpeg-turbo
hash = "sha256-vQjeYuB6JY+bMlxRXZ7HqgS2hEtmEJJvowfwhWmYkY4="; # libjpeg-turbo
version = "2.26.0"; # libjpeg-turbo
hash = "sha256-I1Ojsgd+gRjSJJkx9wSfzJfVq5z3vgxA4zynZvVd4jU="; # libjpeg-turbo
buildInputs = [ libjpeg.out ];
};
mapml = mkGeoserverExtension {
name = "mapml";
version = "2.25.3"; # mapml
hash = "sha256-3BMCWeAFn52Uiob53eer5OqBLOgQaMTmHPFTLs51mEg="; # mapml
version = "2.26.0"; # mapml
hash = "sha256-VGg/3cB+KUwZtbKQUoU4NURDjcANzQpPv4ZWeCzwkq0="; # mapml
};
mbstyle = mkGeoserverExtension {
name = "mbstyle";
version = "2.25.3"; # mbstyle
hash = "sha256-SJAI4ssMZZL75gx1h7gwf+4YwXP/CNEm9BTtA/JNRW4="; # mbstyle
version = "2.26.0"; # mbstyle
hash = "sha256-Z5CNKP2fqMcw6prP/b84tOAPYwlLiFsbV26VdVnqFns="; # mbstyle
};
metadata = mkGeoserverExtension {
name = "metadata";
version = "2.25.3"; # metadata
hash = "sha256-Gst1cctv/oKTS+jD0y8fHFrEBJyn77fEafV+QzspQVc="; # metadata
version = "2.26.0"; # metadata
hash = "sha256-6E9Z6WqCQxlDL3w1FiI+gOzjQ4ZyS5oucj1/02W4k4Y="; # metadata
};
mongodb = mkGeoserverExtension {
name = "mongodb";
version = "2.25.3"; # mongodb
hash = "sha256-LVejtipIRZy3g5GKs8RkOqKHNRskf8YSD11fiFvBF3w="; # mongodb
version = "2.26.0"; # mongodb
hash = "sha256-thfgMeDrDb2rPh9h9R2AgYYWPBHcEG/sI4UhNBb/DfQ="; # mongodb
};
monitor = mkGeoserverExtension {
name = "monitor";
version = "2.25.3"; # monitor
hash = "sha256-+FlKgoESE0j6JXM0yozYMyz6U2TshYNd6WHsKg9frAs="; # monitor
version = "2.26.0"; # monitor
hash = "sha256-vgeqZXzb8nz7daAeur1JMLS0Rospgyx+v9n687000EE="; # monitor
};
mysql = mkGeoserverExtension {
name = "mysql";
version = "2.25.3"; # mysql
hash = "sha256-gfU67lID2YSNbi1aB8m1b+zGqtVnChi56HrtcBE6Aqw="; # mysql
version = "2.26.0"; # mysql
hash = "sha256-PCNCyqJwOK6P6sDWVMdV6gGXgHJOPw97cqkjaixZxwQ="; # mysql
};
netcdf = mkGeoserverExtension {
name = "netcdf";
version = "2.25.3"; # netcdf
hash = "sha256-aMykYIBMwH46apDudKnApNba454Yep5HZeYPqEXoqcI="; # netcdf
version = "2.26.0"; # netcdf
hash = "sha256-0i/zmiIE+xjec6dOd237MdIBrCspZEL+8h1c/g0h7oU="; # netcdf
buildInputs = [ netcdf ];
};
netcdf-out = mkGeoserverExtension {
name = "netcdf-out";
version = "2.25.3"; # netcdf-out
hash = "sha256-3gGzgC7IbwpettwSf4+b8HeJRuvkUfDu0xre9wyVap4="; # netcdf-out
version = "2.26.0"; # netcdf-out
hash = "sha256-xl2mY9QYSVeC2k43H2GFz2D56rajCT9FlpP47Q8aOe8="; # netcdf-out
buildInputs = [ netcdf ];
};
ogr-wfs = mkGeoserverExtension {
name = "ogr-wfs";
version = "2.25.3"; # ogr-wfs
version = "2.26.0"; # ogr-wfs
buildInputs = [ pkgs.gdal ];
hash = "sha256-4rcUvN1py62JMQy51rxvNfV2AQIptXuRen7tvbrno6s="; # ogr-wfs
hash = "sha256-LiB+BE2Q3a2US7HJkBWT0Z9AMZ3A3M584qbEV1uhhEM="; # ogr-wfs
};
# Needs ogr-wfs extension.
ogr-wps = mkGeoserverExtension {
name = "ogr-wps";
version = "2.25.3"; # ogr-wps
version = "2.26.0"; # ogr-wps
# buildInputs = [ pkgs.gdal ];
hash = "sha256-RA1dxzjhOt7lQCu6SVSM8HiXYwtFbUfj0hdk831QE5g="; # ogr-wps
hash = "sha256-0o4cD8wv1Km5pljxAlokVRVEfMbklXgkYhxFZqPdROk="; # ogr-wps
};
oracle = mkGeoserverExtension {
name = "oracle";
version = "2.25.3"; # oracle
hash = "sha256-fKJwLh4T445da1AWPzFpp++LGWiiKhN339VWt1N0s5Q="; # oracle
version = "2.26.0"; # oracle
hash = "sha256-mxc46ctIh7imjQgTI2zZ9gwtgDF6GkE/b5IogUktF9Y="; # oracle
};
params-extractor = mkGeoserverExtension {
name = "params-extractor";
version = "2.25.3"; # params-extractor
hash = "sha256-zO9OwH7NCUILnxRqz1z/QJdfgsx9gfpf2R7rIsgTIr8="; # params-extractor
version = "2.26.0"; # params-extractor
hash = "sha256-dLzEdnNy+Nrxkc4aBCGTESuReW6mkgXEpXDo9rDzsBU="; # params-extractor
};
printing = mkGeoserverExtension {
name = "printing";
version = "2.25.3"; # printing
hash = "sha256-QAy53/p+/mjCTXreKsVSRcpYgfAs7W9f+ZwE4Z6Gnx8="; # printing
version = "2.26.0"; # printing
hash = "sha256-31T/tizxkmzYbxR1eLiY3DanwlFVdeZvFOESgBnuG1A="; # printing
};
pyramid = mkGeoserverExtension {
name = "pyramid";
version = "2.25.3"; # pyramid
hash = "sha256-kFTNQrxibatVZzPSC6Rv/SzU3FUJYQJ3dHZ5AfR3kD8="; # pyramid
version = "2.26.0"; # pyramid
hash = "sha256-lpDexw5nd1jm9cDFsQ/qXdwbX5vTD0RXKIAOg6dKQqE="; # pyramid
};
querylayer = mkGeoserverExtension {
name = "querylayer";
version = "2.25.3"; # querylayer
hash = "sha256-TgQiroYcnVCe5QVIcEa8gsgYELqM2jS7RveGyetWokU="; # querylayer
version = "2.26.0"; # querylayer
hash = "sha256-ajrNJ0eG0pp+v/f4N5kxcUzYOyXuLhMRzvdfdiJh0Vk="; # querylayer
};
sldservice = mkGeoserverExtension {
name = "sldservice";
version = "2.25.3"; # sldservice
hash = "sha256-5E410iNaZVEBKzRGSBcW3JNISap2NrcFtXAuP1+cVt0="; # sldservice
version = "2.26.0"; # sldservice
hash = "sha256-xxpKSDghK+Xz8buPU5lzEa7eiG5A0rPgzCaIO9GKCMY="; # sldservice
};
sqlserver = mkGeoserverExtension {
name = "sqlserver";
version = "2.25.3"; # sqlserver
hash = "sha256-TNeyegWOz/a7uFsn1hBhOgpV0vnFncwQ+U9VqyY62+g="; # sqlserver
version = "2.26.0"; # sqlserver
hash = "sha256-UwZ4ho+HG+ocwri+N4ebTATGcT4tukAxwvx84rP0VWk="; # sqlserver
};
vectortiles = mkGeoserverExtension {
name = "vectortiles";
version = "2.25.3"; # vectortiles
hash = "sha256-RQGeGhfixKrwRuzgmkZ/JDWaPZyDy8fAfGe0iXZfKdY="; # vectortiles
version = "2.26.0"; # vectortiles
hash = "sha256-rlQcWLEPvaKDT6JZ0RuZtaHz1bgtsblFOybKOVqDSVM="; # vectortiles
};
wcs2_0-eo = mkGeoserverExtension {
name = "wcs2_0-eo";
version = "2.25.3"; # wcs2_0-eo
hash = "sha256-+li0zBzyHaq0an7qHAdSXKDpvpOZProHnCoHXjyVY7Y="; # wcs2_0-eo
version = "2.26.0"; # wcs2_0-eo
hash = "sha256-Ky+unKH+WBMvo/rlNPv2Uca3X610yXZvCy0/5KEN6wk="; # wcs2_0-eo
};
web-resource = mkGeoserverExtension {
name = "web-resource";
version = "2.25.3"; # web-resource
hash = "sha256-m9+t3Q2yD+xqvuBvkc5jYWwtGqJit00xiHyDSLX8euE="; # web-resource
version = "2.26.0"; # web-resource
hash = "sha256-S7Wu4wGo2j8PcBC8VS7EECBlr7NN1hALC1VOM5b6Wk0="; # web-resource
};
wmts-multi-dimensional = mkGeoserverExtension {
name = "wmts-multi-dimensional";
version = "2.25.3"; # wmts-multi-dimensional
hash = "sha256-b/16463iotuADA/bIwTutYCiRZYusMf/yB1xEMPZe9U="; # wmts-multi-dimensional
version = "2.26.0"; # wmts-multi-dimensional
hash = "sha256-BNigZB16d1BKRTl/UJs1oWYFKn/cFk5WX1fBwvC046I="; # wmts-multi-dimensional
};
wps = mkGeoserverExtension {
name = "wps";
version = "2.25.3"; # wps
hash = "sha256-4WqZqfc80Qy3AACOb3MhDjocM02vKUEk9x8YfX5onyg="; # wps
version = "2.26.0"; # wps
hash = "sha256-HVTDMqG23Ign7qottKRo1PtQNr6606nV34SRopAMO1Q="; # wps
};
# Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not
# available in nixpgs as of 2024/01.
#wps-cluster-hazelcast = mkGeoserverExtension {
# name = "wps-cluster-hazelcast";
# version = "2.25.3"; # wps-cluster-hazelcast
# hash = "sha256-EDSSNVCZdcmv8ZfB3Gj80xm/ghlWNZwpTYhEwIoegM0="; # wps-cluster-hazelcast
# version = "2.26.0"; # wps-cluster-hazelcast
# hash = "sha256-R0Btbf6BNwGKC2TQ6BmSte612Sel7NspOX9KU+zsHBc="; # wps-cluster-hazelcast
#};
wps-download = mkGeoserverExtension {
name = "wps-download";
version = "2.25.3"; # wps-download
hash = "sha256-70vw5PHh1hLLAocFKlzPKDZWMjQmwUbv/L4yCJGrDQ4="; # wps-download
version = "2.26.0"; # wps-download
hash = "sha256-sVbAi0y8n2shox6TX0Y4Hg5GhYakv5+tgloMix6Wbfg="; # wps-download
};
# Needs Postrgres configuration or similar.
# See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html
wps-jdbc = mkGeoserverExtension {
name = "wps-jdbc";
version = "2.25.3"; # wps-jdbc
hash = "sha256-5d+txy1gw36G7hXfOf5qH+bSPIRw3XeLeMCTw6yHp/M="; # wps-jdbc
version = "2.26.0"; # wps-jdbc
hash = "sha256-iJk24m4UDwK1PrU0PiCDPGj0eK7EEQajUFyl+9aIGpE="; # wps-jdbc
};
ysld = mkGeoserverExtension {
name = "ysld";
version = "2.25.3"; # ysld
hash = "sha256-lbjfJPv9v4HUV31Hp5ZAEOe7IceRCxN7xtUxvOi2CYU="; # ysld
version = "2.26.0"; # ysld
hash = "sha256-/qbtfaIE/4haGeS6U+FML1JI/AyXWFyKOd8tGaYFCmw="; # ysld
};
}
pkgs/by-name/ge/geoserver/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
}:
stdenv.mkDerivation (finalAttrs: rec {
pname = "geoserver";
version = "2.25.3";
version = "2.26.0";
src = fetchurl {
url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
hash = "sha256-EmW3i0qi7P48AftCz7tqI2Wtvdy3cpyR57+s42dYwt8=";
hash = "sha256-WeItL0j50xWYXIFmH4EFhHjxv9Xr6rG0YO8re1jUnNM=";
};
patches = [
pkgs/by-name/go/go-chromecast/package.nix
+58
View File
@@ -0,0 +1,58 @@
{
lib,
buildGo122Module,
fetchFromGitHub,
installShellFiles,
stdenvNoCC,
versionCheckHook,
}:
# "go test" fails with go 1.23
buildGo122Module rec {
pname = "go-chromecast";
version = "0.3.1";
src = fetchFromGitHub {
owner = "vishen";
repo = "go-chromecast";
rev = "refs/tags/v${version}";
hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI=";
};
vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og=";
CGO_ENABLED = 0;
ldflags = [
"-s"
"-w"
"-X=main.version=${version}"
"-X=main.commit=${src.rev}"
"-X=main.date=unknown"
];
doInstallCheck = true;
nativeBuildInputs = [ installShellFiles ];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "--version";
postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
installShellCompletion --cmd go-chromecast \
--bash <($out/bin/go-chromecast completion bash) \
--fish <($out/bin/go-chromecast completion fish) \
--zsh <($out/bin/go-chromecast completion zsh)
'';
meta = {
homepage = "https://github.com/vishen/go-chromecast";
description = "CLI for Google Chromecast, Home devices and Cast Groups";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.zi3m5f ];
mainProgram = "go-chromecast";
};
}
pkgs/by-name/ke/keyguard/deps.json
Generated
+750 -747
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/ke/keyguard/package.nix
+3 -3
View File
@@ -34,13 +34,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "keyguard";
version = "1.6.3";
version = "1.6.4";
src = fetchFromGitHub {
owner = "AChep";
repo = "keyguard-app";
rev = "8f6d527a42f13c6bdcee2ca3f133dd19751fc37a";
hash = "sha256-llr+792hzifV5vP0e7AKWhW3OtYcyAhzXPR45Do62ug=";
rev = "81a8486ca31c86630c84c78285c49d16d7491328";
hash = "sha256-e0Ea2QSAMQqZRVPy5/5pblHfeG+L6oHEXHV5mepE5Z8=";
};
inherit gradleBuildTask gradleUpdateTask desktopItems;
pkgs/by-name/rm/rmg/package.nix
+2 -2
View File
@@ -30,13 +30,13 @@ let
in
stdenv.mkDerivation rec {
pname = "rmg";
version = "0.6.5";
version = "0.6.6";
src = fetchFromGitHub {
owner = "Rosalie241";
repo = "RMG";
rev = "v${version}";
hash = "sha256-mgb9Ed11fBQVnhhU5w1958a19dbTOL0ADczUOxKAnqA=";
hash = "sha256-3Bl9SEHWQbi58VPpCT4H8TC1E5J5j4lRXS1QF+udPdg=";
};
nativeBuildInputs = [
pkgs/by-name/rs/rs-tftpd/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "rs-tftpd";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "altugbakan";
repo = "rs-tftpd";
rev = version;
hash = "sha256-ZWafSqHEBgS7LR9hTfatatvAFZnCP8L5rHLerdjyrUc=";
hash = "sha256-RUjxCHO4X3V3Mt6zargqqT2v92XTt8FO9S68+tYZFC0=";
};
cargoHash = "sha256-uBVDH7YYSuFv0r5T2+EAoL02ta+1hjaza/Ilu+a+k0k=";
cargoHash = "sha256-sLdOVthIHXzdY0/tVn2J0CUr3IqLsVHO/5S4X0NmN64=";
buildFeatures = [ "client" ];
pkgs/by-name/s7/s7/package.nix
+159
View File
@@ -0,0 +1,159 @@
{
lib,
fetchFromGitLab,
stdenv,
notcurses,
gmp,
mpfr,
libmpc,
flint3,
unstableGitUpdater,
writeScript,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
version = "11.2-unstable-2024-11-02";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
rev = "6b6651de318c3360aa2711a445659f372ffe894e";
hash = "sha256-9x1u60jflESAHgP0gwIDVFwhI5XU5gsAiXaic8zdW2U=";
};
buildInputs = [
notcurses
gmp
mpfr
libmpc
flint3
];
# The following scripts are modified from [Guix's](https://packages.guix.gnu.org/packages/s7/).
patchPhase = ''
runHook prePatch
substituteInPlace s7.c \
--replace-fail libc_s7.so $out/lib/libc_s7.so
runHook postPatch
'';
buildPhase = ''
runHook preBuild
# The older REPL
cc s7.c -o s7-repl \
-O2 -I. \
-Wl,-export-dynamic \
-lm -ldl \
-DWITH_MAIN \
-DS7_LOAD_PATH=\"$out/share/s7/scm\"
# The newer REPL powered by Notcurses
cc s7.c -o s7-nrepl \
-O2 -I. \
-Wl,-export-dynamic \
-lm -ldl \
-DWITH_MAIN \
-DWITH_NOTCURSES -lnotcurses-core \
-DS7_LOAD_PATH=\"$out/share/s7/scm\"
cc libarb_s7.c -o libarb_s7.so \
-O2 -I. \
-shared \
-lflint -lmpc \
-fPIC
cc notcurses_s7.c -o libnotcurses_s7.so \
-O2 -I. \
-shared \
-lnotcurses-core \
-fPIC
cc s7.c -c -o s7.o \
-O2 -I. \
-ldl -lm
cc ffitest.c s7.o -o ffitest \
-I. \
-Wl,-export-dynamic \
-ldl -lm
./s7-repl libc.scm
runHook postBuild
'';
installPhase = ''
runHook preInstall
dst_bin=$out/bin
dst_lib=$out/lib
dst_inc=$out/include
dst_share=$out/share/s7
dst_scm=$out/share/s7/scm
dst_doc=$out/share/doc/s7
mkdir -p $dst_bin $dst_lib $dst_inc $dst_share $dst_scm $dst_doc
cp -pr -t $dst_bin s7-repl s7-nrepl
ln -s s7-nrepl $dst_bin/s7
cp -pr -t $dst_lib libarb_s7.so libnotcurses_s7.so libc_s7.so
cp -pr -t $dst_share s7.c
cp -pr -t $dst_inc s7.h
cp -pr -t $dst_scm *.scm
cp -pr -t $dst_doc s7.html
runHook postInstall
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$dst_bin/s7-repl s7test.scm
runHook postInstallCheck
'';
passthru.updateScript = unstableGitUpdater rec {
branch = "master";
tagConverter = writeScript "update-s7-version-number" ''
#! /usr/bin/env nix-shell
#! nix-shell -p curl -i bash
set -eu -o pipefail
read tag # should be "0" if the upstream sticks to tagging nothing.
curl -sS https://cm-gitlab.stanford.edu/bil/s7/-/raw/${branch}/s7.h \
| grep '#define S7_VERSION' \
| awk -F \" '{print $2}'
'';
};
meta = {
description = "Scheme interpreter intended as an extension language for other applications";
longDescription = ''
s7 is a Scheme interpreter intended as an extension language for other
applications.
Although it is a descendant of tinyScheme, s7 is closest as a Scheme
dialect to Guile 1.8. It is expected to be compatible with r5rs and r7rs.
It has continuations, ratios, complex numbers, macros, keywords,
hash-tables, multiprecision arithmetic, generalized `set!`, unicode, and so
on. It does not have `syntax-rules` or any of its friends, and it thinks
there is no such thing as an inexact integer.
s7 is an extension language of Snd and sndlib, Rick Taube's Common Music
(commonmusic at sourceforge), Kjetil Matheussen's Radium music editor, and
Iain Duncan's Scheme for Max (or Pd).
'';
homepage = "https://ccrma.stanford.edu/software/s7/";
license = lib.licenses.bsd0;
maintainers = with lib.maintainers; [ rc-zb ];
mainProgram = "s7";
platforms = lib.platforms.linux;
};
})
pkgs/by-name/tu/tunnelgraf/package.nix
+10 -11
View File
@@ -1,28 +1,28 @@
{ lib
, fetchFromGitHub
, python3
{
lib,
fetchFromGitHub,
python3,
}:
python3.pkgs.buildPythonApplication rec {
pname = "tunnelgraf";
version = "0.6.1";
version = "0.7.2";
pyproject = true;
src = fetchFromGitHub {
owner = "denniswalker";
repo = "tunnelgraf";
rev = "refs/tags/v${version}";
hash = "sha256-CsrbSpp1VszEAKpmHx8GbB7vfZCOvB+tDFNFwWKexEw=";
hash = "sha256-pwHP9eAf2S08ucUawxrQvzMBJNITxbddoLzEoSNUdao=";
};
pythonRelaxDeps = [
"click"
"paramiko"
"pydantic"
];
build-system = with python3.pkgs; [
hatchling
];
build-system = with python3.pkgs; [ hatchling ];
dependencies = with python3.pkgs; [
click
@@ -37,13 +37,12 @@ python3.pkgs.buildPythonApplication rec {
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"tunnelgraf"
];
pythonImportsCheck = [ "tunnelgraf" ];
meta = with lib; {
description = "Tool to manage SSH tunnel hops to many endpoints";
homepage = "https://github.com/denniswalker/tunnelgraf";
changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "tunnelgraf";
pkgs/development/compilers/javacard-devkit/default.nix
-70
View File
@@ -1,70 +0,0 @@
{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook
, pcsclite
}:
stdenv.mkDerivation rec {
pname = "javacard-devkit";
version = "2.2.2";
uscoreVersion = builtins.replaceStrings ["."] ["_"] version;
src = requireFile {
name = "java_card_kit-${uscoreVersion}-linux.zip";
url = "http://www.oracle.com/technetwork/java/javasebusiness/downloads/"
+ "java-archive-downloads-javame-419430.html#java_card_kit-2.2.2-oth-JPR";
sha256 = "1rzkw8izqq73ifvyp937wnjjc40a40drc4zsm0l1s6jyv3d7agb2";
};
nativeBuildInputs = [ unzip oraclejdk8 makeWrapper autoPatchelfHook ];
buildInputs = [ pcsclite ];
zipPrefix = "java_card_kit-${uscoreVersion}";
sourceRoot = ".";
unpackCmd = ''
unzip -p "$curSrc" "$zipPrefix/$zipPrefix-rr-bin-linux-do.zip" | jar x
'';
installPhase = ''
mkdir -p "$out/share/$pname"
cp -rt "$out/share/$pname" api_export_files
cp -rt "$out" lib
for i in bin/*; do
case "$i" in
*.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";;
*) target="$out/bin/$(basename "$i")"
install -vD "$i" "$target"
sed -i -e 's|^$JAVA_HOME/bin/java|''${JAVA:-$JAVA_HOME/bin/java}|' "$target"
wrapProgram "$target" \
--set JAVA_HOME "$JAVA_HOME" \
--prefix CLASSPATH : "$out/share/$pname/api_export_files"
;;
esac
done
makeWrapper "$JAVA_HOME/bin/javac" "$out/bin/javacardc" \
--prefix CLASSPATH : "$out/lib/api.jar"
'';
meta = {
description = "Official development kit by Oracle for programming for the Java Card platform";
longDescription = ''
This Java Card SDK is the official SDK made available by Oracle for programming for the Java Card platform.
Instructions for usage:
First, compile your '.java' (NixOS-specific: you should not need to set the class path -- if you need, it's a bug):
javacardc -source 1.5 -target 1.5 [MyJavaFile].java
Then, test with 'jcwde' (NixOS-specific: you can change the java version used to run jcwde with eg. JAVA=jdb):
CLASSPATH=. jcwde [MyJcwdeConfig].app & sleep 1 && apdutool [MyApdus].apdu
Finally, convert the '.class' file into a '.cap':
converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version]
For more details, please refer to the documentation by Oracle
'';
homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.ekleog ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
-60
View File
@@ -1,60 +0,0 @@
source $stdenv/setup
echo "Unpacking distribution"
unzip ${src} || true
# set the dynamic linker of unpack200, necessary for construct script
echo "patching unpack200"
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200
echo "constructing JDK and JRE installations"
if test -z "$installjdk"; then
sh ${construct} . tmp-linux-jdk tmp-linux-jre
mkdir -p $out
cp -R tmp-linux-jre/* $out
else
sh ${construct} . $out tmp-linux-jre
fi
echo "removing files at top level of installation"
for file in $out/*
do
if test -f $file ; then
rm $file
fi
done
rm -rf $out/docs
# construct the rpath
rpath=
for i in $libraries; do
rpath=$rpath${rpath:+:}$i/lib
done
if test -z "$installjdk"; then
jrePath=$out
else
jrePath=$out/jre
fi
if test -n "$jce"; then
unzip $jce
cp -v jce/*.jar $jrePath/lib/security
fi
rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli
# set all the dynamic linkers
find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
if test -z "$pluginSupport"; then
rm -f $out/bin/javaws
fi
mkdir $jrePath/lib/$architecture/plugins
ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
-193
View File
@@ -1,193 +0,0 @@
{ productVersion
, patchVersion
, sha256
, jceName
, sha256JCE
}:
{ swingSupport ? true
, lib, stdenv
, requireFile
, makeWrapper
, unzip
, file
, xorg ? null
, installjdk ? true
, pluginSupport ? true
, installjce ? false
, config
, glib
, libxml2
, ffmpeg
, libxslt
, libGL
, freetype
, fontconfig
, gtk2
, pango
, cairo
, alsa-lib
, atk
, gdk-pixbuf
, setJavaClassPath
}:
assert swingSupport -> xorg != null;
let
/**
* The JRE libraries are in directories that depend on the CPU.
*/
architecture = {
i686-linux = "i386";
x86_64-linux = "amd64";
armv7l-linux = "arm";
aarch64-linux = "aarch64";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
jce =
if installjce then
requireFile {
name = jceName;
url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html";
sha256 = sha256JCE;
}
else
"";
rSubPaths = [
"lib/${architecture}/jli"
"lib/${architecture}/server"
"lib/${architecture}/xawt"
"lib/${architecture}"
];
in
let result = stdenv.mkDerivation rec {
pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin";
version = "${productVersion}u${patchVersion}";
src =
let
platformName = {
i686-linux = "linux-i586";
x86_64-linux = "linux-x64";
armv7l-linux = "linux-arm32-vfp-hflt";
aarch64-linux = "linux-aarch64";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
in requireFile {
name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz";
url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html";
sha256 = sha256.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};
nativeBuildInputs = [ file makeWrapper ]
++ lib.optional installjce unzip;
# See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1;
installPhase = ''
cd ..
if test -z "$installjdk"; then
mv $sourceRoot/jre $out
else
mv $sourceRoot $out
fi
shopt -s extglob
for file in $out/!(*src.zip)
do
if test -f $file ; then
rm $file
fi
done
if test -n "$installjdk"; then
for file in $out/jre/*
do
if test -f $file ; then
rm $file
fi
done
fi
if test -z "$installjdk"; then
jrePath=$out
else
jrePath=$out/jre
fi
if test -n "${jce}"; then
unzip ${jce}
cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security
fi
if test -z "$pluginSupport"; then
rm -f $out/bin/javaws
if test -n "$installjdk"; then
rm -f $out/jre/bin/javaws
fi
fi
mkdir $jrePath/lib/${architecture}/plugins
ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
postFixup = ''
rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
# set all the dynamic linkers
find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
# Oracle Java Mission Control needs to know where libgtk-x11 and related is
if test -n "$installjdk" -a -x $out/bin/jmc; then
wrapProgram "$out/bin/jmc" \
--suffix-each LD_LIBRARY_PATH ':' "$rpath"
fi
'';
inherit installjdk pluginSupport;
/**
* libXt is only needed on amd64
*/
libraries =
[stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsa-lib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc];
rpath = lib.strings.makeLibraryPath libraries;
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
passthru.home = result;
passthru.architecture = architecture;
meta = with lib; {
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
mainProgram = "java";
knownVulnerabilities = [
"The Oracle JDKs included with Nixpkgs have not been updated since 2021. They contain many known vulnerabilities (https://openjdk.org/groups/vulnerability/advisories/). OpenJDK provides a comparable alternative."
];
};
}; in result
pkgs/development/compilers/oraclejdk/jdk11-linux.nix
-54
View File
@@ -1,54 +0,0 @@
{ lib, stdenv
, requireFile
, xorg
, zlib
, freetype
, alsa-lib
, setJavaClassPath
}:
let result = stdenv.mkDerivation rec {
pname = "oraclejdk";
version = "11.0.10";
src = requireFile {
name = "jdk-${version}_linux-x64_bin.tar.gz";
url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html";
sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2";
};
installPhase = ''
mv ../$sourceRoot $out
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
postFixup = ''
rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}"
for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
patchelf --set-rpath "$rpath" "$f" || true
done
for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi
done
'';
passthru.jre = result;
passthru.home = result;
dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10
meta = with lib; {
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
};
}; in result
pkgs/development/compilers/oraclejdk/jdk8-linux.nix
-10
View File
@@ -1,10 +0,0 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "281";
sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0=";
sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY=";
sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM=";
sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM=";
jceName = "jce_policy-8.zip";
sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w";
}
pkgs/development/compilers/z88dk/default.nix
+4 -17
View File
@@ -30,19 +30,6 @@ let
};
};
IteratorSimple = perlPackages.buildPerlPackage {
pname = "Iterator-Simple";
version = "0.07";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz";
hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q=";
};
meta = {
description = "Simple iterator and utilities";
license = with lib.licenses; [ artistic1 gpl2Only ];
};
};
IteratorSimpleLookahead = perlPackages.buildPerlPackage {
pname = "Iterator-Simple-Lookahead";
version = "0.09";
@@ -50,9 +37,9 @@ let
url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz";
hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw=";
};
propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [
ClassAccessor
]);
propagatedBuildInputs = with perlPackages; [
ClassAccessor IteratorSimple
];
meta = {
description = "Simple iterator with lookahead and unget";
license = with lib.licenses; [ artistic1 gpl2Only ];
@@ -67,9 +54,9 @@ let
hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M=";
};
propagatedBuildInputs = [
IteratorSimple
IteratorSimpleLookahead
] ++ (with perlPackages; [
IteratorSimple
TextTemplate
DataDump
FileSlurp
pkgs/development/libraries/CGAL/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "cgal";
version = "5.6.1";
version = "5.6.2";
src = fetchurl {
url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz";
hash = "sha256-zbFefuMeBmNYnTEHp5mIo3t7FxnfPSTyBYVF0bzdWDc=";
hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4=";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
pkgs/development/libraries/ffmpeg/generic.nix
+2 -2
View File
@@ -137,8 +137,8 @@
, withXcbShape ? withFullDeps # X11 grabbing shape rendering
, withXcbShm ? withFullDeps # X11 grabbing shm communication
, withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering
, withXevd ? withFullDeps && lib.versionAtLeast version "7" && !xevd.meta.broken # MPEG-5 EVC decoding
, withXeve ? withFullDeps && lib.versionAtLeast version "7" && !xeve.meta.broken # MPEG-5 EVC encoding
, withXevd ? withFullDeps && lib.versionAtLeast version "7.1" && !xevd.meta.broken # MPEG-5 EVC decoding
, withXeve ? withFullDeps && lib.versionAtLeast version "7.1" && !xeve.meta.broken # MPEG-5 EVC encoding
, withXlib ? withFullDeps # Xlib support
, withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers
, withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists
pkgs/development/libraries/freetds/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
stdenv.mkDerivation rec {
pname = "freetds";
version = "1.4.22";
version = "1.4.23";
src = fetchurl {
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
hash = "sha256-qafyTwp6hxYX526MxuZVaueIBC8cAGGVZlUFSZsjNLE=";
hash = "sha256-k6PxhrgsYEKmahlwvUeNeRTtscVmm2QtgLTqrPKi0X4=";
};
buildInputs = [
pkgs/development/libraries/libngspice/default.nix
+2 -1
View File
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
] ++ [
"--enable-xspice"
"--enable-cider"
"--enable-osdi"
];
enableParallelBuilding = true;
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
mainProgram = "ngspice";
homepage = "http://ngspice.sourceforge.net";
license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING
maintainers = with maintainers; [ bgamari rongcuid ];
maintainers = with maintainers; [ bgamari ];
platforms = platforms.unix;
};
}
pkgs/development/libraries/minizip-ng/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "minizip-ng";
version = "4.0.3";
version = "4.0.7";
src = fetchFromGitHub {
owner = "zlib-ng";
repo = "minizip-ng";
rev = finalAttrs.version;
hash = "sha256-rP3WficGQZ2sSYnU9Tj0lVl36ShwV76fn/1lv+TrK2c=";
hash = "sha256-scoEqymRMBTZZVr1fxtKOyBj4VLCgI8jQpanUKrJhiQ=";
};
nativeBuildInputs = [ cmake pkg-config ];
pkgs/development/libraries/openimageio/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "openimageio";
version = "2.5.15.0";
version = "2.5.16.0";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenImageIO";
rev = "v${version}";
hash = "sha256-jtX6IDR/yFn10hf+FxM0s4St9XYxhQ1UlMAsNzOxuio=";
hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo=";
};
# Workaround broken zlib version detecion in CMake < 3.37.
pkgs/development/libraries/rdkafka/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rdkafka";
version = "2.5.3";
version = "2.6.0";
src = fetchFromGitHub {
owner = "confluentinc";
repo = "librdkafka";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg=";
sha256 = "sha256-QjmVu9d/wlLjt5WWyZi+WEWibfDUynHGvTwLbH36T84=";
};
nativeBuildInputs = [ pkg-config python3 which ];
pkgs/development/libraries/science/math/osi/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "osi";
version = "0.108.10";
version = "0.108.11";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Osi";
rev = "releases/${version}";
hash = "sha256-rHNGnnDFU9UrszjjkZQkgWCfjjBIQba6vVbK/HLpRsQ=";
hash = "sha256-3aTO7JGEOP/RCOZ1X9b68rrtv6T78euf1TYGTjyXSRE=";
};
buildInputs =
pkgs/development/ocaml-modules/lwt/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
buildDunePackage rec {
pname = "lwt";
version = "5.7.0";
version = "5.8.0";
minimalOCamlVersion = "4.08";
@@ -12,7 +12,7 @@ buildDunePackage rec {
owner = "ocsigen";
repo = "lwt";
rev = version;
hash = "sha256-o0wPK6dPdnsr/LzwcSwbIGcL85wkDjdFuEcAxuS/UEs=";
hash = "sha256-GX5CSJuTajvZJ0TgG95aHeOCBi2B9Aw2URLZRCdp91A=";
};
nativeBuildInputs = [ cppo ];
pkgs/development/ocaml-modules/mtime/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-mtime";
version = "2.0.0";
version = "2.1.0";
src = fetchurl {
url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz";
sha256 = "Pz2g6gBts0RlsDCE3npYqxWg8W9HgoxQC+U63fHgROs=";
sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
pkgs/development/ocaml-modules/ptime/default.nix
+2 -2
View File
@@ -11,12 +11,12 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
"ptime is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation (finalAttrs: {
version = "1.1.0";
version = "1.2.0";
pname = "ocaml${ocaml.version}-ptime";
src = fetchurl {
url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz";
hash = "sha256-y/WxVFT7JxBeLDNAI+HhHY+TnXF4hw9cvo7SbfcBPrE=";
hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA=";
};
nativeBuildInputs = [
pkgs/development/ocaml-modules/res/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "res";
version = "5.0.1";
version = "5.0.2";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mmottl/res/releases/download/${version}/res-${version}.tbz";
hash = "sha256-rSrDMQBfnbWAr2LuajP3fveOtOwLyRbKPkaTKsnocQ4=";
hash = "sha256-hQxRETCYxy7ZHah5cg+XHtH3wCj/ofq1VHxsPHu91FU=";
};
doCheck = true;
pkgs/development/ocaml-modules/tsdl/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@ else
let
pname = "tsdl";
version = "1.0.0";
version = "1.1.0";
webpage = "https://erratique.ch/software/${pname}";
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
hash = "sha256-XdgzCj9Uqplt/8Jk8rSFaQf8zu+9SZa8b9ZIlW/gjyE=";
hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs=";
};
strictDeps = true;
pkgs/development/python-modules/boiboite-opener-framework/default.nix
+6 -1
View File
@@ -34,7 +34,12 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "bof" ];
preCheck = ''
export HOME=$(mktemp -d)
'';
# Race condition, https://github.com/secdev/scapy/pull/4558
# pythonImportsCheck = [ "bof" ];
disabledTests = [
# Tests are using netcat and cat to do UDP connections
pkgs/development/python-modules/gradio-pdf/default.nix
+7 -7
View File
@@ -11,16 +11,16 @@
buildPythonPackage rec {
pname = "gradio-pdf";
version = "0.0.15";
format = "pyproject";
version = "0.0.17";
pyproject = true;
src = fetchPypi {
pname = "gradio_pdf";
inherit version;
hash = "sha256-R+4CDJo84/+PUTTxoz9CsZlHUVsldgjufWsRkALrfN4=";
hash = "sha256-LoVcwE7eGcK5Nc6qKTnrnI+rNlsDbekhKUP+Fzq2SQ8=";
};
nativeBuildInputs = [
build-system = [
hatch-fancy-pypi-readme
hatch-requirements-txt
hatchling
@@ -36,10 +36,10 @@ buildPythonPackage rec {
# tested in `gradio`
doCheck = false;
meta = with lib; {
meta = {
description = "Python library for easily interacting with trained machine learning models";
homepage = "https://pypi.org/project/gradio-pdf/";
license = licenses.asl20;
maintainers = with maintainers; [ pbsds ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ pbsds ];
};
}
pkgs/development/python-modules/gradio/client.nix
+6 -5
View File
@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "gradio-client";
version = "1.3.0";
version = "1.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
# not to be confused with @gradio/client@${version}
rev = "refs/tags/gradio_client@${version}";
sparseCheckout = [ "client/python" ];
hash = "sha256-UZQWguUN3l0cj2wb2f7A61RTLy9nPYcIEwHIo+F1kR0=";
hash = "sha256-pS7yrqBuq/Pe7sEfReAM6OL2qFQVA+vWra36UuhyDkk=";
};
prePatch = ''
cd client/python
@@ -108,10 +108,11 @@ buildPythonPackage rec {
extraArgs = [ "--version-regex" "gradio_client@(.*)" ];
};
meta = with lib; {
meta = {
homepage = "https://www.gradio.app/";
changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio_client@${version}";
description = "Lightweight library to use any Gradio app as an API";
license = licenses.asl20;
maintainers = with maintainers; [ pbsds ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ pbsds ];
};
}
pkgs/development/python-modules/gradio/conftest-skip-network-errors.py
+2
View File
@@ -28,6 +28,8 @@ def pytest_runtest_makereport(item, call):
for exc in iterate_exc_chain(call.excinfo.value):
if isinstance(exc, NixNetworkAccessDeniedError):
tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access."
if isinstance(exc, socket.gaierror):
tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access."
if isinstance(exc, httpx.ConnectError):
tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access."
if isinstance(exc, FileNotFoundError): # gradio specific
pkgs/development/python-modules/gradio/default.nix
+10 -7
View File
@@ -64,15 +64,15 @@
buildPythonPackage rec {
pname = "gradio";
version = "4.44.1";
format = "pyproject";
version = "5.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
# We use the Pypi release, since it provides prebuilt webui assets
src = fetchPypi {
inherit pname version;
hash = "sha256-popSSYrGtj+IZO+Ev3hmpw59B+vpE+35IeHSo3CK1a4=";
hash = "sha256-0hU2aObeLfegG7M/AaB0/HcW7IY8QPRy2OQ5Q57x4VM=";
};
# fix packaging.ParserSyntaxError, which can't handle comments
@@ -95,7 +95,7 @@ buildPythonPackage rec {
"ruff"
];
nativeBuildInputs = [
build-system = [
hatchling
hatch-requirements-txt
hatch-fancy-pypi-readme
@@ -172,6 +172,7 @@ buildPythonPackage rec {
disabledTests = [
# Actually broken
"test_mount_gradio_app"
"test_processing_utils_backwards_compatibility" # type error
# requires network, it caught our xfail exception
"test_error_analytics_successful"
@@ -284,14 +285,16 @@ buildPythonPackage rec {
pythonRemoveDeps = (old.pythonRemoveDeps or [ ]) ++ [ "gradio-client" ];
doInstallCheck = false;
doCheck = false;
preCheck = "";
pythonImportsCheck = null;
dontCheckRuntimeDeps = true;
});
meta = with lib; {
meta = {
homepage = "https://www.gradio.app/";
changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio@${version}";
description = "Python library for easily interacting with trained machine learning models";
license = licenses.asl20;
maintainers = with maintainers; [ pbsds ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ pbsds ];
};
}
pkgs/development/python-modules/hypothesmith/default.nix
+2
View File
@@ -45,6 +45,8 @@ buildPythonPackage rec {
disabledTests = [
# super slow
"test_source_code_from_libcst_node_type"
# https://github.com/Zac-HD/hypothesmith/issues/38
"test_black_autoformatter_from_grammar"
];
pythonImportsCheck = [ "hypothesmith" ];
pkgs/development/python-modules/mmengine/default.nix
+9
View File
@@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
# build-system
setuptools,
@@ -41,6 +42,14 @@ buildPythonPackage rec {
hash = "sha256-bZ6O4UOYUCwq11YmgRWepOIngYxYD/fNfM/VmcyUv9k=";
};
patches = [
(fetchpatch2 {
name = "mmengine-torch-2.5-compat.patch";
url = "https://github.com/open-mmlab/mmengine/commit/4c22f78cdea2981a2b48a167e9feffe4721f8901.patch";
hash = "sha256-k+IFLeqTEVUGGiqmZg56LK64H/UTvpGN20GJT59wf4A=";
})
];
build-system = [ setuptools ];
dependencies = [
pkgs/development/python-modules/pyside2/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
}:
stdenv.mkDerivation rec {
pname = "pyside2";
version = "5.15.14";
version = "5.15.15";
src = fetchurl {
url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
hash = "sha256-MmURlPamt7zkLwTmixQBrSCH5HiaTI8/uGSehhicY3I=";
hash = "sha256-IdaBiwZINLCFARgOSIkOX9h98vs3afgMWBQ0V/VIxAg=";
};
patches = [
pkgs/development/python-modules/types-awscrt/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "types-awscrt";
version = "0.21.5";
version = "0.23.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "types_awscrt";
inherit version;
hash = "sha256-n39H3mh5nLK8ueSG9I13ufWJYrkvukPLiGDacLPFfRs=";
hash = "sha256-P9Ht6skj0ZVsDpB8lz+4O9pGW+rn8FRxazcbKT+bX9w=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/types-s3transfer/default.nix
+5 -2
View File
@@ -2,7 +2,8 @@
lib,
buildPythonPackage,
fetchPypi,
poetry-core,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
@@ -10,13 +11,15 @@ buildPythonPackage rec {
version = "0.10.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "types_s3transfer";
inherit version;
hash = "sha256-YBZ6O/tcU27GzbWBj3+aKO3KncPgtf+FrjdFJvxeV24=";
};
nativeBuildInputs = [ poetry-core ];
build-system = [ setuptools ];
# Module has no tests
doCheck = false;
pkgs/development/tools/aws-sam-cli/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "aws-sam-cli";
version = "1.120.0";
version = "1.127.0";
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-sam-cli";
rev = "refs/tags/v${version}";
hash = "sha256-XFVh7e9ooIBhWRkVovPdrSuyosBMQ84PDRjV2o0x9ns=";
hash = "sha256-5/zXvO5xrNkhPCei4O/nMXA/e18VNrED2lpBbflaJLQ=";
};
build-system = with python3.pkgs; [ setuptools ];
pkgs/development/tools/database/sqldeveloper/default.nix
-84
View File
@@ -1,84 +0,0 @@
{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
let
version = "20.4.0.379.2205";
desktopItem = makeDesktopItem {
name = "sqldeveloper";
exec = "sqldeveloper";
icon = "sqldeveloper";
desktopName = "Oracle SQL Developer";
genericName = "Oracle SQL Developer";
comment = "Oracle's Oracle DB GUI client";
categories = [ "Development" ];
};
in
stdenv.mkDerivation {
inherit version;
pname = "sqldeveloper";
src = requireFile rec {
name = "sqldeveloper-${version}-no-jre.zip";
url = "https://www.oracle.com/tools/downloads/sqldev-downloads.html";
message = ''
This Nix expression requires that ${name} already be part of the store. To
obtain it you need to
- navigate to ${url}
- make sure that it says "Version ${version}" above the list of downloads
- if it does not, click on the "Previous Version" link below the downloads
and repeat until the version is correct. This is necessarry because as the
time of this writing there exists no permanent link for the current version
yet.
Also consider updating this package yourself (you probably just need to
change the `version` variable and update the sha256 to the one of the
new file) or opening an issue at the nixpkgs repo.
- accept the license agreement
- download the file listed under "Other Platforms"
- sign in or create an oracle account if neccessary
and then add the file to the Nix store using either:
nix-store --add-fixed sha256 ${name}
or
nix-prefetch-url --type sha256 file:///path/to/${name}
'';
sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k";
};
nativeBuildInputs = [ makeWrapper unzip ];
unpackCmd = "unzip $curSrc";
installPhase = ''
mkdir -p $out/libexec $out/share/{applications,pixmaps}
mv * $out/libexec/
mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png
cp ${desktopItem}/share/applications/* $out/share/applications
makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \
--set JAVA_HOME ${jdk.home} \
--chdir "$out/libexec/sqldeveloper/bin"
'';
meta = with lib; {
description = "Oracle's Oracle DB GUI client";
longDescription = ''
Oracle SQL Developer is a free integrated development environment that
simplifies the development and management of Oracle Database in both
traditional and Cloud deployments. SQL Developer offers complete
end-to-end development of your PL/SQL applications, a worksheet for
running queries and scripts, a DBA console for managing the database,
a reports interface, a complete data modeling solution, and a migration
platform for moving your 3rd party databases to Oracle.
'';
homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ ardumont ];
};
}
pkgs/development/tools/sqlint/Gemfile.lock
+1 -1
View File
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
google-protobuf (3.25.0)
google-protobuf (3.25.5)
pg_query (4.2.3)
google-protobuf (>= 3.22.3)
sqlint (0.3.0)
pkgs/development/tools/sqlint/gemset.nix
+2 -2
View File
@@ -4,10 +4,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm";
sha256 = "0fanhdf3vzghma51w1hqpp8s585mwzxgqkwvxj5is4q9j0pgwcs3";
type = "gem";
};
version = "3.25.0";
version = "3.25.5";
};
pg_query = {
dependencies = ["google-protobuf"];
pkgs/os-specific/linux/i2c-tools/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "i2c-tools";
version = "4.3";
version = "4.4";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/snapshot/i2c-tools-v${version}.tar.gz";
sha256 = "sha256-HlmIocum+HZEKNiS5BUwEIswRfTMUhD1vCPibAuAK0Q=";
sha256 = "sha256-Zm83gxdZH2XQCc/Dihp7vumF9WAvKgt6OORns5Mua7M=";
};
buildInputs = [ perl ];
pkgs/os-specific/linux/universal-pidff/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/JacKeTUs/universal-pidff";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [
danerieber
computerdane
racci
];
platforms = lib.platforms.linux;
pkgs/servers/atlassian/bamboo.nix
-38
View File
@@ -1,38 +0,0 @@
{ stdenvNoCC, lib, fetchurl, mysql_jdbc
, withMysql ? true
}:
stdenvNoCC.mkDerivation rec {
pname = "atlassian-bamboo";
version = "9.6.4";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/bamboo/downloads/atlassian-bamboo-${version}.tar.gz";
hash = "sha256-Gd4+rH/40s9AvJi/waEVfVwWtT0H3bSlknNV6wxGpNg=";
};
buildPhase = ''
echo "bamboo.home=/run/bamboo/home" > atlassian-bamboo/WEB-INF/classes/bamboo-init.properties
mv conf/server.xml conf/server.xml.dist
ln -sf /run/atlassian-bamboo/server.xml conf/server.xml
rm -r logs; ln -sf /run/atlassian-bamboo/logs/ .
rm -r temp; ln -sf /run/atlassian-bamboo/temp/ .
rm -r work; ln -sf /run/atlassian-bamboo/work/ .
'' + lib.optionalString withMysql ''
cp -v ${mysql_jdbc}/share/java/*jar atlassian-bamboo/lib/
'';
installPhase = ''
cp -rva . $out
patchShebangs $out/bin
'';
meta = with lib; {
description = "Bamboo Data Center is a continuous delivery server";
homepage = "https://www.atlassian.com/software/bamboo";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = with licenses; [ unfree ];
maintainers = with maintainers; [ techknowlogick ];
};
}
pkgs/servers/atlassian/confluence.nix
-51
View File
@@ -1,51 +0,0 @@
{ stdenvNoCC, lib, fetchurl, mysql_jdbc ? null
, enableSSO ? false
, crowdProperties ? null
, withMysql ? true
}:
assert withMysql -> (mysql_jdbc != null);
lib.warnIf (crowdProperties != null) "Using `crowdProperties` is deprecated!"
(stdenvNoCC.mkDerivation rec {
pname = "atlassian-confluence";
version = "9.0.1";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
hash = "sha256-WCshWmJaTfyjRLaXUtkDuXHO5eEhHa/rDCPVFSLd3aU=";
};
buildPhase = ''
echo "confluence.home=/run/confluence/home" > confluence/WEB-INF/classes/confluence-init.properties
mv conf/server.xml conf/server.xml.dist
ln -sf /run/confluence/home/deploy conf/Standalone
ln -sf /run/confluence/server.xml conf/server.xml
rm -r logs; ln -sf /run/confluence/logs/ .
rm -r work; ln -sf /run/confluence/work/ .
rm -r temp; ln -sf /run/confluence/temp/ .
'' + lib.optionalString enableSSO ''
substituteInPlace confluence/WEB-INF/classes/seraph-config.xml \
--replace com.atlassian.confluence.user.ConfluenceAuthenticator\
com.atlassian.confluence.user.ConfluenceCrowdSSOAuthenticator
'' + lib.optionalString (crowdProperties != null) ''
cat <<EOF > confluence/WEB-INF/classes/crowd.properties
${crowdProperties}
EOF
'' + lib.optionalString withMysql ''
cp -v ${mysql_jdbc}/share/java/*jar confluence/WEB-INF/lib/
'';
installPhase = ''
cp -rva . $out
patchShebangs $out/bin
'';
meta = with lib; {
description = "Team collaboration software written in Java and mainly used in corporate environments";
homepage = "https://www.atlassian.com/software/confluence";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfree;
maintainers = with maintainers; [ willibutz ciil techknowlogick ];
};
})
pkgs/servers/atlassian/crowd.nix
-50
View File
@@ -1,50 +0,0 @@
{ lib, stdenv, fetchurl, home ? "/var/lib/crowd"
, port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }:
lib.warnIf (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!"
(stdenv.mkDerivation rec {
pname = "atlassian-crowd";
version = "5.0.1";
src = fetchurl {
url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz";
sha256 = "sha256-ccXSNuiXP0+b9WObboikqVd0nKH0Fi2gMVEF3+WAx5M=";
};
buildPhase = ''
mv apache-tomcat/conf/server.xml apache-tomcat/conf/server.xml.dist
ln -s /run/atlassian-crowd/server.xml apache-tomcat/conf/server.xml
rm -rf apache-tomcat/{logs,work}
ln -s /run/atlassian-crowd/logs apache-tomcat/logs
ln -s /run/atlassian-crowd/work apache-tomcat/work
ln -s /run/atlassian-crowd/database database
substituteInPlace apache-tomcat/bin/startup.sh --replace start run
echo "crowd.home=${home}" > crowd-webapp/WEB-INF/classes/crowd-init.properties
substituteInPlace build.properties \
--replace "openidserver.url=http://localhost:8095/openidserver" \
"openidserver.url=http://localhost:${toString port}/openidserver"
substituteInPlace crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \
--replace "http://localhost:8095/" \
"http://localhost:${toString port}/"
sed -r -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \
-e 's,application.password\s+password,application.password ${openidPassword},'
'' + lib.optionalString (proxyUrl != null) ''
sed -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \
-e 's,http://localhost:${toString port}/openidserver,${proxyUrl}/openidserver,'
'';
installPhase = ''
cp -rva . $out
'';
meta = with lib; {
description = "Single sign-on and identity management tool";
homepage = "https://www.atlassian.com/software/crowd";
license = licenses.unfree;
maintainers = [ ];
};
})
pkgs/servers/atlassian/jira.nix
-44
View File
@@ -1,44 +0,0 @@
{ stdenv
, lib
, fetchurl
, gawk
, enableSSO ? false
, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "9.17.1";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
hash = "sha256-hSwPVYIN1/BG6d8UepopLEMExjwDg/w/Bwj9k27nmDQ=";
};
nativeBuildInputs = [ makeWrapper ];
buildPhase = ''
mv conf/server.xml conf/server.xml.dist
ln -sf /run/atlassian-jira/server.xml conf/server.xml
rm -r logs; ln -sf /run/atlassian-jira/logs/ .
rm -r work; ln -sf /run/atlassian-jira/work/ .
rm -r temp; ln -sf /run/atlassian-jira/temp/ .
substituteInPlace bin/check-java.sh \
--replace "awk" "${gawk}/bin/gawk"
'' + lib.optionalString enableSSO ''
substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \
--replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \
com.atlassian.jira.security.login.SSOSeraphAuthenticator
'';
installPhase = ''
cp -rva . $out
'';
meta = with lib; {
description = "Proprietary issue tracking product, also providing project management functions";
homepage = "https://www.atlassian.com/software/jira";
license = licenses.unfree;
maintainers = with maintainers; [ ciil megheaiulian techknowlogick ];
};
}
pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
+3
View File
@@ -1,6 +1,7 @@
{ lib
, buildHomeAssistantComponent
, fetchFromGitHub
, pycryptodome
}:
buildHomeAssistantComponent rec {
@@ -15,6 +16,8 @@ buildHomeAssistantComponent rec {
hash = "sha256-xTnbA4GztHOE61QObEJbzUSdbuSrhbcJ280DUDdM+n4=";
};
dependencies = [ pycryptodome ];
meta = with lib; {
description = "Auto-configure and then control your Midea M-Smart devices (Air conditioner, Fan, Water heater, Washer, etc) via local area network";
homepage = "https://github.com/georgezhao2010/midea_ac_lan/";
pkgs/servers/skydns/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoModule rec {
pname = "skydns";
@@ -25,11 +25,13 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ];
meta = with lib; {
meta = {
description = "Distributed service for announcement and discovery of services";
homepage = "https://github.com/skynetservices/skydns";
license = lib.licenses.mit;
maintainers = [ ];
mainProgram = "skydns";
# link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/tools/admin/balena-cli/default.nix
+33 -31
View File
@@ -1,23 +1,19 @@
{ lib
, stdenv
, buildNpmPackage
, overrideSDK
, fetchFromGitHub
, testers
, balena-cli
, node-gyp
, python3
, udev
, cctools
, darwin
{
lib,
stdenv,
buildNpmPackage,
fetchFromGitHub,
testers,
balena-cli,
node-gyp,
python3,
udev,
cctools,
apple-sdk_12,
darwinMinVersionHook,
}:
let
# Fix for: https://github.com/NixOS/nixpkgs/issues/272156
buildNpmPackage' = buildNpmPackage.override {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
in buildNpmPackage' rec {
buildNpmPackage rec {
pname = "balena-cli";
version = "19.0.13";
@@ -35,19 +31,22 @@ in buildNpmPackage' rec {
'';
makeCacheWritable = true;
nativeBuildInputs = [
node-gyp
python3
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
cctools
];
nativeBuildInputs =
[
node-gyp
python3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
cctools
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
udev
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Foundation
darwin.apple_sdk.frameworks.Cocoa
];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
udev
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_12
];
passthru.tests.version = testers.testVersion {
package = balena-cli;
@@ -69,7 +68,10 @@ in buildNpmPackage' rec {
homepage = "https://github.com/balena-io/balena-cli";
changelog = "https://github.com/balena-io/balena-cli/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = [ maintainers.kalebpace maintainers.doronbehar ];
maintainers = [
maintainers.kalebpace
maintainers.doronbehar
];
mainProgram = "balena";
};
}
pkgs/tools/admin/berglas/default.nix
+3 -3
View File
@@ -27,16 +27,16 @@ in
buildGoModule rec {
pname = "berglas";
version = "2.0.2";
version = "2.0.6";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+fpxklkcjGiBMyW+L9nNdzXwhGcE2yIbZ/wPbpj9bV0=";
sha256 = "sha256-aTUMEn/QkPzvAyUvMxyqLl6KWFHs+dQK0VDqYv36AGM=";
};
vendorHash = "sha256-BDQJFrFbJGuoDpjGn0T9xWk6huUmDpOTO/JSDIYUKYg=";
vendorHash = "sha256-n/NOAmOOoZMFZGreUGNgrZ3XGbhmI52KtgakcJ/SJIc=";
ldflags = [
"-s"
pkgs/tools/admin/trivy/default.nix
+3 -3
View File
@@ -11,19 +11,19 @@
buildGoModule rec {
pname = "trivy";
version = "0.56.2";
version = "0.57.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = "trivy";
rev = "refs/tags/v${version}";
hash = "sha256-wqiFUiNZ3VG4c/QkoliU2BtqanyC4GwlwUZomOX3VrU=";
hash = "sha256-al8hxVNyDoGQaoqa0fmA7Bn7M1twwlS4I5+XZnETXyc=";
};
# Hash mismatch on across Linux and Darwin
proxyVendor = true;
vendorHash = "sha256-+WkOGy/Z4BuDlwpfisWqhjJlshPXTxjRy2pmmHxU6B8=";
vendorHash = "sha256-TEjV9Cr5oXNMvzFpRDQ9MxgbZMJnq++eU/xJi2/piF8=";
subPackages = [ "cmd/trivy" ];
pkgs/tools/audio/kaldi/default.nix
+3 -3
View File
@@ -19,13 +19,13 @@
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
stdenv.mkDerivation (finalAttrs: {
pname = "kaldi";
version = "0-unstable-2024-09-16";
version = "0-unstable-2024-10-04";
src = fetchFromGitHub {
owner = "kaldi-asr";
repo = "kaldi";
rev = "d9ab0465aa2849ff645c027110c48899d5ec6ca8";
sha256 = "sha256-usrHtVGkp++mU9rWI3u3vXJ8aAycujw9+5VQd0X0idY=";
rev = "4a8b7f673275597fef8a15b160124bd0985b59bd";
sha256 = "sha256-CY40zkVP0ZTjOBjnmVyFdqaHdAxuGGH82GzudoA5MyM=";
};
cmakeFlags = [
pkgs/tools/security/kpcli/default.nix
+4 -2
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/kpcli/${pname}-${version}.pl";
sha256 = "sha256-hvyCC8eUXNm1d1g+/kEnVllRJokChgJWzuoQB5Xd8j8=";
hash = "sha256-hvyCC8eUXNm1d1g+/kEnVllRJokChgJWzuoQB5Xd8j8=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \
"${with perlPackages; makePerlPath ([
CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser
BHooksEndOfScope CaptureTiny Clipboard Clone CryptRijndael CryptX DevelGlobalDestruction ModuleImplementation
ModuleRuntime SortNaturally SubExporterProgressive TermReadKey TermShellUI TryTiny FileKDBX FileKeePass
PackageStash RefUtil TermReadLineGnu XMLParser boolean namespaceclean
] ++ lib.optional stdenv.hostPlatform.isDarwin MacPasteboard)}"
'';
pkgs/top-level/aliases.nix
+16
View File
@@ -115,6 +115,10 @@ mapAliases {
aria = aria2; # Added 2024-03-26
armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
aseprite-unfree = aseprite; # Added 2023-08-26
atlassian-bamboo = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
atlassian-confluence = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
atlassian-crowd = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
atlassian-jira = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06
auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02
aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14
@@ -273,6 +277,7 @@ mapAliases {
dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07
dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17
dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02
docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29
docker-distribution = distribution; # Added 2023-12-26
dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
@@ -536,6 +541,7 @@ mapAliases {
jami-client-qt = jami-client; # Added 2022-11-06
jami-client = jami; # Added 2023-02-10
jami-daemon = jami.daemon; # Added 2023-02-10
javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01
jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07
@@ -894,6 +900,15 @@ mapAliases {
onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24
oraclejdk = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
oraclejdk8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
oraclejre = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
oraclejre8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
jrePlugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
jre8Plugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
jdkdistro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
OSCAR = oscar; # Added 2024-06-12
osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17
ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
@@ -1112,6 +1127,7 @@ mapAliases {
spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07
spotify-unwrapped = spotify; # added 2022-11-06
spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17
sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02
srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09
ssm-agent = amazon-ssm-agent; # Added 2023-10-17
starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
pkgs/top-level/all-packages.nix
+2 -38
View File
@@ -5027,8 +5027,6 @@ with pkgs;
gfxreconstruct = callPackage ../tools/graphics/gfxreconstruct { };
go-chromecast = callPackage ../applications/video/go-chromecast { };
go-containerregistry = callPackage ../development/tools/go-containerregistry { };
inherit (go-containerregistry) crane gcrane;
@@ -6938,8 +6936,6 @@ with pkgs;
docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };
docear = callPackage ../applications/office/docear { };
dockbarx = callPackage ../applications/misc/dockbarx { };
dog = callPackage ../tools/system/dog { };
@@ -15012,35 +15008,12 @@ with pkgs;
openspin = callPackage ../development/compilers/openspin { };
oraclejdk = jdkdistro true false;
oraclejdk8 = oraclejdk8distro true false;
oraclejre = lowPrio (jdkdistro false false);
oraclejre8 = lowPrio (oraclejdk8distro false false);
jrePlugin = jre8Plugin;
jre8Plugin = lowPrio (oraclejdk8distro false true);
jdkdistro = oraclejdk8distro;
oraclejdk8distro = installjdk: pluginSupport:
(callPackage ../development/compilers/oraclejdk/jdk8-linux.nix {
inherit installjdk pluginSupport;
});
oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { };
jasmin = callPackage ../development/compilers/jasmin { };
java-service-wrapper = callPackage ../tools/system/java-service-wrapper { };
jna = callPackage ../development/java-modules/jna { };
javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };
juniper = callPackage ../development/compilers/juniper { };
inherit (callPackage ../development/compilers/julia { })
@@ -15708,10 +15681,6 @@ with pkgs;
spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { };
sqldeveloper = callPackage ../development/tools/database/sqldeveloper {
jdk = oraclejdk;
};
sqlfluff = callPackage ../development/tools/database/sqlfluff { };
sqlx-cli = callPackage ../development/tools/rust/sqlx-cli {
@@ -23971,11 +23940,6 @@ with pkgs;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { };
atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { };
atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { };
atlassian-jira = callPackage ../servers/atlassian/jira.nix { };
cadvisor = callPackage ../servers/monitoring/cadvisor { };
cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix {
@@ -30264,7 +30228,7 @@ with pkgs;
kondo = callPackage ../applications/misc/kondo { };
kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop {
kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop {
stdenv = if stdenv.hostPlatform.isDarwin
then overrideSDK stdenv "11.0"
else stdenv;
@@ -32577,7 +32541,7 @@ with pkgs;
taskopen = callPackage ../applications/misc/taskopen { };
telegram-desktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop {
telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop {
stdenv = if stdenv.hostPlatform.isDarwin
then overrideSDK stdenv "11.0"
else stdenv;
pkgs/top-level/perl-packages.nix
+28
View File
@@ -9938,6 +9938,21 @@ with self; {
};
};
FileKDBX = buildPerlPackage {
pname = "File-KDBX";
version = "0.906";
src = fetchurl {
url = "mirror://cpan/authors/id/C/CC/CCM/File-KDBX-0.906.tar.gz";
hash = "sha256-tHt/kzOrtJHqrsY0WhTn+TlW0UOUTBS4Fkp/0bIkvW8=";
};
propagatedBuildInputs = [ CryptArgon2 CryptX DevelGlobalDestruction FileKeePass IteratorSimple RefUtil XMLLibXML boolean namespaceclean ];
buildInputs = [ ScopeGuard TestDeep TestFatal TestWarnings ];
meta = {
description = "Interface to KeePass V3 and V4 database files";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
FileKeePass = buildPerlPackage {
pname = "File-KeePass";
version = "2.03";
@@ -13317,6 +13332,19 @@ with self; {
};
};
IteratorSimple = buildPerlPackage {
pname = "Iterator-Simple";
version = "0.07";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz";
hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q=";
};
meta = {
description = "Simple iterator and utilities";
license = with lib.licenses; [ artistic1 gpl2Only ];
};
};
IPCSignal = buildPerlPackage {
pname = "IPC-Signal";
version = "1.00";