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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-02-15 18:01:56 +00:00 committed by GitHub
commit 127af785cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
70 changed files with 738 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -7110,6 +7110,12 @@
githubId = 30698906;
name = "Luna D Dragon";
};
LunNova = {
email = "nixpkgs-maintainer@lunnova.dev";
github = "LunNova";
githubId = 782440;
name = "Luna Nova";
};
lionello = {
email = "lio@lunesu.com";
github = "lionello";

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

@ -122,6 +122,14 @@
<link xlink:href="options.html#opt-services.powerdns-admin.enable">services.powerdns-admin</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://github.com/sezanzeb/input-remapper">input-remapper</link>,
an easy to use tool to change the mapping of your input device
buttons. Available at
<link xlink:href="options.html#opt-services.input-remapper.enable">services.input-remapper</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://invoiceplane.com">InvoicePlane</link>,

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

@ -39,6 +39,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [PowerDNS-Admin](https://github.com/ngoduykhanh/PowerDNS-Admin), a web interface for the PowerDNS server. Available at [services.powerdns-admin](options.html#opt-services.powerdns-admin.enable).
- [input-remapper](https://github.com/sezanzeb/input-remapper), an easy to use tool to change the mapping of your input device buttons. Available at [services.input-remapper](options.html#opt-services.input-remapper.enable).
- [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at [services.invoiceplane](options.html#opt-services.invoiceplane.enable).
- [maddy](https://maddy.email), a composable all-in-one mail server. Available as [services.maddy](options.html#opt-services.maddy.enable).

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

@ -547,6 +547,7 @@
./services/misc/greenclip.nix
./services/misc/home-assistant.nix
./services/misc/ihaskell.nix
./services/misc/input-remapper.nix
./services/misc/irkerd.nix
./services/misc/jackett.nix
./services/misc/jellyfin.nix

29
nixos/modules/services/misc/input-remapper.nix Normal file
View File

@ -0,0 +1,29 @@
{ pkgs, lib, config, ... }:
with lib;
let cfg = config.services.input-remapper; in
{
options = {
services.input-remapper = {
enable = mkEnableOption "input-remapper, an easy to use tool to change the mapping of your input device buttons.";
package = mkOption {
type = types.package;
default = pkgs.input-remapper;
defaultText = literalExpression "pkgs.input-remapper";
description = ''
The input-remapper package to use.
'';
};
};
};
config = mkIf cfg.enable {
# FIXME: udev rule hangs sometimes when lots of devices connected, so let's not use it
# config.services.udev.packages = mapper-pkg;
services.dbus.packages = cfg.package;
systemd.packages = cfg.package;
environment.systemPackages = cfg.package;
systemd.services.input-remapper.wantedBy = [ "graphical.target" ];
};
}

6
pkgs/applications/audio/plexamp/default.nix
View File

@ -2,12 +2,12 @@
let
pname = "plexamp";
version = "3.9.1";
version = "4.0.0";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
sha512 = "uassNLdCXx3WLarUMJNhU8fbXugG7yTLMQacPAszLoRdmbMwcN6wT7ED26VhlNVhY3xr02GjZSDw4/LADZWqKw==";
sha512 = "C6fR3HyXZ5dXvKqtADjCm9WwsnI/wKhlR0K4+zkEW4JNmozmZvdB9eDIoS32wgTe23phtwazbXwroK/Xb0kZmQ==";
};
appimageContents = appimageTools.extractType2 {
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/37";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/38";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];

24
pkgs/applications/audio/sptlrx/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "sptlrx";
version = "0.1.0";
src = fetchFromGitHub {
owner = "raitonoberu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Wk4vXm6sB+Rw0VFAhfD0GKxsP+1LwpS6VFHa3UENuJk=";
};
vendorSha256 = "sha256-l5gIbjB2rJyNmZBqrHo4kwClmAgjgDWHTs5KWzrfC08=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Spotify lyrics in your terminal";
homepage = "https://github.com/raitonoberu/sptlrx";
license = licenses.mit;
maintainers = with maintainers; [ MoritzBoehme ];
};
}

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

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "472";
version = "473";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "sha256-6BhicOKQez9gk73WHaPeN/FXcUetdklhh8jePSgvN6E=";
sha256 = "sha256-eSnN9+9xJ1CeJm/jWw4jZq5OkgXC0p0KmxQ8bhnp9W4=";
};
nativeBuildInputs = [

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

@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
pythonPath = with python3Packages; [
pyqt5
pyqt5.pyqt5_sip
pyqt5_sip
send2trash
sphinx
polib

4
pkgs/applications/misc/gallery-dl/default.nix
View File

@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
version = "1.20.4";
version = "1.20.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-K22ee6qcVXbJJKH5/6EMvSdSNKBb7xAP++1s+A5ENu4=";
sha256 = "sha256-UJAoxRybEYxQY+7l/szSj9fy1J552yaxF3MdaEmDiQQ=";
};
propagatedBuildInputs = [ requests yt-dlp ];

35
pkgs/applications/misc/lemonade/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
}:
buildGoModule rec {
pname = "lemonade";
version = "unstable-2021-06-18";
src = fetchFromGitHub {
owner = "lemonade-command";
repo = pname;
rev = "97ad2f7d63cbe6c696af36a754d399b4be4553bc";
sha256 = "sha256-77ymkpO/0DE4+m8fnpXGdnLLFxWMnKu2zsqCpQ3wEPM=";
};
patches = [
(fetchpatch {
url = "https://github.com/lemonade-command/lemonade/commit/2b292b0c9d8dc57f73c30a58b3f0f790a953b212.patch";
sha256 = "sha256-jUcOfsKu1IYa7arZuAvhuD0vw7JTmhzA/VLxOtAnbmI=";
})
];
vendorSha256 = "sha256-wjQfTKVNmehu4aU5425gS0YWKj53dosVSTLgdu9KjKc=";
subPackages = [ "." ];
meta = with lib; {
description = "Remote utility tool that to copy, paste and open browsers over TCP";
homepage = "https://github.com/lemonade-command/lemonade/";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

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

@ -34,13 +34,13 @@
buildPythonApplication rec {
pname = "orca";
version = "41.1";
version = "41.2";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "H9ArmQlPCfbnLfd54actzkFCfsguJFpOqDIzqX7tonE=";
sha256 = "1/Jy6ps3+9ZFTkAh5GU4okcibhwKxXDW4rhOlxmqKv4=";
};
patches = [

18
pkgs/applications/misc/wike/default.nix
View File

@ -7,14 +7,12 @@
, libhandy, webkitgtk, glib-networking
, gnome, dconf
}:
let
pythonEnv = python3.withPackages (p: with p; [
pygobject3
requests
]);
in stdenv.mkDerivation rec {
python3.pkgs.buildPythonApplication rec {
pname = "wike";
version = "1.7.1";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
src = fetchFromGitHub {
owner = "hugolabe";
@ -35,7 +33,6 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib
pythonEnv
gtk3
libhandy
webkitgtk
@ -44,10 +41,13 @@ in stdenv.mkDerivation rec {
dconf
];
propagatedBuildInputs = with python3.pkgs; [
requests
pygobject3
];
postPatch = ''
patchShebangs build-aux/meson/postinstall.py
substituteInPlace src/wike.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
substituteInPlace src/wike-sp.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
'';
meta = with lib; {

2
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -12,7 +12,6 @@
, freetype
, gdk-pixbuf
, glib
, gnome2
, gnome
, gsettings-desktop-schemas
, gtk3
@ -60,7 +59,6 @@ rpath = lib.makeLibraryPath [
freetype
gdk-pixbuf
glib
gnome2.GConf
gtk3
libdrm
libpulseaudio

4
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, patchelf, makeWrapper
# Linked dynamic libraries.
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups
, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
@ -57,7 +57,7 @@ let
version = chromium.upstream-info.version;
deps = [
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
glib fontconfig freetype pango cairo libX11 libXi atk nss nspr
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups
dbus gdk-pixbuf gcc-unwrapped.lib

4
pkgs/applications/networking/browsers/icecat-bin/default.nix
View File

@ -3,7 +3,6 @@
, fetchzip
, autoPatchelfHook
, wrapGAppsHook
, gnome2
, gtk2
, nss
, xdg-utils
@ -14,6 +13,7 @@
, cups
, curl
, dbus
, dbus-glib
, expat
, fontconfig
, freetype
@ -72,12 +72,12 @@ stdenv.mkDerivation rec {
cups
curl
dbus
dbus-glib
expat
fontconfig.lib
freetype
gdk-pixbuf
glib
gnome2.GConf
gtk2
gtk3
libX11

2
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -11,7 +11,6 @@
, freetype
, gdk-pixbuf
, glib
, gnome2
, gtk3
, gtk4
, lib
@ -79,7 +78,6 @@ in stdenv.mkDerivation rec {
freetype
gdk-pixbuf
glib
gnome2.GConf
gtk3
libX11
libXScrnSaver

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

@ -4,7 +4,7 @@
, freetype, fontconfig, libXft, libXrender, libxcb, expat
, libuuid
, libxml2
, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core
, libdrm, mesa
, nss, nspr
, patchelf, makeWrapper
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd libva
freetype fontconfig libXrender libuuid expat glib nss nspr
libxml2 pango cairo gnome2.GConf
libxml2 pango cairo
libdrm mesa
] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;

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

@ -8,18 +8,18 @@
buildGoModule rec {
pname = "arkade";
version = "0.8.12";
version = "0.8.14";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
sha256 = "sha256-OBcvJ1+VAE7jDeQ/I/9uc0wiU0iibeflRMmb+ulgDtQ=";
sha256 = "sha256-XH7JtLv0J6bznZZ/L8wg5KB53OPe3KLiYujBlxP71pg=";
};
CGO_ENABLED = 0;
vendorSha256 = "05zdd5c2x4k4myxmgj32md8wq08i543l8q81rabqgyd3r9nwv4lx";
vendorSha256 = "sha256-ipLVzBkliQSPBZTL5FU8xosTVjxFsUVlAvO0a0q+j2o=";
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
subPackages = [

2
pkgs/applications/networking/instant-messengers/franz/generic.nix
View File

@ -13,7 +13,6 @@
, freetype
, fontconfig
, gtk3
, gnome2
, dbus
, nss
, nspr
@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
freetype
fontconfig
dbus
gnome2.GConf
nss
nspr
alsa-lib

3
pkgs/applications/networking/instant-messengers/gitter/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, alsa-lib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11
, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libdrm, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss
@ -18,7 +18,6 @@ let gitterDirectorySuffix = "opt/gitter";
freetype
gdk-pixbuf
glib
gnome2.GConf
gtk3
libX11
libXScrnSaver

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

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests
, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib
, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa
@ -56,7 +56,6 @@ in stdenv.mkDerivation rec {
freetype
gdk-pixbuf
glib
gnome2.GConf
gtk3
libX11
libXScrnSaver

3
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg
, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome
, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome
, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg
, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }:
@ -26,7 +26,6 @@ let
libsecret
libuuid
gnome2.GConf
gdk-pixbuf
gtk3
libappindicator-gtk3

2
pkgs/applications/networking/instant-messengers/slack/default.nix
View File

@ -18,7 +18,6 @@
, freetype
, gdk-pixbuf
, glib
, gnome2
, gtk3
, libGL
, libappindicator-gtk3
@ -105,7 +104,6 @@ let
freetype
gdk-pixbuf
glib
gnome2.GConf
gtk3
libGL
libappindicator-gtk3

3
pkgs/applications/networking/mullvad-vpn/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, dpkg
, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa
, gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa
, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
, makeWrapper
}:
@ -16,7 +16,6 @@ let deps = [
freetype
gdk-pixbuf
glib
gnome2.GConf
pango
gtk3
libappindicator

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

@ -10,6 +10,7 @@
, qtsvg
, qtlocation
, qtdeclarative
, qqc2-desktop-style
, kirigami2
, kdbusaddons
@ -38,14 +39,14 @@
mkDerivation rec {
pname = "kalendar";
version = "0.4.0";
version = "1.0.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "pim";
repo = pname;
rev = "v${version}";
sha256 = "sha256-j383I40lChsI/VOgceaHYGhE61p3SpvInUrkUV5HnHY=";
sha256 = "sha256-kjtLVU+8wbIa7R6J1XOjuvS3AnJNngxNBCx24Dy1QzM=";
};
nativeBuildInputs = [
@ -60,6 +61,7 @@ mkDerivation rec {
qtsvg
qtlocation
qtdeclarative
qqc2-desktop-style
kirigami2
kdbusaddons

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gitstatus";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "romkatv";
repo = "gitstatus";
rev = "v${version}";
sha256 = "sha256-ZTpnT4kuntHdMWK7c/pHS6mJrAHF9T51DydXnWXj8Z0=";
sha256 = "sha256-mVfB3HWjvk4X8bmLEC/U8SKBRytTh/gjjuReqzN5qTk=";
};
buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ];

4
pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
View File

@ -16,7 +16,7 @@ libgit2.overrideAttrs (oldAttrs: {
src = fetchFromGitHub {
owner = "romkatv";
repo = "libgit2";
rev = "tag-5860a42d19bcd226cb6eff2dcbfcbf155d570c73";
sha256 = "sha256-OdGLNGOzXbWQGqw5zYM1RhU4Z2yRXi9cpAt7Vn9+j5I=";
rev = "tag-0ad3d776aa86dd607dc86dcd7f77ad3ed7ebec61";
sha256 = "sha256-mXCmspM3fqI14DF9sAIMH5vGdMMjWkdDjdME4EiQuqY=";
};
})

4
pkgs/applications/version-management/git-lfs/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "git-lfs";
version = "3.0.2";
version = "3.1.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "git-lfs";
repo = "git-lfs";
sha256 = "0k2pzbhd95xixh5aqdwf5pafilg85wl46d04xbb4lx6k3gkfv0f3";
sha256 = "sha256-xXE0BCO1Ur5qhn0gOKOqaSGKNeXNEHD+pZCz1SoPD3A=";
};
goPackagePath = "github.com/git-lfs/git-lfs";

4
pkgs/data/fonts/gandom-fonts/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "gandom-fonts";
version = "0.6";
version = "0.8";
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
@ -13,7 +13,7 @@ in fetchFromGitHub {
tar xf $downloadedFile --strip=1
find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/gandom-fonts {} \;
'';
sha256 = "0zsq6s9ziyb5jz0v8aj00dlxd1aly0ibxgszd05dfvykmgz051lc";
sha256 = "sha256-EDS3wwKwe2BIcOCxu7DxkVLCoEoTPP31k5ID51lqn3M=";
meta = with lib; {
homepage = "https://github.com/rastikerdar/gandom-font";

4
pkgs/data/fonts/montserrat/default.nix
View File

@ -2,13 +2,13 @@
let
pname = "montserrat";
version = "7.210";
version = "7.222";
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "JulietaUla";
repo = pname;
rev = "v${version}";
sha256 = "sha256-C6T0Iz1rFC+EsKFJRil2jGTMQ4X7wR80E3eORL5qi0U=";
sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0=";
postFetch = ''
tar xf $downloadedFile --strip 1

6
pkgs/desktops/gnome/apps/gnome-todo/default.nix
View File

@ -27,14 +27,14 @@
stdenv.mkDerivation rec {
pname = "gnome-todo";
version = "unstable-2022-01-01";
version = "unstable-2022-02-01";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gnome-todo";
rev = "4a6be8c38510d909a9f94ec34c4da1f31ac9f1ab";
sha256 = "5UGo9vMb8scPWK91gftYOjqkJs9tGMiH1lqyEqedF2A=";
rev = "2cd071ad35efdef72038730d658f013dd0fc7daa";
sha256 = "FMG9ju+LsglAvbBhdgDF+2ZxB633EwnatwCFgW+VOTk=";
};
patches = [

329
pkgs/development/compilers/elm/default.nix
View File

@ -1,95 +1,101 @@
{ lib, stdenv, pkgs
, haskell, haskellPackages, nodejs-14_x
, fetchurl, fetchpatch, makeWrapper, writeScriptBin
# Rust dependecies
, curl, rustPlatform, openssl, pkg-config, Security, darwin
}:
{ pkgs, lib }:
let
# To controll nodejs version we pass down
nodejs = nodejs-14_x;
nodejs = pkgs.nodejs-14_x;
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };
hsPkgs = haskellPackages.override {
overrides = self: super: with haskell.lib.compose; with lib;
let elmPkgs = rec {
elm = overrideCabal (drv: {
# sadly with parallelism most of the time breaks compilation
enableParallelBuilding = false;
preConfigure = self.fetchElmDeps {
elmPackages = (import ./packages/elm-srcs.nix);
elmVersion = drv.version;
registryDat = ./registry.dat;
};
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
jailbreak = true;
postInstall = ''
wrapProgram $out/bin/elm \
--prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
'';
hsPkgs = self: pkgs.haskellPackages.override {
overrides = self: super: with pkgs.haskell.lib.compose; with lib;
let elmPkgs = rec {
elm = overrideCabal (drv: {
# sadly with parallelism most of the time breaks compilation
enableParallelBuilding = false;
preConfigure = fetchElmDeps {
elmPackages = (import ./packages/elm-srcs.nix);
elmVersion = drv.version;
registryDat = ./registry.dat;
};
buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ];
jailbreak = true;
postInstall = ''
wrapProgram $out/bin/elm \
--prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
'';
description = "A delightful language for reliable webapps";
homepage = "https://elm-lang.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ domenkozar turbomack ];
}) (self.callPackage ./packages/elm.nix { });
description = "A delightful language for reliable webapps";
homepage = "https://elm-lang.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ domenkozar turbomack ];
}) (self.callPackage ./packages/elm.nix { });
/*
The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
`package/nix/build.sh`
*/
elm-format = justStaticExecutables (overrideCabal (drv: {
jailbreak = true;
/*
The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
`package/nix/build.sh`
*/
elm-format = justStaticExecutables (overrideCabal (drv: {
jailbreak = true;
description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide";
homepage = "https://github.com/avh4/elm-format";
license = licenses.bsd3;
maintainers = with maintainers; [ avh4 turbomack ];
}) (self.callPackage ./packages/elm-format.nix {}));
description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide";
homepage = "https://github.com/avh4/elm-format";
license = licenses.bsd3;
maintainers = with maintainers; [ avh4 turbomack ];
}) (self.callPackage ./packages/elm-format.nix {}));
elmi-to-json = justStaticExecutables (overrideCabal (drv: {
prePatch = ''
substituteInPlace package.yaml --replace "- -Werror" ""
hpack
'';
jailbreak = true;
elmi-to-json = justStaticExecutables (overrideCabal (drv: {
prePatch = ''
substituteInPlace package.yaml --replace "- -Werror" ""
hpack
'';
jailbreak = true;
description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler";
homepage = "https://github.com/stoeffel/elmi-to-json";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
}) (self.callPackage ./packages/elmi-to-json.nix {}));
description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler";
homepage = "https://github.com/stoeffel/elmi-to-json";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
}) (self.callPackage ./packages/elmi-to-json.nix {}));
elm-instrument = justStaticExecutables (overrideCabal (drv: {
prePatch = ''
sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place
'';
jailbreak = true;
# Tests are failing because of missing instances for Eq and Show type classes
doCheck = false;
elm-instrument = justStaticExecutables (overrideCabal (drv: {
prePatch = ''
sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place
'';
jailbreak = true;
# Tests are failing because of missing instances for Eq and Show type classes
doCheck = false;
description = "Instrument Elm code as a preprocessing step for elm-coverage";
homepage = "https://github.com/zwilias/elm-instrument";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
}) (self.callPackage ./packages/elm-instrument.nix {}));
description = "Instrument Elm code as a preprocessing step for elm-coverage";
homepage = "https://github.com/zwilias/elm-instrument";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
}) (self.callPackage ./packages/elm-instrument.nix {}));
inherit fetchElmDeps;
elmVersion = elmPkgs.elm.version;
};
in elmPkgs // {
inherit elmPkgs;
inherit fetchElmDeps;
elmVersion = elmPkgs.elm.version;
};
in elmPkgs // {
inherit elmPkgs;
# Needed for elm-format
indents = self.callPackage ./packages/indents.nix {};
bimap = self.callPackage ./packages/bimap.nix {};
avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {});
elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {});
elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {};
elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {};
};
# Needed for elm-format
indents = self.callPackage ./packages/indents.nix {};
bimap = self.callPackage ./packages/bimap.nix {};
avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {});
elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {});
elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {};
elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {};
};
};
nodePkgs = pkgs.callPackage ./packages/node-composition.nix {
inherit pkgs;
nodejs = pkgs.nodejs-14_x;
inherit (pkgs.stdenv.hostPlatform) system;
};
in lib.makeScope pkgs.newScope (self: with self; {
inherit fetchElmDeps nodejs;
/* Node/NPM based dependecies can be upgraded using script `packages/generate-node-packages.sh`.
* Packages which rely on `bin-wrap` will fail by default
@ -98,110 +104,83 @@ let
* Packages which depend on npm installation of elm can be patched using
`patchNpmElm` function also defined in `packages/lib.nix`.
*/
elmLib = import ./packages/lib.nix {
inherit lib writeScriptBin stdenv;
inherit (hsPkgs.elmPkgs) elm;
elmLib = let
hsElmPkgs = hsPkgs self;
in import ./packages/lib.nix {
inherit lib;
inherit (pkgs) writeScriptBin stdenv;
inherit (hsElmPkgs.elmPkgs) elm;
};
elmRustPackages = {
elm-json = import ./packages/elm-json.nix {
inherit curl lib rustPlatform fetchurl openssl stdenv pkg-config Security;
} // {
meta = with lib; {
description = "Install, upgrade and uninstall Elm dependencies";
homepage = "https://github.com/zwilias/elm-json";
elm-json = callPackage ./packages/elm-json.nix { };
elm-test-rs = callPackage ./packages/elm-test-rs.nix { };
elm-test = nodePkgs.elm-test // {
meta = with lib; nodePkgs.elm-test.meta // {
description = "Runs elm-test suites from Node.js";
homepage = "https://github.com/rtfeldman/node-test-runner";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
} // (hsPkgs self).elmPkgs // (with elmLib; with (hsPkgs self).elmPkgs; {
elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // {
meta = with lib; nodePkgs.elm-verify-examples.meta // {
description = "Verify examples in your docs";
homepage = "https://github.com/stoeffel/elm-verify-examples";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
elm-coverage = let
patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage);
in patched.override (old: {
# Symlink Elm instrument binary
preRebuild = (old.preRebuild or "") + ''
# Noop custom installation script
sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json
# This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done
# in case of just this package
# TODO: investigate
sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json
'';
postInstall = (old.postInstall or "") + ''
mkdir -p unpacked_bin
ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument
'';
meta = with lib; nodePkgs.elm-coverage.meta // {
description = "Work in progress - Code coverage tooling for Elm";
homepage = "https://github.com/zwilias/elm-coverage";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
});
create-elm-app = patchNpmElm
nodePkgs.create-elm-app // {
meta = with lib; nodePkgs.create-elm-app.meta // {
description = "Create Elm apps with no build configuration";
homepage = "https://github.com/halfzebra/create-elm-app";
license = licenses.mit;
maintainers = [ maintainers.turbomack ];
};
};
elm-test-rs = import ./packages/elm-test-rs.nix {
inherit lib rustPlatform fetchurl openssl stdenv Security darwin;
} // {
meta = with lib; {
description = "Fast and portable executable to run your Elm tests";
homepage = "https://github.com/mpizenberg/elm-test-rs";
license = licenses.bsd3;
maintainers = [ maintainers.jpagex ];
elm-review =
nodePkgs.elm-review // {
meta = with lib; nodePkgs.elm-review.meta // {
description = "Analyzes Elm projects, to help find mistakes before your users find them";
homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
};
};
elmNodePackages = with elmLib;
let
nodePkgs = import ./packages/node-composition.nix {
inherit nodejs pkgs;
inherit (stdenv.hostPlatform) system;
};
in with hsPkgs.elmPkgs; {
elm-test =
nodePkgs.elm-test // {
meta = with lib; {
description = "Runs elm-test suites from Node.js";
homepage = "https://github.com/rtfeldman/node-test-runner";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
elm-verify-examples = patchBinwrap [elmi-to-json]
nodePkgs.elm-verify-examples // {
meta = with lib; {
description = "Verify examples in your docs";
homepage = "https://github.com/stoeffel/elm-verify-examples";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
elm-coverage =
let patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage);
in patched.override (old: {
# Symlink Elm instrument binary
preRebuild = (old.preRebuild or "") + ''
# Noop custom installation script
sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json
# This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done
# in case of just this package
# TODO: investigate
sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json
'';
postInstall = (old.postInstall or "") + ''
mkdir -p unpacked_bin
ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument
'';
meta = with lib; {
description = "Work in progress - Code coverage tooling for Elm";
homepage = "https://github.com/zwilias/elm-coverage";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
});
create-elm-app = patchNpmElm
nodePkgs.create-elm-app // {
meta = with lib; {
description = "Create Elm apps with no build configuration";
homepage = "https://github.com/halfzebra/create-elm-app";
license = licenses.mit;
maintainers = [ maintainers.turbomack ];
};
};
elm-review =
nodePkgs.elm-review // {
meta = with lib; {
description = "Analyzes Elm projects, to help find mistakes before your users find them";
homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // {
meta = with lib; {
meta = with lib; nodePkgs."@elm-tooling/elm-language-server".meta // {
description = "Language server implementation for Elm";
homepage = "https://github.com/elm-tooling/elm-language-server";
license = licenses.mit;
@ -210,7 +189,7 @@ let
};
elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // {
meta = with lib; {
meta = with lib; nodePkgs."elm-optimize-level-2".meta // {
description = "A second level of optimization for the Javascript that the Elm Compiler produces";
homepage = "https://github.com/mdgriffith/elm-optimize-level-2";
license = licenses.bsd3;
@ -219,8 +198,6 @@ let
};
inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install;
};
})
)
in hsPkgs.elmPkgs // elmNodePackages // elmRustPackages // {
lib = elmLib;
}

22
pkgs/development/compilers/elm/packages/elm-json.nix
View File

@ -1,4 +1,13 @@
{ lib, curl, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }:
{ lib
, curl
, rustPlatform
, fetchurl
, openssl
, stdenv
, pkg-config
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "elm-json";
version = "0.2.10";
@ -12,10 +21,19 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ curl openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [
curl openssl
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
cargoSha256 = "sha256:01zasrqf1va58i52s3kwdkj1rnwy80gv00xi6npfshjirj3ix07f";
# Tests perform networking and therefore can't work in sandbox
doCheck = false;
meta = with lib; {
description = "Install, upgrade and uninstall Elm dependencies";
homepage = "https://github.com/zwilias/elm-json";
license = licenses.mit;
maintainers = [ maintainers.turbomack ];
};
}

17
pkgs/development/compilers/elm/packages/elm-test-rs.nix
View File

@ -1,4 +1,5 @@
{ lib, rustPlatform, fetchurl, openssl, stdenv, Security, darwin }:
{ lib, rustPlatform, fetchurl, openssl, stdenv, darwin }:
rustPlatform.buildRustPackage rec {
pname = "elm-test-rs";
version = "2.0";
@ -8,11 +9,23 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256:1manr42w613r9vyji7pxx5gb08jcgkdxv29qqylrqlwxa8d5dcid";
};
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security darwin.apple_sdk.frameworks.CoreServices ];
buildInputs = lib.optionals (!stdenv.isDarwin) [
openssl
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
Security
CoreServices
]);
cargoSha256 = "sha256:1dpdlzv96kpc25yf5jgsz9qldghyw35x382qpxhkadkn5dryzjvd";
verifyCargoDeps = true;
# Tests perform networking and therefore can't work in sandbox
doCheck = false;
meta = with lib; {
description = "Fast and portable executable to run your Elm tests";
homepage = "https://github.com/mpizenberg/elm-test-rs";
license = licenses.bsd3;
maintainers = [ maintainers.jpagex ];
};
}

1
pkgs/development/compilers/elm/packages/elm.nix
View File

@ -6,6 +6,7 @@
, snap-core, snap-server, lib, template-haskell, time
, unordered-containers, utf8-string, vector, zip-archive
}:
mkDerivation {
pname = "elm";
version = "0.19.1";

4
pkgs/development/compilers/tvm/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "tvm";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "apache";
repo = "incubator-tvm";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0qflpd3lw0jslyk5lqpv2v42lkqs8mkvnn6i3fdms32iskdfk6p5";
sha256 = "sha256-fv2hhPGbr/AbwuN8rAF9PI/QTTqxNgwjYl9arg5GjKY=";
};
nativeBuildInputs = [ cmake ];

8
pkgs/development/libraries/libindicator/default.nix
View File

@ -5,13 +5,11 @@
with lib;
stdenv.mkDerivation rec {
name = "libindicator-gtk${gtkVersion}-${version}";
version = "${versionMajor}.${versionMinor}";
versionMajor = "12.10";
versionMinor = "1";
pname = "libindicator-gtk${gtkVersion}";
version = "12.10.1";
src = fetchurl {
url = "${meta.homepage}/${versionMajor}/${version}/+download/libindicator-${version}.tar.gz";
url = "https://launchpad.net/libindicator/${lib.versions.majorMinor version}/${version}/+download/libindicator-${version}.tar.gz";
sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f";
};

4
pkgs/development/libraries/libplctag/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libplctag";
version = "2.4.12";
version = "2.5.0";
src = fetchFromGitHub {
owner = "libplctag";
repo = "libplctag";
rev = "v${version}";
sha256 = "sha256-1gytTzGdB4Zq0LqbilNHbeA8wDmQ3dw36nocmjBeu+8=";
sha256 = "sha256-Xzdljx08aXwD6pE1f/3YBAjvrSzvs2fcXmmLH04GFyg=";
};
nativeBuildInputs = [ cmake ];

22
pkgs/development/python-modules/asyncwhois/default.nix
View File

@ -1,9 +1,9 @@
{ lib
, aiodns
, asynctest
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, python-socks
, pythonOlder
, tldextract
, whodap
@ -11,7 +11,8 @@
buildPythonPackage rec {
pname = "asyncwhois";
version = "0.4.1";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,11 +20,11 @@ buildPythonPackage rec {
owner = "pogzyb";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mKKN2IuveOE+3mZGS5LFa15lJPA9y7KgLd0FoRuEMH0=";
hash = "sha256-9tSGfF/Ezuya4pEyr1XolWXvSO/F/UrobRVlyHITNTU=";
};
propagatedBuildInputs = [
aiodns
python-socks
tldextract
whodap
];
@ -33,8 +34,13 @@ buildPythonPackage rec {
pytestCheckHook
];
# Disable tests that require network access
postPatch = ''
substituteInPlace setup.py \
--replace "python-socks[asyncio]" "python-socks"
'';
disabledTests = [
# Tests require network access
"test_pywhois_aio_get_hostname_from_ip"
"test_pywhois_get_hostname_from_ip"
"test_pywhois_aio_lookup_ipv4"
@ -44,9 +50,13 @@ buildPythonPackage rec {
"test_from_whois_cmd"
"test_get_hostname_from_ip"
"test_whois_query_run"
"test_whois_query_create_connection"
"test_whois_query_send_and_recv"
];
pythonImportsCheck = [ "asyncwhois" ];
pythonImportsCheck = [
"asyncwhois"
];
meta = with lib; {
description = "Python module for retrieving WHOIS information";

12
pkgs/development/python-modules/dendropy/default.nix
View File

@ -2,17 +2,21 @@
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dendropy";
version = "4.5.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jeetsukumaran";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM=";
hash = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM=";
};
checkInputs = [
@ -27,9 +31,13 @@ buildPythonPackage rec {
"test_group1"
# AssertionError: 6 != 5
"test_by_num_lineages"
# AttributeError: module 'collections' has no attribute 'Iterable'
"test_findall_multiple"
];
pythonImportsCheck = [ "dendropy" ];
pythonImportsCheck = [
"dendropy"
];
meta = with lib; {
description = "Python library for phylogenetic computing";

1
pkgs/development/python-modules/emv/default.nix
View File

@ -40,6 +40,7 @@ buildPythonPackage rec {
--replace '"argparse==1.4.0",' "" \
--replace "click==7.1.2" "click" \
--replace "pyscard==2.0.0" "pyscard" \
--replace "pycountry==20.7.3" "pycountry" \
--replace "terminaltables==3.1.0" "terminaltables"
'';

22
pkgs/development/python-modules/p1monitor/default.nix
View File

@ -15,21 +15,15 @@ buildPythonPackage rec {
version = "1.1.0";
format = "pyproject";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "klaasnicolaas";
repo = "python-p1monitor";
rev = "v${version}";
sha256 = "1ciaclgq4aknldjqlqa08jcab28sbqrjxy5nqqwlnb2wlprg5ijz";
hash = "sha256-X8by8qVcLEs5xrb4LjNeGomlmERAYYplo3Yqgh9lKrI=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace '"0.0.0"' '"${version}"' \
--replace 'addopts = "--cov"' ""
'';
nativeBuildInputs = [
poetry-core
];
@ -45,10 +39,18 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "p1monitor" ];
postPatch = ''
substituteInPlace pyproject.toml \
--replace '"0.0.0"' '"${version}"' \
--replace 'addopts = "--cov"' ""
'';
pythonImportsCheck = [
"p1monitor"
];
meta = with lib; {
description = "Python client for the P1 Monitor";
description = "Module for interacting with the P1 Monitor";
homepage = "https://github.com/klaasnicolaas/python-p1monitor";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];

17
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -7,6 +7,7 @@
, lndir
, dbus-python
, sip
, pyqt5_sip
, pyqt-builder
, libsForQt5
, withConnectivity ? false
@ -16,21 +17,7 @@
, withLocation ? false
}:
let
pyqt5_sip = buildPythonPackage rec {
pname = "PyQt5_sip";
version = "12.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "0cmfxb7igahxy74qkq199l6zdxrr75bnxris42fww3ibgjflir6k";
};
# There is no test code and the check phase fails with:
# > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory
doCheck = false;
};
in buildPythonPackage rec {
buildPythonPackage rec {
pname = "PyQt5";
version = "5.15.4";
format = "pyproject";

28
pkgs/development/python-modules/pyqt/sip.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pyqt5-sip";
version = "12.9.1";
src = fetchPypi {
pname = "PyQt5_sip";
inherit version;
sha256 = "LyTymbRMURwjeWqvu7WBv96/eNCQVle3zuIUG0mCAw4=";
};
# There is no test code and the check phase fails with:
# > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory
doCheck = false;
pythonImportsCheck = ["PyQt5.sip"];
meta = with lib; {
description = "Python bindings for Qt5";
homepage = "https://www.riverbankcomputing.com/software/sip/";
license = licenses.gpl3Only;
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ sander ];
};
}

40
pkgs/development/tools/amazon-qldb-shell/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib
, clang
, cmake
, fetchFromGitHub
, llvmPackages
, rustPlatform
, testVersion
}:
let
pname = "amazon-qldb-shell";
version = "2.0.0";
package = rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Pnm1HxEjjNKpS3tTymtOXxUF7EEnWM+7WBsqeaG8seA=";
};
nativeBuildInputs = [ clang cmake ];
buildInputs = [ llvmPackages.libclang ];
cargoSha256 = "sha256-EUqGSKcGnhrdLn8ystaLkkR31RjEvjW6vRzKPMK77e8=";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
passthru.tests.version = testVersion { inherit package; };
meta = with lib; {
description = "An interface to send PartiQL statements to Amazon Quantum Ledger Database (QLDB)";
homepage = "https://github.com/awslabs/amazon-qldb-shell";
license = licenses.asl20;
maintainers = [ maintainers.terlar ];
};
};
in
package

4
pkgs/development/tools/misc/blackfire/php-probe.nix
View File

@ -19,11 +19,11 @@ let
}.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
in stdenv.mkDerivation rec {
pname = "php-blackfire";
version = "1.72.0";
version = "1.74.0";
src = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
sha256 = "FczlRevMn3VGCW+mtIqjGMNZKjsqzCGW3DQLQG7dJ8c=";
sha256 = "79uOQmTovGbY0NLpc3m/xFULS899u2XdR16qd8L4FLw=";
};
nativeBuildInputs = [

4
pkgs/development/tools/nwjs/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, buildEnv, makeWrapper
, xorg, alsa-lib, at-spi2-core, dbus, glib, gtk3, atk, pango, freetype
, fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, gconf, expat, systemd
, fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, expat, systemd
, libcap, libdrm, libxkbcommon
, libnotify
, ffmpeg, libxcb, cups
@ -18,7 +18,7 @@ let
paths = [
xorg.libX11 xorg.libXrender glib gtk3 atk at-spi2-core pango cairo gdk-pixbuf
freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage
xorg.libXext xorg.libXfixes mesa nss nspr gconf expat dbus
xorg.libXext xorg.libXfixes mesa nss nspr expat dbus
xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
xorg.libXScrnSaver xorg.libxshmfence cups
libcap libdrm libnotify

6
pkgs/development/tools/selenium/chromedriver/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper
, cairo, fontconfig, freetype, gdk-pixbuf, glib
, glibc, gtk2, libX11, nspr, nss, pango, gconf
, glibc, gtk2, libX11, nspr, nss, pango
, libxcb, libXi, libXrender, libXext, dbus
, testVersion, chromedriver
}:
@ -30,9 +30,9 @@ let
libs = lib.makeLibraryPath [
stdenv.cc.cc.lib
cairo fontconfig freetype
gdk-pixbuf glib gtk2 gconf
gdk-pixbuf glib gtk2
libX11 nspr nss pango libXrender
gconf libxcb libXext libXi
libxcb libXext libXi
dbus
];

2
pkgs/development/tools/unityhub/default.nix
View File

@ -12,7 +12,7 @@ in appimageTools.wrapType2 rec {
inherit name src;
extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr
alsa-lib cups gnome2.GConf libcap fontconfig freetype pango
alsa-lib cups libcap fontconfig freetype pango
cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb
libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5

4
pkgs/development/tools/yq-go/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "yq-go";
version = "4.19.1";
version = "4.20.1";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
sha256 = "sha256-kIXMBXKcM9EHECJiegnjeFnccF68hmL/7I/QnePJdIw=";
sha256 = "sha256-3UOKcm8RzCa7eSUJsUKBJkKTNi4B3GMY+EOOEk4t2So=";
};
vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE=";

2
pkgs/development/web/cypress/default.nix
View File

@ -2,7 +2,6 @@
, autoPatchelfHook
, callPackage
, fetchzip
, gnome2
, gtk2
, gtk3
, lib
@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
nss
gtk2
alsa-lib
gnome2.GConf
gtk3
mesa # for libgbm
];

3
pkgs/development/web/insomnia/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3
, fontconfig, freetype, gdk-pixbuf, glib, pango, mesa, nspr, nss, gtk3
, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
freetype
gdk-pixbuf
glib
gnome2.GConf
pango
gtk3
gsettings-desktop-schemas

8
pkgs/games/cl-wordle/default.nix
View File

@ -2,16 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cl-wordle";
version = "0.2.0";
version = "0.4.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-M2ljFrfIOyM1Slwsk7ZJ+PhJIVSUvFcFck2Q2e9nOwc=";
sha256 = "sha256-z2XpXgOviBRcberwpxQ4ml1T04k5kMhG7wA0PAYWENg=";
};
cargoSha256 = "sha256-bB6MzpJc8QS2+8GSS8RbSF5QcJyRT8FkmChpf1x2i/E=";
patches = [ ./rust-1-57.diff ];
cargoSha256 = "sha256-C7UMkhgez2CtddftARlwN1TjZ1N26NnZfpRiX1KkMEA=";
meta = with lib; {
description = "Wordle TUI in Rust";

13
pkgs/games/cl-wordle/rust-1-57.diff
View File

@ -1,13 +0,0 @@
diff --git a/src/state.rs b/src/state.rs
index 5fac0a3..41cbde4 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -74,7 +74,7 @@ impl State {
'X'
};
- write!(w, "{score}/6",)?;
+ write!(w, "{:?}/6", score)?;
for Guess(_, m) in self.guesses() {
write!(w, "\n{}", m)?;
}

1
pkgs/misc/drivers/hplip/default.nix
View File

@ -83,6 +83,7 @@ python3Packages.buildPythonApplication {
dbus-python
] ++ lib.optionals withQt5 [
pyqt5
pyqt5_sip
enum-compat
];

2
pkgs/misc/emulators/yuzu/base.nix
View File

@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
# Icons
cc-by-nd-30 cc0
];
maintainers = with maintainers; [ ivar joshuafern ];
maintainers = with maintainers; [ ivar joshuafern sbruder ];
platforms = platforms.linux;
broken = stdenv.isAarch64; # Currently aarch64 is not supported.
};

4
pkgs/misc/emulators/yuzu/default.nix
View File

@ -16,13 +16,13 @@ in {
};
early-access = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-ea";
version = "2156";
version = "2432";
branchName = branch;
src = fetchFromGitHub {
owner = "pineappleEA";
repo = "pineapple-src";
rev = "EA-${version}";
sha256 = "1x8x808x3i8jr9zghx01vakb6q6hkwnarawr9arxvqnd9x79j8ga";
sha256 = "0zqab61rphgjzyxk52idhr7dqwwxih0f8b9hig3zvrwkdry9wfh4";
};
};
}.${branch}

2
pkgs/misc/vscode-extensions/update_installed_exts.sh
View File

@ -40,7 +40,7 @@ function get_vsixpkg() {
URL="https://$1.gallery.vsassets.io/_apis/public/gallery/publisher/$1/extension/$2/latest/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"
# Quietly but delicately curl down the file, blowing up at the first sign of trouble.
curl --silent --show-error --fail -X GET -o "$EXTTMP/$N.zip" "$URL"
curl --silent --show-error --retry 3 --fail -X GET -o "$EXTTMP/$N.zip" "$URL"
# Unpack the file we need to stdout then pull out the version
VER=$(jq -r '.version' <(unzip -qc "$EXTTMP/$N.zip" "extension/package.json"))
# Calculate the SHA

6
pkgs/servers/mattermost/default.nix
View File

@ -10,7 +10,7 @@
, storePathAsBuildHash ? false }:
let
version = "6.3.2";
version = "6.3.3";
goPackagePath = "github.com/mattermost/mattermost-server";
@ -22,7 +22,7 @@ let
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
sha256 = "+6bLkzqlcty8X+mbNkZnHzC8tK8EJwmWAYz3jZ/6q2w=";
sha256 = "OSN8Bscgv7rPfKIfZ3ZnegdgsygFpSM7/vGWojj0P3k=";
};
ldflags = [
@ -65,7 +65,7 @@ let
src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
sha256 = "dxgoYFgW+KKtfNr+1pr7bA9K79gCXpKebTIWDhneuv0=";
sha256 = "Og9DUGyE4cWYF7EQP/8szIrWM1Ldqnpqc+HW+L7XApo=";
};
installPhase = ''

4
pkgs/servers/memcached/default.nix
View File

@ -1,12 +1,12 @@
{lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }:
stdenv.mkDerivation rec {
version = "1.6.12";
version = "1.6.14";
pname = "memcached";
src = fetchurl {
url = "https://memcached.org/files/${pname}-${version}.tar.gz";
sha256 = "sha256-8pGjX4Lvl1btHZUoee9fS+hw+TK9/LKrYTVmCav4I0Y=";
sha256 = "sha256-VNY3QsaIbc3E4Mh/RDmikwqHbNnyv6AdaZsMa60XB7M=";
};
configureFlags = [

56
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -9,6 +9,24 @@
, mkYarnPackage
, nixosTests
, fetchpatch
, enableAWS ? true
, enableAzure ? true
, enableConsul ? true
, enableDigitalOcean ? true
, enableEureka ? true
, enableGCE ? true
, enableHetzner ? true
, enableKubernetes ? true
, enableLinode ? true
, enableMarathon ? true
, enableMoby ? true
, enableOpenstack ? true
, enablePuppetDB ? true
, enableScaleway ? true
, enableTriton ? true
, enableUyuni ? true
, enableXDS ? true
, enableZookeeper ? true
}:
let
@ -92,6 +110,44 @@ buildGoModule rec {
# webui-codemirror
ln -s ${codemirror}/dist web/ui/module/codemirror-promql/dist
ln -s ${codemirror}/lib web/ui/module/codemirror-promql/lib
# Disable some service discovery to shrink binaries.
${lib.optionalString (!enableAWS)
"sed -i -e '/register aws/d' discovery/install/install.go"}
${lib.optionalString (!enableAzure)
"sed -i -e '/register azure/d' discovery/install/install.go"}
${lib.optionalString (!enableConsul)
"sed -i -e '/register consul/d' discovery/install/install.go"}
${lib.optionalString (!enableDigitalOcean)
"sed -i -e '/register digitalocean/d' discovery/install/install.go"}
${lib.optionalString (!enableEureka)
"sed -i -e '/register eureka/d' discovery/install/install.go"}
${lib.optionalString (!enableGCE)
"sed -i -e '/register gce/d' discovery/install/install.go"}
${lib.optionalString (!enableHetzner)
"sed -i -e '/register hetzner/d' discovery/install/install.go"}
${lib.optionalString (!enableKubernetes)
"sed -i -e '/register kubernetes/d' discovery/install/install.go"}
${lib.optionalString (!enableLinode)
"sed -i -e '/register linode/d' discovery/install/install.go"}
${lib.optionalString (!enableMarathon)
"sed -i -e '/register marathon/d' discovery/install/install.go"}
${lib.optionalString (!enableMoby)
"sed -i -e '/register moby/d' discovery/install/install.go"}
${lib.optionalString (!enableOpenstack)
"sed -i -e '/register openstack/d' discovery/install/install.go"}
${lib.optionalString (!enablePuppetDB)
"sed -i -e '/register puppetdb/d' discovery/install/install.go"}
${lib.optionalString (!enableScaleway)
"sed -i -e '/register scaleway/d' discovery/install/install.go"}
${lib.optionalString (!enableTriton)
"sed -i -e '/register triton/d' discovery/install/install.go"}
${lib.optionalString (!enableUyuni)
"sed -i -e '/register uyuni/d' discovery/install/install.go"}
${lib.optionalString (!enableXDS)
"sed -i -e '/register xds/d' discovery/install/install.go"}
${lib.optionalString (!enableZookeeper)
"sed -i -e '/register zookeeper/d' discovery/install/install.go"}
'';
tags = [ "builtinassets" ];

17
pkgs/servers/xmpp/prosody/default.nix
View File

@ -5,6 +5,7 @@
, withDBI ? true
# use withExtraLibs to add additional dependencies of community modules
, withExtraLibs ? [ ]
, withExtraLuaPackages ? _: [ ]
, withOnlyInstalledCommunityModules ? [ ]
, withCommunityModules ? [ ] }:
@ -17,6 +18,7 @@ let
]
++ lib.optional withLibevent p.luaevent
++ lib.optional withDBI p.luadbi
++ withExtraLuaPackages p
);
in
stdenv.mkDerivation rec {
@ -63,23 +65,26 @@ stdenv.mkDerivation rec {
make -C tools/migration
'';
luaEnvPath = lua.pkgs.lib.genLuaPathAbsStr luaEnv;
luaEnvCPath = lua.pkgs.lib.genLuaCPathAbsStr luaEnv;
# the wrapping should go away once lua hook is fixed
postInstall = ''
${concatMapStringsSep "\n" (module: ''
cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
'') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))}
wrapProgram $out/bin/prosody \
--prefix LUA_PATH ';' "$LUA_PATH" \
--prefix LUA_CPATH ';' "$LUA_CPATH"
--set LUA_PATH "$luaEnvPath" \
--set LUA_CPATH "$luaEnvCPath"
wrapProgram $out/bin/prosodyctl \
--add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
--prefix LUA_PATH ';' "$LUA_PATH" \
--prefix LUA_CPATH ';' "$LUA_CPATH"
--set LUA_PATH "$luaEnvPath" \
--set LUA_CPATH "$luaEnvCPath"
make -C tools/migration install
wrapProgram $out/bin/prosody-migrator \
--prefix LUA_PATH ';' "$LUA_PATH" \
--prefix LUA_CPATH ';' "$LUA_CPATH"
--set LUA_PATH "$luaEnvPath" \
--set LUA_CPATH "$luaEnvCPath"
'';
passthru = {

4
pkgs/tools/compression/lziprecover/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "lziprecover";
version = "1.22";
version = "1.23";
src = fetchurl {
url = "mirror://savannah/lzip/lziprecover/${pname}-${version}.tar.gz";
sha256 = "sha256-/ZWKCXX3cpxE87eE5WaJH3NsPcaDdNvSFJ7mkqFtCGI=";
sha256 = "sha256-8pgEF38G3VHD+lJhWuGYp2ACts6Nlhw1dVRsN0D0tXI=";
};
configureFlags = [

157
pkgs/tools/inputmethods/input-remapper/default.nix Normal file
View File

@ -0,0 +1,157 @@
{ lib
, python3
, pkgconfig
, wrapGAppsHook
, gettext
, gtk3
, glib
, dbus
, gobject-introspection
, xmodmap
, pygobject3
, setuptools
, evdev
, pydantic
, pydbus
, psutil
, fetchFromGitHub
, buildPythonApplication
, procps
, gtksourceview4
# Change the default log level to debug for easier debugging of package issues
, withDebugLogLevel ? false
# Xmodmap is an optional dependency
# If you use Xmodmap to set keyboard mappings (or your DE does)
# it is required to correctly map keys
, withXmodmap ? true
# Version and rev and hash are package arguments to allow overriding
# while ensuring the values in prePatch and src match
# https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7
# The names are prefixed with input_remapper to avoid potential
# collisions with package names
, input_remapper_version ? "unstable-2022-02-09"
, input_remapper_src_rev ? "55227e0b5a28d21d7333c6c8ea1c691e56fd35c4"
, input_remapper_src_hash ? "sha256-kzGlEaYN/JfAgbI0aMLr5mwObYOL43X7QU/ihDEBQFg="
}:
let
maybeXmodmap = lib.optional withXmodmap xmodmap;
in
buildPythonApplication {
pname = "input-remapper";
version = input_remapper_version;
src = fetchFromGitHub {
rev = input_remapper_src_rev;
owner = "sezanzeb";
repo = "input-remapper";
hash = input_remapper_src_hash;
};
# Fixes error
# Couldn’t recognize the image file format for file "*.svg"
# at startup, see https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
prePatch = ''
# set revision for --version output
echo "COMMIT_HASH = '${input_remapper_src_rev}'" > inputremapper/commit_hash.py
# fix FHS paths
substituteInPlace inputremapper/configs/data.py \
--replace "/usr/share/input-remapper" "$out/usr/share/input-remapper"
'' + (lib.optionalString (withDebugLogLevel) ''
# if debugging
substituteInPlace inputremapper/logger.py --replace "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)"
'');
doCheck = true;
checkInputs = [
psutil
];
pythonImportsCheck = [
"evdev"
"inputremapper"
];
# Custom test script, can't use plain pytest / pytestCheckHook
# We only run tests in the unit folder, integration tests require UI
# To allow tests which access the system and session DBUS to run, we start a dbus session
# and bind it to both the system and session buses
installCheckPhase = ''
echo "<busconfig>
<type>session</type>
<listen>unix:tmpdir=$TMPDIR</listen>
<listen>unix:path=/build/system_bus_socket</listen>
<standard_session_servicedirs/>
<policy context=\"default\">
<!-- Allow everything to be sent -->
<allow send_destination=\"*\" eavesdrop=\"true\"/>
<!-- Allow everything to be received -->
<allow eavesdrop=\"true\"/>
<!-- Allow anyone to own anything -->
<allow own=\"*\"/>
</policy>
</busconfig>" > dbus.cfg
PATH=${lib.makeBinPath ([ dbus procps ] ++ maybeXmodmap)}:$PATH \
USER="$(id -u -n)" \
DBUS_SYSTEM_BUS_ADDRESS=unix:path=/build/system_bus_socket \
${dbus}/bin/dbus-run-session --config-file dbus.cfg \
python tests/test.py --start-dir unit
'';
# Nixpkgs 15.9.4.3. When using wrapGAppsHook with special derivers you can end up with double wrapped binaries.
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
--prefix PATH : "${lib.makeBinPath maybeXmodmap}"
)
'';
nativeBuildInputs = [
wrapGAppsHook
gettext # needed to build translations
gtk3
glib
gobject-introspection
pygobject3
] ++ maybeXmodmap;
propagatedBuildInputs = [
setuptools # needs pkg_resources
pygobject3
evdev
pkgconfig
pydantic
pydbus
gtksourceview4
];
postInstall = ''
sed -r "s#RUN\+\=\"/bin/input-remapper-control#RUN\+\=\"$out/bin/input-remapper-control#g" -i data/99-input-remapper.rules
sed -r "s#ExecStart\=/usr/bin/input-remapper-service#ExecStart\=$out/bin/input-remapper-service#g" -i data/input-remapper.service
chmod +x data/*.desktop
install -D -t $out/share/applications/ data/*.desktop
install -D -t $out/share/polkit-1/actions/ data/input-remapper.policy
install -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules
install -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service
install -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy
install -D data/inputremapper.Control.conf $out/etc/dbus-1/system.d/inputremapper.Control.conf
install -D -t $out/usr/share/input-remapper/ data/*
# Only install input-remapper prefixed binaries, we don't care about deprecated key-mapper ones
install -m755 -D -t $out/bin/ bin/input-remapper*
'';
meta = with lib; {
description = "An easy to use tool to change the mapping of your input device buttons";
homepage = "https://github.com/sezanzeb/input-remapper";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ LunNova ];
mainProgram = "input-remapper-gtk";
};
}

2
pkgs/tools/misc/mongodb-compass/default.nix
View File

@ -14,7 +14,6 @@ fontconfig,
freetype,
gdk-pixbuf,
glib,
gnome2,
gtk3,
lib,
libdrm,
@ -50,7 +49,6 @@ let
freetype
gdk-pixbuf
glib
gnome2.GConf
gtk3
libdrm
libnotify

9
pkgs/tools/networking/ofono/default.nix
View File

@ -12,14 +12,14 @@
stdenv.mkDerivation rec {
pname = "ofono";
version = "1.33";
version = "1.34";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git";
rev = version;
sha256 = "sha256-UTFP69yv1epVrqBoRKCRcR2WiKBG01sLTzrsh/Nude4=";
sha256 = "sha256-mqltc+/RmQO8awP+J7p9fCVhNsEYA3SgxeV5Gkr1srg=";
};
patches = [
@ -58,8 +58,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Infrastructure for building mobile telephony (GSM/UMTS) applications";
homepage = "https://01.org/ofono";
license = licenses.gpl2;
homepage = "https://git.kernel.org/pub/scm/network/ofono/ofono.git";
changelog = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/plain/ChangeLog?h=${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
};

17
pkgs/tools/text/mdcat/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchFromGitea
, rustPlatform
, pkg-config
, asciidoctor
@ -12,20 +12,21 @@
rustPlatform.buildRustPackage rec {
pname = "mdcat";
version = "0.25.1";
version = "0.26.1";
src = fetchFromGitHub {
owner = "lunaryorn";
repo = pname;
src = fetchFromGitea {
domain = "codeberg.org";
owner = "flausch";
repo = "mdcat";
rev = "mdcat-${version}";
sha256 = "sha256-deG2VjyjFs0LFeTXfPYy3zzjj0rpVjxE0DhkpD5PzSQ=";
sha256 = "sha256-vB49EwQltonR9Uw8RRMZTPR4WkcylnIqiE0/8+t2R1Q=";
};
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
cargoSha256 = "sha256-bPGSdXooBZMye3yj00f3rWIiW4wfg2B4meH44hpkXTY=";
cargoSha256 = "sha256-v52ob5l5HiiZZmo88D9/ldFi0170/BuPzgKIt9ctSgU=";
checkInputs = [ ansi2html ];
# Skip tests that use the network and that include files.
@ -50,7 +51,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "cat for markdown";
homepage = "https://github.com/lunaryorn/mdcat";
license = with licenses; [ asl20 ];
license = with licenses; [ mpl20 ];
maintainers = with maintainers; [ davidtwco SuperSandro2000 ];
};
}

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

@ -1263,6 +1263,8 @@ with pkgs;
amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { };
amber = callPackage ../tools/text/amber {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -6638,6 +6640,8 @@ with pkgs;
innoextract = callPackage ../tools/archivers/innoextract { };
input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { };
input-utils = callPackage ../os-specific/linux/input-utils { };
inql = callPackage ../tools/security/inql { };
@ -11882,9 +11886,7 @@ with pkgs;
elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix;
elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm {
inherit (darwin.apple_sdk.frameworks) Security;
});
elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });
apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { };
@ -14517,7 +14519,7 @@ with pkgs;
checkstyle = callPackage ../development/tools/analysis/checkstyle { };
chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; };
chromedriver = callPackage ../development/tools/selenium/chromedriver { };
chromium-xorg-conf = callPackage ../os-specific/linux/chromium-xorg-conf { };
@ -15250,12 +15252,9 @@ with pkgs;
jre_headless = jre8_headless;
};
nwjs = callPackage ../development/tools/nwjs {
gconf = gnome2.GConf;
};
nwjs = callPackage ../development/tools/nwjs { };
nwjs-sdk = callPackage ../development/tools/nwjs {
gconf = gnome2.GConf;
sdk = true;
};
@ -21049,6 +21048,7 @@ with pkgs;
# _compat can probably be removed on next minor version after 0.10.0
lua = lua5_2_compat;
withExtraLibs = [];
withExtraLuaPackages = _: [];
};
prosody-filer = callPackage ../servers/xmpp/prosody-filer { };
@ -25937,6 +25937,8 @@ with pkgs;
jmusicbot = callPackage ../applications/audio/jmusicbot { };
lemonade = callPackage ../applications/misc/lemonade { };
libquvi = callPackage ../applications/video/quvi/library.nix { };
librespot = callPackage ../applications/audio/librespot {
@ -26067,7 +26069,7 @@ with pkgs;
googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; };
google-chrome = callPackage ../applications/networking/browsers/google-chrome { };
google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; };
@ -28665,6 +28667,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};
sptlrx = callPackage ../applications/audio/sptlrx { };
squishyball = callPackage ../applications/audio/squishyball {
ncurses = ncurses5;
};

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

@ -7349,6 +7349,8 @@ in {
pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { };
pyqt5_sip = callPackage ../development/python-modules/pyqt/sip.nix { };
pyqt5_with_qtmultimedia = self.pyqt5.override {
withMultimedia = true;
};