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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-17 00:15:03 +00:00 committed by GitHub
commit f620e30ca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
53 changed files with 2364 additions and 1112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -955,6 +955,11 @@ environment.systemPackages = [
<link linkend="opt-boot.extraSystemdUnitPaths">boot.extraSystemdUnitPaths</link> list. <link linkend="opt-boot.extraSystemdUnitPaths">boot.extraSystemdUnitPaths</link> list.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
PostgreSQL 9.5 is scheduled EOL during the 21.05 life cycle and has been removed.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

3
nixos/modules/services/databases/postgresql.nix
View File

@ -295,8 +295,7 @@ in
# systems! # systems!
mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 mkDefault (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 if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 else throw "postgresql_9_5 was removed, please upgrade your postgresql version.");
else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");
services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}"; services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}";

9
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -676,6 +676,7 @@ in
Defines the address and other parameters of the upstream servers. Defines the address and other parameters of the upstream servers.
''; '';
default = {}; default = {};
example = { "127.0.0.1:8000" = {}; };
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines; type = types.lines;
@ -690,6 +691,14 @@ in
Defines a group of servers to use as proxy target. Defines a group of servers to use as proxy target.
''; '';
default = {}; default = {};
example = literalExample ''
"backend_server" = {
servers = { "127.0.0.1:8000" = {}; };
extraConfig = ''''
keepalive 16;
'''';
};
'';
}; };
virtualHosts = mkOption { virtualHosts = mkOption {

6
pkgs/applications/blockchains/openethereum/default.nix
View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "openethereum"; pname = "openethereum";
version = "3.2.3"; version = "3.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openethereum"; owner = "openethereum";
repo = "openethereum"; repo = "openethereum";
rev = "v${version}"; rev = "v${version}";
sha256 = "1j7wfgpnvf9pcprd53sbd3pa7yz9588z81i1bx12wmj1fja3xa0j"; sha256 = "143w0b0ff1s73qzr844l25w90d2y2z0b3w2fr5kkbc1wsnpcq7jp";
}; };
cargoSha256 = "0ha18caw8mxzrh984y2z148cmdijrjxf0rc8j4ccwvmrbdsaz1xn"; cargoSha256 = "1gm02pcfll362add8a0dcb0sk0mag8z0q23b87yb6fs870bqvhib";
LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
nativeBuildInputs = [ nativeBuildInputs = [

42
pkgs/applications/editors/kakoune/plugins/generated.nix
View File

@ -17,12 +17,12 @@ let
auto-pairs-kak = buildKakounePluginFrom2Nix { auto-pairs-kak = buildKakounePluginFrom2Nix {
pname = "auto-pairs-kak"; pname = "auto-pairs-kak";
version = "2020-10-04"; version = "2021-03-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexherbo2"; owner = "alexherbo2";
repo = "auto-pairs.kak"; repo = "auto-pairs.kak";
rev = "fd735ec149ef0d9ca5f628a95b1e52858b5afbdc"; rev = "526779a26a5cf5f48e7c4f5c5fecca274968a737";
sha256 = "07795kv9njlnp6mckwv141ny2ns6wyf5r0dfjaxh9ngd105zgif1"; sha256 = "0gkhvwxyh8pdfydrj7zkfidk0drrbhvdi1fq3pkzllna3vz8q181";
}; };
meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/";
}; };
@ -41,12 +41,12 @@ let
fzf-kak = buildKakounePluginFrom2Nix { fzf-kak = buildKakounePluginFrom2Nix {
pname = "fzf-kak"; pname = "fzf-kak";
version = "2021-03-15"; version = "2021-04-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andreyorst"; owner = "andreyorst";
repo = "fzf.kak"; repo = "fzf.kak";
rev = "4e6c9a857511fccdbbc835a1c9acb205b6486a4c"; rev = "1b3a3beebbe7134e671fde2ef2f4242b34ae2c60";
sha256 = "0syhhdlsm7vg6hcd2n2acag9g562z49rbb5smh5p2gnplhmp93i0"; sha256 = "0rsd65zcizbq3isy8576gqw7mcml5ixw84padaz6ndwfif5fv701";
}; };
meta.homepage = "https://github.com/andreyorst/fzf.kak/"; meta.homepage = "https://github.com/andreyorst/fzf.kak/";
}; };
@ -65,12 +65,12 @@ let
kakoune-buffers = buildKakounePluginFrom2Nix { kakoune-buffers = buildKakounePluginFrom2Nix {
pname = "kakoune-buffers"; pname = "kakoune-buffers";
version = "2020-06-11"; version = "2021-04-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Delapouite"; owner = "Delapouite";
repo = "kakoune-buffers"; repo = "kakoune-buffers";
rev = "67959fbad727ba8470fe8cd6361169560f4fb532"; rev = "7832ea7a4528363482f5684f16cbcebcbec0adfd";
sha256 = "09prhzz4yzf6ryw0npd1gpcfp77681vgawpp1ilfvbf25xgbbz33"; sha256 = "196d36jww6asf5zr03l1rwg49kkv16s2d4zyryb2m3zvy7prf2bb";
}; };
meta.homepage = "https://github.com/Delapouite/kakoune-buffers/"; meta.homepage = "https://github.com/Delapouite/kakoune-buffers/";
}; };
@ -147,14 +147,26 @@ let
meta.homepage = "https://github.com/mayjs/openscad.kak/"; meta.homepage = "https://github.com/mayjs/openscad.kak/";
}; };
pandoc-kak = buildKakounePluginFrom2Nix {
pname = "pandoc-kak";
version = "2020-11-30";
src = fetchFromGitHub {
owner = "basbebe";
repo = "pandoc.kak";
rev = "63979f7e08b86d80436bbe2d9dba173a56057b97";
sha256 = "16pmmnpyxf8r7gpj8g1lwa960nscjmcl52n1a7s6xcqkp9856wxs";
};
meta.homepage = "https://github.com/basbebe/pandoc.kak/";
};
powerline-kak = buildKakounePluginFrom2Nix { powerline-kak = buildKakounePluginFrom2Nix {
pname = "powerline-kak"; pname = "powerline-kak";
version = "2021-02-25"; version = "2021-04-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "andreyorst"; owner = "andreyorst";
repo = "powerline.kak"; repo = "powerline.kak";
rev = "64ad98b6c85e63345563671b043960464d51c4b0"; rev = "6fa5ad383f2884f201d6e3ef07a4687c606df525";
sha256 = "09w2sk19qi64hgsyg4gb407vyppnlgk272mqbinz2r3apy6szkl3"; sha256 = "1s7ggjby0bymq48njzhdvkkarmzl44803xv0dlnzrj7q9c3xv27a";
}; };
meta.homepage = "https://github.com/andreyorst/powerline.kak/"; meta.homepage = "https://github.com/andreyorst/powerline.kak/";
}; };
@ -197,12 +209,12 @@ let
tabs-kak = buildKakounePluginFrom2Nix { tabs-kak = buildKakounePluginFrom2Nix {
pname = "tabs-kak"; pname = "tabs-kak";
version = "2021-02-16"; version = "2021-04-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "enricozb"; owner = "enricozb";
repo = "tabs.kak"; repo = "tabs.kak";
rev = "1aaa8cd89e404cbbd76d44ff8089de0951612fbf"; rev = "048f83455ea7c671ab06e9b9578ac25e5de1d6fb";
sha256 = "0dfz6j6yxl65jbh4xvpiy2abr2sdjyalynzhl28y7l1gzqv4ni3j"; sha256 = "0xswpsdf1bj54inl6vf2lzbjkxfc6g0fyv5kd6y9ahlh5irij8z0";
}; };
meta.homepage = "https://github.com/enricozb/tabs.kak/"; meta.homepage = "https://github.com/enricozb/tabs.kak/";
}; };

1
pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
View File

@ -3,6 +3,7 @@ alexherbo2/replace-mode.kak
alexherbo2/sleuth.kak alexherbo2/sleuth.kak
andreyorst/fzf.kak andreyorst/fzf.kak
andreyorst/powerline.kak andreyorst/powerline.kak
basbebe/pandoc.kak
danr/kakoune-easymotion danr/kakoune-easymotion
Delapouite/kakoune-buffers Delapouite/kakoune-buffers
Delapouite/kakoune-registers Delapouite/kakoune-registers

4
pkgs/applications/misc/dasel/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "dasel"; pname = "dasel";
version = "1.14.0"; version = "1.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TomWright"; owner = "TomWright";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1g4a001k86myfln0xlzy8w9krwamvfchnvywpr1p3x6iw95z46w8"; sha256 = "0nxdyd0zg4w1zr8p9z2x88h36vbn7ryk7160zszdiwh5qmdlv47v";
}; };
vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";

59
pkgs/applications/misc/haunt/default.nix Normal file
View File

@ -0,0 +1,59 @@
{ lib
, stdenv
, fetchurl
, guile
, guile-commonmark
, guile-reader
, makeWrapper
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "haunt";
version = "0.2.4";
src = fetchurl {
url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz";
hash = "sha256-zOkICg7KmJJhPWPtJRT3C9sYB1Oig1xLtgPNGe0n3xQ=";
};
nativeBuildInputs = [
makeWrapper
pkg-config
];
buildInputs = [
guile
guile-commonmark
guile-reader
];
postInstall = ''
wrapProgram $out/bin/haunt \
--prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" \
--prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site"
'';
meta = with lib; {
homepage = "https://dthompson.us/projects/haunt.html";
description = "Guile-based static site generator";
longDescription = ''
Haunt is a simple, functional, hackable static site generator that gives
authors the ability to treat websites as Scheme programs.
By giving authors the full expressive power of Scheme, they are able to
control every aspect of the site generation process. Haunt provides a
simple, functional build system that can be easily extended for this
purpose.
Haunt has no opinion about what markup language authors should use to
write posts, though it comes with support for the popular Markdown
format. Likewise, Haunt has no opinion about how authors structure their
sites. Though it comes with support for building simple blogs or Atom
feeds, authors should feel empowered to tweak, replace, or create builders
to do things that aren't provided out-of-the-box.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = guile.meta.platforms;
};
}

5
pkgs/applications/misc/stretchly/default.nix
View File

