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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2023-05-18 12:01:45 +00:00
committed by GitHub
parent 3186ed660f 42bd7ea279
commit bec974b12f
49 changed files with 387 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/team-list.nix
+11
View File
@@ -546,6 +546,17 @@ with lib.maintainers; {
shortName = "Matrix";
};
minimal-bootstrap = {
members = [
artturin
emilytrau
ericson2314
jk
];
scope = "Maintain the minimal-bootstrap toolchain and related packages.";
shortName = "Minimal Bootstrap";
};
mobile = {
members = [
samueldr
pkgs/applications/networking/browsers/palemoon/default.nix
-222
View File
@@ -1,222 +0,0 @@
{ lib
, stdenv
, alsa-lib
, autoconf213
, cairo
, dbus
, dbus-glib
, desktop-file-utils
, fetchFromGitea
, ffmpeg
, fontconfig
, freetype
, gnome2
, gnum4
, libGL
, libGLU
, libevent
, libnotify
, libpulseaudio
, libstartup_notification
, pango
, perl
, pkg-config
, python2
, unzip
, which
, wrapGAppsHook
, writeScript
, xorg
, yasm
, zip
, zlib
, withGTK3 ? true, gtk3, gtk2
, testers
, palemoon
}:
# Only specific GCC versions are supported with branding
# https://developer.palemoon.org/build/linux/
assert stdenv.cc.isGNU;
assert with lib.strings; (
versionAtLeast stdenv.cc.version "7.1"
&& versionOlder stdenv.cc.version "13"
);
stdenv.mkDerivation rec {
pname = "palemoon";
version = "32.2.0";
src = fetchFromGitea {
domain = "repo.palemoon.org";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
fetchSubmodules = true;
sha256 = "sha256-ftY3xSvpAdjnoPsNNL+XyVD6hFPRmReLyrYT5pqSNho=";
};
nativeBuildInputs = [
autoconf213
desktop-file-utils
gnum4
perl
pkg-config
python2
unzip
which
wrapGAppsHook
yasm
zip
];
buildInputs = [
alsa-lib
cairo
dbus
dbus-glib
ffmpeg
fontconfig
freetype
gnome2.GConf
gtk2
libGL
libGLU
libevent
libnotify
libpulseaudio
libstartup_notification
pango
zlib
]
++ (with xorg; [
libX11
libXext
libXft
libXi
libXrender
libXScrnSaver
libXt
pixman
xorgproto
])
++ lib.optionals withGTK3 [
gtk3
];
enableParallelBuilding = true;
postPatch = ''
patchShebangs ./mach
'';
configurePhase = ''
runHook preConfigure
# Too many cores can lead to build flakiness
# https://forum.palemoon.org/viewtopic.php?f=5&t=28480
export jobs=$(($NIX_BUILD_CORES<=16 ? $NIX_BUILD_CORES : 16))
if [ -z "$enableParallelBuilding" ]; then
jobs=1
fi
export MOZCONFIG=$PWD/mozconfig
export MOZ_NOSPAM=1
export build64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}
export gtkversion=${if withGTK3 then "3" else "2"}
export xlibs=${lib.makeLibraryPath [ xorg.libX11 ]}
export prefix=$out
export mozmakeflags="-j$jobs"
export autoconf=${autoconf213}/bin/autoconf
substituteAll ${./mozconfig} $MOZCONFIG
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
./mach build
runHook postBuild
'';
installPhase = ''
runHook preInstall
./mach install
# Install official branding stuff
desktop-file-install --dir=$out/share/applications \
./palemoon/branding/official/palemoon.desktop
for iconname in default{16,22,24,32,48,256} mozicon128; do
n=''${iconname//[^0-9]/}
size=$n"x"$n
install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
done
# Remove unneeded SDK data from installation
# https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729
rm -r $out/{include,share/idl,lib/palemoon-devel-${version}}
runHook postInstall
'';
dontWrapGApps = true;
preFixup =
let
libPath = lib.makeLibraryPath [
ffmpeg
libpulseaudio
];
in
''
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${libPath}"
)
wrapGApp $out/lib/palemoon-${version}/palemoon
'';
meta = with lib; {
homepage = "https://www.palemoon.org/";
description = "An Open Source, Goanna-based web browser focusing on efficiency and customization";
longDescription = ''
Pale Moon is an Open Source, Goanna-based web browser focusing on
efficiency and customization.
Pale Moon offers you a browsing experience in a browser completely built
from its own, independently developed source that has been forked off from
Firefox/Mozilla code a number of years ago, with carefully selected
features and optimizations to improve the browser's stability and user
experience, while offering full customization and a growing collection of
extensions and themes to make the browser truly your own.
'';
changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release";
license = licenses.mpl20;
maintainers = with maintainers; [ AndersonTorres OPNA2608 ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
passthru = {
updateScript = writeScript "update-${pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts curl libxml2
set -eu -o pipefail
# Only release note announcement == finalized release
version="$(
curl -s 'http://www.palemoon.org/releasenotes.shtml' |
xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 |
sed 's/v\(\S*\).*/\1/'
)"
update-source-version ${pname} "$version"
'';
tests.version = testers.testVersion {
package = palemoon;
};
};
}
pkgs/applications/networking/browsers/palemoon/mozconfig
-49
View File
@@ -1,49 +0,0 @@
# -*- mode: sh; coding: utf-8-unix; fill-column: 80 -*-
# Mozconfig template file for nixpkgs
# Keep this similar to the official .mozconfig file, only minor changes for
# portability are permitted with branding.
# https://developer.palemoon.org/build/linux/
_BUILD_64=@build64@
# Set GTK Version
_GTK_VERSION=@gtkversion@
# Standard build options for Pale Moon
ac_add_options --enable-application=palemoon
ac_add_options --enable-optimize="-O2 -w"
ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION
ac_add_options --enable-jemalloc
ac_add_options --enable-strip
ac_add_options --enable-devtools
ac_add_options --enable-av1
ac_add_options --enable-jxl
ac_add_options --disable-eme
ac_add_options --disable-webrtc
ac_add_options --disable-gamepad
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-necko-wifi
ac_add_options --disable-updater
ac_add_options --with-pthreads
# Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding.
ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
ac_add_options --x-libraries=@xlibs@
# MOZ_PKG_SPECIAL is only relevant for upstream's packaging
#
# NixOS-specific additions
#
ac_add_options --prefix=@prefix@
mk_add_options MOZ_MAKE_FLAGS=@mozmakeflags@
mk_add_options AUTOCONF=@autoconf@
pkgs/applications/networking/cluster/calico/default.nix
+1
View File
@@ -23,6 +23,7 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }:
description = "Cloud native networking and network security";
license = licenses.asl20;
maintainers = with maintainers; [ urandom ];
platforms = platforms.linux;
inherit mainProgram;
};
}) {
pkgs/applications/networking/cluster/terraform-providers/providers.json
+9 -9
View File
@@ -327,11 +327,11 @@
"vendorHash": "sha256-SvyeMKuAJ4vu++7Fx0hutx3vQvgf1sh1PFSLPRqJPjw="
},
"dnsimple": {
"hash": "sha256-XLye6cuVZN9AdLuISJOw9aOSFXMdFNqrOCBGASVC2Bw=",
"hash": "sha256-Q/EjVBjZyML1coMblzqGU7AFdG+of1hVQ4GibM7MiRw=",
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
"owner": "dnsimple",
"repo": "terraform-provider-dnsimple",
"rev": "v1.1.1",
"rev": "v1.1.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-rCM+PL78zD1FYK2v9ihdLkoFwbkgtJTSEq5vKXZPAsU="
},
@@ -764,13 +764,13 @@
"vendorHash": null
},
"newrelic": {
"hash": "sha256-YD7RpzhFgX9BwXzZ4OO3XdPPGLurTvEA6Y0iXnVxTPg=",
"hash": "sha256-GTjrbA1IX2OxHDdxyTprWH/ctvjlXJUvqdxqcvDA1ug=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.22.0",
"rev": "v3.23.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-LWIqCc4hn4ExG4LkFKD5NLM6djWpKgYQdqZM7atTez8="
"vendorHash": "sha256-WjiTfHs+MEc06aNstblGKvd3cTj49JF1fvm+tuR2WH8="
},
"nomad": {
"hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=",
@@ -810,11 +810,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-XHHZpl936xZ4jjk71bmlxm1xilqFamdgL3AdkyRBT5Y=",
"hash": "sha256-TnCRDWmlyBYOY1lpYP0evguM6wFszZdOdmFsztdbRrc=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v4.120.0",
"rev": "v4.121.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1098,11 +1098,11 @@
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
},
"tencentcloud": {
"hash": "sha256-eHv6rqVwWxYcQmoYlkKbOFqJ2BG3KMurn2u8rim/mN0=",
"hash": "sha256-fHcEVQZLLmtaKsAaeFcnRxzPBcGv/UUZOpNHsB9VGXA=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.81.0",
"rev": "v1.81.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
pkgs/applications/networking/nextcloud-client/default.nix
+2 -2
View File
@@ -26,7 +26,7 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.8.1";
version = "3.8.2";
outputs = [ "out" "dev" ];
@@ -34,7 +34,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-BTve1dq+OiUwh/Kiy20iSAyALolkdOX7FHwxvVAdS4U=";
sha256 = "sha256-V5g6+Ci2MjBKnitY6IIaMY4gpoeMK+sd7HGZ1U87xL4=";
};
patches = [
pkgs/applications/window-managers/weston/default.nix
+3 -3
View File
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "weston";
version = "11.0.1";
version = "11.0.2";
src = fetchurl {
url = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/weston-${version}.tar.xz";
sha256 = "sha256-pBP2jCUpV/wxkcNlCCPsNWrowSTMwMtEDaXNxOLLnlc=";
url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz";
hash = "sha256-ckB1LO8LfeYiuvi9U0jmP8axnwLvgklhsq3Rd9llKVI=";
};
depsBuildBuild = [ pkg-config ];
pkgs/desktops/mate/mate-utils/default.nix
+14 -2
View File
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, gettext
, itstool
@@ -19,13 +20,24 @@
stdenv.mkDerivation rec {
pname = "mate-utils";
version = "1.26.0";
version = "1.26.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0bkqj8qwwml9xyvb680yy06lv3dzwkv89yrzz5jamvz88ar6m9bw";
sha256 = "L1NHWxoJkd1ak9ndpY/KTkFvJZJTWG2UpbEQjxI3BiA=";
};
patches = [
# Hopefully helps "libxml2.treeError: xmlSetProp() failed"
# This patch is not part of upstream yet.
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919058
# https://github.com/mate-desktop/mate-utils/issues/210
(fetchpatch {
url = "https://salsa.debian.org/debian-mate-team/mate-utils/-/raw/2b43d78f3fdbf0aa50716b62bcada2ef015957c6/debian/patches/1001_fix-gsearchtool-pt-help-translation.patch";
sha256 = "SZVpdup/bNv+3hEGQ0L13mgXyNm+wRcL53t9/Oi24wA=";
})
];
nativeBuildInputs = [
pkg-config
gettext
pkgs/development/compilers/cmdstan/default.nix
+2 -2
View File
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "cmdstan";
version = "2.32.1";
version = "2.32.2";
src = fetchFromGitHub {
owner = "stan-dev";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-VFZ8YOJMGKlROYsmfiQxAgYvz4zPMdzfRfAgStbRSJg=";
hash = "sha256-obV+R1ZjBgunXndCNry+MEne1nQawo81IV2DWwYbbIQ=";
};
nativeBuildInputs = [ stanc ];
pkgs/development/compilers/stanc/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@
ocamlPackages.buildDunePackage rec {
pname = "stanc";
version = "2.32.1";
version = "2.32.2";
minimalOCamlVersion = "4.12";
duneVersion = "3";
pkgs/development/haskell-modules/configuration-common.nix
-3
View File
@@ -1717,9 +1717,6 @@ self: super: {
servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
hercules-ci-agent = lib.pipe super.hercules-ci-agent [
(pkg: pkg.override (_: {
cachix = super.cachix_1_3_3;
}))
(self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ])
];
pkgs/development/haskell-modules/configuration-nix.nix
+30 -17
View File
@@ -994,30 +994,43 @@ self: super: builtins.intersectAttrs super {
# won't work (or would need to patch test suite).
domaindriven-core = dontCheck super.domaindriven-core;
cachix = overrideCabal (drv: {
version = "1.4.2";
cachix-api = overrideCabal (drv: {
version = "1.5";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.4.2";
sha256 = "sha256-EjfBM5O+wXJhthRU/Nd9VFue7xo5O93nx0pMt3jx0Ow=";
rev = "v1.5";
sha256 = "sha256-bt8FFtDSJpBckx3dIjW5Xdvj8aVCm78R3VTpjK5F3Ac=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
postPatch = ''
sed -i 's/1.4.2/1.5/' cachix-api.cabal
'';
}) super.cachix-api;
cachix = overrideCabal (drv: {
version = "1.5";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.5";
sha256 = "sha256-bt8FFtDSJpBckx3dIjW5Xdvj8aVCm78R3VTpjK5F3Ac=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix";
postPatch = ''
sed -i 's/1.4.1/1.4.2/' cachix.cabal
sed -i 's/1.4.2/1.5/' cachix.cabal
'';
}) (super.cachix.override {
fsnotify = dontCheck super.fsnotify_0_4_1_0;
hnix-store-core = super.hnix-store-core_0_6_1_0;
});
cachix_1_3_3 = overrideCabal (drv: {
hydraPlatforms = pkgs.lib.platforms.all;
}) (super.cachix_1_3_3.override {
nix = self.hercules-ci-cnix-store.nixPackage;
fsnotify = dontCheck super.fsnotify_0_4_1_0;
hnix-store-core = super.hnix-store-core_0_6_1_0;
});
}) (lib.pipe
(super.cachix.override {
fsnotify = dontCheck super.fsnotify_0_4_1_0;
hnix-store-core = super.hnix-store-core_0_6_1_0;
})
[
(addBuildTool self.hercules-ci-cnix-store.nixPackage)
(addBuildTool pkgs.pkg-config)
(addBuildDepend self.inline-c-cpp)
(addBuildDepend self.hercules-ci-cnix-store)
]
);
hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };
hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });
pkgs/development/python-modules/dash/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "dash";
version = "2.9.1";
version = "2.9.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "plotly";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-bxWSYDKKnsWs/bTRkIsNJ2hOIoHS2xhl4IIW+uEnbMU=";
hash = "sha256-3Q9rp2V8TawT5yT3TBtdUgnMFqFGRNQCDhtgMb2dS6U=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/dvc-render/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dvc-render";
version = "0.5.0";
version = "0.5.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-x9vb8X7p4MOMZwr91ronXB/bPZD3PqYhbzLccRewyco=";
hash = "sha256-u3llBwuojMRhWkbGW3AF3HyDmiN2Mywf2TF1BDCG0Q0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/justbytes/default.nix
+10 -7
View File
@@ -1,25 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, justbases
, unittestCheckHook
, hypothesis
}:
buildPythonPackage rec {
pname = "justbytes";
version = "0.15";
version = "0.15.2";
src = fetchPypi {
inherit pname version;
hash = "sha256-qrMO9X0v5yYjeWa72mogegR+ii8tCi+o7qZ+Aff2wZQ=";
src = fetchFromGitHub {
owner = "mulkieran";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-+jwIK1ZU+j58VoOfZAm7GdFy7KHU28khwzxhYhcws74=";
};
propagatedBuildInputs = [ justbases ];
nativeCheckInputs = [ hypothesis ];
nativeCheckInputs = [ unittestCheckHook hypothesis ];
meta = with lib; {
description = "computing with and displaying bytes";
homepage = "https://pythonhosted.org/justbytes";
homepage = "https://github.com/mulkieran/justbytes";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ nickcao ];
};
pkgs/development/python-modules/pyquil/default.nix
+2 -2
View File
@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "pyquil";
version = "3.3.4";
version = "3.5.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "rigetti";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-iHyYX9e3O611OzBMafqn4V+yR1y8y4twiJehYDYlvdg=";
hash = "sha256-Fr9SnAzDHaSKp0AYra/gCZOJ5Fzcx1EO56ahZQZP2Ss=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/pysigma/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pysigma";
version = "0.9.9";
version = "0.9.11";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "refs/tags/v${version}";
hash = "sha256-N3BHIec1j4G5bVQu5KKTzmxr4fFjTWIZdmtp1pSfdSg=";
hash = "sha256-lbpx5THSegZK09jREH15RpokmdfOng2vX4tClsc/x/A=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-benedict/default.nix
+2 -2
View File
@@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "python-benedict";
version = "0.30.0";
version = "0.30.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "fabiocaccamo";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-/LERLQw0Jb/Yuf2CfEKIZ658LtSkHjMvMxGcB00IgKs=";
hash = "sha256-7X8a9033r6MJT1KgPH7FiXL0EZqwi4wnKVw5AYAaVR8=";
};
nativeBuildInputs = [
pkgs/development/python-modules/python-slugify/default.nix
+11 -5
View File
@@ -9,23 +9,28 @@
buildPythonPackage rec {
pname = "python-slugify";
version = "6.1.2";
version = "8.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "un33k";
repo = pname;
rev = "v${version}";
hash = "sha256-JGjUNBEMuICsaClQGDSGX4qFRjecVKzmpPNRUTvfwho=";
rev = "refs/tags/v${version}";
hash = "sha256-MJac63XjgWdUQdyyEm8O7gAGVszmHxZzRF4frJtR0BU=";
};
propagatedBuildInputs = [
text-unidecode
unidecode
];
passthru.optional-dependencies = {
unidecode = [
unidecode
];
};
nativeCheckInputs = [
pytestCheckHook
];
@@ -41,6 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python Slugify application that handles Unicode";
homepage = "https://github.com/un33k/python-slugify";
changelog = "https://github.com/un33k/python-slugify/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ vrthra ];
};
pkgs/games/aaaaxy/default.nix
+2 -2
View File
@@ -17,13 +17,13 @@
buildGoModule rec {
pname = "aaaaxy";
version = "1.3.524";
version = "1.3.530";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-9g0wTvG6XSKI7e3RP6e3RoYyvE5UjOYxI5hVINI9Fq8=";
hash = "sha256-jbuBkxd686ky7KFYUaLJ51jon5hwuwkr0QdhMTtZ7eo=";
fetchSubmodules = true;
};
pkgs/os-specific/linux/minimal-bootstrap/coreutils/default.nix
+112
View File
@@ -0,0 +1,112 @@
{ lib
, fetchurl
, kaem
, tinycc
, gnumake
, gnupatch
}:
let
pname = "coreutils";
version = "5.0";
src = fetchurl {
url = "mirror://gnu/coreutils/coreutils-${version}.tar.gz";
sha256 = "10wq6k66i8adr4k08p0xmg87ff4ypiazvwzlmi7myib27xgffz62";
};
# Thanks to the live-bootstrap project!
# See https://github.com/fosslinux/live-bootstrap/blob/e86db47b6ee40d68e26866dd15e8637f64d6d778/sysa/coreutils-5.0/coreutils-5.0.kaem
liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/e86db47b6ee40d68e26866dd15e8637f64d6d778/sysa/coreutils-5.0";
makefile = fetchurl {
url = "${liveBootstrap}/mk/main.mk";
sha256 = "0njg4xccxfqrslrmlb8ls7h6hlnfmdx42nvxwmca8flvczwrplfd";
};
patches = [
# modechange.h uses functions defined in sys/stat.h, so we need to move it to
# after sys/stat.h include.
(fetchurl {
url = "${liveBootstrap}/patches/modechange.patch";
sha256 = "04xa4a5w2syjs3xs6qhh8kdzqavxnrxpxwyhc3qqykpk699p3ms5";
})
# mbstate_t is a struct that is required. However, it is not defined by mes libc.
(fetchurl {
url = "${liveBootstrap}/patches/mbstate.patch";
sha256 = "0rz3c0sflgxjv445xs87b83i7gmjpl2l78jzp6nm3khdbpcc53vy";
})
# strcoll() does not exist in mes libc, change it to strcmp.
(fetchurl {
url = "${liveBootstrap}/patches/ls-strcmp.patch";
sha256 = "0lx8rz4sxq3bvncbbr6jf0kyn5bqwlfv9gxyafp0541dld6l55p6";
})
# getdate.c is pre-compiled from getdate.y
# At this point we don't have bison yet and in any case getdate.y does not
# compile when generated with modern bison.
(fetchurl {
url = "${liveBootstrap}/patches/touch-getdate.patch";
sha256 = "1xd3z57lvkj7r8vs5n0hb9cxzlyp58pji7d335snajbxzwy144ma";
})
# touch: add -h to change symlink timestamps, where supported
(fetchurl {
url = "${liveBootstrap}/patches/touch-dereference.patch";
sha256 = "0wky5r3k028xwyf6g6ycwqxzc7cscgmbymncjg948vv4qxsxlfda";
})
# strcoll() does not exist in mes libc, change it to strcmp.
(fetchurl {
url = "${liveBootstrap}/patches/expr-strcmp.patch";
sha256 = "19f31lfsm1iwqzvp2fyv97lmqg4730prfygz9zip58651jf739a9";
})
# strcoll() does not exist in mes libc, change it to strcmp.
# hard_LC_COLLATE is used but not declared when HAVE_SETLOCALE is unset.
(fetchurl {
url = "${liveBootstrap}/patches/sort-locale.patch";
sha256 = "0bdch18mpyyxyl6gyqfs0wb4pap9flr11izqdyxccx1hhz0a2i6c";
})
];
in
kaem.runCommand "${pname}-${version}" {
inherit pname version;
nativeBuildInputs = [
tinycc.compiler
gnumake
gnupatch
];
meta = with lib; {
description = "The GNU Core Utilities";
homepage = "https://www.gnu.org/software/coreutils";
license = licenses.gpl3Plus;
maintainers = teams.minimal-bootstrap.members;
platforms = platforms.unix;
};
} ''
# Unpack
ungz --file ${src} --output coreutils.tar
untar --file coreutils.tar
rm coreutils.tar
cd coreutils-${version}
# Patch
${lib.concatMapStringsSep "\n" (f: "patch -Np0 -i ${f}") patches}
# Configure
catm config.h
cp lib/fnmatch_.h lib/fnmatch.h
cp lib/ftw_.h lib/ftw.h
cp lib/search_.h lib/search.h
rm src/dircolors.h
# Build
make -f ${makefile} \
CC="tcc -B ${tinycc.libs}/lib" \
PREFIX=''${out}
# Check
./src/echo "Hello coreutils!"
# Install
./src/mkdir -p ''${out}/bin
make -f ${makefile} install PREFIX=''${out}
''
pkgs/os-specific/linux/minimal-bootstrap/default.nix
+2
View File
@@ -11,6 +11,8 @@ lib.makeScope
(extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform; } // extra))
(self: with self; {
coreutils = callPackage ./coreutils { tinycc = tinycc-mes; };
gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; };
gnumake = callPackage ./gnumake { tinycc = tinycc-mes; };
pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix
+1 -1
View File
@@ -154,7 +154,7 @@ kaem.runCommand "${pname}-${version}" {
description = "A tool to control the generation of non-source files from sources";
homepage = "https://www.gnu.org/software/make";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
mainProgram = "make";
platforms = platforms.unix;
};
pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix
+1 -1
View File
@@ -76,7 +76,7 @@ kaem.runCommand "${pname}-${version}" {
description = "GNU Patch, a program to apply differences to files";
homepage = "https://www.gnu.org/software/patch";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
mainProgram = "patch";
platforms = platforms.unix;
};
pkgs/os-specific/linux/minimal-bootstrap/ln-boot/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ kaem.runCommand "${pname}-${version}" {
meta = with lib; {
description = "Basic tool for creating symbolic links";
license = licenses.mit;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
mainProgram = "ln";
platforms = platforms.unix;
};
pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ let
description = "Scheme interpreter and C compiler for bootstrapping";
homepage = "https://www.gnu.org/software/mes";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
pkgs/os-specific/linux/minimal-bootstrap/mes/libc.nix
+1 -1
View File
@@ -31,7 +31,7 @@ kaem.runCommand "${pname}-${version}" {
description = "The Mes C Library";
homepage = "https://www.gnu.org/software/mes";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
} ''
pkgs/os-specific/linux/minimal-bootstrap/mes/nyacc.nix
+1 -1
View File
@@ -28,7 +28,7 @@ kaem.runCommand "${pname}-${version}" {
'';
homepage = "https://savannah.nongnu.org/projects/nyacc";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = platforms.all;
};
} ''
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix
+1 -1
View File
@@ -17,7 +17,7 @@ derivationWithMeta {
description = "Minimal assembler for bootstrapping";
homepage = "https://github.com/oriansj/stage0-posix";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix
+1 -1
View File
@@ -45,7 +45,7 @@ derivationWithMeta {
description = "Minimal build tool for running scripts on systems that lack any shell";
homepage = "https://github.com/oriansj/mescc-tools";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
}
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix
+1 -1
View File
@@ -17,7 +17,7 @@ derivationWithMeta {
description = "First stage minimal scriptable build tool for bootstrapping";
homepage = "https://github.com/oriansj/stage0-posix";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
}
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-extra/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ derivationWithMeta {
description = "Collection of tools written for use in bootstrapping";
homepage = "https://github.com/oriansj/mescc-tools-extra";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
}
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools/default.nix
+1 -1
View File
@@ -82,7 +82,7 @@ derivationWithMeta {
description = "Collection of tools written for use in bootstrapping";
homepage = "https://github.com/oriansj/mescc-tools";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
}
pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/stage0-posix-x86.nix
+1 -1
View File
@@ -45,7 +45,7 @@ rec {
description = "Collection of tools written for use in bootstrapping";
homepage = "https://github.com/oriansj/stage0-posix";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
};
pkgs/os-specific/linux/minimal-bootstrap/tinycc/bootstrappable.nix
+1 -1
View File
@@ -35,7 +35,7 @@ let
description = "Tiny C Compiler's bootstrappable fork";
homepage = "https://gitlab.com/janneke/tinycc";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
pkgs/os-specific/linux/minimal-bootstrap/tinycc/mes.nix
+1 -1
View File
@@ -31,7 +31,7 @@ let
description = "Small, fast, and embeddable C compiler and interpreter";
homepage = "https://repo.or.cz/w/tinycc.git";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ emilytrau ];
maintainers = teams.minimal-bootstrap.members;
platforms = [ "i686-linux" ];
};
pkgs/servers/caddy/xcaddy/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "xcaddy";
version = "0.3.3";
version = "0.3.4";
subPackages = [ "cmd/xcaddy" ];
@@ -10,7 +10,7 @@ buildGoModule rec {
owner = "caddyserver";
repo = pname;
rev = "v${version}";
hash = "sha256-HDyHvHa8yCz59AifHxQ0LAuC/xPXQInuUYURx7bL3oE=";
hash = "sha256-CJzh1/rX9JjIiSyBReCt/lxUBQnXxY8NjRnSSqna9p4=";
};
patches = [
pkgs/servers/misc/virtiofsd/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "virtiofsd";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitLab {
owner = "virtio-fs";
repo = "virtiofsd";
rev = "v${version}";
sha256 = "jxo6qQLIhwT6cqhYWx+5GEnuS9E7O2u82QrzxabjcOs=";
sha256 = "/KL1LH/3txWrZPjvuYmSkNb93euB+Whd2YofIuf/cMg=";
};
cargoHash = "sha256-1wDlYQXRJSkXyQU7H+mQWtsLSpX7i7SdmFYLjyRWfx8=";
cargoHash = "sha256-EkDop9v75IIIWEK+QI5v58lO20RxgJab/scFmn26idU=";
LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
LIBCAPNG_LINK_TYPE =
pkgs/servers/nextcloud/notify_push.nix
+14 -6
View File
@@ -1,26 +1,34 @@
{ lib, fetchFromGitHub, rustPlatform }:
{ lib
, fetchFromGitHub
, nixosTests
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "notify_push";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "nextcloud";
repo = pname;
rev = "v${version}";
hash = "sha256-YCIXpCNKqdCSvq7CSPSwoPc2gpCnnda8S7I4FzpezMc=";
hash = "sha256-5Vd8fD0nB2POtxDFNVtkJfVEe+O8tjnwlwYosDJjIDA=";
};
cargoHash = "sha256-l6gMz/iJeLl+RLjOiR9U1m6V/rK+RWM84bQiz4jCFtY=";
cargoHash = "sha256-TF4rL7KXsbfYiEOfkKRyr3PCvyocq6tg90OZURZh8f8=";
passthru = {
passthru = rec {
test_client = rustPlatform.buildRustPackage {
pname = "${pname}-test_client";
inherit src version;
buildAndTestSubdir = "test_client";
cargoHash = "sha256-4jQvlxU3S3twTpiLab8BXC6ZSPSWN6ftK3GzfKnjHSE=";
cargoHash = "sha256-ES0LBKirOUqXOtA9O2KouA+NWisIMoe8XhmnTC8w1cg=";
};
tests = {
inherit (nixosTests.nextcloud) with-postgresql-and-redis26;
inherit test_client;
};
};
pkgs/servers/nextcloud/packages/25.json
+24 -24
View File
@@ -10,9 +10,9 @@
]
},
"calendar": {
"sha256": "0xhrpadzz73rdjyk4y1xm5hwc6k104rlpp9nmw08pq8phpfs12qa",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.3/calendar-v4.3.3.tar.gz",
"version": "4.3.3",
"sha256": "154xw925v8wipl472vpksiccf1jnic615add6v1zzaxwqwclhjrv",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.0-beta1/calendar-v4.4.0-beta1.tar.gz",
"version": "4.4.0-beta.1",
"description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
"homepage": "https://github.com/nextcloud/calendar/",
"licenses": [
@@ -20,9 +20,9 @@
]
},
"contacts": {
"sha256": "1rdql3m7pg9m044hppyrm3xw329y8h0pzwcmpcinjbjs0vqjssxk",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.2.0/contacts-v5.2.0.tar.gz",
"version": "5.2.0",
"sha256": "1yrvm6284v3j6aj0qwkf0z2dpydmncdz4w239l1ayrix2sr5ys91",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.0-beta2/contacts-v5.3.0-beta2.tar.gz",
"version": "5.3.0-beta.2",
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [
@@ -30,9 +30,9 @@
]
},
"deck": {
"sha256": "0r0kymlfbgbss7888rbi8z67ww5yxc8xvwhk7niaqhi8aggzxgn0",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.3/deck-v1.8.3.tar.gz",
"version": "1.8.3",
"sha256": "1rsfyl6p6myy36mv4x9ci3g53k4ndbwqmss4pfk3sh1y6vik8hcn",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.5/deck-v1.8.5.tar.gz",
"version": "1.8.5",
"description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
"homepage": "https://github.com/nextcloud/deck",
"licenses": [
@@ -70,9 +70,9 @@
]
},
"groupfolders": {
"sha256": "1qvzlqislzzpz6knhdd8xnpd3psrq6xf61j25rnpsn7jd5qg5za7",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.2/groupfolders-v13.1.2.tar.gz",
"version": "13.1.2",
"sha256": "19lahgbi26lkyy3hlrhq5jj8y7rk0ybwfpv6icni7m9h6z18sl2r",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.3/groupfolders-v13.1.3.tar.gz",
"version": "13.1.3",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
"homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [
@@ -110,9 +110,9 @@
]
},
"news": {
"sha256": "1zyn6rs24f5dsb4z65dzx2mdkw8gy8n3adk9dgyyd4cjjhhixhsm",
"url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta3/news.tar.gz",
"version": "21.2.0-beta3",
"sha256": "0fr72j4al8mi6fr7cdsyvvnp5cc39mphaaf3bcpkxy4a2v2hn2k0",
"url": "https://github.com/nextcloud/news/releases/download/21.2.0/news.tar.gz",
"version": "21.2.0",
"description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
"homepage": "https://github.com/nextcloud/news",
"licenses": [
@@ -120,9 +120,9 @@
]
},
"notes": {
"sha256": "0klqf8dixrrb8yp8cc60ggnvhmqb3yh9f6y1281jn8ia5jml622v",
"url": "https://github.com/nextcloud-releases/notes/releases/download/v4.7.2/notes.tar.gz",
"version": "4.7.2",
"sha256": "1zhqdagc8rw018cfkdcfmbvvcj4cbfsp16yy5crpkhp9kayybivr",
"url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.0-beta.1/notes.tar.gz",
"version": "4.8.0-beta.1",
"description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
"homepage": "https://github.com/nextcloud/notes",
"licenses": [
@@ -150,9 +150,9 @@
]
},
"polls": {
"sha256": "1zzsjzfihcxb6rpi4fmpndif90bqzvyb9yv8n7lcbwsmik8xw6ar",
"url": "https://github.com/nextcloud/polls/releases/download/v5.0.3/polls.tar.gz",
"version": "5.0.3",
"sha256": "10906dzlswi352gbshvh86h6yyhwm8b54nkzqgwzpbg9h6yqp1w9",
"url": "https://github.com/nextcloud/polls/releases/download/v5.0.5/polls.tar.gz",
"version": "5.0.5",
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
"homepage": "https://github.com/nextcloud/polls",
"licenses": [
@@ -200,9 +200,9 @@
]
},
"twofactor_nextcloud_notification": {
"sha256": "13afyhiy7yk0fcf32792dwabjcixnw5b4hkxykw0xby3hnh0m3l2",
"url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.6.0/twofactor_nextcloud_notification-v3.6.0.tar.gz",
"version": "3.6.0",
"sha256": "03fp8wcwhyp8ivrcf20klgg17sxc9fia5sa44rbrv3cicmwmw50b",
"url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.7.0/twofactor_nextcloud_notification-v3.7.0.tar.gz",
"version": "3.7.0",
"description": "Allows using any of your logged in devices as second factor",
"homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification",
"licenses": [
pkgs/servers/nextcloud/packages/26.json
+33 -33
View File
@@ -10,9 +10,9 @@
]
},
"calendar": {
"sha256": "0xhrpadzz73rdjyk4y1xm5hwc6k104rlpp9nmw08pq8phpfs12qa",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.3/calendar-v4.3.3.tar.gz",
"version": "4.3.3",
"sha256": "154xw925v8wipl472vpksiccf1jnic615add6v1zzaxwqwclhjrv",
"url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.0-beta1/calendar-v4.4.0-beta1.tar.gz",
"version": "4.4.0-beta.1",
"description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
"homepage": "https://github.com/nextcloud/calendar/",
"licenses": [
@@ -20,9 +20,9 @@
]
},
"contacts": {
"sha256": "1rdql3m7pg9m044hppyrm3xw329y8h0pzwcmpcinjbjs0vqjssxk",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.2.0/contacts-v5.2.0.tar.gz",
"version": "5.2.0",
"sha256": "1yrvm6284v3j6aj0qwkf0z2dpydmncdz4w239l1ayrix2sr5ys91",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.0-beta2/contacts-v5.3.0-beta2.tar.gz",
"version": "5.3.0-beta.2",
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [
@@ -30,9 +30,9 @@
]
},
"deck": {
"sha256": "1bx95f8rpvfwh0zf5iaks7w252dfbfh7xngljj58a4nwqv9g613q",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.0/deck-v1.9.0.tar.gz",
"version": "1.9.0",
"sha256": "0lgm6d99r2qpsx3ymnjy5i7h8c0yif9fgn2nhq49jz51x09pc7kd",
"url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.2/deck-v1.9.2.tar.gz",
"version": "1.9.2",
"description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
"homepage": "https://github.com/nextcloud/deck",
"licenses": [
@@ -70,9 +70,9 @@
]
},
"groupfolders": {
"sha256": "1x471a1fsrg8n9bcmrbwjw7b6zylxick105mcd66s0fshrkyn0b5",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.1/groupfolders-v14.0.1.tar.gz",
"version": "14.0.1",
"sha256": "1ick4llzbsp3i4aiml203851xcm1c6jhnma4d5nmpp995a459axq",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.2/groupfolders-v14.0.2.tar.gz",
"version": "14.0.2",
"description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
"homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [
@@ -100,9 +100,9 @@
]
},
"mail": {
"sha256": "1h2z54jix775hx4dblr55k93d1472ly5lg25kqj8i2334ddmcblw",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.1.1/mail-v3.1.1.tar.gz",
"version": "3.1.1",
"sha256": "07c6kvh5gbdp2lnwizih5d44py98gf6wy8snhlkx4x18gwp6fk9b",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.0-beta.2/mail-v3.2.0-beta.2.tar.gz",
"version": "3.2.0-beta.2",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
@@ -110,9 +110,9 @@
]
},
"news": {
"sha256": "1zyn6rs24f5dsb4z65dzx2mdkw8gy8n3adk9dgyyd4cjjhhixhsm",
"url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta3/news.tar.gz",
"version": "21.2.0-beta3",
"sha256": "0fr72j4al8mi6fr7cdsyvvnp5cc39mphaaf3bcpkxy4a2v2hn2k0",
"url": "https://github.com/nextcloud/news/releases/download/21.2.0/news.tar.gz",
"version": "21.2.0",
"description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
"homepage": "https://github.com/nextcloud/news",
"licenses": [
@@ -120,9 +120,9 @@
]
},
"notes": {
"sha256": "0klqf8dixrrb8yp8cc60ggnvhmqb3yh9f6y1281jn8ia5jml622v",
"url": "https://github.com/nextcloud-releases/notes/releases/download/v4.7.2/notes.tar.gz",
"version": "4.7.2",
"sha256": "1zhqdagc8rw018cfkdcfmbvvcj4cbfsp16yy5crpkhp9kayybivr",
"url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.0-beta.1/notes.tar.gz",
"version": "4.8.0-beta.1",
"description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
"homepage": "https://github.com/nextcloud/notes",
"licenses": [
@@ -130,9 +130,9 @@
]
},
"notify_push": {
"sha256": "1fz6wi5nb4c2w33vp9ry2mk4lmv7aa3axyfxzldf5w4glfzaymzw",
"url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.2/notify_push-v0.6.2.tar.gz",
"version": "0.6.2",
"sha256": "0hdxnkar2ibis5p0gp3yr1i6894la9wxq4pzrbqdrq2cgvsj6a18",
"url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.3/notify_push-v0.6.3.tar.gz",
"version": "0.6.3",
"description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions",
"homepage": "",
"licenses": [
@@ -150,9 +150,9 @@
]
},
"polls": {
"sha256": "1zzsjzfihcxb6rpi4fmpndif90bqzvyb9yv8n7lcbwsmik8xw6ar",
"url": "https://github.com/nextcloud/polls/releases/download/v5.0.3/polls.tar.gz",
"version": "5.0.3",
"sha256": "10906dzlswi352gbshvh86h6yyhwm8b54nkzqgwzpbg9h6yqp1w9",
"url": "https://github.com/nextcloud/polls/releases/download/v5.0.5/polls.tar.gz",
"version": "5.0.5",
"description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).",
"homepage": "https://github.com/nextcloud/polls",
"licenses": [
@@ -200,9 +200,9 @@
]
},
"twofactor_nextcloud_notification": {
"sha256": "13afyhiy7yk0fcf32792dwabjcixnw5b4hkxykw0xby3hnh0m3l2",
"url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.6.0/twofactor_nextcloud_notification-v3.6.0.tar.gz",
"version": "3.6.0",
"sha256": "03fp8wcwhyp8ivrcf20klgg17sxc9fia5sa44rbrv3cicmwmw50b",
"url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.7.0/twofactor_nextcloud_notification-v3.7.0.tar.gz",
"version": "3.7.0",
"description": "Allows using any of your logged in devices as second factor",
"homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification",
"licenses": [
@@ -210,9 +210,9 @@
]
},
"twofactor_webauthn": {
"sha256": "1f5zamydsl7lr91md2qmz0wzsfvs8q05qpn96x6i7c6886vx18xf",
"url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.1.2/twofactor_webauthn-v1.1.2.tar.gz",
"version": "1.1.2",
"sha256": "1lqcw74rsnl8c4sirw9208ra3c8zl8zp93scs7y8fv2n4n60l465",
"url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.2.0/twofactor_webauthn-v1.2.0.tar.gz",
"version": "1.2.0",
"description": "A two-factor provider for WebAuthn devices",
"homepage": "https://github.com/nextcloud/twofactor_webauthn#readme",
"licenses": [
pkgs/tools/admin/awscli2/default.nix
+2 -2
View File
@@ -18,14 +18,14 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.11.15"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.11.20"; # N.B: if you change this, check if overrides are still up-to-date
format = "pyproject";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
hash = "sha256-2FE5PJxdTqSrAIgkaZPf91B6bI6Bj9tbJjXg2nAaLdo=";
hash = "sha256-svd4NI39T4k2xKP43FB5llGyHJ7OKE7LxN7rOjL9L2w=";
};
postPatch = ''
pkgs/tools/audio/spotdl/default.nix
+3 -3
View File
@@ -19,7 +19,7 @@ let
};
in python.pkgs.buildPythonApplication rec {
pname = "spotdl";
version = "4.1.8";
version = "4.1.10";
format = "pyproject";
@@ -27,7 +27,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "spotDL";
repo = "spotify-downloader";
rev = "refs/tags/v${version}";
hash = "sha256-iE5d9enSbONqVxKW7H7N+1TmBp6nVGtiQvxJxV7R/1o=";
hash = "sha256-SmyUoMOlBJZTJH19NwTKbz/vo7Oh4tGHCQrW5DVZQWQ=";
};
nativeBuildInputs = with python.pkgs; [
@@ -56,7 +56,7 @@ in python.pkgs.buildPythonApplication rec {
syncedlyrics
typing-extensions
setuptools # for pkg_resources
];
] ++ python-slugify.optional-dependencies.unidecode;
nativeCheckInputs = with python.pkgs; [
pytestCheckHook
pkgs/tools/networking/mu/default.nix
+2
View File
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
find $out/share/emacs -type f -name '*.el' -print0 \
| xargs -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \
"emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true"
'' + ''
emacs --batch -l package --eval "(package-generate-autoloads \"mu4e\" \"$out/share/emacs/site-lisp/mu4e\")"
'';
buildInputs = [ emacs glib gmime3 texinfo xapian ];
pkgs/tools/networking/rdap/default.nix
+4 -4
View File
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "rdap";
version = "2019-10-17";
vendorSha256 = "sha256-j7sE62NqbN8UrU1mM9WYGYu/tkqw56sNKQ125QQXAmo=";
version = "0.9.1";
vendorSha256 = "sha256-8b1EAnR8PkEAw9yLBqPKFeANJit0OCJG+fssAGR/iTk=";
src = fetchFromGitHub {
owner = "openrdap";
repo = "rdap";
rev = "af93e7ef17b78dee3e346814731377d5ef7b89f3";
sha256 = "sha256-7MR4izJommdvxDZSRxguwqJWu6KXw/X73RJxSmUD7oQ=";
rev = "v${version}";
sha256 = "sha256-FiaUyhiwKXZ3xnFPmdxb8bpbm5eRRFNDL3duOGDnc/A=";
};
doCheck = false;
pkgs/tools/text/difftastic/Cargo.lock
Generated
+62 -24
View File
@@ -4,22 +4,13 @@ version = 3
[[package]]
name = "aho-corasick"
version = "0.7.18"
version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]
[[package]]
name = "ansi_term"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
dependencies = [
"winapi",
]
[[package]]
name = "assert_cmd"
version = "2.0.5"
@@ -232,7 +223,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]]
name = "difftastic"
version = "0.46.0"
version = "0.47.0"
dependencies = [
"assert_cmd",
"bumpalo",
@@ -240,6 +231,7 @@ dependencies = [
"clap",
"const_format",
"crossterm",
"glob",
"itertools",
"lazy_static",
"libc",
@@ -255,6 +247,7 @@ dependencies = [
"regex",
"rustc-hash",
"strsim",
"strum",
"tree-sitter",
"tree_magic_mini",
"typed-arena",
@@ -310,12 +303,24 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "glob"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "hashbrown"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
[[package]]
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
version = "0.1.19"
@@ -493,9 +498,9 @@ dependencies = [
[[package]]
name = "owo-colors"
version = "3.4.0"
version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b"
checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
[[package]]
name = "parking_lot"
@@ -562,14 +567,14 @@ dependencies = [
[[package]]
name = "pretty_assertions"
version = "1.2.1"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563"
checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
dependencies = [
"ansi_term",
"ctor",
"diff",
"output_vt100",
"yansi",
]
[[package]]
@@ -645,9 +650,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.5.6"
version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
dependencies = [
"aho-corasick",
"memchr",
@@ -662,9 +667,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
[[package]]
name = "regex-syntax"
version = "0.6.26"
version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "rustc-hash"
@@ -672,6 +677,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustversion"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
[[package]]
name = "same-file"
version = "1.0.6"
@@ -729,6 +740,28 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "strum"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
dependencies = [
"strum_macros",
]
[[package]]
name = "strum_macros"
version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
dependencies = [
"heck",
"proc-macro2",
"quote",
"rustversion",
"syn",
]
[[package]]
name = "syn"
version = "1.0.95"
@@ -838,12 +871,11 @@ dependencies = [
[[package]]
name = "walkdir"
version = "2.3.2"
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
dependencies = [
"same-file",
"winapi",
"winapi-util",
]
@@ -946,3 +978,9 @@ name = "wu-diff"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e3e6735fcde06432870db8dc9d7e3ab1b93727c14eaef329969426299f28893"
[[package]]
name = "yansi"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
pkgs/tools/text/difftastic/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@ in
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.46.0";
version = "0.47.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-uXSmEJUpcw/PQ5I9nR1b6N1fcOdCSCM4KF0XnGNJkME=";
sha256 = "sha256-P54ck7gkDgz6G8/3N1fxvx2R7cMUaDKnUtLgPzoUrtI=";
};
cargoLock = {
pkgs/top-level/aliases.nix
+1
View File
@@ -1203,6 +1203,7 @@ mapAliases ({
p11_kit = throw "'p11_kit' has been renamed to/replaced by 'p11-kit'"; # Converted to throw 2022-02-22
packet-cli = metal-cli; # Added 2021-10-25
palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18
paperless = paperless-ngx; # Added 2021-06-06
paperless-ng = paperless-ngx; # Added 2022-04-11
paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03
pkgs/top-level/all-packages.nix
+1 -2
View File
@@ -19748,7 +19748,7 @@ with pkgs;
c-blosc = callPackage ../development/libraries/c-blosc { };
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix_1_3_3;
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
calcium = callPackage ../development/libraries/calcium { };
@@ -33199,7 +33199,6 @@ with pkgs;
osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { };
palemoon = callPackage ../applications/networking/browsers/palemoon { };
palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { };
paleta = callPackage ../applications/graphics/paleta { };