Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
859acbc1bc
34 changed files with 261 additions and 150 deletions
|
|
@ -28,6 +28,7 @@ let
|
|||
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
|
||||
"armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux"
|
||||
"powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux"
|
||||
"m68k-linux"
|
||||
|
||||
# MMIXware
|
||||
"mmix-mmixware"
|
||||
|
|
@ -39,7 +40,7 @@ let
|
|||
|
||||
# none
|
||||
"aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none"
|
||||
"or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none"
|
||||
"or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none" "m68k-none"
|
||||
"x86_64-none"
|
||||
|
||||
# OpenBSD
|
||||
|
|
@ -74,6 +75,7 @@ in {
|
|||
riscv = filterDoubles predicates.isRiscV;
|
||||
vc4 = filterDoubles predicates.isVc4;
|
||||
or1k = filterDoubles predicates.isOr1k;
|
||||
m68k = filterDoubles predicates.isM68k;
|
||||
js = filterDoubles predicates.isJavaScript;
|
||||
|
||||
bigEndian = filterDoubles predicates.isBigEndian;
|
||||
|
|
|
|||
|
|
@ -144,6 +144,10 @@ rec {
|
|||
libc = "newlib";
|
||||
};
|
||||
|
||||
m68k = {
|
||||
config = "m68k-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
arm-embedded = {
|
||||
config = "arm-none-eabi";
|
||||
libc = "newlib";
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ rec {
|
|||
isAvr = { cpu = { family = "avr"; }; };
|
||||
isAlpha = { cpu = { family = "alpha"; }; };
|
||||
isOr1k = { cpu = { family = "or1k"; }; };
|
||||
isM68k = { cpu = { family = "m68k"; }; };
|
||||
isJavaScript = { cpu = cpuTypes.js; };
|
||||
|
||||
is32bit = { cpu = { bits = 32; }; };
|
||||
|
|
|
|||
|
|
@ -95,6 +95,8 @@ rec {
|
|||
|
||||
mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; };
|
||||
|
||||
m68k = { bits = 32; significantByte = bigEndian; family = "m68k"; };
|
||||
|
||||
powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };
|
||||
powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; };
|
||||
powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; };
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests {
|
|||
testredox = mseteq redox [ "x86_64-redox" ];
|
||||
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
|
||||
testillumos = mseteq illumos [ "x86_64-solaris" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" ];
|
||||
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
|
||||
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
|
||||
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
|
||||
|
|
|
|||
|
|
@ -32,6 +32,11 @@
|
|||
from Python 3.8.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
PostgreSQL now defaults to major version 13.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-new-services">
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `python3` now defaults to Python 3.9, updated from Python 3.8.
|
||||
|
||||
- PostgreSQL now defaults to major version 13.
|
||||
|
||||
## New Services {#sec-release-21.11-new-services}
|
||||
|
||||
- [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances).
|
||||
|
|
|
|||
|
|
@ -293,7 +293,8 @@ in
|
|||
# Note: when changing the default, make it conditional on
|
||||
# ‘system.stateVersion’ to maintain compatibility with existing
|
||||
# systems!
|
||||
mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11
|
||||
mkDefault (if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13
|
||||
else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11
|
||||
else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
|
||||
else throw "postgresql_9_5 was removed, please upgrade your postgresql version.");
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "geoipupdate";
|
||||
version = "4.7.1";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxmind";
|
||||
repo = "geoipupdate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nshQxr6y3TxKsAVSA9mzL7LJfCtpv0QuuTTqk3/lENc=";
|
||||
sha256 = "sha256-fcz1g17JR6jOpq5zOpCmnI00hyXSYYGHfoFRE8/c8dk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-fqQWFhFeyW4GntRBxEeN6WSOo0G+1hH9vSEZmBKglz8=";
|
||||
vendorSha256 = "sha256-YawWlPZV4bBOsOFDo2nIXKWwcxb5hWy5OiB99MG0HcY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nnn";
|
||||
version = "4.1.1";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09z37lv57nbp0l1ax28558jk5jv91lb22bgaclirvdyz2qp47xhj";
|
||||
sha256 = "sha256-ICUF/LJhsbzDz9xZig1VE6TdG3u0C6Jf/61RoAjx3KI=";
|
||||
};
|
||||
|
||||
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "finalfusion-utils";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "finalfusion";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0gxcjrhfa86kz5qmdf5h278ydc3nc0nfj61brnykb723mg45jj41";
|
||||
sha256 = "sha256-ME0qDSFD8G492+7ex7VQWh9P76a+tOCo+SJ9n9ZIYUI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0dj3xpinzzdfgy06wkp336sp1nyqk7nnvd3hwhyysripmz9apdgg";
|
||||
cargoSha256 = "sha256-/rLv2/bcVsmWw+ZfyumDcj0ptHPQBCCYR9O/lVlV+G0=";
|
||||
|
||||
# Enables build against a generic BLAS.
|
||||
cargoBuildFlags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
buildKodiBinaryAddon rec {
|
||||
pname = "inputstream-adaptive";
|
||||
namespace = "inputstream.adaptive";
|
||||
version = "2.6.20";
|
||||
version = "2.6.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "inputstream.adaptive";
|
||||
rev = "${version}-${rel}";
|
||||
sha256 = "0g0pvfdmnd3frsd5sdckv3llwyjiw809rqy1slq3xj6i08xhcmd5";
|
||||
sha256 = "sha256-WSFbDuUgw0WHWb3ZZVavwpu1TizU9lMA5JAC5haR7c0=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ gtest ];
|
||||
|
|
|
|||
|
|
@ -208,6 +208,7 @@ stdenv.mkDerivation {
|
|||
else if targetPlatform.isAlpha then "alpha"
|
||||
else if targetPlatform.isVc4 then "vc4"
|
||||
else if targetPlatform.isOr1k then "or1k"
|
||||
else if targetPlatform.isM68k then "m68k"
|
||||
else if targetPlatform.isRiscV then "lriscv"
|
||||
else throw "unknown emulation for platform: ${targetPlatform.config}";
|
||||
in if targetPlatform.useLLVM or false then ""
|
||||
|
|
|
|||
|
|
@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [ "PYTHON=python" ];
|
||||
installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
|
||||
|
||||
doCheck = true;
|
||||
# Checks are broken on aarch64 darwin
|
||||
# https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Device Tree Compiler";
|
||||
|
|
|
|||
35
pkgs/development/interpreters/s9fes/default.nix
Normal file
35
pkgs/development/interpreters/s9fes/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ stdenv, lib, fetchurl, ncurses, buildPackages }:
|
||||
|
||||
let
|
||||
isCrossCompiling = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s9fes";
|
||||
version = "20181205";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.t3x.org/s9fes/s9fes-${version}.tgz";
|
||||
sha256 = "sha256-Lp/akaDy3q4FmIE6x0fj9ae/SOD7tdsmzy2xdcCh13o=";
|
||||
};
|
||||
|
||||
# Fix cross-compilation
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace 'ar q' '${stdenv.cc.targetPrefix}ar q' \
|
||||
--replace 'strip' '${stdenv.cc.targetPrefix}strip'
|
||||
${lib.optionalString isCrossCompiling "substituteInPlace Makefile --replace ./s9 '${buildPackages.s9fes}/bin/s9'"}
|
||||
'';
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scheme 9 From Empty Space, an interpreter for R4RS Scheme";
|
||||
homepage = "http://www.t3x.org/s9fes/index.html";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,32 +1,37 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, alcotest, cppo
|
||||
, ocaml-migrate-parsetree, ppx_tools_versioned, reason, yojson }:
|
||||
{ lib, buildDunePackage, fetchFromGitHub, alcotest, reason
|
||||
, ppxlib
|
||||
, yojson }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "graphql_ppx";
|
||||
version = "1.0.1";
|
||||
version = "1.2.0";
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reasonml-community";
|
||||
repo = "graphql-ppx";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lvmv1sb0ca9mja6di1dbmsgjqgj3w9var4amv1iz9nhwjjx4cpi";
|
||||
sha256 = "1fymmvk616wv5xkwfdmqibdgfl47ry6idc5wfh20a3mz9mpaa13s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ cppo ocaml-migrate-parsetree ppx_tools_versioned reason yojson ];
|
||||
buildInputs = [ ppxlib ];
|
||||
|
||||
checkInputs = lib.optional doCheck alcotest;
|
||||
propagatedBuildInputs = [
|
||||
reason
|
||||
yojson
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/reasonml-community/graphql_ppx";
|
||||
description = "GraphQL PPX rewriter for Bucklescript/ReasonML";
|
||||
license = lib.licenses.bsd3;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ Zimmi48 jtcoolen ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ppx_irmin";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
|
||||
sha256 = "fac7c032f472fb369378ad2d8fe77e7cd3b3c1c6a0d7bf59980b69528891b399";
|
||||
sha256 = "29c68c5001a727aaa7a6842d6204ffa3e24b3544fa4f6af2234cdbfa032f7fdf";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml
|
||||
, cppo, dune-configurator, ocaml-migrate-parsetree, ocplib-endian, result
|
||||
, cppo, dune-configurator, ocplib-endian, result
|
||||
, mmap, seq
|
||||
, ocaml-syntax-shims
|
||||
}:
|
||||
|
|
@ -18,7 +18,7 @@ buildDunePackage rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ cppo dune-configurator ocaml-migrate-parsetree ]
|
||||
buildInputs = [ cppo dune-configurator ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims
|
||||
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
|
||||
propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastparquet";
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY=";
|
||||
hash = "sha256-08hanzRnt6WuMriNNtOd+ZHycr2XBeIRav+5sgvT7Do=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
|
|
@ -32,6 +33,16 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# https://github.com/jborean93/smbprotocol/issues/119
|
||||
"test_copymode_local_to_local_symlink_dont_follow"
|
||||
"test_copystat_local_to_local_symlink_dont_follow_fail"
|
||||
|
||||
# fail in sandbox due to networking
|
||||
"test_small_recv"
|
||||
"test_recv_"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "smbprotocol" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.155.1";
|
||||
version = "0.156.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-tlnABN/mcUsR8tgqgrQT+t6joo6wJMeGKtcbjyiVbbE=";
|
||||
sha256 = "sha256-aV5qcXxNLljeM3MrXg8ptAST8ARCb3kR83oy5G9fbak=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -18,13 +18,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
install -D ${src} "$out/libexec/apktool/apktool.jar"
|
||||
mkdir -p "$out/bin"
|
||||
makeWrapper "${jre}/bin/java" "$out/bin/apktool" \
|
||||
--add-flags "-jar $out/libexec/apktool/apktool.jar" \
|
||||
--prefix PATH : "${builtins.head build-tools}/libexec/android-sdk/build-tools/28.0.3"
|
||||
'';
|
||||
installPhase =
|
||||
let
|
||||
tools = builtins.head build-tools;
|
||||
in ''
|
||||
install -D ${src} "$out/libexec/apktool/apktool.jar"
|
||||
mkdir -p "$out/bin"
|
||||
makeWrapper "${jre}/bin/java" "$out/bin/apktool" \
|
||||
--add-flags "-jar $out/libexec/apktool/apktool.jar" \
|
||||
--prefix PATH : "${tools}/libexec/android-sdk/build-tools/${tools.version}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for reverse engineering Android apk files";
|
||||
|
|
|
|||
23
pkgs/development/tools/knightos/regenkfs/default.nix
Normal file
23
pkgs/development/tools/knightos/regenkfs/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "regenkfs";
|
||||
version = "unstable-2020-10-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siraben";
|
||||
repo = "regenkfs";
|
||||
rev = "652155445fc39bbe6628f6b9415b5cd6863f592f";
|
||||
sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ=";
|
||||
cargoBuildFlags = [ "--features=c-undef" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reimplementation of genkfs in Rust";
|
||||
homepage = "https://github.com/siraben/regenkfs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
};
|
||||
}
|
||||
22
pkgs/development/tools/knightos/remkrom/default.nix
Normal file
22
pkgs/development/tools/knightos/remkrom/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "remkrom";
|
||||
version = "unstable-2020-10-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siraben";
|
||||
repo = "remkrom";
|
||||
rev = "86a0b19c1d382a029ecaa96eeca7e9f76c8561d6";
|
||||
sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reimplementation of mkrom in Rust";
|
||||
homepage = "https://github.com/siraben/remkrom";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
};
|
||||
}
|
||||
|
|
@ -425,12 +425,12 @@ final: prev:
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-07-23";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "a33313899a56b936c889f9faaad798d429997042";
|
||||
sha256 = "1mqcwvmnn4lbl4901gh5rsfagcx464zdaw0rq0sn0fkyx4ydq9s0";
|
||||
rev = "139ca9bb8685a2d9b807d869a49a85fcd42811f7";
|
||||
sha256 = "1739vvb9rzlkyrq63lgadhf2azaszy2xhy52hw91rczg8xw7zfc5";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -1437,12 +1437,12 @@ final: prev:
|
|||
|
||||
embark-vim = buildVimPluginFrom2Nix {
|
||||
pname = "embark-vim";
|
||||
version = "2021-04-25";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "embark-theme";
|
||||
repo = "vim";
|
||||
rev = "95847fbae47aa5d49b6470568b8151a93e15307a";
|
||||
sha256 = "06qvnbhwm2gl8921hyq75dwxxfbkwfvvsn4pci89831qn6w3pa6f";
|
||||
rev = "03029f4ec49cd0dd1d16eb9561742f5c9f794e71";
|
||||
sha256 = "14gnndh40h8qlymsb9lkycn4w7jv8f7kk0yjxi4wzjvycg7mrplx";
|
||||
};
|
||||
meta.homepage = "https://github.com/embark-theme/vim/";
|
||||
};
|
||||
|
|
@ -1522,12 +1522,12 @@ final: prev:
|
|||
|
||||
feline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "feline-nvim";
|
||||
version = "2021-07-11";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "famiu";
|
||||
repo = "feline.nvim";
|
||||
rev = "4c04c967691d028b4056f726735db329039cdff2";
|
||||
sha256 = "18z9dl58mfmffysr8g5drd6iy79fwn463lagp629cdghrjxcq65c";
|
||||
rev = "fb51d6ba6363d10d6fc9e14d0fcef09fd402e431";
|
||||
sha256 = "1cpk0jyhgx93bvjpc76gjp671k53av8mj6d19j4zwm3xm5v1by2p";
|
||||
};
|
||||
meta.homepage = "https://github.com/famiu/feline.nvim/";
|
||||
};
|
||||
|
|
@ -1546,12 +1546,12 @@ final: prev:
|
|||
|
||||
fern-vim = buildVimPluginFrom2Nix {
|
||||
pname = "fern-vim";
|
||||
version = "2021-07-03";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lambdalisue";
|
||||
repo = "fern.vim";
|
||||
rev = "1b234d8ec0ffadf7fe3f4ddba13480dd4adeb7c7";
|
||||
sha256 = "1prl720r82mp89jfciw50pd2cygp97v46w7vq30b1m4v3016lh15";
|
||||
rev = "a4d4288a11d0e50214c4f5745da5f8ce39cb2a6d";
|
||||
sha256 = "1ldv2ar8dm2arawxkzi2r7r1c6wacl9g9dkmyib038bdmr4qfn1g";
|
||||
};
|
||||
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
|
||||
};
|
||||
|
|
@ -2722,6 +2722,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
|
||||
};
|
||||
|
||||
lualine-lsp-progress = buildVimPluginFrom2Nix {
|
||||
pname = "lualine-lsp-progress";
|
||||
version = "2021-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "arkav";
|
||||
repo = "lualine-lsp-progress";
|
||||
rev = "7c024f40a3b26c8f7925745cdd2fe7acc96939c4";
|
||||
sha256 = "0flmd69d7kjzcnzclx6k2yxjfy9nmkwxjlrgl3sszw5qpffxjlk1";
|
||||
};
|
||||
meta.homepage = "https://github.com/arkav/lualine-lsp-progress/";
|
||||
};
|
||||
|
||||
lualine-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lualine-nvim";
|
||||
version = "2021-05-27";
|
||||
|
|
@ -3144,12 +3156,12 @@ final: prev:
|
|||
|
||||
neoformat = buildVimPluginFrom2Nix {
|
||||
pname = "neoformat";
|
||||
version = "2021-07-20";
|
||||
version = "2021-07-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbdchd";
|
||||
repo = "neoformat";
|
||||
rev = "f9fa0e31f9e5c7aaa2ea2091ca64b28d84d485c0";
|
||||
sha256 = "1bv75ijvs63r88nghjk5ljjz06r6xbp3923r3c17p1d3ks2qsfxa";
|
||||
rev = "b676afbf57bd3fb256a7a45605cac06407eff5a1";
|
||||
sha256 = "1ln4sqj00xw2dnn3gwshxdzaq5gaknbs59cksrr7i7mj902lqr8v";
|
||||
};
|
||||
meta.homepage = "https://github.com/sbdchd/neoformat/";
|
||||
};
|
||||
|
|
@ -3424,8 +3436,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "shaunsingh";
|
||||
repo = "nord.nvim";
|
||||
rev = "4308ebe128e25704bc1b1ef20133d68d8fba2db0";
|
||||
sha256 = "07wcm7gjv48b1z33qixb52bvq7qj44dalmzjbms2wlg00zgq38kf";
|
||||
rev = "b7209e7657dcc786b844a920894a517571da1317";
|
||||
sha256 = "1iaslrhq18myxwla41n3kllvwcn3hb5zcgfl3h6zw4ar8n9pvwdr";
|
||||
};
|
||||
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
|
||||
};
|
||||
|
|
@ -3456,12 +3468,12 @@ final: prev:
|
|||
|
||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "null-ls-nvim";
|
||||
version = "2021-07-22";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "2c2aec89bb85cc38e9fd6f83a93bb748ae462a01";
|
||||
sha256 = "11qfbn54h7ckggf9va2qawpl81mbm985lr893gvimfkwl6v3zqlp";
|
||||
rev = "52286ee4d11016b3366481935c12211c44d43777";
|
||||
sha256 = "0lf0d2b2yajjv39l9zy0h5cmrnah8ig7fk3ckmlpvcfhrlqry9j8";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
};
|
||||
|
|
@ -3504,12 +3516,12 @@ final: prev:
|
|||
|
||||
nvim-autopairs = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-autopairs";
|
||||
version = "2021-07-23";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-autopairs";
|
||||
rev = "5a86b4f83c1f17b27a02c191dcebb0441c0531bb";
|
||||
sha256 = "1c4jcdjmafkpcq2vma39vsdm93al8yi3q8n6i4hfvmw8lvsxcfy6";
|
||||
rev = "e3e105b11a3b34e93bdcee0c895801cf3ed2a835";
|
||||
sha256 = "0pgg4xvq0dxn4rzip7nzzy1sscm8v1fixkwlpr9jdbp86s9kkq87";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
|
||||
};
|
||||
|
|
@ -3612,24 +3624,24 @@ final: prev:
|
|||
|
||||
nvim-dap = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap";
|
||||
version = "2021-07-23";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-dap";
|
||||
rev = "9dc887db1c266aab2ebddf3845d22587f15e92a6";
|
||||
sha256 = "10klagr9ybk96ayhsxd1qp2mjpkrv0a70lh571ixmdf90a6zkg4y";
|
||||
rev = "b557bf8d503c966a4233a72449a80ebcaaed5415";
|
||||
sha256 = "0p6jq9a6xgbxpjcffm6bk88aicqg05cnk0an5j0cy60s7hp5vvv7";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||
};
|
||||
|
||||
nvim-dap-ui = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap-ui";
|
||||
version = "2021-06-29";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcarriga";
|
||||
repo = "nvim-dap-ui";
|
||||
rev = "e32b33dae9d8d738f86f84699d4f978f8d9deb02";
|
||||
sha256 = "0sdx890gk79qyyjs946kq3anyq8yyxvkg9sfphiavq5xs9840ps1";
|
||||
rev = "10a57a6b6973661d7082589df3bafc949f004346";
|
||||
sha256 = "10w6wxn3gf3pn6xw9ws05pxqp4a4ssg252bq7bsq8xys9saf12gy";
|
||||
};
|
||||
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
|
||||
};
|
||||
|
|
@ -3720,12 +3732,12 @@ final: prev:
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-07-20";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "4f72377143fc0961391fb0e42e751b9f677fca4e";
|
||||
sha256 = "1w9gjnv98gv8jwkkw1x5jsnc8366w1jcllipxlrij97z6hspqc8m";
|
||||
rev = "00028be5527abbc829ae8263cb3319dcae08e8ec";
|
||||
sha256 = "17vxq8b70v9kq7labi3di0r6rgdhf4vz4mkiw6ji26pa60bfxy8w";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -4481,8 +4493,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "simrat39";
|
||||
repo = "rust-tools.nvim";
|
||||
rev = "a0be4f89830210c5203ea2bee1373041400a59d1";
|
||||
sha256 = "1f5s9shmlpixw6lkywbnbfcqhqvaczmbhys243pn96pv4bsy09r5";
|
||||
rev = "160aeb66e46e863802c2e4c5a772c3858bc02fd0";
|
||||
sha256 = "108nxkbybl1fvyawgq0mzbi2c5fadycxj0pnnnsw8alycyjln13f";
|
||||
};
|
||||
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
|
||||
};
|
||||
|
|
@ -4561,12 +4573,12 @@ final: prev:
|
|||
|
||||
semshi = buildVimPluginFrom2Nix {
|
||||
pname = "semshi";
|
||||
version = "2021-07-13";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numirias";
|
||||
repo = "semshi";
|
||||
rev = "39c7500032f35711aecb492affd989433b984f14";
|
||||
sha256 = "14hv67fhmq85m382grc6h07r5xs83mmx3j8nf94j60gwbybhlkdb";
|
||||
rev = "252f07fd5f0ae9eb19d02bae979fd7c9152c1ccf";
|
||||
sha256 = "0r1nrkhyhk08vfhf9hnbhjlnqy0imqhdqx31y301k2kb31hyiyq3";
|
||||
};
|
||||
meta.homepage = "https://github.com/numirias/semshi/";
|
||||
};
|
||||
|
|
@ -5169,8 +5181,8 @@ final: prev:
|
|||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "79644ab67731c7ba956c354bf0545282f34e10cc";
|
||||
sha256 = "0v7qpblbgs298aj0p5fs4q8b8zc36ib427aq78c0500988p6hr3d";
|
||||
rev = "c0f1999b0280bb042bba01c930dd94a4bfdee363";
|
||||
sha256 = "13igy3nph7vg1pnq7hjvql71i0031xdxgkiyd1h38chcs7whvxzf";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -6822,12 +6834,12 @@ final: prev:
|
|||
|
||||
vim-fugitive = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fugitive";
|
||||
version = "2021-07-21";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-fugitive";
|
||||
rev = "a7c54990f031ab93b556ceb25c5afb8a45c3311a";
|
||||
sha256 = "0ld8p75av2v9ki5sh7rh8cxj99k6lydhy6jp9x19fk8bzxsgff02";
|
||||
rev = "75b2a9a8daf6589f9747ff4f2d068fdea54e92ea";
|
||||
sha256 = "1c265bq5a60y7ndpvwdn54kdzb6spdfnkfdaffp47rgq0y1pfphj";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-fugitive/";
|
||||
};
|
||||
|
|
@ -7749,12 +7761,12 @@ final: prev:
|
|||
|
||||
vim-matchup = buildVimPluginFrom2Nix {
|
||||
pname = "vim-matchup";
|
||||
version = "2021-07-19";
|
||||
version = "2021-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andymass";
|
||||
repo = "vim-matchup";
|
||||
rev = "61802ad25f303dc37f575cbed9b902605353db49";
|
||||
sha256 = "15c8y5rfsnmx4dm01advvax8flkibkg60lbs8x0xgyzfcqjzhl14";
|
||||
rev = "8ae49bf65c960f6260f2d475b35b068bc6b822f2";
|
||||
sha256 = "1r0car7vbz57b5fq7kjibsdi6knw50n8az145dbfq8svkf7s1fvy";
|
||||
};
|
||||
meta.homepage = "https://github.com/andymass/vim-matchup/";
|
||||
};
|
||||
|
|
@ -9310,12 +9322,12 @@ final: prev:
|
|||
|
||||
vim-ultest = buildVimPluginFrom2Nix {
|
||||
pname = "vim-ultest";
|
||||
version = "2021-07-18";
|
||||
version = "2021-07-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcarriga";
|
||||
repo = "vim-ultest";
|
||||
rev = "06f965a62c32906f220c37e7b758a275d6a992f6";
|
||||
sha256 = "0zgpp6g29n1kb0qi6n84i1d540g0xhw5bzj8kp5xsh5wlvn9h4fk";
|
||||
rev = "54eaa1b19c924551e9988063926533583e41b24c";
|
||||
sha256 = "16d38yc4v0fy7w8qdrbx134f99xny4kfgwgazqa47cgj8nrb0n4g";
|
||||
};
|
||||
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ antoinemadec/coc-fzf
|
|||
antoinemadec/FixCursorHold.nvim
|
||||
ap/vim-css-color
|
||||
arcticicestudio/nord-vim
|
||||
arkav/lualine-lsp-progress
|
||||
arthurxavierx/vim-unicoder
|
||||
artur-shaik/vim-javacomplete2
|
||||
autozimu/LanguageClient-neovim
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jackett";
|
||||
version = "0.18.455";
|
||||
version = "0.18.459";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
|
||||
sha256 = "sha256-qEuhgtDtdMCHJtUcUDUmKI8FT0ti7veleI7UhwTAUfE=";
|
||||
sha256 = "sha256-KOdUMJ29bqJ7WyE4BxMDRsPdIKwZNRfrbIItdoeexUk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.23.5.4841-549599676";
|
||||
version = "1.23.5.4862-0f739d462";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "168aill68fcq3cv3a78yhqnfxziww8r80is179y9jxmhymnmzp9q";
|
||||
sha256 = "1qbv30ki8xw9vdvqw8fh56br8gkm1ndcw361sal7ahn62d4h85nq";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "0cp2likx2dqy6j5icp5n07kg1md9qvq9vsh4818m86r2p015qlvb";
|
||||
sha256 = "1ac169197gfi78mnm46lhgvzlg2y9c0pzdm5a6031lfalqc7z9nc";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
|||
|
|
@ -34,16 +34,16 @@ let
|
|||
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "Ajour";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casperstorm";
|
||||
repo = "ajour";
|
||||
rev = version;
|
||||
sha256 = "0xmjr8brjmkk13dsn3yvcl5ss6b214hpka0idk072n46qsyhg2wh";
|
||||
sha256 = "sha256-arb6wPoDlNdBxSQ+G0KyN4Pbd0nPhb+DbvRlbPaPtPI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "06d1h2c2abg56567znxh65d4ddpi6wvxip9rbzkmdnzgy3b3y2wl";
|
||||
cargoSha256 = "sha256-1hK6C10oM5b8anX+EofekR686AZR5LcpXyhVkmHcSwA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grpcurl";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fullstorydev";
|
||||
repo = "grpcurl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BxmoIGhuAt/uhHLNdMiSrNVWAoxAAMKPJ/NsXjf2ynk=";
|
||||
sha256 = "sha256-/no8bRGoKibtcjaITUuzwAbX+gPHNJROSf79iuuRwe4=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/grpcurl" ];
|
||||
|
||||
vendorSha256 = "sha256-EnstvJk2kZ1Ft5xY1dO14wnmT//2K72OnDMZqeaOeQI=";
|
||||
vendorSha256 = "sha256-nl8vKVhUMSO20qCDyhNkU5cghNy8vIFqSBvLk59nbWg=";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-07-22";
|
||||
version = "2021-07-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pmi1oKam3t4iKqbisFghdVlzp1Ozmc9Nmn19JLrsams=";
|
||||
sha256 = "sha256-UMajZExQjrbXon/tNYt+xp9LM7QRVXefGHDYuu949AQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -101,6 +101,8 @@ mapAliases ({
|
|||
buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
|
||||
buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26
|
||||
buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26
|
||||
buildkite-agent2 = throw "buildkite-agent2 has been discontinued. Please use buildkite-agent (v3.x)"; # added 2018-09-26
|
||||
buildkite-agent3 = buildkite-agent; # added 2018-09-26
|
||||
bundler_HEAD = bundler; # added 2015-11-15
|
||||
calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13
|
||||
calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13
|
||||
|
|
@ -340,6 +342,7 @@ mapAliases ({
|
|||
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
|
||||
ht-rust = xh; # added 2021-02-13
|
||||
htmlTidy = html-tidy; # added 2014-12-06
|
||||
hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06
|
||||
iana_etc = iana-etc; # added 2017-03-08
|
||||
icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
|
||||
icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
|
||||
|
|
@ -385,11 +388,12 @@ mapAliases ({
|
|||
kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25
|
||||
krename-qt5 = krename; # added 2017-02-18
|
||||
kerberos = libkrb5; # moved from top-level 2021-03-14
|
||||
keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10
|
||||
keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # added 2019-12-10
|
||||
kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23
|
||||
kvm = qemu_kvm; # added 2018-04-25
|
||||
latinmodern-math = lmmath;
|
||||
letsencrypt = certbot; # added 2016-05-16
|
||||
leksah = throw "To use leksah, refer to the instructions in https://github.com/leksah/leksah."; # added 2019-04-28
|
||||
libaudit = audit; # added 2018-04-25
|
||||
libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
|
||||
libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25
|
||||
|
|
@ -529,6 +533,7 @@ mapAliases ({
|
|||
oauth2_proxy = oauth2-proxy; # added 2021-04-18
|
||||
opencascade_oce = opencascade; # added 2018-04-25
|
||||
oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
|
||||
octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24
|
||||
ofp = throw "ofp is not compatible with odp-dpdk";
|
||||
opencl-icd = ocl-icd; # added 2017-01-20
|
||||
openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21
|
||||
|
|
@ -549,6 +554,7 @@ mapAliases ({
|
|||
parity = openethereum; # added 2020-08-01
|
||||
parquet-cpp = arrow-cpp; # added 2018-09-08
|
||||
pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
|
||||
pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22
|
||||
pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03
|
||||
perlXMLParser = perlPackages.XMLParser; # added 2018-10-12
|
||||
perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12
|
||||
|
|
@ -893,13 +899,16 @@ mapAliases ({
|
|||
virtmanager-qt = virt-manager-qt; # added 2019-10-29
|
||||
virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21
|
||||
vorbisTools = vorbis-tools; # added 2016-01-26
|
||||
way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13
|
||||
webkit = webkitgtk; # added 2019-03-05
|
||||
webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
|
||||
webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
|
||||
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
|
||||
wineStaging = wine-staging; # added 2018-01-08
|
||||
winusb = woeusb; # added 2017-12-22
|
||||
winstone = throw "winstone is not supported anymore. Alternatives are Jetty or Tomcat."; # added 2019-05-14
|
||||
winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10
|
||||
wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18
|
||||
wireguard = wireguard-tools; # added 2018-05-19
|
||||
morituri = whipper; # added 2018-09-13
|
||||
xp-pen-g430 = pentablet-driver; # added 2020-05-03
|
||||
|
|
@ -968,12 +977,9 @@ mapAliases ({
|
|||
ocamlPackages_4_03
|
||||
ocamlPackages_latest;
|
||||
|
||||
# added 2019-08-01
|
||||
mumble_git = pkgs.mumble;
|
||||
murmur_git = pkgs.murmur;
|
||||
|
||||
# added 2020-08-17
|
||||
zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0.";
|
||||
mumble_git = pkgs.mumble; # added 2019-08-01
|
||||
murmur_git = pkgs.murmur; # added 2019-08-01
|
||||
zabbix44 = throw "zabbix44: Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; # added 2020-08-17
|
||||
|
||||
# added 2019-09-06
|
||||
zeroc_ice = pkgs.zeroc-ice;
|
||||
|
|
@ -988,16 +994,10 @@ mapAliases ({
|
|||
ocaml_4_03 = ocamlPackages_4_03.ocaml;
|
||||
}) // {
|
||||
|
||||
# added 2019-10-28
|
||||
gnatsd = nats-server;
|
||||
|
||||
# added 2020-01-10
|
||||
tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452.";
|
||||
# added 2020-01-10
|
||||
tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452.";
|
||||
|
||||
# added 2020-02-09
|
||||
dina-font-pcf = dina-font;
|
||||
gnatsd = nats-server; # added 2019-10-28
|
||||
tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10
|
||||
tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10
|
||||
dina-font-pcf = dina-font; # added 2020-02-09
|
||||
|
||||
# added 2019-04-13
|
||||
# *-polly pointed to llvmPackages_latest
|
||||
|
|
@ -1013,9 +1013,7 @@ mapAliases ({
|
|||
|
||||
dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02
|
||||
sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04
|
||||
|
||||
gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7.";
|
||||
|
||||
todolist = throw "todolist is now ultralist."; # added 2020-12-27
|
||||
|
||||
/* Cleanup before 21.05 */
|
||||
|
|
|
|||
|
|
@ -4429,6 +4429,8 @@ in
|
|||
|
||||
rar2fs = callPackage ../tools/filesystems/rar2fs { };
|
||||
|
||||
s9fes = callPackage ../development/interpreters/s9fes { };
|
||||
|
||||
s-tar = callPackage ../tools/archivers/s-tar {};
|
||||
|
||||
sonota = callPackage ../tools/misc/sonota { };
|
||||
|
|
@ -7945,8 +7947,6 @@ in
|
|||
|
||||
pdfarranger = callPackage ../applications/misc/pdfarranger { };
|
||||
|
||||
pdfread = throw "pdfread has been remove from nixpkgs, because it is unmaintained for years and the sources are no longer available";
|
||||
|
||||
briss = callPackage ../tools/graphics/briss { };
|
||||
|
||||
brickd = callPackage ../servers/brickd { };
|
||||
|
|
@ -11623,6 +11623,8 @@ in
|
|||
|
||||
knightos-genkfs = callPackage ../development/tools/knightos/genkfs { };
|
||||
|
||||
regenkfs = callPackage ../development/tools/knightos/regenkfs { };
|
||||
|
||||
knightos-kcc = callPackage ../development/tools/knightos/kcc { };
|
||||
|
||||
knightos-kimg = callPackage ../development/tools/knightos/kimg { };
|
||||
|
|
@ -11631,6 +11633,8 @@ in
|
|||
|
||||
knightos-mkrom = callPackage ../development/tools/knightos/mkrom { };
|
||||
|
||||
remkrom = callPackage ../development/tools/knightos/remkrom { };
|
||||
|
||||
knightos-patchrom = callPackage ../development/tools/knightos/patchrom { };
|
||||
|
||||
knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { };
|
||||
|
|
@ -12576,14 +12580,14 @@ in
|
|||
|
||||
# Import PHP80 interpreter, extensions and packages
|
||||
php80 = callPackage ../development/interpreters/php/8.0.nix {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
};
|
||||
php80Extensions = recurseIntoAttrs php80.extensions;
|
||||
php80Packages = recurseIntoAttrs php80.packages;
|
||||
|
||||
# Import PHP74 interpreter, extensions and packages
|
||||
php74 = callPackage ../development/interpreters/php/7.4.nix {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
};
|
||||
php74Extensions = recurseIntoAttrs php74.extensions;
|
||||
php74Packages = recurseIntoAttrs php74.packages;
|
||||
|
|
@ -13222,9 +13226,7 @@ in
|
|||
|
||||
buck = callPackage ../development/tools/build-managers/buck { };
|
||||
|
||||
buildkite-agent = buildkite-agent3;
|
||||
buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)";
|
||||
buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { };
|
||||
buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
|
||||
|
||||
buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { };
|
||||
|
||||
|
|
@ -15837,11 +15839,6 @@ in
|
|||
inherit (callPackage ../development/tools/misc/hydra { })
|
||||
hydra-unstable;
|
||||
|
||||
hydra-flakes = throw ''
|
||||
Flakes support has been merged into Hydra's master. Please use
|
||||
`pkgs.hydra-unstable` now.
|
||||
'';
|
||||
|
||||
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
|
||||
|
||||
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
|
||||
|
|
@ -18188,9 +18185,6 @@ in
|
|||
|
||||
lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { };
|
||||
|
||||
leksah = throw ("To use leksah, refer to the instructions in " +
|
||||
"https://github.com/leksah/leksah.");
|
||||
|
||||
libgme = callPackage ../development/libraries/audio/libgme { };
|
||||
|
||||
librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
|
||||
|
|
@ -20395,8 +20389,6 @@ in
|
|||
|
||||
webhook = callPackage ../servers/http/webhook { };
|
||||
|
||||
winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat.";
|
||||
|
||||
xinetd = callPackage ../servers/xinetd { };
|
||||
|
||||
zookeeper = callPackage ../servers/zookeeper {
|
||||
|
|
@ -24191,8 +24183,6 @@ in
|
|||
};
|
||||
wireshark-qt = wireshark;
|
||||
|
||||
# The GTK UI is deprecated by upstream. You probably want the QT version.
|
||||
wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead.";
|
||||
wireshark-cli = wireshark.override {
|
||||
withQt = false;
|
||||
libpcap = libpcap.override { withBluez = stdenv.isLinux; };
|
||||
|
|
@ -26228,8 +26218,6 @@ in
|
|||
|
||||
octoprint = callPackage ../applications/misc/octoprint { };
|
||||
|
||||
octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set.";
|
||||
|
||||
ocrad = callPackage ../applications/graphics/ocrad { };
|
||||
|
||||
offrss = callPackage ../applications/networking/offrss { };
|
||||
|
|
@ -27899,9 +27887,6 @@ in
|
|||
|
||||
wapiti = callPackage ../tools/security/wapiti { };
|
||||
|
||||
way-cooler = throw ("way-cooler is abandoned by its author: " +
|
||||
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html");
|
||||
|
||||
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
|
||||
inherit (wayfireApplications) wayfire wcm;
|
||||
wayfireApplications-unwrapped = recurseIntoAttrs (
|
||||
|
|
@ -31420,10 +31405,8 @@ in
|
|||
|
||||
nix-repl = throw (
|
||||
"nix-repl has been removed because it's not maintained anymore, " +
|
||||
(lib.optionalString (! lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion))
|
||||
"ugrade your Nix installation to a newer version and ") +
|
||||
"use `nix repl` instead. " +
|
||||
"Also see https://github.com/NixOS/nixpkgs/pull/44903"
|
||||
(lib.optionalString (!lib.versionAtLeast "2" (lib.versions.major builtins.nixVersion)) "ugrade your Nix installation to a newer version and ") +
|
||||
"use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903"
|
||||
);
|
||||
|
||||
nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { };
|
||||
|
|
|
|||
|
|
@ -623,9 +623,7 @@ let
|
|||
inherit (pkgs) file;
|
||||
};
|
||||
|
||||
lwt = callPackage ../development/ocaml-modules/lwt {
|
||||
ocaml-migrate-parsetree = ocaml-migrate-parsetree-2;
|
||||
};
|
||||
lwt = callPackage ../development/ocaml-modules/lwt { };
|
||||
|
||||
lwt-canceler = callPackage ../development/ocaml-modules/lwt-canceler { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue