alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-04-20 00:11:42 +00:00 committed by GitHub
parent a4f5f8b2e5 f864e4613b
commit d7f6c4a239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
176 changed files with 1219 additions and 908 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View file

@ -9245,6 +9245,13 @@
githubId = 2057309;
name = "Sergey Sofeychuk";
};
lx = {
email = "alex@adnab.me";
github = "Alexis211";
githubId = 101484;
matrix = "@lx:deuxfleurs.fr";
name = "Alex Auvolat";
};
lxea = {
email = "nix@amk.ie";
github = "lxea";

2
nixos/doc/manual/release-notes/rl-2305.section.md
View file

@ -107,6 +107,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [trurl](https://github.com/curl/trurl), a command line tool for URL parsing and manipulation.
- [wgautomesh](https://git.deuxfleurs.fr/Deuxfleurs/wgautomesh), a simple utility to help connect wireguard nodes together in a full mesh topology. Available as [services.wgautomesh](options.html#opt-services.wgautomesh.enable).
- [woodpecker-agents](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-agents](#opt-services.woodpecker-agents.agents._name_.enable).
- [woodpecker-server](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-server](#opt-services.woodpecker-server.enable).

2
nixos/modules/installer/tools/nixos-generate-config.pl
View file

@ -200,7 +200,7 @@ sub pciCheck {
}
# In case this is a virtio scsi device, we need to explicitly make this available.
if ($vendor eq "0x1af4" && $device eq "0x1004") {
if ($vendor eq "0x1af4" && ($device eq "0x1004" || $device eq "0x1048") ) {
push @initrdAvailableKernelModules, "virtio_scsi";
}

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

@ -1044,6 +1044,7 @@
./services/networking/wg-netmanager.nix
./services/networking/webhook.nix
./services/networking/wg-quick.nix
./services/networking/wgautomesh.nix
./services/networking/wireguard.nix
./services/networking/wpa_supplicant.nix
./services/networking/wstunnel.nix

161
nixos/modules/services/networking/wgautomesh.nix Normal file
View file

@ -0,0 +1,161 @@
{ lib, config, pkgs, ... }:
with lib;
let
cfg = config.services.wgautomesh;
settingsFormat = pkgs.formats.toml { };
configFile =
# Have to remove nulls manually as TOML generator will not just skip key
# if value is null
settingsFormat.generate "wgautomesh-config.toml"
(filterAttrs (k: v: v != null)
(mapAttrs
(k: v:
if k == "peers"
then map (e: filterAttrs (k: v: v != null) e) v
else v)
cfg.settings));
runtimeConfigFile =
if cfg.enableGossipEncryption
then "/run/wgautomesh/wgautomesh.toml"
else configFile;
in
{
options.services.wgautomesh = {
enable = mkEnableOption (mdDoc "the wgautomesh daemon");
logLevel = mkOption {
type = types.enum [ "trace" "debug" "info" "warn" "error" ];
default = "info";
description = mdDoc "wgautomesh log level.";
};
enableGossipEncryption = mkOption {
type = types.bool;
default = true;
description = mdDoc "Enable encryption of gossip traffic.";
};
gossipSecretFile = mkOption {
type = types.path;
description = mdDoc ''
File containing the shared secret key to use for gossip encryption.
Required if `enableGossipEncryption` is set.
'';
};
enablePersistence = mkOption {
type = types.bool;
default = true;
description = mdDoc "Enable persistence of Wireguard peer info between restarts.";
};
openFirewall = mkOption {
type = types.bool;
default = true;
description = mdDoc "Automatically open gossip port in firewall (recommended).";
};
settings = mkOption {
type = types.submodule {
freeformType = settingsFormat.type;
options = {
interface = mkOption {
type = types.str;
description = mdDoc ''
Wireguard interface to manage (it is NOT created by wgautomesh, you
should use another NixOS option to create it such as
`networking.wireguard.interfaces.wg0 = {...};`).
'';
example = "wg0";
};
gossip_port = mkOption {
type = types.port;
description = mdDoc ''
wgautomesh gossip port, this MUST be the same number on all nodes in
the wgautomesh network.
'';
default = 1666;
};
lan_discovery = mkOption {
type = types.bool;
default = true;
description = mdDoc "Enable discovery of peers on the same LAN using UDP broadcast.";
};
upnp_forward_external_port = mkOption {
type = types.nullOr types.port;
default = null;
description = mdDoc ''
Public port number to try to redirect to this machine's Wireguard
daemon using UPnP IGD.
'';
};
peers = mkOption {
type = types.listOf (types.submodule {
options = {
pubkey = mkOption {
type = types.str;
description = mdDoc "Wireguard public key of this peer.";
};
address = mkOption {
type = types.str;
description = mdDoc ''
Wireguard address of this peer (a single IP address, multliple
addresses or address ranges are not supported).
'';
example = "10.0.0.42";
};
endpoint = mkOption {
type = types.nullOr types.str;
description = mdDoc ''
Bootstrap endpoint for connecting to this Wireguard peer if no
other address is known or none are working.
'';
default = null;
example = "wgnode.mydomain.example:51820";
};
};
});
default = [ ];
description = mdDoc "wgautomesh peer list.";
};
};
};
default = { };
description = mdDoc "Configuration for wgautomesh.";
};
};
config = mkIf cfg.enable {
services.wgautomesh.settings = {
gossip_secret_file = mkIf cfg.enableGossipEncryption "$CREDENTIALS_DIRECTORY/gossip_secret";
persist_file = mkIf cfg.enablePersistence "/var/lib/wgautomesh/state";
};
systemd.services.wgautomesh = {
path = [ pkgs.wireguard-tools ];
environment = { RUST_LOG = "wgautomesh=${cfg.logLevel}"; };
description = "wgautomesh";
serviceConfig = {
Type = "simple";
ExecStart = "${getExe pkgs.wgautomesh} ${runtimeConfigFile}";
Restart = "always";
RestartSec = "30";
LoadCredential = mkIf cfg.enableGossipEncryption [ "gossip_secret:${cfg.gossipSecretFile}" ];
ExecStartPre = mkIf cfg.enableGossipEncryption [
''${pkgs.envsubst}/bin/envsubst \
-i ${configFile} \
-o ${runtimeConfigFile}''
];
DynamicUser = true;
StateDirectory = "wgautomesh";
StateDirectoryMode = "0700";
RuntimeDirectory = "wgautomesh";
AmbientCapabilities = "CAP_NET_ADMIN";
CapabilityBoundingSet = "CAP_NET_ADMIN";
};
wantedBy = [ "multi-user.target" ];
};
networking.firewall.allowedUDPPorts =
mkIf cfg.openFirewall [ cfg.settings.gossip_port ];
};
}

1
nixos/modules/services/printing/cupsd.nix
View file

@ -317,6 +317,7 @@ in
environment.etc.cups.source = "/var/lib/cups";
services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
services.udev.packages = cfg.drivers;
# Allow asswordless printer admin for members of wheel group
security.polkit.extraConfig = mkIf polkitEnabled ''

10
nixos/modules/services/security/fail2ban.nix
View file

@ -78,6 +78,13 @@ in
'';
};
bantime = mkOption {
default = null;
type = types.nullOr types.str;
example = "10m";
description = lib.mdDoc "Number of seconds that a host is banned.";
};
maxretry = mkOption {
default = 3;
type = types.ints.unsigned;
@ -320,6 +327,9 @@ in
''}
# Miscellaneous options
ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}
${optionalString (cfg.bantime != null) ''
bantime = ${cfg.bantime}
''}
maxretry = ${toString cfg.maxretry}
backend = systemd
# Actions

2
nixos/modules/services/web-apps/moodle.nix
View file

@ -56,7 +56,7 @@ let
mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
phpExt = pkgs.php80.buildEnv {
phpExt = pkgs.php81.buildEnv {
extensions = { all, ... }: with all; [ iconv mbstring curl openssl tokenizer soap ctype zip gd simplexml dom intl sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache exif sodium ];
extraConfig = "max_input_vars = 5000";
};

4
nixos/modules/virtualisation/multipass.nix
View file

@ -33,8 +33,8 @@ in
description = "Multipass orchestrates virtual Ubuntu instances.";
wantedBy = [ "multi-user.target" ];
wants = [ "network.target" ];
after = [ "network.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
environment = {
"XDG_DATA_HOME" = "/var/lib/multipass/data";

1
nixos/tests/power-profiles-daemon.nix
View file

@ -6,6 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
maintainers = [ mvnetbiz ];
};
nodes.machine = { pkgs, ... }: {
security.polkit.enable = true;
services.power-profiles-daemon.enable = true;
environment.systemPackages = [ pkgs.glib ];
};

4
pkgs/applications/audio/airwindows-lv2/default.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "airwindows-lv2";
version = "16.0";
version = "18.0";
src = fetchFromGitHub {
owner = "hannesbraun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jdeJ/VAJTDeiR9pyYps82F2Ty16r+a/FK+XV5L3rWco=";
sha256 = "sha256-06mfTvt0BXHUGZG2rnEbuOPIP+jD76mQZTo+m4b4lo4=";
};
nativeBuildInputs = [ meson ninja pkg-config ];

4
pkgs/applications/misc/cpu-x/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "cpu-x";
version = "4.5.2";
version = "4.5.3";
src = fetchFromGitHub {
owner = "X0rg";
repo = "CPU-X";
rev = "v${version}";
sha256 = "sha256-VPmwnzoOBNLDYZsoEknbcX7QP2Tcm08pL/rw1uCK8xM=";
sha256 = "sha256-o48NkOPabfnwsu+nyXJOstW6g0JSUgIrEFx1nNCR7XE=";
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];

4
pkgs/applications/misc/crow-translate/default.nix
View file

@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "crow-translate";
version = "2.10.3";
version = "2.10.4";
src = fetchzip {
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
hash = "sha256-K6mYzR4EIBHd0w/6Dpx4ldX4iDFszmfSLT6jNTfJlDQ=";
hash = "sha256-M2vAH1YAvNOhDsz+BWxvteR8YX89FHtbUcQZr1uVoCs=";
};
patches = [

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "hstr";
version = "2.6";
version = "3.1";
src = fetchFromGitHub {
owner = "dvorka";
repo = "hstr";
rev = version;
sha256 = "sha256-yfaDISnTDb20DgMOvh6jJYisV6eL/Mp5jafnWEnFG8c=";
hash = "sha256-OuLy1aiEwUJDGy3+UXYF1Vx1nNXic46WIZEM1xrIPfA=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

11
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -221,12 +221,13 @@ buildStdenv.mkDerivation ({
"profilingPhase"
];
patches = lib.optionals (lib.versionOlder version "102.6.0") [
patches = lib.optionals (lib.versionAtLeast version "112.0" && lib.versionOlder version "113.0") [
(fetchpatch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
name = "rust-cbindgen-0.24.2-compat.patch";
url = "https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch";
hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o=";
# Crash when desktop scaling does not divide window scale on Wayland
# https://bugzilla.mozilla.org/show_bug.cgi?id=1803016
name = "mozbz1803016.patch";
url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb";
hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA=";
})
]
++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch

10
pkgs/applications/networking/browsers/librewolf/src.json
View file

@ -1,11 +1,11 @@
{
"packageVersion": "112.0-1",
"packageVersion": "112.0.1-1",
"source": {
"rev": "112.0-1",
"sha256": "1qjckchx20bf20z05g8m7hqm68v4hpn20fbs52l19z87irglmmfk"
"rev": "112.0.1-1",
"sha256": "0bk3idpl11n4gwk8rgfi2pilwx9n56s8dpp7y599h17mlrsw8az4"
},
"firefox": {
"version": "112.0",
"sha512": "6b2bc8c0c93f3109da27168fe7e8f734c6ab4efb4ca56ff2d5e3a52659da71173bba2104037a000623833be8338621fca482f39f836e3910fe2996e6d0a68b39"
"version": "112.0.1",
"sha512": "23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50"
}
}

33
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv
, fetchurl
, makeDesktopItem
, writeText
# Common run-time dependencies
, zlib
@ -112,6 +113,19 @@ let
hash = "sha256-mi8btxI6de5iQ8HzNpvuFdJHjzi03zZJT65dsWEiDHA=";
};
};
distributionIni = writeText "distribution.ini" (lib.generators.toINI {} {
# Some light branding indicating this build uses our distro preferences
Global = {
id = "nixos";
version = "1.0";
about = "Tor Browser for NixOS";
};
});
policiesJson = writeText "policies.json" (builtins.toJSON {
policies.DisableAppUpdate = true;
});
in
stdenv.mkDerivation rec {
pname = "tor-browser-bundle-bin";
@ -132,7 +146,9 @@ stdenv.mkDerivation rec {
categories = [ "Network" "WebBrowser" "Security" ];
};
buildCommand = ''
buildPhase = ''
runHook preBuild
# For convenience ...
TBB_IN_STORE=$out/share/tor-browser
interp=$(< $NIX_CC/nix-support/dynamic-linker)
@ -209,7 +225,7 @@ stdenv.mkDerivation rec {
// Insist on using IPC for communicating with Tor
//
// Defaults to creating \$TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket
// Defaults to creating \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket
lockPref("extensions.torlauncher.control_port_use_ipc", true);
lockPref("extensions.torlauncher.socks_port_use_ipc", true);
@ -331,6 +347,7 @@ stdenv.mkDerivation rec {
echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");"
echo "user_pref(\"extensions.torlauncher.torrc_path\", \"\$HOME/TorBrowser/Data/Tor/torrc\");"
echo "user_pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/TorBrowser/Data/Tor\");"
echo "user_pref(\"network.proxy.socks\", \"file://\$XDG_RUNTIME_DIR/Tor/socks.socket\");"
} >> "\$HOME/TorBrowser/Data/Browser/profile.default/prefs.js"
# Lift-off
@ -416,6 +433,18 @@ stdenv.mkDerivation rec {
echo "Checking tor-browser wrapper ..."
TBB_HOME=$(mktemp -d) \
$out/bin/tor-browser --version >/dev/null
runHook postBuild
'';
installPhase = ''
runHook preInstall
# Install distribution customizations
install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini
install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json
runHook postInstall
'';
meta = with lib; {

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

@ -1,8 +1,6 @@
{ darwin, fetchFromGitHub, rustPlatform, lib, stdenv }:
with rustPlatform;
buildRustPackage rec {
rustPlatform.buildRustPackage rec {
pname = "click";
version = "0.4.2";

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "glooctl";
version = "1.13.11";
version = "1.13.12";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-K3tk55YPgBSF0YrxSw8zypnzgwEiyEPAAbiGyuKId9o=";
hash = "sha256-JGmt07aXcxbPH772oWTD7YPvLLuxZGy8rdXEN1EgCNc=";
};
subPackages = [ "projects/gloo/cli/cmd" ];

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

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "kaniko";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "kaniko";
rev = "v${version}";
hash = "sha256-sPICsDgkijQ7PyeTWQgT553toc4/rWPPo7SY3ptX82U=";
hash = "sha256-dXQ0/o1qISv+sjNVIpfF85bkbM9sGOGwqVbWZpMWfMY=";
};
vendorHash = null;

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

@ -182,13 +182,13 @@
"vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI="
},
"buildkite": {
"hash": "sha256-4Bbod7IuinZE28AZ2r1BBrexgbS29jEpwtG8aTKj7M8=",
"hash": "sha256-gITbMnNrqkef+giXXm9RVSLZJdWpKkqPT0rifF+0l1U=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite",
"repo": "terraform-provider-buildkite",
"rev": "v0.14.0",
"rev": "v0.15.0",
"spdx": "MIT",
"vendorHash": "sha256-dN5oNNO5lf8dUfk9SDUH3f3nA0CNoJyfTqk+Z5lwTz8="
"vendorHash": "sha256-X79ZrkKWhbyozSr3fhMmIRKZnB5dY/T1oQ7haaXuhEI="
},
"checkly": {
"hash": "sha256-tdimESlkfRO/kdA6JOX72vQNXFLJZ9VKwPRxsJo5WFI=",
@ -318,13 +318,13 @@
"vendorHash": null
},
"dns": {
"hash": "sha256-qLKlnw0vnPvxJluvUiBERu1YdtrRklocVw314/lvQT4=",
"hash": "sha256-pTBPSiPO84L9vhBv4mJIMJP0UNVwrz/MX0YCZODwb7s=",
"homepage": "https://registry.terraform.io/providers/hashicorp/dns",
"owner": "hashicorp",
"repo": "terraform-provider-dns",
"rev": "v3.2.4",
"rev": "v3.3.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk="
"vendorHash": "sha256-wx8BXlobu86Nk9D8o5loKhbO14ANI+shFQ2i7jswKgE="
},
"dnsimple": {
"hash": "sha256-d3kbHf17dBnQC5FOCcqGeZ/6+qV1pxvEJ9IZwXoodFc=",
@ -419,11 +419,11 @@
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
},
"github": {
"hash": "sha256-GlNOYpIRX+DL7cfBsst83MdW/SXmh16L+MwDSFLzXYo=",
"hash": "sha256-iFYYKFPa9+pTpmTddFzqB1yRwBnp8NG281oxQP7V6+U=",
"homepage": "https://registry.terraform.io/providers/integrations/github",
"owner": "integrations",
"repo": "terraform-provider-github",
"rev": "v5.22.0",
"rev": "v5.23.0",
"spdx": "MIT",
"vendorHash": null
},
@ -602,13 +602,13 @@
"vendorHash": "sha256-vSIeSEzyJQzh9Aid/FWsF4xDYXMOhbsaLQ31mtfH7/Y="
},
"kafka": {
"hash": "sha256-p8KT6K9fcd0OFy+NoZyZzQxG13fIiyMJg2yNPKIWH60=",
"hash": "sha256-IG0xgMs0j2jRJBa52Wsx7/r4s9DRnw5b+AfYpZAewxI=",
"homepage": "https://registry.terraform.io/providers/Mongey/kafka",
"owner": "Mongey",
"repo": "terraform-provider-kafka",
"rev": "v0.5.2",
"rev": "v0.5.3",
"spdx": "MIT",
"vendorHash": "sha256-RzC8j+Toub7kiOKW6IppjwyJ0vGEJ0YHb8YXrWFkZW4="
"vendorHash": "sha256-Z5APR41/+MsrHAtpTZKnG0qTi1+JSBJbPTVxNpd6f84="
},
"kafka-connect": {
"hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=",
@ -801,11 +801,11 @@
},
"nutanix": {
"deleteVendor": true,
"hash": "sha256-PQwP2xIh635pc8nL0qhiUUqaf5Dm8uERFk61LUk6Xmc=",
"hash": "sha256-szqvEU1cxEIBKIeHmeqT6YAEsXZDvINxfDyp76qswzw=",
"homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
"owner": "nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.8.0",
"rev": "v1.8.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},

4
pkgs/applications/networking/dyndns/cfdyndns/default.nix
View file

@ -1,8 +1,6 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
with rustPlatform;
buildRustPackage rec {
rustPlatform.buildRustPackage rec {
pname = "cfdyndns";
version = "0.0.3";
src = fetchFromGitHub {

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hydroxide";
version = "0.2.25";
version = "0.2.26";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YBaimsHRmmh5d98c9x56JIyOOnkZsypxdqlSCG6pVJ4=";
sha256 = "sha256-UCS49P83dGTD/Wx95Mslstm2C6hKgJB/1tJTZmmwLDg=";
};
vendorHash = "sha256-OLsJc/AMtD03KA8SN5rsnaq57/cB7bMB/f7FfEjErEU=";

40
pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock generated
View file

@ -189,12 +189,12 @@ dependencies = [
[[package]]
name = "async-imap"
version = "0.6.0"
source = "git+https://github.com/async-email/async-imap?branch=master#90270474a5a494669e7c63c13471d189afdc98ae"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce"
dependencies = [
"async-channel",
"async-native-tls 0.4.0",
"base64 0.13.1",
"base64 0.21.0",
"byte-pool",
"chrono",
"futures",
@ -218,18 +218,6 @@ dependencies = [
"event-listener",
]
[[package]]
name = "async-native-tls"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
dependencies = [
"native-tls",
"thiserror",
"tokio",
"url",
]
[[package]]
name = "async-native-tls"
version = "0.5.0"
@ -494,9 +482,9 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]]
name = "byte-pool"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca"
checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158"
dependencies = [
"crossbeam-queue",
"stable_deref_trait",
@ -836,9 +824,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
version = "0.5.7"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if",
"crossbeam-utils",
@ -1061,13 +1049,13 @@ dependencies = [
[[package]]
name = "deltachat"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"ansi_term",
"anyhow",
"async-channel",
"async-imap",
"async-native-tls 0.5.0",
"async-native-tls",
"async-smtp",
"async_zip",
"backtrace",
@ -1135,7 +1123,7 @@ dependencies = [
[[package]]
name = "deltachat-jsonrpc"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"anyhow",
"async-channel",
@ -1158,7 +1146,7 @@ dependencies = [
[[package]]
name = "deltachat-repl"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"ansi_term",
"anyhow",
@ -1173,7 +1161,7 @@ dependencies = [
[[package]]
name = "deltachat-rpc-server"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"anyhow",
"deltachat",
@ -1197,7 +1185,7 @@ dependencies = [
[[package]]
name = "deltachat_ffi"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"anyhow",
"deltachat",

11
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View file

@ -21,17 +21,16 @@
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
version = "1.112.6";
version = "1.112.7";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
hash = "sha256-xadf6N5x3zdefwsKUFaVs71HmLMpJoUq5LL7IENsvC0=";
hash = "sha256-zBstNj8IZ8ScwZxzvTxDPwe8R0n2z/EuvjbR+bJepJk=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"async-imap-0.6.0" = "sha256-q6ZDm+4i+EtiMgkW/8LQ/TkDO/sj0p7KJhpYE76zAjo=";
"email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
@ -53,16 +52,16 @@ let
};
in buildNpmPackage rec {
pname = "deltachat-desktop";
version = "1.36.2";
version = "1.36.3";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-0f3i+ZmORq1IDdzsIJo7e4lCnC3K1B5SY9pjpGM8+ro=";
hash = "sha256-OmAWABZLTNU8EzXl2Rp/Y4DJcaqXuMt14ReaJbHx/u8=";
};
npmDepsHash = "sha256-9gfqVFGmouGd+E78/GDKyanHEvA37OZSR1zBEpVOYF0=";
npmDepsHash = "sha256-u2hYIhXGMnjAp5T2h4THcTL5Om4Zg8aTO3NpSiphAXc=";
nativeBuildInputs = [
makeWrapper

8
pkgs/applications/networking/instant-messengers/discord/linux.nix
View file

@ -6,9 +6,10 @@
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
, libunity
, speechd
, wayland
, branch
, common-updater-scripts, withOpenASAR ? false }:
, common-updater-scripts, withOpenASAR ? false, withTTS ? false }:
let
disableBreakingUpdates = runCommand "disable-breaking-updates.py"
@ -46,7 +47,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true;
libPath = lib.makeLibraryPath [
libPath = lib.makeLibraryPath ([
libcxx
systemd
libpulseaudio
@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
libappindicator-gtk3
libdbusmenu
wayland
];
] ++ lib.optional withTTS speechd);
installPhase = ''
runHook preInstall
@ -102,6 +103,7 @@ stdenv.mkDerivation rec {
wrapProgramShell $out/opt/${binaryName}/${binaryName} \
"''${gappsWrapperArgs[@]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \
${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
--run "${lib.getExe disableBreakingUpdates}"

12
pkgs/applications/networking/instant-messengers/ferdium/default.nix
View file

@ -1,16 +1,22 @@
{ lib, mkFranzDerivation, fetchurl, xorg }:
{ lib, mkFranzDerivation, fetchurl, xorg, nix-update-script }:
mkFranzDerivation rec {
pname = "ferdium";
name = "Ferdium";
version = "6.2.4";
version = "6.2.6";
src = fetchurl {
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
sha256 = "sha256-iat0d06IhupMVYfK8Ot14gBY+5rHO4e/lVYqbX9ucIo=";
sha256 = "sha256-jG3NdolWqQzj/62jYwnqJHz5uT6QIuOkrpL/FcLl56k=";
};
extraBuildInputs = [ xorg.libxshmfence ];
passthru = {
updateScript = nix-update-script {
extraArgs = [ "--override-filename" ./default.nix ];
};
};
meta = with lib; {
description = "All your services in one place built by the community";
homepage = "https://ferdium.org/";

9
pkgs/applications/networking/instant-messengers/franz/generic.nix
View file

@ -28,9 +28,10 @@
# Helper function for building a derivation for Franz and forks.
{ pname, name, version, src, meta, extraBuildInputs ? [] }:
stdenv.mkDerivation rec {
{ pname, name, version, src, meta, extraBuildInputs ? [], ... } @ args:
let
cleanedArgs = builtins.removeAttrs args [ "pname" "name" "version" "src" "meta" "extraBuildInputs" ];
in stdenv.mkDerivation (rec {
inherit pname version src meta;
# Don't remove runtime deps.
@ -91,4 +92,4 @@ stdenv.mkDerivation rec {
--suffix PATH : ${xdg-utils}/bin \
"''${gappsWrapperArgs[@]}"
'';
}
} // cleanedArgs)

6
pkgs/applications/networking/sniffnet/default.nix
View file

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "sniffnet";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "gyulyvgc";
repo = "sniffnet";
rev = "refs/tags/v${version}";
hash = "sha256-sJUc14MXaCS4OHtwdCuwI1b7NAlOnaGsXBNUYCEXJqQ=";
hash = "sha256-8G6cfp5/eXjwyNBk2SvE2XmUt7Y42E76IjDU5QHUK7s=";
};
cargoHash = "sha256-neRVpJmI4TgzvIQqKNqBr61O7rR8246PcxG50IIKE/M=";
cargoHash = "sha256-KN7jlB6PzRGpHBk5UvqPLhxRG7QAzOXLmEuFYNhdZJU=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/science/machine-learning/streamlit/default.nix
View file

@ -26,12 +26,12 @@
buildPythonApplication rec {
pname = "streamlit";
version = "1.18.1";
version = "1.21.0";
format = "wheel"; # source currently requires pipenv
src = fetchPypi {
inherit pname version format;
hash = "sha256-lO2QfM/G+4M55f8JCZBwk10SkMp4gXb68KncHm90k7g=";
hash = "sha256-BYYlmJUqkSbhZlLKpbyI7u6nsnc68lLi2szxyEzqrvQ=";
};
propagatedBuildInputs = [

2
pkgs/applications/science/misc/root/default.nix
View file

@ -191,7 +191,7 @@ stdenv.mkDerivation rec {
"-Dpythia6=OFF"
"-Dpythia8=OFF"
"-Drfio=OFF"
"-Droot7=OFF"
"-Droot7=ON"
"-Dsqlite=OFF"
"-Dssl=ON"
"-Dtmva=ON"

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ghq";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "x-motemen";
repo = "ghq";
rev = "v${version}";
sha256 = "sha256-dUW5eZODHkhhzC21uA9jFnwb9Q+9/t7o0K/nGbsZH84=";
sha256 = "sha256-ggTx5Kz9cRqOqxxzERv4altf7m1GlreGgOiYCnHyJks=";
};
vendorHash = "sha256-Q3sIXt8srGI1ZFUdQ+x6I6Tc07HqyH0Hyu4kBe64uRs=";
vendorHash = "sha256-6ZDvU3RQ/1M4DZMFOaQsEuodldB8k+2thXNhvZlVQEg=";
doCheck = false;

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
version = "1.26.0";
version = "1.28.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "cli";
rev = "v${version}";
hash = "sha256-k0wkHw12MyVsAudaihoymGkP4y5y98cR7LKa+hEC1Mc=";
hash = "sha256-e3tblY/lf25TJrsLeQdaPcgVlsaEimkjQxO0P9X1o6w=";
};
vendorHash = "sha256-FZ1CiR8Rj/sMoCnQm6ArGQfRTlvmD14EZDmufnlTSTk=";
vendorHash = "sha256-PH0PJujdRtnVS0s6wWtS6kffQBQduqb2KJYru9ePatw=";
ldflags = [
"-s"

4
pkgs/applications/virtualization/ecs-agent/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "amazon-ecs-agent";
version = "1.67.2";
version = "1.70.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
hash = "sha256-iSL5ogS8BLcxge3eo+kCqtsGmj7P1wbi+/84nA9fO2Q=";
hash = "sha256-CAoMXWxtsGJOEOxZ8ZLwLYAWW0kY/4jryrIAFDbOeXA=";
};
vendorHash = null;

36
pkgs/applications/virtualization/singularity/generic.nix
View file

@ -36,7 +36,9 @@ in
, conmon
, coreutils
, cryptsetup
, e2fsprogs
, fakeroot
, fuse2fs ? e2fsprogs.fuse2fs
, go
, gpgme
, libseccomp
@ -46,6 +48,10 @@ in
, openssl
, squashfsTools
, squashfuse
# Test dependencies
, singularity-tools
, cowsay
, hello
# Overridable configurations
, enableNvidiaContainerCli ? true
# Compile with seccomp support
@ -83,7 +89,7 @@ let
ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap"
'');
in
buildGoModule {
(buildGoModule {
inherit pname version src;
# Override vendorHash with the output got from
@ -113,6 +119,12 @@ buildGoModule {
which
];
# Search inside the project sources
# and see the `control` file of the Debian package from upstream repos
# for build-time dependencies and run-time utilities
# apptainer/apptainer: https://github.com/apptainer/apptainer/blob/main/dist/debian/control
# sylabs/singularity: https://github.com/sylabs/singularity/blob/main/debian/control
buildInputs = [
bash # To patch /bin/sh shebangs.
conmon
@ -120,8 +132,7 @@ buildGoModule {
gpgme
libuuid
openssl
squashfsTools
squashfuse
squashfsTools # Required at build time by SingularityCE
]
++ lib.optional enableNvidiaContainerCli nvidia-docker
++ lib.optional enableSeccomp libseccomp
@ -144,6 +155,8 @@ buildGoModule {
bash
coreutils
cryptsetup # cryptsetup
fakeroot
fuse2fs # Mount ext3 filesystems
go
privileged-un-utils
squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image
@ -191,10 +204,7 @@ buildGoModule {
substituteInPlace "$out/bin/run-singularity" \
--replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}"
wrapProgram "$out/bin/${projectName}" \
--prefix PATH : "${lib.makeBinPath [
fakeroot
squashfsTools # Singularity (but not Apptainer) expects unsquashfs from the host PATH
]}"
--prefix PATH : "''${defaultPathInputs// /\/bin:}"
# Make changes in the config file
${lib.optionalString enableNvidiaContainerCli ''
substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \
@ -235,4 +245,14 @@ buildGoModule {
maintainers = with maintainers; [ jbedo ShamrockLee ];
mainProgram = projectName;
} // extraMeta;
}
}).overrideAttrs (finalAttrs: prevAttrs: {
passthru = prevAttrs.passthru or { } // {
tests = {
image-hello-cowsay = singularity-tools.buildImage {
name = "hello-cowsay";
contents = [ hello cowsay ];
singularity = finalAttrs.finalPackage;
};
};
};
})

12
pkgs/applications/virtualization/singularity/packages.nix
View file

@ -7,20 +7,20 @@ let
apptainer = callPackage
(import ./generic.nix rec {
pname = "apptainer";
version = "1.1.5";
version = "1.1.7";
projectName = "apptainer";
src = fetchFromGitHub {
owner = "apptainer";
repo = "apptainer";
rev = "v${version}";
hash = "sha256-onJkpHJNsO0cQO2m+TmdMuMkuvH178mDhOeX41bYFic=";
hash = "sha256-3F8qwP27IXcnnEYMnLzkCOxQDx7yej6QIZ40Wb5pk34=";
};
# Update by running
# nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules"
# at the root directory of the Nixpkgs repository
vendorHash = "sha256-tAnh7A8Lw5KtY7hq+sqHMEUlgXvgeeCKKIfRZFoRtug=";
vendorHash = "sha256-PfFubgR/W1WBXIsRO+Kg7hA6ebeAcRiJlTlAZbnl19A=";
extraDescription = " (previously known as Singularity)";
extraMeta.homepage = "https://apptainer.org";
@ -38,20 +38,20 @@ let
singularity = callPackage
(import ./generic.nix rec {
pname = "singularity-ce";
version = "3.10.4";
version = "3.11.1";
projectName = "singularity";
src = fetchFromGitHub {
owner = "sylabs";
repo = "singularity";
rev = "v${version}";
hash = "sha256-bUnQXQVwaVA3Lkw3X9TBWqNBgiPxAVCHnkq0vc+CIsM=";
hash = "sha256-gdgg6VN3Ily+2Remz6dZBhhfWIxyaBa4bIlFcgrA/uY=";
};
# Update by running
# nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).go-modules"
# at the root directory of the Nixpkgs repository
vendorHash = "sha256-K8helLcOuz3E4LzBE9y3pnZqwdwhO/iMPTN1o22ipVg=";
vendorHash = "sha256-mBhlH6LSmcJuc6HbU/3Q9ii7vJkW9jcikBWCl8oeMOk=";
# Do not build conmon from the Git submodule source,
# Use Nixpkgs provided version

4
pkgs/applications/window-managers/icewm/default.nix
View file

@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "icewm";
version = "3.3.2";
version = "3.3.3";
src = fetchFromGitHub {
owner = "ice-wm";
repo = "icewm";
rev = finalAttrs.version;
hash = "sha256-9fw3vqcorWZZROYm1vbDOrlkzEbuk7X2dOO/Edo3AOg=";
hash = "sha256-VcUc1T3uTj8fhSZ+/XWRzgoenjqA/gguxuNsj+PYzB0=";
};
nativeBuildInputs = [

2
pkgs/build-support/fetchgit/default.nix
View file

@ -66,7 +66,7 @@ lib.warnIf (builtins.isString sparseCheckout)
stdenvNoCC.mkDerivation {
inherit name;
builder = ./builder.sh;
fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash.
fetcher = ./nix-prefetch-git;
nativeBuildInputs = [ git ]
++ lib.optionals fetchLFS [ git-lfs ];

4
pkgs/data/fonts/lxgw-neoxihei/default.nix
View file

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-neoxihei";
version = "1.009";
version = "1.010";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
hash = "sha256-Q7rrgqrjALLY2y40mNfNmzSeGwcVwhZUmDj08nlWsao=";
hash = "sha256-IIiQn2Qlac4ZFy/gVubrpqEpJIt0Dav2TEL29xDC7w4=";
};
dontUnpack = true;

4
pkgs/data/fonts/sarasa-gothic/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sarasa-gothic";
version = "0.40.4";
version = "0.40.5";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
hash = "sha256-PVlozsWYomsQKp8WxHD8+pxzlTmIKGPK71HDLWMR9S0=";
hash = "sha256-bs3o8+LyCTCZvUYigUWfSmjFrzPg7nLzElZYxDEsQ9k=";
};
sourceRoot = ".";

4
pkgs/data/icons/numix-icon-theme-circle/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "23.03.19";
version = "23.04.05";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-kvIPtPJkBIioz/ScES3xmzjJ0IH4eK5wYSj5Jb2U47g=";
sha256 = "sha256-eyTiAfwons/VDsNCNfYp4OR+U37LvTIh8Wfktie8PKU=";
};
nativeBuildInputs = [ gtk3 ];

4
pkgs/data/icons/tela-circle-icon-theme/default.nix
View file

@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2023-01-29";
version = "2023-04-16";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "J3opK+5xGmV81ubA60BZw9+9IifylrRYo+5cRLWd6Xs=";
sha256 = "OHI/kT4HMlWUTxIeGXjtuIYBzQKM3XTGXuE9cviNDTM=";
};
nativeBuildInputs = [

4
pkgs/development/compilers/crystal/build-package.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, crystal
, pcre2
, shards
, git
, pkg-config
@ -90,7 +91,8 @@ stdenv.mkDerivation (mkDerivationArgs // {
inherit enableParallelBuilding;
strictDeps = true;
buildInputs = args.buildInputs or [ ] ++ [ crystal ];
buildInputs = args.buildInputs or [ ] ++ [ crystal ]
++ lib.optional (lib.versionAtLeast crystal.version "1.8") pcre2;
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
crystal

29
pkgs/development/compilers/crystal/default.nix
View file

@ -72,18 +72,6 @@ let
meta.platforms = lib.attrNames sha256s;
};
commonBuildInputs = extraBuildInputs: [
boehmgc
pcre
pcre2
libevent
libyaml
zlib
libxml2
openssl
] ++ extraBuildInputs
++ lib.optionals stdenv.isDarwin [ libiconv ];
generic = (
{ version
, sha256
@ -92,7 +80,7 @@ let
, extraBuildInputs ? [ ]
, buildFlags ? [ "all" "docs" "release=1"]
}:
lib.fix (compiler: stdenv.mkDerivation {
lib.fix (compiler: stdenv.mkDerivation (finalAttrs: {
pname = "crystal";
inherit buildFlags doCheck version;
@ -172,7 +160,16 @@ let
strictDeps = true;
nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ];
buildInputs = commonBuildInputs extraBuildInputs;
buildInputs = [
boehmgc
(if lib.versionAtLeast version "1.8" then pcre2 else pcre)
libevent
libyaml
zlib
libxml2
openssl
] ++ extraBuildInputs
++ lib.optionals stdenv.isDarwin [ libiconv ];
makeFlags = [
"CRYSTAL_CONFIG_VERSION=${version}"
@ -202,7 +199,7 @@ let
--suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \
--suffix CRYSTAL_PATH : lib:$lib/crystal \
--suffix CRYSTAL_LIBRARY_PATH : ${
lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
lib.makeLibraryPath finalAttrs.buildInputs
}
install -dm755 $lib/crystal
cp -r src/* $lib/crystal/
@ -248,7 +245,7 @@ let
license = licenses.asl20;
maintainers = with maintainers; [ david50407 manveru peterhoeg ];
};
})
}))
);
in

2
pkgs/development/compilers/go/1.18.nix
View file

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Foundation Security xcbuild ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
depsBuildTarget = lib.optional isCross targetCC;

2
pkgs/development/compilers/go/1.19.nix
View file

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Foundation Security xcbuild ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
depsBuildTarget = lib.optional isCross targetCC;

2
pkgs/development/compilers/go/1.20.nix
View file

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Foundation Security xcbuild ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
depsBuildTarget = lib.optional isCross targetCC;

3
pkgs/development/compilers/llvm/git/default.nix
View file

@ -3,6 +3,7 @@
, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
, targetLlvm
# This is the default binutils, but with *this* version of LLD rather
# than the default LLVM verion's, if LLD is the choice. We use these for
# the `useLLVM` bootstrapping below.
@ -344,7 +345,7 @@ in let
};
openmp = callPackage ./openmp {
inherit llvm_meta;
inherit llvm_meta targetLlvm;
};
});

36
pkgs/development/compilers/llvm/git/libcxx/default.nix
View file

@ -17,7 +17,7 @@ let
basename = "libcxx";
in
assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi";
assert stdenv.isDarwin -> cxxabi.libName == "c++abi";
stdenv.mkDerivation rec {
pname = basename + lib.optionalString headersOnly "-headers";
@ -64,35 +64,33 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals (!headersOnly) [ cxxabi ];
cmakeFlags = [
cmakeFlags = let
# See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string
libcxx_cxx_abi_opt = {
"c++abi" = "system-libcxxabi";
"cxxrt" = "libcxxrt";
}.${cxxabi.libName} or (throw "unknown cxxabi: ${cxxabi.libName} (${cxxabi.pname})");
in [
"-DLLVM_ENABLE_RUNTIMES=libcxx"
"-DLIBCXX_CXX_ABI=${lib.optionalString (!headersOnly) "system-"}${cxxabi.pname}"
] ++ lib.optional (!headersOnly && cxxabi.pname == "libcxxabi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1"
"-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}"
] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1"
++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXX_ENABLE_THREADS=OFF"
"-DLIBCXX_ENABLE_FILESYSTEM=OFF"
"-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"
# If we're only building the headers we don't actually *need* a functioning
# C/C++ compiler:
++ lib.optionals (headersOnly) [
"-DCMAKE_C_COMPILER_WORKS=ON"
"-DCMAKE_CXX_COMPILER_WORKS=ON"
];
ninjaFlags = lib.optional headersOnly "generate-cxx-headers";
installTargets = lib.optional headersOnly "install-cxx-headers";
preInstall = lib.optionalString (stdenv.isDarwin && !headersOnly) ''
for file in lib/*.dylib; do
if [ -L "$file" ]; then continue; fi
baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))
installName="$out/lib/$baseName"
abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/')
for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do
${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file
done
done
'';
passthru = {
isLLVM = true;
inherit cxxabi;

8
pkgs/development/compilers/llvm/git/llvm/default.nix
View file

@ -24,10 +24,10 @@
&& (stdenv.hostPlatform == stdenv.buildPlatform)
, enableManpages ? false
, enableSharedLibraries ? !stdenv.hostPlatform.isStatic
, enablePFM ? !(stdenv.isDarwin
|| stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
|| stdenv.isAarch32 # broken for the armv7l builder
)
, enablePFM ? stdenv.isLinux /* PFM only supports Linux */
# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
# broken for the armv7l builder
&& !stdenv.hostPlatform.isAarch
, enablePolly ? true
} @args:

5
pkgs/development/compilers/llvm/git/openmp/default.nix
View file

@ -6,6 +6,7 @@
, cmake
, ninja
, llvm
, targetLlvm
, lit
, clang-unwrapped
, perl
@ -34,7 +35,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ninja perl pkg-config lit ];
buildInputs = [ llvm ];
buildInputs = [
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
];
# Unsup:Pass:XFail:Fail
# 26:267:16:8

4
pkgs/development/libraries/aws-c-auth/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-auth";
version = "0.6.22";
version = "0.6.26";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-auth";
rev = "v${version}";
sha256 = "sha256-crqoUXPf+2/bhKvvw6fiKNqozVqczbf+aSlK390/w/Q=";
sha256 = "sha256-PvdkTw5JydJT0TbXLB2C9tk4T+ho+fAbaw4jU9m5KuU=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/aws-c-common/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-common";
version = "0.8.9";
version = "0.8.15";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zaX97qFJ/YcjEq6mQqtT6SHIEeRxGgDkAvN72Vjxe98=";
sha256 = "sha256-AemFZZwfHdjqX/sXUw1fpusICOa3C7rT6Ofsz5bGYOQ=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/aws-c-event-stream/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-event-stream";
version = "0.2.18";
version = "0.2.20";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zsPhZHguOky55fz2m5xu4H42/pWATGJEHyoK0fZLybc=";
sha256 = "sha256-UDACkGqTtyLablSzePMmMk4iGpgfdtZU/SEv0RCSFfA=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/aws-c-http/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-http";
version = "0.7.3";
version = "0.7.6";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-http";
rev = "v${version}";
sha256 = "sha256-n4BTiqxFz9eOTgh4o78TN2QgCIUbE2Z4jDq27HNORLo=";
sha256 = "sha256-pJGzGbIuz8UJkfmTQEZgXSOMuYixMezNZmgaRlcnmfg=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/aws-c-io/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-io";
version = "0.13.18";
version = "0.13.19";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+12vByeXdQDdc0fn5tY8k4QP4qyqqLRuc8vtuvE/AfU=";
sha256 = "sha256-6lTAnoBWbwyWpycsaS7dpCC9c4xYws19HCNyTd7aRho=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/aws-c-mqtt/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
version = "0.8.4";
version = "0.8.8";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
sha256 = "sha256-33D+XcNH5e8ty/rckuJFMMP7xG0IhG5wl8Thvu9b7hM=";
sha256 = "sha256-bt5Qjw+CqgTfi/Ibhc4AwmJxr22Q6m3ygpmeMhvQTT0=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/aws-c-s3/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-s3";
version = "0.2.2";
version = "0.2.8";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-s3";
rev = "v${version}";
sha256 = "sha256-hPb9KTq/+OrUlE5EtmE6PYvtxsEmBb8K9ab7CAaELNo=";
sha256 = "sha256-kwYzsKdEy+e0GxqYcakcdwoaC2LLPZe8E7bZNrmqok0=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/aws-c-sdkutils/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-sdkutils";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-sdkutils";
rev = "v${version}";
sha256 = "sha256-qu/+xYorB+QXP5Ixj5ZFP9ZenVYV6hcmxHnH14DEgrU=";
sha256 = "sha256-7aLupTbKC2I7+ylySe1xq3q6YDP9ogLlsWSKBk+jI+Q=";
};
nativeBuildInputs = [

45
pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
View file

@ -1,41 +1,41 @@
From 6be95cf45c4b5beae8b364468cef42d5c5880836 Mon Sep 17 00:00:00 2001
From 2370ee92e78cfb0d55e3958b63ac71b16567b5fd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 9 Jan 2022 01:57:18 +0100
Date: Wed, 9 Nov 2022 17:59:17 +0100
Subject: [PATCH] build: Make includedir properly overrideable
This is required by some package managers like Nix.
---
CMakeLists.txt | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
CMakeLists.txt | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad50174..e0be58c 100644
index 9f13d21..f6e62c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,10 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -66,6 +66,10 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR "lib")
endif()
+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+ set(CMAKE_INSTALL_INCLUDEDIR "include")
+endif()
+
if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
set(FIND_LIBRARY_USE_LIB64_PATHS true)
endif()
@@ -302,7 +306,7 @@ endif ()
@@ -322,7 +326,7 @@ endif()
target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:include>)
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:include>)
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
aws_use_package(aws-c-http)
aws_use_package(aws-c-mqtt)
@@ -316,13 +320,13 @@ aws_use_package(aws-c-s3)
@@ -336,14 +340,14 @@ aws_use_package(aws-c-s3)
target_link_libraries(${PROJECT_NAME} ${DEP_AWS_LIBS})
-install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
-install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development)
-install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development)
@ -43,6 +43,7 @@ index ad50174..e0be58c 100644
-install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development)
-install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development)
-install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development)
-install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development)
+install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development)
+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development)
+install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development)
@ -50,9 +51,9 @@ index ad50174..e0be58c 100644
+install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development)
+install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development)
+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development)
install(
TARGETS ${PROJECT_NAME}
--
2.34.1
+install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development)
install(
TARGETS ${PROJECT_NAME}
--
2.37.3

4
pkgs/development/libraries/aws-crt-cpp/default.nix
View file

@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "aws-crt-cpp";
version = "0.18.9";
version = "0.19.8";
outputs = [ "out" "dev" ];
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "awslabs";
repo = "aws-crt-cpp";
rev = "v${version}";
sha256 = "sha256-NEsEKUKmADevb8SSc8EFuXLc12fuOf6fXI76yVeDQno=";
sha256 = "sha256-z/9ifBv4KbH5RiR1t1Dz8cCWZlHrMSyB8/w4pdTscw0=";
};
patches = [

34
pkgs/development/libraries/aws-sdk-cpp/default.nix
View file

@ -1,18 +1,11 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, curl
, openssl
, s2n-tls
, zlib
, aws-crt-cpp
, aws-c-cal
, aws-c-common
, aws-c-event-stream
, aws-c-io
, aws-checksums
, CoreAudio
, AudioToolbox
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
@ -31,13 +24,13 @@ in
stdenv.mkDerivation rec {
pname = "aws-sdk-cpp";
version = "1.9.294";
version = "1.11.37";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-sdk-cpp";
rev = version;
sha256 = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";
sha256 = "sha256-C1PdLNagoIMk9/AAV2Pp7kWcspasJtN9Tx679FnEprc=";
};
patches = [
@ -50,30 +43,15 @@ stdenv.mkDerivation rec {
substituteInPlace cmake/compiler_settings.cmake \
--replace '"-Werror"' ' '
# Missing includes for GCC11
sed '5i#include <thread>' -i \
aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \
aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \
aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \
aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \
aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \
aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \
aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \
aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \
aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \
aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \
aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \
aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \
aws-cpp-sdk-transfer-tests/TransferTests.cpp
# Flaky on Hydra
rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
# Includes aws-c-auth private headers, so only works with submodule build
rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp
rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp
# TestRandomURLMultiThreaded fails
rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
rm tests/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
'' + lib.optionalString stdenv.isi686 ''
# EPSILON is exceeded
rm aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp
rm tests/aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp
'';
# FIXME: might be nice to put different APIs in different outputs

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

@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
fionera
sternenseemann
];
license = licenses.mit;
license = with licenses; [ mit zlib ];
platforms = with platforms; linux;
};
}

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

@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "grpc";
version = "1.53.0"; # N.B: if you change this, please update:
version = "1.54.0"; # N.B: if you change this, please update:
# pythonPackages.grpcio-tools
# pythonPackages.grpcio-status
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-YRVWR1woMDoq8TWFrL2nqQvAbtqBnUd3QlfbFTJm8dc=";
hash = "sha256-WVH7rYyFx2LyAnctnNbX4KevoJ5KKZujN+SmL0Y6wvw=";
fetchSubmodules = true;
};

4
pkgs/development/libraries/gsl-lite/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "gsl-lite";
version = "0.40.0";
version = "0.41.0";
src = fetchFromGitHub {
owner = "gsl-lite";
repo = "gsl-lite";
rev = "v${version}";
hash = "sha256-80ksT8XFn2LLMr63gKGZD/0+FDLnAtFyMpuuSjtoBlk=";
hash = "sha256-cuuix302bVA7dWa7EJoxJ+otf1rSzjWQK8DHJsVkQio=";
};
nativeBuildInputs = [ cmake ninja ];

4
pkgs/development/libraries/gvm-libs/default.nix
View file

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "gvm-libs";
version = "22.4.5";
version = "22.4.6";
src = fetchFromGitHub {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-dnR562qsDoW8Xb4TNrpcn66tn9iVmcmTaBxMbb+CX64=";
hash = "sha256-HG9DwUX0rTE7Fc5AOl98u/JEfvfd0iwn3fvsIG8lsfU=";
};
nativeBuildInputs = [

40
pkgs/development/libraries/libdeltachat/Cargo.lock generated
View file

@ -189,12 +189,12 @@ dependencies = [
[[package]]
name = "async-imap"
version = "0.6.0"
source = "git+https://github.com/async-email/async-imap?branch=master#90270474a5a494669e7c63c13471d189afdc98ae"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce"
dependencies = [
"async-channel",
"async-native-tls 0.4.0",
"base64 0.13.1",
"base64 0.21.0",
"byte-pool",
"chrono",
"futures",
@ -218,18 +218,6 @@ dependencies = [
"event-listener",
]
[[package]]
name = "async-native-tls"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
dependencies = [
"native-tls",
"thiserror",
"tokio",
"url",
]
[[package]]
name = "async-native-tls"
version = "0.5.0"
@ -494,9 +482,9 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]]
name = "byte-pool"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca"
checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158"
dependencies = [
"crossbeam-queue",
"stable_deref_trait",
@ -836,9 +824,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
version = "0.5.7"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if",
"crossbeam-utils",
@ -1061,13 +1049,13 @@ dependencies = [
[[package]]
name = "deltachat"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"ansi_term",
"anyhow",
"async-channel",
"async-imap",
"async-native-tls 0.5.0",
"async-native-tls",
"async-smtp",
"async_zip",
"backtrace",
@ -1135,7 +1123,7 @@ dependencies = [
[[package]]
name = "deltachat-jsonrpc"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"anyhow",
"async-channel",
@ -1158,7 +1146,7 @@ dependencies = [
[[package]]
name = "deltachat-repl"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"ansi_term",
"anyhow",
@ -1173,7 +1161,7 @@ dependencies = [
[[package]]
name = "deltachat-rpc-server"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"anyhow",
"deltachat",
@ -1197,7 +1185,7 @@ dependencies = [
[[package]]
name = "deltachat_ffi"
version = "1.112.6"
version = "1.112.7"
dependencies = [
"anyhow",
"deltachat",

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

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.112.6";
version = "1.112.7";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-xadf6N5x3zdefwsKUFaVs71HmLMpJoUq5LL7IENsvC0=";
hash = "sha256-zBstNj8IZ8ScwZxzvTxDPwe8R0n2z/EuvjbR+bJepJk=";
};
patches = [
@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"async-imap-0.6.0" = "sha256-q6ZDm+4i+EtiMgkW/8LQ/TkDO/sj0p7KJhpYE76zAjo=";
"email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";

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

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
version = "0.4.40";
version = "0.4.41";
pname = "libzen";
src = fetchurl {
url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
sha256 = "sha256-VUPixFIUudnwuk9D3uYdApbh/58UJ+1sh53dG2K59p4=";
sha256 = "sha256-6yN9fT3Kbca6BocZQgon3gk0p4PMrrKGdWKzWvOQHi0=";
};
nativeBuildInputs = [ autoreconfHook ];

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

@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "live555";
version = "2023.01.19";
version = "2023.03.30";
src = fetchurl {
urls = [
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
];
sha256 = "sha256-p8ZJE/f3AHxf3CnqgR48p4HyYicbPkKv3UvBBB2G+pk=";
sha256 = "sha256-v/1Nh8dicdWeNxFp7bakhEaKB4ysKtRFnyLKqNmJ2tQ=";
};
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;

4
pkgs/development/libraries/physics/hepmc3/default.nix
View file

@ -16,11 +16,11 @@ in
stdenv.mkDerivation rec {
pname = "hepmc3";
version = "3.2.5";
version = "3.2.6";
src = fetchurl {
url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz";
sha256 = "sha256-zQ91yA91VJxZzCqCns52Acd96Xyypat1eQysjh1YUDI=";
sha256 = "sha256-JI87WzbddzhEy+c9UfYIkUWDNLmGsll1TFnb9Lvx1SU=";
};
nativeBuildInputs = [

2
pkgs/development/libraries/qt-6/default.nix
View file

@ -65,6 +65,7 @@ let
qtlocation
qtlottie
qtmultimedia
qtmqtt
qtnetworkauth
qtpositioning
qtsensors
@ -107,6 +108,7 @@ let
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;
inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox;
};
qtmqtt = callPackage ./modules/qtmqtt.nix { };
qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
qtpositioning = callPackage ./modules/qtpositioning.nix { };
qtsensors = callPackage ./modules/qtsensors.nix { };

14
pkgs/development/libraries/qt-6/modules/qtmqtt.nix Normal file
View file

@ -0,0 +1,14 @@
{ qtModule
, fetchurl
, qtbase
}:
qtModule rec {
pname = "qtmqtt";
version = "6.5.0";
src = fetchurl {
url = "https://github.com/qt/qtmqtt/archive/refs/tags/v${version}.tar.gz";
sha256 = "qv3GYApd4QKk/Oubx48VhG/Dbl/rvq5ua0UinPlDDNY=";
};
qtInputs = [ qtbase ];
}

4
pkgs/development/libraries/science/math/ipopt/default.nix
View file

@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "ipopt";
version = "3.14.11";
version = "3.14.12";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Ipopt";
rev = "releases/${version}";
sha256 = "sha256-PzNDiTZkPORFckFJryFuvn/rsfx3wrXJ9Qde88gH5o4=";
sha256 = "sha256-cyV3tgmZz5AExxxdGJ12r+PPXn7v2AEhxb9icBxolS8=";
};
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

6
pkgs/development/libraries/sentencepiece/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "sentencepiece";
version = "0.1.97";
version = "0.1.98";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-T6qQtLmuPKVha0CwX4fBH7IQoAlwVj64X2qDecWd7s8=";
rev = "refs/tags/v${version}";
sha256 = "sha256-afODoC4G3ibVXMLEIxusmju4wkTcOtlEzS17+EuyIZw=";
};
nativeBuildInputs = [ cmake ];

1
pkgs/development/libraries/spice-gtk/default.nix
View file

@ -135,6 +135,7 @@ stdenv.mkDerivation rec {
"-Dpolkit=disabled"
] ++ lib.optionals (!stdenv.isLinux) [
"-Dlibcap-ng=disabled"
"-Degl=disabled"
] ++ lib.optionals stdenv.hostPlatform.isMusl [
"-Dcoroutine=gthread" # Fixes "Function missing:makecontext"
];

4
pkgs/development/misc/brev-cli/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.215";
version = "0.6.217";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Yv59F3i++l6UA8J3l3pyyaeagAcPIqsAWBlSojxjflg=";
sha256 = "sha256-wrdR0g8lND0V7BCKXDyk93Kf7eEIdg4Vb85MbhhK8AE=";
};
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";

4
pkgs/development/misc/loc/default.nix
View file

@ -1,8 +1,6 @@
{ lib, fetchFromGitHub, rustPlatform }:
with rustPlatform;
buildRustPackage rec {
rustPlatform.buildRustPackage rec {
version = "0.4.1";
pname = "loc";

31
pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix Normal file
View file

@ -0,0 +1,31 @@
{ lib, buildDunePackage
, cohttp, cohttp-lwt, logs, lwt, js_of_ocaml, js_of_ocaml-ppx, js_of_ocaml-lwt
, nodejs, lwt_ppx
}:
buildDunePackage {
pname = "cohttp-lwt-jsoo";
inherit (cohttp-lwt) version src;
duneVersion = "3";
propagatedBuildInputs = [
cohttp
cohttp-lwt
logs
lwt
js_of_ocaml
js_of_ocaml-ppx
js_of_ocaml-lwt
];
doCheck = true;
checkInputs = [
nodejs
lwt_ppx
];
meta = cohttp-lwt.meta // {
description = "CoHTTP implementation for the Js_of_ocaml JavaScript compiler";
};
}

16
pkgs/development/ocaml-modules/cohttp/top.nix Normal file
View file

@ -0,0 +1,16 @@
{ lib, buildDunePackage, cohttp }:
buildDunePackage {
pname = "cohttp-top";
inherit (cohttp) version src;
duneVersion = "3";
propagatedBuildInputs = [ cohttp ];
doCheck = true;
meta = cohttp.meta // {
description = "CoHTTP toplevel pretty printers for HTTP types";
};
}

3
pkgs/development/ocaml-modules/lwt/camlp4.nix
View file

@ -11,10 +11,11 @@ buildDunePackage rec {
sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9";
};
useDune2 = false;
duneVersion = "1";
minimalOCamlVersion = "4.02";
nativeBuildInputs = [ camlp4 ];
propagatedBuildInputs = [ camlp4 ];
preBuild = "rm META.lwt_camlp4";

7
pkgs/development/ocaml-modules/lwt/default.nix
View file

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, libev, buildDunePackage
, cppo, dune-configurator, ocplib-endian
, ocaml, cppo, dune-configurator, ocplib-endian
}:
buildDunePackage rec {
@ -15,6 +15,11 @@ buildDunePackage rec {
sha256 = "sha256-XstKs0tMwliCyXnP0Vzi5WC27HKJGnATUYtbbQmH1TE=";
};
postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "5.0") ''
substituteInPlace src/unix/dune \
--replace "libraries bigarray lwt" "libraries lwt"
'';
nativeBuildInputs = [ cppo ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ libev ocplib-endian ];

7
pkgs/development/ocaml-modules/ocplib-endian/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchFromGitHub, cppo }:
{ lib, buildDunePackage, fetchFromGitHub, ocaml, cppo }:
buildDunePackage rec {
version = "1.2";
@ -11,6 +11,11 @@ buildDunePackage rec {
sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4=";
};
postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "5.0") ''
substituteInPlace src/dune \
--replace "libraries ocplib_endian bigarray" "libraries ocplib_endian"
'';
minimalOCamlVersion = "4.03";
nativeBuildInputs = [ cppo ];

1
pkgs/development/ocaml-modules/tcpip/default.nix
View file

@ -63,6 +63,7 @@ buildDunePackage rec {
mirage-clock-unix
ipaddr-cstruct
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "OCaml TCP/IP networking stack, used in MirageOS";

4
pkgs/development/php-packages/composer/default.nix
View file

@ -2,11 +2,11 @@
mkDerivation rec {
pname = "composer";
version = "2.5.4";
version = "2.5.5";
src = fetchurl {
url = "https://github.com/composer/composer/releases/download/${version}/composer.phar";
sha256 = "sha256-kc5sv5Rj6uhq6dXCHUL6pgGlGfP7srYjpV7iRngHm9M=";
sha256 = "sha256-VmptHPS+HMOsiC0qKhOBf/rlTmD1qnyRN0NIEKWAn/w=";
};
dontUnpack = true;

4
pkgs/development/php-packages/php-cs-fixer/default.nix
View file

@ -2,14 +2,14 @@
let
pname = "php-cs-fixer";
version = "3.13.1";
version = "3.16.0";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
sha256 = "4bQrCjuaWN4Dbs1tkk4m1WxSb510ue7G59HA+gQ52yk=";
sha256 = "sha256-B4VzfsSwcffR/t4eREMLH9jRWCTumYel6GM4rpumVBY=";
};
dontUnpack = true;

4
pkgs/development/php-packages/psalm/default.nix
View file

@ -2,14 +2,14 @@
let
pname = "psalm";
version = "5.4.0";
version = "5.9.0";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
sha256 = "sha256-d5jf68s+LppUDwERQaqr+ry8L+Zmob8VwetYkQ+vIUg=";
sha256 = "sha256-56vLT/t+3f5ZyH1pFmgy4vtSMQcDYLQZIF/iIkwd2vM=";
};
dontUnpack = true;

1
pkgs/development/python-modules/brother-ql/default.nix
View file

@ -33,5 +33,6 @@ buildPythonPackage rec {
homepage = "https://github.com/pklaus/brother_ql";
license = licenses.gpl3;
maintainers = with maintainers; [ grahamc ];
mainProgram = "brother_ql";
};
}

45
pkgs/development/python-modules/django-dynamic-preferences/default.nix
View file

@ -1,22 +1,49 @@
{ lib, buildPythonPackage, fetchPypi
, django, persisting-theory, six
{ lib
, buildPythonPackage
, fetchFromGitHub
# dependencies
, django
, persisting-theory
, six
# tests
, djangorestframework
, pytest-django
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "django-dynamic-preferences";
version = "1.14.0";
version = "1.15.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-wAq8uNUkBnOQpmUYz80yaDuHrTzGINWRNkn8dwe4CDM=";
src = fetchFromGitHub {
owner = "agateblue";
repo = "django-dynamic-preferences";
rev = "refs/tags/${version}";
hash = "sha256-S0PAlSrMOQ68mX548pZzARfau/lytXWC4S5uVO1rUmo=";
};
propagatedBuildInputs = [ six django persisting-theory ];
buildInputs = [
django
];
# django.core.exceptions.ImproperlyConfigured: Requested setting DYNAMIC_PREFERENCES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
doCheck = false;
propagatedBuildInputs = [
six
persisting-theory
];
nativeCheckInputs = [
djangorestframework
pytestCheckHook
pytest-django
];
env.DJANGO_SETTINGS = "tests.settings";
meta = with lib; {
changelog = "https://github.com/agateblue/django-dynamic-preferences/blob/${version}/HISTORY.rst";
homepage = "https://github.com/EliotBerriot/django-dynamic-preferences";
description = "Dynamic global and instance settings for your django project";
license = licenses.bsd3;

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

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "grpcio-status";
version = "1.53.0";
version = "1.54.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-WkaCDcfZS6xIquXdl8lMreoJ2AoFVTrKdKkqKVQDBCA=";
hash = "sha256-tQMF1SwN9haUk8yl8uObm013Oz8w1Kemtt18GMuJAHw=";
};
postPatch = ''

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

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.53.0";
version = "1.54.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-kl7/8tY8oyZvk8kk/+ul1JbxaozL4SX6DRis9HzF+og=";
hash = "sha256-33msv1mZcBjhMXE7cWov3bVVbhhA6fud5MpzvyBZWQ4=";
};
postPatch = ''

23
pkgs/development/python-modules/jax/default.nix
View file

@ -5,6 +5,7 @@
, etils
, fetchFromGitHub
, jaxlib
, jaxlib-bin
, lapack
, matplotlib
, numpy
@ -13,15 +14,20 @@
, pytest-xdist
, pythonOlder
, scipy
, stdenv
, typing-extensions
}:
let
usingMKL = blas.implementation == "mkl" || lapack.implementation == "mkl";
# jaxlib is broken on aarch64-* as of 2023-03-05, but the binary wheels work
# fine. jaxlib is only used in the checkPhase, so switching backends does not
# impact package behavior. Get rid of this once jaxlib is fixed on aarch64-*.
jaxlib' = if jaxlib.meta.broken then jaxlib-bin else jaxlib;
in
buildPythonPackage rec {
pname = "jax";
version = "0.4.1";
version = "0.4.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -29,14 +35,14 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "refs/tags/jaxlib-v${version}";
hash = "sha256-ajLI0iD0YZRK3/uKSbhlIZGc98MdW174vA34vhoy7Iw=";
# google/jax contains tags for jax and jaxlib. Only use jax tags!
rev = "refs/tags/${pname}-v${version}";
hash = "sha256-UJzX8zP3qaEUIV5hPJhiGiLJO7k8p962MHWxIHDY1ZA=";
};
# jaxlib is _not_ included in propagatedBuildInputs because there are
# different versions of jaxlib depending on the desired target hardware. The
# JAX project ships separate wheels for CPU, GPU, and TPU. Currently only the
# CPU wheel is packaged.
# JAX project ships separate wheels for CPU, GPU, and TPU.
propagatedBuildInputs = [
absl-py
etils
@ -47,7 +53,7 @@ buildPythonPackage rec {
] ++ etils.optional-dependencies.epath;
nativeCheckInputs = [
jaxlib
jaxlib'
matplotlib
pytestCheckHook
pytest-xdist
@ -83,6 +89,11 @@ buildPythonPackage rec {
"test_custom_linear_solve_cholesky"
"test_custom_root_with_aux"
"testEigvalsGrad_shape"
] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [
# See https://github.com/google/jax/issues/14793.
"test_for_loop_fixpoint_correctly_identifies_loop_varying_residuals_unrolled_for_loop"
"testQdwhWithRandomMatrix3"
"testScanGrad_jit_scan"
];
# See https://github.com/google/jax/issues/11722. This is a temporary fix in

18
pkgs/development/python-modules/jaxlib/bin.nix
View file

@ -39,7 +39,7 @@ assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1";
assert cudaSupport -> lib.versionAtLeast cudnn.version "8.2";
let
version = "0.3.22";
version = "0.4.4";
pythonVersion = python.pythonVersion;
@ -50,21 +50,21 @@ let
cpuSrcs = {
"x86_64-linux" = fetchurl {
url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-cp310-manylinux2014_x86_64.whl";
hash = "sha256-w2wo0jk+1BdEkNwfSZRQbebdI4Ac8Kgn0MB0cIMcWU4=";
hash = "sha256-4VT909AB+ti5HzQvsaZWNY6MS/GItlVEFH9qeZnUuKQ=";
};
"aarch64-darwin" = fetchurl {
url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_11_0_arm64.whl";
hash = "sha256-7Ir55ZhBkccqfoa56WVBF8QwFAC2ws4KFHDkfVw6zm0=";
hash = "sha256-wuOmoCeTldslSa0MommQeTe+RYKhUMam1ZXrgSov+8U=";
};
"x86_64-darwin" = fetchurl {
url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_10_14_x86_64.whl";
hash = "sha256-bOoQI+T+YsTUNA+cDu6wwYTcq9fyyzCpK9qrdCrNVoA=";
hash = "sha256-arfiTw8yafJwjRwJhKby2O7y3+4ksh3PjaKW9JgJ1ok=";
};
};
gpuSrc = fetchurl {
url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-cp310-manylinux2014_x86_64.whl";
hash = "sha256-rabU62p4fF7Tu/6t8LNYZdf6YO06jGry/JtyFZeamCs=";
hash = "sha256-bJ62DdzuPSV311ZI2R/LJQ3fOkDibtz2+8wDKw31FLk=";
};
in
buildPythonPackage rec {
@ -77,7 +77,13 @@ buildPythonPackage rec {
# python version.
disabled = !(pythonVersion == "3.10");
src = if !cudaSupport then cpuSrcs."${stdenv.hostPlatform.system}" else gpuSrc;
# See https://discourse.nixos.org/t/ofborg-does-not-respect-meta-platforms/27019/6.
src =
if !cudaSupport then
(
cpuSrcs."${stdenv.hostPlatform.system}"
or (throw "jaxlib-bin is not supported on ${stdenv.hostPlatform.system}")
) else gpuSrc;
# Prebuilt wheels are dynamically linked against things that nix can't find.
# Run `autoPatchelfHook` to automagically fix them.

11
pkgs/development/python-modules/jaxlib/default.nix
View file

@ -52,7 +52,7 @@ let
inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl;
pname = "jaxlib";
version = "0.3.22";
version = "0.4.4";
meta = with lib; {
description = "JAX is Autograd and XLA, brought together for high-performance machine learning research.";
@ -137,8 +137,9 @@ let
src = fetchFromGitHub {
owner = "google";
repo = "jax";
rev = "${pname}-v${version}";
hash = "sha256-bnczJ8ma/UMKhA5MUQ6H4az+Tj+By14ZTG6lQQwptQs=";
# google/jax contains tags for jax and jaxlib. Only use jaxlib tags!
rev = "refs/tags/${pname}-v${version}";
hash = "sha256-DP68UwS9bg243iWU4MLHN0pwl8LaOcW3Sle1ZjsLOHo=";
};
nativeBuildInputs = [
@ -242,9 +243,9 @@ let
sha256 =
if cudaSupport then
"sha256-4yu4y4SwSQoeaOz9yojhvCRGSC6jp61ycVDIKyIK/l8="
"sha256-cgsiloW77p4+TKRrYequZ/UwKwfO2jsHKtZ+aA30H7E="
else
"sha256-CyRfPfJc600M7VzR3/SQX/EAyeaXRJwDQWot5h2XnFU=";
"sha256-D7WYG3YUaWq+4APYx8WpA191VVtoHG0fth3uEHXOeos=";
};
buildAttrs = {

4
pkgs/development/python-modules/onvif-zeep-async/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "onvif-zeep-async";
version = "1.2.11";
version = "1.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-SCK4PITp9XRlHeon10Sh5GvhMWNPLu4Y4oFLRC8JHVo=";
hash = "sha256-Gd3OfFfJE//uDiaU6HTlURCqoGOG4jvuMN1TlDy7pZU=";
};
propagatedBuildInputs = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pydeps";
version = "1.11.2";
version = "1.12.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "thebjorn";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-6eiSzuxspWutEKL1pKBeZ0/ZQjS07BpTwgd8dyrePcM=";
hash = "sha256-lwQaU7MwFuk+VBCKl4zBNWRFo88/uW2DxXjiZNyuHAg=";
};
buildInputs = [

4
pkgs/development/python-modules/tplink-omada-client/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tplink-omada-client";
version = "1.2.3";
version = "1.2.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "tplink_omada_client";
inherit version;
hash = "sha256-6c4xWa4XGtnEb3n7oL95oA6bqwaRrHCOn6WCi/xg3Sg=";
hash = "sha256-4kvFlk+4GWFRFVIAirg0wKk5se8g+kvmxQ54RiluuoU=";
};
nativeBuildInputs = [

4
pkgs/development/tools/analysis/codeql/default.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.12.5";
version = "2.12.6";
dontConfigure = true;
dontBuild = true;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-PjebVOzd0Vy3mX4q6Zs+AbxaKTpjE5QJzhciZfLcyUc=";
sha256 = "sha256-0AOrjM7wUMgyKLmeoAPMY7O/YWXmqb5OBJGlGV5JFR0=";
};
nativeBuildInputs = [

6
pkgs/development/tools/bazel-gazelle/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "bazel-gazelle";
version = "0.28.0";
version = "0.30.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-axpRS8SZwChmLYSaarxZkwvrRk72XRHW7v4d11EtJ3k=";
sha256 = "sha256-95nA6IEuAIh/6J6G2jADz3UKpQj5wybQ1HpaHSI+QRo=";
};
vendorSha256 = null;
vendorHash = null;
doCheck = false;

4
pkgs/development/tools/build-managers/shards/default.nix
View file

@ -37,8 +37,8 @@ let
in
rec {
shards_0_17 = generic {
version = "0.17.2";
hash = "sha256-2HpoMgyi8jnWYiBHscECYiaRu2g0mAH+dCY1t5m/l1s=";
version = "0.17.3";
hash = "sha256-vgcMB/vp685YwYI9XtJ5cTEjdnYaZY9aOMUnJBJaQoU=";
};
shards = shards_0_17;

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