Merge branch 'master' into staging-next

Conflicts:
	pkgs/applications/editors/vim/common.nix
	pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
	pkgs/development/python-modules/pymavlink/default.nix
This commit is contained in:
Dmitry Kalinkin 2021-12-20 12:09:28 -05:00
commit ac40a963c9
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
210 changed files with 2508 additions and 1035 deletions

View File

@ -29,7 +29,7 @@ How to add a new (major) version of the Linux kernel to Nixpkgs:
4. If needed you can also run `make menuconfig`:
```ShellSession
$ nix-env -i ncurses
$ nix-env -f "<nixpkgs>" -iA ncurses
$ export NIX_CFLAGS_LINK=-lncurses
$ make menuconfig ARCH=arch
```

View File

@ -43,13 +43,13 @@
- nixpkgs:
- update pkg
- `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
- `nix-env -iA pkg-attribute-name -f <path to your local nixpkgs folder>`
- add pkg
- Make sure its in `pkgs/top-level/all-packages.nix`
- `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
- `nix-env -iA pkg-attribute-name -f <path to your local nixpkgs folder>`
- _If you dont want to install pkg in you profile_.
- `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
- If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
- `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
- If you installed your package with `nix-env`, you can run `nix-env -e pkg-name` where `pkg-name` is as reported by `nix-env -q` to uninstall it from your system.
- NixOS and its modules:
- You can add new module to your NixOS configuration file (usually its `/etc/nixos/configuration.nix`). And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`.

View File

@ -15,12 +15,12 @@ Modes of use of `emscripten`:
If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions you can use these commands:
* `nix-env -i emscripten`
* `nix-env -f "<nixpkgs>" -iA emscripten`
* `nix-shell -p emscripten`
* **Declarative usage**:
This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`.
This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`. From the root of the nixpkgs repository:
* build and install all packages:
* `nix-env -iA emscriptenPackages`

View File

@ -5,10 +5,7 @@
The easiest way to get a working idris version is to install the `idris` attribute:
```ShellSession
$ # On NixOS
$ nix-env -i nixos.idris
$ # On non-NixOS
$ nix-env -i nixpkgs.idris
$ nix-env -f "<nixpkgs>" -iA idris
```
This however only provides the `prelude` and `base` libraries. To install idris with additional libraries, you can use the `idrisPackages.with-packages` function, e.g. in an overlay in `~/.config/nixpkgs/overlays/my-idris.nix`:

View File

@ -24,18 +24,10 @@ You can test building an Octave package as follows:
$ nix-build -A octavePackages.symbolic
```
When building Octave packages with `nix-build`, the `buildOctavePackage` function adds `octave-octaveVersion` to; the start of the package's name attribute.
This can be required when installing the package using `nix-env`:
To install it into your user profile, run this command from the root of the repository:
```ShellSession
$ nix-env -i octave-6.2.0-symbolic
```
Although, you can also install it using the attribute name:
```ShellSession
$ nix-env -i -A octavePackages.symbolic
$ nix-env -f. -iA octavePackages.symbolic
```
You can build Octave with packages by using the `withPackages` passed-through function.

View File

@ -58,13 +58,7 @@ in `all-packages.nix`. You can test building a Perl package as follows:
$ nix-build -A perlPackages.ClassC3
```
`buildPerlPackage` adds `perl-` to the start of the name attribute, so the package above is actually called `perl-Class-C3-0.21`. So to install it, you can say:
```ShellSession
$ nix-env -i perl-Class-C3
```
(Of course you can also install using the attribute name: `nix-env -i -A perlPackages.ClassC3`.)
To install it with `nix-env` instead: `nix-env -f. -iA perlPackages.ClassC3`.
So what does `buildPerlPackage` do? It does the following:
@ -135,9 +129,11 @@ This will remove the `-I` flags from the shebang line, rewrite them in the `use
Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program `nix-generate-from-cpan`, which can be installed as follows:
```ShellSession
$ nix-env -i nix-generate-from-cpan
$ nix-env -f "<nixpkgs>" -iA nix-generate-from-cpan
```
Substitute `<nixpkgs>` by the path of a nixpkgs clone to use the latest version.
This program takes a Perl module name, looks it up on CPAN, fetches and unpacks the corresponding package, and prints a Nix expression on standard output. For example:
```ShellSession

View File

@ -3481,9 +3481,9 @@
githubId = 5493775;
name = "Ente";
};
enzime = {
Enzime = {
email = "enzime@users.noreply.github.com";
github = "enzime";
github = "Enzime";
githubId = 10492681;
name = "Michael Hoang";
};
@ -9184,12 +9184,6 @@
githubId = 301903;
name = "Chip Collier";
};
phreedom = {
email = "phreedom@yandex.ru";
github = "phreedom";
githubId = 62577;
name = "Evgeny Egorochkin";
};
phryneas = {
email = "mail@lenzw.de";
github = "phryneas";

View File

@ -109,6 +109,14 @@
<literal>writers.writePyPy2</literal> needs to be used.
</para>
</listitem>
<listitem>
<para>
If you previously used
<literal>/etc/docker/daemon.json</literal>, you need to
incorporate the changes into the new option
<literal>virtualisation.docker.daemon.settings</literal>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">

View File

@ -41,6 +41,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter.
Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used.
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
## Other Notable Changes {#sec-release-22.05-notable-changes}
- The option [services.redis.servers](#opt-services.redis.servers) was added

View File

@ -207,13 +207,20 @@ in
serviceConfig =
{ Type = "forking";
PIDFile = "/run/dhcpcd.pid";
PIDFile = "/run/dhcpcd/pid";
RuntimeDirectory = "dhcpcd";
ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet ${optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}";
ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
Restart = "always";
};
};
users.users.dhcpcd = {
isSystemUser = true;
group = "dhcpcd";
};
users.groups.dhcpcd = {};
environment.systemPackages = [ dhcpcd ];
environment.etc."dhcpcd.exit-hook".source = exitHook;

View File

@ -8,7 +8,8 @@ let
cfg = config.virtualisation.docker;
proxy_env = config.networking.proxy.envVars;
settingsFormat = pkgs.formats.json {};
daemonSettingsFile = settingsFormat.generate "daemon.json" cfg.daemon.settings;
in
{
@ -52,6 +53,20 @@ in
'';
};
daemon.settings =
mkOption {
type = settingsFormat.type;
default = { };
example = {
ipv6 = true;
"fixed-cidr-v6" = "fd00::/80";
};
description = ''
Configuration for docker daemon. The attributes are serialized to JSON used as daemon.conf.
See https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file
'';
};
enableNvidia =
mkOption {
type = types.bool;
@ -171,12 +186,7 @@ in
""
''
${cfg.package}/bin/dockerd \
--group=docker \
--host=fd:// \
--log-driver=${cfg.logDriver} \
${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
${optionalString cfg.liveRestore "--live-restore" } \
${optionalString cfg.enableNvidia "--add-runtime nvidia=${pkgs.nvidia-docker}/bin/nvidia-container-runtime" } \
--config-file=${daemonSettingsFile} \
${cfg.extraOptions}
''];
ExecReload=[
@ -219,6 +229,19 @@ in
{ assertion = cfg.enableNvidia -> config.hardware.opengl.driSupport32Bit or false;
message = "Option enableNvidia requires 32bit support libraries";
}];
virtualisation.docker.daemon.settings = {
group = "docker";
hosts = [ "fd://" ];
log-driver = mkDefault cfg.logDriver;
storage-driver = mkIf (cfg.storageDriver != null) (mkDefault cfg.storageDriver);
live-restore = mkDefault cfg.liveRestore;
runtimes = mkIf cfg.enableNvidia {
nvidia = {
path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime";
};
};
};
}
]);

View File

@ -0,0 +1,40 @@
{ stdenv
, fetchFromGitLab
, lib
, makeWrapper
, ponymix
, rofi-unwrapped
}:
stdenv.mkDerivation rec {
pname = "rofi-pulse-select";
version = "0.2.0";
src = fetchFromGitLab {
owner = "DamienCassou";
repo = pname;
rev = "${version}";
sha256 = "1405v0bh2m8ip9c23l95i8iq2gfrpanc6f4dz17nysdcff2ay2p3";
};
installPhase = ''
runHook preInstall
install -D --target-directory=$out/bin/ ./rofi-pulse-select
wrapProgram $out/bin/rofi-pulse-select \
--prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped ponymix ]}
runHook postInstall
'';
nativeBuildInputs = [ makeWrapper ];
meta = with lib; {
description = "Rofi-based interface to select source/sink (aka input/output) with PulseAudio";
homepage = "https://gitlab.com/DamienCassou/rofi-pulse-select";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ DamienCassou ];
platforms = platforms.linux;
};
}

View File

@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
homepage = "http://gobby.0x539.de/";
description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat";
license = lib.licenses.gpl2Plus;
maintainers = [ maintainers.phreedom ];
maintainers = [ ];
platforms = platforms.all;
};
}

View File

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "8.2.3651";
version = "8.2.3848";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
sha256 = "sha256-bSbNO00lqjsjVhkv9W6TCvCQV6UDf2X79z0cgLy9UE0=";
sha256 = "sha256-U6xrEZbieRBU0FDdTloYdZzuNpJ9+Q7FZgfI+0SPEAQ=";
};
enableParallelBuilding = true;

View File

@ -13,7 +13,7 @@ mkDerivation {
homepage = "https://apps.kde.org/k3b/";
description = "Disk burning application";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ sander phreedom ];
maintainers = with maintainers; [ sander ];
platforms = platforms.linux;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "appeditor";
version = "1.1.1";
version = "1.1.3";
src = fetchFromGitHub {
owner = "donadigo";
repo = "appeditor";
rev = version;
sha256 = "14ycw1b6v2sa4vljpnx2lpx4w89mparsxk6s8w3yx4dqjglcg5bp";
sha256 = "sha256-0zutz1nnThyF7h44cDxjE53hhAJfJf6DTs9p4HflXr8=";
};
nativeBuildInputs = [

View File

@ -1,19 +1,19 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGo117Module, fetchFromGitHub }:
buildGoPackage rec {
buildGo117Module rec {
pname = "cointop";
version = "1.6.8";
version = "1.6.10";
src = fetchFromGitHub {
owner = "miguelmota";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uENfTj+pJjX4t+yrd7zrn3LHRbJJSZFCN1N6Ce47wcE=";
sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0=";
};
goPackagePath = "github.com/miguelmota/cointop";
vendorSha256 = null;
ldflags = [ "-s" "-w" "-X ${goPackagePath}/cointop.version=${version}" ];
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies";

View File

@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "remarkable-mouse";
version = "6.0.0";
version = "7.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "46eff5d6a07ca60ed652d09eeee9b4c4566da422be4a3dfa2fcd452a3df65ac1";
sha256 = "0c67cd1ef4c46290cb74731c163c3fefc35590cd24749ec354af23012984d99e";
};
propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ];

View File

@ -0,0 +1,25 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3 }:
stdenv.mkDerivation rec {
pname = "spotify-tray";
version = "1.3.2";
src = fetchFromGitHub {
owner = "tsmetana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-E86rA8cBjy/bI7sZHlT40o7i23PcONXT5GTHEfcaDf0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ gtk3 ];
meta = with lib; {
homepage = "https://github.com/tsmetana/spotify-tray";
description = "Adds a tray icon to the Spotify Linux client application.";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ Enzime ];
};
}

View File

@ -32,10 +32,10 @@ rec {
firefox-esr-91 = common rec {
pname = "firefox-esr";
version = "91.4.0esr";
version = "91.4.1esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "781bf62a0e1215cad7d90de7c822978997bfeaf71bde4e7124a732921d130762c6654417c708a299726039d1603ff5e0796106118ad4b2ddef4e9dac84887765";
sha512 = "1b9f17c4e58e3753f8507754bba93e3b7f76df5b6845d6173719fbdd98b70af2a90242df42fe274217f56d0280e5dbae17962f5b6bf111421260790f770f5337";
};
meta = {

View File

@ -17,10 +17,10 @@ in
mkFranzDerivation' rec {
pname = "ferdi";
name = "Ferdi";
version = "5.6.3";
version = "5.6.4";
src = fetchurl {
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
sha256 = "sha256-cfX3x0ZRxT6sxMm20uL8lKhMbrI/yiCHVrBTPKIlDSE=";
sha256 = "sha256-y3kuhSWoGysGkvDTV+bze6LSXVO4uDfDOos64eSYFf0=";
};
extraBuildInputs = [ xorg.libxshmfence ];
meta = with lib; {

View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/prof7bit/TorChat";
description = "Instant messaging application on top of the Tor network and it's location hidden services";
license = licenses.gpl3;
maintainers = [ maintainers.phreedom ];
maintainers = [ ];
platforms = platforms.unix;
};
}

View File

@ -93,7 +93,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5).
'';
license = licenses.gpl3;
maintainers = with maintainers; [ phreedom ttuegel ];
maintainers = with maintainers; [ ttuegel ];
repositories.git = "https://github.com/quassel/quassel.git";
inherit (qtbase.meta) platforms;
};

View File

@ -4,15 +4,15 @@
}:
stdenv.mkDerivation rec {
pname = "waypipe-unstable";
version = "0.8.1";
pname = "waypipe";
version = "0.8.2";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mstoeckl";
repo = "waypipe";
rev = "v${version}";
sha256 = "1v08dv3dfz420v51ahz7qgv3429073kmgrf8f66s4c3jlpch2pa1";
sha256 = "02q8l1qaahmd41h6v3r46akh7xlqz7fpwwsy15qww4jdvypg6vg4";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc ];

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wayvnc";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
sha256 = "0q48fgh6gf3jicy4bk3kq18h9lhqfq9qz32ri6j9ffvbb8mcw64s";
sha256 = "0cws9jfnmxqycmlyllvvqzw4jsbrwwk10v9gy8wifv3c61rwgdkk";
};
nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ];

View File

@ -27,6 +27,6 @@ buildPythonApplication rec {
description = "Free software that synchronises media players";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ enzime ];
maintainers = with maintainers; [ Enzime ];
};
}

View File

@ -65,7 +65,7 @@ mkDerivation rec {
vector graphics.
'';
homepage = "https://www.calligra.org/";
maintainers = with maintainers; [ phreedom ebzzry zraexy ];
maintainers = with maintainers; [ ebzzry zraexy ];
platforms = platforms.linux;
license = with licenses; [ gpl2 lgpl2 ];
};

View File

@ -22,13 +22,13 @@ index c51e76d..ae8159e 100644
+ .output();
+ }
+
+ if dest_path.extension() == Some(::std::ffi::OsStr::new("lld")) {
+ if dest_path.file_name() == Some(::std::ffi::OsStr::new("leanc")) {
+ use std::os::unix::fs::PermissionsExt;
+ let new_path = dest_path.with_extension("orig");
+ ::std::fs::rename(dest_path, &new_path)?;
+ ::std::fs::write(dest_path, format!(r#"#! @shell@
+exec -a "$0" {} "$@" --dynamic-linker=@dynamicLinker@
+"#, new_path.to_str().unwrap()))?;
+LEAN_CC="${{LEAN_CC:-@cc@}}" exec -a "$0" {} "$@" -L {}/lib # use bundled libraries, but not bundled compiler that doesn't know about NIX_LDFLAGS
+"#, new_path.to_str().unwrap(), dest_path.parent().unwrap().parent().unwrap().to_str().unwrap()))?;
+ ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?;
}

View File

@ -24,9 +24,10 @@ rustPlatform.buildRustPackage rec {
patches = lib.optionals stdenv.isLinux [
# Run patchelf on the downloaded binaries.
# This necessary because Lean 4 now dynamically links to GMP.
# This is necessary because Lean 4 is now dynamically linked.
(runCommand "0001-dynamically-patchelf-binaries.patch" {
CC = stdenv.cc;
cc = "${stdenv.cc}/bin/cc";
patchelf = patchelf;
shell = runtimeShell;
} ''
@ -34,6 +35,7 @@ rustPlatform.buildRustPackage rec {
substitute ${./0001-dynamically-patchelf-binaries.patch} $out \
--subst-var patchelf \
--subst-var dynamicLinker \
--subst-var cc \
--subst-var shell
'')
];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
version = "3.21.0";
version = "3.22.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
sha256 = "sha256-w0frk1Nd1/HTo94VAbD7QjVuT8laPbmgd8ENTb0+89c=";
sha256 = "sha256-BarbO25c103YImOOnjVgwgqpa3mUVvndgJeUHRf2I60=";
};
hardeningDisable = [ "format" ];

View File

@ -3,11 +3,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
version = "1.8.45";
version = "1.8.46";
src = fetchPypi {
inherit pname version;
sha256 = "f1010cefb5b97a5d392d32aa1425bdb7df995161125f8686f2c7383c2a86e9e5";
sha256 = "c740c11551af4bcb1378772bde77ca6c846c6fd261b79d932c0ecbb164afe3bd";
};
postPatch = ''

View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre }:
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre }:
mkDerivation rec {
pname = "contour";
@ -23,5 +23,6 @@ mkDerivation rec {
license = licenses.asl20;
maintainers = with maintainers; [ fortuneteller2k ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/contour.x86_64-darwin
};
}

View File

@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "netflix";
namespace = "plugin.video.netflix";
version = "1.16.2";
version = "1.18.2";
src = fetchFromGitHub {
owner = "CastagnaIT";
repo = namespace;
rev = "v${version}";
sha256 = "0yycwm8vrpkr4fsbf713mhpnaxfd849nhzp5r1898sb9vldab4xk";
sha256 = "sha256-nunjcVapWWTxYtILEcrkfJiWvSz71zyxSCbWQ4aCfLM=";
};
propagatedBuildInputs = [

View File

@ -22,13 +22,13 @@
}:
stdenv.mkDerivation rec {
pname = "qmplay2";
version = "21.06.07";
version = "21.12.07";
src = fetchFromGitHub {
owner = "zaps166";
repo = "QMPlay2";
rev = version;
sha256 = "sha256-NV9uglYnqebXhMx8uL0DhGe9l5TBVjlSIaB4IWC8YAc=";
sha256 = "sha256-iFT88CTz7L7tnNmpe/HaeTrHiE8l0Jk+r0c6O7wJ7N8=";
fetchSubmodules = true;
};

View File

@ -7,8 +7,8 @@
, mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
, ncurses, srt
, libvdpau, libsamplerate, libspatialaudio, live555, fluidsynth
, wayland, wayland-protocols, ncurses, srt
, onlyLibVLC ? false
, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook
, jackSupport ? false
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
fluidsynth wayland wayland-protocols ncurses srt
libspatialaudio fluidsynth wayland wayland-protocols ncurses srt
] ++ optional (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ])
@ -101,6 +101,12 @@ stdenv.mkDerivation rec {
sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE "<removed>"|g' config.h
'';
# Add missing SOFA files
# Given in EXTRA_DIST, but not in install-data target
postInstall = ''
cp -R share/hrtfs $out/share/vlc
'';
meta = with lib; {
description = "Cross-platform media player and streaming server";
homepage = "http://www.videolan.org/vlc/";

View File

@ -86,7 +86,7 @@ stdenv.mkDerivation ({
find $out/share/emacs -type f -name '*.el' -print0 \
| xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c \
"emacs --batch -f batch-native-compile {} || true"
"emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true"
'';
}

View File

@ -8,6 +8,9 @@
(setq package-build-archive-dir (expand-file-name "packages/"))
(setq package-build-recipes-dir (expand-file-name "recipes/"))
;; Allow installing package tarfiles larger than 10MB
(setq large-file-warning-threshold nil)
(defun melpa2nix-build-package ()
(if (not noninteractive)
(error "`melpa2nix-build-package' is to be used only with -batch"))

View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "xreader";
version = "3.2.1";
version = "3.2.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-Ghltzoq5m27LvAojV5/aLiJL3ZvIXSnRjYtdvfRM0a8=";
sha256 = "sha256-rAPc4RF2uXp1hI8/8PXDYy3DnL5vNR8rF/EEixO0FXI=";
};
nativeBuildInputs = [

View File

@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgtk_doc=true"
"-Ddesktop_docs=false"
"-Ddate_in_gnome_version=false"
"-Dgnome_distributor=NixOS"
];
separateDebugInfo = stdenv.isLinux;

File diff suppressed because one or more lines are too long

View File

@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
license = licenses.lgpl2;
platforms = platforms.mesaPlatforms;
maintainers = [ maintainers.phreedom ];
maintainers = [ ];
};
}

View File

@ -46,7 +46,7 @@ let
homepage = "https://gobby.github.io/";
description = "An implementation of the Infinote protocol written in GObject-based C";
license = lib.licenses.lgpl2Plus;
maintainers = [ lib.maintainers.phreedom ];
maintainers = [ ];
platforms = with lib.platforms; linux ++ darwin;
};
};

View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
repositories.git = "git://github.com/lastfm/liblastfm.git";
description = "Official LastFM library";
platforms = platforms.unix;
maintainers = [ maintainers.phreedom ];
maintainers = [ ];
license = licenses.gpl3;
};
}

