Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
f92395cf3c
@ -477,6 +477,14 @@ self: super:
|
||||
<title>Other Notable Changes</title>
|
||||
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>stdenv.lib</literal> has been deprecated and will break
|
||||
eval in 21.11. Please use <literal>pkgs.lib</literal> instead.
|
||||
See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/108938">#108938</link>
|
||||
for details.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The Mailman NixOS module (<literal>services.mailman</literal>) has a new
|
||||
@ -653,6 +661,11 @@ self: super:
|
||||
The <varname>platform</varname> grouping of these things never meant anything, and was just a historial/implementation artifact that was overdue removal.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<varname>services.restic</varname> now uses a dedicated cache directory for every backup defined in <varname>services.restic.backups</varname>. The old global cache directory, <literal>/root/.cache/restic</literal>, is now unused and can be removed to free up disk space.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -5,36 +5,17 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
drivers = config.services.xserver.videoDrivers;
|
||||
|
||||
# FIXME: should introduce an option like
|
||||
# ‘hardware.video.nvidia.package’ for overriding the default NVIDIA
|
||||
# driver.
|
||||
nvidiaForKernel = kernelPackages:
|
||||
if elem "nvidia" drivers then
|
||||
kernelPackages.nvidia_x11
|
||||
else if elem "nvidiaBeta" drivers then
|
||||
kernelPackages.nvidia_x11_beta
|
||||
else if elem "nvidiaVulkanBeta" drivers then
|
||||
kernelPackages.nvidia_x11_vulkan_beta
|
||||
else if elem "nvidiaLegacy304" drivers then
|
||||
kernelPackages.nvidia_x11_legacy304
|
||||
else if elem "nvidiaLegacy340" drivers then
|
||||
kernelPackages.nvidia_x11_legacy340
|
||||
else if elem "nvidiaLegacy390" drivers then
|
||||
kernelPackages.nvidia_x11_legacy390
|
||||
else null;
|
||||
|
||||
nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
|
||||
nvidia_libs32 =
|
||||
if versionOlder nvidia_x11.version "391" then
|
||||
((nvidiaForKernel pkgs.pkgsi686Linux.linuxPackages).override { libsOnly = true; kernel = null; }).out
|
||||
else
|
||||
(nvidiaForKernel config.boot.kernelPackages).lib32;
|
||||
nvidia_x11 = let
|
||||
drivers = config.services.xserver.videoDrivers;
|
||||
isDeprecated = str: (hasPrefix "nvidia" str) && (str != "nvidia");
|
||||
hasDeprecated = drivers: any isDeprecated drivers;
|
||||
in if (hasDeprecated drivers) then
|
||||
throw ''
|
||||
Selecting an nvidia driver has been modified for NixOS 19.03. The version is now set using `hardware.nvidia.package`.
|
||||
''
|
||||
else if (elem "nvidia" drivers) then cfg.package else null;
|
||||
|
||||
enabled = nvidia_x11 != null;
|
||||
|
||||
cfg = config.hardware.nvidia;
|
||||
|
||||
pCfg = cfg.prime;
|
||||
@ -170,6 +151,16 @@ in
|
||||
GPUs stay awake even during headless mode.
|
||||
'';
|
||||
};
|
||||
|
||||
hardware.nvidia.package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
defaultText = "config.boot.kernelPackages.nvidiaPackages.stable";
|
||||
description = ''
|
||||
The NVIDIA X11 derivation to use.
|
||||
'';
|
||||
example = "config.boot.kernelPackages.nvidiaPackages.legacy340";
|
||||
};
|
||||
};
|
||||
|
||||
config = let
|
||||
@ -271,9 +262,9 @@ in
|
||||
};
|
||||
|
||||
hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out;
|
||||
hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_libs32;
|
||||
hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32;
|
||||
hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out;
|
||||
hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32;
|
||||
hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32;
|
||||
|
||||
environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
|
||||
++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ];
|
||||
|
||||
@ -243,9 +243,11 @@ in
|
||||
restartIfChanged = false;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = [ "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ] ++ pruneCmd;
|
||||
ExecStart = [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ] ++ pruneCmd;
|
||||
User = backup.user;
|
||||
RuntimeDirectory = "restic-backups-${name}";
|
||||
CacheDirectory = "restic-backups-${name}";
|
||||
CacheDirectoryMode = "0700";
|
||||
} // optionalAttrs (backup.s3CredentialsFile != null) {
|
||||
EnvironmentFile = backup.s3CredentialsFile;
|
||||
};
|
||||
|
||||
@ -11,14 +11,21 @@ let
|
||||
else if isBool v then boolToString v
|
||||
else if isString v then ''"${escape [''"''] v}"''
|
||||
else if isList v then "[ " + concatMapStringsSep ", " toConf v + " ]"
|
||||
else if isAttrs v then "\n{\n" + convertAttrs v + "\n}"
|
||||
else abort "clight.toConf: unexpected type (v = ${v})";
|
||||
|
||||
clightConf = pkgs.writeText "clight.conf"
|
||||
(concatStringsSep "\n" (mapAttrsToList
|
||||
(name: value: "${toString name} = ${toConf value};")
|
||||
(filterAttrs
|
||||
(_: value: value != null)
|
||||
cfg.settings)));
|
||||
getSep = v:
|
||||
if isAttrs v then ":"
|
||||
else "=";
|
||||
|
||||
convertAttrs = attrs: concatStringsSep "\n" (mapAttrsToList
|
||||
(name: value: "${toString name} ${getSep value} ${toConf value};")
|
||||
attrs);
|
||||
|
||||
clightConf = pkgs.writeText "clight.conf" (convertAttrs
|
||||
(filterAttrs
|
||||
(_: value: value != null)
|
||||
cfg.settings));
|
||||
in {
|
||||
options.services.clight = {
|
||||
enable = mkOption {
|
||||
@ -49,9 +56,10 @@ in {
|
||||
};
|
||||
|
||||
settings = let
|
||||
validConfigTypes = with types; either int (either str (either bool float));
|
||||
validConfigTypes = with types; oneOf [ int str bool float ];
|
||||
collectionTypes = with types; oneOf [ validConfigTypes (listOf validConfigTypes) ];
|
||||
in mkOption {
|
||||
type = with types; attrsOf (nullOr (either validConfigTypes (listOf validConfigTypes)));
|
||||
type = with types; attrsOf (nullOr (either collectionTypes (attrsOf collectionTypes)));
|
||||
default = {};
|
||||
example = { captures = 20; gamma_long_transition = true; ac_capture_timeouts = [ 120 300 60 ]; };
|
||||
description = ''
|
||||
@ -69,10 +77,10 @@ in {
|
||||
services.upower.enable = true;
|
||||
|
||||
services.clight.settings = {
|
||||
gamma_temp = with cfg.temperature; mkDefault [ day night ];
|
||||
gamma.temp = with cfg.temperature; mkDefault [ day night ];
|
||||
} // (optionalAttrs (config.location.provider == "manual") {
|
||||
latitude = mkDefault config.location.latitude;
|
||||
longitude = mkDefault config.location.longitude;
|
||||
daytime.latitude = mkDefault config.location.latitude;
|
||||
daytime.longitude = mkDefault config.location.longitude;
|
||||
});
|
||||
|
||||
services.geoclue2.appConfig.clightc = {
|
||||
|
||||
@ -37,12 +37,10 @@ in
|
||||
boot.kernelPackages = mkOption {
|
||||
default = pkgs.linuxPackages;
|
||||
type = types.unspecified // { merge = mergeEqualOption; };
|
||||
apply = kernelPackages: kernelPackages.extend (self: super: {
|
||||
kernel = super.kernel.override {
|
||||
inherit randstructSeed;
|
||||
kernelPatches = super.kernel.kernelPatches ++ kernelPatches;
|
||||
features = lib.recursiveUpdate super.kernel.features features;
|
||||
};
|
||||
apply = kernelPackages: pkgs.linuxPackagesFor (kernelPackages.kernel.override {
|
||||
inherit randstructSeed;
|
||||
kernelPatches = kernelPackages.kernel.kernelPatches ++ kernelPatches;
|
||||
features = lib.recursiveUpdate kernelPackages.kernel.features features;
|
||||
});
|
||||
# We don't want to evaluate all of linuxPackages for the manual
|
||||
# - some of it might not even evaluate correctly.
|
||||
|
||||
@ -1,27 +1,20 @@
|
||||
{ fetchFromGitHub, python3Packages, lib, git, graphviz }:
|
||||
{ python3Packages, lib, git, graphviz }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "git-big-picture";
|
||||
version = "1.0.0";
|
||||
version = "1.1.1";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-big-picture";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "14yf71iwgk78nw8w0bpijsnnl4vg3bvxsw3vvypxmbrc1nh0bdha";
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit format version;
|
||||
pname = "git_big_picture"; # underscores needed for working download URL
|
||||
python = "py3"; # i.e. no Python 2.7
|
||||
sha256 = "a20a480057ced1585c4c38497d27a5012f12dd29697313f0bb8fa6ddbb5c17d8";
|
||||
};
|
||||
|
||||
buildInputs = [ git graphviz ];
|
||||
|
||||
# NOTE: Tests are disabled due to unpackaged test dependency "Scruf".
|
||||
# When bumping to 1.1.0, please re-enable and use:
|
||||
#checkInputs = [ cram git pytest ];
|
||||
#checkPhase = "pytest test.py";
|
||||
doCheck = false;
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/git-big-picture \
|
||||
--prefix PATH ":" ${ lib.makeBinPath buildInputs }
|
||||
--prefix PATH ":" ${ lib.makeBinPath [ git graphviz ] }
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osinfo-db";
|
||||
version = "20201119";
|
||||
version = "20201218";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
|
||||
sha256 = "1a0c42rh3anl3wy4hpg36s8k37y8zxpi5lc67wjwnj4j6mwi7w3l";
|
||||
sha256 = "sha256-APKuXWtnpF1r/q2MXddaDeBnBigx4hwMevPwx5uNq3k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];
|
||||
|
||||
@ -16,15 +16,15 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patchPhase = "patchShebangs .";
|
||||
preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
make CC=${buildPackages.stdenv.cc}/bin/cc find_sizes
|
||||
mv find_sizes find_sizes_build
|
||||
make clean
|
||||
|
||||
substituteInPlace Makefile --replace "./find_sizes" "./find_sizes_build"
|
||||
substituteInPlace Makefile --replace "ar cr" "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar cr"
|
||||
substituteInPlace Makefile --replace "ranlib" "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
|
||||
substituteInPlace Makefile --replace "STRIP=strip" "STRIP=${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
|
||||
substituteInPlace Makefile --replace "ar cr" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar cr"
|
||||
substituteInPlace Makefile --replace "ranlib" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
|
||||
substituteInPlace Makefile --replace "STRIP=strip" "STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
|
||||
'';
|
||||
nativeBuildInputs = [ perl zlib ];
|
||||
# buildInputs = [ zlib ];
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ijg.org/files/jpegsrc.v9d.tar.gz";
|
||||
sha256 = "0clwys9lcqlxqgcw8s1gwfm5ix2zjlqpklmd3mbvqmj5ibj51jwr";
|
||||
sha256 = "1vkip9rz4hz8f31a2kl7wl7f772wg1z0fg1fbd1653wzwlxllhvc";
|
||||
};
|
||||
|
||||
configureFlags = optional static "--enable-static --disable-shared";
|
||||
|
||||
@ -11,14 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mbedtls";
|
||||
name = "mbedtls-${version}";
|
||||
version = "2.16.3"; # nixpkgs-update: no auto update
|
||||
version = "2.16.9"; # nixpkgs-update: no auto update
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ARMmbed";
|
||||
repo = "mbedtls";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1mzh92yyz93099a1gb2wvwc76jv12d1k1wg9k3dimbgczxgrkirc";
|
||||
sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja perl python ];
|
||||
|
||||
@ -137,12 +137,12 @@
|
||||
version = "${versionMajor}.${versionMinor}.${versionAdditional}-1";
|
||||
|
||||
versionMajor = "17";
|
||||
versionMinor = "5";
|
||||
versionMinor = "7";
|
||||
versionAdditional = "1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb";
|
||||
sha256 = "0ysrl01z5ca72qw8n8kwwcl432cgiyw4pibfwg5nifx0kd7i7z4z";
|
||||
url = "https://packages.microsoft.com/debian/10/prod/pool/main/m/msodbcsql17/msodbcsql${versionMajor}_${version}_amd64.deb";
|
||||
sha256 = "0vwirnp56jibm3qf0kmi4jnz1w7xfhnsfr8imr0c9hg6av4sk3a6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg patchelf ];
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apache-libcloud";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2e3e4d02f9b3197f9119e737bc704fba52f34459d4bc96d8ad8f183d600747ba";
|
||||
sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d";
|
||||
};
|
||||
|
||||
checkInputs = [ mock pytest pytestrunner requests-mock ];
|
||||
@ -28,9 +28,12 @@ buildPythonPackage rec {
|
||||
# requires a certificates file
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "libcloud" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A unified interface to many cloud providers";
|
||||
homepage = "http://incubator.apache.org/libcloud/";
|
||||
homepage = "https://libcloud.apache.org/";
|
||||
changelog = "https://github.com/apache/libcloud/blob/v${version}/CHANGES.rst";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rich";
|
||||
version = "9.1.0";
|
||||
version = "9.10.0";
|
||||
|
||||
# tests not included in pypi tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "willmcgugan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "18iha0fs8vm0j11k39yxj26h8qxrp27ijhx6h1yyizbygmr5b5nk";
|
||||
sha256 = "1m1rswg16r4pxv7504nk7lpyxrwf16xw4w55rs3jisryx14ccic6";
|
||||
};
|
||||
format = "pyproject";
|
||||
|
||||
|
||||
@ -51,15 +51,15 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
gradle_latest = gradle_6_7;
|
||||
gradle_latest = gradle_6_8;
|
||||
|
||||
gradle_6_7 = gradleGen rec {
|
||||
name = "gradle-6.7";
|
||||
nativeVersion = "0.22-milestone-8";
|
||||
gradle_6_8 = gradleGen rec {
|
||||
name = "gradle-6.8.1";
|
||||
nativeVersion = "0.22-milestone-9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "1i6zm55wzy13wvvmf3804b0rs47yrqqablf4gpf374ls05cpgmca";
|
||||
sha256 = "1zfn7400k39qbiidd5zxay6v5f5xz8x4g7rrf04p71bkmws1lngx";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
@ -30,10 +31,10 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${stdenv.lib.makeBinPath [ valgrind ]}
|
||||
wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner'';
|
||||
homepage = "https://github.com/jfrimmel/cargo-valgrind";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
|
||||
@ -88,7 +88,7 @@ let
|
||||
'';
|
||||
|
||||
# The default one still uses jdk8 (#89731)
|
||||
gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_7;
|
||||
gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_8;
|
||||
|
||||
# fake build to pre-download deps into fixed-output derivation
|
||||
deps = stdenv.mkDerivation {
|
||||
|
||||
@ -1,11 +1,17 @@
|
||||
{ lib, callPackage, fetchpatch, fetchurl, stdenv }:
|
||||
{ lib, callPackage, fetchpatch, fetchurl, stdenv, pkgsi686Linux }:
|
||||
|
||||
let
|
||||
|
||||
generic = args:
|
||||
if ((!lib.versionOlder args.version "391")
|
||||
generic = args: let
|
||||
imported = import ./generic.nix args;
|
||||
in if ((!lib.versionOlder args.version "391")
|
||||
&& stdenv.hostPlatform.system != "x86_64-linux") then null
|
||||
else callPackage (import ./generic.nix args) { };
|
||||
else callPackage imported {
|
||||
lib32 = (pkgsi686Linux.callPackage imported {
|
||||
libsOnly = true;
|
||||
kernel = null;
|
||||
}).out;
|
||||
};
|
||||
|
||||
kernel = callPackage # a hacky way of extracting parameters from callPackage
|
||||
({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
|
||||
|
||||
|
||||
@ -25,6 +25,8 @@
|
||||
, # don't include the bundled 32-bit libraries on 64-bit platforms,
|
||||
# even if it’s in downloaded binary
|
||||
disable32Bit ? false
|
||||
# 32 bit libs only version of this package
|
||||
, lib32 ? null
|
||||
}:
|
||||
|
||||
with lib;
|
||||
@ -93,6 +95,8 @@ let
|
||||
};
|
||||
persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256;
|
||||
inherit persistencedVersion settingsVersion;
|
||||
} // optionalAttrs (!i686bundled) {
|
||||
inherit lib32;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, autoPatchelfHook
|
||||
, fetchurl
|
||||
, file
|
||||
@ -60,11 +61,11 @@ stdenv.mkDerivation {
|
||||
pleroma = nixosTests.pleroma;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "ActivityPub microblogging server";
|
||||
homepage = https://git.pleroma.social/pleroma/pleroma;
|
||||
license = stdenv.lib.licenses.agpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [ ninjatrappeur ];
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ ninjatrappeur ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgrouting";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ postgresql boost ];
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "pgRouting";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9M8Hug+znihViHC/57aPyc7Zgbeb1H8a/iVCfAG/Am8=";
|
||||
sha256 = "sha256-ahDQ+nSTeIsdjID/ZwiGZCVBzOf0/oQs3SYsFYEEoxY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}";
|
||||
maintainers = [ maintainers.steve-chavez ];
|
||||
platforms = postgresql.meta.platforms;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plpgsql_check";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0rjbzcdvwx19ql0ilccr47inilf7kh5hn7aacjqs1nxk91g3x7yf";
|
||||
sha256 = "sha256-mYFItrFC0BeRwLfZA1SAV+4rvrNrx75lTWS7w2ZDHag=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tt-rss";
|
||||
version = "2019-01-29";
|
||||
rev = "c7c9c5fb0ab6b3d4ea3078865670d6c1dfe2ecac";
|
||||
version = "2021-01-29";
|
||||
rev = "6d8f2221b82b6a31becbeed8baf5e05ad9e053fe";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz";
|
||||
sha256 = "0k184zqrfscv17gnl106q4yzhqmxb0g1dn1wkdkrclc3qcrviyp6";
|
||||
url = "https://git.tt-rss.org/fox/tt-rss/archive/${rev}.tar.gz";
|
||||
sha256 = "124c62hck631xlq5aa1miz9rbg711ygk7z1yx92m5dfcy630l7x5";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -152,9 +152,12 @@ let
|
||||
inherit lib config stdenv;
|
||||
}) mkDerivation;
|
||||
|
||||
# For convenience, bring in the library functions in lib/ so
|
||||
# packages don't have to do that themselves.
|
||||
inherit lib;
|
||||
# Slated for deprecation in 21.11
|
||||
lib = builtins.trace
|
||||
( "Warning: `stdenv.lib` is deprecated and will be removed in the next release."
|
||||
+ " Please use `pkgs.lib` instead."
|
||||
+ " For more information see https://github.com/NixOS/nixpkgs/issues/108938")
|
||||
lib;
|
||||
|
||||
inherit fetchurlBoot;
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kdiff3";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1f1vyhvc31yfxspv5lzw8qjd2w8x74s2fmij1921m307g84qxqbn";
|
||||
sha256 = "sha256-vJL30E6xI/nFbb4wR69nv3FSQPqZSHrB0czypF4IVME=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
|
||||
@ -12205,7 +12205,7 @@ in
|
||||
gradle_4_10 = res.gradleGen.gradle_4_10;
|
||||
gradle_4 = gradle_4_10;
|
||||
gradle_5 = res.gradleGen.gradle_5_6;
|
||||
gradle_6 = res.gradleGen.gradle_6_7;
|
||||
gradle_6 = res.gradleGen.gradle_6_8;
|
||||
|
||||
gperf = callPackage ../development/tools/misc/gperf { };
|
||||
# 3.1 changed some parameters from int to size_t, leading to mismatches.
|
||||
|
||||
@ -12340,10 +12340,10 @@ let
|
||||
|
||||
MathPlanePath = buildPerlPackage {
|
||||
pname = "Math-PlanePath";
|
||||
version = "127";
|
||||
version = "129";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-127.tar.gz";
|
||||
sha256 = "1dzywpydigwyr38vz9f4yn7xkkk21vi6lyzjlyqv8iny0y0c7w20";
|
||||
url = "mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-129.tar.gz";
|
||||
sha256 = "0zirgq9n422wc1j95pijkr88wwmzhll5nxh3sb2vcxsh9l75v8cd";
|
||||
};
|
||||
propagatedBuildInputs = [ MathLibm constant-defer ];
|
||||
buildInputs = [ DataFloat MathBigIntLite NumberFraction ];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user