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

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2022-12-14 00:13:49 +00:00 committed by GitHub
commit a8b61d6609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
232 changed files with 1434 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maintainers/maintainer-list.nix
View File

@ -1677,6 +1677,15 @@
githubId = 214787;
name = "Herwig Hochleitner";
};
benediktbroich = {
name = "Benedikt Broich";
email = "b.broich@posteo.de";
github = "BenediktBroich";
githubId = 32903896;
keys = [{
fingerprint = "CB5C 7B3C 3E6F 2A59 A583 A90A 8A60 0376 7BE9 5976";
}];
};
benesim = {
name = "Benjamin Isbarn";
email = "benjamin.isbarn@gmail.com";

8
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
View File

@ -238,6 +238,14 @@
the Nix store.
</para>
</listitem>
<listitem>
<para>
The <literal>services.fwupd</literal> module now allows
arbitrary daemon settings to be configured in a structured
manner
(<link linkend="opt-services.fwupd.daemonSettings"><literal>services.fwupd.daemonSettings</literal></link>).
</para>
</listitem>
<listitem>
<para>
The <literal>unifi-poller</literal> package and corresponding

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

@ -70,4 +70,6 @@ In addition to numerous new and upgraded packages, this release has the followin
- Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store.
- The `services.fwupd` module now allows arbitrary daemon settings to be configured in a structured manner ([`services.fwupd.daemonSettings`](#opt-services.fwupd.daemonSettings)).
- The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream.

68
nixos/modules/services/hardware/fwupd.nix
View File

@ -7,13 +7,16 @@ with lib;
let
cfg = config.services.fwupd;
format = pkgs.formats.ini {
listToValue = l: lib.concatStringsSep ";" (map (s: generators.mkValueStringDefault {} s) l);
mkKeyValue = generators.mkKeyValueDefault {} "=";
};
customEtc = {
"fwupd/daemon.conf" = {
source = pkgs.writeText "daemon.conf" ''
[fwupd]
DisabledDevices=${lib.concatStringsSep ";" cfg.disabledDevices}
DisabledPlugins=${lib.concatStringsSep ";" cfg.disabledPlugins}
'';
source = format.generate "daemon.conf" {
fwupd = cfg.daemonSettings;
};
};
"fwupd/uefi_capsule.conf" = {
source = pkgs.writeText "uefi_capsule.conf" ''
@ -67,24 +70,6 @@ in {
'';
};
disabledDevices = mkOption {
type = types.listOf types.str;
default = [];
example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ];
description = lib.mdDoc ''
Allow disabling specific devices by their GUID
'';
};
disabledPlugins = mkOption {
type = types.listOf types.str;
default = [];
example = [ "udev" ];
description = lib.mdDoc ''
Allow disabling specific plugins
'';
};
extraTrustedKeys = mkOption {
type = types.listOf types.path;
default = [];
@ -120,18 +105,49 @@ in {
Which fwupd package to use.
'';
};
daemonSettings = mkOption {
type = types.submodule {
freeformType = format.type.nestedTypes.elemType;
options = {
DisabledDevices = mkOption {
type = types.listOf types.str;
default = [];
example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ];
description = lib.mdDoc ''
List of device GUIDs to be disabled.
'';
};
DisabledPlugins = mkOption {
type = types.listOf types.str;
default = [];
example = [ "udev" ];
description = lib.mdDoc ''
List of plugins to be disabled.
'';
};
};
};
default = {};
description = lib.mdDoc ''
Configurations for the fwupd daemon.
'';
};
};
};
imports = [
(mkRenamedOptionModule [ "services" "fwupd" "blacklistDevices"] [ "services" "fwupd" "disabledDevices" ])
(mkRenamedOptionModule [ "services" "fwupd" "blacklistPlugins"] [ "services" "fwupd" "disabledPlugins" ])
(mkRenamedOptionModule [ "services" "fwupd" "blacklistDevices"] [ "services" "fwupd" "daemonSettings" "DisabledDevices" ])
(mkRenamedOptionModule [ "services" "fwupd" "blacklistPlugins"] [ "services" "fwupd" "daemonSettings" "DisabledPlugins" ])
(mkRenamedOptionModule [ "services" "fwupd" "disabledDevices" ] [ "services" "fwupd" "daemonSettings" "DisabledDevices" ])
(mkRenamedOptionModule [ "services" "fwupd" "disabledPlugins" ] [ "services" "fwupd" "daemonSettings" "DisabledPlugins" ])
];
###### implementation
config = mkIf cfg.enable {
# Disable test related plug-ins implicitly so that users do not have to care about them.
services.fwupd.disabledPlugins = cfg.package.defaultDisabledPlugins;
services.fwupd.daemonSettings.DisabledPlugins = cfg.package.defaultDisabledPlugins;
environment.systemPackages = [ cfg.package ];

2
pkgs/applications/accessibility/contrast/default.nix
View File

@ -70,6 +70,8 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin;
};
}

2
pkgs/applications/audio/cardinal/default.nix
View File

@ -62,5 +62,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.all;
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin;
};
}

2
pkgs/applications/audio/chuck/default.nix
View File

@ -37,5 +37,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ ftrvxmtrx ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

14
pkgs/applications/audio/easyeffects/default.nix
View File

@ -3,9 +3,11 @@
, desktop-file-utils
, fetchFromGitHub
, calf
, fftw
, fftwFloat
, fmt_8
, fmt_9
, glib
, gsl
, gtk4
, itstool
, libadwaita
@ -25,6 +27,7 @@
, pkg-config
, rnnoise
, rubberband
, speex
, speexdsp
, tbb
, wrapGAppsHook4
@ -34,13 +37,13 @@
stdenv.mkDerivation rec {
pname = "easyeffects";
version = "6.3.0";
version = "7.0.0";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
sha256 = "sha256-OLxuE1jiALuKlC9U9esVlhaMBEaoZyNae8OO8upE4ZM=";
sha256 = "sha256-SjhJj5kClPd8DT1vzbSdqJ9AJw0XiX9Q8/R8SDnxGPQ=";
};
nativeBuildInputs = [
@ -53,9 +56,11 @@ stdenv.mkDerivation rec {
];
buildInputs = [
fftw
fftwFloat
fmt_8
fmt_9
glib
gsl
gtk4
libadwaita
libbs2b
@ -69,6 +74,7 @@ stdenv.mkDerivation rec {
pipewire
rnnoise
rubberband
speex
speexdsp
tbb
zita-convolver

2
pkgs/applications/audio/snapcast/default.nix
View File

@ -45,5 +45,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ fpletz ];
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl3Plus;
# never built on x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

2
pkgs/applications/blockchains/haven-cli/default.nix
View File

@ -59,5 +59,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ kim0 ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/blockchains/solana-validator/default.nix
View File

@ -83,6 +83,8 @@ rustPlatform.buildRustPackage rec {
license = licenses.asl20;
maintainers = with maintainers; [ adjacentresearch ];
platforms = platforms.unix;
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin;
};
passthru.updateScript = ./update.sh;
}

4
pkgs/applications/editors/jove/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jove";
version = "4.17.4.7";
version = "4.17.4.8";
src = fetchFromGitHub {
owner = "jonmacs";
repo = "jove";
rev = finalAttrs.version;
sha256 = "sha256-a8amp8JAI25XIeL8MzvJEAvv6B0oIaQvUOQlAaS3PeI=";
sha256 = "sha256-/n/TgVqyG/WeK+/DZqFZCdkQR4SD5+YmljLlzAehMvw=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -387,7 +387,7 @@ self: super: {
});
forms = super.forms.overrideAttrs (old: {
dependencies = with self; [ self.self ];
dependencies = [ self.self ];
});
fruzzy =
@ -713,7 +713,7 @@ self: super: {
};
skim-vim = super.skim-vim.overrideAttrs (old: {
dependencies = with self; [ skim ];
dependencies = [ self.skim ];
});
sniprun =

2
pkgs/applications/editors/xedit/default.nix
View File

@ -48,5 +48,7 @@ stdenv.mkDerivation rec {
license = with licenses; [ mit ];
maintainers = with maintainers; [ shamilton ];
platforms = platforms.unix;
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin;
};
}

4
pkgs/applications/emulators/dosbox/default.nix
View File

@ -2,7 +2,7 @@
, stdenv
, fetchurl
, autoreconfHook
, SDL_compat
, SDL
, SDL_net
, SDL_sound
, copyDesktopItems
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
SDL_compat
SDL
SDL_net
SDL_sound
libGL

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

@ -46,13 +46,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-53";
version = "7.1.0-54";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-U111mor498zAyoYKqCerb9cnxUUOlXKYPfaIzKxZiUM=";
hash = "sha256-aQipCcqOS9viOLPHEx21MrJHdxYKZl++3DIKMz97Ukw=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

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

@ -39,5 +39,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ raskin ];
license = licenses.gpl2;
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

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

@ -70,5 +70,7 @@ stdenv.mkDerivation rec {
license = licenses.unlicense;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

11
pkgs/applications/graphics/inkscape/default.nix
View File

@ -5,7 +5,6 @@
, cairo
, cmake
, fetchurl
, fetchpatch
, gettext
, ghostscript
, glib
@ -59,11 +58,11 @@ let
in
stdenv.mkDerivation rec {
pname = "inkscape";
version = "1.2.1";
version = "1.2.2";
src = fetchurl {
url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz";
sha256 = "Rs59oOunykutwdtw6cu2fgrfm7NCaH3G4ItcohuNTBs=";
sha256 = "oMf9DQPAohU15kjvMB3PgN18/B81ReUQZfvxuj7opcQ=";
};
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
@ -79,12 +78,6 @@ stdenv.mkDerivation rec {
# e.g., those from the "Effects" menu.
python3 = "${python3Env}/bin/python";
})
# Fix build with Poppler 22.09
(fetchpatch {
url = "https://github.com/archlinux/svntogit-packages/raw/b2f65dfb60ae0c8cd6cd9affd3d71064082a6201/trunk/inkscape-1.2.1-poppler-22.09.0.patch";
sha256 = "pArvsS/qoCTMAisF8yj3agZKrb90zRFZkck1TX0KeGc=";
})
];
postPatch = ''

12
pkgs/applications/graphics/megapixels/default.nix
View File

@ -6,8 +6,10 @@
, ninja
, pkg-config
, wrapGAppsHook4
, libepoxy
, feedbackd
, gtk4
, libepoxy
, xorg
, zbar
, tiffSupport ? true
, libraw
@ -27,13 +29,13 @@ let
in
stdenv.mkDerivation rec {
pname = "megapixels";
version = "1.5.2";
version = "1.6.0";
src = fetchFromGitLab {
owner = "postmarketOS";
repo = "megapixels";
rev = version;
hash = "sha256-UH3NQdMlZTi4hc8HNSbCcQSm0rxI78RMCRYll1NCBO8=";
hash = "sha256-xrO9Xr9DPjlDs4yaKy32yb4X8wFqLKfy8rsjtBuN+Rg=";
};
nativeBuildInputs = [
@ -45,8 +47,10 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libepoxy
feedbackd
gtk4
libepoxy
xorg.libXrandr
zbar
];

2
pkgs/applications/graphics/symbolic-preview/default.nix
View File

@ -23,5 +23,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ qyliss ];
license = licenses.gpl3Plus;
platforms = platforms.unix;
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin;
};
}

74
pkgs/applications/misc/citations/default.nix Normal file
View File

@ -0,0 +1,74 @@
{ darwin
, desktop-file-utils
, fetchFromGitLab
, gettext
, glib
, gtk4
, gtksourceview5
, lib
, libadwaita
, meson
, ninja
, pkg-config
, poppler
, rustPlatform
, stdenv
, testers
, wrapGAppsHook4
}:
stdenv.mkDerivation (finalAttrs: {
pname = "citations";
version = "0.5.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = finalAttrs.pname;
rev = finalAttrs.version;
hash = "sha256-QPK6Nw0tDdttUDFKMgThTYMTxGXsn5OReqf1LNAai7g=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
src = finalAttrs.src;
name = "${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-Kounxi4JxoU4+rWMWNB8rzTyG3MDKYD0OzYfAHwm6bY=";
};
nativeBuildInputs = [
desktop-file-utils
gettext
glib
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
wrapGAppsHook4
];
buildInputs = [
glib
gtk4
gtksourceview5
libadwaita
poppler
] ++ lib.optional stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation
];
doCheck = true;
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "citations --help";
};
meta = with lib; {
description = "Manage your bibliographies using the BibTeX format";
homepage = "https://apps.gnome.org/app/org.gnome.World.Citations";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ benediktbroich ];
platforms = platforms.unix;
};
})

2
pkgs/applications/misc/gnome-extension-manager/default.nix
View File

@ -60,5 +60,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ foo-dogsquared ];
# never built on aarch64-linux since first introduction in nixpkgs
broken = stdenv.isLinux && stdenv.isAarch64;
};
}

2
pkgs/applications/misc/oneko/default.nix
View File

@ -35,5 +35,7 @@ stdenv.mkDerivation rec {
license = with licenses; [ publicDomain ];
maintainers = with maintainers; [ xaverdh irenes ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/misc/openbangla-keyboard/default.nix
View File

@ -68,5 +68,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ hqurve ];
platforms = platforms.linux;
# never built on aarch64-linux since first introduction in nixpkgs
broken = stdenv.isLinux && stdenv.isAarch64;
};
}

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

@ -111,13 +111,13 @@ in {
application = mkSweetHome3D rec {
pname = lib.toLower module + "-application";
version = "6.6";
version = "7.0.2";
module = "SweetHome3D";
description = "Design and visualize your future home";
license = lib.licenses.gpl2Plus;
src = fetchurl {
url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip";
sha256 = "sha256-CnVXpmodmyoZdqmt7OgRyzuLeDhkPhrAS/CldFM8SQs=";
sha256 = "sha256-9Jv/U7afG6+LwPB6IhqLePjQA67bPKelP+UcuvizBqo=";
};
desktopName = "Sweet Home 3D";
icons = {

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -19,9 +19,9 @@
}
},
"beta": {
"version": "109.0.5414.25",
"sha256": "1yl8bxbxnlvypqvnb0kd4z3c793m375pwza43gab35kc1azxfnrg",
"sha256bin64": "1rld29mq6dvd85nvsrxj155m79hylxknhphlmw82i74fa7r6lxhm",
"version": "109.0.5414.36",
"sha256": "14kicgbadb83401dpfqnz3hb3dxi55nfydj5wpmg29dyw0bdndpm",
"sha256bin64": "11lpv9432xqkdj4q89sfyd0261444s9amncnzdmij93ni1wac8b4",
"deps": {
"gn": {
"version": "2022-11-10",

2
pkgs/applications/networking/cluster/docker-machine/xhyve.nix
View File

@ -35,5 +35,7 @@ buildGoPackage rec {
license = licenses.bsd3;
maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

5
pkgs/applications/networking/cluster/fn-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fn";
version = "0.6.22";
version = "0.6.23";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
hash = "sha256-FXgDCZcHcKvgkV1YFjMKl+5oJ5H1DV/Gj9am5VJuIjw=";
hash = "sha256-3g8S3cJ3RC06rvPMyQSKf8L4DkDTZ0Oe+6eh+rwyqg8=";
};
vendorSha256 = null;
@ -32,6 +32,5 @@ buildGoModule rec {
homepage = "https://fnproject.io";
license = licenses.asl20;
maintainers = [ maintainers.c4605 ];
broken = stdenv.isDarwin;
};
}

18
pkgs/applications/networking/cluster/kube-score/default.nix
View File

@ -1,22 +1,26 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "kube-score";
version = "1.14.0";
version = "1.16.0";
src = fetchFromGitHub {
owner = "zegl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6/+S1aj2qoUPz+6+8Z4Z5dpfyOi/DnrLLUpPgBn/OxU=";
hash = "sha256-dKvPLAT9e8gNJkKDF7dQPGLSkv9QUjQklUX8Dm8i33E=";
};
vendorSha256 = "sha256-0Zi62FmX4rFl3os2ehtussSSUPJtxLq7622CEdeKZCs=";
vendorHash = "sha256-pcNdszOfsYKiASOUNKflbr89j/wb9ILQvjMJYsiGPWo=";
meta = with lib; {
description = "Kubernetes object analysis with recommendations for improved reliability and security";
homepage = "https://github.com/zegl/kube-score";
license = licenses.mit;
maintainers = [ maintainers.j4m3s ];
homepage = "https://github.com/zegl/kube-score";
changelog = "https://github.com/zegl/kube-score/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ j4m3s ];
};
}

18
pkgs/applications/networking/cluster/kubeone/default.nix
View File

@ -8,19 +8,20 @@
buildGoModule rec {
pname = "kubeone";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
sha256 = "sha256-CjT6YKC6DJvs+LeKIzOl2Y6n0/yGv0nz8EfHqiSnIDo=";
hash = "sha256-s94o2/wInWMWbJcq8cpEbJYHL6vpD3Vurl/rOigzQRk=";
};
vendorSha256 = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA=";
vendorHash = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA=";
ldflags = [
"-s -w"
"-s"
"-w"
"-X k8c.io/kubeone/pkg/cmd.version=${version}"
"-X k8c.io/kubeone/pkg/cmd.date=unknown"
];
@ -40,10 +41,11 @@ buildGoModule rec {
command = "kubeone version";
};
meta = {
description = "Automate cluster operations on all your cloud, on-prem, edge, and IoT environments.";
meta = with lib; {
description = "Automate cluster operations on all your cloud, on-prem, edge, and IoT environments";
homepage = "https://kubeone.io/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ lblasc ];
changelog = "https://github.com/kubermatic/kubeone/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ lblasc ];
};
}

4
pkgs/applications/networking/cluster/kyverno/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
version = "1.8.3";
version = "1.8.4";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
sha256 = "sha256-AsUgjGoDoT/GN+Z2tXd0KjVFcVI1KF3nVRsLDWkY9HM=";
sha256 = "sha256-VAKT1gw8wkfde/rQVvRzq4HH0mKcLczR5EHtxy3zULg=";
};
ldflags = [

32
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -48,11 +48,11 @@
"vendorHash": "sha256-byReViTX0KRFVgWMkte00CDB/3Mw8Ov5GyD48sENmIA="
},
"alicloud": {
"hash": "sha256-4f29+7irL+6uNTEFnUu46LGz4aBDwortClCZ0+EDZ4Q=",
"hash": "sha256-VGrMkgX7WmIz7v0+D1OPYerslVueGw5XRBtWebLrkQk=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.193.1",
"rev": "v1.194.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -75,13 +75,13 @@
"vendorHash": null
},
"argocd": {
"hash": "sha256-yWhq2WolfL7PQVuWr5P7EH0cM78wGyL2+yezh2WzL2c=",
"hash": "sha256-8gyNJrRmrLev53dmMMjpZ3COTwPg5FYaxYBgkrdAWXo=",
"homepage": "https://registry.terraform.io/providers/oboukili/argocd",
"owner": "oboukili",
"repo": "terraform-provider-argocd",
"rev": "v4.1.0",
"rev": "v4.2.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4="
"vendorHash": "sha256-U88K2CZcN7xh1rPmkZpbRWgj3+lPKN7hkB9T60jR1JQ="
},
"auth0": {
"hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=",
@ -442,24 +442,24 @@
"vendorHash": "sha256-QAFx/Ew86T4LWJ6ZtJTUWwR5rGunWj0E5Vzt++BN9ks="
},
"google": {
"hash": "sha256-VqQK6NifhilmnJL5L4EHmmeFWZPBmQhoUl3mz8igSck=",
"hash": "sha256-EKPXlEpZVcQ0r97Um3kX8YZneaoKJrY76414hC5+1iA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.45.0",
"rev": "v4.46.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-nwA+OD0gtnV5di43wgH1OZp/RngLvnVRAuKQxsxnlLw="
"vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA="
},
"google-beta": {
"hash": "sha256-/fdgwdIIFHLEMeqsWashkQJlIoFU86ZmsbA4pX18FhE=",
"hash": "sha256-4ksd2LPAG6GeEexeThy4FnzTcDwDo753FP+02pCoyFU=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.45.0",
"rev": "v4.46.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-nwA+OD0gtnV5di43wgH1OZp/RngLvnVRAuKQxsxnlLw="
"vendorHash": "sha256-kyE1MPc1CofhngsMYLIPaownEZQmHc9UMSegwVZ8zIA="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -471,13 +471,13 @@
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
},
"grafana": {
"hash": "sha256-DAuG1VYLYr3cz+PR5wNlPBKuUcnbYAO0d9tNxnBiGuU=",
"hash": "sha256-eDrLyLlK/6zigBW7IW+w4FtHP5eW82zo2+Ow55H0SKc=",
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
"owner": "grafana",
"repo": "terraform-provider-grafana",
"rev": "v1.31.1",
"rev": "v1.32.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-4PrQW8h8EtX7hvSh2nzvA4EHwb2AhZqSLhrXlRrq8Lo="
"vendorHash": "sha256-s6VwvxHXny5gCrbxiRI3F7w3HR3lq2NeiHZgTiU37m0="
},
"gridscale": {
"hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=",
@ -888,11 +888,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=",
"hash": "sha256-2qOFrNwBFp30gLR9pFEaByx1vD8TZUayISaKZ7fytZo=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v2.6.4",
"rev": "v2.7.0",
"spdx": "MPL-2.0",
"vendorHash": null
},

72
pkgs/applications/networking/headlines/default.nix Normal file
View File

@ -0,0 +1,72 @@
{ lib
, stdenv
, cmake
, pkg-config
, libmicrohttpd
, curl
, openssl
, jsoncpp
, libxml2
, gst_all_1
, boost
, websocketpp
, libadwaita
, gtkmm4
, libsecret
, fetchFromGitLab
, makeWrapper
, xdg-utils
, youtube-dl
, ffmpeg
}:
stdenv.mkDerivation rec {
pname = "headlines";
version = "0.7.2";
src = fetchFromGitLab {
owner = "caveman250";
repo = "Headlines";
rev = version;
sha256 = "sha256-wamow0UozX5ecKbXWOgsWCerInL4J0gK0+Muf+eoO9k=";
};
nativeBuildInputs = [
cmake
pkg-config
makeWrapper
];
buildInputs = [
libmicrohttpd
curl
openssl
jsoncpp
libxml2
boost
websocketpp
libadwaita
gtkmm4
libsecret
] ++ (with gst_all_1; [
gstreamer
gst-libav
gst-plugins-base
(gst-plugins-good.override { gtkSupport = true; })
gst-plugins-bad
]);
postFixup = ''
wrapProgram "$out/bin/headlines" \
--prefix PATH : "${lib.makeBinPath [ xdg-utils youtube-dl ffmpeg ]}" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
meta = with lib; {
description = "GTK4 / Libadwaita Reddit client written in C++";
homepage = "https://gitlab.com/caveman250/Headlines";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ chuangzhu ];
};
}

5
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -57,6 +57,11 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';
# Only affects unused scripts in $out/share/element/electron/scripts. Also
# breaks because there are some `node`-scripts with a `npx`-shebang and
# this shouldn't be in the closure just for unused scripts.
dontPatchShebangs = true;
buildPhase = ''
runHook preBuild

10
pkgs/applications/networking/instant-messengers/element/pin.json
View File

@ -1,7 +1,7 @@
{
"version": "1.11.15",
"desktopSrcHash": "l+IjI3uvnOjaJA6IszDSuOO08SMqbUf8rI/u12g5Rxo=",
"desktopYarnHash": "024vd7xiwialfrag325558qjrqlfxzy9xq7jb15ysawand1k2xyv",
"webSrcHash": "YLQ4z333RMx9qyVRTBbDCWLTy5QqLlHmYpmOa8vlCbg=",
"webYarnHash": "1ll2sj9q3h2b76383bqv8a8ckqlk8b131zwx223fnz8mfqsc9br0"
"version": "1.11.16",
"desktopSrcHash": "EeED62HRpaWN91yxcDvwwNUWmDRU38lyT5ba1S4go6Q=",
"desktopYarnHash": "1f0bghcbzab2dkvxmvhhc0dzyk3js09v2sh93gsjsq9mkhld1k0w",
"webSrcHash": "T6UcGNm4i+Nc4Yk/mVFc4L9jxWQtOpjps1ZtEhilHW0=",
"webYarnHash": "1jyzym34lzadniqrysbm1m5agw03hzw6ymmdxpbay38afrhrciyk"
}

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

@ -63,13 +63,13 @@ rec {
patch-src = src + "/daemon/contrib/src/pjproject/";
in
rec {
version = "513a3f14c44b2c2652f9219ec20dea64b236b713";
version = "eae25732568e600d248aa8c226271ff6b81df170";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "pjproject";
rev = version;
sha256 = "sha256-93AlJGMnlzJMrJquelpHQQKjhEgfpTFXTMqkBnm87u8=";
sha256 = "sha256-N7jn4qen+PgFiVkTFi2HSWhx2QPHwAYMtnrpE/ptDVc=";
};
patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));

3
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
View File

@ -217,7 +217,6 @@ stdenv.mkDerivation rec {
};
meta = {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "Kotatogram – experimental Telegram Desktop fork";
longDescription = ''
Unofficial desktop client for the Telegram messenger, based on Telegram Desktop.
@ -229,5 +228,7 @@ stdenv.mkDerivation rec {
homepage = "https://kotatogram.github.io";
changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}";
maintainers = with maintainers; [ ilya-fedin ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);
};
}

2
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
View File

@ -49,5 +49,7 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Only;
maintainers = with maintainers; [ ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

@ -45,5 +45,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ eelco ];
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/networking/sync/lsyncd/default.nix
View File

@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ bobvanderlinden ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/networking/umurmur/default.nix
View File

@ -24,5 +24,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
homepage = "https://github.com/umurmur/umurmur";
platforms = platforms.all;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

6
pkgs/applications/office/banking/default.nix
View File

@ -18,14 +18,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "banking";
version = "0.5.1";
version = "0.6.0";
format = "other";
src = fetchFromGitLab {
owner = "tabos";
repo = "banking";
rev = version;
sha256 = "sha256-tZlBpDcwQ/aWroP2sFQBZcvmBD26PiY7q/8xFA8GnVc=";
hash = "sha256-x/um40sRD58d5LuuJlyietCV1Rw4H5VSO0I3ZwD5kO8=";
};
postPatch = ''
@ -54,8 +54,8 @@ python3.pkgs.buildPythonApplication rec {
cryptography
fints
mt-940
onetimepad
pygobject3
pysqlitecipher
schwifty
];

2
pkgs/applications/radio/m17-cxx-demod/default.nix
View File

@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = teams.c3d2.members;
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin;
};
}

2
pkgs/applications/science/astronomy/xearth/default.nix
View File

@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.mafo ];
license = "xearth";
platforms=platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/science/chemistry/gwyddion/default.nix
View File

@ -68,5 +68,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2;
platforms = with lib.platforms; linux ++ darwin;
maintainers = [ lib.maintainers.cge ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

13
pkgs/applications/science/math/weka/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "weka";
version = "3.9.2";
version = "3.9.6";
src = fetchurl {
url = "mirror://sourceforge/weka/${lib.replaceChars ["."]["-"] "${pname}-${version}"}.zip";
sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
sha256 = "sha256-8fVN4MXYqXNEmyVtXh1IrauHTBZWgWG8AvsGI5Y9Aj0=";
};
nativeBuildInputs = [ makeWrapper unzip ];
@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
--add-flags "-Xmx1000M -jar $out/share/weka/weka.jar"
'';
meta = {
meta = with lib; {
homepage = "http://www.cs.waikato.ac.nz/ml/weka/";
description = "Collection of machine learning algorithms for data mining tasks";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.mimame ];
platforms = lib.platforms.unix;
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl2Plus;
maintainers = [ maintainers.mimame ];
platforms = platforms.unix;
};
}

3
pkgs/applications/science/physics/nnpdf/default.nix
View File

@ -62,11 +62,12 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "An open-source machine learning framework for global analyses of parton distributions";
homepage = "https://docs.nnpdf.science/";
license = licenses.gpl3Only;
maintainers = [ maintainers.veprbl ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);
};
}

2
pkgs/applications/science/physics/sacrifice/default.nix
View File