View File

@ -0,0 +1,25 @@
{ lib, stdenv, cmake, fetchFromGitHub, libmysofa, zlib }:
stdenv.mkDerivation rec {
pname = "libspatialaudio";
version = "0.3.0";
src = fetchFromGitHub {
owner = "videolabs";
repo = "libspatialaudio";
rev = version;
hash = "sha256-sPnQPD41AceXM4uGqWXMYhuQv0TUkA6TZP8ChxUFIoI=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libmysofa zlib ];
meta = with lib; {
description =
"Ambisonic encoding / decoding and binauralization library in C++";
homepage = "https://github.com/videolabs/libspatialaudio";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ krav ];
};
}

View File

@ -44,7 +44,7 @@ in stdenv.mkDerivation {
homepage = "https://libtorrent.org/";
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3;
maintainers = [ maintainers.phreedom ];
maintainers = [ ];
platforms = platforms.unix;
};
}

View File

@ -47,7 +47,7 @@ in stdenv.mkDerivation {
homepage = "https://libtorrent.org/";
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3;
maintainers = [ maintainers.phreedom ];
maintainers = [ ];
broken = stdenv.isDarwin;
platforms = platforms.unix;
};

View File

@ -40,7 +40,7 @@ in stdenv.mkDerivation {
homepage = "https://libtorrent.org/";
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3;
maintainers = [ maintainers.phreedom ];
maintainers = [ ];
platforms = platforms.unix;
};
}

View File

@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
description = "C++ wrapper for the libxml2 XML parser library";
license = licenses.lgpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ phreedom ];
maintainers = with maintainers; [ ];
};
}

View File

@ -242,7 +242,7 @@ stdenv.mkDerivation rec {
homepage = "https://qt-project.org/";
description = "A cross-platform application framework for C++";
license = lib.licenses.lgpl21Plus; # or gpl3
maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ];
maintainers = with lib.maintainers; [ orivej lovek323 sander ];
platforms = lib.platforms.unix;
badPlatforms = [ "x86_64-darwin" ];
};

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "qtutilities";
version = "6.5.2";
version = "6.5.3";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/2gw6k6RUYBRnKJ85C8sDBCCcBEfkRU+MCgWi5/Z2hc=";
sha256 = "sha256-P1vAmH1cF5qQxpa4AOIOyK8ogLZgyXt8jaxaHwE9qck=";
};
buildInputs = [ qtbase cpp-utilities ];

View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
description = "Transparent SOCKS v4 proxying library";
homepage = "http://tsocks.sourceforge.net/";
license = lib.licenses.gpl2;
maintainers = with maintainers; [ edwtjo phreedom ];
maintainers = with maintainers; [ edwtjo ];
platforms = platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
};

View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.and.org/ustr/";
description = "Micro String API for C language";
license = licenses.bsd2;
maintainers = [ maintainers.phreedom ];
maintainers = [ ];
platforms = platforms.linux;
};
}

View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "psysh";
version = "0.10.12";
version = "0.11.0";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
sha256 = "sha256-UJ44PgVdXw++gfKZgBTjOBFRj3GL0WUB7I0Qpdzrijw=";
sha256 = "sha256-UIAeOVbKWcfNV3bXaBhkK06wezhtig8aBZfB27umwFU=";
};
dontUnpack = true;

View File

@ -16,6 +16,6 @@ buildPythonPackage rec {
description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python";
license = licenses.mit;
maintainers = with maintainers; [ phreedom ];
maintainers = with maintainers; [ ];
};
}

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "boschshcpy";
version = "0.2.24";
version = "0.2.27";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tschamm";
repo = pname;
rev = version;
sha256 = "sha256-hvanimPWTKzOHRwJhynzO/4Z1jGlLopk4ogU3KHTEyc=";
sha256 = "sha256-xlkLMCLo1tut1mLj/L9YcRn16+GVKXJSSkpClBh1ujI=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, pycryptodome
, PyGithub
, pythonOlder
}:
buildPythonPackage rec {
pname = "brelpy";
version = "0.0.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MYWSKYd7emHZfY+W/UweQtTg62GSUMybpecL9BR8dhg=";
};
propagatedBuildInputs = [
pycryptodome
];
# Source not tagged and PyPI releases don't contain tests
doCheck = false;
pythonImportsCheck = [
"brelpy"
];
meta = with lib; {
description = "Python to communicate with the Brel hubs";
homepage = "https://gitlab.com/rogiervandergeer/brelpy";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -1,24 +1,33 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "cement";
version = "3.0.4";
version = "3.0.6";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "10a8459dc9fc31d6c038ede24a9081c5c3bd5fcd75b071e01baf281f81c9eace";
sha256 = "fccec41eab3f15a03445b1ce24c8a7e106d4d5520f6507a7145698ce68923d31";
};
# Disable test tests since they depend on a memcached server running on
# 127.0.0.1:11211.
doCheck = false;
disabled = !isPy3k;
pythonImportsCheck = [
"cement"
];
meta = with lib; {
description = "CLI Application Framework for Python";
homepage = "https://builtoncement.com/";
description = "A CLI Application Framework for Python.";
maintainers = with maintainers; [ eqyiel ];
license = licenses.bsd3;
maintainers = with maintainers; [ eqyiel ];
};
}

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