Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
83aadb450e
|
|
@ -1,8 +1,8 @@
|
|||
name: "Update terraform-providers"
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "14 3 * * 0"
|
||||
#schedule:
|
||||
# - cron: "14 3 * * 0"
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
|
|
|
|||
|
|
@ -263,6 +263,13 @@
|
|||
<link linkend="opt-services.expressvpn.enable">services.expressvpn</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/L11R/go-autoconfig">go-autoconfig</link>,
|
||||
IMAP/SMTP autodiscover server. Available as
|
||||
<link linkend="opt-services.go-autoconfig.enable">services.go-autoconfig</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://www.grafana.com/oss/tempo/">Grafana
|
||||
|
|
@ -454,6 +461,15 @@
|
|||
available via the <literal>hardware.xone</literal> module.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
dd-agent package removed along with the
|
||||
<literal>services.dd-agent</literal> module, due to the
|
||||
project being deprecated in favor of
|
||||
<literal>datadog-agent</literal>, which is available via the
|
||||
<literal>services.datadog-agent</literal> module.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
virtlyst package and <literal>services.virtlyst</literal>
|
||||
|
|
|
|||
|
|
@ -94,6 +94,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable).
|
||||
|
||||
- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable).
|
||||
|
||||
- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable).
|
||||
|
||||
- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable).
|
||||
|
|
@ -158,6 +160,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module.
|
||||
|
||||
- dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module.
|
||||
|
||||
- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers.
|
||||
|
||||
- The `services.graphite.api` and `services.graphite.beacon` NixOS options, and
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@ in
|
|||
|
||||
config = {
|
||||
_module.args = {
|
||||
pkgs = finalPkgs;
|
||||
pkgs = finalPkgs.__splicedPackages;
|
||||
};
|
||||
|
||||
assertions = [
|
||||
|
|
|
|||
|
|
@ -669,7 +669,6 @@
|
|||
./services/monitoring/collectd.nix
|
||||
./services/monitoring/das_watchdog.nix
|
||||
./services/monitoring/datadog-agent.nix
|
||||
./services/monitoring/dd-agent/dd-agent.nix
|
||||
./services/monitoring/do-agent.nix
|
||||
./services/monitoring/fusion-inventory.nix
|
||||
./services/monitoring/grafana.nix
|
||||
|
|
@ -804,6 +803,7 @@
|
|||
./services/networking/git-daemon.nix
|
||||
./services/networking/globalprotect-vpn.nix
|
||||
./services/networking/gnunet.nix
|
||||
./services/networking/go-autoconfig.nix
|
||||
./services/networking/go-neb.nix
|
||||
./services/networking/go-shadowsocks2.nix
|
||||
./services/networking/gobgpd.nix
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ with lib;
|
|||
(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" "couchpotato" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
|
||||
(mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
|
||||
(mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ in
|
|||
conf = format.generate "vector.toml" cfg.settings;
|
||||
validateConfig = file:
|
||||
pkgs.runCommand "validate-vector-conf" {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.vector ];
|
||||
nativeBuildInputs = [ pkgs.vector ];
|
||||
} ''
|
||||
vector validate --no-environment "${file}"
|
||||
ln -s "${file}" "$out"
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@ in
|
|||
wantedBy = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
|
||||
path = [ pkgs.alsa-utils ];
|
||||
|
||||
startLimitIntervalSec = 350;
|
||||
startLimitBurst = 10;
|
||||
serviceConfig = {
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.
|
||||
[
|
||||
"auto_conf"
|
||||
"agent_metrics.yaml.default"
|
||||
"disk.yaml.default"
|
||||
"network.yaml.default"
|
||||
"ntp.yaml.default"
|
||||
]
|
||||
|
|
@ -1,236 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.dd-agent;
|
||||
|
||||
ddConf = pkgs.writeText "datadog.conf" ''
|
||||
[Main]
|
||||
dd_url: https://app.datadoghq.com
|
||||
skip_ssl_validation: no
|
||||
api_key: ${cfg.api_key}
|
||||
${optionalString (cfg.hostname != null) "hostname: ${cfg.hostname}"}
|
||||
|
||||
collector_log_file: /var/log/datadog/collector.log
|
||||
forwarder_log_file: /var/log/datadog/forwarder.log
|
||||
dogstatsd_log_file: /var/log/datadog/dogstatsd.log
|
||||
pup_log_file: /var/log/datadog/pup.log
|
||||
|
||||
# proxy_host: my-proxy.com
|
||||
# proxy_port: 3128
|
||||
# proxy_user: user
|
||||
# proxy_password: password
|
||||
|
||||
# tags: mytag0, mytag1
|
||||
${optionalString (cfg.tags != null ) "tags: ${concatStringsSep ", " cfg.tags }"}
|
||||
|
||||
# collect_ec2_tags: no
|
||||
# recent_point_threshold: 30
|
||||
# use_mount: no
|
||||
# listen_port: 17123
|
||||
# graphite_listen_port: 17124
|
||||
# non_local_traffic: no
|
||||
# use_curl_http_client: False
|
||||
# bind_host: localhost
|
||||
|
||||
# use_pup: no
|
||||
# pup_port: 17125
|
||||
# pup_interface: localhost
|
||||
# pup_url: http://localhost:17125
|
||||
|
||||
# dogstatsd_port : 8125
|
||||
# dogstatsd_interval : 10
|
||||
# dogstatsd_normalize : yes
|
||||
# statsd_forward_host: address_of_own_statsd_server
|
||||
# statsd_forward_port: 8125
|
||||
|
||||
# device_blacklist_re: .*\/dev\/mapper\/lxc-box.*
|
||||
|
||||
# ganglia_host: localhost
|
||||
# ganglia_port: 8651
|
||||
'';
|
||||
|
||||
diskConfig = pkgs.writeText "disk.yaml" ''
|
||||
init_config:
|
||||
|
||||
instances:
|
||||
- use_mount: no
|
||||
'';
|
||||
|
||||
networkConfig = pkgs.writeText "network.yaml" ''
|
||||
init_config:
|
||||
|
||||
instances:
|
||||
# Network check only supports one configured instance
|
||||
- collect_connection_state: false
|
||||
excluded_interfaces:
|
||||
- lo
|
||||
- lo0
|
||||
'';
|
||||
|
||||
postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;
|
||||
nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;
|
||||
mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig;
|
||||
jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig;
|
||||
processConfig = pkgs.writeText "process.yaml" cfg.processConfig;
|
||||
|
||||
etcfiles =
|
||||
let
|
||||
defaultConfd = import ./dd-agent-defaults.nix;
|
||||
in
|
||||
listToAttrs (map (f: {
|
||||
name = "dd-agent/conf.d/${f}";
|
||||
value.source = "${pkgs.dd-agent}/agent/conf.d-system/${f}";
|
||||
}) defaultConfd) //
|
||||
{
|
||||
"dd-agent/datadog.conf".source = ddConf;
|
||||
"dd-agent/conf.d/disk.yaml".source = diskConfig;
|
||||
"dd-agent/conf.d/network.yaml".source = networkConfig;
|
||||
} //
|
||||
(optionalAttrs (cfg.postgresqlConfig != null)
|
||||
{
|
||||
"dd-agent/conf.d/postgres.yaml".source = postgresqlConfig;
|
||||
}) //
|
||||
(optionalAttrs (cfg.nginxConfig != null)
|
||||
{
|
||||
"dd-agent/conf.d/nginx.yaml".source = nginxConfig;
|
||||
}) //
|
||||
(optionalAttrs (cfg.mongoConfig != null)
|
||||
{
|
||||
"dd-agent/conf.d/mongo.yaml".source = mongoConfig;
|
||||
}) //
|
||||
(optionalAttrs (cfg.processConfig != null)
|
||||
{
|
||||
"dd-agent/conf.d/process.yaml".source = processConfig;
|
||||
}) //
|
||||
(optionalAttrs (cfg.jmxConfig != null)
|
||||
{
|
||||
"dd-agent/conf.d/jmx.yaml".source = jmxConfig;
|
||||
});
|
||||
|
||||
in {
|
||||
options.services.dd-agent = {
|
||||
enable = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable the dd-agent v5 monitoring service.
|
||||
For datadog-agent v6, see {option}`services.datadog-agent.enable`.
|
||||
'';
|
||||
default = false;
|
||||
type = types.bool;
|
||||
};
|
||||
|
||||
api_key = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
The Datadog API key to associate the agent with your account.
|
||||
|
||||
Warning: this key is stored in cleartext within the world-readable
|
||||
Nix store! Consider using the new v6
|
||||
{option}`services.datadog-agent` module instead.
|
||||
'';
|
||||
example = "ae0aa6a8f08efa988ba0a17578f009ab";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
tags = mkOption {
|
||||
description = lib.mdDoc "The tags to mark this Datadog agent";
|
||||
example = [ "test" "service" ];
|
||||
default = null;
|
||||
type = types.nullOr (types.listOf types.str);
|
||||
};
|
||||
|
||||
hostname = mkOption {
|
||||
description = lib.mdDoc "The hostname to show in the Datadog dashboard (optional)";
|
||||
default = null;
|
||||
example = "mymachine.mydomain";
|
||||
type = types.nullOr types.str;
|
||||
};
|
||||
|
||||
postgresqlConfig = mkOption {
|
||||
description = lib.mdDoc "Datadog PostgreSQL integration configuration";
|
||||
default = null;
|
||||
type = types.nullOr types.lines;
|
||||
};
|
||||
|
||||
nginxConfig = mkOption {
|
||||
description = lib.mdDoc "Datadog nginx integration configuration";
|
||||
default = null;
|
||||
type = types.nullOr types.lines;
|
||||
};
|
||||
|
||||
mongoConfig = mkOption {
|
||||
description = lib.mdDoc "MongoDB integration configuration";
|
||||
default = null;
|
||||
type = types.nullOr types.lines;
|
||||
};
|
||||
|
||||
jmxConfig = mkOption {
|
||||
description = lib.mdDoc "JMX integration configuration";
|
||||
default = null;
|
||||
type = types.nullOr types.lines;
|
||||
};
|
||||
|
||||
processConfig = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Process integration configuration
|
||||
See <https://docs.datadoghq.com/integrations/process/>
|
||||
'';
|
||||
default = null;
|
||||
type = types.nullOr types.lines;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.dd-agent pkgs.sysstat pkgs.procps ];
|
||||
|
||||
users.users.datadog = {
|
||||
description = "Datadog Agent User";
|
||||
uid = config.ids.uids.datadog;
|
||||
group = "datadog";
|
||||
home = "/var/log/datadog/";
|
||||
createHome = true;
|
||||
};
|
||||
|
||||
users.groups.datadog.gid = config.ids.gids.datadog;
|
||||
|
||||
systemd.services = let
|
||||
makeService = attrs: recursiveUpdate {
|
||||
path = [ pkgs.dd-agent pkgs.python pkgs.sysstat pkgs.procps pkgs.gohai ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "datadog";
|
||||
Group = "datadog";
|
||||
Restart = "always";
|
||||
RestartSec = 2;
|
||||
PrivateTmp = true;
|
||||
};
|
||||
restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ];
|
||||
} attrs;
|
||||
in {
|
||||
dd-agent = makeService {
|
||||
description = "Datadog agent monitor";
|
||||
serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
|
||||
};
|
||||
|
||||
dogstatsd = makeService {
|
||||
description = "Datadog statsd";
|
||||
environment.TMPDIR = "/run/dogstatsd";
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start";
|
||||
Type = "forking";
|
||||
PIDFile = "/run/dogstatsd/dogstatsd.pid";
|
||||
RuntimeDirectory = "dogstatsd";
|
||||
};
|
||||
};
|
||||
|
||||
dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) {
|
||||
description = "Datadog JMX Fetcher";
|
||||
path = [ pkgs.dd-agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
|
||||
serviceConfig.ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch";
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc = etcfiles;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
dd=$(nix-build --no-out-link -A dd-agent ../../../..)
|
||||
echo '# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.' > dd-agent-defaults.nix
|
||||
echo '[' >> dd-agent-defaults.nix
|
||||
echo ' "auto_conf"' >> dd-agent-defaults.nix
|
||||
for f in $(find $dd/agent/conf.d-system -maxdepth 1 -type f | grep -v '\.example' | sort); do
|
||||
echo " \"$(basename $f)\"" >> dd-agent-defaults.nix
|
||||
done
|
||||
echo ']' >> dd-agent-defaults.nix
|
||||
66
nixos/modules/services/networking/go-autoconfig.nix
Normal file
66
nixos/modules/services/networking/go-autoconfig.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.go-autoconfig;
|
||||
format = pkgs.formats.yaml { };
|
||||
configFile = format.generate "config.yml" cfg.settings;
|
||||
|
||||
in {
|
||||
options = {
|
||||
services.go-autoconfig = {
|
||||
|
||||
enable = mkEnableOption (mdDoc "IMAP/SMTP autodiscover feature for mail clients");
|
||||
|
||||
settings = mkOption {
|
||||
default = { };
|
||||
description = mdDoc ''
|
||||
Configuration for go-autoconfig. See
|
||||
<https://github.com/L11R/go-autoconfig/blob/master/config.yml>
|
||||
for more information.
|
||||
'';
|
||||
type = types.submodule {
|
||||
freeformType = format.type;
|
||||
};
|
||||
example = literalExpression ''
|
||||
{
|
||||
service_addr = ":1323";
|
||||
domain = "autoconfig.example.org";
|
||||
imap = {
|
||||
server = "example.org";
|
||||
port = 993;
|
||||
};
|
||||
smtp = {
|
||||
server = "example.org";
|
||||
port = 465;
|
||||
};
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd = {
|
||||
services.go-autoconfig = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
description = "IMAP/SMTP autodiscover server";
|
||||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.go-autoconfig}/bin/go-autoconfig -config ${configFile}";
|
||||
Restart = "on-failure";
|
||||
WorkingDirectory = ''${pkgs.go-autoconfig}/'';
|
||||
DynamicUser = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ onny ];
|
||||
|
||||
}
|
||||
|
|
@ -140,6 +140,7 @@ in
|
|||
path = with pkgs; [
|
||||
git
|
||||
gnutar
|
||||
gzip
|
||||
nix
|
||||
] ++ lib.optionals (cfg.switchCommand == "boot") [ systemd ];
|
||||
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ in {
|
|||
"curl --fail -L --cacert ${ca_pem} https://localhost:8448/"
|
||||
)
|
||||
serverpostgres.require_unit_state("postgresql.service")
|
||||
serverpostgres.succeed("register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} ")
|
||||
serverpostgres.succeed("register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} https://localhost:8448/")
|
||||
serverpostgres.succeed("obtain-token-and-register-email")
|
||||
serversqlite.wait_for_unit("matrix-synapse.service")
|
||||
serversqlite.wait_until_succeeds(
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "erigon";
|
||||
version = "2022.08.03";
|
||||
version = "2022.09.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z+YghJjJfeGO/LuwcLb5A9ghZUcL1OoppMZPsa38ahQ=";
|
||||
sha256 = "sha256-vcppzHJ6yLIqp/5Gl9JIgkTVR1mKKAj1vhWY/bCvbPQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2+9oXLIDYZfWzQfnjwJet4QT01tGzLlQJFjN4ZbG6uw=";
|
||||
vendorSha256 = "sha256-mY8m5bXm09pmq1imCo8uiBBnzPzrVuka8XtZyxL9LWo=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import ./generic.nix (rec {
|
||||
version = "28.1";
|
||||
sha256 = "sha256-D33wnlxhx0LyG9WZaQDj2II3tG0HcJdZTC4dSA3lrgY=";
|
||||
version = "28.2";
|
||||
sha256 = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
|
||||
patches = _: [ ];
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "f3d";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f3d-app";
|
||||
repo = "f3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Yn1IcGWAbXjG0wJQjRimvreozFu9mf0FMwyGNYc4P+U=";
|
||||
hash = "sha256-dOpiX7xJWDKHqPLGvlgv7NHgfzyeZhJd898+KzAmD4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals stdenv.isLinux [ libGL libX11 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
|
||||
|
||||
# conflict between VTK and Nixpkgs;
|
||||
# see https://github.com/NixOS/nixpkgs/issues/89167
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and minimalist 3D viewer using VTK";
|
||||
homepage = "https://f3d-app.github.io/f3d";
|
||||
|
|
|
|||
47
pkgs/applications/graphics/kphotoalbum/default.nix
Normal file
47
pkgs/applications/graphics/kphotoalbum/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ mkDerivation
|
||||
, fetchurl
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
, wrapGAppsHook
|
||||
, exiv2
|
||||
, ffmpeg
|
||||
, libkdcraw
|
||||
, phonon
|
||||
, libvlc
|
||||
, kconfig
|
||||
, kiconthemes
|
||||
, kio
|
||||
, kinit
|
||||
, kpurpose
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kphotoalbum";
|
||||
version = "5.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-kejzDYpBQEoGKgPzVcUVlGKmd1OoXx+W7t9p3MNNw/A=";
|
||||
};
|
||||
|
||||
# not sure if we really need phonon when we have vlc, but on KDE it's bound to
|
||||
# be on the system anyway, so there is no real harm including it
|
||||
buildInputs = [ exiv2 phonon libvlc ];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
|
||||
propagatedBuildInputs = [ kconfig kiconthemes kio kinit kpurpose libkdcraw ];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Efficient image organization and indexing";
|
||||
homepage = "https://www.kphotoalbum.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
inherit (kconfig.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "kanboard";
|
||||
repo = "kanboard";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RO8yxXn0kRXNIP6+OUdXMH1tRDX55e34r3CGPU5EHU0=";
|
||||
sha256 = "sha256-Sr20WAJLKy/vaCw76abq8qoKWZbuVgqjlCTZom/puPU=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -1,74 +1,74 @@
|
|||
{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, alsa-utils
|
||||
, gobject-introspection
|
||||
, libappindicator-gtk3
|
||||
, libnotify
|
||||
, wlrctl
|
||||
, gtk3
|
||||
, xprintidle
|
||||
, wrapGAppsHook
|
||||
, babel
|
||||
, psutil
|
||||
, xlib
|
||||
, pygobject3
|
||||
, dbus-python
|
||||
, croniter
|
||||
}:
|
||||
|
||||
let inherit (python3Packages) python buildPythonApplication fetchPypi croniter;
|
||||
|
||||
in buildPythonApplication rec {
|
||||
buildPythonApplication rec {
|
||||
pname = "safeeyes";
|
||||
version = "2.1.3";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1b5w887hivmdrkm1ydbar4nmnks6grpbbpvxgf9j9s46msj03c9x";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gobject-introspection
|
||||
gnome.adwaita-icon-theme
|
||||
gnome.adwaita-icon-theme
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libappindicator-gtk3
|
||||
libnotify
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
babel
|
||||
psutil
|
||||
xlib
|
||||
pygobject3
|
||||
dbus-python
|
||||
croniter
|
||||
|
||||
libappindicator-gtk3
|
||||
libnotify
|
||||
xprintidle-ng
|
||||
];
|
||||
|
||||
# patch smartpause plugin
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
-e 's!xprintidle!xprintidle-ng!g' \
|
||||
safeeyes/plugins/smartpause/plugin.py
|
||||
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
|
||||
dontWrapGApps = true;
|
||||
|
||||
sed -i \
|
||||
-e 's!xprintidle!xprintidle-ng!g' \
|
||||
safeeyes/plugins/smartpause/config.json
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
cp -r safeeyes/platform/icons $out/share/icons/
|
||||
cp safeeyes/platform/safeeyes.desktop $out/share/applications/safeeyes.desktop
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
|
||||
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
|
||||
--prefix XDG_DATA_DIRS : "${librsvg}/share"
|
||||
|
||||
# safeeyes images
|
||||
--prefix XDG_DATA_DIRS : "$out/lib/${python.libPrefix}/site-packages/usr/share"
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--prefix PATH : ${lib.makeBinPath [ alsa-utils wlrctl xprintidle ]}
|
||||
)
|
||||
mkdir -p $out/share/applications
|
||||
cp -r safeeyes/platform/icons $out/share/
|
||||
cp safeeyes/platform/safeeyes.desktop $out/share/applications/
|
||||
'';
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "http://slgobinath.github.io/SafeEyes";
|
||||
description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ srghma ];
|
||||
platforms = lib.platforms.all;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ srghma ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,25 @@
|
|||
{ lib, stdenv, fetchFromGitHub, buildPackages, cmake, installShellFiles
|
||||
, boost, lua, protobuf, rapidjson, shapelib, sqlite, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages, cmake, installShellFiles
|
||||
, boost, lua, protobuf, rapidjson, shapelib, sqlite, zlib, testers }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tilemaker";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "systemed";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "tilemaker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-st6WDCk1RZ2lbfrudtcD+zenntyTMRHrIXw3nX5FHOU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with Boost >= 1.79, remove on next upstream release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/systemed/tilemaker/commit/252e7f2ad8938e38d51783d1596307dcd27ed269.patch";
|
||||
hash = "sha256-YSkhmpzEYk/mxVPSDYdwZclooB3zKRjDPzqamv6Nvyc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tilemaker.cpp \
|
||||
--replace "config.json" "$out/share/tilemaker/config-openmaptiles.json" \
|
||||
|
|
@ -25,11 +33,18 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
"-DPROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc";
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-DTM_VERSION=${finalAttrs.version}" ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage ../docs/man/tilemaker.1
|
||||
install -Dm644 ../resources/* -t $out/share/tilemaker
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "tilemaker --help";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Make OpenStreetMap vector tiles without the stack";
|
||||
homepage = "https://tilemaker.org/";
|
||||
|
|
@ -37,4 +52,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tofi";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "philj56";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mSW6o/yvqj3nqkdA9C4waB+b+YcFcEXDPAdRHqYXXhY=";
|
||||
sha256 = "sha256-wF9gj1VNu+ik/dq5Q0l6rNfqU9kQXyLiAQvbU1OoHdg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/0CZFvCBesATVGGCJoiM3GfYvCrmDJBHMXhn/o8xhKg=";
|
||||
sha256 = "sha256-U9U1r74E4ryc8zUb1EogfBT57kfsd89i7DWO05tnQw4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg=";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, fetchFromGitHub
|
||||
, callPackage
|
||||
, config
|
||||
, writeShellScript
|
||||
|
||||
, cdrtools # libvirt
|
||||
}:
|
||||
|
|
@ -47,7 +48,12 @@ let
|
|||
'';
|
||||
|
||||
# Keep the attributes around for later consumption
|
||||
passthru = attrs;
|
||||
passthru = attrs // {
|
||||
updateScript = writeShellScript "update" ''
|
||||
provider="$(basename ${provider-source-address})"
|
||||
./pkgs/applications/networking/cluster/terraform-providers/update-provider --no-build "$provider"
|
||||
'';
|
||||
};
|
||||
});
|
||||
|
||||
list = lib.importJSON ./providers.json;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=../../../../.. -i bash -p jq
|
||||
#! nix-shell -i bash -p jq
|
||||
# shellcheck shell=bash
|
||||
|
||||
# Update all providers which have specified provider source address
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl git jq moreutils nix nix-prefetch
|
||||
#! nix-shell -i bash -p coreutils curl git jq moreutils nix nix-prefetch
|
||||
# shellcheck shell=bash
|
||||
# vim: ft=sh
|
||||
#
|
||||
|
|
@ -100,6 +100,8 @@ echo_provider() {
|
|||
echo "== terraform-providers.${provider}: $* =="
|
||||
}
|
||||
|
||||
pushd "$(dirname "$0")"
|
||||
|
||||
if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then
|
||||
echo_provider "init"
|
||||
source_address=registry.terraform.io/${provider}
|
||||
|
|
@ -164,3 +166,5 @@ if [[ ${build} == 1 ]]; then
|
|||
echo_provider "building"
|
||||
nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider}"
|
||||
fi
|
||||
|
||||
popd
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "profanity";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "profanity-im";
|
||||
repo = "profanity";
|
||||
rev = version;
|
||||
hash = "sha256-yUiiww8yhymdqR6CITRnItxZhfpZiEbu1WyD8bDW+vc=";
|
||||
hash = "sha256-cTkNtj1mN5EuCyniFibKNzY2fxe3NKpRXt8acO/p6WY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"version": "1.10.12-sc.1",
|
||||
"rev": "v1.10.12-sc.1",
|
||||
"srcHash": "1rpfax6xx731w59a2i7v6jr17l3rnrn79d666f0cjchg36nkqqg9",
|
||||
"webYarnHash": "0m5dnz3m68iz94siwmavzj50wxd6w6wanjsm1zhq76lgymgcbqc2",
|
||||
"jsSdkYarnHash": "1k1jvavbqr7vcbdaxc6yqiq5254kxhywn1s2zndrfny7ap8z5c1c",
|
||||
"reactSdkYarnHash": "0cz7pgrbysljmhpf4m0wqwqjqijxahl3wz5qhczlkj46dvq6qyxb",
|
||||
"desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn"
|
||||
"version": "1.11.4-sc.1",
|
||||
"rev": "v1.11.4-sc.1",
|
||||
"srcHash": "05h7zcgnq8xi1hs5wqhjbm173y56zyz8g9l6ii8nbkzjrggif37w",
|
||||
"webYarnHash": "1yji94xcigz54bbhvssj2pgncw9fgal7mzw9h9bfwmny0pjh8c4p",
|
||||
"jsSdkYarnHash": "11yaii6srq6fysipsr083g4ac3k1rxhclprj4q60xwk39fl4qfpb",
|
||||
"reactSdkYarnHash": "0riz037rigpqybyf1jnfchzxyalajfc37l6xwdn5zb9avf730bms",
|
||||
"desktopYarnHash": "0m0zzq2wbk7h7anjmj586089j2qgsd5cj99rmi2hmsmssq63fmwk"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,12 +116,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Matrix client / Element Desktop fork";
|
||||
homepage = "https://schildi.chat/";
|
||||
changelog = "https://github.com/SchildiChat/schildichat-desktop/releases";
|
||||
maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]);
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,8 +84,10 @@ in stdenv.mkDerivation rec {
|
|||
runHook preBuild
|
||||
|
||||
pushd element-web
|
||||
node scripts/copy-res.js
|
||||
node_modules/.bin/webpack --progress --mode production
|
||||
export VERSION=${version}
|
||||
yarn build:res --offline
|
||||
yarn build:module_system --offline
|
||||
yarn build:bundle --offline
|
||||
popd
|
||||
|
||||
runHook postBuild
|
||||
|
|
@ -100,12 +102,12 @@ in stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Matrix client / Element Web fork";
|
||||
homepage = "https://schildi.chat/";
|
||||
changelog = "https://github.com/SchildiChat/schildichat-desktop/releases";
|
||||
maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ];
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]);
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbmc";
|
||||
version = "5.65.0";
|
||||
version = "5.65.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diffblue";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-A2xMbRblDXyhUXGDVxNBxFbs9npQJpMUBCPAloF33M8=";
|
||||
sha256 = "sha256-6Cy3yScPl2Ax0N2pmJWJEPXrSlj+F0IAoM5G8rIjbT8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "0.11.3";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sSmadO7iKkJb/kd9rnH34/DyAHqdNtbvGDt9xkK4t8E=";
|
||||
sha256 = "sha256-v2zvcUDbzjisJVxEic6VDZewaE0kp1rcB2NK8y3utnQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pe6AaO3vTbix+b21GqEICxdej8mbXXpzNrF4eKbEnSE=";
|
||||
vendorSha256 = "sha256-MlfDvdzkegtS8sW/GjkOMLQTK30G6RipHaYzNcwIkEE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lkl";
|
||||
version = "2019-10-04";
|
||||
version = "2022-05-18";
|
||||
|
||||
outputs = [ "dev" "lib" "out" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lkl";
|
||||
repo = "linux";
|
||||
rev = "06ca3ddb74dc5b84fa54fa1746737f2df502e047";
|
||||
sha256 = "0qjp0r338bwgrqdsvy5mkdh7ryas23m47yvxfwdknfyl0k3ylq62";
|
||||
rev = "10c7b5dee8c424cc2ab754e519ecb73350283ff9";
|
||||
sha256 = "sha256-D3HQdKzhB172L62a+8884bNhcv7vm/c941wzbYtbf4I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bc bison flex python3 ];
|
||||
|
|
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
|||
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
|
||||
patchShebangs arch/lkl/scripts
|
||||
|
||||
patchShebangs scripts/ld-version.sh
|
||||
|
||||
# Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
|
||||
sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,17 +1,39 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, fetchurl, writeScript }:
|
||||
|
||||
let
|
||||
version = "7.01";
|
||||
version = "8.00";
|
||||
in
|
||||
fetchzip {
|
||||
fetchurl {
|
||||
name = "i.ming-${version}";
|
||||
url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf";
|
||||
sha256 = "1b2dj7spkznpkad8a0blqigj9f6ism057r0wn9wdqg5g88yp32vd";
|
||||
hash = "sha256-JGu9H0+IdJL6QQtLwvqlFLEaJdq1JVRiqLm5zptwjyE=";
|
||||
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
postFetch = ''
|
||||
install -DT -m444 $downloadedFile $out/share/fonts/truetype/I.Ming/I.Ming.ttf
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "updater" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused
|
||||
set -e
|
||||
version=$(curl -i -s https://github.com/ichitenfont/I.Ming/releases/latest | sed -n -E 's|^location.*releases/tag/([0-9.]+).*$|\1|p')
|
||||
if [[ $version != ${version} ]]; then
|
||||
tmp=$(mktemp -d)
|
||||
curl -Lo $tmp/I.Ming.ttf https://raw.githubusercontent.com/ichitenfont/I.Ming/$version/$version/I.Ming-$version.ttf
|
||||
install -DT -m444 $tmp/I.Ming.ttf $tmp/share/fonts/truetype/I.Ming/I.Ming.ttf
|
||||
rm $tmp/I.Ming.ttf
|
||||
hash=$(nix hash path --type sha256 --base32 --sri $tmp)
|
||||
sed -i -E \
|
||||
-e "s/version = \"[0-9.]+\"/version = \"$version\"/" \
|
||||
-e "s|hash = \".*\"|hash = \"$hash\"|" \
|
||||
pkgs/data/fonts/i-dot-ming/default.nix
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source Pan-CJK serif typeface";
|
||||
homepage = "https://github.com/ichitenfont/I.Ming";
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ let
|
|||
# { case = "8.13"; out = "1.0-beta2-8.13"; }
|
||||
{ case = "8.14"; out = "1.0-8.14"; }
|
||||
{ case = "8.15"; out = "1.0-8.15"; }
|
||||
{ case = "8.16"; out = "1.0-8.16"; }
|
||||
] null;
|
||||
release = {
|
||||
"1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
|
||||
|
|
@ -19,6 +20,7 @@ let
|
|||
"1.0-beta2-8.13".sha256 = "sha256-IC56/lEDaAylUbMCfG/3cqOBZniEQk8jmI053DBO5l8=";
|
||||
"1.0-8.14".sha256 = "sha256-iRnaNeHt22JqxMNxOGPPycrO9EoCVjusR2s0GfON1y0=";
|
||||
"1.0-8.15".sha256 = "sha256-8RUC5dHNfLJtJh+IZG4nPTAVC8ZKVh2BHedkzjwLf/k=";
|
||||
"1.0-8.16".sha256 = "sha256-7rkCAN4PNnMgsgUiiLe2TnAliknN75s2SfjzyKCib/o=";
|
||||
};
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
|
|
@ -37,7 +39,7 @@ let
|
|||
echo "all:" > all/Makefile
|
||||
echo "install:" >> all/Makefile
|
||||
'' ;
|
||||
derivation = mkCoqDerivation ({
|
||||
derivation = (mkCoqDerivation ({
|
||||
inherit version pname defaultVersion release releaseRev repo owner;
|
||||
|
||||
mlPlugin = true;
|
||||
|
|
@ -72,7 +74,11 @@ let
|
|||
maintainers = with maintainers; [ cohencyril ];
|
||||
};
|
||||
} // optionalAttrs (package != "single")
|
||||
{ passthru = genAttrs packages metacoq_; });
|
||||
{ passthru = genAttrs packages metacoq_; })
|
||||
).overrideAttrs (o: {
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++
|
||||
optional (versionAtLeast o.version "1.0-8.16") coq.ocamlPackages.stdlib-shims;
|
||||
});
|
||||
in derivation;
|
||||
in
|
||||
metacoq_ (if single then "single" else "all")
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, lib
|
||||
, fetchurl
|
||||
, unzip
|
||||
, version ? "2.17.3"
|
||||
, version ? "2.18.0"
|
||||
, sources ? let
|
||||
base = "https://storage.googleapis.com/dart-archive/channels";
|
||||
x86_64 = "x64";
|
||||
|
|
@ -10,28 +10,28 @@
|
|||
aarch64 = "arm64";
|
||||
# Make sure that if the user overrides version parameter they're
|
||||
# also need to override sources, to avoid mistakes
|
||||
version = "2.17.3";
|
||||
version = "2.18.0";
|
||||
in
|
||||
{
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip";
|
||||
sha256 = "sha256-NjkqC9DaaFGN47Qe46xUlsEx2O2bQrKhb1eJyxfr7Vg=";
|
||||
sha256 = "sha256-wfUh6rXy8jAC0TVQJzXh4SrV2DQs9SvY8PGtNgZx+cA=";
|
||||
};
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||
sha256 = "sha256-+6y4lOGS8VyWrZCMSgLFun0E/WOCGlHEE8J5cQiVpUY=";
|
||||
sha256 = "sha256-zyu6r8akId/AHpBKH95wJXXu1LD9CKShWYKfppnSRx4=";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||
sha256 = "sha256-aPmgmsYaqxwTWtLmSjm/rAiJANQ5lB3uJ12OqMhUG5U=";
|
||||
sha256 = "sha256-45HE7Y9iO5dI+JfLWF1ikFfBFB+er46bK+EYkyuhFjI=";
|
||||
};
|
||||
"${version}-i686-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
|
||||
sha256 = "sha256-BFIN36OURaWIgBUiO35GkMkhCBHnqtKYPJVetdJ5cZI=";
|
||||
sha256 = "sha256-IkSJWfAocT1l8F2igAkR+Y5PNYD5PZ0j21D8aJk9JCY=";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||
sha256 = "sha256-yZMke1raq0Mvu01LFE1aUsTEARZWMS0rAI727FHq6ts=";
|
||||
sha256 = "sha256-Bt18brbJA/XfiyP5o197HDXMuGm+a1AZx92Thoriv78=";
|
||||
};
|
||||
}
|
||||
}:
|
||||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation {
|
|||
mkdir -p $out
|
||||
cp -R * $out/
|
||||
echo $libPath
|
||||
'' + lib.optionalString(stdenv.isLinux) ''
|
||||
'' + lib.optionalString (stdenv.isLinux) ''
|
||||
find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/recp/cglm";
|
||||
description = "Highly Optimized Graphics Math (glm) for C";
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://www.jbig2dec.com/";
|
||||
description = "Decoder implementation of the JBIG2 image compression format";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
license = lib.licenses.agpl3;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, perl, texinfo }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, perl, texinfo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtasn1";
|
||||
|
|
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-FhPwrBz0hNbsDOO4wG1WJjzHJC8cI7MNgtI940WmP3o=";
|
||||
};
|
||||
|
||||
# Patch borrowed from alpine to work around a specific test failure with musl libc
|
||||
# Upstream is patching this test in their own CI because that CI is using alpine and thus musl
|
||||
# https://github.com/gnutls/libtasn1/commit/06e7433c4e587e2ba6df521264138585a63d07c7#diff-037ea159eb0a7cb0ac23b851e66bee30fb838ee8d0d99fa331a1ba65283d37f7R293
|
||||
patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/libtasn1/failed-test.patch?id=aaed9995acc1511d54d5d93e1ea3776caf4aa488";
|
||||
sha256 = "sha256-GTfwqEelEsGtLEcBwGRfBZZz1vKXRfWXtMx/409YqX8=";
|
||||
});
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,17 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-plugins";
|
||||
version = "9.0.0";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shlevy";
|
||||
repo = "nix-plugins";
|
||||
rev = version;
|
||||
hash = "sha256-AkHsZpYM4EY8SNuF6LhxF2peOjp69ICGc3kOLkDms64=";
|
||||
hash = "sha256-7Lo+YxpiRz0+ZLFDvYMJWWK2j0CyPDRoP1wAc+OaPJY=";
|
||||
};
|
||||
|
||||
patches = [ ./nix-2.9.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ nix boost ];
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
diff --git a/extra-builtins.cc b/extra-builtins.cc
|
||||
index 617807a..c417cb3 100644
|
||||
--- a/extra-builtins.cc
|
||||
+++ b/extra-builtins.cc
|
||||
@@ -27,7 +27,7 @@ static ExtraBuiltinsSettings extraBuiltinsSettings;
|
||||
|
||||
static GlobalConfig::Register rp(&extraBuiltinsSettings);
|
||||
|
||||
-static void extraBuiltins(EvalState & state, const Pos & pos,
|
||||
+static void extraBuiltins(EvalState & state, const PosIdx pos,
|
||||
Value ** _args, Value & v)
|
||||
{
|
||||
static auto extraBuiltinsFile = absPath(extraBuiltinsSettings.extraBuiltinsFile);
|
||||
@@ -44,10 +44,10 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
|
||||
auto attrs = state.buildBindings(2);
|
||||
|
||||
auto sExec = state.symbols.create("exec");
|
||||
- attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = sExec });
|
||||
+ attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = "exec" });
|
||||
|
||||
auto sImportNative = state.symbols.create("importNative");
|
||||
- attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = sImportNative });
|
||||
+ attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = "importNative" });
|
||||
|
||||
arg = state.allocValue();
|
||||
arg->mkAttrs(attrs);
|
||||
@@ -64,7 +64,7 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
|
||||
static RegisterPrimOp rp1("__extraBuiltins", 0,
|
||||
extraBuiltins);
|
||||
|
||||
-static void cflags(EvalState & state, const Pos & _pos,
|
||||
+static void cflags(EvalState & state, const PosIdx _pos,
|
||||
Value ** _args, Value & v)
|
||||
{
|
||||
auto attrs = state.buildBindings(3);
|
||||
|
|
@ -388,6 +388,7 @@
|
|||
, "webpack-dev-server"
|
||||
, "copy-webpack-plugin"
|
||||
, "webtorrent-cli"
|
||||
, "wrangler"
|
||||
, "wring"
|
||||
, "write-good"
|
||||
, "@yaegassy/coc-nginx"
|
||||
|
|
|
|||
5464
pkgs/development/node-packages/node-packages.nix
generated
5464
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -550,6 +550,16 @@ final: prev: {
|
|||
buildInputs = [ final.node-gyp-build ];
|
||||
};
|
||||
|
||||
wrangler = prev.wrangler.override (oldAttrs: {
|
||||
dontNpmInstall = true;
|
||||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||
postInstall = ''
|
||||
makeWrapper "$out/lib/node_modules/wrangler/bin/wrangler.js" "$out/bin/wrangler" \
|
||||
--inherit-argv0
|
||||
'';
|
||||
meta = oldAttrs.meta // { broken = before "16.13"; };
|
||||
});
|
||||
|
||||
yaml-language-server = prev.yaml-language-server.override {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -4,9 +4,6 @@ buildDunePackage rec {
|
|||
pname = "lwt_ssl";
|
||||
version = "1.1.3";
|
||||
|
||||
minimumOCamlVersion = "4.02";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aantron";
|
||||
repo = "lwt_ssl";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
, lwt_ssl
|
||||
, magic-mime
|
||||
, mrmime
|
||||
, openssl
|
||||
, pecu
|
||||
, psq
|
||||
, ssl
|
||||
|
|
@ -28,8 +27,6 @@ buildDunePackage rec {
|
|||
substituteInPlace ./vendor/dune --replace "mrmime.prettym" "prettym"
|
||||
'';
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
logs
|
||||
magic-mime
|
||||
|
|
@ -43,7 +40,8 @@ buildDunePackage rec {
|
|||
alcotest-lwt
|
||||
dune-site
|
||||
];
|
||||
doCheck = true;
|
||||
# Check fails with OpenSSL 3
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "An HTTP library with HTTP/2 support written entirely in OCaml";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-python-hcl2";
|
||||
version = "0.3.46";
|
||||
version = "0.3.47";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-At8K/eTXZ8CYDflI7Z7sBhE0VeElPUDk8KYfRJTl1v0=";
|
||||
hash = "sha256-F4vAn6HRvNNc+4ZfGCzUef14bNmxTICwENmaOe3MaHc=";
|
||||
};
|
||||
|
||||
# Nose is required during build process, so can not use `checkInputs`.
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "btrees";
|
||||
version = "4.10.0";
|
||||
version = "4.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "BTrees";
|
||||
inherit version;
|
||||
hash = "sha256-1qsONBDQdNcVQkXW3GSTrobxtQvWCA0TEOuz7N6l3rY=";
|
||||
hash = "sha256-QOPUFrOwMajIYzRQfRIbadnJ3pB+ESNE3lJrVFHZA8U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudflare";
|
||||
version = "2.9.12";
|
||||
version = "2.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-w+ciURz9sJcWmhhjJfvoorFYUBFp0PaLZ55zb2sMwDA=";
|
||||
hash = "sha256-wLgb7HnDSX3OVCVNlBd97iIg+g0ngaDWk7Jcs5fKc7k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "diagrams";
|
||||
version = "0.21.1";
|
||||
version = "0.22.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mingrammer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YoXV5ikkBCSVyGmzEqp+7JLy82d7z9sbwS+U/EN3BFk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-LUuClvBJeOxtrg+S+lYLpP7T1RXCy5dNjFYQO3H54QE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ghapi";
|
||||
version = "1.0.1";
|
||||
version = "1.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "fastai";
|
||||
repo = "ghapi";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-BbgI9SS5NqYCbcT3F+jximVILF2LlyeQyEdR84L6JIc=";
|
||||
sha256 = "sha256-nH3OciLhet4620WAEmm8mUAmlnpniyIsF2oIzqbZ7FI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glfw";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FlorianRhiem";
|
||||
repo = "pyGLFW";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-4Ym3Vmkf+HwORbhR72Ws/cqLkNMPCY8FL35O2hSalGQ=";
|
||||
sha256 = "sha256-puaKveByAEkgME81uePTMSglvMgyqornW1sNAbJXNuc=";
|
||||
};
|
||||
|
||||
# Patch path to GLFW shared object
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.10.1";
|
||||
version = "3.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Un6Fv1Lh4HdYwdU/iR+5JFcPjY2NrFfC9+MkGuaTF8M=";
|
||||
hash = "sha256-5coFy0HkeoLfJdfL5JjGMk/sVNIPZoJahYe5Nwl/bvY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "makefun";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-dwxuRY8e9HMEGFM08daG7iAXVdBhUqh44mRidTQMGB0=";
|
||||
sha256 = "sha256-WxEOcz2U96SdisJ7Hi1A8rsFAemMHYJeDZMtJpIN1d8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix_common";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-qZ3PAqa9lbJKWmGzVIiKKskr8rS4OccnuN2dos36OFM=";
|
||||
sha256 = "sha256-YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ attrs ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mill-local";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyMillLocal";
|
||||
rev = version;
|
||||
sha256 = "sha256-OKaR0hpNVBlaZrEmEmHxqRG1i03XP2Z4c7c35YIqe+I=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-u7TidHD0NzZ1JxYoCWviIXSsXojJHvVNg07eDBFQuls=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mistletoe";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ouNU5lPym8r1WZ2JSFEhGaxgN+nC+O53851VRQ59Gmw=";
|
||||
sha256 = "sha256-PLlteCJtCPDTvwnvyvMw0jkCSSAG4YssBlWOi4a/f68=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "monty";
|
||||
version = "2022.4.26";
|
||||
version = "2022.9.8";
|
||||
disabled = pythonOlder "3.5"; # uses type annotations
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "materialsvirtuallab";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-SQku10nzTSuO5ISUDyDKAEoMhBBxPzyLNhoAyrlKH+E=";
|
||||
sha256 = "sha256-3C5L7nKokuxtYlw13AKSrNVsvKH9okmBNyLXt7Vmjqk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.78.0";
|
||||
version = "2.82.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-24V9vfuNMxvC5iqluW4xz7WICXbQA89xmiAH6tIDRw0=";
|
||||
hash = "sha256-oQCDWLZv7Xa03lYwfn7fjr2/3VN6IDqp96rNN8qfSoE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openwrt-luci-rpc";
|
||||
version = "1.1.11";
|
||||
version = "1.1.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-DkitN+mwCZ14QEn2fTOqUrQTtoncR1ifP3WDSQ6qkkk=";
|
||||
sha256 = "sha256-vLRmv8xxbjBp6TDFExfprqw3JGi8qCVZ5bV7AgVZnuA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pivy";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin3d";
|
||||
repo = "pivy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mU3QRDJd56gGDWqwcxAN3yUCkAkABP/I9gIBMH2MOXA=";
|
||||
hash = "sha256-y72nzZAelyRDR2JS73/0jo2x/XiDZpsERPZV3gzIhAI=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyisy";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "automicus";
|
||||
repo = "PyISY";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FWv5xPUQob+UlTU9eq9HYAhxCDucOZr+ddm5/a0sbgw=";
|
||||
hash = "sha256-Q3KewvZJMq4YKrpS6ir5rqZkDhxGACDIhlbr3b6lDAs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ let
|
|||
if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ];
|
||||
in buildPythonPackage rec {
|
||||
pname = "pyopencl";
|
||||
version = "2022.1.6";
|
||||
version = "2022.2.3";
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
|
||||
|
|
@ -40,7 +40,7 @@ in buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-+Ih9VOZUWY84VEclQLLrIorFa1aiSRuVvfrI8VvhyUM=";
|
||||
sha256 = "sha256-IdpfCKq7wrL9yBRm/6rAfB25Sx9HqVvFf2M7VVkMy6I=";
|
||||
};
|
||||
|
||||
# py.test is not needed during runtime, so remove it from `install_requires`
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3vtyVXWfAIUZuV0kcnT6UniMaHTw11Az7vHdjyouPbI=";
|
||||
hash = "sha256-UIArc0NBg4FM2FjW7r798xbvw5S8gsGiTq7RdQp969E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyPDF2";
|
||||
version = "2.10.6";
|
||||
version = "2.10.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kSKmRB9sELkrAmKpX5wE9VL+RJjybn3G49JvwKWBU84=";
|
||||
sha256 = "sha256-PHkw2fK6JdybGC2cIpOtbeOtryo5NMfoxBeGVa6Mejk=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-mypy-plugins";
|
||||
version = "1.9.3";
|
||||
version = "1.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "typeddjango";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4hG3atahb+dH2dRGAxguJW3vvEf0TUGUJ3G5ymrf3Vg=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-QvUh/vIvzCfEYNC0Y388qavGvbTg0yuT4j0SttUpUWs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-fsutil";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "fabiocaccamo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Swq0kAZTM/zP3LXMkzZnp8KTI0YzGPIbWV2kKV1Dw0k=";
|
||||
hash = "sha256-2T2C2bIOAdxppZxqI+QGE2R/+46LoqB7eNdlt4sVAd8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-songpal";
|
||||
version = "0.15";
|
||||
version = "0.15.1";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "rytilahti";
|
||||
repo = "python-songpal";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NoO3cgviFbXosEnx46nXdW02jYOfRPHUdc1VeCvwBsQ=";
|
||||
rev = "refs/tags/release/${version}";
|
||||
hash = "sha256-FX5pDWjUhrhK5B7zEfvihN77pSNi2QltRu0xbkUdc/c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
, attrs
|
||||
, cached-property
|
||||
, click
|
||||
, six
|
||||
, packaging
|
||||
, pytest-cov
|
||||
, pytest-timeout
|
||||
|
|
@ -14,21 +13,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pythonfinder";
|
||||
version = "1.2.10";
|
||||
version = "1.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sarugaku";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4a648wOh+ASeocevFVh/4Fkq0CEhkFbt+2mWVmb9Bhw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-N/q9zi2SX38ivSpnjrx+bEzdR9cS2ivSgy42SR8cl+Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
cached-property
|
||||
click
|
||||
six
|
||||
packaging
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,14 +6,13 @@
|
|||
, async-timeout
|
||||
, graphql-subscription-manager
|
||||
, python-dateutil
|
||||
, pytz
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.24.0";
|
||||
version = "0.25.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,8 +20,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = version;
|
||||
hash = "sha256-Ib9Rb6RkhUe4WDDHVLgaOYOleSFj7LFys6pW3WgxMQo=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gR2AAI/ZQ7TX48QsTCwv8qZJOGb978nWLP2+cY9XcI8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -30,7 +29,6 @@ buildPythonPackage rec {
|
|||
async-timeout
|
||||
graphql-subscription-manager
|
||||
python-dateutil
|
||||
pytz
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "regenmaschine";
|
||||
version = "2022.09.0";
|
||||
version = "2022.09.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-DEa9bh6dOBMyqgts9UoFOfC97vaZ4d6NPYlKC8ayrgk=";
|
||||
sha256 = "sha256-mii7D93hi+i1F5shED21RoOtN2/RNoYG8vA/+qF8nEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ropgadget";
|
||||
version = "7.0";
|
||||
version = "7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "JonathanSalwan";
|
||||
repo = "ROPgadget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7pGPi1efgxLoxoiqtxzfcSWuNw0otAVgamEzs8stBtc=";
|
||||
hash = "sha256-eVRQQ8VmjT8wTpiTK2Emr1tEpSwFJPbMc1fa2Zh3mT0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "shiv";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ec16095a0565906536af7f5e57771e9ae7a061b646ed63ad66ebbc70c30f4d2a";
|
||||
sha256 = "sha256-BDSfgXSythWUrwVnsg27rHN0nsfumFdX/2e62h239UY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click pip setuptools wheel ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "simple-salesforce";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-eDaqL4CsP5wOqfwrkeWJdg+rlcMnFT3l7A9xgVnhx0w=";
|
||||
sha256 = "sha256-E1tYKcV+7Raw8R7EOwyzCKh5keGxt232lxEQkoYU0Fw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "solax";
|
||||
version = "0.2.10";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-DUXaz9BF1NOG+RSeks9CxLGDz/wWwpZBxwWh4MQapio=";
|
||||
sha256 = "sha256-lqzFY2Rfmc/9KUuFfq07DZkIIS2cJ1JqZ/8gP3+pu5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-docutils";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lJNrGWGqzaYexrsKzxFpzXgwtSMLZFhVwdR4m68ZaF4=";
|
||||
hash = "sha256-ffEzuHEFr0EPxqmSAwpw7p9aLCY2xa/n4N4oXrn9sBU=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deadnix";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astro";
|
||||
repo = "deadnix";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uvW+PCJdpYHaIIi7YM+kXmHlhQgMbkXBGvAd0mzSb1U=";
|
||||
sha256 = "sha256-4IK+vv3R3UzF5anH1swypPIzXXZmTCJ2kS2eGUcYvLk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-cDInmOv1yMedJWHzwGT2wmoUd58ZwKh6IDcOvG65RV8=";
|
||||
cargoSha256 = "sha256-GmvSrU7wDOKc22GU43oFJoYCYiVKQ5Oe6qrLQXLtcyM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Find and remove unused code in .nix source files";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
|
|
@ -13,10 +13,20 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "sha256-jrAd1G/NCjXfaJmzOhMjMZfJoGHsQ1bi3HudBM0e8rE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/circleci-cli $out/bin/circleci
|
||||
|
||||
installShellCompletion --cmd circleci \
|
||||
--bash <($out/bin/circleci completion bash --skip-update-check) \
|
||||
--zsh <($out/bin/circleci completion zsh --skip-update-check)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# Box blurb edited from the AUR package circleci-cli
|
||||
description = ''
|
||||
|
|
@ -24,6 +34,7 @@ buildGoModule rec {
|
|||
run jobs as if they were running on the hosted CirleCI application.
|
||||
'';
|
||||
maintainers = with maintainers; [ synthetica ];
|
||||
mainProgram = "circleci";
|
||||
license = licenses.mit;
|
||||
homepage = "https://circleci.com/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mix2nix";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ydlr";
|
||||
repo = "mix2nix";
|
||||
rev = version;
|
||||
sha256 = "0q4yq8glrdj72j7b9xnwb6j3cli3cccimh9sb7acb4npaiivvf69";
|
||||
sha256 = "0flsw8r4x27qxyrlazzjmjq3zkkppgw9krcdcqj7wbq06r2dck3q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ elixir ];
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ let
|
|||
|
||||
in buildPythonApplication rec {
|
||||
pname = "pipenv";
|
||||
version = "2022.9.2";
|
||||
version = "2022.9.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-EMCIPt0f2Aqin9Yz34JoPCSVjol3i/UMRnNhC/ttv7A=";
|
||||
sha256 = "sha256-tt//Bt6lbjut6S/CZ8LaHwgHxcewkD7vYRX9uJnCtLY=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
|
|
|||
|
|
@ -3,21 +3,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-run";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7o0aRiCxWoDoMysXIPyiBqH/8TtFo87im6Y0OFL0cTA=";
|
||||
sha256 = "sha256-xVxigZET2/7xr+bb3r80F3y0yaNV1JeGeJ2EF0GWa1A=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-vREz3FTZXMrc18LXIycJXX6SgW6IKGIgL/+79dMfNjk=";
|
||||
cargoSha256 = "sha256-MK3F3Kt80Xdbbm68Jv1uh78nAj1LzJ90H54NYdn+Oms=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libusb1 ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv AppKit IOKit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run embedded programs just like native ones.";
|
||||
description = "Run embedded programs just like native ones";
|
||||
homepage = "https://github.com/knurling-rs/probe-run";
|
||||
changelog = "https://github.com/knurling-rs/probe-run/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = pname;
|
||||
repo = "wrangler";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HnenF3X/6tvzwlbuOiQAvB76GrdRsqETG+3fp1fx334=";
|
||||
};
|
||||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cypress";
|
||||
version = "10.3.1";
|
||||
version = "10.8.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
|
||||
sha256 = "sha256-LfvTnvOGFFZn7tUQ150fCO0gw7TK6JJj+Ys75VjJJ2M=";
|
||||
sha256 = "sha256-QKzdK/3WGcNoPPgsCO08rmOFgwgYTI9yvP70HoGvojg=";
|
||||
};
|
||||
|
||||
# don't remove runtime deps
|
||||
|
|
@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Fast, easy and reliable testing for anything that runs in a browser";
|
||||
homepage = "https://www.cypress.io";
|
||||
mainProgram = "Cypress";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ let
|
|||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "5.19.7"; #zen
|
||||
suffix = "zen2"; #zen
|
||||
sha256 = "19hvjbw845g8jhfy6mhjizlkcq26si4mm9nchd3jl5mmbps4k2sp"; #zen
|
||||
version = "5.19.8"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1jqzny85gl2wc029wp96v5x48wpn6nyx6zx9xrxqw0bhrlczzgq7"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "5.19.7"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "0zackpfnc4fmf9hvlcbmw9sdw3hag023k3ppy0iaakrfq44zqnis"; #lqx
|
||||
version = "5.19.8"; #lqx
|
||||
suffix = "lqx2"; #lqx
|
||||
sha256 = "1k1i9fqc0d5p2kp9bwdsp0ccbdfimavx4wpxv48mcnb7b93bpln2"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
|
|
|||
29
pkgs/servers/go-autoconfig/default.nix
Normal file
29
pkgs/servers/go-autoconfig/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-autoconfig";
|
||||
version = "unstable-2022-08-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "L11R";
|
||||
repo = pname;
|
||||
rev = "b1b182202da82cc881dccd715564853395d4f76a";
|
||||
sha256 = "sha256-Rbg6Ghp5NdcLSLSIhwwFFMKmZPWsboDyHCG6ePqSSZA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pI2iucrt7XLLZNOz364kOEulXxPdvJp92OewqnkQEO4=";
|
||||
|
||||
postInstall = ''
|
||||
cp -r templates $out/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "IMAP/SMTP autodiscover feature for Thunderbird, Apple Mail and Microsoft Outlook";
|
||||
homepage = "https://github.com/L11R/go-autoconfig";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
|
|
@ -14,15 +14,15 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "pomerium";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pomerium";
|
||||
repo = "pomerium";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0s5ji1iywymzxlv89y3ivl5vngkifhbpidpwxdrh969l3c5r4klf";
|
||||
sha256 = "sha256-+YcYrhUQMiLUcBnYhTHxf+NrmQIdYpeO/blMgU33w6o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256:1p78nb7bryvs7p5iq6ihylflyjia60x4hd9c62ffwz37dwqlbi33";
|
||||
vendorSha256 = "sha256-Y8RFMW9nfO6cMCw1SDowKkpPHfUwGhzLPXr7vM6y6Nw=";
|
||||
|
||||
ui = mkYarnPackage {
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ in
|
|||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.66.0";
|
||||
version = "1.67.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jrjNl3NlJ9sWNNM/VYrASPnVZ/U9fn1N1P6Yqd+MQ08=";
|
||||
sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -67,7 +67,8 @@ buildPythonApplication rec {
|
|||
--replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" \
|
||||
--replace "PyYAML>=5.4,<6" "PyYAML" \
|
||||
--replace "prompt-toolkit==3.0.29" "prompt-toolkit" \
|
||||
--replace "terminaltables==3.1.0" "terminaltables"
|
||||
--replace "terminaltables==3.1.0" "terminaltables" \
|
||||
--replace "oci==2.78.0" "oci"
|
||||
'';
|
||||
|
||||
# https://github.com/oracle/oci-cli/issues/187
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
runCommandLocal "er-patcher" rec {
|
||||
pname = "er-patcher";
|
||||
version = "1.06-1";
|
||||
version = "1.06-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gurrgur";
|
||||
repo = "er-patcher";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tjGvM+LNvHYX2VbVjwL404jpWWCzJ6j5jRPg/wib4e8=";
|
||||
sha256 = "sha256-rFIuswn55FNVmBoDfIpG2cKxybNDaTwOeIUFFoncGF0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,22 +2,22 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tea";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "gitea.com";
|
||||
owner = "gitea";
|
||||
repo = "tea";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LtLel6JfmYr2Zu7g7oBjAqDcl5y7tJL3XGL7gw+kHxU=";
|
||||
sha256 = "sha256-Bvee8m/BXvPtaaD8xjVg9qzorO0ln6xHP1upPgWoD+A=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorSha256 = "sha256-nb0lQEAaIYlGpodFQLhMk/24DmTgg5K3zQ4s/XY+Z1w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gitea official CLI client";
|
||||
homepage = "https://gitea.com/gitea/tea";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.j4m3s ];
|
||||
maintainers = with maintainers; [ j4m3s techknowlogick ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
diff --git a/checks/system/unix.py b/checks/system/unix.py
|
||||
index c37af3c3..58c72626 100644
|
||||
--- a/checks/system/unix.py
|
||||
+++ b/checks/system/unix.py
|
||||
@@ -39,7 +39,7 @@ class IO(Check):
|
||||
self.value_re = re.compile(r'\d+\.\d+')
|
||||
|
||||
def _parse_linux2(self, output):
|
||||
- recentStats = output.split('Device:')[2].split('\n')
|
||||
+ recentStats = output.split('Device')[2].split('\n')
|
||||
header = recentStats[0]
|
||||
headerNames = re.findall(self.header_re, header)
|
||||
device = None
|
||||
@@ -123,14 +123,14 @@ class IO(Check):
|
||||
|
||||
# Linux 2.6.32-343-ec2 (ip-10-35-95-10) 12/11/2012 _x86_64_ (2 CPU)
|
||||
#
|
||||
- # Device: rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util
|
||||
+ # Device rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util
|
||||
# sda1 0.00 17.61 0.26 32.63 4.23 201.04 12.48 0.16 4.81 0.53 1.73
|
||||
# sdb 0.00 2.68 0.19 3.84 5.79 26.07 15.82 0.02 4.93 0.22 0.09
|
||||
# sdg 0.00 0.13 2.29 3.84 100.53 30.61 42.78 0.05 8.41 0.88 0.54
|
||||
# sdf 0.00 0.13 2.30 3.84 100.54 30.61 42.78 0.06 9.12 0.90 0.55
|
||||
# md0 0.00 0.00 0.05 3.37 1.41 30.01 18.35 0.00 0.00 0.00 0.00
|
||||
#
|
||||
- # Device: rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util
|
||||
+ # Device rrqm/s wrqm/s r/s w/s rkB/s wkB/s avgrq-sz avgqu-sz await svctm %util
|
||||
# sda1 0.00 0.00 0.00 10.89 0.00 43.56 8.00 0.03 2.73 2.73 2.97
|
||||
# sdb 0.00 0.00 0.00 2.97 0.00 11.88 8.00 0.00 0.00 0.00 0.00
|
||||
# sdg 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00
|
||||
|
|
@ -1,108 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python2
|
||||
, unzip, makeWrapper }:
|
||||
let
|
||||
python' = python2.override {
|
||||
packageOverrides = self: super: {
|
||||
docker = self.buildPythonPackage rec {
|
||||
name = "docker-${version}";
|
||||
version = "1.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "docker-py";
|
||||
rev = version;
|
||||
sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
six
|
||||
requests
|
||||
websocket-client
|
||||
docker_pycreds
|
||||
uptime
|
||||
] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];
|
||||
|
||||
# due to flake8
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
pymongo = super.pymongo.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.9.5";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "912516ac6a355d7624374a38337b8587afe3eb535c0a5456b3bd12df637a6e70";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "5.11.2";
|
||||
pname = "dd-agent";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datadog";
|
||||
repo = "dd-agent";
|
||||
rev = version;
|
||||
sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx";
|
||||
};
|
||||
|
||||
patches = [ ./40103-iostat-fix.patch ];
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
buildInputs = with python'.pkgs; [
|
||||
requests
|
||||
psycopg2
|
||||
psutil
|
||||
ntplib
|
||||
simplejson
|
||||
pyyaml
|
||||
pymongo
|
||||
python-etcd
|
||||
consul
|
||||
docker
|
||||
];
|
||||
propagatedBuildInputs = with python'.pkgs; [ python tornado ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
cp -R $src $out/agent
|
||||
chmod u+w -R $out
|
||||
(cd $out/agent; patchPhase)
|
||||
PYTHONPATH=$out/agent:$PYTHONPATH
|
||||
ln -s $out/agent/agent.py $out/bin/dd-agent
|
||||
ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd
|
||||
ln -s $out/agent/ddagent.py $out/bin/dd-forwarder
|
||||
|
||||
# Move out default conf.d so that /etc/dd-agent/conf.d is used
|
||||
mv $out/agent/conf.d $out/agent/conf.d-system
|
||||
|
||||
cat > $out/bin/dd-jmxfetch <<EOF
|
||||
#!/usr/bin/env bash
|
||||
exec ${python'.interpreter} $out/agent/jmxfetch.py $@
|
||||
EOF
|
||||
chmod a+x $out/bin/dd-jmxfetch
|
||||
|
||||
wrapProgram $out/bin/dd-forwarder \
|
||||
--prefix PYTHONPATH : $PYTHONPATH
|
||||
wrapProgram $out/bin/dd-agent \
|
||||
--prefix PYTHONPATH : $PYTHONPATH
|
||||
wrapProgram $out/bin/dogstatsd \
|
||||
--prefix PYTHONPATH : $PYTHONPATH
|
||||
wrapProgram $out/bin/dd-jmxfetch \
|
||||
--prefix PYTHONPATH : $PYTHONPATH
|
||||
|
||||
patchShebangs $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = ''
|
||||
Event collector for the DataDog analysis service
|
||||
-- v5 Python implementation
|
||||
'';
|
||||
homepage = "https://www.datadoghq.com";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ thoughtpolice domenkozar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Command line client for Mega.co.nz";
|
||||
homepage = "https://megatools.megous.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ viric AndersonTorres zowoq ];
|
||||
maintainers = with maintainers; [ viric AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchFromGitHub, fetchzip, stdenv }:
|
||||
|
||||
rec {
|
||||
version = "0.108.0";
|
||||
version = "0.112.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "returntocorp";
|
||||
repo = "semgrep";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Vdrv7lVPsBsxkwwfviD5zRAdsD02RfWmM+IlaThduQs=";
|
||||
sha256 = "sha256-SZtxZz4x6YUKw1uO5HQTU4lRY989SoCNsPQphJr+L0Y=";
|
||||
};
|
||||
|
||||
# submodule dependencies
|
||||
|
|
@ -17,25 +17,25 @@ rec {
|
|||
langsSrc = fetchFromGitHub {
|
||||
owner = "returntocorp";
|
||||
repo = "semgrep-langs";
|
||||
rev = "98e4aacb0d58539b50a642a28d916a5d749e2a42";
|
||||
sha256 = "sha256-7w+8vLmzqBjbeV+a4Br7kLQ2bJv3aZJw8cB0R9d/D+E=";
|
||||
rev = "91e288062eb794e8a5e6967d1009624237793491";
|
||||
sha256 = "sha256-z2t2bTRyj5zu9h/GBg2YeRFimpJsd3dA7dK8VBaKzHo=";
|
||||
};
|
||||
|
||||
interfacesSrc = fetchFromGitHub {
|
||||
owner = "returntocorp";
|
||||
repo = "semgrep-interfaces";
|
||||
rev = "bad298d06a5dc50e69b6818ba73f0cc9b9a17b58";
|
||||
sha256 = "sha256-AgNSvjVsP4b4zwkmq6BoNcOX3xdCSnQmXK+fVSkDXxQ=";
|
||||
rev = "7bc457a32e088ef21adf1529fa0ddeea634b9131";
|
||||
sha256 = "sha256-xN8Qm1/YLa49k9fZKDoPPmHASI2ipI3mkKlwEK2ajO4=";
|
||||
};
|
||||
|
||||
# fetch pre-built semgrep-core since the ocaml build is complex and relies on
|
||||
# the opam package manager at some point
|
||||
coreRelease = if stdenv.isDarwin then fetchzip {
|
||||
url = "https://github.com/returntocorp/semgrep/releases/download/v${version}/semgrep-v${version}-osx.zip";
|
||||
sha256 = "sha256-f3ah4yGvtUL3Ievz+3hhh5Am1YMplRxsRQzdRAoF9uU=";
|
||||
sha256 = "sha256-JiOH39vMDL6r9WKuPO0CDkRwGZtzl/GIFoSegVddFpw=";
|
||||
} else fetchzip {
|
||||
url = "https://github.com/returntocorp/semgrep/releases/download/v${version}/semgrep-v${version}-ubuntu-16.04.tgz";
|
||||
sha256 = "sha256-qie9svlzRoAsI33W+Sxh4YTVk1iPV0NVXfzfKlEUul4=";
|
||||
sha256 = "sha256-V6r+VQrgz8uVSbRa2AmW4lnLxovk63FL7LqVKD46RBw=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, semgrep-core
|
||||
, buildPythonApplication
|
||||
, pythonPackages
|
||||
, pythonRelaxDepsHook
|
||||
|
||||
, pytestCheckHook
|
||||
, git
|
||||
|
|
@ -19,12 +20,15 @@ buildPythonApplication rec {
|
|||
|
||||
SEMGREP_CORE_BIN = "${semgrep-core}/bin/semgrep-core";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "typing-extensions~=4.2" "typing-extensions" \
|
||||
--replace "jsonschema~=3.2" "jsonschema" \
|
||||
--replace "boltons~=21.0" "boltons"
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
pythonRelaxDeps = [
|
||||
"attrs"
|
||||
"boltons"
|
||||
"jsonschema"
|
||||
"typing-extensions"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# remove git submodule placeholders
|
||||
rm -r ./src/semgrep/{lang,semgrep_interfaces}
|
||||
# link submodule dependencies
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "solo2-cli";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solokeys";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CRufj4SAkM0Qdffq45dp41TUqnnWep4zCB0XrEjdoG8=";
|
||||
sha256 = "sha256-+n+tc3BDHr93yc2TzvI1Xqpcl8fM+bF/KZdv0rWfIZ8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Q6/Vi5TB0H3OQ4np/DYIpTOsTPTSDjHonFI24LJ5gWE=";
|
||||
cargoSha256 = "sha256-2bBo5HXLYQj+R47exPyMbx/RIrykDHjRkLRNMjVAzEI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -309,6 +309,7 @@ mapAliases ({
|
|||
dbus_libs = throw "'dbus_libs' has been renamed to/replaced by 'dbus'"; # Converted to throw 2022-02-22
|
||||
dbus_tools = throw "'dbus_tools' has been renamed to/replaced by 'dbus.out'"; # Converted to throw 2022-02-22
|
||||
dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20
|
||||
dd-agent = throw "dd-agent has been removed in favor of the newer datadog-agent"; # Added 2022-04-26
|
||||
ddar = throw "ddar has been removed: abandoned by upstream"; # Added 2022-03-18
|
||||
deadbeef-mpris2-plugin = throw "'deadbeef-mpris2-plugin' has been renamed to/replaced by 'deadbeefPlugins.mpris2'"; # Converted to throw 2022-02-22
|
||||
deadpixi-sam = deadpixi-sam-unstable;
|
||||
|
|
|
|||
|
|
@ -5936,7 +5936,7 @@ with pkgs;
|
|||
|
||||
schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
|
||||
electron = electron_17;
|
||||
electron = electron_20;
|
||||
};
|
||||
schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" ''
|
||||
#!/bin/sh
|
||||
|
|
@ -6011,7 +6011,9 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
wrangler = callPackage ../development/tools/wrangler {
|
||||
inherit (nodePackages_latest) wrangler;
|
||||
|
||||
wrangler_1 = callPackage ../development/tools/wrangler_1 {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
|
||||
};
|
||||
|
||||
|
|
@ -8060,6 +8062,8 @@ with pkgs;
|
|||
|
||||
kpcli = callPackage ../tools/security/kpcli { };
|
||||
|
||||
kphotoalbum = libsForQt5.callPackage ../applications/graphics/kphotoalbum { };
|
||||
|
||||
kratos = callPackage ../applications/misc/kratos { };
|
||||
|
||||
krename = libsForQt5.callPackage ../applications/misc/krename { };
|
||||
|
|
@ -10763,7 +10767,7 @@ with pkgs;
|
|||
|
||||
safe-rm = callPackage ../tools/system/safe-rm { };
|
||||
|
||||
safeeyes = callPackage ../applications/misc/safeeyes { };
|
||||
safeeyes = with python3.pkgs; toPythonApplication safeeyes;
|
||||
|
||||
sahel-fonts = callPackage ../data/fonts/sahel-fonts { };
|
||||
|
||||
|
|
@ -22921,6 +22925,8 @@ with pkgs;
|
|||
|
||||
nats-server = callPackage ../servers/nats-server { };
|
||||
|
||||
go-autoconfig = callPackage ../servers/go-autoconfig { };
|
||||
|
||||
go-camo = callPackage ../servers/http/go-camo { };
|
||||
|
||||
gofish = callPackage ../servers/gopher/gofish { };
|
||||
|
|
@ -27116,7 +27122,6 @@ with pkgs;
|
|||
|
||||
das_watchdog = callPackage ../tools/system/das_watchdog { };
|
||||
|
||||
dd-agent = callPackage ../tools/networking/dd-agent/5.nix { };
|
||||
datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix {
|
||||
pythonPackages = datadog-integrations-core {};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9781,6 +9781,8 @@ in {
|
|||
|
||||
safe = callPackage ../development/python-modules/safe { };
|
||||
|
||||
safeeyes = callPackage ../applications/misc/safeeyes { };
|
||||
|
||||
safeio = callPackage ../development/python-modules/safeio { };
|
||||
|
||||
safety = callPackage ../development/python-modules/safety { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue