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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-03-21 12:26:00 +00:00 committed by GitHub
commit 6f6e1d46b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 369 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/hardware/sane.nix
View File

@ -4,9 +4,7 @@ with lib;
let
pkg = if config.hardware.sane.snapshot
then pkgs.sane-backends-git
else pkgs.sane-backends;
pkg = pkgs.sane-backends;
sanedConf = pkgs.writeTextFile {
name = "saned.conf";

109
pkgs/applications/graphics/sane/backends/default.nix
View File

@ -1,10 +1,107 @@
{ callPackage, fetchurl, ... } @ args:
{ stdenv, lib, fetchurl, runtimeShell
, gettext, pkg-config, python3
, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
, curl, systemd, libxml2, poppler
callPackage ./generic.nix (args // rec {
version = "1.0.30";
# List of { src name backend } attibute sets - see installFirmware below:
, extraFirmware ? []
# For backwards compatibility with older setups; use extraFirmware instead:
, gt68xxFirmware ? null, snapscanFirmware ? null
}:
stdenv.mkDerivation {
pname = "sane-backends";
version = "1.0.32";
src = fetchurl {
url = "https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-${version}.tar.gz";
sha256 = "18vryaycps3zpjzxh0wjgg8nv2f4pdvcfxxmdfj28qbzqjlrcp9z";
# raw checkouts of the repo do not work because, the configure script is
# only functional in manually uploaded release tarballs.
# https://gitlab.com/sane-project/backends/-/issues/440
# unfortunately this make the url unpredictable on update, to find the link
# go to https://gitlab.com/sane-project/backends/-/releases and choose
# the link with other in the URL.
url = "https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz";
sha256 = "055iicihxa6b28iv5fnz13n67frdr5nrydq2c846f9x7q0vw4a1s";
};
})
outputs = [ "out" "doc" "man" ];
nativeBuildInputs = [
gettext
pkg-config
python3
];
buildInputs = [
avahi
libgphoto2
libieee1284
libjpeg
libpng
libtiff
libusb1
libv4l
net-snmp
curl
systemd
libxml2
poppler
];
enableParallelBuilding = true;
configureFlags =
lib.optional (avahi != null) "--with-avahi"
++ lib.optional (libusb1 != null) "--with-usb"
;
postInstall = let
compatFirmware = extraFirmware
++ lib.optional (gt68xxFirmware != null) {
src = gt68xxFirmware.fw;
inherit (gt68xxFirmware) name;
backend = "gt68xx";
}
++ lib.optional (snapscanFirmware != null) {
src = snapscanFirmware;
name = "your-firmwarefile.bin";
backend = "snapscan";
};
installFirmware = f: ''
mkdir -p $out/share/sane/${f.backend}
ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name}
'';
in ''
mkdir -p $out/etc/udev/rules.d/
./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
# the created 49-libsane references /bin/sh
substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
--replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}"
substituteInPlace $out/lib/libsane.la \
--replace "-ljpeg" "-L${lib.getLib libjpeg}/lib -ljpeg"
# net.conf conflicts with the file generated by the nixos module
rm $out/etc/sane.d/net.conf
'' + lib.concatStrings (builtins.map installFirmware compatFirmware);
meta = with lib; {
description = "SANE (Scanner Access Now Easy) backends";
longDescription = ''
Collection of open-source SANE backends (device drivers).
SANE is a universal scanner interface providing standardized access to
any raster image scanner hardware: flatbed scanners, hand-held scanners,
video- and still-cameras, frame-grabbers, etc. For a list of supported
scanners, see http://www.sane-project.org/sane-backends.html.
'';
homepage = "http://www.sane-project.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ peti ];
platforms = platforms.linux;
};
}

95
pkgs/applications/graphics/sane/backends/generic.nix
View File

@ -1,95 +0,0 @@
{ lib, stdenv
, gettext, pkg-config
, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp
# List of { src name backend } attibute sets - see installFirmware below:
, extraFirmware ? []
# For backwards compatibility with older setups; use extraFirmware instead:
, gt68xxFirmware ? null, snapscanFirmware ? null
# Passed from versioned package (e.g. default.nix, git.nix):
, version, src, ...
}:
stdenv.mkDerivation {
inherit src version;
name = "sane-backends-${version}";
outputs = [ "out" "doc" "man" ];
nativeBuildInputs = [
gettext
pkg-config
];
buildInputs = [
avahi
libgphoto2
libieee1284
libjpeg
libpng
libtiff
libusb1
libv4l
net-snmp
];
enableParallelBuilding = true;
configureFlags = []
++ lib.optional (avahi != null) "--enable-avahi"
++ lib.optional (libusb1 != null) "--with-usb"
;
postInstall = let
compatFirmware = extraFirmware
++ lib.optional (gt68xxFirmware != null) {
src = gt68xxFirmware.fw;
inherit (gt68xxFirmware) name;
backend = "gt68xx";
}
++ lib.optional (snapscanFirmware != null) {
src = snapscanFirmware;
name = "your-firmwarefile.bin";
backend = "snapscan";
};
installFirmware = f: ''
mkdir -p $out/share/sane/${f.backend}
ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name}
'';
in ''
mkdir -p $out/etc/udev/rules.d/
./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
# the created 49-libsane references /bin/sh
substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
--replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}"
substituteInPlace $out/lib/libsane.la \
--replace "-ljpeg" "-L${libjpeg.out}/lib -ljpeg"
# net.conf conflicts with the file generated by the nixos module
rm -f $out/etc/sane.d/net.conf
'' + lib.concatStrings (builtins.map installFirmware compatFirmware);
meta = with lib; {
description = "SANE (Scanner Access Now Easy) backends";
longDescription = ''
Collection of open-source SANE backends (device drivers).
SANE is a universal scanner interface providing standardized access to
any raster image scanner hardware: flatbed scanners, hand-held scanners,
video- and still-cameras, frame-grabbers, etc. For a list of supported
scanners, see http://www.sane-project.org/sane-backends.html.
'';
homepage = "http://www.sane-project.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ peti ];
platforms = platforms.linux;
};
}

10
pkgs/applications/graphics/sane/backends/git.nix
View File

@ -1,10 +0,0 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // {
version = "2017-12-01";
src = fetchgit {
sha256 = "0qf7d7268kdxnb723c03m6icxhbgx0vw8gqvck2q1w5b948dy9g8";
rev = "e895ee55bec8a3320a0e972b32c05d35b47fe226";
url = "https://gitlab.com/sane-project/backends.git";
};
})

3
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
View File

@ -1,4 +1,4 @@
sourcePerArch:
{ sourcePerArch, knownVulnerabilities ? [] }:
{ swingSupport ? true # not used for now
, lib, stdenv
@ -48,6 +48,7 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ];
inherit knownVulnerabilities;
};
}; in result

3
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
View File

@ -1,4 +1,4 @@
sourcePerArch:
{ sourcePerArch, knownVulnerabilities ? [] }:
{ stdenv
, lib
@ -107,6 +107,7 @@ let result = stdenv.mkDerivation rec {
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
maintainers = with lib.maintainers; [ taku0 ];
inherit knownVulnerabilities;
};
}; in result

8
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; };
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.hotspot; };
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.openj9; };
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.openj9; };
}

8
pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot;
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot;
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9;
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9;
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.openj9; };
}

8
pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.hotspot;
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.hotspot;
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.openj9;
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.openj9;
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
}

8
pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.hotspot;
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.hotspot;
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.openj9;
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.openj9;
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; };
}

8
pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.hotspot;
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.hotspot;
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.openj9;
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.openj9;
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
}

8
pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.hotspot;
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.hotspot;
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.openj9;
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.openj9;
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; };
}

8
pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.hotspot;
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.hotspot;
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.openj9;
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.openj9;
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; };
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; };
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; };
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; };
}

8
pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.hotspot;
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.hotspot;
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.openj9;
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.openj9;
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.openj9; };
}

8
pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.hotspot;
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.hotspot;
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.openj9;
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.openj9;
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; };
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.hotspot; };
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.openj9; };
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.openj9; };
}

8
pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
View File

@ -2,8 +2,8 @@ let
sources = builtins.fromJSON (builtins.readFile ./sources.json);
in
{
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.hotspot;
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.hotspot;
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.openj9;
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.openj9;
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.openj9; };
}

33
pkgs/development/libraries/lib3mf/default.nix
View File

@ -1,26 +1,41 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }:
{ lib, stdenv, fetchFromGitHub, cmake, ninja, automaticcomponenttoolkit
, pkg-config, libzip, gtest, openssl, libuuid, libossp_uuid }:
stdenv.mkDerivation rec {
pname = "lib3mf";
version = "2.0.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "3MFConsortium";
repo = pname;
rev = "v${version}";
sha256 = "0w4d9zvl95g1x3r5nyd6cr27g6fwhhwaivh8a5r1xs5l6if21x19";
sha256 = "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3";
};
nativeBuildInputs = [ cmake ninja ];
nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ];
outputs = [ "out" "dev" ];
cmakeFlags = [
"-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "out"}/include/lib3mf"
"-DUSE_INCLUDED_ZLIB=OFF"
"-DUSE_INCLUDED_LIBZIP=OFF"
"-DUSE_INCLUDED_GTEST=OFF"
"-DUSE_INCLUDED_SSL=OFF"
];
buildInputs = [
libzip gtest openssl
] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]);
postPatch = ''
rmdir Tests/googletest
ln -s ${gtest.src} Tests/googletest
# fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in
sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3mf.pc.in
# replace bundled binaries
for i in AutomaticComponentToolkit/bin/act.*; do
ln -sf ${automaticcomponenttoolkit}/bin/act $i
done
'';
meta = with lib; {

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

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "libquotient";
version = "0.6.5";
version = "0.6.6";
src = fetchFromGitHub {
owner = "quotient-im";
repo = "libQuotient";
rev = version;
sha256 = "sha256-TAfo4BkNHE8r32FPT2iDjddq2lk1yC9DrRGZurSO48c=";
sha256 = "sha256-QSpkcQEDTMsFbQBa7dTuL/5HraVChUHqUuJdNMty/4s=";
};
buildInputs = [ qtbase qtmultimedia ];

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

@ -7,13 +7,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mimalloc";
version = "1.6.7";
version = "2.0.0";
src = fetchFromGitHub {
owner = "microsoft";
repo = pname;
rev = "v${version}";
sha256 = "1ymffs3ixc4vkhpr09ph6xhyknm2cx8ij8j5l70cq6119mwilnwa";
sha256 = "sha256-BMDCreY41CxJaPo9BdSRZlqh/YjtPC9aI/Zxt501e+0=";
};
nativeBuildInputs = [ cmake ninja ];

4
pkgs/development/libraries/qwt/6.nix
View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
stdenv.mkDerivation rec {
name = "qwt-6.1.5";
name = "qwt-6.1.6";
src = fetchurl {
url = "mirror://sourceforge/qwt/${name}.tar.bz2";
sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0";
sha256 = "sha256-mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY=";
};
propagatedBuildInputs = [ qtbase qtsvg qttools ];

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

@ -9,13 +9,13 @@
}:
buildPythonPackage rec {
version = "3.1.0";
version = "3.2.0";
pname = "humanize";
disabled = isPy27; # setup.py no longer compatible
src = fetchPypi {
inherit pname version;
sha256 = "fd3eb915310335c63a54d4507289ecc7b3a7454cd2c22ac5086d061a3cbfd592";
sha256 = "09ph6fd1362xdn2hgwdgh30z0zqjp3bgvr1akyvm36b8jm400sdb";
};
nativeBuildInputs = [ setuptools_scm ];

50
pkgs/development/python-modules/influxdb/default.nix
View File

@ -1,23 +1,46 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, dateutil
, pytz
, six
, msgpack
, fetchFromGitHub
, fetchpatch
, mock
, msgpack
, nose
, pandas
, pytestCheckHook
, pytz
, requests
, requests-mock
, six
}:
buildPythonPackage rec {
pname = "influxdb";
version = "5.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6";
src = fetchFromGitHub {
owner = "influxdata";
repo = "influxdb-python";
rev = "v${version}";
sha256 = "1jfkf53jcf8lcq98qc0bw5d1d0yp3558mh8l2dqc9jlsm0smigjs";
};
propagatedBuildInputs = [
requests
dateutil
pytz
six
msgpack
];
checkInputs = [
pytestCheckHook
requests-mock
mock
nose
pandas
];
patches = [
(fetchpatch {
url = "https://github.com/influxdata/influxdb-python/commit/cc41e290f690c4eb67f75c98fa9f027bdb6eb16b.patch";
@ -25,14 +48,17 @@ buildPythonPackage rec {
})
];
# ImportError: No module named tests
doCheck = false;
propagatedBuildInputs = [ requests dateutil pytz six msgpack ];
disabledTests = [
# Disable failing test
"test_write_points_from_dataframe_with_tags_and_nan_json"
];
pythonImportsCheck = [ "influxdb" ];
meta = with lib; {
description = "Python client for InfluxDB";
homepage = "https://github.com/influxdb/influxdb-python";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which
, contextlib2, osxfuse
, contextlib2, macfuse-stubs, DiskArbitration
}:
buildPythonPackage rec {
@ -23,7 +23,7 @@ buildPythonPackage rec {
buildInputs =
lib.optionals stdenv.isLinux [ fuse ]
++ lib.optionals stdenv.isDarwin [ osxfuse ];
++ lib.optionals stdenv.isDarwin [ DiskArbitration macfuse-stubs ];
checkInputs = [ pytest which ] ++
lib.optionals stdenv.isLinux [ attr ];

13
pkgs/development/python-modules/simplekml/default.nix
View File

@ -1,4 +1,7 @@
{ lib , buildPythonPackage , fetchPypi }:
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "simplekml";
@ -9,11 +12,13 @@ buildPythonPackage rec {
sha256 = "17h48r1dsfz4g9xcxh1xq85h20hiz7qzzymc1gla96bj2wh4wyv5";
};
doCheck = false; # no tests are defined in 1.3.5
# no tests are defined in 1.3.5
doCheck = false;
pythonImportsCheck = [ "simplekml" ];
meta = with lib; {
description = "Generate KML with as little effort as possible";
homepage = "https://readthedocs.org/projects/simplekml/";
description = "Python package to generate KML";
homepage = "https://simplekml.readthedocs.io/";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ rvolosatovs ];
};

33
pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, lib, fetchFromGitHub, go }:
stdenv.mkDerivation rec {
pname = "AutomaticComponentToolkit";
version = "1.6.0";
src = fetchFromGitHub {
owner = "Autodesk";
repo = pname;
rev = "v${version}";
sha256 = "1r0sbw82cf9dbcj3vgnbd4sc1lklzvijic2z5wgkvs21azcm0yzh";
};
nativeBuildInputs = [ go ];
buildPhase = ''
cd Source
export HOME=/tmp
go build -o act *.go
'';
installPhase = ''
install -Dm0755 act $out/bin/act
'';
meta = with lib; {
description = "Toolkit to automatically generate software components: abstract API, implementation stubs and language bindings";
homepage = "https://github.com/Autodesk/AutomaticComponentToolkit";
license = licenses.bsd2;
maintainers = with maintainers; [ gebner ];
platforms = platforms.all;
};
}

53
pkgs/os-specific/darwin/macfuse/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ lib, stdenv, fetchurl, cpio, xar, undmg, libtapi }:
stdenv.mkDerivation rec {
pname = "macfuse-stubs";
version = "4.1.0";
src = fetchurl {
url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg";
sha256 = "118hg64w5wb95lbxw6w1hbqxrx3plcbxfjhvxx86q0zx0saa9diw";
};
nativeBuildInputs = [ cpio xar undmg libtapi ];
postUnpack = ''
xar -xf 'Install macFUSE.pkg'
cd Core.pkg
gunzip -dc Payload | cpio -i
'';
sourceRoot = ".";
buildPhase = ''
pushd usr/local/lib
for f in *.dylib; do
tapi stubify --filetype=tbd-v2 "$f" -o "''${f%%.dylib}.tbd"
done
sed -i "s|^prefix=.*|prefix=$out|" pkgconfig/fuse.pc
popd
'';
# NOTE: Keep in mind that different parts of macFUSE are distributed under a
# different license
installPhase = ''
mkdir -p $out/include $out/lib/pkgconfig
cp usr/local/lib/*.tbd $out/lib
cp usr/local/lib/pkgconfig/*.pc $out/lib/pkgconfig
cp -R usr/local/include/* $out/include
'';
meta = with lib; {
homepage = "https://osxfuse.github.io";
description = "Build time stubs for FUSE on macOS";
platforms = platforms.darwin;
maintainers = with maintainers; [ midchildan ];
# macFUSE as a whole includes code with restrictions on commercial
# redistribution. However, the build artifacts that we actually touch for
# this derivation are distributed under a free license.
license = with licenses; [
lgpl2Plus # libfuse
];
};
}

48
pkgs/os-specific/darwin/osxfuse/default.nix
View File

@ -1,48 +0,0 @@
{ lib, stdenv, runCommand, fetchFromGitHub, autoreconfHook }:
let
version = "3.8.3";
headers = runCommand "osxfuse-common-${version}" {
src = fetchFromGitHub {
owner = "osxfuse";
repo = "osxfuse";
rev = "osxfuse-${version}";
sha256 = "13lmg41zcyiajh8m42w7szkbg2is4551ryx2ia2mmzvvd23pag0z";
};
} ''
mkdir -p $out/include
cp --target-directory=$out/include $src/common/*.h
'';
in
stdenv.mkDerivation {
pname = "osxfuse";
inherit version;
src = fetchFromGitHub {
owner = "osxfuse";
repo = "fuse";
rev = "1a1977a"; # Submodule reference from osxfuse/osxfuse at tag osxfuse-${version}
sha256 = "101fw8j40ylfbbrjycnwr5qp422agyf9sfbczyb9w5ivrkds3rfw";
};
postPatch = ''
touch config.rpath
'';
postInstall = ''
ln -s osxfuse.pc $out/lib/pkgconfig/fuse.pc
'';
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ headers ];
meta = with lib; {
homepage = "https://osxfuse.github.io";
description = "C-based FUSE for macOS SDK";
platforms = platforms.darwin;
license = licenses.gpl2;
};
}

34
pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib, stdenv, kernel, fetchFromGitHub, }:
stdenv.mkDerivation rec {
pname = "mbp2018-bridge-drv";
version = "0.01";
src = fetchFromGitHub {
owner = "MCMrARM";
repo = "mbp2018-bridge-drv";
rev = "${version}";
sha256 = "0ac2l51ybfrvg8m36x67rsvgjqs1vwp7c89ssvbjkrcq3y4qdb53";
};
buildPhase = ''
make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \
-j$NIX_BUILD_CORES M=$(pwd) modules
'';
installPhase = ''
make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \
INSTALL_MOD_PATH=$out M=$(pwd) modules_install
'';
meta = with lib; {
description = "A driver for MacBook models 2018 and newer, which makes the keyboard, mouse and audio output work.";
longDescription = ''
A driver for MacBook models 2018 and newer, implementing the VHCI (required for mouse/keyboard/etc.) and audio functionality.
'';
homepage = "https://github.com/MCMrARM/mbp2018-bridge-drv";
license = lib.licenses.gpl2Only;
platforms = platforms.linux;
maintainers = [ lib.maintainers.hlolli ];
};
}

4
pkgs/servers/monitoring/munin/default.nix
View File

@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
version = "2.0.65";
version = "2.0.66";
pname = "munin";
src = fetchFromGitHub {
owner = "munin-monitoring";
repo = "munin";
rev = version;
sha256 = "0gz9kp1x39xpklq77xpm8kldsc4w87732if90w5p9pw0ip4cn6df";
sha256 = "sha256-1aikMRY1YiSQNUnYqsw1Eew9D9JHbkX+BXNCof6YK50=";
};
buildInputs = [

4
pkgs/tools/filesystems/bindfs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fuse, pkg-config, osxfuse }:
{ lib, stdenv, fetchurl, fuse, pkg-config, macfuse-stubs }:
stdenv.mkDerivation rec {
version = "1.15.1";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = if stdenv.isDarwin
then [ osxfuse ]
then [ macfuse-stubs ]
else [ fuse ];
postFixup = ''
ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs

4
pkgs/tools/filesystems/s3fs/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, osxfuse }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, macfuse-stubs }:
stdenv.mkDerivation rec {
pname = "s3fs-fuse";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ curl openssl libxml2 ]
++ lib.optionals stdenv.isLinux [ fuse ]
++ lib.optionals stdenv.isDarwin [ osxfuse ];
++ lib.optionals stdenv.isDarwin [ macfuse-stubs ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [

8
pkgs/tools/filesystems/unionfs-fuse/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, fuse, osxfuse }:
{ lib, stdenv, fetchFromGitHub, cmake, fuse, macfuse-stubs }:
stdenv.mkDerivation rec {
pname = "unionfs-fuse";
@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace '/usr/local/include/osxfuse/fuse' '${osxfuse}/include/osxfuse/fuse'
substituteInPlace src/CMakeLists.txt \
--replace 'target_link_libraries(unionfs fuse pthread)' 'target_link_libraries(unionfs osxfuse pthread)'
--replace '/usr/local/include/osxfuse/fuse' '${macfuse-stubs}/include/fuse'
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ (if stdenv.isDarwin then osxfuse else fuse) ];
buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ];
# Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
# possible to do:

4
pkgs/top-level/aliases.nix
View File

@ -460,6 +460,7 @@ mapAliases ({
openssh_with_kerberos = openssh; # added 2018-01-28
onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04
osquery = throw "osquery has been removed."; # added 2019-11-24
osxfuse = macfuse-stubs; # added 2021-03-20
otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02
owncloudclient = owncloud-client; # added 2016-08
p11_kit = p11-kit; # added 2018-02-25
@ -636,7 +637,8 @@ mapAliases ({
sambaMaster = throw "sambaMaster was removed in 2019-09-13: outdated and no longer needed";
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
saneBackends = sane-backends; # added 2016-01-02
saneBackendsGit = sane-backends-git; # added 2016-01-02
saneBackendsGit = sane-backends; # added 2016-01-02
sane-backends-git = sane-backends; # added 2021-02-19
saneFrontends = sane-frontends; # added 2016-01-02
sapic = throw "sapic was deprecated on 2019-1-19: sapic is bundled with 'tamarin-prover' now";
scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01

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

@ -11978,6 +11978,8 @@ in
astyle = callPackage ../development/tools/misc/astyle { };
automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { };
awf = callPackage ../development/tools/misc/awf { };
aws-adfs = with python3Packages; toPythonApplication aws-adfs;
@ -19402,7 +19404,9 @@ in
inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
};
osxfuse = callPackage ../os-specific/darwin/osxfuse { };
macfuse-stubs = callPackage ../os-specific/darwin/macfuse {
inherit (darwin) libtapi;
};
osxsnarf = callPackage ../os-specific/darwin/osxsnarf { };
@ -19669,6 +19673,8 @@ in
tbs = callPackage ../os-specific/linux/tbs { };
mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { };
nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { });
@ -29730,8 +29736,6 @@ in
sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {});
sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {});
senv = callPackage ../applications/misc/senv { };
brlaser = callPackage ../misc/cups/drivers/brlaser { };

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

@ -3970,6 +3970,7 @@ in {
llfuse = callPackage ../development/python-modules/llfuse {
inherit (pkgs) fuse;
inherit (pkgs.darwin.apple_sdk.frameworks) DiskArbitration;
};
llvmlite = callPackage ../development/python-modules/llvmlite {