nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-31 01:04:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-22 00:02:05 +00:00 committed by GitHub
commit f6ad0961da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
90 changed files with 1094 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -182,6 +182,16 @@
</para>
</listitem>
</itemizedlist>
<itemizedlist spacing="compact">
<listitem>
<para>
<link xlink:href="https://docs.fluidd.xyz/">fluidd</link>, a
Klipper web interface for managing 3d printers using
moonraker. Available as
<link linkend="opt-services.fluidd.enable">fluidd</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-incompatibilities">
<title>Backward Incompatibilities</title>
@ -273,7 +283,7 @@ Superuser created successfully.
<listitem>
<para>
The <literal>staticjinja</literal> package has been upgraded
from 1.0.4 to 3.0.1
from 1.0.4 to 4.1.0
</para>
</listitem>
<listitem>

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

@ -56,6 +56,8 @@ pt-services.clipcat.enable).
* [navidrome](https://www.navidrome.org/), a personal music streaming server with
subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable).
- [fluidd](https://docs.fluidd.xyz/), a Klipper web interface for managing 3d printers using moonraker. Available as [fluidd](#opt-services.fluidd.enable).
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
- The `paperless` module and package have been removed. All users should migrate to the
@ -105,7 +107,7 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable
Superuser created successfully.
```
- The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1
- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0
- The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync

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

@ -953,6 +953,7 @@
./services/web-apps/documize.nix
./services/web-apps/dokuwiki.nix
./services/web-apps/engelsystem.nix
./services/web-apps/fluidd.nix
./services/web-apps/galene.nix
./services/web-apps/gerrit.nix
./services/web-apps/gotify-server.nix

2
nixos/modules/profiles/headless.nix
View File

@ -9,7 +9,7 @@ with lib;
boot.vesa = false;
# Don't start a tty on the serial consoles.
systemd.services."serial-getty@ttyS0".enable = false;
systemd.services."serial-getty@ttyS0".enable = lib.mkDefault false;
systemd.services."serial-getty@hvc0".enable = false;
systemd.services."getty@tty1".enable = false;
systemd.services."autovt@".enable = false;

64
nixos/modules/services/web-apps/fluidd.nix Normal file
View File

@ -0,0 +1,64 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.fluidd;
moonraker = config.services.moonraker;
in
{
options.services.fluidd = {
enable = mkEnableOption "Fluidd, a Klipper web interface for managing your 3d printer";
package = mkOption {
type = types.package;
description = "Fluidd package to be used in the module";
default = pkgs.fluidd;
defaultText = "pkgs.fluidd";
};
hostName = mkOption {
type = types.str;
default = "localhost";
description = "Hostname to serve fluidd on";
};
nginx = mkOption {
type = types.submodule
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; });
default = { };
example = {
serverAliases = [ "fluidd.\${config.networking.domain}" ];
};
description = "Extra configuration for the nginx virtual host of fluidd.";
};
};
config = mkIf cfg.enable {
services.nginx = {
enable = true;
upstreams.fluidd-apiserver.servers."${moonraker.address}:${toString moonraker.port}" = { };
virtualHosts."${cfg.hostName}" = mkMerge [
cfg.nginx
{
root = mkForce "${cfg.package}/share/fluidd/htdocs";
locations = {
"/" = {
index = "index.html";
tryFiles = "$uri $uri/ /index.html";
};
"/index.html".extraConfig = ''
add_header Cache-Control "no-store, no-cache, must-revalidate";
'';
"/websocket" = {
proxyWebsockets = true;
proxyPass = "http://fluidd-apiserver/websocket";
};
"~ ^/(printer|api|access|machine|server)/" = {
proxyWebsockets = true;
proxyPass = "http://fluidd-apiserver$request_uri";
};
};
}
];
};
};
}

26
nixos/modules/virtualisation/amazon-image.nix
View File

@ -18,7 +18,15 @@ let
in
{
imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-init.nix ];
imports = [
../profiles/headless.nix
# Note: While we do use the headless profile, we also explicitly
# turn on the serial console on ttyS0 below. This is because
# AWS does support accessing the serial console:
# https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configure-access-to-serial-console.html
./ec2-data.nix
./amazon-init.nix
];
config = {
@ -49,7 +57,7 @@ in
];
boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ];
boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" "random.trust_cpu=on" ];
boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0,115200n8" "random.trust_cpu=on" ];
# Prevent the nouveau kernel module from being loaded, as it
# interferes with the nvidia/nvidia-uvm modules needed for CUDA.
@ -63,7 +71,12 @@ in
boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)";
boot.loader.grub.efiSupport = cfg.efi;
boot.loader.grub.efiInstallAsRemovable = cfg.efi;
boot.loader.timeout = 0;
boot.loader.timeout = 1;
boot.loader.grub.extraConfig = ''
serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
terminal_output console serial
terminal_input console serial
'';
boot.initrd.network.enable = true;
@ -127,15 +140,14 @@ in
copy_bin_and_libs ${pkgs.util-linux}/sbin/swapon
'';
# Don't put old configurations in the GRUB menu. The user has no
# way to select them anyway.
boot.loader.grub.configurationLimit = 0;
# Allow root logins only using the SSH key that the user specified
# at instance creation time.
services.openssh.enable = true;
services.openssh.permitRootLogin = "prohibit-password";
# Enable the serial console on ttyS0
systemd.services."serial-getty@ttyS0".enable = true;
# Creates symlinks for block device names.
services.udev.packages = [ pkgs.ec2-utils ];

1
nixos/tests/all-tests.nix
View File

@ -136,6 +136,7 @@ in
fish = handleTest ./fish.nix {};
flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
fluentd = handleTest ./fluentd.nix {};
fluidd = handleTest ./fluidd.nix {};
fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
freeswitch = handleTest ./freeswitch.nix {};
fsck = handleTest ./fsck.nix {};

21
nixos/tests/fluidd.nix Normal file
View File

@ -0,0 +1,21 @@
import ./make-test-python.nix ({ lib, ... }:
with lib;
{
name = "fluidd";
meta.maintainers = with maintainers; [ vtuan10 ];
nodes.machine = { pkgs, ... }: {
services.fluidd = {
enable = true;
};
};
testScript = ''
machine.start()
machine.wait_for_unit("nginx.service")
machine.wait_for_open_port(80)
machine.succeed("curl -sSfL http://localhost/ | grep 'fluidd'")
'';
})

46
pkgs/applications/audio/mpg123/default.nix
View File

@ -1,30 +1,52 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, makeWrapper
, alsa-lib
, pkg-config
, perl
, withConplay ? !stdenv.targetPlatform.isWindows
, withAlsa ? stdenv.hostPlatform.isLinux
, alsa-lib
, withPulse ? stdenv.hostPlatform.isLinux
, libpulseaudio
, withCoreAudio ? stdenv.hostPlatform.isDarwin
, AudioUnit
, AudioToolbox
, withJack ? stdenv.hostPlatform.isUnix
, jack
, withConplay ? !stdenv.hostPlatform.isWindows
}:
stdenv.mkDerivation rec {
pname = "mpg123";
version = "1.26.5";
version = "1.28.2";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "sha256-UCqX4Nk1vn432YczgCHY8wG641wohPKoPVnEtSRm7wY=";
sha256 = "006v44nz4nkpgvxz1k2vbbrfpa2m47hyydscs0wf3iysiyvd9vvy";
};
outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ];
nativeBuildInputs = lib.optionals withConplay [ makeWrapper ];
nativeBuildInputs = lib.optionals withConplay [ makeWrapper ]
++ lib.optionals (withPulse || withJack) [ pkg-config ];
buildInputs = lib.optionals withConplay [ perl ]
++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsa-lib ];
++ lib.optionals withAlsa [ alsa-lib ]
++ lib.optionals withPulse [ libpulseaudio ]
++ lib.optionals withCoreAudio [ AudioUnit AudioToolbox ]
++ lib.optionals withJack [ jack ];
configureFlags = lib.optional
(stdenv.hostPlatform ? mpg123)
"--with-cpu=${stdenv.hostPlatform.mpg123.cpu}";
configureFlags = [
"--with-audio=${lib.strings.concatStringsSep "," (
lib.optional withJack "jack"
++ lib.optional withPulse "pulse"
++ lib.optional withAlsa "alsa"
++ lib.optional withCoreAudio "coreaudio"
++ [ "dummy" ]
)}"
] ++ lib.optional (stdenv.hostPlatform ? mpg123) "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}";
enableParallelBuilding = true;
postInstall = lib.optionalString withConplay ''
mkdir -p $conplay/bin
@ -43,8 +65,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Fast console MPEG Audio Player and decoder library";
homepage = "https://mpg123.org";
license = licenses.lgpl21;
maintainers = [ maintainers.ftrvxmtrx ];
license = licenses.lgpl21Only;
maintainers = with maintainers; [ ftrvxmtrx ];
platforms = platforms.all;
};
}

2
pkgs/applications/blockchains/go-ethereum/default.nix
View File

@ -55,6 +55,6 @@ in buildGoModule rec {
homepage = "https://geth.ethereum.org/";
description = "Official golang implementation of the Ethereum protocol";
license = with licenses; [ lgpl3Plus gpl3Plus ];
maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ];
maintainers = with maintainers; [ adisbladis lionello RaghavSood ];
};
}

2
pkgs/applications/blockchains/openethereum/default.nix
View File

@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
description = "Fast, light, robust Ethereum implementation";
homepage = "http://parity.io/ethereum";
license = licenses.gpl3;
maintainers = with maintainers; [ akru xrelkd ];
maintainers = with maintainers; [ akru ];
platforms = lib.platforms.unix;
};
}

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

@ -16,9 +16,9 @@ buildGoModule rec {
vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}")
'';
ldflags = [
"-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}"
];
# Tests require internet
doCheck = false;

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -88,19 +88,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "10.5.2";
version = "10.5.5";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "16zk7d0sxm2j00vb002mjj38wxcxxlahnfdb9lmkmkfms9p9xfkb";
sha256 = "0847lib2z21fgb7x5szwvprc77fhdpmp4z5d6n1sk6d40dd34spn";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "0xc3ac2y9xf7ff3pqrp5n6l9j8i5hk3y2y3zwykwhnycnfi6dfv4";
sha256 = "0i26fb0r234nrwnvb2c9vk9yn869qghq0n4qlm1d7mr62dy6prxa";
};
};
in

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

@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "4.1.2369.18-1";
version = "4.1.2369.21-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "062zh7a4mr52h9m09dnqrdc48ajnkq887kcbcvzcd20wsnvivi48";
sha256 = "03062mik6paqp219jz420jsg762jjrfxmj1daq129z2zgzq0qr8l";
};
unpackPhase = ''

8
pkgs/applications/networking/cluster/kube3d/default.nix
View File

@ -17,10 +17,10 @@ buildGoModule rec {
excludedPackages = "\\(tools\\|docgen\\)";
preBuild = let t = "github.com/rancher/k3d/v4/version"; in
''
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}")
'';
ldflags = let t = "github.com/rancher/k3d/v4/version"; in
[
"-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}"
];
doCheck = false;

6
pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix
View File

@ -13,9 +13,9 @@ buildGoModule rec {
vendorSha256 = "sha256-EM0lPwwWJuLD+aqZWshz1ILaeEtUU4wJ0Puwv1Ikgf4=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w")
'';
ldflags = [
"-s" "-w"
];
meta = with lib; {
homepage = "https://github.com/aquasecurity/starboard-octant-plugin";

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

@ -16,9 +16,9 @@ buildGoModule rec {
# Don't build and check the integration tests
excludedPackages = "itest";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}")
'';
ldflags = [
"-s" "-w" "-X main.version=v${version}"
];
preCheck = ''
# Remove test that requires networking

4
pkgs/applications/system/glances/default.nix
View File

@ -9,14 +9,14 @@
buildPythonApplication rec {
pname = "glances";
version = "3.2.3";
version = "3.2.3.1";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "1nc8bdzzrzaircq3myd32w6arpy2prn739886cq2h47cpinxmvpr";
sha256 = "0h7y36z4rizl1lyxacq32vpmvbwn9w2nrvrxn791060cksfw4xwd";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

4
pkgs/desktops/mate/atril/default.nix
View File

@ -24,11 +24,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "atril";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06nyicj96dqcv035yqnzmm6pk3m35glxj0ny6lk1vwqkk2l750xl";
sha256 = "0pz44k3axhjhhwfrfvnwvxak1dmjkwqs63rhrbcaagyymrp7cpki";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/caja-dropbox/default.nix
View File

@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation rec {
pname = "caja-dropbox";
version = "1.24.0";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2";
sha256 = "16w4r0zjps12lmzwiwpb9qnmbvd0p391q97296sxa8k88b1x14wn";
};
patches = [

4
pkgs/desktops/mate/caja-extensions/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "caja-extensions";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13jkynanqj8snys0if8lv6yx1y0jrm778s2152n4x65hsghc6cw5";
sha256 = "03zwv3yl5553cnp6jjn7vr4l28dcdhsap7qimlrbvy20119kj5gh";
};
nativeBuildInputs = [

46
pkgs/desktops/mate/caja/caja-extension-dirs.patch
View File

@ -1,46 +0,0 @@
From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 11 Feb 2020 17:49:13 -0300
Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS
CAJA_EXTENSION_DIRS is a list of paths where caja extensions are
looked for. It is needed for distributions like NixOS that do not
install all extensions in the same directory. In NixOS each package is
installed in a self contained directory.
---
libcaja-private/caja-module.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
index d54d7cf..9794e56 100644
--- a/libcaja-private/caja-module.c
+++ b/libcaja-private/caja-module.c
@@ -258,11 +258,25 @@ void
caja_module_setup (void)
{
static gboolean initialized = FALSE;
+ gchar *caja_extension_dirs;
+ gchar **dir_vector;
if (!initialized)
{
initialized = TRUE;
+ caja_extension_dirs = (gchar *) g_getenv ("CAJA_EXTENSION_DIRS");
+
+ if (caja_extension_dirs)
+ {
+ dir_vector = g_strsplit (caja_extension_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
+
+ for (gchar **dir = dir_vector; *dir != NULL; ++ dir)
+ load_module_dir (*dir);
+
+ g_strfreev(dir_vector);
+ }
+
load_module_dir (CAJA_EXTENSIONDIR);
eel_debug_call_at_shutdown (free_module_objects);
--
2.25.0

8
pkgs/desktops/mate/caja/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "caja";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ylgb4b31vwgqmmknrhm4m9gfa1rzb9azpdd9myi0hscrr3h22z5";
sha256 = "1m0ai2r8b2mvlr8bqj9n6vg1pwzlwa46fqpq206wgyx5sgxac052";
};
nativeBuildInputs = [
@ -25,10 +25,6 @@ stdenv.mkDerivation rec {
hicolor-icon-theme
];
patches = [
./caja-extension-dirs.patch
];
configureFlags = [ "--disable-update-mimedb" ];
enableParallelBuilding = true;

2
pkgs/desktops/mate/default.nix
View File

@ -52,7 +52,7 @@ let
mate-user-share = callPackage ./mate-user-share { };
mate-utils = callPackage ./mate-utils { };
mozo = callPackage ./mozo { };
pluma = callPackage ./pluma { };
pluma = callPackage ./pluma { inherit (pkgs.gnome) adwaita-icon-theme; };
python-caja = callPackage ./python-caja { };
basePackages = [

4
pkgs/desktops/mate/engrampa/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "engrampa";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0x26djz73g3fjwzcpr7k60xb6qx5izhw7lf2ggn34iwpihl0sa7f";
sha256 = "1qsy0ynhj1v0kyn3g3yf62g31rwxmpglfh9xh0w5lc9j5k1b5kcp";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/eom/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "eom";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08rjckr1hdw7c31f2hzz3vq0rn0c5z3hmvl409y6k6ns583k1bgf";
sha256 = "1nv7q0yw11grgxr5lyvll0f7fl823kpjp05z81bwgnvd76m6kw97";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/libmatekbd/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmatekbd";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17mcxfkvl14p04id3n5kbhpjwjq00c8wmbyciyy2hm7kwdln6zx8";
sha256 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2";
};
nativeBuildInputs = [ pkg-config gettext ];

4
pkgs/desktops/mate/libmatemixer/default.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "libmatemixer";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1n6rq7k66zvfd6sb7h92xihh021w9hysfa4yd1mzjcbb7c62ybqx";
sha256 = "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws";
};
nativeBuildInputs = [ pkg-config gettext ];

4
pkgs/desktops/mate/libmateweather/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmateweather";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02d7c59pami1fzxg73mp6risa9hvsdpgs68f62wkg09nrppzsk4v";
sha256 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7";
};
nativeBuildInputs = [ pkg-config gettext ];

8
pkgs/desktops/mate/marco/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop
, libXdamage, libXpresent, libstartup_notification, gnome, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }:
, libXdamage, libXpresent, libstartup_notification, gnome, glib, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "marco";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19s2y2s9immp86ni3395mgxl605m2wn10m8399y9qkgw2b5m10s9";
sha256 = "01avxrg2fc6grfrp6hl8b0im4scy9xf6011swfrhli87ig6hhg7n";
};
nativeBuildInputs = [
@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
mate-settings-daemon
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname version; };

26
pkgs/desktops/mate/mate-applets/default.nix
View File

@ -1,37 +1,39 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck
, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook
, mateUpdateScript }:
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, dbus-glib, glib, gtk3, gtksourceview3
, gucharmap, libmateweather, libnl, libwnck, libgtop, libxml2, libnotify, mate-panel, polkit
, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-applets";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0h70i4x3bk017pgv4zn280682wm58vwdjm7kni91ni8rmblnnvyp";
sha256 = "0xy9dwiqvmimqshbfq80jxq65aznlgx491lqq8rl4x8c9sdl7q5p";
};
nativeBuildInputs = [
pkg-config
gettext
itstool
pkg-config
wrapGAppsHook
];
buildInputs = [
dbus-glib
gtk3
gtksourceview3
gnome.gucharmap
libwnck
gucharmap
hicolor-icon-theme
libgtop
libxml2
libmateweather
libnl
libnotify
libwnck
libxml2
mate-panel
polkit
upower
wirelesstools
mate.libmateweather
mate.mate-panel
hicolor-icon-theme
];
configureFlags = [ "--enable-suid=no" ];

4
pkgs/desktops/mate/mate-backgrounds/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-backgrounds";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ixb2vlm3dr52ibp4ggrbkf38m3q6i5lxjg4ix82gxbb6h6a3gp5";
sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d";
};
nativeBuildInputs = [

10
pkgs/desktops/mate/mate-calc/default.nix
View File

@ -1,24 +1,26 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libmpc, libxml2, mpfr, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-calc";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1yg8j0dqy37fljd20pwxdgna3f1v7k9wmdr9l4r1nqf4a7zwi96l";
sha256 = "0mddfh9ixhh60nfgx5kcprcl9liavwqyina11q3pnpfs3n02df3y";
};
nativeBuildInputs = [
pkg-config
gettext
itstool
pkg-config
wrapGAppsHook
];
buildInputs = [
gtk3
libmpc
libxml2
mpfr
];
enableParallelBuilding = true;

4
pkgs/desktops/mate/mate-common/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-common";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0srb2ly5pjq1g0cs8m39nbfv33dvsc2j4g2gw081xis3awzh3lki";
sha256 = "014wpfqpqmfkzv81paap4fz15mj1gsyvaxlrfqsp9a3yxw4f7jaf";
};
enableParallelBuilding = true;

4
pkgs/desktops/mate/mate-control-center/default.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "mate-control-center";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18vsqkcl4n3k5aa05fqha61jc3133zw07gd604sm0krslwrwdn39";
sha256 = "0jhkn0vaz8glji4j5ar6im8l2wf40kssl07gfkz40rcgfzm18rr8";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-desktop/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-desktop";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1nd1dn8mm1z6x4r68a25q4vzys1a6fmbzc94ss1z1n1872pczs6i";
sha256 = "18sj8smf0b998m5qvki37hxg0agcx7wmgz9z7cwv6v48i2dnnz2z";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-icon-theme/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-icon-theme";
version = "1.24.0";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na";
sha256 = "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1";
};
nativeBuildInputs = [ pkg-config gettext iconnamingutils ];

4
pkgs/desktops/mate/mate-indicator-applet/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-indicator-applet";
version = "1.24.0";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf";
sha256 = "144fh9f3lag2cqnmb6zxlh8k83ya8kha6rmd7r8gg3z5w3nzpyz4";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-media/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-media";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "118i4w2i2g3hfgbfn3hjzjkfq8vjj6049r7my3vna9js23b7ab92";
sha256 = "0fiwzsir8i1bqz7g7b20g5zs28qq63j41v9c5z69q8fq7wh1nwwb";
};
buildInputs = [

4
pkgs/desktops/mate/mate-menus/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-menus";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17zc9fn14jykhn30z8iwlw0qwk32ivj6gxgww3xrqvqk0da5yaas";
sha256 = "1r7zf64aclaplz77hkl9kq0xnz6jk1l49z64i8v56c41pm59c283";
};
nativeBuildInputs = [ pkg-config gettext gobject-introspection ];

4
pkgs/desktops/mate/mate-netbook/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-netbook";
version = "1.24.0";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8";
sha256 = "12gdy69nfysl8vmd8lv8b0lknkaagplrrz88nh6n0rmjkxnipgz3";
};
nativeBuildInputs = [

8
pkgs/desktops/mate/mate-notification-daemon/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3,
libnotify, libwnck, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
libnotify, libwnck, gtk3, libxml2, mate-desktop, mate-panel, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-notification-daemon";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02mf9186cbziyvz7ycb0j9b7rn085a7f9hrm03n28q5kz0z1k92q";
sha256 = "1fmr6hlcy2invp2yxqfqgpdx1dp4qa8xskjq2rm6v4gmz20nag5j";
};
nativeBuildInputs = [
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
libnotify
libwnck
gtk3
mate-desktop
mate-panel
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

4
pkgs/desktops/mate/mate-panel/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-panel";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1sj851h71nq4ssrsd4k5b0vayxmspl5x3rhf488b2xpcj81vmi9h";
sha256 = "0r7a8wy9p2x6r0c4qaa81qhhjc080rxnc6fznz7i6fkv2z91wbh9";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-polkit/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-polkit";
version = "1.24.0";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn";
sha256 = "0kkjv025l1l8352m5ky1g7hmk7isgi3dnfnh7sqg9pyhml97i9dd";
};
nativeBuildInputs = [

8
pkgs/desktops/mate/mate-power-manager/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }:
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, libsecret, dbus-glib, upower, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-power-manager";
version = "1.24.3";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1rmcrpii3hl35qjznk6h5cq72n60cs12n294hjyakxr9kvgns7l6";
sha256 = "0ybvwv24g8awxjl2asgvx6l2ghn4limcm48ylha68dkpy3607di6";
};
nativeBuildInputs = [
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
libxml2
libcanberra-gtk3
gtk3
gnome.libgnome-keyring
libsecret
libnotify
dbus-glib
upower

4
pkgs/desktops/mate/mate-screensaver/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-screensaver";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18hxhglryfcbpbns9izigiws7lvdv5dnsaaz226ih3aar5db1ysy";
sha256 = "0xmgzrb5nk7x6ganf7jd4gmdafanx7f0znga0lhsd8kd40r40la1";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-sensors-applet/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "mate-sensors-applet";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1nb4fy3mcymv7pmnc0czpxgp1sqvs533jwnqv1b5cqby415ljb16";
sha256 = "0s19r30fsicqvvcnz57lv158pi35w9zn5i7h5hz59224y0zpqhsc";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-session-manager/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "mate-session-manager";
version = "1.24.3";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18mhv8dq18hvx28gi88c9499s3s1nsq55m64sas8fqlvnp2sx84h";
sha256 = "05hqi8wlwjr07mp5njhp7h06mgnv98zsxaxkmxc5w3iwb3va45ar";
};
patches = [

4
pkgs/desktops/mate/mate-settings-daemon/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "mate-settings-daemon";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "051r7xrx1byllsszbwsk646sq4izyag9yxg8jw2rm6x6mgwb89cc";
sha256 = "0hbdwqagxh1mdpxfdqr1ps3yqvk0v0c5zm0bwk56y6l1zwbs0ymp";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-system-monitor/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-system-monitor";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1mbny5hs5805398krvcsvi1jfhyq9a9dfciyrnis67n2yisr1hzp";
sha256 = "13rkrk7c326ng8164aqfp6i7334n7zrmbg61ncpjprbrvlx2qiw3";
};
nativeBuildInputs = [

34
pkgs/desktops/mate/mate-terminal/default.nix
View File

@ -1,31 +1,27 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook, mateUpdateScript }:
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "mate-terminal";
version = "1.24.1";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0qmyhxmarwkxad8k1m9q1iwx70zhfp6zc2mh74nv26nj4gr3h3am";
sha256 = "08mgxbviik2dwwnbclp0518wlag2fhcr6c2yadgcbhwiq4aff9vp";
};
buildInputs = [
glib
itstool
libxml2
mate.mate-desktop
vte
gtk3
dconf
pcre2
nativeBuildInputs = [
gettext
itstool
pkg-config
wrapGAppsHook
];
nativeBuildInputs = [
pkg-config
gettext
wrapGAppsHook
buildInputs = [
dconf
libxml2
mate-desktop
pcre2
vte
];
enableParallelBuilding = true;
@ -33,7 +29,7 @@ stdenv.mkDerivation rec {
passthru.updateScript = mateUpdateScript { inherit pname version; };
meta = with lib; {
description = "The MATE Terminal Emulator";
description = "MATE desktop terminal emulator";
homepage = "https://mate-desktop.org";
license = licenses.gpl3Plus;
platforms = platforms.unix;

4
pkgs/desktops/mate/mate-user-guide/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mate-user-guide";
version = "1.24.0";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f";
sha256 = "1h620ngryqc4m8ybvc92ba8404djnm0l65f34mlw38g9ad8d9085";
};
nativeBuildInputs = [ itstool gettext libxml2 ];

4
pkgs/desktops/mate/mate-user-share/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "mate-user-share";
version = "1.24.0";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5";
sha256 = "1wh0b4qw5wzpl7sg44lpwjb9r6xllch3xfz8c2cchl8rcgbh2kph";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mate-utils/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "mate-utils";
version = "1.24.0";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1";
sha256 = "0bkqj8qwwml9xyvb680yy06lv3dzwkv89yrzz5jamvz88ar6m9bw";
};
nativeBuildInputs = [

4
pkgs/desktops/mate/mozo/default.nix
View File

@ -2,14 +2,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "mozo";
version = "1.24.1";
version = "1.26.0";
format = "other";
doCheck = false;
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "14ps43gdh1sfvq49yhl58gxq3rc0d25i2d7r4ghlzf07ssxl53b0";
sha256 = "1hnxqdk69g7j809k6picgq8y626hnyznlzxd0pi743gshpwwnhj6";
};
nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ];

22
pkgs/desktops/mate/pluma/default.nix
View File

@ -1,32 +1,32 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3
, gnome, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }:
, adwaita-icon-theme, gtksourceview4, libpeas, mate-desktop, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec {
pname = "pluma";
version = "1.24.2";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "183frfhll3sb4r12p24160j1c1cfd102nlp5rrwvyv5qqm7i2fg4";
sha256 = "0lway12q2xygiwjgrx7chgka838jbnmlzz98g7agag1rwzd481ii";
};
nativeBuildInputs = [
pkg-config
gettext
perl
itstool
isocodes
itstool
perl
pkg-config
wrapGAppsHook
];
buildInputs = [
adwaita-icon-theme
enchant
libxml2
python3
gtksourceview3
gtksourceview4
libpeas
gnome.adwaita-icon-theme
mate.mate-desktop
libxml2
mate-desktop
python3
];
enableParallelBuilding = true;

4
pkgs/desktops/mate/python-caja/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "python-caja";
version = "1.24.0";
version = "1.26.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg";
sha256 = "181zcs1pi3762chm4xraqs8048jm7jzwnvgwla1v3z2nqzpp3xr1";
};
nativeBuildInputs = [

18
pkgs/development/libraries/ndpi/default.nix
View File

@ -1,23 +1,31 @@
{ lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap
{ lib
, stdenv
, fetchFromGitHub
, which
, autoconf
, automake
, libtool
, libpcap
, json_c
, pkg-config }:
stdenv.mkDerivation rec {
pname = "ndpi";
version = "3.4";
version = "4.0";
src = fetchFromGitHub {
owner = "ntop";
repo = "nDPI";
rev = version;
sha256 = "0xjh9gv0mq0213bjfs5ahrh6m7l7g99jjg8104c0pw54hz0p5pq1";
sha256 = "0snzvlracc6s7r2pgdn0jqcc7nxjxzcivsa579h90g5ibhhplv5x";
};
configureScript = "./autogen.sh";
nativeBuildInputs = [which autoconf automake libtool];
nativeBuildInputs = [ which autoconf automake libtool pkg-config ];
buildInputs = [
libpcap
pkg-config
json_c
];
meta = with lib; {

4
pkgs/development/mobile/androidenv/compose-android-packages.nix
View File

@ -3,8 +3,8 @@
}:
{ toolsVersion ? "26.1.1"
, platformToolsVersion ? "31.0.2"
, buildToolsVersions ? [ "30.0.3" ]
, platformToolsVersion ? "31.0.3"
, buildToolsVersions ? [ "31.0.0" ]
, includeEmulator ? false
, emulatorVersion ? "30.6.3"
, platformVersions ? []

444
pkgs/development/mobile/androidenv/repo.json
View File

@ -1400,6 +1400,27 @@
},
"29": {
"google_apis_playstore": {
"arm64-v8a": {
"archives": [
{
"os": "macosx",
"sha1": "47705387b8fbbfe87e3679d272c29f7064defba8",
"size": 1242979582,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-darwin.zip"
},
{
"os": "linux",
"sha1": "47705387b8fbbfe87e3679d272c29f7064defba8",
"size": 1242979582,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-linux.zip"
}
],
"displayName": "Google Play ARM 64 v8a System Image",
"license": "android-sdk-arm-dbt-license",
"name": "system-image-29-google_apis_playstore-arm64-v8a",
"path": "system-images/android-29/google_apis_playstore/arm64-v8a",
"revision": "29-google_apis_playstore-arm64-v8a"
},
"x86": {
"archives": [
{
@ -1462,15 +1483,15 @@
"archives": [
{
"os": "macosx",
"sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75",
"size": 1207055010,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-darwin.zip"
"sha1": "7208c0b72b51adb561595e62891763d7322964a0",
"size": 1308440072,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-darwin.zip"
},
{
"os": "linux",
"sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75",
"size": 1207055010,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-linux.zip"
"sha1": "7208c0b72b51adb561595e62891763d7322964a0",
"size": 1308440072,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-linux.zip"
}
],
"displayName": "Google Play ARM 64 v8a System Image",
@ -1535,55 +1556,55 @@
}
}
},
"S": {
"31": {
"google_apis_playstore": {
"arm64-v8a": {
"archives": [
{
"os": "macosx",
"sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733",
"size": 1333046412,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-darwin.zip"
"sha1": "bef2699f7fd74fe0c4106a8898833074de72984d",
"size": 1394878415,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-darwin.zip"
},
{
"os": "linux",
"sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733",
"size": 1333046412,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-linux.zip"
"sha1": "bef2699f7fd74fe0c4106a8898833074de72984d",
"size": 1394878415,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-linux.zip"
}
],
"displayName": "Google Play ARM 64 v8a System Image",
"license": "android-sdk-arm-dbt-license",
"name": "system-image-S-google_apis_playstore-arm64-v8a",
"path": "system-images/android-S/google_apis_playstore/arm64-v8a",
"revision": "S-google_apis_playstore-arm64-v8a"
"name": "system-image-31-google_apis_playstore-arm64-v8a",
"path": "system-images/android-31/google_apis_playstore/arm64-v8a",
"revision": "31-google_apis_playstore-arm64-v8a"
},
"x86_64": {
"archives": [
{
"os": "windows",
"sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff",
"size": 1384401947,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-windows.zip"
"sha1": "6450e33574aba4746682cfa72edd4e89947fed38",
"size": 1433583169,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-windows.zip"
},
{
"os": "macosx",
"sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff",
"size": 1384401947,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-darwin.zip"
"sha1": "6450e33574aba4746682cfa72edd4e89947fed38",
"size": 1433583169,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-darwin.zip"
},
{
"os": "linux",
"sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff",
"size": 1384401947,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-linux.zip"
"sha1": "6450e33574aba4746682cfa72edd4e89947fed38",
"size": 1433583169,
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-linux.zip"
}
],
"displayName": "Google Play Intel x86 Atom_64 System Image",
"license": "android-sdk-preview-license",
"name": "system-image-S-google_apis_playstore-x86_64",
"path": "system-images/android-S/google_apis_playstore/x86_64",
"revision": "S-google_apis_playstore-x86_64"
"name": "system-image-31-google_apis_playstore-x86_64",
"path": "system-images/android-31/google_apis_playstore/x86_64",
"revision": "31-google_apis_playstore-x86_64"
}
}
}
@ -3101,32 +3122,32 @@
"path": "build-tools/30.0.3",
"revision": "30.0.3"
},
"31.0.0-rc3": {
"31.0.0": {
"archives": [
{
"os": "macosx",
"sha1": "e75dfb7a975809ba0ca0d25c2b82f7fd56444a4b",
"size": 53224980,
"url": "https://dl.google.com/android/repository/012061446cfd98341585d0d07401d0bd1a4c30f6.build-tools_r31-rc3-macosx.zip"
},
{
"os": "windows",
"sha1": "9d9ce209353c9046abe16285d58ef893c4b42221",
"size": 57592553,
"url": "https://dl.google.com/android/repository/41966dc138d44a3e3797b92fb68bf70552011d5d.build-tools_r31-rc3-windows.zip"
"sha1": "032da328482814e6ef7fe918665c07e8f8f806ca",
"size": 56688233,
"url": "https://dl.google.com/android/repository/09489e417c0a266f2862ddd82b4ac29a1b7af55e.build-tools_r31-windows.zip"
},
{
"os": "linux",
"sha1": "6859f11348d3984afbfcc74984802bd2e31cc0e2",
"size": 54724181,
"url": "https://dl.google.com/android/repository/build-tools_r31-rc3-linux.zip"
"sha1": "9dbebfdb9ff4c0dbc4ef00677986bf571ddcf99c",
"size": 54931191,
"url": "https://dl.google.com/android/repository/build-tools_r31-linux.zip"
},
{
"os": "macosx",
"sha1": "c9b4215affd183974b1b2d1c5745911203f56de5",
"size": 52867497,
"url": "https://dl.google.com/android/repository/d32e21a8aa8492ef8b86a489f601da425842b5da.build-tools_r31-macosx.zip"
}
],
"displayName": "Android SDK Build-Tools 31-rc3",
"license": "android-sdk-preview-license",
"displayName": "Android SDK Build-Tools 31",
"license": "android-sdk-license",
"name": "build-tools",
"path": "build-tools/31.0.0-rc3",
"revision": "31.0.0-rc3"
"path": "build-tools/31.0.0",
"revision": "31.0.0"
}
},
"cmake": {
@ -3321,115 +3342,115 @@
"path": "cmdline-tools/3.0",
"revision": "3.0"
},
"4.0-rc01": {
"4.0": {
"archives": [
{
"os": "linux",
"sha1": "98d3f2715f6bfbacef063d1376d7765fe5b93309",
"size": 99514756,
"url": "https://dl.google.com/android/repository/commandlinetools-linux-6987402_latest.zip"
"sha1": "87e7cd8879ed469117f20090dc4d454a24e30170",
"size": 103957858,
"url": "https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip"
},
{
"os": "macosx",
"sha1": "573d312a3fdc7700d9c395d647292d90b193d4ee",
"size": 99514744,
"url": "https://dl.google.com/android/repository/commandlinetools-mac-6987402_latest.zip"
"sha1": "8fcf59d208cb5d48e1233979aa5187e7dfb98cf3",
"size": 103957846,
"url": "https://dl.google.com/android/repository/commandlinetools-mac-7302050_latest.zip"
},
{
"os": "windows",
"sha1": "72fae22d41fb8aa4f22e408e18c9d00f06050f7b",
"size": 99496635,
"url": "https://dl.google.com/android/repository/commandlinetools-win-6987402_latest.zip"
"sha1": "ede5b054c06a7fea51bfd27041a100bae5521803",
"size": 103939737,
"url": "https://dl.google.com/android/repository/commandlinetools-win-7302050_latest.zip"
}
],
"displayName": "Android SDK Command-line Tools",
"license": "android-sdk-preview-license",
"license": "android-sdk-license",
"name": "cmdline-tools",
"path": "cmdline-tools/4.0-beta01",
"revision": "4.0-rc01"
"path": "cmdline-tools/4.0",
"revision": "4.0"
},
"5.0-rc01": {
"5.0": {
"archives": [
{
"os": "linux",
"sha1": "f06b1642396ef1e431b990dbe386d5f1e3deabcc",
"size": 102189958,
"url": "https://dl.google.com/android/repository/commandlinetools-linux-7006259_latest.zip"
"sha1": "0885385de11983c020ff0d47039987fe372160d2",
"size": 109673042,
"url": "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip"
},
{
"os": "macosx",
"sha1": "0752424530724f76cb5a28de84d663e63739e6ee",
"size": 102189946,
"url": "https://dl.google.com/android/repository/commandlinetools-mac-7006259_latest.zip"
"sha1": "49538fa064c077b188bdb51f3aa57bb2882b0abd",
"size": 109673028,
"url": "https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip"
},
{
"os": "windows",
"sha1": "6f8e359dba91af39c046a791ea32e3ca5149a078",
"size": 102171837,
"url": "https://dl.google.com/android/repository/commandlinetools-win-7006259_latest.zip"
"sha1": "a2f359fb8b075acebcb3e3e48b4170cfe4071882",
"size": 109651902,
"url": "https://dl.google.com/android/repository/commandlinetools-win-7583922_latest.zip"
}
],
"displayName": "Android SDK Command-line Tools",
"license": "android-sdk-preview-license",
"license": "android-sdk-license",
"name": "cmdline-tools",
"path": "cmdline-tools/5.0-alpha01",
"revision": "5.0-rc01"
"path": "cmdline-tools/5.0",
"revision": "5.0"
}
},
"emulator": {
"30.5.5": {
"30.8.4": {
"archives": [
{
"os": "macosx",
"sha1": "90f8a9942253db75ab4d13f791377e9739a88617",
"size": 300476485,
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-7285888.zip"
},
{
"os": "linux",
"sha1": "ccdee1aa99e4ec39f5a762d6912682ac248b92f0",
"size": 272500365,
"url": "https://dl.google.com/android/repository/emulator-linux_x64-7285888.zip"
"sha1": "140f833321684f7696e4b9012636c45eaa5b6a4a",
"size": 277522999,
"url": "https://dl.google.com/android/repository/emulator-linux_x64-7600983.zip"
},
{
"os": "windows",
"sha1": "84c3105ba1a3a94963e1f99b3f706d0231948fc9",
"size": 324371999,
"url": "https://dl.google.com/android/repository/emulator-windows_x64-7285888.zip"
"sha1": "c26170db8aba1bbfcfe63481e95a90bc7b2ff129",
"size": 326723360,
"url": "https://dl.google.com/android/repository/emulator-windows_x64-7600983.zip"
},
{
"os": "macosx",
"sha1": "9811a649c516153681471f897a02398947640045",
"size": 315292647,
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-7600983.zip"
}
],
"displayName": "Android Emulator",
"license": "android-sdk-license",
"name": "emulator",
"path": "emulator",
"revision": "30.5.5"
"revision": "30.8.4"
},
"30.6.3": {
"30.9.0": {
"archives": [
{
"os": "macosx",
"sha1": "66c9b788de49548d0faab052274f97b042f7241d",
"size": 308984491,
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-7266284.zip"
"sha1": "b197e04e0543271899a1bd956a3f828e1159086b",
"size": 315330447,
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-7634933.zip"
},
{
"os": "linux",
"sha1": "ecd9b55fe4784b6c8683faa4b1d2c951b8929154",
"size": 272243636,
"url": "https://dl.google.com/android/repository/emulator-linux_x64-7266284.zip"
"sha1": "5cdfb2b27f24ded22348535f2de28ec373e203c8",
"size": 277557089,
"url": "https://dl.google.com/android/repository/emulator-linux_x64-7634933.zip"
},
{
"os": "windows",
"sha1": "5736749dc46ad950ec84e8275dfde2606d3e8a80",
"size": 324657514,
"url": "https://dl.google.com/android/repository/emulator-windows_x64-7266284.zip"
"sha1": "aed5ba827d0c1d68c8663a4d786f184aaeb939ed",
"size": 326205048,
"url": "https://dl.google.com/android/repository/emulator-windows_x64-7634933.zip"
}
],
"displayName": "Android Emulator",
"license": "android-sdk-preview-license",
"name": "emulator",
"path": "emulator",
"revision": "30.6.3"
"revision": "30.9.0"
}
},
"extras": {
@ -3460,32 +3481,32 @@
"path": "extras/google/auto",
"revision": "1.1"
},
"2.0-rc1": {
"2.0-rc2": {
"archives": [
{
"os": "linux",
"sha1": "b480489e604371301da10731a793b234b01b8f42",
"size": 4527281,
"url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc1.zip"
"sha1": "dbb771c2be299fd88ca05d8b0e381c369a7f7009",
"size": 6947111,
"url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc2.zip"
},
{
"os": "macosx",
"sha1": "3adaf99d06eaeeb31f7bdbb62ae841e740bfc156",
"size": 5592023,
"url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc1.zip"
"sha1": "ec1f68f9acc234f8493f4ba24954d1d45291b736",
"size": 8593497,
"url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc2.zip"
},
{
"os": "windows",
"sha1": "e07788ed91d8e6dd3374f77da1cf78afb2664cc0",
"size": 5703857,
"url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc1.zip"
"sha1": "471ae94176512f859580e6ac9e8b8f5010632c78",
"size": 7130894,
"url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc2.zip"
}
],
"displayName": "Android Auto Desktop Head Unit Emulator",
"license": "android-sdk-preview-license",
"name": "extras",
"path": "extras/google/auto",
"revision": "2.0-rc1"
"revision": "2.0-rc2"
}
},
"ndk": {
@ -4136,6 +4157,114 @@
"name": "ndk",
"path": "ndk/23.0.7272597",
"revision": "23.0.7272597-rc3"
},
"23.0.7344513-rc4": {
"archives": [
{
"os": "macosx",
"sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039",
"size": 694920487,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip"
},
{
"os": "linux",
"sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc",
"size": 724510864,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip"
},
{
"os": "windows",
"sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94",
"size": 785615074,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip"
}
],
"displayName": "NDK (Side by side) 23.0.7344513",
"license": "android-sdk-preview-license",
"name": "ndk",
"path": "ndk/23.0.7344513",
"revision": "23.0.7344513-rc4"
},
"23.0.7421159-rc5": {
"archives": [
{
"os": "macosx",
"sha1": "9ef60fcc7a4bb0477d4189c711853cbc12b24efe",
"size": 694850942,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-darwin.zip"
},
{
"os": "linux",
"sha1": "453ba0ca124e43337318f8a40d26cab114e7092c",
"size": 724438684,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-linux.zip"
},
{
"os": "windows",
"sha1": "ace75623181ce86bc70df312155c04b9d8ff3e46",
"size": 785543078,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-windows.zip"
}
],
"displayName": "NDK (Side by side) 23.0.7421159",
"license": "android-sdk-preview-license",
"name": "ndk",
"path": "ndk/23.0.7421159",
"revision": "23.0.7421159-rc5"
},
"23.0.7530507-rc6": {
"archives": [
{
"os": "macosx",
"sha1": "af299c3e4f6fd3e6f05b1699a0181d84a95068c4",
"size": 695336572,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-darwin.zip"
},
{
"os": "linux",
"sha1": "b3118a9daeff8ad1801c4dbaeda1e5e5fb33b8a5",
"size": 725026229,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-linux.zip"
},
{
"os": "windows",
"sha1": "386f5c80217f6f33d6420f7de4f935eaff831868",
"size": 786033634,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-windows.zip"
}
],
"displayName": "NDK (Side by side) 23.0.7530507",
"license": "android-sdk-preview-license",
"name": "ndk",
"path": "ndk/23.0.7530507",
"revision": "23.0.7530507-rc6"
},
"23.0.7599858": {
"archives": [
{
"os": "macosx",
"sha1": "c19f4a29e03689ea31bebe77f2d0a256d8e16925",
"size": 691981924,
"url": "https://dl.google.com/android/repository/android-ndk-r23-darwin.zip"
},
{
"os": "linux",
"sha1": "9bad35f442caeda747780ba1dd92f2d98609d9cd",
"size": 721667870,
"url": "https://dl.google.com/android/repository/android-ndk-r23-linux.zip"
},
{
"os": "windows",
"sha1": "14af52e23af9f7a9e7576a17e1814701192745be",
"size": 782684423,
"url": "https://dl.google.com/android/repository/android-ndk-r23-windows.zip"
}
],
"displayName": "NDK (Side by side) 23.0.7599858",
"license": "android-sdk-license",
"name": "ndk",
"path": "ndk/23.0.7599858",
"revision": "23.0.7599858"
}
},
"ndk-bundle": {
@ -4786,6 +4915,33 @@
"name": "ndk-bundle",
"path": "ndk-bundle",
"revision": "23.0.7272597-rc3"
},
"23.0.7344513-rc4": {
"archives": [
{
"os": "macosx",
"sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039",
"size": 694920487,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip"
},
{
"os": "linux",
"sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc",
"size": 724510864,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip"
},
{
"os": "windows",
"sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94",
"size": 785615074,
"url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip"
}
],
"displayName": "NDK",
"license": "android-sdk-preview-license",
"name": "ndk-bundle",
"path": "ndk-bundle",
"revision": "23.0.7344513-rc4"
}
},
"patcher": {
@ -4806,32 +4962,32 @@
}
},
"platform-tools": {
"31.0.2": {
"31.0.3": {
"archives": [
{
"os": "macosx",
"sha1": "78937049851e1db90317612c6b831759f56fc86d",
"size": 13829393,
"url": "https://dl.google.com/android/repository/42b081e1e068bb936179551684cdcb30315e245c.platform-tools_r31.0.2-darwin.zip"
"sha1": "15f6f7e97b35994d538a0fc5147ad5fb502ba03d",
"size": 13227985,
"url": "https://dl.google.com/android/repository/e8b2b4cbe47c728c1e54c5f524440b52d4e1a33c.platform-tools_r31.0.3-darwin.zip"
},
{
"os": "linux",
"sha1": "ff02a9d8c6fa9687e1207fc0c4b84033925d452d",
"size": 13876419,
"url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-linux.zip"
"sha1": "f09581347ed39978abb3a99c6bb286de6adc98ef",
"size": 13302579,
"url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-linux.zip"
},
{
"os": "windows",
"sha1": "9cc0f642a66706a978214395b85c8e8228c24f2f",
"size": 12537668,
"url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-windows.zip"
"sha1": "26bc02bbd920e8ed461ae526cc4c69d773b72395",
"size": 11912013,
"url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip"
}
],
"displayName": "Android SDK Platform-Tools",
"license": "android-sdk-license",
"name": "platform-tools",
"path": "platform-tools",
"revision": "31.0.2"
"revision": "31.0.3"
}
},
"platforms": {
@ -5204,6 +5360,21 @@
"path": "platforms/android-30",
"revision": "30"
},
"31": {
"archives": [
{
"os": "all",
"sha1": "ca5bcaa565cb37e9d287051d6dd0e49a5426ec29",
"size": 56475526,
"url": "https://dl.google.com/android/repository/platform-31_r01.zip"
}
],
"displayName": "Android SDK Platform 31",
"license": "android-sdk-license",
"name": "platforms",
"path": "platforms/android-31",
"revision": "31"
},
"4": {
"archives": [
{
@ -5329,50 +5500,35 @@
"name": "platforms",
"path": "platforms/android-9",
"revision": "9"
},
"S": {
"archives": [
{
"os": "all",
"sha1": "3aee3ad760dc7becf657d6421629fe360215f92e",
"size": 56206479,
"url": "https://dl.google.com/android/repository/platform-S_r03.zip"
}
],
"displayName": "Android SDK Platform S",
"license": "android-sdk-license",
"name": "platforms",
"path": "platforms/android-S",
"revision": "S"
}
},
"skiaparser": {
"2": {
"3": {
"archives": [
{
"os": "linux",
"sha1": "2703a570224a5ced1f73eb3efbdb3192a1ecec81",
"size": 6681896,
"url": "https://dl.google.com/android/repository/skiaparser-7248848-linux.zip"
"sha1": "36e2c30f7745f4c062129a0fd549d29ab991db41",
"size": 6767192,
"url": "https://dl.google.com/android/repository/skiaparser-7478287-linux.zip"
},
{
"os": "macosx",
"sha1": "ecf8794beccf578d4130bb9f7f2c7fa0c40c62c2",
"size": 7340904,
"url": "https://dl.google.com/android/repository/skiaparser-7248848-mac.zip"
"sha1": "04a834a8ab3efd4612300da7cef7f43a6b257468",
"size": 7401688,
"url": "https://dl.google.com/android/repository/skiaparser-7478287-mac.zip"
},
{
"os": "windows",
"sha1": "84c28480ca057e48e8d2fed0ae8f52fc21aa7e61",
"size": 6450856,
"url": "https://dl.google.com/android/repository/skiaparser-7248848-win.zip"
"sha1": "567f24512f9d9487a3b948032a136261f5d59c92",
"size": 6532776,
"url": "https://dl.google.com/android/repository/skiaparser-7478287-win.zip"
}
],
"displayName": "Layout Inspector image server for API S",
"license": "android-sdk-license",
"name": "skiaparser",
"path": "skiaparser/2",
"revision": "2"
"revision": "3"
},
"6": {
"archives": [

1
pkgs/development/node-packages/node-packages.json
View File

@ -73,6 +73,7 @@
, "coffee-script"
, "coinmon"
, "configurable-http-proxy"
, "conventional-changelog-cli"
, "cordova"
, "cpy-cli"
, "create-cycle-app"

311
pkgs/development/node-packages/node-packages.nix generated
View File

@ -18051,6 +18051,15 @@ let
sha512 = "jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==";
};
};
"conventional-changelog-3.1.24" = {
name = "conventional-changelog";
packageName = "conventional-changelog";
version = "3.1.24";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.24.tgz";
sha512 = "ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg==";
};
};
"conventional-changelog-angular-5.0.12" = {
name = "conventional-changelog-angular";
packageName = "conventional-changelog-angular";
@ -18060,6 +18069,33 @@ let
sha512 = "5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==";
};
};
"conventional-changelog-atom-2.0.8" = {
name = "conventional-changelog-atom";
packageName = "conventional-changelog-atom";
version = "2.0.8";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz";
sha512 = "xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==";
};
};
"conventional-changelog-codemirror-2.0.8" = {
name = "conventional-changelog-codemirror";
packageName = "conventional-changelog-codemirror";
version = "2.0.8";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz";
sha512 = "z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==";
};
};
"conventional-changelog-conventionalcommits-4.6.0" = {
name = "conventional-changelog-conventionalcommits";
packageName = "conventional-changelog-conventionalcommits";
version = "4.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.0.tgz";
sha512 = "sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A==";
};
};
"conventional-changelog-core-4.2.3" = {
name = "conventional-changelog-core";
packageName = "conventional-changelog-core";
@ -18069,6 +18105,51 @@ let
sha512 = "MwnZjIoMRL3jtPH5GywVNqetGILC7g6RQFvdb8LRU/fA/338JbeWAku3PZ8yQ+mtVRViiISqJlb0sOz0htBZig==";
};
};
"conventional-changelog-ember-2.0.9" = {
name = "conventional-changelog-ember";
packageName = "conventional-changelog-ember";
version = "2.0.9";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz";
sha512 = "ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==";
};
};
"conventional-changelog-eslint-3.0.9" = {
name = "conventional-changelog-eslint";
packageName = "conventional-changelog-eslint";
version = "3.0.9";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz";
sha512 = "6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==";
};
};
"conventional-changelog-express-2.0.6" = {
name = "conventional-changelog-express";
packageName = "conventional-changelog-express";
version = "2.0.6";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz";
sha512 = "SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==";
};
};
"conventional-changelog-jquery-3.0.11" = {
name = "conventional-changelog-jquery";
packageName = "conventional-changelog-jquery";
version = "3.0.11";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz";
sha512 = "x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==";
};
};
"conventional-changelog-jshint-2.0.9" = {
name = "conventional-changelog-jshint";
packageName = "conventional-changelog-jshint";
version = "2.0.9";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz";
sha512 = "wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==";
};
};
"conventional-changelog-preset-loader-2.3.4" = {
name = "conventional-changelog-preset-loader";
packageName = "conventional-changelog-preset-loader";
@ -59758,6 +59839,15 @@ let
sha512 = "HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw==";
};
};
"tempfile-3.0.0" = {
name = "tempfile";
packageName = "tempfile";
version = "3.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/tempfile/-/tempfile-3.0.0.tgz";
sha512 = "uNFCg478XovRi85iD42egu+eSFUmmka750Jy7L5tfHI5hQKKtbPnxaSaXAbBqCDYrw3wx4tXjKwci4/QmsZJxw==";
};
};
"tempy-0.1.0" = {
name = "tempy";
packageName = "tempy";
@ -77730,6 +77820,227 @@ in
bypassCache = true;
reconstructLock = true;
};
conventional-changelog-cli = nodeEnv.buildNodePackage {
name = "conventional-changelog-cli";
packageName = "conventional-changelog-cli";
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-2.1.1.tgz";
sha512 = "xMGQdKJ+4XFDDgfX5aK7UNFduvJMbvF5BB+g0OdVhA3rYdYyhctrIE2Al+WYdZeKTdg9YzMWF2iFPT8MupIwng==";
};
dependencies = [
sources."@babel/code-frame-7.14.5"
sources."@babel/helper-validator-identifier-7.14.9"
sources."@babel/highlight-7.14.5"
sources."@hutson/parse-repository-url-3.0.2"
sources."@types/minimist-1.2.2"
sources."@types/normalize-package-data-2.4.1"
sources."JSONStream-1.3.5"
sources."add-stream-1.0.0"
sources."ansi-styles-3.2.1"
sources."array-ify-1.0.0"
sources."arrify-1.0.1"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."compare-func-2.0.0"
sources."conventional-changelog-3.1.24"
sources."conventional-changelog-angular-5.0.12"
sources."conventional-changelog-atom-2.0.8"
sources."conventional-changelog-codemirror-2.0.8"
sources."conventional-changelog-conventionalcommits-4.6.0"
sources."conventional-changelog-core-4.2.3"
sources."conventional-changelog-ember-2.0.9"
sources."conventional-changelog-eslint-3.0.9"
sources."conventional-changelog-express-2.0.6"
sources."conventional-changelog-jquery-3.0.11"
sources."conventional-changelog-jshint-2.0.9"
sources."conventional-changelog-preset-loader-2.3.4"
sources."conventional-changelog-writer-5.0.0"
sources."conventional-commits-filter-2.0.7"
sources."conventional-commits-parser-3.2.1"
sources."core-util-is-1.0.2"
sources."dargs-7.0.0"
sources."dateformat-3.0.3"
sources."decamelize-1.2.0"
(sources."decamelize-keys-1.1.0" // {
dependencies = [
sources."map-obj-1.0.1"
];
})
sources."dot-prop-5.3.0"
sources."error-ex-1.3.2"
sources."escape-string-regexp-1.0.5"
sources."find-up-4.1.0"
sources."function-bind-1.1.1"
(sources."get-pkg-repo-4.1.2" // {
dependencies = [
sources."meow-7.1.1"
(sources."normalize-package-data-2.5.0" // {
dependencies = [
sources."hosted-git-info-2.8.9"
];
})
(sources."read-pkg-5.2.0" // {
dependencies = [
sources."type-fest-0.6.0"
];
})
(sources."read-pkg-up-7.0.1" // {
dependencies = [
sources."type-fest-0.8.1"
];
})
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
sources."semver-5.7.1"
sources."string_decoder-1.1.1"
sources."through2-2.0.5"
];
})
sources."git-raw-commits-2.0.10"
sources."git-remote-origin-url-2.0.0"
sources."git-semver-tags-4.1.1"
sources."gitconfiglocal-1.0.0"
sources."graceful-fs-4.2.8"
sources."handlebars-4.7.7"
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
sources."has-flag-3.0.0"
sources."hosted-git-info-4.0.2"
sources."indent-string-4.0.0"
sources."inherits-2.0.4"
sources."ini-1.3.8"
sources."is-arrayish-0.2.1"
sources."is-core-module-2.6.0"
sources."is-obj-2.0.0"
sources."is-plain-obj-1.1.0"
sources."is-text-path-1.0.1"
sources."isarray-1.0.0"
sources."js-tokens-4.0.0"
sources."json-parse-better-errors-1.0.2"
sources."json-parse-even-better-errors-2.3.1"
sources."json-stringify-safe-5.0.1"
sources."jsonparse-1.3.1"
sources."kind-of-6.0.3"
sources."lines-and-columns-1.1.6"
(sources."load-json-file-4.0.0" // {
dependencies = [
sources."parse-json-4.0.0"
sources."pify-3.0.0"
];
})
sources."locate-path-5.0.0"
sources."lodash-4.17.21"
sources."lodash.ismatch-4.4.0"
sources."lru-cache-6.0.0"
sources."map-obj-4.2.1"
(sources."meow-8.1.2" // {
dependencies = [
sources."hosted-git-info-2.8.9"
(sources."read-pkg-5.2.0" // {
dependencies = [
sources."normalize-package-data-2.5.0"
sources."type-fest-0.6.0"
];
})
(sources."read-pkg-up-7.0.1" // {
dependencies = [
sources."type-fest-0.8.1"
];
})
sources."semver-5.7.1"
sources."type-fest-0.18.1"
sources."yargs-parser-20.2.9"
];
})
sources."min-indent-1.0.1"
sources."minimist-1.2.5"
sources."minimist-options-4.1.0"
sources."modify-values-1.0.1"
sources."neo-async-2.6.2"
(sources."normalize-package-data-3.0.3" // {
dependencies = [
sources."semver-7.3.5"
];
})
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
sources."p-try-2.2.0"
sources."parse-json-5.2.0"
sources."path-exists-4.0.0"
sources."path-parse-1.0.7"
(sources."path-type-3.0.0" // {
dependencies = [
sources."pify-3.0.0"
];
})
sources."pify-2.3.0"
sources."process-nextick-args-2.0.1"
sources."q-1.5.1"
sources."quick-lru-4.0.1"
(sources."read-pkg-3.0.0" // {
dependencies = [
sources."hosted-git-info-2.8.9"
sources."normalize-package-data-2.5.0"
sources."semver-5.7.1"
];
})
(sources."read-pkg-up-3.0.0" // {
dependencies = [
sources."find-up-2.1.0"
sources."locate-path-2.0.0"
sources."p-limit-1.3.0"
sources."p-locate-2.0.0"
sources."p-try-1.0.0"
sources."path-exists-3.0.0"
];
})
sources."readable-stream-3.6.0"
sources."redent-3.0.0"
sources."resolve-1.20.0"
sources."safe-buffer-5.2.1"
sources."semver-6.3.0"
sources."source-map-0.6.1"
sources."spdx-correct-3.1.1"
sources."spdx-exceptions-2.3.0"
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.10"
sources."split-1.0.1"
sources."split2-3.2.2"
sources."string_decoder-1.3.0"
sources."strip-bom-3.0.0"
sources."strip-indent-3.0.0"
sources."supports-color-5.5.0"
sources."temp-dir-2.0.0"
sources."tempfile-3.0.0"
sources."text-extensions-1.9.0"
sources."through-2.3.8"
sources."through2-4.0.2"
sources."trim-newlines-3.0.1"
sources."trim-off-newlines-1.0.1"
sources."type-fest-0.13.1"
sources."uglify-js-3.14.1"
sources."util-deprecate-1.0.2"
sources."uuid-3.4.0"
sources."validate-npm-package-license-3.0.4"
sources."wordwrap-1.0.0"
sources."xtend-4.0.2"
sources."yallist-4.0.0"
sources."yargs-parser-18.1.3"
];
buildInputs = globalBuildInputs;
meta = {
description = "Generate a changelog from git metadata";
homepage = "https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-cli#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
cordova = nodeEnv.buildNodePackage {
name = "cordova";
packageName = "cordova";

24
pkgs/development/python-modules/docopt-ng/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "docopt-ng";
version = "0.7.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-hs7qAy8M+lnmB3brDPOKxzZTWBAihyMg9H3IdGeNckQ=";
};
pythonImportsCheck = [ "docopt" ];
doCheck = false; # no tests in the package
meta = with lib; {
description = "More-magic command line arguments parser. Now with more maintenance!";
homepage = "https://github.com/bazaar-projects/docopt-ng";
license = licenses.mit;
maintainers = with maintainers; [ fgaz ];
};
}

4
pkgs/development/python-modules/mcstatus/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "mcstatus";
version = "6.4.0";
version = "6.5.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Dinnerbone";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pJ5TY9tbdhVW+kou+n5fMgCdHVBK6brBrlGIuO+VIK0=";
sha256 = "00xi3452lap4zx38msx89vvhrzkzb2dvwis1fcmx24qngj9g3yfr";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/netcdf4/default.nix
View File

@ -3,13 +3,13 @@
}:
buildPythonPackage rec {
pname = "netCDF4";
version = "1.5.6";
version = "1.5.7";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
sha256 = "7577f4656af8431b2fa6b6797acb45f81fa1890120e9123b3645e14765da5a7c";
sha256 = "d145f9c12da29da3922d8b8aafea2a2a89501bcb28a219a46b7b828b57191594";
};
checkInputs = [ pytest ];

4
pkgs/development/python-modules/smart-open/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "smart-open";
version = "5.1.0";
version = "5.2.0";
disabled = pythonOlder "3.5";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "RaRe-Technologies";
repo = "smart_open";
rev = "v${version}";
sha256 = "0gv3vxpglnhh6d80wsqigxi7psn6s7ylz20kx5ahblcx5rqyhjmi";
sha256 = "sha256-eC9BYHeACzGp382QBNgLcNMYDkHi0WXyEj/Re9ShXuA=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/staticjinja/default.nix
View File

@ -2,7 +2,7 @@
, fetchFromGitHub
, buildPythonPackage
, poetry
, docopt
, docopt-ng
, easywatch
, jinja2
, pytestCheckHook
@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "staticjinja";
version = "3.0.1";
version = "4.1.0";
format = "pyproject";
# No tests in pypi
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "staticjinja";
repo = pname;
rev = version;
sha256 = "sha256-W4q0vG8Kl2gCmA8UnUbdiGRtghhdnWxIJXFIIa6BogA=";
sha256 = "sha256-4IL+7ncJPd1e7k5oFRjQ6yvDjozcBAAZPf88biNTiLU=";
};
nativeBuildInputs = [
@ -31,7 +31,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
jinja2
docopt
docopt-ng
easywatch
];

14
pkgs/development/python-modules/trimesh/default.nix
View File

@ -1,12 +1,16 @@
{ lib, buildPythonPackage, fetchPypi, numpy }:
{ lib
, buildPythonPackage
, fetchPypi
, numpy
}:
buildPythonPackage rec {
pname = "trimesh";
version = "3.9.20";
version = "3.9.29";
src = fetchPypi {
inherit pname version;
sha256 = "476173507224bd07febc94070d30e5d704f541b48cd2db4c3bc2fe562498e22c";
sha256 = "sha256-YEddrun9rLcWk2u3Tfus8W014bU4BKWXWOOhCW/jSlY=";
};
propagatedBuildInputs = [ numpy ];
@ -15,8 +19,10 @@ buildPythonPackage rec {
# optional dependencies
doCheck = false;
pythonImportsCheck = [ "trimesh" ];
meta = with lib; {
description = "Python library for loading and using triangular meshes.";
description = "Python library for loading and using triangular meshes";
homepage = "https://trimsh.org/";
license = licenses.mit;
maintainers = with maintainers; [ gebner ];

35
pkgs/development/python-modules/whisper/default.nix
View File

@ -1,19 +1,40 @@
{ lib, buildPythonPackage, fetchPypi, mock, six }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, six
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "whisper";
version = "1.1.8";
src = fetchPypi {
inherit pname version;
sha256 = "345f35d0dccaf181e0aa4353e6c13f40f5cceda10a3c7021dafab29f004f62ae";
src = fetchFromGitHub {
owner = "graphite-project";
repo = pname;
rev = version;
sha256 = "11f7sarj62zgpw3ak4a2q55lj7ap4039l9ybc3a6yvs1ppvrcn7x";
};
propagatedBuildInputs = [ six ];
checkInputs = [ mock ];
propagatedBuildInputs = [
six
];
checkInputs = [
mock
pytestCheckHook
];
disabledTests = [
# whisper-resize.py: not found
"test_resize_with_aggregate"
];
pythonImportsCheck = [ "whisper" ];
meta = with lib; {
homepage = "http://graphite.wikidot.com/";
homepage = "https://github.com/graphite-project/whisper";
description = "Fixed size round-robin style database";
maintainers = with maintainers; [ offline basvandijk ];
license = licenses.asl20;

46
pkgs/development/python-modules/whitenoise/default.nix
View File

@ -1,21 +1,51 @@
{ lib, fetchPypi, buildPythonPackage, isPy27 }:
{ lib
, brotli
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "whitenoise";
version = "5.2.0";
disabled = isPy27;
version = "5.3.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7";
src = fetchFromGitHub {
owner = "evansd";
repo = pname;
rev = "v${version}";
sha256 = "17j1rml1hb43c7fs7kf4ygkpmnjppzgsbnyw3plq9w3yh9w5hkhg";
};
# No tests
doCheck = false;
propagatedBuildInputs = [
brotli
];
checkInputs = [
pytestCheckHook
requests
];
disabledTestPaths = [
# Don't run Django tests
"tests/test_django_whitenoise.py"
"tests/test_runserver_nostatic.py"
"tests/test_storage.py"
];
disabledTests = [
# Test fails with AssertionError
"test_modified"
];
pythonImportsCheck = [ "whitenoise" ];
meta = with lib; {
description = "Radically simplified static file serving for WSGI applications";
homepage = "http://whitenoise.evans.io/";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

6
pkgs/development/tools/continuous-integration/drone-cli/default.nix
View File

@ -9,9 +9,9 @@ buildGoModule rec {
doCheck = false;
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.version=${version}")
'';
ldflags = [
"-X main.version=${version}"
];
src = fetchFromGitHub {
owner = "drone";

6
pkgs/development/tools/dockle/default.nix
View File

@ -16,9 +16,9 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ btrfs-progs lvm2 ];
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X main.version=${version}")
'';
ldflags = [
"-s" "-w" "-X main.version=${version}"
];
preCheck = ''
# Remove tests that use networking

6
pkgs/development/tools/golangci-lint/default.nix
View File

@ -19,9 +19,9 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
preBuild = ''
buildFlagsArray+=("-ldflags=-s -w -X main.version=${version} -X main.commit=v${version} -X main.date=19700101-00:00:00")
'';
ldflags = [
"-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" "-X main.date=19700101-00:00:00"
];
postInstall = ''
for shell in bash zsh; do

6
pkgs/servers/monitoring/telegraf/default.nix
View File

@ -18,9 +18,9 @@ buildGoModule rec {
vendorSha256 = "sha256-J48ezMi9+PxohDKFhBpbcu6fdojlZPXnQQw2IcyimTA=";
proxyVendor = true;
preBuild = ''
buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}")
'';
ldflags = [
"-w" "-s" "-X main.version=${version}"
];
passthru.tests = { inherit (nixosTests) telegraf; };

6
pkgs/tools/admin/trivy/default.nix
View File

@ -15,9 +15,9 @@ buildGoModule rec {
excludedPackages = "misc";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}")
'';
ldflags = [
"-s" "-w" "-X main.version=v${version}"
];
doInstallCheck = true;
installCheckPhase = ''

12
pkgs/tools/audio/beets/default.nix
View File

@ -100,18 +100,13 @@ let
in pythonPackages.buildPythonApplication rec {
pname = "beets";
# While there is a stable version, 1.4.9, it is more than 1000 commits behind
# master and lacks many bug fixes and improvements[1]. Also important,
# unstable does not require bs1770gain[2].
# [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
# [2]: https://github.com/NixOS/nixpkgs/pull/90504
version = "unstable-2021-05-13";
version = "1.5.0";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
rev = "1faa41f8c558d3f4415e5e48cf4513d50b466d34";
sha256 = "sha256-P0bV7WNqCYe9+3lqnFmAoRlb2asdsBUjzRMc24RngpU=";
rev = "v${version}";
sha256 = "sha256-yQMCJUwpjDDhPffBS6LUq6z4iT1VyFQE0R27XEbYXbY=";
};
propagatedBuildInputs = [
@ -266,7 +261,6 @@ in pythonPackages.buildPythonApplication rec {
passthru = {
# FIXME: remove in favor of pkgs.beetsExternalPlugins
externalPlugins = beetsExternalPlugins;
updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
};
meta = with lib; {

4
pkgs/tools/graphics/agi/default.nix
View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "agi";
version = "2.1.0-dev-20210809";
version = "2.1.0-dev-20210820";
src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
sha256 = "sha256-n1a35syStFbhpVGyi/7oxWzBb2lXyVZd3K8/Bt8b0Lg=";
sha256 = "sha256-XsjWrih+8D3z1I41N5ZoLar/+5FV9mPN9aMbyZK2m/0=";
};
nativeBuildInputs = [

4
pkgs/tools/misc/disfetch/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "disfetch";
version = "2.12";
version = "2.13";
src = fetchFromGitHub {
owner = "q60";
repo = "disfetch";
rev = version;
sha256 = "sha256-+6U5BdLmdTaFzgZmjSH7rIL9JTwIX7bFkQqm0rNuTRY=";
sha256 = "sha256-+0WWhf7VYqPWgt1IwKQ74HLCLfhXsstA7Eh9VU/BKhg=";
};
dontBuild = true;

8
pkgs/tools/misc/envdir-go/default.nix
View File

@ -14,10 +14,10 @@ buildGoPackage rec {
sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc";
};
preBuild = ''
# TODO: is there a way to get the commit ref so we can set main.buildCommit?
buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}")
'';
# TODO: is there a way to get the commit ref so we can set main.buildCommit?
ldflags = [
"-X main.buildDate=1970-01-01T00:00:00+0000" "-X main.buildVersion=${version}"
];
meta = {
description = "A go rewrite of envdir";

6
pkgs/tools/misc/goss/default.nix
View File

@ -14,9 +14,9 @@ buildGoModule rec {
vendorSha256 = "1lyqjkwj8hybj5swyrv6357hs8sxmf4wim0c8yhfb9mv7fsxhrv7";
CGO_ENABLED = 0;
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}")
'';
ldflags = [
"-s" "-w" "-X main.version=v${version}"
];
meta = with lib; {
homepage = "https://github.com/aelsabbahy/goss/";

6
pkgs/tools/misc/noti/default.nix
View File

@ -16,9 +16,9 @@ buildGoPackage rec {
goPackagePath = "github.com/variadico/noti";
preBuild = ''
buildFlagsArray+=("-ldflags" "-X ${goPackagePath}/internal/command.Version=${version}")
'';
ldflags = [
"-X ${goPackagePath}/internal/command.Version=${version}"
];
postInstall = ''
install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1

6
pkgs/tools/networking/assh/default.nix
View File

@ -20,9 +20,9 @@ buildGoModule rec {
doCheck = false;
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X moul.io/assh/v2/pkg/version.Version=${version}")
'';
ldflags = [
"-s" "-w" "-X moul.io/assh/v2/pkg/version.Version=${version}"
];
nativeBuildInputs = [ makeWrapper ];

6
pkgs/tools/security/bettercap/default.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "bettercap";
version = "2.31.1";
version = "2.32.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-vZajnKjuIFoNnjxSsFkkpxyCR27VWqVN4lGf9SadmPU=";
sha256 = "sha256-OND8WPqU/95rKykqMAPWmDsJ+AjsjGjrncZ2/m3mpt0=";
};
vendorSha256 = "sha256-et6D+M+xJbxIiDP7JRRABZ8UqUCpt9ZVI5DP45tyTGM=";
vendorSha256 = "sha256-QKv8F9QLRi+1Bqj9KywJsTErjs7o6gFM4tJLA8y52MY=";
doCheck = false;

6
pkgs/tools/security/gitleaks/default.nix
View File

@ -16,9 +16,9 @@ buildGoModule rec {
vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}")
'';
ldflags = [
"-s" "-w" "-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}"
];
meta = with lib; {
description = "Scan git repos (or files) for secrets";

6
pkgs/tools/security/grype/default.nix
View File

@ -19,9 +19,9 @@ buildGoModule rec {
propagatedBuildInputs = [ docker ];
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/anchore/grype/internal/version.version=${version}")
'';
ldflags = [
"-s" "-w" "-X github.com/anchore/grype/internal/version.version=${version}"
];
# Tests require a running Docker instance
doCheck = false;

6
pkgs/tools/security/kiterunner/default.nix
View File

@ -16,9 +16,9 @@ buildGoModule rec {
vendorSha256 = "1nczzzsnh38qi949ki5268y39ggkwncanc1pv7727qpwllzl62vy";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/assetnote/kiterunner/cmd/kiterunner/cmd.Version=${version}")
'';
ldflags = [
"-s" "-w" "-X github.com/assetnote/kiterunner/cmd/kiterunner/cmd.Version=${version}"
];
subPackages = [ "./cmd/kiterunner" ];

6
pkgs/tools/security/safe/default.nix
View File

@ -18,9 +18,9 @@ buildGoPackage rec {
goPackagePath = "github.com/starkandwayne/safe";
preBuild = ''
buildFlagsArray+=("-ldflags" "-X main.Version=${version}")
'';
ldflags = [
"-X main.Version=${version}"
];
meta = with lib; {
description = "A Vault CLI";

6
pkgs/tools/security/teler/default.nix
View File

@ -16,9 +16,9 @@ buildGoModule rec {
vendorSha256 = "sha256-TQjwPem+RMuoF5T02CL/CTvBS6W7Q786gTvYUFIvxjE=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X ktbs.dev/teler/common.Version=${version}")
'';
ldflags = [
"-s" "-w" "-X ktbs.dev/teler/common.Version=${version}"
];
# test require internet access
doCheck = false;

5
pkgs/top-level/all-packages.nix
View File

@ -25645,7 +25645,10 @@ with pkgs;
mpc123 = callPackage ../applications/audio/mpc123 { };
mpg123 = callPackage ../applications/audio/mpg123 { };
mpg123 = callPackage ../applications/audio/mpg123 {
inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox;
jack = libjack2;
};
mpg321 = callPackage ../applications/audio/mpg321 { };

2
pkgs/top-level/python-packages.nix
View File

@ -2165,6 +2165,8 @@ in {
docopt = callPackage ../development/python-modules/docopt { };
docopt-ng = callPackage ../development/python-modules/docopt-ng { };
docplex = callPackage ../development/python-modules/docplex { };
docrep = callPackage ../development/python-modules/docrep { };