@ -44,5 +44,7 @@ stdenv.mkDerivation {
homepage = "https://agile.hepforge.org/trac/wiki/Sacrifice";
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ veprbl ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/science/physics/sherpa/default.nix
View File

@ -34,5 +34,7 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.com/sherpa-team/sherpa";
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

62
pkgs/applications/system/thumbdrives/default.nix Normal file
View File

@ -0,0 +1,62 @@
{ lib
, python3
, fetchFromSourcehut
, gtk3
, libhandy_0
, gobject-introspection
, meson
, pkg-config
, ninja
, gettext
, glib
, desktop-file-utils
, wrapGAppsHook
}:
python3.pkgs.buildPythonApplication rec {
pname = "thumbdrives";
version = "0.3.1";
format = "other";
src = fetchFromSourcehut {
owner = "~martijnbraam";
repo = pname;
rev = version;
sha256 = "sha256-CPZKswbvsG61A6J512FOCKAntoJ0sUb2s+MKb0rO+Xw=";
};
postPatch = ''
patchShebangs build-aux/meson
'';
nativeBuildInputs = [
meson
pkg-config
ninja
gettext
glib
gtk3
desktop-file-utils
wrapGAppsHook
gobject-introspection
];
buildInputs = [
gtk3
libhandy_0
];
propagatedBuildInputs = with python3.pkgs; [
pygobject3
pyxdg
];
meta = with lib; {
description = "USB mass storage emulator for Linux handhelds";
homepage = "https://sr.ht/~martijnbraam/thumbdrives/";
license = licenses.mit;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;
};
}

4
pkgs/applications/version-management/git-and-tools/ghorg/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ghorg";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "gabrie30";
repo = "ghorg";
rev = "v${version}";
sha256 = "sha256-P9LwgEUz8QgUVQYISIx3Sa8ibFxNTGNNO5Vn014UB88=";
sha256 = "sha256-1wtpbwTO8MdEvcdo5ImNuiNOtyPfaKFpr2Rezac4ofU=";
};
doCheck = false;

4
pkgs/applications/version-management/git-and-tools/git-team/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "git-team";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "hekmekk";
repo = "git-team";
rev = "v${version}";
hash = "sha256-LZR30zqwit/xydQbpGm1LXd/tno/sTCaftgjVkVS6ZY=";
hash = "sha256-+j5d1tImVHaTx63uzLdh2YNCFa1ErAVv4OMwxOutBQ4=";
};
vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A=";

2
pkgs/applications/version-management/got/default.nix
View File

@ -46,5 +46,7 @@ stdenv.mkDerivation rec {
license = licenses.isc;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ abbe afh ];
# never built on x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

17
pkgs/applications/version-management/srvc/default.nix
View File

@ -1,28 +1,31 @@
{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }:
{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, webfs }:
rustPlatform.buildRustPackage rec {
pname = "srvc";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "insilica";
repo = "rs-srvc";
rev = "v${version}";
sha256 = "sha256-2eEuKAMxxTwjDInpYcOlFJha5DTe0IrxT5rI6ymN0hc=";
sha256 = "sha256-XslMwA1DhztK9DPNCucUpzjCQXz6PN8ml8JBvKtJeqg=";
};
cargoSha256 = "sha256-nJM7/w4awbCZQysUOSTO6bfsBXO3agJRdp1RyRZhtUY=";
# remove timeouts in tests to make them less flaky
patches = [ ./tests-no-timeout.patch ];
cargoSha256 = "sha256-KxwBF5t8lcaH8ZD4SorIBiq7p6r9LGHfEOyNXtB9HJw=";
buildInputs = lib.optionals stdenv.isDarwin [
Security
];
checkInputs = [ webfs ];
# remove timeouts in tests to make them less flaky
TEST_SRVC_DISABLE_TIMEOUT = 1;
meta = with lib; {
description = "Sysrev version control";
homepage = "https://github.com/insilica/rs-srvc";
changelog = "https://github.com/insilica/rs-srvc/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ john-shaffer ];
mainProgram = "sr";

36
pkgs/applications/version-management/srvc/tests-no-timeout.patch
View File

@ -1,36 +0,0 @@
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -1,15 +1,13 @@
#![allow(dead_code)]
use std::path::PathBuf;
-use std::time::Duration;
use assert_cmd::Command;
#[cfg(unix)]
use rexpect::session::PtySession;
-pub fn cmd(timeout_millis: u64) -> Command {
+pub fn cmd(_: u64) -> Command {
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
- cmd.timeout(Duration::from_millis(timeout_millis));
cmd.env_remove("RUST_BACKTRACE");
cmd
}
@@ -19,14 +17,14 @@ pub fn spawn(
dir: &str,
args: Vec<&str>,
timestamp_override: u64,
- timeout_millis: u64,
+ _: u64,
) -> Result<PtySession, rexpect::errors::Error> {
let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_sr"));
cmd.args(args);
cmd.current_dir(dir);
cmd.env("SR_TIMESTAMP_OVERRIDE", timestamp_override.to_string());
cmd.env_remove("RUST_BACKTRACE");
- Ok(rexpect::session::spawn_command(cmd, Some(timeout_millis))?)
+ rexpect::session::spawn_command(cmd, None)
}
pub fn remove_sink(dir: &str) -> Result<(), std::io::Error> {

9
pkgs/applications/video/aegisub/default.nix
View File

@ -28,13 +28,6 @@
, wxGTK
, zlib
, CoreText
, CoreFoundation
, AppKit
, Carbon
, IOKit
, Cocoa
, spellcheckSupport ? true
, hunspell ? null
@ -51,6 +44,7 @@
, portaudio ? null
, useBundledLuaJIT ? false
, darwin
}:
assert spellcheckSupport -> (hunspell != null);
@ -62,6 +56,7 @@ assert portaudioSupport -> (portaudio != null);
let
luajit52 = luajit.override { enable52Compat = true; };
inherit (lib) optional;
inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa;
in
stdenv.mkDerivation rec {
pname = "aegisub";

4
pkgs/applications/video/kodi/addons/youtube/default.nix
View File

@ -3,11 +3,11 @@
buildKodiAddon rec {
pname = "youtube";
namespace = "plugin.video.youtube";
version = "6.8.22+matrix.1";
version = "6.8.23+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "V1ALhD0zLm6Rq2KFpZXULPiB7sAPaNDhCpxScr+apDE=";
sha256 = "GIPgw1exAgw/D5vNpQQkUnTye66jfLLI5/asrthEDPQ=";
};
propagatedBuildInputs = [

2
pkgs/applications/video/motion/default.nix
View File

@ -22,5 +22,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ puffnfresh veprbl ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

4
pkgs/applications/video/mpv/default.nix
View File

@ -17,7 +17,6 @@
, lua
, libuchardet
, libiconv
, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
, xcbuild
, waylandSupport ? stdenv.isLinux
@ -75,11 +74,12 @@
, xineramaSupport ? stdenv.isLinux, libXinerama
, xvSupport ? stdenv.isLinux, libXv
, zimgSupport ? true, zimg
, darwin
}:
let
inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
in stdenv.mkDerivation rec {
pname = "mpv";
version = "0.35.0";

2
pkgs/applications/video/obs-studio/plugins/input-overlay.nix
View File

@ -43,5 +43,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ glittershark ];
license = licenses.gpl2;
platforms = platforms.linux;
# never built on aarch64-linux since first introduction in nixpkgs
broken = stdenv.isLinux && stdenv.isAarch64;
};
}

2
pkgs/applications/video/olive-editor/default.nix
View File

@ -34,5 +34,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.balsoft ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/video/openshot-qt/libopenshot-audio.nix
View File

@ -63,5 +63,7 @@ stdenv.mkDerivation rec {
license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/virtualization/xhyve/default.nix
View File

@ -33,5 +33,7 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.lnl7 ];
license = licenses.bsd2;
platforms = platforms.darwin;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/desktops/gnome/games/five-or-more/default.nix
View File

@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
description = "Remove colored balls from the board by forming lines";
maintainers = teams.gnome.members;
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/four-in-a-row/default.nix
View File

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "Make lines of the same color to win";
maintainers = teams.gnome.members;
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/gnome-chess/default.nix
View File

@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
description = "Play the classic two-player boardgame of chess";
maintainers = teams.gnome.members;
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/gnome-klotski/default.nix
View File

@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
description = "Slide blocks to solve the puzzle";
maintainers = teams.gnome.members;
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/gnome-mahjongg/default.nix
View File

@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
description = "Disassemble a pile of tiles by removing matching pairs";
maintainers = teams.gnome.members;
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/gnome-mines/default.nix
View File

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "Clear hidden mines from a minefield";
maintainers = teams.gnome.members;
license = licenses.gpl3;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/gnome-robots/default.nix
View File

@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
description = "Avoid the robots and make them crash into each other";
maintainers = teams.gnome.members;
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/gnome-sudoku/default.nix
View File

@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
description = "Test your logic skills in this number grid puzzle";
maintainers = teams.gnome.members;
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/gnome-taquin/default.nix
View File

@ -70,6 +70,6 @@ stdenv.mkDerivation rec {
description = "Move tiles so that they reach their places";
maintainers = teams.gnome.members;
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/gnome-tetravex/default.nix
View File

@ -71,6 +71,6 @@ stdenv.mkDerivation rec {
description = "Complete the puzzle by matching numbered tiles";
maintainers = teams.gnome.members;
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/iagno/default.nix
View File

@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
description = "Computer version of the game Reversi, more popularly called Othello";
maintainers = teams.gnome.members;
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/desktops/gnome/games/lightsoff/default.nix
View File

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
maintainers = teams.gnome.members;
license = licenses.gpl2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/development/compilers/cakelisp/default.nix
View File

@ -38,5 +38,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.darwin ++ platforms.linux;
maintainers = [ maintainers.sbond75 ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/development/compilers/ecl/16.1.2.nix
View File

@ -93,5 +93,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

6
pkgs/development/compilers/gleam/default.nix
View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.25.0";
version = "0.25.1";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LLl3T7VvDyyeq47vgZPkQhcPk2yZMRsCta8EqduNvuY=";
sha256 = "sha256-PzvFX1ssBPXhHBNGK38y427HYJ9Q40c4w2mqGZ/2rtI=";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoSha256 = "sha256-vMgU66LhhRrSA9Dx3eyVmUwrYKVtAfE12tQC8WzTimo=";
cargoSha256 = "sha256-NeNpT/yOXE70ElawrOGBc4G5bN2ohzYVVUtF4yVCJOo=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";

3
pkgs/development/compilers/inform7/default.nix
View File

@ -22,11 +22,12 @@ in stdenv.mkDerivation {
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "A design system for interactive fiction";
homepage = "http://inform7.com/";
license = licenses.artistic2;
maintainers = with maintainers; [ mbbx6spp ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);
};
}

2
pkgs/development/compilers/llvm/10/lldb/default.nix
View File

@ -94,6 +94,8 @@ stdenv.mkDerivation (rec {
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
} // lib.optionalAttrs enableManpages {
pname = "lldb-manpages";

2
pkgs/development/compilers/llvm/5/lldb/default.nix
View File

@ -82,5 +82,7 @@ stdenv.mkDerivation rec {
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/development/compilers/llvm/6/lldb/default.nix
View File

@ -82,5 +82,7 @@ stdenv.mkDerivation rec {
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/development/compilers/llvm/7/lldb/default.nix
View File

@ -85,5 +85,7 @@ stdenv.mkDerivation rec {
larger LLVM Project, such as the Clang expression parser and LLVM
disassembler.
'';
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/development/compilers/polyml/5.7.nix
View File

@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
platforms = with platforms; (linux ++ darwin);
maintainers = with maintainers; [ maggesi ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

6
pkgs/development/compilers/purescript/purescript/default.nix
View File

@ -18,7 +18,7 @@ let
in stdenv.mkDerivation rec {
pname = "purescript";
version = "0.15.6";
version = "0.15.7";
# These hashes can be updated automatically by running the ./update.sh script.
src =
@ -26,12 +26,12 @@ in stdenv.mkDerivation rec {
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
sha256 = "14l4m9xgp9slg4hfaqkwvzdvmg26qj2livldni3lmivvcagjgb2x";
sha256 = "0aq5sr93z6c5l76sqbj3g48z6yrhxfqxri0x1ajmjwhcwjg79d6v";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
sha256 = "1vw3igxv4zr5gf1ml5ls17w9cc9shdn8fvbk6dkfnxrs93cwrq0k";
sha256 = "032jqrk46k9zbq058ms8rnrq0209rd8vkxwj73vqrlgqvpzlfl5k";
};

2
pkgs/development/compilers/smlnj/default.nix
View File

@ -88,5 +88,7 @@ in stdenv.mkDerivation {
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ thoughtpolice ];
mainProgram = "sml";
# never built on x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

2
pkgs/development/compilers/terra/default.nix
View File

@ -89,5 +89,7 @@ in stdenv.mkDerivation rec {
platforms = platforms.all;
maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ];
license = licenses.mit;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/development/interpreters/bic/default.nix
View File

@ -38,5 +38,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/hexagonal-sun/bic";
platforms = platforms.unix;
maintainers = with maintainers; [ hexagonal-sun ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

14
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -31,6 +31,10 @@
, rebuildBytecode ? true
, reproducibleBuild ? false
, enableOptimizations ? false
, strip2to3 ? false
, stripConfig ? false
, stripIdlelib ? false
, stripTests ? false
, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
}:
@ -318,6 +322,16 @@ in with passthru; stdenv.mkDerivation ({
postFixup = ''
# Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7.
cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
'' + optionalString strip2to3 ''
rm -R $out/bin/2to3 $out/lib/python*/lib2to3
'' + optionalString stripConfig ''
rm -R $out/bin/python*-config $out/lib/python*/config-*
'' + optionalString stripIdlelib ''
# Strip IDLE
rm -R $out/bin/idle* $out/lib/python*/idlelib
'' + optionalString stripTests ''
# Strip tests
rm -R $out/lib/python*/test $out/lib/python*/**/test{,s}
'';
enableParallelBuilding = true;

2
pkgs/development/libraries/classads/default.nix
View File

@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
description = "The Classified Advertisements library provides a generic means for matching resources";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

49
pkgs/development/libraries/crocoddyl/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, example-robot-data
, pinocchio
, pythonSupport ? false
, python3Packages
}:
stdenv.mkDerivation rec {
pname = "crocoddyl";
version = "1.9.0";
src = fetchFromGitHub {
owner = "loco-3d";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IQ+8ZZXVTTRFa4uGetpylRab4P9MSTU2YtytYA3z6ys=";
fetchSubmodules = true;
};
strictDeps = true;
nativeBuildInputs = [
cmake
];
propagatedBuildInputs = lib.optionals (!pythonSupport) [
example-robot-data
pinocchio
] ++ lib.optionals pythonSupport [
python3Packages.example-robot-data
python3Packages.pinocchio
];
cmakeFlags = lib.optionals (!pythonSupport) [
"-DBUILD_EXAMPLES=OFF"
"-DBUILD_PYTHON_INTERFACE=OFF"
];
meta = with lib; {
description = "Crocoddyl optimal control library";
homepage = "https://github.com/loco-3d/crocoddyl";
license = licenses.bsd3;
maintainers = with maintainers; [ wegank ];
platforms = platforms.unix;
};
}

2
pkgs/development/libraries/enchant/1.x.nix
View File

@ -18,5 +18,7 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
badPlatforms = [ "x86_64-darwin" ];
license = licenses.lgpl21;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

42
pkgs/development/libraries/example-robot-data/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pythonSupport ? false
, python3Packages
}:
stdenv.mkDerivation rec {
pname = "example-robot-data";
version = "4.0.3";
src = fetchFromGitHub {
owner = "Gepetto";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-rxVyka8tcF/CmGTVNyh3FPR1LVa6JOAN+9zjElgqCak=";
};
strictDeps = true;
nativeBuildInputs = [
cmake
];
buildInputs = lib.optionals pythonSupport [
python3Packages.pinocchio
];
cmakeFlags = lib.optionals (!pythonSupport) [
"-DBUILD_PYTHON_INTERFACE=OFF"
];
meta = with lib; {
description = "Set of robot URDFs for benchmarking and developed examples.";
homepage = "https://github.com/Gepetto/example-robot-data";
license = licenses.bsd3;
maintainers = with maintainers; [ wegank ];
platforms = platforms.unix;
};
}

6
pkgs/development/libraries/ftgl/default.nix
View File

@ -5,13 +5,15 @@
, doxygen
, freeglut
, freetype
, GLUT
, libGL
, libGLU
, OpenGL
, pkg-config
, darwin
}:
let
inherit (darwin.apple_sdk.frameworks) OpenGL GLUT;
in
stdenv.mkDerivation rec {
pname = "ftgl";
version = "2.4.0";

2
pkgs/development/libraries/garmintools/default.nix
View File

@ -13,5 +13,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2;
maintainers = [ ];
platforms = lib.platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/development/libraries/gcc/libstdc++/5.nix
View File

@ -113,5 +113,7 @@ stdenv.mkDerivation rec {
description = "GNU Compiler Collection, version ${version} -- C++ standard library";
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
# never built on aarch64-linux since first introduction in nixpkgs
broken = stdenv.isLinux && stdenv.isAarch64;
};
}

2
pkgs/development/libraries/gmp/4.3.2.nix
View File

@ -71,6 +71,8 @@ let self = stdenv.mkDerivation rec {
maintainers = [ ];
platforms = lib.platforms.all;
badPlatforms = [ "x86_64-darwin" ];
# never built on aarch64-darwin, aarch64-linux since first introduction in nixpkgs
broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);
};
};
in self

2
pkgs/development/libraries/gmp/5.1.x.nix
View File

@ -80,6 +80,8 @@ let self = stdenv.mkDerivation rec {
platforms = platforms.all;
badPlatforms = [ "x86_64-darwin" ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
};
in self

2
pkgs/development/libraries/htmlcxx/default.nix
View File

@ -20,5 +20,7 @@ stdenv.mkDerivation rec {
description = "A simple non-validating css1 and html parser for C++";
license = licenses.lgpl2;
platforms = platforms.all;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

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