@ -5,18 +5,17 @@
, electron , electron
, common-updater-scripts , common-updater-scripts
, writeShellScript , writeShellScript
, jq
, makeDesktopItem , makeDesktopItem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stretchly"; pname = "stretchly";
version = "1.5.0"; version = "1.6.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
sha256 = "19czwmwqsn82zdzln9zqqyl9sb3dm95gp58dqn1459gyinkzpvda"; sha256 = "1q0ihp6cd65lnscbr7xj3yyb06qds77r4s6m1xbk5l9vs2rw923d";
}; };
icon = fetchurl { icon = fetchurl {

24
pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch
View File

@ -1,24 +0,0 @@
From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 25 Nov 2020 11:26:49 +0100
Subject: [PATCH] replace git with normal python package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index ef25aad..b4246a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-git+https://github.com/Yubico/yubikey-manager.git
+yubikey-manager
./py/qr
--
2.29.2

10
pkgs/applications/misc/yubioath-desktop/default.nix
View File

@ -6,11 +6,11 @@
mkDerivation rec { mkDerivation rec {
pname = "yubioath-desktop"; pname = "yubioath-desktop";
version = "5.0.4"; version = "5.0.5";
src = fetchurl { src = fetchurl {
url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz";
sha256 = "1aw88xvg6gjsfwmmlcrdcgyycn2cp7b8vxjzj14h7igcj02xh84h"; sha256 = "05xs6xh9pi50h0668arirj0gnz11adpixgsdkds072077gasdm0g";
}; };
doCheck = false; doCheck = false;
@ -19,10 +19,6 @@ mkDerivation rec {
nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ];
patches = [
./0001-replace-git-with-normal-python-package.patch
];
postPatch = '' postPatch = ''
substituteInPlace deployment.pri \ substituteInPlace deployment.pri \
--replace '/usr/bin' "$out/bin" --replace '/usr/bin' "$out/bin"
@ -48,7 +44,7 @@ mkDerivation rec {
cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons
substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \ substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \
--replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \
--replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" --replace 'Icon=com.yubico.yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png"
''; '';
meta = with lib; { meta = with lib; {

2
pkgs/applications/networking/instant-messengers/profanity/default.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
# Enable feature flags, so that build fail if libs are missing # Enable feature flags, so that build fail if libs are missing
configureFlags = [ "--enable-c-plugins" "--enable-otr" ] configureFlags = [ "--enable-c-plugins" "--enable-otr" ]
++ optionals notifySupport [ "--enable-notifications" ] ++ optionals notifySupport [ "--enable-notifications" ]
++ optionals traySupport [ "--enable-icons" ] ++ optionals traySupport [ "--enable-icons-and-clipboard" ]
++ optionals pgpSupport [ "--enable-pgp" ] ++ optionals pgpSupport [ "--enable-pgp" ]
++ optionals pythonPluginSupport [ "--enable-python-plugins" ] ++ optionals pythonPluginSupport [ "--enable-python-plugins" ]
++ optionals omemoSupport [ "--enable-omemo" ]; ++ optionals omemoSupport [ "--enable-omemo" ];

24
pkgs/applications/networking/mailreaders/mailspring/default.nix
View File

@ -18,11 +18,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mailspring"; pname = "mailspring";
version = "1.8.0"; version = "1.9.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
sha256 = "BtzYcHN87qH7s3GiBrsDfmuy9v2xdhCeSShu8+T9T3E="; sha256 = "ISwNFR8M377+J7WoG9MlblF8r5yRTgCxEGszZCjqW/k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -34,9 +34,7 @@ stdenv.mkDerivation rec {
alsaLib alsaLib
db db
glib glib
# We don't know why with trackerSupport the executable fail to launch, See: gtk3
# https://github.com/NixOS/nixpkgs/issues/106732
(gtk3.override {trackerSupport = false; })
libkrb5 libkrb5
libsecret libsecret
nss nss
@ -52,10 +50,16 @@ stdenv.mkDerivation rec {
]; ];
unpackPhase = '' unpackPhase = ''
runHook preUnpack
dpkg -x $src . dpkg -x $src .
runHook postUnpack
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib} mkdir -p $out/{bin,lib}
cp -ar ./usr/share $out cp -ar ./usr/share $out
@ -64,11 +68,13 @@ stdenv.mkDerivation rec {
ln -s $out/share/mailspring/mailspring $out/bin/mailspring ln -s $out/share/mailspring/mailspring $out/bin/mailspring
ln -s ${openssl.out}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 ln -s ${openssl.out}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0
runHook postInstall
''; '';
postFixup = /* sh */ '' postFixup = /* sh */ ''
substituteInPlace $out/share/applications/mailspring.desktop \ substituteInPlace $out/share/applications/Mailspring.desktop \
--replace /usr/bin $out/bin --replace Exec=mailspring Exec=$out/bin/mailspring
''; '';
meta = with lib; { meta = with lib; {
@ -77,8 +83,8 @@ stdenv.mkDerivation rec {
Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. Mailspring is an open-source mail client forked from Nylas Mail and built with Electron.
Mailspring's sync engine runs locally, but its source is not open. Mailspring's sync engine runs locally, but its source is not open.
''; '';
license = licenses.unfree; license = licenses.gpl3Plus;
maintainers = with maintainers; [ toschmidt ]; maintainers = with maintainers; [ toschmidt doronbehar ];
homepage = "https://getmailspring.com"; homepage = "https://getmailspring.com";
downloadPage = "https://github.com/Foundry376/Mailspring"; downloadPage = "https://github.com/Foundry376/Mailspring";
platforms = platforms.x86_64; platforms = platforms.x86_64;

1
pkgs/applications/science/logic/coq/default.nix
View File

@ -43,6 +43,7 @@ let
"8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; "8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n";
"8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd";
"8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n";
"8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk";
}; };
releaseRev = v: "V${v}"; releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix fetched = import ../../../../build-support/coq/meta-fetch/default.nix

31
pkgs/applications/window-managers/neocomp/default.nix
View File

@ -16,27 +16,30 @@
, libXinerama , libXinerama
, libXrandr , libXrandr
, libXrender , libXrender
, libXres
, pcre , pcre
, pkg-config , pkg-config
}: }:
let
rev = "v0.6-17-g271e784";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "neocomp-unstable"; pname = "neocomp";
version = "2019-03-12"; version = "unstable-2021-04-06";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; owner = "DelusionalLogic";
owner = "DelusionalLogic"; repo = "NeoComp";
repo = "NeoComp"; rev = "ccd340d7b2dcd3f828aff958a638cc23686aee6f";
sha256 = "1mp338vz1jm5pwf7pi5azx4hzykmvpkwzx1kw6a9anj272f32zpg"; sha256 = "sha256-tLLEwpAGNVTC+N41bM7pfskIli4Yvc95wH2/NT0OZ+8=";
}; };
buildInputs = [ nativeBuildInputs = [
asciidoc asciidoc
docbook_xml_dtd_45 docbook_xml_dtd_45
docbook_xsl docbook_xsl
pkg-config
];
buildInputs = [
freetype freetype
judy judy
libGL libGL
@ -50,15 +53,15 @@ stdenv.mkDerivation rec {
libXinerama libXinerama
libXrandr libXrandr
libXrender libXrender
libXres
pcre pcre
pkg-config
]; ];
makeFlags = [ makeFlags = [
"PREFIX=${placeholder "out"}" "PREFIX=${placeholder "out"}"
"CFGDIR=${placeholder "out"}/etc/xdg/neocomp" "CFGDIR=${placeholder "out"}/etc/xdg/neocomp"
"ASTDIR=${placeholder "out"}/share/neocomp/assets" "ASTDIR=${placeholder "out"}/share/neocomp/assets"
"COMPTON_VERSION=git-${rev}-${version}" "COMPTON_VERSION=${version}"
]; ];
postPatch = '' postPatch = ''
@ -72,8 +75,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/DelusionalLogic/NeoComp"; homepage = "https://github.com/DelusionalLogic/NeoComp";
license = licenses.gpl3; license = licenses.gpl3Only;
maintainers = with maintainers; [ twey ]; maintainers = with maintainers; [ twey fortuneteller2k ];
platforms = platforms.linux; platforms = platforms.linux;
description = "A fork of Compton, a compositor for X11"; description = "A fork of Compton, a compositor for X11";
longDescription = '' longDescription = ''

1
pkgs/development/compilers/dmd/default.nix
View File

@ -170,6 +170,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ThomasMader lionello ]; maintainers = with maintainers; [ ThomasMader lionello ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
# many tests are failing # many tests are failing
broken = true;
}; };
} }

11
pkgs/development/compilers/dotnet/default.nix
View File

@ -1,6 +1,9 @@
/* /*
How to combine packages for use in development: How to combine packages for use in development:
dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_3_0 sdk aspnetcore_2_1 ]; dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_3_0 sdk aspnetcore_2_1 ];
Hashes below are retrived from:
https://dotnet.microsoft.com/download/dotnet
*/ */
{ callPackage }: { callPackage }:
let let
@ -124,11 +127,11 @@ rec {
}; };
sdk_5_0 = buildNetCoreSdk { sdk_5_0 = buildNetCoreSdk {
version = "5.0.200"; version = "5.0.202";
sha512 = { sha512 = {
x86_64-linux = "0g7zcmkcdwc11h42m6hq8d0w55nnvnsmj3dc16829q55cp7l7kggmjljnd9slx7r7nrsyi7yy8brwh8n4kfi5998pdyb09fzhq5w60d"; x86_64-linux = "Ae1Z8jYYSYdAVnPSSUDVXOKdgw59u8GVVv3AOJMDnmBGcS3m+QHcmREEeg3uT9FTGbfpT4ox32uYH6Nb2T2YOA==";
aarch64-linux = "2zy6nxiw313g2sbmnkg76r64llbk2w2wcsa6frq535zbviw52zf163jvw2687rpiw4szdizf337l3b0qa0396abw5dhq2czqlxjyjv8"; aarch64-linux = "JuwSWgY35xrK0gOGR034mhAemulIkhtd4M00P0vA6EtOeyMY4Vl4cj6zudMh6Jt5DD8EJKQ8KbABX8byuePp2Q==";
x86_64-darwin = "2p0yxplafhi5ks38pq8nyi43kpv4l4npa718rvcvl57qs76j0dqlk1s4wdw7msx8g7xxy1aal47zy9rxvlypmgwx4dnp339cmbd6mf6"; x86_64-darwin = "jxnfTbQUb0dJ2/NX2pu8Pi/F/e4EaDm2Ta5U+6sSYj/s6nNp6NHxtEn7BzhQ9/EVLszl/oXi3lL0d/BPbzldEA==";
}; };
}; };
} }

4
pkgs/development/compilers/go/1.16.nix
View File

@ -11,7 +11,7 @@ let
inherit (lib) optionals optionalString; inherit (lib) optionals optionalString;
version = "1.16.2"; version = "1.16.3";
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz"; url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "1sl33wkhp6pi9f15f6khp5a7l7xwmpc3sp1zmji8pjr3g8l19jip"; sha256 = "sha256-spjSnekjbKR6Aj44IxO8wtLu0x36cGtgoEEDzoOnGiU=";
}; };
# perl is used for testing go vet # perl is used for testing go vet

6
pkgs/development/compilers/roslyn/deps.nix generated
View File

