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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-01-30 06:01:18 +00:00 committed by GitHub
commit fae05a7b29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 657 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -522,6 +522,14 @@
wrapper for <literal>assert</literal> conditions.
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.vimPlugins.onedark-nvim</literal> now refers to
<link xlink:href="https://github.com/navarasu/onedark.nvim">navarasu/onedark.nvim</link>
(formerly refers to
<link xlink:href="https://github.com/olimorris/onedarkpro.nvim">olimorris/onedarkpro.nvim</link>).
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">

3
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -160,6 +160,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- `lib.assertMsg` and `lib.assertOneOf` no longer return `false` if the passed condition is `false`, `throw`ing the given error message instead (which makes the resulting error message less cluttered). This will not impact the behaviour of code using these functions as intended, namely as top-level wrapper for `assert` conditions.
- `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim)
(formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)).
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Other Notable Changes {#sec-release-22.05-notable-changes}

14
nixos/modules/services/search/elasticsearch.nix
View File

@ -143,6 +143,17 @@ in
example = lib.literalExpression "[ pkgs.elasticsearchPlugins.discovery-ec2 ]";
};
restartIfChanged = mkOption {
type = types.bool;
description = ''
Automatically restart the service on config change.
This can be set to false to defer restarts on a server or cluster.
Please consider the security implications of inadvertently running an older version,
and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option.
'';
default = true;
};
};
###### implementation
@ -153,6 +164,7 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [ pkgs.inetutils ];
inherit (cfg) restartIfChanged;
environment = {
ES_HOME = cfg.dataDir;
ES_JAVA_OPTS = toString cfg.extraJavaOptions;
@ -163,6 +175,8 @@ in
User = "elasticsearch";
PermissionsStartOnly = true;
LimitNOFILE = "1024000";
Restart = "always";
TimeoutStartSec = "infinity";
};
preStart = ''
${optionalString (!config.boot.isContainer) ''

9
nixos/modules/services/x11/desktop-managers/gnome.xml
View File

@ -249,14 +249,5 @@ services.xserver.desktopManager.gnome = {
See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/56342">this issue.</link>
</para>
</section>
<section xml:id="sec-gnome-faq-nixos-rebuild-switch-kills-session">
<title>Why does <literal>nixos-rebuild switch</literal> sometimes kill my session?</title>
<para>
This is a known <link xlink:href="https://github.com/NixOS/nixpkgs/issues/44344">issue</link> without any workarounds.
If you are doing a fairly large upgrade, it is probably safer to use <literal>nixos-rebuild boot</literal>.
</para>
</section>
</section>
</chapter>

2
nixos/tests/mysql/common.nix
View File

@ -3,7 +3,7 @@
inherit (pkgs.darwin) cctools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
});
mysqlPackage = {
mysqlPackages = {
inherit (pkgs) mysql57 mysql80;
};
mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";

2
nixos/tests/mysql/mysql.nix
View File

@ -142,7 +142,7 @@ let
in
lib.mapAttrs (_: package: makeMySQLTest {
inherit package;
hasRocksDB = false; hasMroonga = false;
hasRocksDB = false; hasMroonga = false; useSocketAuth = false;
}) mysqlPackages
// (lib.mapAttrs (_: package: makeMySQLTest {
inherit package;

53
pkgs/applications/audio/ChowCentaur/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon
, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor
, alsa-lib, libjack2, lv2, gcc-unwrapped }:
stdenv.mkDerivation rec {
pname = "ChowCentaur";
version = "1.4.0";
src = fetchFromGitHub {
owner = "jatinchowdhury18";
repo = "KlonCentaur";
rev = "v${version}";
sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
cairo
libxkbcommon
xcbutilcursor
xcbutilkeysyms
xcbutil
libXrandr
libXinerama
libXcursor
alsa-lib
libjack2
lv2
];
cmakeFlags = [
"-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
"-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"
"-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm"
];
installPhase = ''
mkdir -p $out/lib/lv2 $out/lib/vst3
cd ChowCentaur/ChowCentaur_artefacts/Release
cp -r LV2/ChowCentaur.lv2 $out/lib/lv2
cp -r VST3/ChowCentaur.vst3 $out/lib/vst3
'';
meta = with lib; {
description =
"Digital emulation of the Klon Centaur guitar pedal using RNNs, Wave Digital Filters, and more";
homepage = "https://github.com/jatinchowdhury18/KlonCentaur";
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ magnetophon ];
};
}

4
pkgs/applications/audio/freewheeling/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype, fluidsynth
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsa-lib, libjack2, libvorbis
, libSM, libsndfile, libogg, libtool
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook libtool ];
buildInputs = [
freetype SDL SDL_gfx SDL_ttf
freetype fluidsynth SDL SDL_gfx SDL_ttf
liblo libxml2 libjack2 alsa-lib libvorbis libsndfile libogg libSM
(gnutls.overrideAttrs (oldAttrs: {
configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];

4
pkgs/applications/misc/1password/default.nix
View File

@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
url = {
"i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
"x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
"aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip";
"aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm64_v${version}.zip";
}.${stdenv.hostPlatform.system};
sha256 = {
"i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg=";
"x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4=";
"aarch64-linux" = "vWoA/0ZfdwVniHmxC4nH1QIc6bjdb00+SwlkIWc9BPs=";
"aarch64-linux" = "12h1s9c97w0gb6bia3hy7773mwpfnyrn40sbjm1zc37y4zyi5dyp";
}.${stdenv.hostPlatform.system};
stripRoot = false;
} else

6
pkgs/applications/misc/weather/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python2Packages, installShellFiles }:
{ lib, stdenv, fetchurl, python3, installShellFiles }:
stdenv.mkDerivation rec {
version = "2.4.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
installShellFiles
python2Packages.wrapPython
python3.pkgs.wrapPython
];
dontConfigure = true;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# Upstream doesn't provide a setup.py or alike, so we follow:
# http://fungi.yuggoth.org/weather/doc/install.rst#id3
installPhase = ''
site_packages=$out/${python2Packages.python.sitePackages}
site_packages=$out/${python3.sitePackages}
install -Dt $out/bin -m 755 weather
install -Dt $site_packages weather.py
install -Dt $out/share/weather-util \

1
pkgs/applications/networking/instant-messengers/coyim/default.nix
View File

@ -23,5 +23,6 @@ buildGoPackage rec {
homepage = "https://coy.im/";
license = licenses.gpl3;
platforms = platforms.linux;
broken = true; #fails to build with go >= 1.16
};
}

95
pkgs/applications/science/logic/key/default.nix
View File

@ -1,62 +1,105 @@
{ lib, stdenv
, fetchurl
, unzip
, jdk
, ant
, gradle_7
, perl
, jre
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, testVersion
, key
}:
# get this from the download URL when changing version
let gitRevision = "7d3deab0763c88edee4f7a08e604661e0dbdd450";
in stdenv.mkDerivation rec {
let
pname = "key";
version = "2.6.3";
version = "2.10.0";
src = fetchurl {
url = "https://formal.iti.kit.edu/key/releases/${version}/key-src-${version}_${gitRevision}.zip";
sha256 = "1dr5jmrqs0iy76wdsfiv5hx929i24yzm1xypzqqvx7afc7apyawy";
url = "https://www.key-project.org/dist/${version}/key-${version}-sources.tgz";
sha256 = "1f201cbcflqd1z6ysrkh3mff5agspw3v74ybdc3s2lfdyz3b858w";
};
sourceRoot = "key-${version}/key";
sourceRoot = "key";
# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {
pname = "${pname}-deps";
inherit version src sourceRoot;
nativeBuildInputs = [ gradle_7 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426
${lib.optionalString stdenv.isDarwin "export TERM=dumb"}
gradle --no-daemon classes testClasses
'';
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
installPhase = ''
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
| sh
'';
outputHashMode = "recursive";
outputHash = "sha256-1TWySkS8w7L6Q+V946kcLOnM4hL3fieFvLrF5BZAlh4=";
};
in stdenv.mkDerivation rec {
inherit pname version src sourceRoot;
nativeBuildInputs = [
unzip
jdk
ant
gradle_7
makeWrapper
copyDesktopItems
];
buildPhase = ''
ant -buildfile scripts/build.xml \
-Dgit.revision=${gitRevision} \
compileAll deployAll
'';
executable-name = "KeY";
postCheck = ''
ant -buildfile scripts/build.xml \
-Dgit.revision=${gitRevision} \
compileAllTests runAllTests test-deploy-all
desktopItems = [
(makeDesktopItem {
name = "KeY";
exec = executable-name;
icon = "key";
comment = meta.description;
desktopName = "KeY";
genericName = "KeY";
categories = "Science;";
})
];
# disable tests (broken on darwin)
gradleAction = if stdenv.isDarwin then "assemble" else "build";
buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426
${lib.optionalString stdenv.isDarwin "export TERM=dumb"}
# point to offline repo
sed -ie "s#repositories {#repositories { maven { url '${deps}' }#g" build.gradle
cat <(echo "pluginManagement { repositories { maven { url '${deps}' } } }") settings.gradle > settings_new.gradle
mv settings_new.gradle settings.gradle
gradle --offline --no-daemon ${gradleAction}
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/java
# Wrong version in the code. On next version change 2.5 to ${version}:
unzip deployment/key-2.5_${gitRevision}.zip -d $out/share/java
cp key.ui/build/libs/key-*-exe.jar $out/share/java/KeY.jar
mkdir -p $out/bin
mkdir -p $out/share/icons/hicolor/256x256/apps
cp key.ui/src/main/resources/de/uka/ilkd/key/gui/images/key-color-icon-square.png $out/share/icons/hicolor/256x256/apps/key.png
makeWrapper ${jre}/bin/java $out/bin/KeY \
--add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main"
runHook postInstall
'';
passthru.tests.version =
testVersion {
package = key;
command = "KeY --help";
# Wrong '2.5' version in the code. On next version change to ${version}
version = "2.5";
};
meta = with lib; {

25
pkgs/applications/window-managers/labwc/default.nix
View File

@ -1,33 +1,33 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, meson
, ninja
, cairo
, glib
, libdrm
, libinput
, libxcb
, libxkbcommon
, libxml2
, meson
, ninja
, pango
, pkg-config
, scdoc
, wayland
, wayland-protocols
, wlroots
, libxcb
, libxkbcommon
, xwayland
, libdrm
, scdoc
}:
stdenv.mkDerivation rec {
pname = "labwc";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "johanmalm";
owner = "labwc";
repo = pname;
rev = version;
sha256 = "sha256-v8LGiQG/n1IXeVMPWyiP9MgZzZLW78JftvxnRVTswaM=";
hash = "sha256-O9jVDR7UROt5u8inUsZjbzB3dQTosiLYqXkeOyGrbaM=";
};
nativeBuildInputs = [
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
pkg-config
scdoc
];
buildInputs = [
cairo
glib
@ -54,8 +55,8 @@ stdenv.mkDerivation rec {
mesonFlags = [ "-Dxwayland=enabled" ];
meta = with lib; {
homepage = "https://github.com/johanmalm/labwc";
description = "Openbox alternative for Wayland";
homepage = "https://github.com/labwc/labwc";
description = "A Wayland stacking compositor, similar to Openbox";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;

6
pkgs/development/compilers/llvm/12/libcxx/default.nix
View File

@ -23,12 +23,6 @@ stdenv.mkDerivation {
../../libcxx-0001-musl-hacks.patch
];
# Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
postPatch = ''
substituteInPlace include/__config \
--replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
'';
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';

6
pkgs/development/compilers/llvm/13/libcxx/default.nix
View File

@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
../../libcxx-0001-musl-hacks.patch
];
# Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
postPatch = ''
substituteInPlace include/__config \
--replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
'';
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';

6
pkgs/development/compilers/llvm/git/libcxx/default.nix
View File

@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
../../libcxx-0001-musl-hacks.patch
];
# Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
postPatch = ''
substituteInPlace include/__config \
--replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
'';
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';

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

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "upb-lib";
version = "0.4.12";
version = "0.5";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "e668055d9c389aefd09203afb96a950a320095f225ef0a1aa611e592db92a71b";
sha256 = "sha256-0KTbIDP4lqZ7KNSuPXNbiwkxsqqCxlkiIl8/nnPqohI=";
};
propagatedBuildInputs = [

9
pkgs/development/tools/misc/uncrustify/default.nix
View File

@ -1,14 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, python2 }:
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "uncrustify";
pname = "uncrustify";
version = "0.72.0";
src = fetchFromGitHub {
owner = product;
repo = product;
rev = name;
owner = "uncrustify";
repo = "uncrustify";
rev = "uncrustify-${version}";
sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY=";
};

8
pkgs/development/tools/ocaml/ocp-build/default.nix
View File

@ -1,10 +1,8 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner, re }:
let
version = "1.99.21";
in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-ocp-build-${version}";
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-ocp-build";
version = "1.99.21";
src = fetchFromGitHub {
owner = "OCamlPro";

2
pkgs/development/tools/omnisharp-roslyn/create-deps.sh
View File

@ -48,7 +48,7 @@ do
sha256=$(nix-prefetch-url "$url" 2>/dev/null)
cat << EOL
{
name = "$package";
pname = "$package";
version = "$version";
src = fetchurl {
url = "$url";

5
pkgs/development/tools/omnisharp-roslyn/default.nix
View File

@ -14,8 +14,7 @@ let
dotnet-sdk = dotnetCorePackages.sdk_5_0;
deps = map (package: stdenv.mkDerivation (with package; {
pname = name;
inherit version src;
inherit pname version src;
buildInputs = [ unzip ];
unpackPhase = ''
@ -41,7 +40,7 @@ let
installPhase = ''
runHook preInstall
package=$out/lib/dotnet/${name}/${version}
package=$out/lib/dotnet/${pname}/${version}
mkdir -p $package
cp -r . $package
echo "{}" > $package/.nupkg.metadata

564
pkgs/development/tools/omnisharp-roslyn/deps.nix generated
View File

File diff suppressed because it is too large Load Diff

12
pkgs/development/tools/selenium/selendroid/default.nix
View File

@ -2,12 +2,12 @@
with lib;
let
name = "selendroid-standalone-${version}";
pname = "selendroid-standalone";
pluginName = "selendroid-grid-plugin-${version}";
version = "0.17.0";
srcs = {
jar = fetchurl {
url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar";
url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar";
sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw";
};
gridPlugin = fetchurl {
@ -17,9 +17,7 @@ let
};
in
stdenv.mkDerivation {
inherit name;
inherit version;
inherit pname version;
dontUnpack = true;
@ -28,11 +26,11 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/share/lib/selendroid
cp ${srcs.jar} $out/share/lib/selendroid/${name}.jar
cp ${srcs.jar} $out/share/lib/selendroid/selendroid-standalone-${version}.jar
cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar
makeWrapper ${jdk}/bin/java $out/bin/selendroid \
--add-flags "-jar $out/share/lib/selendroid/${name}.jar"
--add-flags "-jar $out/share/lib/selendroid/selendroid-standalone-${version}.jar"
makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \
--add-flags "-Dfile.encoding=UTF-8" \
--add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \

2
pkgs/misc/arm-trusted-firmware/default.nix
View File

@ -10,7 +10,7 @@ let
, ... } @ args:
stdenv.mkDerivation ({
name = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}-${version}";
pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}";
inherit version;
src = fetchFromGitHub {

3
pkgs/misc/cups/drivers/hl1110/default.nix
View File

@ -17,7 +17,8 @@ lprdeb = fetchurl {
};
in
stdenv.mkDerivation {
name = "cups-brother-hl1110";
pname = "cups-brother-hl1110";
inherit version;
srcs = [ lprdeb cupssrc cupsdeb ];
nativeBuildInputs = [ makeWrapper ];

3
pkgs/misc/cups/drivers/hl1210w/default.nix
View File

@ -12,7 +12,8 @@ let
};
in
stdenv.mkDerivation {
name = "cups-brother-hl1210W";
pname = "cups-brother-hl1210W";
inherit version;
srcs = [ lprdeb cupsdeb ];
nativeBuildInputs = [ makeWrapper ];

3
pkgs/misc/cups/drivers/hl3140cw/default.nix
View File

@ -17,7 +17,8 @@ let
};
in
stdenv.mkDerivation {
name = "cups-brother-hl3140cw";
pname = "cups-brother-hl3140cw";
inherit version;
nativeBuildInputs = [ makeWrapper dpkg ];
buildInputs = [ cups ghostscript a2ps ];

3
pkgs/misc/cups/drivers/hll2340dw/default.nix
View File

@ -16,7 +16,8 @@ let
in
stdenv.mkDerivation {
name = "cups-brother-hll2340dw";
pname = "cups-brother-hll2340dw";
inherit version;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ cups ghostscript dpkg a2ps ];

1
pkgs/misc/vim-plugins/aliases.nix
View File

@ -94,7 +94,6 @@ mapAliases (with prev; {
neosnippet = neosnippet-vim;
The_NERD_Commenter = nerdcommenter;
The_NERD_tree = nerdtree;
onedark-nvim = onedarkpro-nvim; # added 2021-10-22
open-browser = open-browser-vim;
pathogen = vim-pathogen;
polyglot = vim-polyglot;

48
pkgs/misc/vim-plugins/overrides.nix
View File

@ -65,8 +65,16 @@
, gobject-introspection
, wrapGAppsHook
# vim-clap dependencies
# sniprun dependencies
, bashInteractive
, coreutils
, curl
, gnugrep
, gnused
, makeWrapper
, procps
# vim-clap dependencies
, libgit2
, libiconv
, openssl
@ -76,7 +84,6 @@
, asmfmt
, delve
, errcheck
, gnused
, go-motion
, go-tools
, gocode
@ -536,6 +543,43 @@ self: super: {
dependencies = with self; [ skim ];
});
sniprun =
let
version = "1.1.2";
src = fetchFromGitHub {
owner = "michaelb";
repo = "sniprun";
rev = "v${version}";
sha256 = "sha256-WL0eXwiPhcndI74wtFox2tSnZn1siE86x2MLkfpxxT4=";
};
sniprun-bin = rustPlatform.buildRustPackage {
pname = "sniprun-bin";
inherit version src;
cargoSha256 = "sha256-1WbgnsjoFdvko6VRKY+IjafMNqvJvyIZCDk8I9GV3GM=";
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/sniprun \
--prefix PATH ${lib.makeBinPath [ bashInteractive coreutils curl gnugrep gnused procps ]}
'';
doCheck = false;
};
in
buildVimPluginFrom2Nix {
pname = "sniprun";
inherit version src;
patches = [ ./patches/sniprun/fix-paths.patch ];
postPatch = ''
substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin}
'';
propagatedBuildInputs = [ sniprun-bin ];
};
sqlite-lua = super.sqlite-lua.overrideAttrs (old: {
postPatch = let
libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";

36
pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch Normal file
View File

@ -0,0 +1,36 @@
diff --git a/lua/sniprun.lua b/lua/sniprun.lua
index aa39e0b..188d54a 100644
--- a/lua/sniprun.lua
+++ b/lua/sniprun.lua
@@ -4,9 +4,7 @@ M.custom_highlight=false
M.info_floatwin = {}
-- See https://github.com/tjdevries/rofl.nvim/blob/632c10f2ec7c56882a3f7eda8849904bcac6e8af/lua/rofl.lua
-local binary_path = vim.fn.fnamemodify(
- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h")
- .. "/target/release/sniprun"
+local binary_path = "@sniprun_bin@/bin/sniprun"
local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.."
diff --git a/ressources/init_repl.sh b/ressources/init_repl.sh
index 2e6264d..0eab1c6 100644
--- a/ressources/init_repl.sh
+++ b/ressources/init_repl.sh
@@ -23,7 +23,7 @@ mkfifo $working_dir/$pipe
touch $working_dir/$out
sleep 36000 > $working_dir/$pipe &
-echo "/bin/cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh
+echo "cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh
chmod +x $working_dir/real_launcher.sh
echo $repl " process started at $(date +"%F %T")." >> $working_dir/log
diff --git a/ressources/launcher_repl.sh b/ressources/launcher_repl.sh
index feaa91e..749c55e 100755
--- a/ressources/launcher_repl.sh
+++ b/ressources/launcher_repl.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-/bin/cat $1 > $2
+cat $1 > $2

8
pkgs/misc/vscode-extensions/default.nix
View File

@ -693,8 +693,8 @@ let
mktplcRef = {
name = "prettier-vscode";
publisher = "esbenp";
version = "9.1.0";
sha256 = "sha256-lR5BDbDYURCF1Gq5JIm7BcXVvKXPdNBYom0BiVX/3u0=";
version = "9.2.0";
sha256 = "sha256-ROI312MPMUY1q6IV4qVCW8DD0MQPA/hVW7rfamo/IbI=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
@ -1462,8 +1462,8 @@ let
mktplcRef = {
name = "material-icon-theme";
publisher = "PKief";
version = "4.11.0";
sha256 = "1l2s8j645riqjmj09i3v71s8ycin5vd6brdp35z472fnk6wyi1y6";
version = "4.12.1";
sha256 = "sha256-pmWnnZrdk6zb8YFG5ESgK4k875hgeseWyzkA9YUjg7A=";
};
meta = {
license = lib.licenses.mit;

23
pkgs/os-specific/darwin/usr-include/default.nix
View File

@ -1,23 +0,0 @@
{lib, stdenv, darwin}:
/*
* This is needed to build GCC on Darwin.
*
* These are the collection of headers that would normally be available under
* /usr/include in macOS machines with command line tools installed. They need
* to be in one folder for gcc to use them correctly.
*/
stdenv.mkDerivation {
name = "darwin-usr-include";
buildInputs = [ darwin.CF stdenv.libc ];
buildCommand = ''
mkdir -p $out
cd $out
ln -sf ${stdenv.libc}/include/* .
mkdir CoreFoundation
ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation
'';
meta.platforms = lib.platforms.darwin;
}

7
pkgs/servers/sql/mysql/5.7.x.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, cmake, bison, pkg-config
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
, cctools, CoreServices, developer_cmds
, libtirpc, rpcsvc-proto
, libtirpc, rpcsvc-proto, nixosTests
}:
# Note: zlib is not required; MySQL can use an internal zlib.
@ -9,11 +9,11 @@
let
self = stdenv.mkDerivation rec {
pname = "mysql";
version = "5.7.27";
version = "5.7.37";
src = fetchurl {
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0=";
};
preConfigure = lib.optionalString stdenv.isDarwin ''
@ -75,6 +75,7 @@ self = stdenv.mkDerivation rec {
connector-c = self;
server = self;
mysqlVersion = "5.7";
tests = nixosTests.mysql.mysql57;
};
meta = with lib; {

4
pkgs/servers/web-apps/plausible/default.nix
View File

@ -12,13 +12,13 @@
let
pname = "plausible";
version = "1.4.3";
version = "1.4.4";
src = fetchFromGitHub {
owner = "plausible";
repo = "analytics";
rev = "v${version}";
sha256 = "1aa5nkwb4qz599zb77dhwrvn5gwcdiyji4vbxmayn2zhv2vhj36d";
sha256 = "1ckw5cd4z96jkjhmzjq7k3kzjj7bvj38i5xq9r43cz0sn7w3470k";
};
# TODO consider using `mix2nix` as soon as it supports git dependencies.

2
pkgs/servers/web-apps/plausible/package.json
View File

@ -64,5 +64,5 @@
"webpack-bundle-analyzer": "^4.4.2"
},
"name": "plausible",
"version": "v1.4.3"
"version": "v1.4.4"
}

42
pkgs/servers/web-apps/plausible/yarn.lock
View File

@ -1131,9 +1131,9 @@
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
"@types/node@*":
version "17.0.10"
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab"
integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog==
version "17.0.13"
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.13.tgz#5ed7ed7c662948335fcad6c412bb42d99ea754e3"
integrity sha512-Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw==
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
@ -1647,9 +1647,9 @@ buffer-from@^1.0.0:
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
bytes@^3.0.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
version "3.1.2"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
call-bind@^1.0.0, call-bind@^1.0.2:
version "1.0.2"
@ -1694,9 +1694,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297:
version "1.0.30001301"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz#ebc9086026534cab0dab99425d9c3b4425e5f450"
integrity sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==
version "1.0.30001304"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz#38af55ed3fc8220cb13e35e6e7309c8c65a05559"
integrity sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ==
chalk@^2.0.0:
version "2.4.2"
@ -2280,9 +2280,9 @@ duplexer@^0.1.2:
integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
electron-to-chromium@^1.4.17:
version "1.4.52"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.52.tgz#ce44c6d6cc449e7688a4356b8c261cfeafa26833"
integrity sha512-JGkh8HEh5PnVrhU4HbpyyO0O791dVY6k7AdqfDeqbcRMeoGxtNHWT77deR2nhvbLe4dKpxjlDEvdEwrvRLGu2Q==
version "1.4.57"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz#2b2766df76ac8dbc0a1d41249bc5684a31849892"
integrity sha512-FNC+P5K1n6pF+M0zIK+gFCoXcJhhzDViL3DRIGy2Fv5PohuSES1JHR7T+GlwxSxlzx4yYbsuzCZvHxcBSRCIOw==
emoji-regex@^8.0.0:
version "8.0.0"
@ -2429,9 +2429,9 @@ eslint-import-resolver-node@^0.3.6:
resolve "^1.20.0"
eslint-module-utils@^2.7.2:
version "2.7.2"
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==
version "2.7.3"
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
dependencies:
debug "^3.2.7"
find-up "^2.1.0"
@ -2761,9 +2761,9 @@ flatpickr@^4.6.2:
integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw==
flatted@^3.1.0:
version "3.2.4"
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"
integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
version "3.2.5"
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
foreach@^2.0.5:
version "2.0.5"
@ -4140,9 +4140,9 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
find-up "^4.0.0"
postcss-calc@^8.2.0:
version "8.2.2"
resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.2.tgz#9706e7399e8ec8b61a47830dcf1f21391af23373"
integrity sha512-B5R0UeB4zLJvxNt1FVCaDZULdzsKLPc6FhjFJ+xwFiq7VG4i9cuaJLxVjNtExNK8ocm3n2o4unXXLiVX1SCqxA==
version "8.2.3"
resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.3.tgz#53b95ce93de19213c2a5fdd71277a81690ef41d0"
integrity sha512-EGM2EBBWqP57N0E7N7WOLT116PJ39dwHVU01WO4XPPQLJfkL2xVgkMZ+TZvCfapj/uJH07UEfKHQNPHzSw/14Q==
dependencies:
postcss-selector-parser "^6.0.2"
postcss-value-parser "^4.0.2"

56
pkgs/servers/web-apps/plausible/yarn.nix
View File

@ -1082,11 +1082,11 @@
};
}
{
name = "_types_node___node_17.0.10.tgz";
name = "_types_node___node_17.0.13.tgz";
path = fetchurl {
name = "_types_node___node_17.0.10.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz";
sha1 = "616f16e9d3a2a3d618136b1be244315d95bd7cab";
name = "_types_node___node_17.0.13.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.13.tgz";
sha1 = "5ed7ed7c662948335fcad6c412bb42d99ea754e3";
};
}
{
@ -1674,11 +1674,11 @@
};
}
{
name = "bytes___bytes_3.1.1.tgz";
name = "bytes___bytes_3.1.2.tgz";
path = fetchurl {
name = "bytes___bytes_3.1.1.tgz";
url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz";
sha1 = "3f018291cb4cbad9accb6e6970bca9c8889e879a";
name = "bytes___bytes_3.1.2.tgz";
url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz";
sha1 = "8b0beeb98605adf1b128fa4386403c009e0221a5";
};
}
{
@ -1730,11 +1730,11 @@
};
}
{
name = "caniuse_lite___caniuse_lite_1.0.30001301.tgz";
name = "caniuse_lite___caniuse_lite_1.0.30001304.tgz";
path = fetchurl {
name = "caniuse_lite___caniuse_lite_1.0.30001301.tgz";
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz";
sha1 = "ebc9086026534cab0dab99425d9c3b4425e5f450";
name = "caniuse_lite___caniuse_lite_1.0.30001304.tgz";
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz";
sha1 = "38af55ed3fc8220cb13e35e6e7309c8c65a05559";
};
}
{
@ -2378,11 +2378,11 @@
};
}
{
name = "electron_to_chromium___electron_to_chromium_1.4.52.tgz";
name = "electron_to_chromium___electron_to_chromium_1.4.57.tgz";
path = fetchurl {
name = "electron_to_chromium___electron_to_chromium_1.4.52.tgz";
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.52.tgz";
sha1 = "ce44c6d6cc449e7688a4356b8c261cfeafa26833";
name = "electron_to_chromium___electron_to_chromium_1.4.57.tgz";
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz";
sha1 = "2b2766df76ac8dbc0a1d41249bc5684a31849892";
};
}
{
@ -2538,11 +2538,11 @@
};
}
{
name = "eslint_module_utils___eslint_module_utils_2.7.2.tgz";
name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz";
path = fetchurl {
name = "eslint_module_utils___eslint_module_utils_2.7.2.tgz";
url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz";
sha1 = "1d0aa455dcf41052339b63cada8ab5fd57577129";
name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz";
url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz";
sha1 = "ad7e3a10552fdd0642e1e55292781bd6e34876ee";
};
}
{
@ -2842,11 +2842,11 @@
};
}
{
name = "flatted___flatted_3.2.4.tgz";
name = "flatted___flatted_3.2.5.tgz";
path = fetchurl {
name = "flatted___flatted_3.2.4.tgz";
url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz";
sha1 = "28d9969ea90661b5134259f312ab6aa7929ac5e2";
name = "flatted___flatted_3.2.5.tgz";
url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz";
sha1 = "76c8584f4fc843db64702a6bd04ab7a8bd666da3";
};
}
{
@ -4571,11 +4571,11 @@
};
}
{
name = "postcss_calc___postcss_calc_8.2.2.tgz";
name = "postcss_calc___postcss_calc_8.2.3.tgz";
path = fetchurl {
name = "postcss_calc___postcss_calc_8.2.2.tgz";
url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.2.tgz";
sha1 = "9706e7399e8ec8b61a47830dcf1f21391af23373";
name = "postcss_calc___postcss_calc_8.2.3.tgz";
url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.3.tgz";
sha1 = "53b95ce93de19213c2a5fdd71277a81690ef41d0";
};
}
{

21
pkgs/stdenv/adapters.nix
View File

@ -270,4 +270,25 @@ rec {
allowSubstitutes = false;
});
});
/* Modify a stdenv so that it builds binaries with the specified list of
compilerFlags appended and passed to the compiler.
This example would recompile every derivation on the system with
-funroll-loops and -O3 passed to each gcc invocation.
Example:
nixpkgs.overlays = [
(self: super: {
stdenv = super.withCFlags [ "-funroll-loops" "-O3" ] super.stdenv;
})
];
*/
withCFlags = compilerFlags: stdenv:
stdenv.override (old: {
mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}";
});
});
}

7
pkgs/tools/misc/steampipe/default.nix
View File

@ -2,16 +2,17 @@
buildGoModule rec {
pname = "steampipe";
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
sha256 = "sha256-vDyox8UArgK27FkNFK3SNksvOmpaRgZ/ueZgqO7MOl0=";
sha256 = "sha256-xLw3y9DYkei0MoErsMpSDhEK73lK9b13st+DqHvvhys=";
};
vendorSha256 = "sha256-ikmcayOy87u6XMYjxxzFv35Rlp9oTteEKFOPr/+xc2Y=";
vendorSha256 = "sha256-MTSkWrutDKmsaTI9/L8wh3tWwra/F3+bP0RyVi4DMqE=";
proxyVendor = true;
# tests are failing for no obvious reasons
doCheck = false;

7
pkgs/tools/security/gnupg/23.nix
View File

@ -34,6 +34,13 @@ stdenv.mkDerivation rec {
./tests-add-test-cases-for-import-without-uid.patch
./allow-import-of-previously-known-keys-even-without-UI.patch
./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
] ++ lib.optional stdenv.isDarwin [
# Remove an innocent warning printed on systems without procfs
# https://dev.gnupg.org/T5656
(fetchpatch {
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/890be5f6af88e7913d177af87a50129049e681bb/gnupg/2.3.3-proc-error.patch";
sha256 = "sha256-oiTa7Nf+AEmhZ683CJEaCb559PXJ6RpSSgRLpxz4CKU=";
})
];
postPatch = ''
sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1

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

@ -106,8 +106,6 @@ mapAliases ({
bsod = throw "bsod has been removed: deleted by upstream"; # added 2022-01-07
btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03
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-agent3 = buildkite-agent; # added 2018-09-26
bundler_HEAD = bundler; # added 2015-11-15
bunny = throw "bunny has been removed: deleted by upstream"; # added 2022-01-07
@ -360,7 +358,6 @@ mapAliases ({
gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12
gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14
gmock = gtest; # moved from top-level 2021-03-14
go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26
go-pup = pup; # added 2017-12-19
gobby5 = gobby; # added 2021-02-01
gobjectIntrospection = gobject-introspection; # added 2018-12-02

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

@ -21022,7 +21022,7 @@ with pkgs;
engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; };
envoy = callPackage ../servers/http/envoy {
go = go_1_15;
go = go_1_17;
jdk = openjdk11;
gn = gn1924;
};
@ -24778,6 +24778,8 @@ with pkgs;
boops = callPackage ../applications/audio/boops { };
ChowCentaur = callPackage ../applications/audio/ChowCentaur { };
ChowKick = callPackage ../applications/audio/ChowKick { };
CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { };
@ -24899,9 +24901,7 @@ with pkgs;
coursera-dl = callPackage ../applications/misc/coursera-dl {};
coyim = callPackage ../applications/networking/instant-messengers/coyim {
buildGoPackage = buildGo115Package;
};
coyim = callPackage ../applications/networking/instant-messengers/coyim { };
cozy-drive = callPackage ../applications/networking/cozy-drive {};
@ -26870,7 +26870,7 @@ with pkgs;
lame = callPackage ../development/libraries/lame { };
labwc = callPackage ../applications/window-managers/labwc {
wlroots = wlroots_0_14;
wlroots = wlroots_0_15;
};
larswm = callPackage ../applications/window-managers/larswm { };

2
pkgs/top-level/darwin-packages.nix
View File

@ -154,8 +154,6 @@ impure-cmds // appleSourcePackages // chooseLibs // {
trash = callPackage ../os-specific/darwin/trash { };
usr-include = callPackage ../os-specific/darwin/usr-include { };
xattr = pkgs.python3Packages.callPackage ../os-specific/darwin/xattr { };
inherit (pkgs.callPackages ../os-specific/darwin/xcode { })