Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar 2020-10-11 00:27:21 +02:00
commit aabcf2d8f5
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
52 changed files with 570 additions and 352 deletions

View file

@ -64,6 +64,12 @@
Python 3 now defaults to Python 3.8 instead of 3.7.
</para>
</listitem>
<listitem>
<para>
Python 3.5 has reached its upstream EOL at the end of September 2020: it
has been removed from the list of available packages.
</para>
</listitem>
<listitem>
<para>
Two new options, <link linkend="opt-services.openssh.authorizedKeysCommand">authorizedKeysCommand</link>
@ -605,8 +611,8 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
<listitem>
<para>
In addition to the hostname, the fully qualified domain name (FQDN),
which consists of <literal>${cfg.hostName}</literal> and
<literal>${cfg.domain}</literal> is now added to
which consists of <literal>${networking.hostName}</literal> and
<literal>${networking.domain}</literal> is now added to
<literal>/etc/hosts</literal>, to allow local FQDN resolution, as used by the
<literal>hostname --fqdn</literal> command and other applications that
try to determine the FQDN. These new entries take precedence over entries
@ -626,6 +632,10 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
or digit, and have as interior characters only letters, digits, and
hyphen. The maximum length is 63 characters. Additionally it is
recommended to only use lower-case characters.
If (e.g. for legacy reasons) a FQDN is required as the Linux kernel network node hostname
(<literal>uname --nodename</literal>) the option
<literal>boot.kernel.sysctl."kernel.hostname"</literal>
can be used as a workaround (but be aware of the 64 character limit).
</para>
</listitem>
<listitem>
@ -1132,8 +1142,10 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
</listitem>
<listitem>
<para>
The <literal>fontconfig</literal> module stopped generating fontconfig 2.10.x config and cache.
Fontconfig 2.10.x was removed from Nixpkgs - it hasn't been used in any nixpkgs package anymore.
The <literal>fontconfig</literal> module stopped generating config and cache files for fontconfig 2.10.x, the <filename>/etc/fonts/fonts.conf</filename> now belongs to the latest fontconfig, just like on other Linux distributions, and we will <link xlink:href="https://github.com/NixOS/nixpkgs/pull/95358">no longer</link> be versioning the config directories.
</para>
<para>
Fontconfig 2.10.x was removed from Nixpkgs since it hasnt been used in any Nixpkgs package for years now.
</para>
</listitem>
<listitem>

View file

@ -391,6 +391,10 @@ in
end with a letter or digit, and have as interior characters only
letters, digits, and hyphen. The maximum length is 63 characters.
Additionally it is recommended to only use lower-case characters.
If (e.g. for legacy reasons) a FQDN is required as the Linux kernel
network node hostname (uname --nodename) the option
boot.kernel.sysctl."kernel.hostname" can be used as a workaround (but
the 64 character limit still applies).
'';
};
@ -470,7 +474,7 @@ in
networking.search = mkOption {
default = [];
example = [ "example.com" "local.domain" ];
example = [ "example.com" "home.arpa" ];
type = types.listOf types.str;
description = ''
The list of search paths used when resolving domain names.
@ -479,7 +483,7 @@ in
networking.domain = mkOption {
default = null;
example = "home";
example = "home.arpa";
type = types.nullOr types.str;
description = ''
The domain. It can be left empty if it is auto-detected through DHCP.

View file

@ -9,9 +9,9 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
version = "4.0.1.0"; # "Android Studio 4.0.1"
build = "193.6626763";
sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j";
version = "4.0.2.0"; # "Android Studio 4.0.2"
build = "193.6821437";
sha256Hash = "sha256-v3lug8XCl4tekMBP4N1wS925FnDaSMDf6SIJhwKydzY=";
};
betaVersion = {
version = "4.1.0.18"; # "Android Studio 4.1 RC 3"

View file

@ -0,0 +1,57 @@
{ mkDerivation
, lib
, fetchFromGitLab
, qmake
, qtbase
, qtcharts
, qtsvg
, marble
, qtwebengine
, ldutils
}:
mkDerivation rec {
pname = "zombietrackergps";
version = "1.01";
src = fetchFromGitLab {
owner = "ldutils-projects";
repo = pname;
rev = "v_${version}";
sha256 = "0h354ydbahy8rpkmzh5ym5bddbl6irjzklpcg6nbkv6apry84d48";
};
buildInputs = [
ldutils
qtbase
qtcharts
qtsvg
marble.dev
qtwebengine
];
nativeBuildInputs = [
qmake
];
prePatch = ''
sed -ie "s,INCLUDEPATH += /usr/include/libldutils,INCLUDEPATH += ${ldutils}," ZombieTrackerGPS.pro
'';
preConfigure = ''
export LANG=en_US.UTF-8
export INSTALL_ROOT=$out
'';
postConfigure = ''
substituteInPlace Makefile --replace '$(INSTALL_ROOT)' ""
'';
meta = with lib; {
description = "GPS track manager for Qt using KDE Marble maps";
homepage = "https://gitlab.com/ldutils-projects/zombietrackergps";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ sohalt ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitLab, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }:
stdenv.mkDerivation rec {
pname = "f3d";
version = "1.0.1";
src = fetchFromGitLab {
domain = "gitlab.kitware.com";
owner = "f3d";
repo = "f3d";
rev = "v${version}";
sha256 = "0a6r0jspkhl735f6zmnhby1g4dlmjqd5izgsp5yfdcdhqj4j63mg";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ vtk_9 ]
++ stdenv.lib.optionals stdenv.isLinux [ libGL libX11 ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
meta = with stdenv.lib; {
description = "Fast and minimalist 3D viewer using VTK";
homepage = "https://kitware.github.io/F3D";
license = licenses.bsd3;
maintainers = with maintainers; [ bcdarwin ];
platforms = with platforms; unix;
};
}

View file

@ -7,24 +7,24 @@ let
bgrabitmap = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgrabitmap";
rev = "v11.1";
sha256 = "0bcmiiwly4a7w8p3m5iskzvk8rz87qhc0gcijrdvwg87cafd88gz";
rev = "v11.2.4";
sha256 = "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md";
};
bgracontrols = fetchFromGitHub {
owner = "bgrabitmap";
repo = "bgracontrols";
rev = "v6.7.2";
sha256 = "0cwxzv0rl6crkf6f67mvga5cn5pyhr6ksm8cqhpxjiqi937dnyxx";
rev = "v6.9";
sha256 = "0hwjlqlwqs4fqxlgay84hccs1lm3c6i9nmq9sxzrip410mggnjyw";
};
in stdenv.mkDerivation rec {
pname = "lazpaint";
version = "7.1.3";
version = "7.1.4";
src = fetchFromGitHub {
owner = "bgrabitmap";
repo = "lazpaint";
rev = "v${version}";
sha256 = "1sfb5hmhzscz3nv4cmc192jimkg70l4z3q3yxkivhw1hwwsv9cbg";
sha256 = "19b0wrjjyvz3g2d2gdsz8ihc1clda5v22yb597an8j9sblp9m0nf";
};
nativeBuildInputs = [ lazarus fpc makeWrapper ];

View file

@ -161,11 +161,10 @@ let
#
# ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
]; # TODO: VA-API patches (we should be able to drop enable-video-acceleration-on-linux.patch now):
# ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build:
# ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
# ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
# ];
] ++ optionals (useVaapi) [
# Check for enable-accelerated-video-decode on Linux:
(githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d")
];
postPatch = ''
# Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.):

View file

@ -15,7 +15,7 @@
, enablePepperFlash ? false
, enableWideVine ? false
, useVaapi ? false # Deprecated, use enableVaapi instead!
, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon
, enableVaapi ? false # Disabled by default due to unofficial support
, useOzone ? false
, cupsSupport ? true
, pulseSupport ? config.pulseaudio or stdenv.isLinux
@ -152,8 +152,8 @@ let
Chromium's useVaapi was replaced by enableVaapi and you don't need to pass
"--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore).
'' else lib.optionalString
(!enableVaapi)
"--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode";
(enableVaapi)
"--add-flags --enable-accelerated-video-decode";
in stdenv.mkDerivation {
name = "chromium${suffix}-${version}";
inherit version;

View file

@ -1,65 +0,0 @@
--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
// |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
// internal decoded frame.
if (buffer_allocation_mode_ != BufferAllocationMode::kNone &&
+ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau &&
!vpp_vaapi_wrapper_) {
vpp_vaapi_wrapper_ = VaapiWrapper::Create(
VaapiWrapper::kVideoProcess, VAProfileNone,
@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
PictureBuffer buffer = buffers[i];
buffer.set_size(requested_pic_size_);
std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
- (buffer_allocation_mode_ == BufferAllocationMode::kNone)
+ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) ||
+ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau))
? vaapi_wrapper_
: vpp_vaapi_wrapper_,
make_context_current_cb_, bind_image_cb_, buffer);
@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
VaapiVideoDecodeAccelerator::BufferAllocationMode
VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
+ // NVIDIA blobs use VDPAU
+ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) {
+ LOG(INFO) << "VA-API driver on VDPAU backend";
+ return BufferAllocationMode::kWrapVdpau;
+ }
+
// TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
// |output_mode_| as well.
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h
+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
// Using |client_|s provided PictureBuffers and as many internally
// allocated.
kNormal,
+ kWrapVdpau,
};
// Decides the concrete buffer allocation mode, depending on the hardware
--- a/media/gpu/vaapi/vaapi_wrapper.cc
+++ b/media/gpu/vaapi/vaapi_wrapper.cc
@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType(
} else if (base::StartsWith(va_vendor_string, "Intel iHD driver",
base::CompareCase::SENSITIVE)) {
return media::VAImplementation::kIntelIHD;
+ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU",
+ base::CompareCase::SENSITIVE)) {
+ return media::VAImplementation::kNVIDIAVDPAU;
}
return media::VAImplementation::kOther;
}
--- a/media/gpu/vaapi/vaapi_wrapper.h
+++ b/media/gpu/vaapi/vaapi_wrapper.h
@@ -79,6 +79,7 @@ enum class VAImplementation {
kIntelIHD,
kOther,
kInvalid,
+ kNVIDIAVDPAU,
};
// This class handles VA-API calls and ensures proper locking of VA-API calls

View file

@ -1,48 +0,0 @@
From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 14 Apr 2020 14:16:10 +0200
Subject: [PATCH] Enable accelerated video decode on Linux
This will enable accelerated video decode on Linux by default (i.e.
without "--ignore-gpu-blacklist"), but on NixOS we'll provide
"--disable-accelerated-video-decode" and
"--disable-accelerated-video-encode" by default to avoid regressions
(e.g. VA-API doesn't work properly for some radeon drivers).
Video acceleration can then be enabled via:
chromium.override { enableVaapi = true; }
without rebuilding Chromium.
---
gpu/config/software_rendering_list.json | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
index 22712bdbf38f..a06dd19a50e4 100644
--- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json
@@ -336,22 +336,6 @@
]
},
{
- "id": 48,
- "description": "Accelerated video decode is unavailable on Linux",
- "cr_bugs": [137247, 1032907],
- "os": {
- "type": "linux"
- },
- "exceptions": [
- {
- "machine_model_name": ["Chromecast"]
- }
- ],
- "features": [
- "accelerated_video_decode"
- ]
- },
- {
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
--
2.11.0

View file

@ -1,34 +0,0 @@
# Generated by debian-patches.sh from debian-patches.txt
let
prefix = "https://sources.debian.org/data/main/e/elinks/0.13.2-1/debian/patches";
in
[
{
url = "${prefix}/03_459467_ui.leds.enable_0.diff";
sha256 = "0l35lglmnvyzz3xyy18nksra14gsp7yc67rskbzmr61szg8b9jqr";
}
{
url = "${prefix}/04_436817_nostrip.diff";
sha256 = "0ixvxaba1ww375gpdh7r67srp3xsfb5vyz2sfv1pgj6mczwg8v24";
}
{
url = "${prefix}/07_617713_cache_control.diff";
sha256 = "0drn4r33ywvmihr0drsp2jwz7mlf5z5fv8ra7fpkdavx45xqaf15";
}
{
url = "${prefix}/10-reproducible-build.diff";
sha256 = "024yp3xsh0hw29l1wikfmk9j3mqval6pdr4xi7rzffrlaknh58h5";
}
{
url = "${prefix}/14_debug_disable_Werror.diff";
sha256 = "0s620r88ikfljflb5nd133cww2wc0i85ag8lzpvrsmg0q00hfmax";
}
{
url = "${prefix}/16_POST_BUFFER_SIZE.diff";
sha256 = "17vkvy0d0rabmgk8iqwgdsrgjn6dbb9cf6760qbz82zlb37s09nh";
}
{
url = "${prefix}/11-reproducible-build.diff";
sha256 = "1z17g9z68lh12fs6fkralfghh8bs1bs5mlq83d15l4bn3za3s0sl";
}
]

View file

@ -1,8 +0,0 @@
elinks/0.13.2-1
03_459467_ui.leds.enable_0.diff
04_436817_nostrip.diff
07_617713_cache_control.diff
10-reproducible-build.diff
14_debug_disable_Werror.diff
16_POST_BUFFER_SIZE.diff
11-reproducible-build.diff

View file

@ -1,42 +1,38 @@
{ stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib, brotli, openssl, autoconf, automake, gettext, pkgconfig, libev
, gpm
{ stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib
, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkgconfig, libev
, gpm, libidn, tre, expat
, # Incompatible licenses, LGPLv3 - GPLv2
enableGuile ? false, guile ? null
, enablePython ? false, python ? null
, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_38 ? null
# re-add javascript support when upstream supports modern spidermonkey
}:
assert enableGuile -> guile != null;
assert enablePython -> python != null;
stdenv.mkDerivation rec {
pname = "elinks-0.13.2";
version = "0.13.2";
pname = "elinks";
version = "0.13.5";
src = fetchurl {
url = "https://deb.debian.org/debian/pool/main/e/elinks/elinks_${version}.orig.tar.gz";
sha256 = "0xkpqnqy0x8sizx4snca0pw3q98gkhnw5a05yf144j1x1y2nb14c";
src = fetchFromGitHub {
owner = "rkd77";
repo = "felinks";
rev = "v${version}";
sha256 = "067l9m47j40039q8mvvnxd1amwrac3x6vv0c0svimfpvj4ammgkg";
};
patches = map fetchurl (import ./debian-patches.nix);
postPatch = (stdenv.lib.optional stdenv.isDarwin) ''
patch -p0 < ${fetchpatch {
url = "https://raw.githubusercontent.com/macports/macports-ports/72bed7749e76b9092ddd8d9fe2d8449c5afb1d71/www/elinks/files/patch-perl.diff";
sha256 = "14q9hk3kg2n2r5b062hvrladp7b4yzysvhq07903w9kpg4zdbyqh";
}}
'';
buildInputs = [ ncurses xlibsWrapper bzip2 zlib brotli openssl libev ]
buildInputs = [
ncurses xlibsWrapper bzip2 zlib brotli zstd lzma
openssl libidn tre expat libev
]
++ stdenv.lib.optional stdenv.isLinux gpm
++ stdenv.lib.optional enableGuile guile
++ stdenv.lib.optional enablePython python
++ stdenv.lib.optional enablePerl perl
++ stdenv.lib.optional enableSpidermonkey spidermonkey_38
;
nativeBuildInputs = [ autoconf automake gettext pkgconfig ];
nativeBuildInputs = [ autoreconfHook gettext pkgconfig ];
configureFlags = [
"--enable-finger"
@ -46,23 +42,20 @@ stdenv.mkDerivation rec {
"--enable-bittorrent"
"--enable-nntp"
"--enable-256-colors"
"--enable-true-color"
"--with-lzma"
"--with-libev"
"--with-terminfo"
] ++ stdenv.lib.optional enableGuile "--with-guile"
++ stdenv.lib.optional enablePython "--with-python"
++ stdenv.lib.optional enablePerl "--with-perl"
++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_38}"
;
preConfigure = ''
patchShebangs ./autogen.sh
./autogen.sh
'';
meta = with stdenv.lib; {
description = "Full-featured text-mode web browser (package based on the fork felinks)";
homepage = "https://github.com/rkd77/felinks";
license = licenses.gpl2;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ iblech ];
maintainers = with maintainers; [ iblech gebner ];
};
}

View file

@ -4,11 +4,11 @@
}:
mkDerivation rec {
pname = "hpmyroom";
version = "12.0.0.0220";
version = "12.1.1.0257";
src = fetchurl {
url = "https://www.myroom.hpe.com/downloadfiles/${pname}-${version}.x86_64.rpm";
sha256 = "0gajj2s6l7jj8520agrv2dyisg7hhacbwzqlsp9a0xdxr0v71jhr";
sha256 = "1xm41v324zq1x5awgb7fr238f7ml7vq6jrfh84358i5shgha1g2k";
};
nativeBuildInputs = [

View file

@ -3,18 +3,18 @@
}:
let
version = "0.7.6";
version = "0.7.7";
in stdenv.mkDerivation rec {
pname = "rambox";
inherit version;
src = {
x86_64-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb";
sha256 = "1v9l5nfd25mq448457hg0mj5bzylh0krk411kbr73s7lbaaww1jl";
sha256 = "0bij4f1bkg94gc8pq7r6yfym5zcvwc2ymdnmnmh5m4h1pa1gk6x9";
};
i686-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb";
sha256 = "0zhn5hnpl6fpgshp1vwghq6f1hz3f7gds7rjnhky1352cb6cr89i";
sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd51rfs";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");

View file

@ -1,23 +1,51 @@
{ lib, stdenv, fetchFromGitLab, cmake, libGLU, libGL, zlib, wxGTK
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages
{ lib
, stdenv
, fetchFromGitLab
, cmake
, libGLU
, libGL
, zlib
, wxGTK
, libX11
, gettext
, glew
, glm
, cairo
, curl
, openssl
, boost
, pkgconfig
, doxygen
, pcre
, libpthreadstubs
, libXdmcp
, fetchpatch
, lndir
, callPackages
, stable ? true
, baseName ? "kicad"
, versions ? { }
, oceSupport ? false, opencascade
, withOCCT ? true, opencascade-occt
, ngspiceSupport ? true, libngspice
, scriptingSupport ? true, swig, python, wxPython
, debug ? false, valgrind
, oceSupport ? false
, opencascade
, withOCCT ? true
, opencascade-occt
, ngspiceSupport ? true
, libngspice
, scriptingSupport ? true
, swig
, python
, wxPython
, debug ? false
, valgrind
, withI18n ? true
, gtk3
}:
assert ngspiceSupport -> libngspice != null;
with lib;
let
versionConfig = versions.${baseName};
# oce on aarch64 fails a test
@ -95,8 +123,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen pkgconfig lndir ];
buildInputs = [
libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext
glew glm libpthreadstubs cairo curl openssl boost
libGLU
libGL
zlib
libX11
wxGTK
pcre
libXdmcp
gettext
glew
glm
libpthreadstubs
cairo
curl
openssl
boost
gtk3
]
++ optionals (scriptingSupport) [ swig python wxPython ]
++ optional (ngspiceSupport) libngspice

View file

@ -58,7 +58,6 @@ file="${here}/versions.nix"
# just in case this runs in parallel
tmp="${here}/,versions.nix.${RANDOM}"
# libraries currently on github, move to $gitlab/libraries planned
libs=( symbols templates footprints packages3d )
get_rev="git ls-remote --heads --tags"
@ -67,9 +66,6 @@ gitlab="https://gitlab.com/kicad"
# append commit hash or tag
gitlab_pre="https://gitlab.com/api/v4/projects/kicad%2Fcode%2Fkicad/repository/archive.tar.gz?sha="
# append "-$lib/archive/[hash or tag].tar.gz
github="https://github.com/kicad/kicad"
# not a lib, but separate and already moved to gitlab
i18n="${gitlab}/code/kicad-i18n.git"
i18n_pre="https://gitlab.com/api/v4/projects/kicad%2Fcode%2Fkicad-i18n/repository/archive.tar.gz?sha="
@ -147,8 +143,8 @@ for version in "${all_versions[@]}"; do
for lib in "${libs[@]}"; do
echo "Checking ${lib}" >&2
url="${github}-${lib}.git"
lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1)"
url="${gitlab}/libraries/kicad-${lib}.git"
lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | head -n1)"
has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)"
has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")"
if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
@ -161,7 +157,7 @@ for version in "${all_versions[@]}"; do
esac
printf "\"%s\";\n" "${lib_rev}"
printf "%8s%s.sha256 =\t\"%s\";\n" "" \
"${lib}" "$(${prefetch} "${github}-${lib}/archive/${lib_rev}.tar.gz")"
"${lib}" "$(${prefetch} "https://gitlab.com/api/v4/projects/kicad%2Flibraries%2Fkicad-${lib}/repository/archive.tar.gz?sha=${lib_rev}")"
count=$((count+1))
fi
done
@ -172,7 +168,7 @@ for version in "${all_versions[@]}"; do
printf "\nReusing old %s\n" "${pname}" >&2
grep -sm 1 "\"${pname}\"" -A 23 "${file}"
fi
done
done
printf "}\n"
} > "${tmp}"

View file

@ -3,49 +3,49 @@
{
"kicad" = {
kicadVersion = {
version = "5.1.6";
version = "5.1.6";
src = {
rev = "c6e7f7de7df655fd59b57823499efc443009de6b";
sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622";
rev = "c6e7f7de7df655fd59b57823499efc443009de6b";
sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622";
};
};
libVersion = {
version = "5.1.6";
version = "5.1.6";
libSources = {
i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd";
i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha";
symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708";
symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6";
templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9";
templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";
footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332";
footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx";
packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c";
packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1";
i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd";
i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha";
symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708";
symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6";
templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9";
templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";
footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332";
footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx";
packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c";
packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1";
};
};
};
"kicad-unstable" = {
kicadVersion = {
version = "2020-08-22";
version = "2020-10-09";
src = {
rev = "a2341f0f335b0abb9fc8cb86d19cbe6f9b38fade";
sha256 = "0167yb39f800xarq3khn7sbdkgcx9j2ayhy8c7lhhks6kh7459g0";
rev = "560428a70f0196fb4ade620042c5ddefc1685ebe";
sha256 = "0rzn83bpl06v1d49lcvwfg93nirn684bqqq536zxhmjm0ayx29ka";
};
};
libVersion = {
version = "2020-08-22";
version = "2020-10-09";
libSources = {
i18n.rev = "cbbb1efd940094bf0c3168280698b2b059a8c509";
i18n.sha256 = "1q4jakn6m8smnr2mg7jgb520nrb6fag9mdvlcpx3smp3qbxka818";
symbols.rev = "9ca6a5348cdeb88e699582d4ed051ff7303b44d3";
symbols.sha256 = "13w6pb34rhz96rnar25z7kiscy6q1fm8l39hq1bpb8g9yn86ssz4";
templates.rev = "ae16953b81055855bcede4a33305413599d86a15";
templates.sha256 = "1pkv90p3liy3bj4nklxsvpzh9m56p0k5ldr22armvgqfaqaadx9v";
footprints.rev = "f94c2d5d619d16033f69a555b449f59604d97865";
footprints.sha256 = "1g71sk77jvqaf9xvgq6dkyvd9pij2lb4n0bn0dqnwddhwam935db";
packages3d.rev = "f699b0e3c13fe75618086913e39279c85da14cc7";
packages3d.sha256 = "0m5rb5axa946v729z35ga84in76y4zpk32qzi0hwqx957zy72hs9";
i18n.rev = "d24af2da8cab4ce1081c401909a4a880514e5549";
i18n.sha256 = "0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf";
symbols.rev = "9c50f4333bafc5a1abf7786436db5ffb6a66758d";
symbols.sha256 = "06ic59svz0256isy93863i5ay4k8wshvp1kspnqrc776wmq03l3k";
templates.rev = "41eae4ccd3ac02fdb969e3aa272c07ab51dcf5af";
templates.sha256 = "0xxfkpsgbnafmpaxpz1747zn7fhqp0kfl32rzjrx4vzxyp25q805";
footprints.rev = "50015af7e603cc499199c7e1c6daa7c85dd732ae";
footprints.sha256 = "16bic67klbj7sgj7cab8ha2fg3ypp9ap82gxkn6ijvpl7dka8bhb";
packages3d.rev = "df0dc0074491bb665b2c3ce569cbd4aa16118ad6";
packages3d.sha256 = "027jlcp9fpryldjkcxhb1b5bpwqna9kl6r0lnkd86x238kj3rd8v";
};
};
};

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-trim";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "foriequal0";
repo = pname;
rev = "v${version}";
sha256 = "079kavm3n776wvmy25jq1g4qdvmhh3d3x1vdpb1f6pw5rkky8lyw";
sha256 = "0w6qrr53wal4p4jvz35f9mpqwz1vfcymj17sz418n9p9lw45f24n";
};
cargoSha256 = "1ii5l7z9avg0gzlaav2gnfbr8wkbp008i5rz6k6bs2sfqnpnn5k6";
cargoSha256 = "1mlvkvgcln59bi249z87v8i0ixq1a7walkzsjml6d219rmy5550h";
nativeBuildInputs = [ pkg-config ];

View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig
, qtbase, qtmultimedia, qtsvg, qttools, krdc
, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol
, libselinux, libsepol, utillinux
@ -20,6 +20,15 @@ mkDerivation rec {
"-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5"
];
patches = [
(fetchpatch {
# Maintainer note: Check whether this patch is still needed when a new version is released
name = "krdc-variable-name-changes.patch";
url = "https://github.com/fadenb/qt-virt-manager/commit/4640f5f64534ed7c8a1ecc6851f1c7503988de6d.patch";
sha256 = "1chl58nra1mj96n8jmnjbsyr6vlwkhn38afhwqsbr0bgyg23781v";
})
];
buildInputs = [
qtbase qtmultimedia qtsvg krdc
libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol

View file

@ -0,0 +1,46 @@
{ stdenv
, fetchFromGitHub
, gdk-pixbuf
, gtk-engine-murrine
, gtk_engines
, librsvg
}:
stdenv.mkDerivation rec {
pname = "marwaita-pop_os";
version = "0.9";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "1fpzsch9rpq7dmg01ny7jc2vd6dks0fqxxp2rb9jcs0vx5d2fdc6";
};
buildInputs = [
gdk-pixbuf
gtk_engines
librsvg
];
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
cp -a Marwaita* $out/share/themes
runHook postInstall
'';
meta = with stdenv.lib; {
description = "Marwaita GTK theme with Pop_os Linux style";
homepage = "https://www.pling.com/p/1377894/";
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
}

View file

@ -0,0 +1,46 @@
{ stdenv
, fetchFromGitHub
, gdk-pixbuf
, gtk-engine-murrine
, gtk_engines
, librsvg
}:
stdenv.mkDerivation rec {
pname = "skeu";
version = "0.5.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "0lbl09p0h493ya978fh7cib68qlmxfxahmbj0mpa3b65ynxda645";
};
buildInputs = [
gdk-pixbuf
gtk_engines
librsvg
];
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
cp -a Skeu* $out/share/themes
runHook postInstall
'';
meta = with stdenv.lib; {
description = "GTK theme with skeuomorphism design";
homepage = "https://www.pling.com/p/1363834/";
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
}

View file

@ -13,6 +13,8 @@ let
sha256 = "0bb3a7x7vzmdyhm4nilm8bcn4q50pwqryggnxz21n16v6xakwjmr";
};
enableParallelBuilding = true;
nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
buildInputs = [ libck ];
@ -31,6 +33,8 @@ stdenv.mkDerivation {
sha256 = "1vb4yaprs2bwbxmxx2zkqvysxx8r9qww2q1nqkz8yps3ji715jw7";
};
enableParallelBuilding = true;
nativeBuildInputs = [ bootstrap ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];

View file

@ -2,12 +2,12 @@
, enablePython ? false, python ? null, swig ? null}:
stdenv.mkDerivation rec {
version = "3.0.7";
version = "3.0.8";
pname = "gdcm";
src = fetchurl {
url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
sha256 = "1mm1190fv059k2vrilh3znm8z1ilygwld1iazdgh5s04mi1qljni";
sha256 = "1q9p0r7wszn51yak9wdp61fd9i0wj3f8ja2frmhk7d1gxic7j1rk";
};
dontUseCmakeBuildDir = true;

View file

@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null;
with stdenv.lib;
let
version = "2.2.0";
version = "2.3.0";
versmm = versions.major version + "." + versions.minor version;
name = "hwloc-${version}";
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
sha256 = "0li27a3lnmb77qxpijj0kpblz32wmqd3b386sypq8ar7vy9vhw5f";
sha256 = "0r4a07ag1fv48ql2g64px0wrjpxlvkh6c7mhnkv9xxkkg04zc1xn";
};
configureFlags = [

View file

@ -0,0 +1,41 @@
{ mkDerivation
, lib
, fetchFromGitLab
, qtbase
, qtcharts
, qtsvg
, qmake
}:
mkDerivation rec {
pname = "ldutils";
version = "1.01";
src = fetchFromGitLab {
owner = "ldutils-projects";
repo = pname;
rev = "v_${version}";
sha256 = "09k2d5wj70xfr3sb4s9ajczq0lh65705pggs54zqqqjxazivbmgk";
};
buildInputs = [
qtbase
qtcharts
qtsvg
];
nativeBuildInputs = [
qmake
];
LDUTILS_LIB=placeholder "out";
LDUTILS_INCLUDE=placeholder "out";
meta = with lib; {
description = "Headers and link library for other ldutils projects";
homepage = "https://gitlab.com/ldutils-projects/ldutils";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ sohalt ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,60 @@
{ stdenv
, fetchFromGitHub
, libaom
, cmake
, pkg-config
, zlib
, libpng
, libjpeg
, dav1d
}:
stdenv.mkDerivation rec {
pname = "libavif";
version = "0.8.1";
src = fetchFromGitHub {
owner = "AOMediaCodec";
repo = pname;
rev = "v${version}";
sha256 = "1fs222cn1d60pv5fjsr92axk5dival70b6yqw0wng5ikk9zsdkhy";
};
# reco: encode libaom slowest but best, decode dav1d fastest
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DAVIF_CODEC_AOM=ON"
"-DAVIF_CODEC_DAV1D=ON"
"-DAVIF_BUILD_APPS=ON"
];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
libaom
zlib
libpng
libjpeg
dav1d
];
meta = with stdenv.lib; {
description = "C implementation of the AV1 Image File Format";
longDescription = ''
Libavif aims to be a friendly, portable C implementation of the
AV1 Image File Format. It is a work-in-progress, but can already
encode and decode all AOM supported YUV formats and bit depths
(with alpha). It also features an encoder and a decoder
(avifenc/avifdec).
'';
homepage = "https://github.com/AOMediaCodec/libavif";
changelog = "https://github.com/AOMediaCodec/libavif/blob/v${version}/CHANGELOG.md";
maintainers = with maintainers; [ mkg20001 ];
platforms = platforms.all;
license = licenses.bsd2;
};
}

View file

@ -4,18 +4,18 @@
, cmake
, blas
# Check Inputs
, python2
, python
}:
stdenv.mkDerivation rec {
pname = "libcint";
version = "3.1.1";
version = "4.0.2";
src = fetchFromGitHub {
owner = "sunqm";
repo = "libcint";
rev = "v${version}";
sha256 = "0z1gavi7aacx68fmyzy90vzv5kff844lnxc6habs6y377dr3rwwy";
sha256 = "0j8fkkp3vb1936qy80sc08c327b47qxh0x2aadd1225jjq6xqxmn";
};
nativeBuildInputs = [ cmake ];
@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
];
doCheck = true;
# Test syntax (like print statements) is written in python2. Fixed when #33 merged: https://github.com/sunqm/libcint/pull/33
checkInputs = [ python2.pkgs.numpy ];
checkInputs = [ python.pkgs.numpy ];
meta = with lib; {
description = "General GTO integrals for quantum chemistry";
@ -39,6 +38,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://wiki.sunqm.net/libcint";
downloadPage = "https://github.com/sunqm/libcint";
changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog";
license = licenses.bsd2;
maintainers = with maintainers; [ drewrisinger ];
};

View file

@ -3,7 +3,7 @@
, isPy27
, fetchFromGitHub
, fetchpatch
, pytest
, pytestCheckHook
, unittest2
, future
, numpy
@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "batchgenerators";
version = "0.20.0";
version = "0.20.1";
disabled = isPy27;
@ -24,11 +24,12 @@ buildPythonPackage rec {
owner = "MIC-DKFZ";
repo = pname;
rev = "v${version}";
sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf";
sha256 = "1f91yflv9rschyl5bnfn735hp1rxrzcxkx18aajmlzb067h0ip8m";
};
patches = [
# lift Pillow bound; should be merged in next release
(fetchpatch {
url = "https://github.com/MIC-DKFZ/batchgenerators/pull/59.patch";
sha256 = "171b3dm40yn0wi91m9s2nq3j565s1w39jpdf1mvc03rn75i8vdp0";
@ -39,9 +40,7 @@ buildPythonPackage rec {
future numpy pillow scipy scikitlearn scikitimage threadpoolctl
];
checkInputs = [ pytest unittest2 ];
checkPhase = "pytest tests";
checkInputs = [ pytestCheckHook unittest2 ];
meta = {
description = "2D and 3D image data augmentation for deep learning";

View file

@ -1,5 +1,5 @@
{ buildPythonPackage
, fetchFromGitHub
, fetchPypi
, pytest
, six
, tqdm
@ -19,14 +19,11 @@
buildPythonPackage rec {
pname = "internetarchive";
version = "1.9.4";
version = "1.9.5";
# Can't use pypi, data files for tests missing
src = fetchFromGitHub {
owner = "jjjake";
repo = "internetarchive";
rev = "v${version}";
sha256 = "10xlblj21hanahsmw6lfggbrbpw08pdmvdgds1p58l8xd4fazli8";
src = fetchPypi {
inherit pname version;
sha256 = "759053685c75e6e969d690043b82643c4016500abcbbc44e4daf52ec097a9a15";
};
propagatedBuildInputs = [
@ -50,6 +47,8 @@ buildPythonPackage rec {
LC_ALL=en_US.utf-8 pytest tests
'';
pythonImportsCheck = [ "internetarchive" ];
meta = with lib; {
description = "A Python and Command-Line Interface to Archive.org";
homepage = "https://github.com/jjjake/internetarchive";

View file

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "mocket";
version = "3.9.0";
version = "3.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "1n1h9xbi1my0vgjsh7mfkd51qfa6imjzxnwqccsvshqa8grcv1wm";
sha256 = "1bp6642qh8fkjqgvp1vif2zbzpappbbq3sgs7vfr87inn4frc2cz";
};
patchPhase = ''

View file

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "PyMetno";
version = "0.5.1";
version = "0.8.1";
src = fetchFromGitHub {
repo = pname;
owner = "Danielhiversen";
rev = version;
sha256 = "1ihq1lzgzcxbg916izakx9jp0kp1vdrcdwcwwwsws838wc08ax6m";
sha256 = "1jngf0mbn5hn166pqh1ga5snwwvv7n5kv1k9kaksrfibixkvpw6h";
};
propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ];

View file

@ -1,5 +1,6 @@
{ stdenv
, buildPythonPackage
, isPy3k
, fetchPypi
, pep8
}:
@ -8,6 +9,8 @@ buildPythonPackage rec {
pname = "shortuuid";
version = "1.0.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "3c11d2007b915c43bee3e10625f068d8a349e04f0d81f08f5fa08507427ebf1f";

View file

@ -3,7 +3,7 @@
, isPy27
, fetchFromGitHub
, flit
, pytest
, pytestCheckHook
, pytestcov
, numpy
, scipy
@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "threadpoolctl";
version = "2.0.0";
version = "2.1.0";
disabled = isPy27;
format = "flit";
@ -20,13 +20,10 @@ buildPythonPackage rec {
owner = "joblib";
repo = pname;
rev = version;
sha256 = "16z4n82f004i4l1jw6qrzazda1m6v2yjnpqlp71ipa8mzy9kw7dw";
sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df";
};
checkInputs = [ pytest pytestcov numpy scipy ];
checkPhase = "pytest tests -k 'not test_nested_prange_blas'";
# cython doesn't get run on the tests when added to nativeBuildInputs, breaking this test
checkInputs = [ pytestCheckHook pytestcov numpy scipy ];
meta = with lib; {
homepage = "https://github.com/joblib/threadpoolctl";

View file

@ -7,7 +7,7 @@
# updater
, python27, python3, writeScript
# Apple dependencies
, cctools, libcxx, CoreFoundation, CoreServices, Foundation
, cctools, llvmPackages_8, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
, buildJdk, runJdk
, buildJdkName
@ -139,8 +139,10 @@ let
'';
};
stdenv' = if stdenv.isDarwin then llvmPackages_8.libcxxStdenv else stdenv;
in
stdenv.mkDerivation rec {
stdenv'.mkDerivation rec {
pname = "bazel";
inherit version;
@ -348,10 +350,10 @@ stdenv.mkDerivation rec {
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${llvmPackages_8.libcxx}/include/c++/v1"
# don't use system installed Xcode to run clang, use Nix clang instead
sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
sed -i -E "s;/usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9;${stdenv'.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
scripts/bootstrap/compile.sh \
src/tools/xcode/realpath/BUILD \
src/tools/xcode/stdredirect/BUILD \
@ -380,7 +382,7 @@ stdenv.mkDerivation rec {
substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|' \
sed -i 's|/sbin/md5|md5sum|g' \
src/BUILD
# substituteInPlace is rather slow, so prefilter the files with grep
@ -417,8 +419,8 @@ stdenv.mkDerivation rec {
fetch --distdir=${distDir}
build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')"
build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')"
build --linkopt="$(echo $(< ${stdenv'.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')"
build --host_linkopt="$(echo $(< ${stdenv'.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')"
build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
build --host_javabase='@local_jdk//:jdk'
@ -428,8 +430,8 @@ stdenv.mkDerivation rec {
# add the same environment vars to compile.sh
sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv'.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv'.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \
-e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
-e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
-e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
@ -469,7 +471,7 @@ stdenv.mkDerivation rec {
makeWrapper
which
customBash
] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
] ++ lib.optionals (stdenv.isDarwin) [ cctools CoreFoundation CoreServices Foundation ];
# Bazel makes extensive use of symlinks in the WORKSPACE.
# This causes problems with infinite symlinks if the build output is in the same location as the

View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper }:
{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper, fetchpatch }:
crystal.buildCrystalPackage rec {
pname = "oq";
@ -11,6 +11,15 @@ crystal.buildCrystalPackage rec {
sha256 = "1zg4kxpfi3sap4cwp42zg46j5dv0nf926qdqm7k22ncm6jdrgpgw";
};
patches = [
(fetchpatch {
# remove once we have upgraded to oq 1.1.2+
name = "yaml-test-leniency.patch";
url = "https://github.com/Blacksmoke16/oq/commit/93ed2fe50c9ce3fd8d35427e007790ddaaafce60.patch";
sha256 = "1iyz0c0w0ykz268bkrlqwvh1jnnrja0mqip6y89sbpa14lp0l37n";
})
];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jq libxml2 ];
@ -32,6 +41,6 @@ crystal.buildCrystalPackage rec {
homepage = "https://blacksmoke16.github.io/oq/";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View file

@ -1,6 +1,6 @@
{
lib, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules,
zlib, boost, libunwind, elfutils, sparsehash,
zlib, boost, libunwind, elfutils, sparsehash, zstd,
qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram
}:
@ -17,7 +17,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [
zlib boost libunwind elfutils sparsehash
zlib boost libunwind elfutils sparsehash zstd
qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram
];

View file

@ -16,21 +16,19 @@
mkDerivation rec {
pname = "ppsspp";
version = "1.9.4";
version = "1.10.3";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0ivi0dcfxwa4nz19amki80qacnjhqr42f0ihyby1scxafl3nq55c";
sha256 = "sha256-W41Poq5S+opkasIGYo13SQZWQF1HjfFnH7u9DW5HNA0=";
};
postPatch = ''
substituteInPlace git-version.cmake \
--replace unknown ${src.rev}
substituteInPlace UI/NativeApp.cpp \
--replace /usr/share $out/share
substituteInPlace git-version.cmake --replace unknown ${src.rev}
substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share
'';
nativeBuildInputs = [ cmake pkgconfig python3 ];
@ -52,6 +50,7 @@ mkDerivation rec {
"-DUSE_SYSTEM_LIBZIP=ON"
"-DUSE_SYSTEM_SNAPPY=ON"
"-DUSING_QT_UI=ON"
"-DHEADLESS=OFF"
];
installPhase = ''
@ -61,9 +60,11 @@ mkDerivation rec {
'';
meta = with lib; {
description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++";
description = "A HLE Playstation Portable emulator, written in C++";
homepage = "https://www.ppsspp.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
}
# TODO: add SDL headless port

View file

@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "stella";
version = "6.2.1";
version = "6.3";
src = fetchFromGitHub {
owner = "stella-emu";
repo = "stella";
rev = version;
sha256 = "1yhszswwg217x8d2qlcasi9l97y1z6w1pgliys4p27zv5b1ygy7p";
sha256 = "0a687qdd1qxdz2wzx557vgylv4c37cpypz2gr7p432rgymmzdcg6";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -60,10 +60,6 @@ in stdenv.mkDerivation rec {
# ./fuse3-install_man.patch)
install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1
install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8
# TODO: Temporary version fix:
substituteInPlace meson.build \
--replace "version: '3.9.3'" "version: '${version}'"
'' else ''
sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
./makeconf.sh

View file

@ -11,7 +11,7 @@ in {
};
fuse_3 = mkFuse {
version = "3.9.4";
sha256Hash = "1j11niqw3p94yd6mfdrkdra0nic8a38fc179y5h9yz81q39m2f3b";
version = "3.10.0";
sha256Hash = "05ipzmlk6xci9v4sf0pap542b37aszghlchswl6s76fg6h3w4yms";
};
}

View file

@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.0.0";
version = "3.0.1";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "f1c96aff6e873a2f9b1b8c2441d5a7801dd48d3abdb738a4d24b26c2a8fbe6c4";
sha256 = "97af6724b04308f691392c80d75564ff8b246871f2f59c4f03cede3c4dd401bb";
};
outputs = [ "bin" "out" "dev" ];

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
open standards for commuincation and interaction.
'';
homepage = "http://www.icecast.org";
homepage = "https://www.icecast.org";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ jcumming ];
platforms = with stdenv.lib.platforms; unix;

View file

@ -31,6 +31,10 @@ stdenv.mkDerivation {
+ "partimage-0.6.9-openssl-1.1-compatibility.patch?id=3fe8e9910002b6523d995512a646b063565d0447";
sha256 = "1hs0krxrncxq1w36bhad02yk8yx71zcfs35cw87c82sl2sfwasjg";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/p/partimage/0.6.9-8/debian/patches/04-fix-FTBFS-glic-2.28.patch";
sha256 = "0xid5636g58sxbhxnjmfjdy7y8rf3c77zmmpfbbqv4lv9jd2gmxm";
})
];
meta = {

View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "direnv";
version = "2.22.0";
version = "2.23.0";
vendorSha256 = null;
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
sha256 = "06z85r99w0nr093fawva6sysdlrdsfjjf7asx96k1sjv56sb306m";
sha256 = "0m42mg4z04880dwl3iyppq2nda9v883jaxl8221d0xcpkjfm8hjm";
};
# we have no bash at the moment for windows

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "graylog";
version = "3.3.6";
version = "3.3.7";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "0yqs5zllaj7v4j9kzfkqxd4n9jdy2656pgai7v05a8wpri4b6sf5";
sha256 = "198j1gfw4cw8pi7bzpijd61165a2n4nawp071yhfcyslviv1wmqr";
};
dontBuild = true;

View file

@ -64,10 +64,10 @@ in {
enterprise-integrations = glPlugin rec {
name = "graylog-enterprise-integrations-${version}";
pluginName = "graylog-plugin-enterprise-integrations";
version = "3.3.6";
version = "3.3.7";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz";
sha256 = "15sx53ikc49d7a7qlcac9jyx9amrcqqqpk8hwj5lc8iv7d1wnxf9";
sha256 = "0m560wrkxdrfa9hrx3lii1vc4z9zp4gy6lgzi2i4igcfhs4drnlk";
};
installPhase = ''
mkdir -p $out/bin
@ -96,10 +96,10 @@ in {
integrations = glPlugin rec {
name = "graylog-integrations-${version}";
pluginName = "graylog-plugin-integrations";
version = "3.3.6";
version = "3.3.7";
src = fetchurl {
url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz";
sha256 = "11cg0rn10sc1gzip88pm2yzyxighiaafw1vznr3ips307ia0c7hm";
sha256 = "1w21ka34y2kdjjf4fd725han8b87vp6mpjnb7pyl2m4wy6srdlvr";
};
installPhase = ''
mkdir -p $out/bin

View file

@ -2,18 +2,16 @@
buildGoModule rec {
pname = "lf";
version = "16";
version = "17";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
sha256 = "174h6xnm3amayf0wfiai16m8qnkx54h5zy4rs7j3yzycd7sirs5b";
sha256 = "0hs70hbbwz9kbbf13l2v32yv70n4aw8sz7rky82qdcqcpnpisjq8";
};
vendorSha256 = "10na3jzvln353ygcvbhj4243yr83skw5zf3r2n8p6d7i83i86c8w";
doCheck = false;
vendorSha256 = "1xjanlq67b6n07pha6ljgnl3n2ks4x3albvca317l68cvjiw3shs";
nativeBuildInputs = [ installShellFiles ];

View file

@ -5,32 +5,43 @@
, features ?
(if stdenv.isAarch64
then [ "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
else [ "leveldb" "leveldb/leveldb-sys-2" "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]
else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])
, coreutils
, CoreServices
}:
rustPlatform.buildRustPackage rec {
pname = "vector";
version = "0.8.1";
version = "0.10.0";
src = fetchFromGitHub {
owner = "timberio";
repo = pname;
rev = "v${version}";
sha256 = "0k15scvjcg2v4z80vq27yrn2wm50fp8xj8lga2czzs0zxhlv21nl";
sha256 = "0q6x3fvwwh18iyznqlr09n3zppzgw9jaz973s8haz54hnxj16wx0";
};
cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w";
cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl protobuf rdkafka ]
++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
# needed for internal protobuf c wrapper library
PROTOC="${protobuf}/bin/protoc";
PROTOC_INCLUDE="${protobuf}/include";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features},disable-resolv-conf -- --test-threads 1";
checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1";
# recent overhauls of DNS support in 0.9 mean that we try to resolve
# vector.dev during the checkPhase, which obviously isn't going to work.
# these tests in the DNS module are trivial though, so stubbing them out is
# fine IMO.
patchPhase = ''
substituteInPlace ./src/dns.rs \
--replace "#[test]" ""
'';
meta = with stdenv.lib; {
description = "A high-performance logs, metrics, and events router";

View file

@ -28,4 +28,5 @@ mkDerivation {
homepage = "https://github.com/maralorn/nix-output-monitor";
description = "Parses output of nix-build to show additional information";
license = stdenv.lib.licenses.agpl3Plus;
maintainers = [ stdenv.lib.maintainers.maralorn ];
}

View file

@ -38,11 +38,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.10.11";
version = "0.10.12";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "0c4azy2iqcj5qg09caqzzjzvig5h0sjilkprphdxvg2bi7dr9g5c";
sha256 = "0bxm3vhba289vcgpzbs1hz5fjamf0zgxkr7h8vcsiijjjavmv64a";
};
configureFlags = [

View file

@ -1941,6 +1941,10 @@ in
f3 = callPackage ../tools/filesystems/f3 { };
f3d = callPackage ../applications/graphics/f3d {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
};
fac = callPackage ../development/tools/fac { };
facedetect = callPackage ../tools/graphics/facedetect { };
@ -7010,7 +7014,7 @@ in
sleuthkit = callPackage ../tools/system/sleuthkit {};
sleepyhead = libsForQt514.callPackage ../applications/misc/sleepyhead {};
sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {};
slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { };
@ -8123,6 +8127,8 @@ in
xdelta = callPackage ../tools/compression/xdelta { };
xdeltaUnstable = callPackage ../tools/compression/xdelta/unstable.nix { };
xdot = with python3Packages; toPythonApplication xdot;
xdummy = callPackage ../tools/misc/xdummy { };
xdxf2slob = callPackage ../tools/misc/xdxf2slob { };
@ -13325,6 +13331,8 @@ in
libavc1394 = callPackage ../development/libraries/libavc1394 { };
libavif = callPackage ../development/libraries/libavif { };
libb2 = callPackage ../development/libraries/libb2 { };
libbacktrace = callPackage ../development/libraries/libbacktrace { };
@ -15099,6 +15107,8 @@ in
kreport = callPackage ../development/libraries/kreport { };
ldutils = callPackage ../development/libraries/ldutils { };
libcommuni = callPackage ../development/libraries/libcommuni { };
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
@ -19180,6 +19190,8 @@ in
marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { };
marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { };
matcha-gtk-theme = callPackage ../data/themes/matcha { };
materia-theme = callPackage ../data/themes/materia-theme { };
@ -19362,6 +19374,8 @@ in
shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
skeu = callPackage ../data/themes/skeu { };
sweet = callPackage ../data/themes/sweet { };
mime-types = callPackage ../data/misc/mime-types { };
@ -24645,6 +24659,8 @@ in
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { };
zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { };
zotero = callPackage ../applications/office/zotero { };
@ -27086,7 +27102,7 @@ in
};
vector = callPackage ../tools/misc/vector {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
epkowa = callPackage ../misc/drivers/epkowa { };