@ -137,10 +137,10 @@
} }
{ {
name = "microsoft.netcore.app.host.linux-x64"; name = "microsoft.netcore.app.host.linux-x64";
version = "3.1.12"; version = "3.1.14";
src = fetchurl { src = fetchurl {
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.12/microsoft.netcore.app.host.linux-x64.3.1.12.nupkg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.14/microsoft.netcore.app.host.linux-x64.3.1.14.nupkg";
sha256 = "1kp1sb7n1sb012v4k1xfv97n0x7k5r2rn0za8y8nbxjb2a4i4a8n"; sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h";
}; };
} }
{ {

26
pkgs/development/guile-modules/guile-cairo/default.nix
View File

@ -1,23 +1,38 @@
{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }: { lib
, stdenv
, fetchurl
, cairo
, expat
, guile
, guile-lib
, pkg-config
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "guile-cairo"; pname = "guile-cairo";
version = "1.11.2"; version = "1.11.2";
src = fetchurl { src = fetchurl {
url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"; hash = "sha256-YjLU3Cxb2dMxE5s7AfQ0PD4fucp4mDYaaZIGcwlBoHs=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [
pkg-config
];
buildInputs = [
cairo
expat
guile
];
buildInputs = [ guile cairo expat ];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = false; # Cannot find unit-test module from guile-lib doCheck = false; # Cannot find unit-test module from guile-lib
checkInputs = [ guile-lib ]; checkInputs = [ guile-lib ];
meta = with lib; { meta = with lib; {
homepage = "https://www.nongnu.org/guile-cairo/";
description = "Cairo bindings for GNU Guile"; description = "Cairo bindings for GNU Guile";
longDescription = '' longDescription = ''
Guile-Cairo wraps the Cairo graphics library for Guile Scheme. Guile-Cairo wraps the Cairo graphics library for Guile Scheme.
@ -28,7 +43,6 @@ stdenv.mkDerivation rec {
maintained graphics library with all of the benefits of Scheme: memory maintained graphics library with all of the benefits of Scheme: memory
management, exceptions, macros, and a dynamic programming environment. management, exceptions, macros, and a dynamic programming environment.
''; '';
homepage = "https://www.nongnu.org/guile-cairo/";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
maintainers = with maintainers; [ vyp ]; maintainers = with maintainers; [ vyp ];
platforms = platforms.linux; platforms = platforms.linux;

42
pkgs/development/guile-modules/guile-commonmark/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, guile
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "guile-commonmark";
version = "0.1.2";
src = fetchFromGitHub {
owner = "OrangeShark";
repo = pname;
rev = "v${version}";
hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
guile
];
# https://github.com/OrangeShark/guile-commonmark/issues/20
doCheck = false;
makeFlags = [
"GUILE_AUTO_COMPILE=0"
];
meta = with lib; {
homepage = "https://github.com/OrangeShark/guile-commonmark";
description = "Implementation of CommonMark for Guile";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = guile.meta.platforms;
};
}

29
pkgs/development/guile-modules/guile-fibers/default.nix
View File

@ -1,26 +1,37 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }: { lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, guile
, pkg-config
, texinfo
}:
let stdenv.mkDerivation rec {
pname = "guile-fibers";
version = "1.0.0"; version = "1.0.0";
name = "guile-fibers-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wingo"; owner = "wingo";
repo = "fibers"; repo = "fibers";
rev = "v${version}"; rev = "v${version}";
sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi"; hash = "sha256-kU/ty/XRNfv3ubIwH40wZmo8MXApeduHcH2KEGqoh+Q=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [
buildInputs = [ guile texinfo ]; autoreconfHook
pkg-config
];
buildInputs = [
guile
texinfo
];
autoreconfPhase = "./autogen.sh"; autoreconfPhase = "./autogen.sh";
meta = with lib; { meta = with lib; {
description = "Concurrent ML-like concurrency for Guile";
homepage = "https://github.com/wingo/fibers"; homepage = "https://github.com/wingo/fibers";
description = "Concurrent ML-like concurrency for Guile";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
maintainers = with maintainers; [ vyp ]; maintainers = with maintainers; [ vyp ];
platforms = platforms.linux; platforms = platforms.linux;

48
pkgs/development/guile-modules/guile-gnome/default.nix
View File

@ -1,7 +1,21 @@
{ fetchurl, lib, stdenv, guile, guile-lib, gwrap { lib
, pkg-config, gconf, glib, gnome_vfs, gtk2 , stdenv
, libglade, libgnome, libgnomecanvas, libgnomeui , fetchurl
, pango, guile-cairo, texinfo , gconf
, glib
, gnome_vfs
, gtk2
, guile
, guile-cairo
, guile-lib
, gwrap
, libglade
, libgnome
, libgnomecanvas
, libgnomeui
, pango
, pkg-config
, texinfo
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,20 +24,37 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz";
sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3"; hash = "sha256-ravUjtWZPYUo/WBOCqDZatgaYdBtps3WgyNXKtbCFsM=";
}; };
nativeBuildInputs = [
pkg-config
texinfo
];
buildInputs = [ buildInputs = [
texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2 gconf
libglade libgnome libgnomecanvas libgnomeui pango guile-cairo glib
gnome_vfs
gtk2
guile
guile-cairo
gwrap
libglade
libgnome
libgnomecanvas
libgnomeui
pango
] ++ lib.optional doCheck guile-lib; ] ++ lib.optional doCheck guile-lib;
# The test suite tries to open an X display, which fails. # The test suite tries to open an X display, which fails.
doCheck = false; doCheck = false;
GUILE_AUTO_COMPILE = 0; makeFlags = [
"GUILE_AUTO_COMPILE=0"
];
meta = with lib; { meta = with lib; {
homepage = "https://www.gnu.org/software/guile-gnome/";
description = "GNOME bindings for GNU Guile"; description = "GNOME bindings for GNU Guile";
longDescription = '' longDescription = ''
GNU guile-gnome brings the power of Scheme to your graphical application. GNU guile-gnome brings the power of Scheme to your graphical application.
@ -32,7 +63,6 @@ stdenv.mkDerivation rec {
guile-gnome a comprehensive environment for developing modern guile-gnome a comprehensive environment for developing modern
applications. applications.
''; '';
homepage = "https://www.gnu.org/software/guile-gnome/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ vyp ]; maintainers = with maintainers; [ vyp ];
platforms = platforms.linux; platforms = platforms.linux;

29
pkgs/development/guile-modules/guile-lib/default.nix
View File

@ -1,20 +1,29 @@
{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }: { lib
, stdenv
, fetchurl
, guile
, pkg-config
, texinfo
}:
assert stdenv ? cc && stdenv.cc.isGNU; assert stdenv ? cc && stdenv.cc.isGNU;
let stdenv.mkDerivation rec {
name = "guile-lib-${version}"; pname = "guile-lib";
version = "0.2.6.1"; version = "0.2.6.1";
in stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://savannah/guile-lib/${name}.tar.gz"; url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"; hash = "sha256-bR09DxTbnSgLjUJ9bh3sRBfd0Cv/I71Zguy24mLrPyo=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [
buildInputs = [ guile texinfo ]; pkg-config
];
buildInputs = [
guile
texinfo
];
doCheck = true; doCheck = true;
@ -25,6 +34,7 @@ in stdenv.mkDerivation {
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://www.nongnu.org/guile-lib/";
description = "A collection of useful Guile Scheme modules"; description = "A collection of useful Guile Scheme modules";
longDescription = '' longDescription = ''
guile-lib is intended as an accumulation place for pure-scheme Guile guile-lib is intended as an accumulation place for pure-scheme Guile
@ -32,7 +42,6 @@ in stdenv.mkDerivation {
modules into a coherent library. Think "a down-scaled, limited-scope CPAN modules into a coherent library. Think "a down-scaled, limited-scope CPAN
for Guile". for Guile".
''; '';
homepage = "https://www.nongnu.org/guile-lib/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ vyp ]; maintainers = with maintainers; [ vyp ];
platforms = platforms.gnu ++ platforms.linux; platforms = platforms.gnu ++ platforms.linux;

31
pkgs/development/guile-modules/guile-ncurses/default.nix
View File

@ -1,18 +1,29 @@
{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }: { lib
, stdenv
, fetchurl
, pkg-config
, guile
, libffi
, ncurses
}:
let stdenv.mkDerivation rec {
name = "guile-ncurses-${version}"; pname = "guile-ncurses";
version = "1.7"; version = "1.7";
in stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://gnu/guile-ncurses/${name}.tar.gz"; url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [
buildInputs = [ guile ncurses libffi ]; pkg-config
];
buildInputs = [
guile
libffi
ncurses
];
preConfigure = '' preConfigure = ''
configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site"
@ -29,6 +40,7 @@ in stdenv.mkDerivation {
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {
homepage = "https://www.gnu.org/software/guile-ncurses/";
description = "Scheme interface to the NCurses libraries"; description = "Scheme interface to the NCurses libraries";
longDescription = '' longDescription = ''
GNU Guile-Ncurses is a library for the Guile Scheme interpreter that GNU Guile-Ncurses is a library for the Guile Scheme interpreter that
@ -36,7 +48,6 @@ in stdenv.mkDerivation {
interface functionality is built on the ncurses libraries: curses, form, interface functionality is built on the ncurses libraries: curses, form,
panel, and menu. panel, and menu.
''; '';
homepage = "https://www.gnu.org/software/guile-ncurses/";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
maintainers = with maintainers; [ vyp ]; maintainers = with maintainers; [ vyp ];
platforms = platforms.gnu ++ platforms.linux; platforms = platforms.gnu ++ platforms.linux;

24
pkgs/development/guile-modules/guile-opengl/default.nix
View File

@ -1,21 +1,27 @@
{ lib, stdenv, fetchurl, pkg-config, guile }: { lib
, stdenv
, fetchurl
, guile
, pkg-config
}:
let stdenv.mkDerivation rec {
name = "guile-opengl-${version}"; pname = "guile-opengl";
version = "0.1.0"; version = "0.1.0";
in stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://gnu/guile-opengl/${name}.tar.gz"; url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim"; hash = "sha256-NdK5UwUszX5B0kKbynG8oD2PCKIGpZ1x91ktBDvpDo8=";
}; };
nativeBuildInputs = [ pkg-config guile ]; nativeBuildInputs = [
pkg-config
guile
];
meta = with lib; { meta = with lib; {
description = "Guile bindings for the OpenGL graphics API";
homepage = "https://www.gnu.org/software/guile-opengl/"; homepage = "https://www.gnu.org/software/guile-opengl/";
description = "Guile bindings for the OpenGL graphics API";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ vyp ]; maintainers = with maintainers; [ vyp ];
platforms = platforms.unix; platforms = platforms.unix;

43
pkgs/development/guile-modules/guile-reader/default.nix
View File

@ -1,36 +1,49 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config { lib
, gperf, guile, guile-lib, libffi }: , stdenv
, fetchurl
, fetchpatch
, gperf
, guile
, guile-lib
, libffi
, pkg-config
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "guile-reader"; pname = "guile-reader";
version = "0.6.3"; version = "0.6.3";
src = fetchurl { src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz"; url = "http://download.savannah.nongnu.org/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; hash = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [
buildInputs = [ gperf guile guile-lib libffi ]; pkg-config
];
buildInputs = [
gperf
guile
guile-lib
libffi
];
GUILE_SITE="${guile-lib}/share/guile/site"; GUILE_SITE="${guile-lib}/share/guile/site";
configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ]; configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ];
meta = with lib; { meta = with lib; {
homepage = "https://www.nongnu.org/guile-reader/";
description = "A simple framework for building readers for GNU Guile"; description = "A simple framework for building readers for GNU Guile";
longDescription = '' longDescription = ''
Guile-Reader is a simple framework for building readers for GNU Guile-Reader is a simple framework for building readers for GNU Guile.
Guile.
The idea is to make it easy to build procedures that extend The idea is to make it easy to build procedures that extend Guile's read
Guile's read procedure. Readers supporting various syntax procedure. Readers supporting various syntax variants can easily be
variants can easily be written, possibly by re-using existing written, possibly by re-using existing "token readers" of a standard
"token readers" of a standard Scheme readers. For example, it Scheme readers. For example, it is used to implement Skribilo's
is used to implement Skribilo's R5RS-derived document syntax. R5RS-derived document syntax.
''; '';
homepage = "https://www.nongnu.org/guile-reader/";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.gnu; platforms = platforms.gnu;

38
pkgs/development/guile-modules/guile-sdl/default.nix
View File

@ -1,5 +1,13 @@
{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv { lib
, SDL, SDL_image, SDL_ttf, SDL_mixer , stdenv
, fetchurl
, SDL
, SDL_image
, SDL_mixer
, SDL_ttf
, buildEnv
, guile
, pkg-config
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -8,25 +16,33 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; hash = "sha256-ATx1bnnDlj69h6ZUy7wd2lVsuDGS424sFCIlJQLQTzI=";
}; };
nativeBuildInputs = [ pkg-config guile ]; nativeBuildInputs = [
guile
buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ]; pkg-config
];
GUILE_AUTO_COMPILE = 0; buildInputs = [
SDL.dev
SDL_image
SDL_mixer
SDL_ttf
];
makeFlags = let makeFlags = let
sdl = buildEnv { sdl-env = buildEnv {
name = "sdl-env"; name = "sdl-env";
paths = buildInputs; paths = buildInputs;
}; };
in [ "SDLMINUSI=-I${sdl}/include/SDL" ]; in [
"GUILE_AUTO_COMPILE=0"
"SDLMINUSI=-I${sdl-env}/include/SDL"
];
meta = with lib; { meta = with lib; {
description = "Guile bindings for SDL";
homepage = "https://www.gnu.org/software/guile-sdl/"; homepage = "https://www.gnu.org/software/guile-sdl/";
description = "Guile bindings for SDL";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ vyp ]; maintainers = with maintainers; [ vyp ];
platforms = platforms.linux; platforms = platforms.linux;

42
pkgs/development/guile-modules/guile-sdl2/default.nix
View File

@ -1,36 +1,50 @@
{ lib, stdenv, fetchurl, guile, libtool, pkg-config { lib
, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer , stdenv
, fetchurl
, SDL2
, SDL2_image
, SDL2_mixer
, SDL2_ttf
, guile
, libtool
, pkg-config
}: }:
let stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "guile-sdl2"; pname = "guile-sdl2";
version = "0.5.0"; version = "0.5.0";
in stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "https://files.dthompson.us/${pname}/${name}.tar.gz"; url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz";
sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m"; hash = "sha256-lWTLctPUDqvN/Y95oOL7LF3czlLJFQ9d9np9dx4DHYU=";
}; };
nativeBuildInputs = [ libtool pkg-config ]; nativeBuildInputs = [
pkg-config
libtool
];
buildInputs = [ buildInputs = [
guile SDL2 SDL2_image SDL2_ttf SDL2_mixer SDL2
SDL2_image
SDL2_mixer
SDL2_ttf
guile
]; ];
configureFlags = [ configureFlags = [
"--with-libsdl2-prefix=${SDL2}"
"--with-libsdl2-image-prefix=${SDL2_image}" "--with-libsdl2-image-prefix=${SDL2_image}"
"--with-libsdl2-ttf-prefix=${SDL2_ttf}"
"--with-libsdl2-mixer-prefix=${SDL2_mixer}" "--with-libsdl2-mixer-prefix=${SDL2_mixer}"
"--with-libsdl2-prefix=${SDL2}"
"--with-libsdl2-ttf-prefix=${SDL2_ttf}"
]; ];
makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; makeFlags = [
"GUILE_AUTO_COMPILE=0"
];
meta = with lib; { meta = with lib; {
description = "Bindings to SDL2 for GNU Guile";
homepage = "https://dthompson.us/projects/guile-sdl2.html"; homepage = "https://dthompson.us/projects/guile-sdl2.html";
description = "Bindings to SDL2 for GNU Guile";
license = licenses.lgpl3Plus; license = licenses.lgpl3Plus;
maintainers = with maintainers; [ seppeljordan vyp ]; maintainers = with maintainers; [ seppeljordan vyp ];
platforms = platforms.all; platforms = platforms.all;

39
pkgs/development/guile-modules/guile-xcb/default.nix
View File

@ -1,29 +1,36 @@
{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }: { lib
, stdenv
, fetchurl
, guile
, pkg-config
, texinfo
}:
let stdenv.mkDerivation rec {
name = "guile-xcb-${version}"; pname = "guile-xcb";
version = "1.3"; version = "1.3";
in stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "http://www.markwitmer.com/dist/${name}.tar.gz"; url = "http://www.markwitmer.com/dist/${pname}-${version}.tar.gz";
sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; hash = "sha256-iYR6AYSTgUsURAEJTWcdHlc0f8LzEftAIsfonBteuxE=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [
buildInputs = [ guile texinfo ]; pkg-config
];
buildInputs = [
guile
texinfo
];
preConfigure = '' configureFlags = [
configureFlags=" "--with-guile-site-dir=$out/share/guile/site"
--with-guile-site-dir=$out/share/guile/site "--with-guile-site-ccache-dir=$out/share/guile/site"
--with-guile-site-ccache-dir=$out/share/guile/site ];
";
'';
meta = with lib; { meta = with lib; {
description = "XCB bindings for Guile";
homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
description = "XCB bindings for Guile";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ vyp ]; maintainers = with maintainers; [ vyp ];
platforms = platforms.linux; platforms = platforms.linux;

42
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1242,13 +1242,7 @@ self: super: {
patch = doJailbreak super.patch; patch = doJailbreak super.patch;
# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatch (doJailbreak super.reflex-dom-core) (pkgs.fetchpatch { reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core)));
url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
sha256 = "1g7lgwj7rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l";
stripLen = 2;
extraPrefix = "";
includes = ["reflex-dom-core.cabal" ];
}))));
# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch { reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch {
@ -1475,14 +1469,6 @@ self: super: {
# https://github.com/obsidiansystems/dependent-sum/issues/55 # https://github.com/obsidiansystems/dependent-sum/issues/55
dependent-sum = doJailbreak super.dependent-sum; dependent-sum = doJailbreak super.dependent-sum;
# Overspecified constraint on 'constraints'. Kinda funny, huh?
dependent-sum-aeson-orphans = appendPatch (doJailbreak super.dependent-sum-aeson-orphans) (pkgs.fetchpatch {
# 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9
# Bump version bounds for ghc 8.10
url = https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/e1f5898116222a1bc557d41f3395066f83736093.patch;
sha256 = "01fj29xdblxpz4drasaygf9875fipylpj8w164lb0cszd1vmqwnb";
});
# 2020-11-18: https://github.com/srid/rib/issues/169 # 2020-11-18: https://github.com/srid/rib/issues/169
# aeson bound out of sync # aeson bound out of sync
rib-core = doJailbreak super.rib-core; rib-core = doJailbreak super.rib-core;
@ -1491,20 +1477,8 @@ self: super: {
# base upper bound is incompatible with ghc 8.10 # base upper bound is incompatible with ghc 8.10
neuron = doJailbreak super.neuron; neuron = doJailbreak super.neuron;
reflex = dontCheck (doJailbreak (appendPatches super.reflex [ # 2020-04-16: https://github.com/reflex-frp/reflex/issues/449
# https://github.com/reflex-frp/reflex/pull/444 reflex = dontCheck (doJailbreak super.reflex);
# Fixes for ghc 8.10
(pkgs.fetchpatch {
url = https://github.com/reflex-frp/reflex/commit/d230632427fc1b7031163567c97f20050610c122.patch;
sha256 = "0gafqqi6q16m5y4mrc2f7lhahmazvcbiadn2v84y9p3zvx2v26xy";
})
# https://github.com/reflex-frp/reflex/pull/444
# Bound bumps for ghc 8.10
(pkgs.fetchpatch {
url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch;
sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq";
})
]));
# 2020-11-19: jailbreaking because of pretty-simple bound out of date # 2020-11-19: jailbreaking because of pretty-simple bound out of date
# https://github.com/kowainik/stan/issues/408 # https://github.com/kowainik/stan/issues/408
@ -1563,9 +1537,9 @@ self: super: {
); );
# 2020-12-05: http-client is fixed on too old version # 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override {
http-client = self.http-client_0_7_6; http-client = self.http-client_0_7_7;
}; });
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
pandoc-include-code = doJailbreak super.pandoc-include-code; pandoc-include-code = doJailbreak super.pandoc-include-code;
@ -1811,4 +1785,8 @@ self: super: {
# PR pending https://github.com/zohl/cereal-time/pull/2 # PR pending https://github.com/zohl/cereal-time/pull/2
cereal-time = doJailbreak super.cereal-time; cereal-time = doJailbreak super.cereal-time;
# 2021-04-16: too strict bounds on QuickCheck and tasty
# https://github.com/hasufell/lzma-static/issues/1
lzma-static = doJailbreak super.lzma-static;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

45
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -82,6 +82,8 @@ default-package-overrides:
- hls-retrie-plugin < 1.0.0.1 - hls-retrie-plugin < 1.0.0.1
- lsp < 1.2 - lsp < 1.2
- lsp-types < 1.2 - lsp-types < 1.2
- hls-plugin-api < 1.1.0.0
- hls-explicit-imports-plugin < 1.0.0.1
# 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25, # 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25,
# so we need to restrict these to compatible versions # so we need to restrict these to compatible versions
# Remove these as soon as haskell-gi{,-base} are 0.25.* # Remove these as soon as haskell-gi{,-base} are 0.25.*
@ -99,7 +101,7 @@ default-package-overrides:
- gi-secret < 0.0.13 - gi-secret < 0.0.13
- gi-vte < 2.91.28 - gi-vte < 2.91.28
# Stackage Nightly 2021-04-02 # Stackage Nightly 2021-04-06
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
- AC-Angle ==1.0 - AC-Angle ==1.0
@ -330,7 +332,7 @@ default-package-overrides:
- bech32 ==1.1.0 - bech32 ==1.1.0
- bech32-th ==1.0.2 - bech32-th ==1.0.2
- bench ==1.0.12 - bench ==1.0.12
- benchpress ==0.2.2.15 - benchpress ==0.2.2.16
- between ==0.11.0.0 - between ==0.11.0.0
- bibtex ==0.1.0.6 - bibtex ==0.1.0.6
- bifunctors ==5.5.10 - bifunctors ==5.5.10
@ -381,7 +383,7 @@ default-package-overrides:
- boolsimplifier ==0.1.8 - boolsimplifier ==0.1.8
- boots ==0.2.0.1 - boots ==0.2.0.1
- bordacount ==0.1.0.0 - bordacount ==0.1.0.0
- boring ==0.1.3 - boring ==0.2
- both ==0.1.1.1 - both ==0.1.1.1
- bound ==2.0.3 - bound ==2.0.3
- BoundedChan ==1.0.3.0 - BoundedChan ==1.0.3.0
@ -535,7 +537,7 @@ default-package-overrides:
- composite-hashable ==0.7.4.0 - composite-hashable ==0.7.4.0
- composite-tuple ==0.1.2.0 - composite-tuple ==0.1.2.0
- composite-xstep ==0.1.0.0 - composite-xstep ==0.1.0.0
- composition ==1.0.2.1 - composition ==1.0.2.2
- composition-extra ==2.0.0 - composition-extra ==2.0.0
- concise ==0.1.0.1 - concise ==0.1.0.1
- concurrency ==1.11.0.1 - concurrency ==1.11.0.1
@ -661,7 +663,7 @@ default-package-overrides:
- data-ordlist ==0.4.7.0 - data-ordlist ==0.4.7.0
- data-ref ==0.0.2 - data-ref ==0.0.2
- data-reify ==0.6.3 - data-reify ==0.6.3
- data-serializer ==0.3.4.1 - data-serializer ==0.3.5
- data-textual ==0.3.0.3 - data-textual ==0.3.0.3
- dataurl ==0.1.0.0 - dataurl ==0.1.0.0
- DAV ==1.3.4 - DAV ==1.3.4
@ -708,7 +710,7 @@ default-package-overrides:
- distributed-closure ==0.4.2.0 - distributed-closure ==0.4.2.0
- distribution-opensuse ==1.1.1 - distribution-opensuse ==1.1.1
- distributive ==0.6.2.1 - distributive ==0.6.2.1
- dl-fedora ==0.7.6 - dl-fedora ==0.7.7
- dlist ==0.8.0.8 - dlist ==0.8.0.8
- dlist-instances ==0.1.1.1 - dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1 - dlist-nonempty ==0.1.1
@ -873,7 +875,7 @@ default-package-overrides:
- fix-whitespace ==0.0.5 - fix-whitespace ==0.0.5
- flac ==0.2.0 - flac ==0.2.0
- flac-picture ==0.1.2 - flac-picture ==0.1.2
- flags-applicative ==0.1.0.2 - flags-applicative ==0.1.0.3
- flat ==0.4.4 - flat ==0.4.4
- flat-mcmc ==1.5.2 - flat-mcmc ==1.5.2
- flexible-defaults ==0.0.3 - flexible-defaults ==0.0.3
@ -1043,7 +1045,7 @@ default-package-overrides:
- graphite ==0.10.0.1 - graphite ==0.10.0.1
- graphql-client ==1.1.1 - graphql-client ==1.1.1
- graphs ==0.7.1 - graphs ==0.7.1
- graphula ==2.0.0.3 - graphula ==2.0.0.4
- graphviz ==2999.20.1.0 - graphviz ==2999.20.1.0
- graph-wrapper ==0.2.6.0 - graph-wrapper ==0.2.6.0
- gravatar ==0.8.0 - gravatar ==0.8.0
@ -1126,7 +1128,7 @@ default-package-overrides:
- hformat ==0.3.3.1 - hformat ==0.3.3.1
- hfsevents ==0.1.6 - hfsevents ==0.1.6
- hgrev ==0.2.6 - hgrev ==0.2.6
- hidapi ==0.1.6 - hidapi ==0.1.7
- hie-bios ==0.7.5 - hie-bios ==0.7.5
- hi-file-parser ==0.1.1.0 - hi-file-parser ==0.1.1.0
- higher-leveldb ==0.6.0.0 - higher-leveldb ==0.6.0.0
@ -1162,7 +1164,7 @@ default-package-overrides:
- hp2pretty ==0.10 - hp2pretty ==0.10
- hpack ==0.34.4 - hpack ==0.34.4
- hpack-dhall ==0.5.2 - hpack-dhall ==0.5.2
- hpc-codecov ==0.2.0.2 - hpc-codecov ==0.3.0.0
- hpc-lcov ==1.0.1 - hpc-lcov ==1.0.1
- hprotoc ==2.4.17 - hprotoc ==2.4.17
- hruby ==0.3.8.1 - hruby ==0.3.8.1
@ -1185,7 +1187,7 @@ default-package-overrides:
- hslua-module-path ==0.1.0.1 - hslua-module-path ==0.1.0.1
- hslua-module-system ==0.2.2.1 - hslua-module-system ==0.2.2.1
- hslua-module-text ==0.3.0.1 - hslua-module-text ==0.3.0.1
- HsOpenSSL ==0.11.6 - HsOpenSSL ==0.11.6.1
- HsOpenSSL-x509-system ==0.1.0.4 - HsOpenSSL-x509-system ==0.1.0.4
- hsp ==0.10.0 - hsp ==0.10.0
- hspec ==2.7.9 - hspec ==2.7.9
@ -1465,7 +1467,7 @@ default-package-overrides:
- liboath-hs ==0.0.1.2 - liboath-hs ==0.0.1.2
- libyaml ==0.1.2 - libyaml ==0.1.2
- LibZip ==1.0.1 - LibZip ==1.0.1
- lifted-async ==0.10.1.3 - lifted-async ==0.10.2
- lifted-base ==0.2.3.12 - lifted-base ==0.2.3.12
- lift-generics ==0.2 - lift-generics ==0.2
- line ==4.0.1 - line ==4.0.1
@ -1629,7 +1631,7 @@ default-package-overrides:
- mono-traversable ==1.0.15.1 - mono-traversable ==1.0.15.1
- mono-traversable-instances ==0.1.1.0 - mono-traversable-instances ==0.1.1.0
- mono-traversable-keys ==0.1.0 - mono-traversable-keys ==0.1.0
- more-containers ==0.2.2.0 - more-containers ==0.2.2.2
- morpheus-graphql ==0.17.0 - morpheus-graphql ==0.17.0
- morpheus-graphql-app ==0.17.0 - morpheus-graphql-app ==0.17.0
- morpheus-graphql-client ==0.17.0 - morpheus-graphql-client ==0.17.0
@ -2069,7 +2071,7 @@ default-package-overrides:
- rhine-gloss ==0.7.0 - rhine-gloss ==0.7.0
- rigel-viz ==0.2.0.0 - rigel-viz ==0.2.0.0
- rio ==0.1.20.0 - rio ==0.1.20.0
- rio-orphans ==0.1.1.0 - rio-orphans ==0.1.2.0
- rio-prettyprint ==0.1.1.0 - rio-prettyprint ==0.1.1.0
- roc-id ==0.1.0.0 - roc-id ==0.1.0.0
- rocksdb-haskell ==1.0.1 - rocksdb-haskell ==1.0.1
@ -2163,7 +2165,7 @@ default-package-overrides:
- servant-swagger ==1.1.10 - servant-swagger ==1.1.10
- servant-swagger-ui ==0.3.4.3.37.2 - servant-swagger-ui ==0.3.4.3.37.2
- servant-swagger-ui-core ==0.3.4 - servant-swagger-ui-core ==0.3.4
- serverless-haskell ==0.12.5 - serverless-haskell ==0.12.6
- serversession ==1.0.2 - serversession ==1.0.2
- serversession-frontend-wai ==1.0 - serversession-frontend-wai ==1.0
- ses-html ==0.4.0.0 - ses-html ==0.4.0.0
@ -2234,7 +2236,7 @@ default-package-overrides:
- soap-tls ==0.1.1.4 - soap-tls ==0.1.1.4
- socket ==0.8.3.0 - socket ==0.8.3.0
- socks ==0.6.1 - socks ==0.6.1
- some ==1.0.2 - some ==1.0.3
- sop-core ==0.5.0.1 - sop-core ==0.5.0.1
- sort ==1.0.0.0 - sort ==1.0.0.0
- sorted-list ==0.2.1.0 - sorted-list ==0.2.1.0
@ -2309,7 +2311,7 @@ default-package-overrides:
- string-conversions ==0.4.0.1 - string-conversions ==0.4.0.1
- string-interpolate ==0.3.1.0 - string-interpolate ==0.3.1.0
- string-qq ==0.0.4 - string-qq ==0.0.4
- string-random ==0.1.4.0 - string-random ==0.1.4.1
- stringsearch ==0.3.6.6 - stringsearch ==0.3.6.6
- string-transform ==1.1.1 - string-transform ==1.1.1
- stripe-concepts ==1.0.2.6 - stripe-concepts ==1.0.2.6
@ -2362,7 +2364,7 @@ default-package-overrides:
- tardis ==0.4.3.0 - tardis ==0.4.3.0
- tasty ==1.4.1 - tasty ==1.4.1
- tasty-ant-xml ==1.1.8 - tasty-ant-xml ==1.1.8
- tasty-bench ==0.2.4 - tasty-bench ==0.2.5
- tasty-dejafu ==2.0.0.7 - tasty-dejafu ==2.0.0.7
- tasty-discover ==4.2.2 - tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.3 - tasty-expected-failure ==0.12.3
@ -2741,7 +2743,7 @@ default-package-overrides:
- yesod-sitemap ==1.6.0 - yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0 - yesod-static ==1.6.1.0
- yesod-test ==1.6.12 - yesod-test ==1.6.12
- yesod-websockets ==0.3.0.2 - yesod-websockets ==0.3.0.3
- yes-precure5-command ==5.5.3 - yes-precure5-command ==5.5.3
- yi-rope ==0.11 - yi-rope ==0.11
- yjsvg ==0.2.0.1 - yjsvg ==0.2.0.1
@ -5694,6 +5696,7 @@ broken-packages:
- ghcjs-xhr - ghcjs-xhr
- ghclive - ghclive
- ghcprofview - ghcprofview
- ghcup
- ght - ght
- gi-cairo-again - gi-cairo-again
- gi-graphene - gi-graphene
@ -7490,7 +7493,6 @@ broken-packages:
- kparams - kparams
- kqueue - kqueue
- kraken - kraken
- krank
- krapsh - krapsh
- Kriens - Kriens
- krpc - krpc
@ -9330,7 +9332,6 @@ broken-packages:
- puzzle-draw - puzzle-draw
- puzzle-draw-cmdline - puzzle-draw-cmdline
- pvd - pvd
- PyF
- pyffi - pyffi
- pyfi - pyfi
- python-pickle - python-pickle
@ -10379,6 +10380,7 @@ broken-packages:
- sorted - sorted
- sorting - sorting
- sorty - sorty
- souffle-dsl
- souffle-haskell - souffle-haskell
- sound-collage - sound-collage
- sounddelay - sounddelay
@ -11454,6 +11456,7 @@ broken-packages:
- wai-graceful - wai-graceful
- wai-handler-devel - wai-handler-devel
- wai-handler-fastcgi - wai-handler-fastcgi
- wai-handler-hal
- wai-handler-scgi - wai-handler-scgi
- wai-handler-snap - wai-handler-snap
- wai-handler-webkit - wai-handler-webkit

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -51,6 +51,7 @@ in
, license , license
, enableParallelBuilding ? true , enableParallelBuilding ? true
, maintainers ? null , maintainers ? null
, changelog ? null
, doCoverage ? false , doCoverage ? false
, doHaddock ? !(ghc.isHaLVM or false) , doHaddock ? !(ghc.isHaLVM or false)
, passthru ? {} , passthru ? {}
@ -642,6 +643,7 @@ stdenv.mkDerivation ({
// optionalAttrs (args ? description) { inherit description; } // optionalAttrs (args ? description) { inherit description; }
// optionalAttrs (args ? maintainers) { inherit maintainers; } // optionalAttrs (args ? maintainers) { inherit maintainers; }
// optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; }
// optionalAttrs (args ? changelog) { inherit changelog; }
; ;
} }

2061
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

1
pkgs/development/python-modules/pycomfoconnect/default.nix
View File

@ -2,7 +2,6 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, protobuf , protobuf
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {

42
pkgs/development/tools/electron/default.nix
View File

@ -86,30 +86,30 @@ rec {
headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885";
}; };
electron_10 = mkElectron "10.4.2" { electron_10 = mkElectron "10.4.3" {
x86_64-linux = "3d613b413f01c8af1600be42c82941761452407e1160125eca60feec0d7dd0c0"; x86_64-linux = "48793fc6c6d3bfb8df81cd29f6c52e68c8c6b901693c6ba4ed505799fa673e9f";
x86_64-darwin = "87b18811d165f2fd64606ae13a567b737f54bd41c7e2204a047a3532f4fa2d9c"; x86_64-darwin = "28cbacf51e0528e0d4ba30a2c56efd6a8e7f836104786733aae0c5fc99dc2615";
i686-linux = "297083ca9b21554ea1f729ed17c0c8b13aaea24e77194f9c1b340489fcfc0fa6"; i686-linux = "b9b7fd9b91630350dafe97a31c918f941ab15b044f0b4e9b2a705482447fe78f";
armv7l-linux = "3d93ec220824cce5d99b3a7511604b89c63935bd1130fc64ce08b8436e34c096"; armv7l-linux = "b1e1b4d0620eae647915c95d21656d21c00efe89f44198938d9fd9fba045e39c";
aarch64-linux = "0060e37eada91bac51945ae325ab04309438609089d31ab3f8bbfda73cc26166"; aarch64-linux = "aa9177becf787920cef4cde27a6ed08e2e23976678162a3cd6b77615b1582c05";
headers = "13cpkblkvhvd3sww8n1gw4rhva84x2fkkg81yr3n2mb0virlfgpn"; headers = "0phv08myxq226blrqzg3fza3mh3ivgfmcja98b7377pc3x7bv76g";
}; };
electron_11 = mkElectron "11.4.1" { electron_11 = mkElectron "11.4.3" {
x86_64-linux = "3efd3d3b5a9f71323320288aece65fcec89ea0331c3d6d3afc2495d3b0dc95d3"; x86_64-linux = "222e7aa51d5516796d532f784c574f07315bad4bf29efb0ce687014f93ba5fa5";
x86_64-darwin = "6ff91613c51b2ebaf280eb86b826f47d62639081a0f38c2012c428a17619a163"; x86_64-darwin = "6cccbaf8dca7eb3819b0ac3044686f6705c5d51c88ee1361d8573c2b83c8dc0a";
i686-linux = "513e1bc7a3e546dc0e712836886ac89c9f76bb7fb1e4b7a1f9d9cbc7347d8569"; i686-linux = "1910729fd6088e9c914db9fdd6c42ce6747fcb048947dd83fa2cdf564c786353";
armv7l-linux = "838fc96d90cfcc5e1e892287008f9d9d2dbe27f3d4cf2479e6275ecdd140fb65"; armv7l-linux = "e0e1375bdb79a6917467490683e49bb59da9260b73d7b710a5e4e4535c1c5e80";
aarch64-linux = "a3de4208b5033a19ffa9dd8130d440909b181c0ef57cb51c8f9c8dbbb1267a26"; aarch64-linux = "9fb287ed8bcc7782775bd615fe1c31db4a8b6d548209fd15ef5312ac72a04d07";
headers = "1bpsmmlxl4gk9yn5w7f8m6g8k1gmvwk0jwpqlk5islpkcy6x7107"; headers = "00gln9jlb621gvxx1z7s212wakjbdigdqv02vx1pjvkg62aazg8j";
}; };
electron_12 = mkElectron "12.0.2" { electron_12 = mkElectron "12.0.4" {
x86_64-linux = "fc3ff888d8cd4ada8368420c8951ed1b5ad78919bdcb688abe698d00e12a2e0a"; x86_64-linux = "6419716f614f396954981e6432afe77277dff2b64ecb84e2bbd6d740362ea01c";
x86_64-darwin = "766ca8f8adc4535db3069665ea8983979ea79dd5ec376e1c298f858b420ec58f"; x86_64-darwin = "3072f1854eb5b91d5f24e03a313583bb85d696cda48381bdf3e40ee2c93dfe34";
i686-linux = "78ab55db275b85210c6cc14ddf41607fbd5cefed93ef4d1b6b74630b0841b23c"; i686-linux = "fa241874aacca8fe4b4f940fa9133fe65fdcf9ef0847322332f0c67ee7b42aa0";
armv7l-linux = "8be8c6ea05da669d79179c5969ddee853710a1dd44f86e8f3bbe1167a2daf13c"; armv7l-linux = "8d88d13bf117820bc3b46501d34004f18ebf402f2817836a2a7ba4fc60433653";
aarch64-linux = "9ef70ab9347be63555784cac99efbaff1ef2d02dcc79070d7bccd18c38de87ef"; aarch64-linux = "c5cbcbb5b397407e45e682480b30da4fcf94154ac92d8f6eea4c79a50d56626a";
headers = "07095b5rylilbmyd0syamm6fc4pngazldj5jgm7blgirdi8yzzd2"; headers = "121falvhz0bfxc2h7wwvyfqdagr3aznida4f4phzqp0ja3rznxf3";
}; };
} }

2
pkgs/development/tools/purescript/spago/default.nix
View File

@ -17,6 +17,8 @@ let
maintainers = (oldAttrs.maintainers or []) ++ [ maintainers = (oldAttrs.maintainers or []) ++ [
lib.maintainers.cdepillabout lib.maintainers.cdepillabout
]; ];
changelog =
"https://github.com/purescript/spago/releases/tag/${oldAttrs.version}";
})); }));
in in

4
pkgs/games/osu-lazer/default.nix
View File

@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "osu-lazer"; pname = "osu-lazer";
version = "2021.331.0"; version = "2021.410.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ppy"; owner = "ppy";
repo = "osu"; repo = "osu";
rev = version; rev = version;
sha256 = "dCKBxVDBBhJ7LEawmMOU7PKh0yxmDgVw6PL2F0qA5RU="; sha256 = "twKg9iZdY+zgwEQeHMOlRZKXxAHic7GnoqH0jOdW7fw=";
}; };
patches = [ ./bypass-tamper-detection.patch ]; patches = [ ./bypass-tamper-detection.patch ];

28
pkgs/games/osu-lazer/deps.nix generated
View File

@ -261,8 +261,8 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "JetBrains.Annotations"; name = "JetBrains.Annotations";
version = "2020.3.0"; version = "2021.1.0";
sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb";
}) })
(fetchNuGet { (fetchNuGet {
name = "ManagedBass"; name = "ManagedBass";
@ -296,8 +296,8 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.AspNetCore.Connections.Abstractions"; name = "Microsoft.AspNetCore.Connections.Abstractions";
@ -551,8 +551,8 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.ObjectPool"; name = "Microsoft.Extensions.ObjectPool";
version = "5.0.4"; version = "5.0.5";
sha256 = "07kyqbm7f7k4bv3fa54b826b87z00385pqgjzd4s8l26j6p39rrm"; sha256 = "0hh0xm14hp479dsd0gb9igz0vbbn3sak27v39phpyilxvk7ky5z1";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Extensions.Options"; name = "Microsoft.Extensions.Options";
@ -576,8 +576,8 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.App.Runtime.linux-x64"; name = "Microsoft.NETCore.App.Runtime.linux-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.Platforms"; name = "Microsoft.NETCore.Platforms";
@ -721,8 +721,8 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "ppy.osu.Framework"; name = "ppy.osu.Framework";
version = "2021.330.0"; version = "2021.410.0";
sha256 = "01v319nd9szq5z5qq6pa348y1mv93pnhw0vrgbrjwvcs797h7mjl"; sha256 = "1vwdrspdpal44hyspv3rsax8mkszvbnc2xl1xswczx9mzj6qs4by";
}) })
(fetchNuGet { (fetchNuGet {
name = "ppy.osu.Framework.NativeLibs"; name = "ppy.osu.Framework.NativeLibs";
@ -731,8 +731,8 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "ppy.osu.Game.Resources"; name = "ppy.osu.Game.Resources";
version = "2021.211.1"; version = "2021.410.0";
sha256 = "0rqv5blmyzvcpk0b1r6fzr1bla62kr2fwkr1f9ahir9zafvk2wmm"; sha256 = "1a5qia4595n0b21dj63sl71ar56m9x1glqwky7a9bb0dqpvfivya";
}) })
(fetchNuGet { (fetchNuGet {
name = "ppy.osuTK.NS20"; name = "ppy.osuTK.NS20";
@ -741,8 +741,8 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "ppy.SDL2-CS"; name = "ppy.SDL2-CS";
version = "1.0.82"; version = "1.0.225-alpha";
sha256 = "0hdfih1hjpqxgblwc947inyfhskkj85f061cagf8gdl69xsp2l1b"; sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc";
}) })
(fetchNuGet { (fetchNuGet {
name = "ppy.squirrel.windows"; name = "ppy.squirrel.windows";

15
pkgs/games/osu-lazer/update.sh
View File

@ -22,21 +22,8 @@ chmod -R +w "$src"
pushd "$src" pushd "$src"
# Setup empty nuget package folder to force reinstall.
mkdir ./nuget_tmp.packages mkdir ./nuget_tmp.packages
cat >./nuget_tmp.config <<EOF dotnet restore osu.Desktop --packages ./nuget_tmp.packages --runtime linux-x64
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<config>
<add key="globalPackagesFolder" value="$(realpath ./nuget_tmp.packages)" />
</config>
</configuration>
EOF
dotnet restore osu.Desktop --configfile ./nuget_tmp.config --runtime linux-x64
echo "{ fetchNuGet }: [" >"$deps_file" echo "{ fetchNuGet }: [" >"$deps_file"
while read pkg_spec; do while read pkg_spec; do

6
pkgs/misc/emulators/ryujinx/default.nix
View File

@ -16,13 +16,13 @@ let
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "ryujinx"; pname = "ryujinx";
version = "1.0.6807"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx version = "1.0.6835"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ryujinx"; owner = "Ryujinx";
repo = "Ryujinx"; repo = "Ryujinx";
rev = "0ee314fb3b9d476d0d207a3595bde24af9c4b69b"; rev = "e520eecb5ba682d4b51bb782e3bc99fb1d6afe04";
sha256 = "1yyjy5qblsdg186hr81qpc07n0cqla67q3hjf2rrzq5pyb10bldy"; sha256 = "1yy1xslnvvl0m7g0jszj2pjwdwf0pbv53crzfkhla3n68kvfy00f";
}; };
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];

416
pkgs/misc/emulators/ryujinx/deps.nix generated
View File

@ -45,20 +45,15 @@
sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5";
}) })
(fetchNuGet { (fetchNuGet {
name = "GLWidget"; name = "GtkSharp";
version = "1.0.2"; version = "3.22.25.128";
sha256 = "0nb46jiscnsywwdfy7zhx1bw4jfmca3s6l8dhbi99gc4bvp8ar7p"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy";
}) })
(fetchNuGet { (fetchNuGet {
name = "GtkSharp.Dependencies"; name = "GtkSharp.Dependencies";
version = "1.1.0"; version = "1.1.0";
sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn";
}) })
(fetchNuGet {
name = "GtkSharp";
version = "3.22.25.128";
sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy";
})
(fetchNuGet { (fetchNuGet {
name = "LibHac"; name = "LibHac";
version = "0.12.0"; version = "0.12.0";
@ -66,18 +61,18 @@
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; name = "Microsoft.AspNetCore.App.Runtime.osx-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "1mmklq1fwq4km9y9jgk63wmwjlarx4npkpvjaiwdzv83vdv104ja"; sha256 = "09nsi9fa8kb3jpnim0hdap3jabskvpr4fmpvnj5wsh3gp91vqvgb";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.win-x64"; name = "Microsoft.AspNetCore.App.Runtime.win-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "0k7q89w3nky4m0j5jsk95c8gczlyp5jl9982gf1hli3gqpl2q4jr"; sha256 = "10g2vdsz685agqbd7h7dd9gvs584prpai0zv37r59wzlynj1assl";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.CodeCoverage"; name = "Microsoft.CodeCoverage";
@ -94,35 +89,30 @@
version = "1.0.0"; version = "1.0.0";
sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x";
}) })
(fetchNuGet {
name = "Microsoft.NET.Test.Sdk";
version = "16.8.0";
sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.App.Host.osx-x64"; name = "Microsoft.NETCore.App.Host.osx-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "1nirb155gzn2ws1ayaqspjmjaizw87jq2684mzkn18jv4si0hbpf"; sha256 = "14d6wz593dwm2j3apd3ny10idk8bfxqgfrparhc1q7q4i66y21ws";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.App.Host.win-x64"; name = "Microsoft.NETCore.App.Host.win-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "0nghghcapc28ixg21wb30ccjirc9wz83h0y3bn5zyfanxv2m2ypx"; sha256 = "1233y31z46yqzjgwpa6mmb1h63iqp6wbly6mbwkjqm2adx1wkp47";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.App.Runtime.linux-x64"; name = "Microsoft.NETCore.App.Runtime.linux-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.App.Runtime.osx-x64"; name = "Microsoft.NETCore.App.Runtime.osx-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "0lvpf4zz617y94zz3zsmzrg6zcdd6z3z9gz2bd5kq1l8y1pmq77y"; sha256 = "1a1ijdk61l0h25sj9ypcf96vz1c08ca7q5809g82qpi9m34kw8b8";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.App.Runtime.win-x64"; name = "Microsoft.NETCore.App.Runtime.win-x64";
version = "5.0.0"; version = "5.0.5";
sha256 = "1486654z369857h45v73jz8pwr8ibb97fiw5mfm7f01kdbyjdsdd"; sha256 = "1gc4msk61jgj9ill4icp0mn523g411iqpxphp0fykfvqdpqyqg46";
}) })
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.Platforms"; name = "Microsoft.NETCore.Platforms";
@ -139,11 +129,6 @@
version = "2.0.0"; version = "2.0.0";
sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0";
}) })
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
version = "3.1.0";
sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.NETCore.Platforms"; name = "Microsoft.NETCore.Platforms";
version = "5.0.0"; version = "5.0.0";
@ -159,6 +144,11 @@
version = "1.1.0"; version = "1.1.0";
sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh";
}) })
(fetchNuGet {
name = "Microsoft.NET.Test.Sdk";
version = "16.8.0";
sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.TestPlatform.ObjectModel"; name = "Microsoft.TestPlatform.ObjectModel";
version = "16.8.0"; version = "16.8.0";
@ -189,21 +179,11 @@
version = "4.5.0"; version = "4.5.0";
sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q";
}) })
(fetchNuGet {
name = "Microsoft.Win32.Registry";
version = "4.7.0";
sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Win32.Registry"; name = "Microsoft.Win32.Registry";
version = "5.0.0"; version = "5.0.0";
sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n";
}) })
(fetchNuGet {
name = "Microsoft.Win32.SystemEvents";
version = "4.5.0";
sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq";
})
(fetchNuGet { (fetchNuGet {
name = "Microsoft.Win32.SystemEvents"; name = "Microsoft.Win32.SystemEvents";
version = "5.0.0"; version = "5.0.0";
@ -255,15 +235,35 @@
sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6";
}) })
(fetchNuGet { (fetchNuGet {
name = "OpenTK.NetStandard"; name = "OpenTK.Core";
version = "1.0.5.32"; version = "4.5.0";
sha256 = "12y8kg73llmq3zibcp6j3hhiw04g7mqlm1nslmb74gfkzx0b4m9f"; sha256 = "06qxczikp0aah20d4skk3g588dgh2vn2xffn0ajyyv0475m61s9m";
})
(fetchNuGet {
name = "OpenTK.Graphics";
version = "4.5.0";
sha256 = "180g5c92fhhhpmwl6paihx4h1bil7akaihlz2qy124n28pf4s988";
})
(fetchNuGet {
name = "OpenTK.Mathematics";
version = "4.5.0";
sha256 = "1h9dxhq1llxdbgdzsi87ijqgj2ilr3rv0zkxhaa65xrc5x8j8fva";
})
(fetchNuGet {
name = "OpenTK.OpenAL";
version = "4.5.0";
sha256 = "0lqxpc3vnxglql42x2frvq5bpkl5cf3dpnf9nx6pr3q6qnhigkfb";
}) })
(fetchNuGet { (fetchNuGet {
name = "PangoSharp"; name = "PangoSharp";
version = "3.22.25.128"; version = "3.22.25.128";
sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp";
}) })
(fetchNuGet {
name = "ppy.SDL2-CS";
version = "1.0.225-alpha";
sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.any.System.Collections"; name = "runtime.any.System.Collections";
version = "4.3.0"; version = "4.3.0";
@ -279,21 +279,26 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn";
}) })
(fetchNuGet {
name = "runtime.any.System.Globalization.Calendars";
version = "4.3.0";
sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.any.System.Globalization"; name = "runtime.any.System.Globalization";
version = "4.3.0"; version = "4.3.0";
sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x";
}) })
(fetchNuGet {
name = "runtime.any.System.Globalization.Calendars";
version = "4.3.0";
sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.any.System.IO"; name = "runtime.any.System.IO";
version = "4.3.0"; version = "4.3.0";
sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x";
}) })
(fetchNuGet {
name = "runtime.any.System.Reflection";
version = "4.3.0";
sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.any.System.Reflection.Extensions"; name = "runtime.any.System.Reflection.Extensions";
version = "4.3.0"; version = "4.3.0";
@ -304,16 +309,16 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf";
}) })
(fetchNuGet {
name = "runtime.any.System.Reflection";
version = "4.3.0";
sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.any.System.Resources.ResourceManager"; name = "runtime.any.System.Resources.ResourceManager";
version = "4.3.0"; version = "4.3.0";
sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl";
}) })
(fetchNuGet {
name = "runtime.any.System.Runtime";
version = "4.3.0";
sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.any.System.Runtime.Handles"; name = "runtime.any.System.Runtime.Handles";
version = "4.3.0"; version = "4.3.0";
@ -325,20 +330,15 @@
sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19";
}) })
(fetchNuGet { (fetchNuGet {
name = "runtime.any.System.Runtime"; name = "runtime.any.System.Text.Encoding";
version = "4.3.0"; version = "4.3.0";
sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3";
}) })
(fetchNuGet { (fetchNuGet {
name = "runtime.any.System.Text.Encoding.Extensions"; name = "runtime.any.System.Text.Encoding.Extensions";
version = "4.3.0"; version = "4.3.0";
sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8";
}) })
(fetchNuGet {
name = "runtime.any.System.Text.Encoding";
version = "4.3.0";
sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.any.System.Threading.Tasks"; name = "runtime.any.System.Threading.Tasks";
version = "4.3.0"; version = "4.3.0";
@ -364,6 +364,16 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa";
}) })
(fetchNuGet {
name = "runtime.native.System";
version = "4.0.0";
sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
})
(fetchNuGet {
name = "runtime.native.System";
version = "4.3.0";
sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.native.System.IO.Compression"; name = "runtime.native.System.IO.Compression";
version = "4.1.0"; version = "4.1.0";
@ -374,25 +384,15 @@
version = "4.0.1"; version = "4.0.1";
sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6";
}) })
(fetchNuGet {
name = "runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97";
})
(fetchNuGet { (fetchNuGet {
name = "runtime.native.System.Security.Cryptography"; name = "runtime.native.System.Security.Cryptography";
version = "4.0.0"; version = "4.0.0";
sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9";
}) })
(fetchNuGet { (fetchNuGet {
name = "runtime.native.System"; name = "runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.0.0";
sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
})
(fetchNuGet {
name = "runtime.native.System";
version = "4.3.0"; version = "4.3.0";
sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97";
}) })
(fetchNuGet { (fetchNuGet {
name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl";
@ -524,15 +524,20 @@
version = "1.0.0-beta0013"; version = "1.0.0-beta0013";
sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql";
}) })
(fetchNuGet {
name = "SixLabors.ImageSharp";
version = "1.0.2";
sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj";
})
(fetchNuGet { (fetchNuGet {
name = "SixLabors.ImageSharp.Drawing"; name = "SixLabors.ImageSharp.Drawing";
version = "1.0.0-beta11"; version = "1.0.0-beta11";
sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5";
}) })
(fetchNuGet { (fetchNuGet {
name = "SixLabors.ImageSharp"; name = "SPB";
version = "1.0.2"; version = "0.0.2";
sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; sha256 = "178z9mi7zlk0laj79nkjh75ych47jjajiaj33hnh7zfmz05d8h6r";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.AppContext"; name = "System.AppContext";
@ -559,6 +564,16 @@
version = "5.0.0"; version = "5.0.0";
sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh";
}) })
(fetchNuGet {
name = "System.Collections";
version = "4.0.11";
sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
})
(fetchNuGet {
name = "System.Collections";
version = "4.3.0";
sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
})
(fetchNuGet { (fetchNuGet {
name = "System.Collections.Concurrent"; name = "System.Collections.Concurrent";
version = "4.0.12"; version = "4.0.12";
@ -575,14 +590,9 @@
sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.Collections"; name = "System.ComponentModel";
version = "4.0.11";
sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
})
(fetchNuGet {
name = "System.Collections";
version = "4.3.0"; version = "4.3.0";
sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.ComponentModel.EventBasedAsync"; name = "System.ComponentModel.EventBasedAsync";
@ -599,11 +609,6 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x";
}) })
(fetchNuGet {
name = "System.ComponentModel";
version = "4.3.0";
sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
})
(fetchNuGet { (fetchNuGet {
name = "System.Console"; name = "System.Console";
version = "4.0.0"; version = "4.0.0";
@ -644,11 +649,6 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4";
}) })
(fetchNuGet {
name = "System.Drawing.Common";
version = "4.5.0";
sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc";
})
(fetchNuGet { (fetchNuGet {
name = "System.Drawing.Common"; name = "System.Drawing.Common";
version = "5.0.1"; version = "5.0.1";
@ -659,6 +659,16 @@
version = "4.0.11"; version = "4.0.11";
sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
}) })
(fetchNuGet {
name = "System.Globalization";
version = "4.0.11";
sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
})
(fetchNuGet {
name = "System.Globalization";
version = "4.3.0";
sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
})
(fetchNuGet { (fetchNuGet {
name = "System.Globalization.Calendars"; name = "System.Globalization.Calendars";
version = "4.0.1"; version = "4.0.1";
@ -675,19 +685,14 @@
sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.Globalization"; name = "System.IO";
version = "4.0.11"; version = "4.1.0";
sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.Globalization"; name = "System.IO";
version = "4.3.0"; version = "4.3.0";
sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
})
(fetchNuGet {
name = "System.IO.Compression.ZipFile";
version = "4.0.1";
sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.IO.Compression"; name = "System.IO.Compression";
@ -695,14 +700,9 @@
sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.IO.FileSystem.Primitives"; name = "System.IO.Compression.ZipFile";
version = "4.0.1"; version = "4.0.1";
sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82";
})
(fetchNuGet {
name = "System.IO.FileSystem.Primitives";
version = "4.3.0";
sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.IO.FileSystem"; name = "System.IO.FileSystem";
@ -715,19 +715,14 @@
sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.IO"; name = "System.IO.FileSystem.Primitives";
version = "4.1.0"; version = "4.0.1";
sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.IO"; name = "System.IO.FileSystem.Primitives";
version = "4.3.0"; version = "4.3.0";
sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
})
(fetchNuGet {
name = "System.Linq.Expressions";
version = "4.1.0";
sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
}) })
(fetchNuGet { (fetchNuGet {
name = "System.Linq"; name = "System.Linq";
@ -739,6 +734,11 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
}) })
(fetchNuGet {
name = "System.Linq.Expressions";
version = "4.1.0";
sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
})
(fetchNuGet { (fetchNuGet {
name = "System.Management"; name = "System.Management";
version = "5.0.0"; version = "5.0.0";
@ -784,6 +784,26 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx";
}) })
(fetchNuGet {
name = "System.Reflection";
version = "4.1.0";
sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
})
(fetchNuGet {
name = "System.Reflection";
version = "4.3.0";
sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.0.1";
sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.3.0";
sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
})
(fetchNuGet { (fetchNuGet {
name = "System.Reflection.Emit.ILGeneration"; name = "System.Reflection.Emit.ILGeneration";
version = "4.0.1"; version = "4.0.1";
@ -804,16 +824,6 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c";
}) })
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.0.1";
sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.3.0";
sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
})
(fetchNuGet { (fetchNuGet {
name = "System.Reflection.Extensions"; name = "System.Reflection.Extensions";
version = "4.0.1"; version = "4.0.1";
@ -844,16 +854,6 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1";
}) })
(fetchNuGet {
name = "System.Reflection";
version = "4.1.0";
sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
})
(fetchNuGet {
name = "System.Reflection";
version = "4.3.0";
sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
})
(fetchNuGet { (fetchNuGet {
name = "System.Resources.ResourceManager"; name = "System.Resources.ResourceManager";
version = "4.0.1"; version = "4.0.1";
@ -864,6 +864,16 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
}) })
(fetchNuGet {
name = "System.Runtime";
version = "4.1.0";
sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
})
(fetchNuGet {
name = "System.Runtime";
version = "4.3.0";
sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
})
(fetchNuGet { (fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe"; name = "System.Runtime.CompilerServices.Unsafe";
version = "4.7.0"; version = "4.7.0";
@ -894,16 +904,6 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8";
}) })
(fetchNuGet {
name = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.0.0";
sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6";
})
(fetchNuGet {
name = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.3.0";
sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii";
})
(fetchNuGet { (fetchNuGet {
name = "System.Runtime.InteropServices"; name = "System.Runtime.InteropServices";
version = "4.1.0"; version = "4.1.0";
@ -914,6 +914,16 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
}) })
(fetchNuGet {
name = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.0.0";
sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6";
})
(fetchNuGet {
name = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.3.0";
sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii";
})
(fetchNuGet { (fetchNuGet {
name = "System.Runtime.Numerics"; name = "System.Runtime.Numerics";
version = "4.0.1"; version = "4.0.1";
@ -924,26 +934,11 @@
version = "4.1.1"; version = "4.1.1";
sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
}) })
(fetchNuGet {
name = "System.Runtime";
version = "4.1.0";
sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
})
(fetchNuGet {
name = "System.Runtime";
version = "4.3.0";
sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
})
(fetchNuGet { (fetchNuGet {
name = "System.Security.AccessControl"; name = "System.Security.AccessControl";
version = "4.5.0"; version = "4.5.0";
sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0";
}) })
(fetchNuGet {
name = "System.Security.AccessControl";
version = "4.7.0";
sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz";
})
(fetchNuGet { (fetchNuGet {
name = "System.Security.AccessControl"; name = "System.Security.AccessControl";
version = "5.0.0"; version = "5.0.0";
@ -989,6 +984,11 @@
version = "4.1.0"; version = "4.1.0";
sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh";
}) })
(fetchNuGet {
name = "System.Security.Principal";
version = "4.3.0";
sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf";
})
(fetchNuGet { (fetchNuGet {
name = "System.Security.Principal.Windows"; name = "System.Security.Principal.Windows";
version = "4.3.0"; version = "4.3.0";
@ -999,31 +999,11 @@
version = "4.5.0"; version = "4.5.0";
sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86";
}) })
(fetchNuGet {
name = "System.Security.Principal.Windows";
version = "4.7.0";
sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d";
})
(fetchNuGet { (fetchNuGet {
name = "System.Security.Principal.Windows"; name = "System.Security.Principal.Windows";
version = "5.0.0"; version = "5.0.0";
sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8";
}) })
(fetchNuGet {
name = "System.Security.Principal";
version = "4.3.0";
sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf";
})
(fetchNuGet {
name = "System.Text.Encoding.Extensions";
version = "4.0.11";
sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs";
})
(fetchNuGet {
name = "System.Text.Encoding.Extensions";
version = "4.3.0";
sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
})
(fetchNuGet { (fetchNuGet {
name = "System.Text.Encoding"; name = "System.Text.Encoding";
version = "4.0.11"; version = "4.0.11";
@ -1034,6 +1014,16 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
}) })
(fetchNuGet {
name = "System.Text.Encoding.Extensions";
version = "4.0.11";
sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs";
})
(fetchNuGet {
name = "System.Text.Encoding.Extensions";
version = "4.3.0";
sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
})
(fetchNuGet { (fetchNuGet {
name = "System.Text.RegularExpressions"; name = "System.Text.RegularExpressions";
version = "4.1.0"; version = "4.1.0";
@ -1044,21 +1034,21 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l";
}) })
(fetchNuGet {
name = "System.Threading";
version = "4.0.11";
sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
})
(fetchNuGet {
name = "System.Threading";
version = "4.3.0";
sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
})
(fetchNuGet { (fetchNuGet {
name = "System.Threading.Overlapped"; name = "System.Threading.Overlapped";
version = "4.3.0"; version = "4.3.0";
sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm";
}) })
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.0.0";
sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr";
})
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.3.0";
sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
})
(fetchNuGet { (fetchNuGet {
name = "System.Threading.Tasks"; name = "System.Threading.Tasks";
version = "4.0.11"; version = "4.0.11";
@ -1069,6 +1059,16 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
}) })
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.0.0";
sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr";
})
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.3.0";
sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
})
(fetchNuGet { (fetchNuGet {
name = "System.Threading.Thread"; name = "System.Threading.Thread";
version = "4.3.0"; version = "4.3.0";
@ -1084,16 +1084,6 @@
version = "4.0.1"; version = "4.0.1";
sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6";
}) })
(fetchNuGet {
name = "System.Threading";
version = "4.0.11";
sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
})
(fetchNuGet {
name = "System.Threading";
version = "4.3.0";
sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
})
(fetchNuGet { (fetchNuGet {
name = "System.Xml.ReaderWriter"; name = "System.Xml.ReaderWriter";
version = "4.0.11"; version = "4.0.11";
@ -1114,14 +1104,14 @@
version = "4.3.0"; version = "4.3.0";
sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
}) })
(fetchNuGet {
name = "System.Xml.XPath.XmlDocument";
version = "4.3.0";
sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm";
})
(fetchNuGet { (fetchNuGet {
name = "System.Xml.XPath"; name = "System.Xml.XPath";
version = "4.3.0"; version = "4.3.0";
sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci";
}) })
(fetchNuGet {
name = "System.Xml.XPath.XmlDocument";
version = "4.3.0";
sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm";
})
] ]

2
pkgs/servers/gemini/agate/default.nix
View File

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-+X1ibnYAUB34u8+oNBSkjLtsArxlrg0Nq5zJrXi7Rfk="; sha256 = "sha256-+X1ibnYAUB34u8+oNBSkjLtsArxlrg0Nq5zJrXi7Rfk=";
}; };
cargoSha256 = "sha256-ZVu7wQFe+FHWX2wevVYct1dQSE9rFET8bkmv85wNV8A="; cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ];

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2021.4.4"; version = "2021.4.5";
components = { components = {
"abode" = ps: with ps; [ abodepy ]; "abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ]; "accuweather" = ps: with ps; [ accuweather ];

4
pkgs/servers/home-assistant/default.nix
View File

@ -116,7 +116,7 @@ let
extraBuildInputs = extraPackages py.pkgs; extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2021.4.4"; hassVersion = "2021.4.5";
in with py.pkgs; buildPythonApplication rec { in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -135,7 +135,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; rev = version;
sha256 = "1p36ymjhirl32ax3xxdg9ia089jw1klww5imq18r6ksajafr78ys"; sha256 = "106d1n9z8pfcnqm594vkhczrrrjap801w6fdr0psv5vhdxrqh4sj";
}; };
# leave this in, so users don't have to constantly update their downstream patch handling # leave this in, so users don't have to constantly update their downstream patch handling

9
pkgs/servers/sql/postgresql/default.nix
View File

@ -191,15 +191,6 @@ let
in self: { in self: {
postgresql_9_5 = self.callPackage generic {
version = "9.5.25";
psqlSchema = "9.5";
sha256 = "00yny0sskxrqk4ji2phgv3iqxd1aiy6rh660k73s4s1pn9gcaa3n";
this = self.postgresql_9_5;
thisAttr = "postgresql_9_5";
inherit self;
};
postgresql_9_6 = self.callPackage generic { postgresql_9_6 = self.callPackage generic {
version = "9.6.21"; version = "9.6.21";
psqlSchema = "9.6"; psqlSchema = "9.6";

69
pkgs/tools/graphics/agi/default.nix Normal file
View File

@ -0,0 +1,69 @@
{ lib
, stdenv
, fetchzip
, autoPatchelfHook
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, wrapGAppsHook
, gobject-introspection
, gdk-pixbuf
, jre
, androidenv
}:
stdenv.mkDerivation rec {
pname = "agi";
version = "1.1.0-dev-20210413";
src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
sha256 = "13i6n95d0cjrhx68qsich6xzk5f9ga0y3m19k4z2d58s164rnh0v";
};
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
wrapGAppsHook
gdk-pixbuf
gobject-introspection
copyDesktopItems
];
buildInputs = [
stdenv.cc.cc.lib
];
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib}
cp ./{agi,gapis,gapir,gapit,device-info} $out/bin
cp lib/gapic.jar $out/lib
wrapProgram $out/bin/agi \
--add-flags "--vm ${jre}/bin/java" \
--add-flags "--jar $out/lib/gapic.jar" \
--add-flags "--adb ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb"
for i in 16 32 48 64 96 128 256 512 1024; do
install -D ${src}/icon.png $out/share/icons/hicolor/''${i}x$i/apps/agi.png
done
runHook postInstall
'';
desktopItems = [(makeDesktopItem {
name = "agi";
desktopName = "Android GPU Inspector";
exec = "$out/bin/agi";
icon = "agi";
type = "Application";
categories = "Development;Debugger;Graphics;3DGraphics";
terminal = "false";
})];
meta = with lib; {
homepage = "https://github.com/google/agi/";
description = "Android GPU Inspector";
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.ivar ];
};
}

12
pkgs/tools/misc/tremor-rs/default.nix
View File

@ -3,22 +3,26 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tremor"; pname = "tremor";
version = "0.10.1"; version = "0.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tremor-rs"; owner = "tremor-rs";
repo = "tremor-runtime"; repo = "tremor-runtime";
rev = "v${version}"; rev = "v${version}";
sha256 = "1z1khxfdj2j0xf7dp0x2cd9kl6r4qicp7kc4p4sdky2yib66512y"; sha256 = "19g0ijkclrza6s0qcbwwh3lhlkisy00ffcl0c0d7dfqwrcisgz57";
}; };
cargoSha256 = "sha256-rN/d6BL2d0D0ichQR6v0543Bh/Y2ktz8ExMH50M8B8c="; cargoSha256 = "1xv205czb2z6qpqi6vslyrx2n21510qqa11i2hwya3jdcc9lkrsd";
nativeBuildInputs = [ cmake pkg-config installShellFiles ]; nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs = [ openssl ]; buildInputs = [ openssl ];
# TODO export TREMOR_PATH($out/lib) variable
postInstall = '' postInstall = ''
# Copy the standard library to $out/lib
cp -r ${src}/tremor-script/lib/ $out
installShellCompletion --cmd tremor \ installShellCompletion --cmd tremor \
--bash <($out/bin/tremor completions bash) \ --bash <($out/bin/tremor completions bash) \
--fish <($out/bin/tremor completions fish) \ --fish <($out/bin/tremor completions fish) \
@ -30,7 +34,7 @@ rustPlatform.buildRustPackage rec {
# OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled. # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled.
OPENSSL_NO_VENDOR = 1; OPENSSL_NO_VENDOR = 1;
cargoBuildFlags = [ "--all" ]; cargoBuildFlags = [ "-p tremor-cli" ];
meta = with lib; { meta = with lib; {
description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation";

2
pkgs/tools/networking/ntp/default.nix
View File

@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"; url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html";
}; };
maintainers = with maintainers; [ eelco thoughtpolice ]; maintainers = with maintainers; [ eelco thoughtpolice ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

10
pkgs/tools/security/yubikey-agent/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "yubikey-agent"; pname = "yubikey-agent";
version = "0.1.3"; version = "unstable-2021-02-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FiloSottile"; owner = "FiloSottile";
repo = pname; repo = pname;
rev = "v${version}"; rev = "8cadc13d107757f8084d9d2b93ea64ff0c1748e8";
sha256 = "07gix5wrakn4z846zhvl66lzwx58djrfnn6m8v7vc69l9jr3kihr"; sha256 = "1lklgq9qkqil5s0g56wbhs0vpr9c1bd4ir7bkrjwqj75ygxim8ml";
}; };
buildInputs = buildInputs =
@ -25,7 +25,7 @@ buildGoModule rec {
substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send
''; '';
vendorSha256 = "128mlsagj3im6h0p0ndhzk29ya47g19im9dldx3nmddf2jlccj2h"; vendorSha256 = "1zx1w2is61471v4dlmr4wf714zqsc8sppik671p7s4fis5vccsca";
doCheck = false; doCheck = false;
@ -42,7 +42,7 @@ buildGoModule rec {
# See https://github.com/FiloSottile/yubikey-agent/pull/43 # See https://github.com/FiloSottile/yubikey-agent/pull/43
+ lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.isLinux ''
mkdir -p $out/lib/systemd/user mkdir -p $out/lib/systemd/user
substitute ${./yubikey-agent.service} $out/lib/systemd/user/yubikey-agent.service \ substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \
--replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent" --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent"
''; '';

35
pkgs/tools/security/yubikey-agent/yubikey-agent.service
View File

@ -1,35 +0,0 @@
[Unit]
Description=Seamless ssh-agent for YubiKeys
Documentation=https://filippo.io/yubikey-agent
[Service]
ExecStart=yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock
ExecReload=/bin/kill -HUP $MAINPID
ProtectSystem=strict
ProtectKernelLogs=yes
ProtectKernelModules=yes
ProtectKernelTunables=yes
ProtectControlGroups=yes
ProtectClock=yes
ProtectHostname=yes
PrivateTmp=yes
PrivateDevices=yes
PrivateUsers=yes
IPAddressDeny=any
RestrictAddressFamilies=AF_UNIX
RestrictNamespaces=yes
RestrictRealtime=yes
RestrictSUIDSGID=yes
LockPersonality=yes
CapabilityBoundingSet=
SystemCallFilter=@system-service
SystemCallFilter=~@privileged @resources
SystemCallErrorNumber=EPERM
SystemCallArchitectures=native
NoNewPrivileges=yes
KeyringMode=private
UMask=0177
RuntimeDirectory=yubikey-agent
[Install]
WantedBy=default.target

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

@ -559,7 +559,6 @@ mapAliases ({
pmtools = acpica-tools; # added 2018-11-01 pmtools = acpica-tools; # added 2018-11-01
polarssl = mbedtls; # added 2018-04-25 polarssl = mbedtls; # added 2018-04-25
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
postgresql95 = postgresql_9_5;
postgresql96 = postgresql_9_6; postgresql96 = postgresql_9_6;
postgresql100 = throw "postgresql100 was deprecated on 2018-10-21: use postgresql_10 instead"; postgresql100 = throw "postgresql100 was deprecated on 2018-10-21: use postgresql_10 instead";
# postgresql plugins # postgresql plugins

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

@ -757,6 +757,8 @@ in
agda-pkg = callPackage ../development/tools/agda-pkg { }; agda-pkg = callPackage ../development/tools/agda-pkg { };
agi = callPackage ../tools/graphics/agi { };
agrep = callPackage ../tools/text/agrep { }; agrep = callPackage ../tools/text/agrep { };
aha = callPackage ../tools/text/aha { }; aha = callPackage ../tools/text/aha { };
@ -11660,15 +11662,6 @@ in
groovy = callPackage ../development/interpreters/groovy { }; groovy = callPackage ../development/interpreters/groovy { };
guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
# Needed for autogen
guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { };
guile_2_2 = callPackage ../development/interpreters/guile { };
guile = guile_2_2;
inherit (callPackages ../applications/networking/cluster/hadoop { inherit (callPackages ../applications/networking/cluster/hadoop {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}) })
@ -12090,8 +12083,19 @@ in
gImageReader = callPackage ../applications/misc/gImageReader { }; gImageReader = callPackage ../applications/misc/gImageReader { };
guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
# Needed for autogen
guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { };
guile_2_2 = callPackage ../development/interpreters/guile { };
guile = guile_2_2;
guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { };
guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
guile-gnome = callPackage ../development/guile-modules/guile-gnome { guile-gnome = callPackage ../development/guile-modules/guile-gnome {
@ -18971,7 +18975,6 @@ in
timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
inherit (import ../servers/sql/postgresql pkgs) inherit (import ../servers/sql/postgresql pkgs)
postgresql_9_5
postgresql_9_6 postgresql_9_6
postgresql_10 postgresql_10
postgresql_11 postgresql_11
@ -23516,6 +23519,8 @@ in
wxGTK = wxGTK30; wxGTK = wxGTK30;
}; };
haunt = callPackage ../applications/misc/haunt { };
hugo = callPackage ../applications/misc/hugo { }; hugo = callPackage ../applications/misc/hugo { };
go-org = callPackage ../applications/misc/go-org { }; go-org = callPackage ../applications/misc/go-org { };
@ -26834,10 +26839,12 @@ in
}; };
kodi-wayland = callPackage ../applications/video/kodi { kodi-wayland = callPackage ../applications/video/kodi {
jre_headless = jdk11_headless;
waylandSupport = true; waylandSupport = true;
}; };
kodi-gbm = callPackage ../applications/video/kodi { kodi-gbm = callPackage ../applications/video/kodi {
jre_headless = jdk11_headless;
gbmSupport = true; gbmSupport = true;
}; };