Project import generated by Copybara.
GitOrigin-RevId: 5bc8b980b9178ef9a4bb622320cf34e59ea2ea10
This commit is contained in:
Default email
parent
619d6dcc77
commit
2ea8997135
204 changed files with 3160 additions and 1848 deletions
4
third_party/nixpkgs/.github/CODEOWNERS
vendored
4
third_party/nixpkgs/.github/CODEOWNERS
vendored
|
|
@ -95,8 +95,8 @@
|
|||
/pkgs/development/perl-modules @volth @stigtsp
|
||||
|
||||
# R
|
||||
/pkgs/applications/science/math/R @peti
|
||||
/pkgs/development/r-modules @peti
|
||||
/pkgs/applications/science/math/R @jbedo @bcdarwin
|
||||
/pkgs/development/r-modules @jbedo @bcdarwin
|
||||
|
||||
# Ruby
|
||||
/pkgs/development/interpreters/ruby @marsam
|
||||
|
|
|
|||
2
third_party/nixpkgs/lib/default.nix
vendored
2
third_party/nixpkgs/lib/default.nix
vendored
|
|
@ -91,7 +91,7 @@ let
|
|||
concatImapStringsSep makeSearchPath makeSearchPathOutput
|
||||
makeLibraryPath makeBinPath optionalString
|
||||
hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
|
||||
escapeShellArg escapeShellArgs replaceChars lowerChars
|
||||
escapeShellArg escapeShellArgs escapeRegex replaceChars lowerChars
|
||||
upperChars toLower toUpper addContextFrom splitString
|
||||
removePrefix removeSuffix versionOlder versionAtLeast
|
||||
getName getVersion
|
||||
|
|
|
|||
|
|
@ -3419,6 +3419,12 @@
|
|||
githubId = 454695;
|
||||
name = "Artur Taranchiev";
|
||||
};
|
||||
exarkun = {
|
||||
email = "exarkun@twistedmatrix.com";
|
||||
github = "exarkun";
|
||||
githubId = 254565;
|
||||
name = "Jean-Paul Calderone";
|
||||
};
|
||||
exfalso = {
|
||||
email = "0slemi0@gmail.com";
|
||||
github = "exfalso";
|
||||
|
|
|
|||
|
|
@ -85,18 +85,18 @@ in
|
|||
|
||||
programs.captive-browser.dhcp-dns =
|
||||
let
|
||||
iface = prefix:
|
||||
optionalString cfg.bindInterface (concatStringsSep " " (map escapeShellArg [ prefix cfg.interface ]));
|
||||
iface = prefixes:
|
||||
optionalString cfg.bindInterface (escapeShellArgs (prefixes ++ [ cfg.interface ]));
|
||||
in
|
||||
mkOptionDefault (
|
||||
if config.networking.networkmanager.enable then
|
||||
"${pkgs.networkmanager}/bin/nmcli dev show ${iface ""} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS"
|
||||
"${pkgs.networkmanager}/bin/nmcli dev show ${iface []} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS"
|
||||
else if config.networking.dhcpcd.enable then
|
||||
"${pkgs.dhcpcd}/bin/dhcpcd ${iface "-U"} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers"
|
||||
"${pkgs.dhcpcd}/bin/dhcpcd ${iface ["-U"]} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers"
|
||||
else if config.networking.useNetworkd then
|
||||
"${cfg.package}/bin/systemd-networkd-dns ${iface ""}"
|
||||
"${cfg.package}/bin/systemd-networkd-dns ${iface []}"
|
||||
else
|
||||
"${config.security.wrapperDir}/udhcpc --quit --now -f ${iface "-i"} -O dns --script ${
|
||||
"${config.security.wrapperDir}/udhcpc --quit --now -f ${iface ["-i"]} -O dns --script ${
|
||||
pkgs.writeShellScript "udhcp-script" ''
|
||||
if [ "$1" = bound ]; then
|
||||
echo "$dns"
|
||||
|
|
|
|||
|
|
@ -84,6 +84,9 @@ in
|
|||
Restart = "on-failure";
|
||||
RestartSec = 10;
|
||||
};
|
||||
unitConfig = {
|
||||
StartLimitIntervalSec = 0;
|
||||
};
|
||||
};
|
||||
|
||||
services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled
|
||||
|
|
|
|||
|
|
@ -398,6 +398,10 @@ in
|
|||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
};
|
||||
|
||||
unitConfig = {
|
||||
StartLimitIntervalSec = 0;
|
||||
};
|
||||
};
|
||||
|
||||
services.etcd = {
|
||||
|
|
|
|||
|
|
@ -146,6 +146,9 @@ in
|
|||
User = "kubernetes";
|
||||
Group = "kubernetes";
|
||||
};
|
||||
unitConfig = {
|
||||
StartLimitIntervalSec = 0;
|
||||
};
|
||||
path = top.path;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -337,6 +337,9 @@ in
|
|||
'';
|
||||
WorkingDirectory = top.dataDir;
|
||||
};
|
||||
unitConfig = {
|
||||
StartLimitIntervalSec = 0;
|
||||
};
|
||||
};
|
||||
|
||||
# Allways include cni plugins
|
||||
|
|
|
|||
|
|
@ -77,6 +77,9 @@ in
|
|||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
};
|
||||
unitConfig = {
|
||||
StartLimitIntervalSec = 0;
|
||||
};
|
||||
};
|
||||
|
||||
services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName;
|
||||
|
|
|
|||
|
|
@ -79,6 +79,9 @@ in
|
|||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
};
|
||||
unitConfig = {
|
||||
StartLimitIntervalSec = 0;
|
||||
};
|
||||
};
|
||||
|
||||
services.kubernetes.pki.certs = {
|
||||
|
|
|
|||
|
|
@ -429,6 +429,7 @@ in
|
|||
|
||||
startLimitIntervalSec = 60; # 1 min
|
||||
serviceConfig = {
|
||||
Type = "notify";
|
||||
ExecStart = "${dovecotPkg}/sbin/dovecot -F";
|
||||
ExecReload = "${dovecotPkg}/sbin/doveadm reload";
|
||||
Restart = "on-failure";
|
||||
|
|
|
|||
|
|
@ -371,8 +371,9 @@ in
|
|||
};
|
||||
services.postfix.config = mkIf cfg.postfix.enable cfg.postfix.config;
|
||||
|
||||
systemd.services.postfix.serviceConfig.SupplementaryGroups =
|
||||
mkIf cfg.postfix.enable [ postfixCfg.group ];
|
||||
systemd.services.postfix = mkIf cfg.postfix.enable {
|
||||
serviceConfig.SupplementaryGroups = [ postfixCfg.group ];
|
||||
};
|
||||
|
||||
# Allow users to run 'rspamc' and 'rspamadm'.
|
||||
environment.systemPackages = [ pkgs.rspamd ];
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@ in
|
|||
default = "common";
|
||||
example = "combined";
|
||||
description = ''
|
||||
Log format for log files. Possible values are: combined, common, referer, agent.
|
||||
Log format for log files. Possible values are: combined, common, referer, agent, none.
|
||||
See <link xlink:href="https://httpd.apache.org/docs/2.4/logs.html"/> for more details.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -221,10 +221,7 @@ in
|
|||
knot = handleTest ./knot.nix {};
|
||||
krb5 = discoverTests (import ./krb5 {});
|
||||
ksm = handleTest ./ksm.nix {};
|
||||
kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {};
|
||||
# kubernetes.e2e should eventually replace kubernetes.rbac when it works
|
||||
#kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {};
|
||||
kubernetes.rbac = handleTestOn ["x86_64-linux"] ./kubernetes/rbac.nix {};
|
||||
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
|
||||
latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; };
|
||||
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
|
||||
leaps = handleTest ./leaps.nix {};
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
testScript = ''
|
||||
command = "${pkgs.kbd}/bin/setfont ter-112n 2>&1"
|
||||
(status, out) = machine.execute(command)
|
||||
import re
|
||||
pattern = re.compile(r".*Unable to find file:.*")
|
||||
match = pattern.match(out)
|
||||
if match:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,15 @@
|
|||
{ system ? builtins.currentSystem }:
|
||||
{ system ? builtins.currentSystem
|
||||
, pkgs ? import <nixpkgs> { inherit system; }
|
||||
}:
|
||||
let
|
||||
dns = import ./dns.nix { inherit system pkgs; };
|
||||
rbac = import ./rbac.nix { inherit system pkgs; };
|
||||
# TODO kubernetes.e2e should eventually replace kubernetes.rbac when it works
|
||||
# e2e = import ./e2e.nix { inherit system pkgs; };
|
||||
in
|
||||
{
|
||||
dns = import ./dns.nix { inherit system; };
|
||||
# e2e = import ./e2e.nix { inherit system; }; # TODO: make it pass
|
||||
# the following test(s) can be removed when e2e is working:
|
||||
rbac = import ./rbac.nix { inherit system; };
|
||||
dns-single-node = dns.singlenode.test;
|
||||
dns-multi-node = dns.multinode.test;
|
||||
rbac-single-node = rbac.singlenode.test;
|
||||
rbac-multi-node = rbac.multinode.test;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopidy";
|
||||
repo = "mopidy";
|
||||
rev = "v${version}";
|
||||
sha256 = "14m80z9spi2vhfs2bbff7ky80mr6bksl4550y17hwd7zpkid60za";
|
||||
sha256 = "1l1rya48ykiq156spm8pfsm6li8apz66ppz7gs4s91fv7g7l5x2f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "ptcollab";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuxshao";
|
||||
repo = "ptcollab";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-98v9it9M5FXCsOpWvO10uKYmEH15v1FEH1hH73XHa7w=";
|
||||
sha256 = "sha256-AeIjc+FoFsTcyWl261GvyySIHP107rL4JkuMXFhnPbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "0.9.9";
|
||||
version = "0.9.9-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GsGa2y718qWQlP0pLy8X3mVsFpNNnOTVQZpp4+e1RhA=";
|
||||
sha256 = "sha256-EmnrwBMHb9jpEZAG393yyMaFRRQJ6YYDRvsp+ATT7MY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "03lnw61pgp88iwz2gbcp8y3jvz6v94cn0ynjz6snb9jq88gf25dz";
|
||||
cargoHash = "sha256-WzsaUrqe7F4x+ShqG14kq78MTSWIxIMRa3pdr3RXrwk=";
|
||||
|
||||
nativeBuildInputs = [ clang ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "helix";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helix-editor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-iCNA+gZer6BycWnhosDFRuxfS6QAb06XTix/vFsaey0=";
|
||||
sha256 = "sha256-lScMHZ/pLcHkuvv8kSKnYK5AFVxyhOUMFdsu3nlDVD0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sqXPgtLMXa3kMQlnw2xDBEsVfjeRXO6Zp6NEFS/0h20=";
|
||||
cargoSha256 = "sha256-N5vlPoYyksHEZsyia8u8qtoEBY6qsXqO9CRBFaTQmiw=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "texmaker";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0zhqq9s5r2w44p7xhlxkj0c10jyx0hji5bjdpgp7xdlrvckr9yf6";
|
||||
sha256 = "sha256-gANJknSWIMN+B0uAOtPil8EbjyWt4E+xOxOseR87Dd4=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "tiled";
|
||||
version = "1.7.0";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjorn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XVIkyf9cQZXjFuGGCliCSY22X8EkoPEl1EpGCrMTsgY=";
|
||||
sha256 = "sha256-yQWe27zLWOnRQk+MEpuWs8CFP/le3PQ+yziB0ikNang=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "meh-unstable-2015-04-11";
|
||||
pname = "meh";
|
||||
version = "unstable-2018-10-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jhawthorn";
|
||||
repo = "meh";
|
||||
rev = "4ab1c75f97cb70543db388b3ed99bcfb7e94c758";
|
||||
sha256 = "1j1n3m9hjhz4faryai97jq7cr6a322cqrd878gpkm9nrikap3bkk";
|
||||
rev = "69f653a1f16d11b12e5b600e808a740898f3223e";
|
||||
sha256 = "sha256-srSwoaajW4H4+kmE7NQAqVz9d/1q2XQ5ayQaOcGwzI0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
make PREFIX=$out install
|
||||
'';
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
mkDerivation {
|
||||
pname = "bomber";
|
||||
meta = with lib; {
|
||||
homepage = "https://kde.org/applications/en/games/org.kde.bomber";
|
||||
homepage = "https://apps.kde.org/bomber/";
|
||||
description = "A single player arcade game";
|
||||
longDescription = ''
|
||||
Bomber is a single player arcade game. The player is invading various
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "cointop";
|
||||
version = "1.6.5";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelmota";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pnh4z7vk8xazdBPNbwR5BrKFbi8df8UTM2SOU+KDvsk=";
|
||||
sha256 = "sha256-cn2TtXIxBnEZyWAdtf9ING9I/53z6D8UPVxnFVSkGgo=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/miguelmota/cointop";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "mob";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
goPackagePath = "github.com/remotemobprogramming/mob";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
sha256 = "sha256-GA+MmZU1KEg3HIU225Llr5W4dHGFGiMr/j0N/CslBC4=";
|
||||
sha256 = "sha256-PvFECy5wgpdOdToeYsW+NiVC2LXkBCMBorIl8m++Lic=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notejot";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lainsce";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-jR1zOmVkFGgA5bzMDHQ8HMToi18Y3n2aJDx7pwsZEhM=";
|
||||
hash = "sha256-OmzEwShIpzIbonqwQmpdutd3tztm7Gmmo3qdt+DApWo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
92
third_party/nixpkgs/pkgs/applications/misc/premid/default.nix
vendored
Normal file
92
third_party/nixpkgs/pkgs/applications/misc/premid/default.nix
vendored
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook, fetchurl, copyDesktopItems
|
||||
, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig
|
||||
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
|
||||
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
|
||||
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
|
||||
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "premid";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/premid/Linux/releases/download/v${version}/${pname}.tar.gz";
|
||||
sha256 = "sha256-TuID63cVZkQ2kBl2iZeuVvjRUJYBt62ppPvgffBlOXY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
cups
|
||||
libdrm
|
||||
libuuid
|
||||
libXdamage
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXtst
|
||||
libxcb
|
||||
libxshmfence
|
||||
mesa
|
||||
nss
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
libcxx systemd libpulseaudio libdrm mesa
|
||||
stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
|
||||
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
|
||||
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
|
||||
libXtst nspr nss libxcb pango systemd libXScrnSaver
|
||||
libappindicator-gtk3 libdbusmenu
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,opt/PreMiD,share/pixmaps}
|
||||
mv * $out/opt/PreMiD
|
||||
|
||||
chmod +x $out/opt/PreMiD/${pname}
|
||||
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
|
||||
$out/opt/PreMiD/${pname}
|
||||
|
||||
wrapProgram $out/opt/PreMiD/${pname} \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${pname}
|
||||
|
||||
ln -s $out/opt/PreMiD/${pname} $out/bin/
|
||||
'';
|
||||
|
||||
# This is the icon used by the desktop file
|
||||
postInstall = ''
|
||||
ln -s $out/opt/PreMiD/assets/appIcon.png $out/share/pixmaps/${pname}.png
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = "PreMiD";
|
||||
icon = pname;
|
||||
desktopName = "PreMiD";
|
||||
genericName = meta.description;
|
||||
mimeType = "x-scheme-handler/premid";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple, configurable utility to show your web activity as playing status on Discord";
|
||||
homepage = "https://premid.app";
|
||||
downloadPage = "https://premid.app/downloads";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ natto1784 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ticker";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "achannarasappa";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FavbBGmChWQ3xySPHlw5HisZwVaNe/NaxA6+InN8fL8=";
|
||||
sha256 = "sha256-T9pApuzATohiOUmWa+GBlLrlTNgKNMwtW6fSPO/NS6Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU=";
|
||||
vendorSha256 = "sha256-vTB1RPg1LN44bkWrdGEXR6WRlM/Q2EITUO0yt5ar/zg=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}"
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "usql";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xo";
|
||||
repo = "usql";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vLGoPttl7f4qCVM8e0F0llIODuNqJ7GxXqbUgokv7Qw=";
|
||||
sha256 = "sha256-NHeJSWrcX4hYBJpZu/UjQ1ZWfcUnWFCV0Meo+XveDOw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sGECp1L6WzIPGbQbBoV1IrTgyy4/c95OLAmj9D0FjXs=";
|
||||
vendorSha256 = "sha256-EsLLBhyOcupx5LrJyWWMu4RAGWDKo3keflyZOASKldE=";
|
||||
|
||||
buildInputs = [ unixODBC icu ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
xmrig.overrideAttrs (oldAttrs: rec {
|
||||
pname = "xmrig-mo";
|
||||
version = "6.14.1-mo1";
|
||||
version = "6.14.1-mo2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MoneroOcean";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1YG0llNv1VR8ocNFxYLZFXMzowNNqpqSyIu7iCr/rfM=";
|
||||
sha256 = "sha256-bfD/zxUo4ZDLRDpFbD/FCAvBISHvhRaYXwwiYFd10No=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ buildGoModule {
|
|||
subPackages = [ "cmd/bee" ];
|
||||
|
||||
# no symbol table, no debug info, and pass the commit for the version string
|
||||
buildFlags = lib.optionalString ( lib.hasAttr "goVersionString" versionSpec)
|
||||
"-ldflags -s -ldflags -w -ldflags -X=github.com/ethersphere/bee.commit=${versionSpec.goVersionString}";
|
||||
ldflags = lib.optionals ( lib.hasAttr "goVersionString" versionSpec)
|
||||
[ "-s" "-w" "-X=github.com/ethersphere/bee.commit=${versionSpec.goVersionString}" ];
|
||||
|
||||
# Mimic the bee Makefile: without disabling CGO, two (transitive and
|
||||
# unused) dependencies would fail to compile.
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "92.0.4515.131",
|
||||
"sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n",
|
||||
"sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g",
|
||||
"version": "92.0.4515.159",
|
||||
"sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr",
|
||||
"sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-05-07",
|
||||
|
|
@ -55,8 +55,8 @@
|
|||
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "92.0.4515.131-1",
|
||||
"sha256": "1nbgknj5ba116y47sxbp7pbma1bp0lmkyi3vk915x837ysaf6mrd"
|
||||
"rev": "92.0.4515.159-1",
|
||||
"sha256": "1mfkpkyj0sd2k07fzmxmqc24ywqqmcv3vpg1yhh96k676q0qkpd0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Declarative continuous deployment for Kubernetes";
|
||||
downloadPage = "https://github.com/argoproj/argo-cd";
|
||||
homepage = "https://argoproj.github.io/projects/argo-cd";
|
||||
homepage = "https://argo-cd.readthedocs.io/en/stable/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ shahrukh330 superherointj ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.22.0";
|
||||
version = "1.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4lqqD3SBLBWrnFWhRzV3QgRLdGRW1Jx/eL6swtHL0Vw=";
|
||||
sha256 = "sha256-coiDKczX5kWw/5A9+p0atPbn2nR0wBBdfXKTw6FYywo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
|
||||
|
|
@ -97,10 +97,5 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
passthru.tests = with nixosTests.kubernetes; {
|
||||
dns-single-node = dns.singlenode;
|
||||
dns-multi-node = dns.multinode;
|
||||
rbac-single-node = rbac.singlenode;
|
||||
rbac-multi-node = rbac.multinode;
|
||||
};
|
||||
passthru.tests = nixosTests.kubernetes;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hyprspace";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac;
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aLODIaDbSLVEog/F0FVx6ykadCggE0Vebzwjw0sqYJ0=";
|
||||
sha256 = "sha256-g0oyI3jnqQADyOrpnK4IvpFQPEwNrpvyDS+DhBDXZGg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rw75xNBBV58F+HBVtD/EslPWxZxLbI3/mJVdJF4usKI=";
|
||||
|
|
|
|||
|
|
@ -23,11 +23,14 @@ buildGoPackage rec {
|
|||
buildInputs = [ trousers gtk3 gtkspell3 ]
|
||||
++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi
|
||||
++ lib.optionals gui [ wrapGAppsHook ];
|
||||
buildFlags = lib.optionals (!gui) [ "-tags" "nogui" ];
|
||||
tags = lib.optionals (!gui) [ "nogui" ];
|
||||
excludedPackages = "\\(appengine\\|bn256cgo\\)";
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 ''
|
||||
grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
|
||||
-e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
|
||||
-e "s,bn256\.,bn256cgo.,g"
|
||||
'';
|
||||
|
||||
# https://hydra.nixos.org/build/150102618/nixlog/2
|
||||
meta.broken = stdenv.isAarch64;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,17 +20,19 @@
|
|||
, pantheon /* granite, icons, maintainers */
|
||||
, webkitgtk
|
||||
, libpeas
|
||||
, libhandy
|
||||
, curl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-planner";
|
||||
version = "2.6.9";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planner";
|
||||
rev = version;
|
||||
sha256 = "17ij017x2cplqhway8376k8mmrll4w1jfwhf7ixldq9g0q2inzd8";
|
||||
sha256 = "sha256-3eFPGRcZWhzFYi52TbHmpFNLI0pWYcHbbBI7efqZwYE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -58,6 +60,8 @@ stdenv.mkDerivation rec {
|
|||
sqlite
|
||||
webkitgtk
|
||||
libgdata # required by some dependency transitively
|
||||
libhandy
|
||||
curl
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "An ultrafast memory-efficient short read aligner";
|
||||
license = licenses.artistic2;
|
||||
homepage = "http://bowtie-bio.sf.net/bowtie";
|
||||
homepage = "http://bowtie-bio.sourceforge.net";
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -66,8 +66,8 @@ let
|
|||
# Make desktop item
|
||||
mkdir -p "$out"/share/applications
|
||||
cp "$desktopItem"/share/applications/* "$out"/share/applications/
|
||||
mkdir -p "$out"/share/icons
|
||||
ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/icons/eagle.png
|
||||
mkdir -p "$out"/share/pixmaps
|
||||
ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/pixmaps/eagle.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cadical";
|
||||
version = "1.3.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arminbiere";
|
||||
repo = "cadical";
|
||||
rev = "rel-${version}";
|
||||
sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf";
|
||||
sha256 = "0y44z3np4gssgdh4aj5qila7pshrbphycdxn2083i8ayyyjbxshp";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opensmt";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usi-verification-and-security";
|
||||
repo = "opensmt";
|
||||
rev = "v${version}";
|
||||
sha256 = "uoIcXWsxxRsIuFsou3RcN9e48lc7cWMgRPVJLFVslDE=";
|
||||
sha256 = "sha256-m8TpMBY1r0h8GJTHM4FLBuZtX+WK/Q7RTXUnNmUWV+o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake bison flex ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
let
|
||||
name = "maxima";
|
||||
version = "5.44.0";
|
||||
version = "5.45.0";
|
||||
|
||||
lisp-compiler = if ecl-fasl then ecl else sbcl;
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation ({
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
|
||||
sha256 = "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr";
|
||||
sha256 = "sha256-x2MfMmRIBc67e6/vOrUzHEus0sJ+OE/YgyO1A5pg0Ng=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
|
|
@ -20,6 +21,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# the patch below is included in sage 9.4 and should be included
|
||||
# in a future pynac release. see https://trac.sagemath.org/ticket/28357
|
||||
(fetchpatch {
|
||||
name = "realpartloop.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/realpartloop.patch?h=9.4.beta5";
|
||||
sha256 = "sha256-1nj0xtlFN5fZKEiRLD+tiW/ZtxMQre1ziEGA0OVUGE4=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
flint
|
||||
gmp
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/sage/env.py b/src/sage/env.py
|
||||
index 2908f5d04f..81dfd75c0d 100644
|
||||
index 95980cc2df..37107a30e1 100644
|
||||
--- a/src/sage/env.py
|
||||
+++ b/src/sage/env.py
|
||||
@@ -218,93 +218,12 @@ NTL_LIBDIR = var("NTL_LIBDIR")
|
||||
@@ -227,93 +227,12 @@ OPENMP_CXXFLAGS = var("OPENMP_CXXFLAGS", "")
|
||||
SAGE_BANNER = var("SAGE_BANNER", "")
|
||||
SAGE_IMPORTALL = var("SAGE_IMPORTALL", "yes")
|
||||
|
||||
|
|
@ -51,10 +51,9 @@ index 2908f5d04f..81dfd75c0d 100644
|
|||
- if sys.platform == 'cygwin':
|
||||
- # Later down we take the first matching DLL found, so search
|
||||
- # SAGE_LOCAL first so that it takes precedence
|
||||
- search_directories = [
|
||||
- Path(SAGE_LOCAL) / 'bin',
|
||||
- Path(sysconfig.get_config_var('BINDIR')),
|
||||
- ]
|
||||
- if SAGE_LOCAL:
|
||||
- search_directories.append(Path(SAGE_LOCAL) / 'bin')
|
||||
- search_directories.append(Path(sysconfig.get_config_var('BINDIR')))
|
||||
- # Note: The following is not very robust, since if there are multible
|
||||
- # versions for the same library this just selects one more or less
|
||||
- # at arbitrary. However, practically speaking, on Cygwin, there
|
||||
|
|
@ -66,7 +65,8 @@ index 2908f5d04f..81dfd75c0d 100644
|
|||
- else:
|
||||
- ext = 'so'
|
||||
-
|
||||
- search_directories = [Path(SAGE_LOCAL) / 'lib']
|
||||
- if SAGE_LOCAL:
|
||||
- search_directories.append(Path(SAGE_LOCAL) / 'lib')
|
||||
- libdir = sysconfig.get_config_var('LIBDIR')
|
||||
- if libdir is not None:
|
||||
- libdir = Path(libdir)
|
||||
|
|
@ -97,4 +97,4 @@ index 2908f5d04f..81dfd75c0d 100644
|
|||
+GAP_SO = var("GAP_SO", '/default')
|
||||
|
||||
# post process
|
||||
if ' ' in DOT_SAGE:
|
||||
if DOT_SAGE is not None and ' ' in DOT_SAGE:
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py
|
||||
index 6e034dcb5a..8ec60ec72b 100644
|
||||
--- a/src/sage/tests/cmdline.py
|
||||
+++ b/src/sage/tests/cmdline.py
|
||||
@@ -660,8 +660,8 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False
|
||||
sage: with open(input, 'w') as F:
|
||||
....: _ = F.write(s)
|
||||
sage: L = ["sage", "--rst2ipynb", input, output]
|
||||
- sage: test_executable(L) # optional - rst2ipynb
|
||||
- ('', '', 0)
|
||||
+ sage: test_executable(L)[2] # optional - rst2ipynb
|
||||
+ 0
|
||||
sage: import json # optional - rst2ipynb
|
||||
sage: d = json.load(open(output,'r')) # optional - rst2ipynb
|
||||
sage: type(d) # optional - rst2ipynb
|
||||
@@ -757,8 +757,6 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False
|
||||
///
|
||||
4
|
||||
}}}
|
||||
- sage: err # py2 # optional -- sagenb
|
||||
- ''
|
||||
sage: ret # py2 # optional -- sagenb
|
||||
0
|
||||
|
||||
|
|
@ -29,14 +29,14 @@ let
|
|||
);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "9.3";
|
||||
version = "9.4";
|
||||
pname = "sage-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sagemath";
|
||||
repo = "sage";
|
||||
rev = version;
|
||||
sha256 = "sha256-l9DX8jcDdKA7GJ6xU+nBsmlZxrcZ9ZUAJju621ooBEo=";
|
||||
sha256 = "sha256-jqkr4meG02KbTCMsGvyr1UbosS4ZuUJhPXU/InuS+9A=";
|
||||
};
|
||||
|
||||
# Patches needed because of particularities of nix or the way this is packaged.
|
||||
|
|
@ -77,64 +77,9 @@ stdenv.mkDerivation rec {
|
|||
# be empty since dependencies update all the time.
|
||||
packageUpgradePatches = [
|
||||
# After updating smypow to (https://trac.sagemath.org/ticket/3360) we can
|
||||
# now set the cache dir to be withing the .sage directory. This is not
|
||||
# now set the cache dir to be within the .sage directory. This is not
|
||||
# strictly necessary, but keeps us from littering in the user's HOME.
|
||||
./patches/sympow-cache.patch
|
||||
|
||||
# ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests
|
||||
./patches/ignore-cmp-deprecation.patch
|
||||
|
||||
# remove use of matplotlib function deprecated in 3.4
|
||||
# https://trac.sagemath.org/ticket/31827
|
||||
(fetchSageDiff {
|
||||
base = "9.3";
|
||||
name = "remove-matplotlib-deprecated-function.patch";
|
||||
rev = "32b2bcaefddc4fa3d2aee6fa690ce1466cbb5948";
|
||||
sha256 = "sha256-SXcUGBMOoE9HpuBzgKC3P6cUmM5MiktXbe/7dVdrfWo=";
|
||||
})
|
||||
|
||||
# pari 2.13 update
|
||||
# https://trac.sagemath.org/ticket/30801
|
||||
#
|
||||
# the last commit in that ticket is
|
||||
# c78b1470fccd915e2fa93f95f2fefba6220fb1f7, but commits after
|
||||
# 10a4531721d2700fd717e2b3a1364508ffd971c3 only deal with 32-bit
|
||||
# and post-26635 breakage, none of which is relevant to us. since
|
||||
# there are post-9.4.beta0 rebases after that, we just skip later
|
||||
# commits.
|
||||
(fetchSageDiff {
|
||||
base = "9.3";
|
||||
name = "pari-2.13.1.patch";
|
||||
rev = "10a4531721d2700fd717e2b3a1364508ffd971c3";
|
||||
sha256 = "sha256-gffWKK9CMREaNOb5zb63iZUgON4FvsPrMQNqe+5ZU9E=";
|
||||
})
|
||||
|
||||
# sympy 1.8 update
|
||||
# https://trac.sagemath.org/ticket/31647
|
||||
(fetchSageDiff {
|
||||
base = "9.4.beta0";
|
||||
name = "sympy-1.8.patch";
|
||||
rev = "fa864b36e15696450c36d54215b1e68183b29d25";
|
||||
sha256 = "sha256-fj/9QEZlVF0fw9NpWflkTuBSKpGjCE6b96ECBgdn77o=";
|
||||
})
|
||||
|
||||
# sphinx 4 update
|
||||
# https://trac.sagemath.org/ticket/31696
|
||||
(fetchSageDiff {
|
||||
base = "9.4.beta3";
|
||||
name = "sphinx-4.patch";
|
||||
rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8";
|
||||
sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM=";
|
||||
})
|
||||
|
||||
# eclib 20210625 update
|
||||
# https://trac.sagemath.org/ticket/31443
|
||||
(fetchSageDiff {
|
||||
base = "9.4.beta3";
|
||||
name = "eclib-20210625.patch";
|
||||
rev = "789550ca04c94acfb1e803251538996a34962038";
|
||||
sha256 = "sha256-VlyEn5hg3joG8t/GwiRfq9TzJ54AoHxLolsNQ3shc2c=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
, linbox
|
||||
, m4ri
|
||||
, m4rie
|
||||
, memory-allocator
|
||||
, libmpc
|
||||
, mpfi
|
||||
, ntl
|
||||
|
|
@ -107,6 +108,7 @@ buildPythonPackage rec {
|
|||
lrcalc
|
||||
m4ri
|
||||
m4rie
|
||||
memory-allocator
|
||||
mpfi
|
||||
ntl
|
||||
blas
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "git-delete-merged-branches";
|
||||
version = "6.0.5";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hartwork";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1mlmikcpm94nymid35v9rx9dyprhwidgwbdfd5zhsw502d40v0xp";
|
||||
sha256 = "sha256-mUgSIwU39BT0bCA2UQANe2Yzkgl2xAmXQQ9P2bLoEMc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ with lib;
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.14.6";
|
||||
version = "1.15.0";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "sha256-IIoOJlafMD6Kg8Zde3LcoK97PKLmqOUMQN3nmIgqe1o=";
|
||||
sha256 = "sha256-Wu5rtVoQql/0XWkszYOqE4QJxKUY/CsCpmjkaB+E6Hc=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -26,12 +26,10 @@ buildGoPackage rec {
|
|||
|
||||
buildInputs = [ btrfs-progs ];
|
||||
|
||||
buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ];
|
||||
|
||||
buildPhase = ''
|
||||
cd go/src/${goPackagePath}
|
||||
patchShebangs .
|
||||
make binaries man $buildFlags
|
||||
make binaries man "VERSION=v${version}" "REVISION=${src.rev}"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -27,14 +27,12 @@ buildGoModule rec {
|
|||
|
||||
buildInputs = [ btrfs-progs ];
|
||||
|
||||
buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ];
|
||||
|
||||
BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
patchShebangs .
|
||||
make binaries man $buildFlags
|
||||
make binaries man "VERSION=v${version}" "REVISION=${src.rev}"
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.20.3";
|
||||
version = "0.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JNTTSVWGPqJT9xShF1bgwTGtlp37Ocsdovow8F4EH3g=";
|
||||
sha256 = "sha256-lohMrsMCAnb2p7H+xfa24Wx3LEFxCAlGHfP9A70Hg48=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sm7Iorux2GKja0qzw2wM4sdsRwijtezIlef5vh1Nt54=";
|
||||
cargoSha256 = "sha256-pe96VNTH49qgQ4yxKcAcQPN31W2k1mD9TdhNKBp4x5Q=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "dfb0b040033334d2e676906786c7a90805310e7d",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dfb0b040033334d2e676906786c7a90805310e7d.tar.gz",
|
||||
"sha256": "0x53gkkpxlcm6qa38yksx8cws9phl2zxvdys5imjpg8dl1sal3pg",
|
||||
"msg": "Update from Hackage at 2021-08-10T19:15:27Z"
|
||||
"commit": "23315eb3220b0748c3aa71a9027dc39e5416ce9e",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/23315eb3220b0748c3aa71a9027dc39e5416ce9e.tar.gz",
|
||||
"sha256": "0pgcyfb3lnl7kxpj87sbj50ljlg2l05v4kgcdwy568pcf24bh764",
|
||||
"msg": "Update from Hackage at 2021-08-17T22:21:14Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "theme-obsidian2";
|
||||
version = "2.18";
|
||||
version = "2.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
|
||||
sha256 = "1w3grlkws4ih7333hys33z4bgm33jbc78bq2pyp8nzw4q9d2hz2r";
|
||||
sha256 = "sha256-GGnrix8utJ34pszuoxcMY5Yr0stwL17Y812FIiRZOUk=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rev = "9ae8768";
|
||||
version = "5.4";
|
||||
pname = "mail-notification";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "epienbroek";
|
||||
repo = "mail-notification";
|
||||
sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome-icon-theme hicolor-icon-theme tango-icon-theme ];
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c
|
||||
|
||||
# currently disable the check for missing sheme until a better solution
|
||||
# is found; needed, because otherwise the application doesn't even start
|
||||
# and fails saying it unable to find gconf scheme values.
|
||||
sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./patches/mail-notification-dont-link-against-bsd-compat.patch
|
||||
];
|
||||
|
||||
patchFlags = [ "-p0" ];
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
preConfigure = "./jb configure prefix=$out";
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace build/config \
|
||||
--replace "omf-dir|string|1|${gnome2.scrollkeeper}/share/omf" "omf-dir|string|1|$out/share/omf" \
|
||||
--replace "scrollkeeper-dir|string|1|${gnome2.scrollkeeper}/var/lib/scrollkeeper" "omf-dir|string|1|$out/var/lib/scrollkeeper" \
|
||||
'';
|
||||
|
||||
buildPhase = "./jb build";
|
||||
installPhase = "./jb install";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tray status icon, which notifies us when new email arrives";
|
||||
homepage = "https://www.nongnu.org/mailnotify/";
|
||||
license = with licenses; [ gpl3 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.eleanor ];
|
||||
};
|
||||
}
|
||||
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tali";
|
||||
version = "40.1";
|
||||
version = "40.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1xhp30c70bi8p4sm6v8zmxi1p55fs56dqgfbhfnsda5g1cxwir7h";
|
||||
sha256 = "9SHsnW1SKA/Pfi1IerbVqIw54yx6n5XrqwKdUsAj4Cs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
, autoconf, automake, libtool, jdk, perl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "aldor-1.2.0";
|
||||
pname = "aldor";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/pippijn/aldor";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{lib, stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "aliceml-1.4-7d44dc8e";
|
||||
pname = "aliceml";
|
||||
version = "1.4-7d44dc8e";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/aliceml/aliceml";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ lib, stdenv, fetchurl, autoconf, automake }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "avra-1.3.0";
|
||||
pname = "avra";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/avra/${name}.tar.bz2";
|
||||
url = "mirror://sourceforge/avra/avra-${version}.tar.bz2";
|
||||
sha256 = "04lp0k0h540l5pmnaai07637f0p4zi766v6sfm7cryfaca3byb56";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, perl, coreutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "berkeley_upc-2.22.0";
|
||||
pname = "berkeley_upc";
|
||||
version = "2.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://upc.lbl.gov/download/release/${name}.tar.gz";
|
||||
url = "http://upc.lbl.gov/download/release/berkeley_upc-${version}.tar.gz";
|
||||
sha256 = "041l215x8z1cvjcx7kwjdgiaf9rl2d778k6kiv8q09bc68nwd44m";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, python3, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cmdstan-2.17.1";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cmdstan";
|
||||
version = "2.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/stan-dev/cmdstan/releases/download/v2.17.1/cmdstan-2.17.1.tar.gz";
|
||||
url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz";
|
||||
sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# build-tools
|
||||
, bootPkgs
|
||||
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
|
||||
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx, xattr
|
||||
, bash
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
|
|
@ -135,12 +135,12 @@ let
|
|||
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "8.10.4";
|
||||
version = "8.10.6";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj";
|
||||
sha256 = "43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -155,9 +155,6 @@ stdenv.mkDerivation (rec {
|
|||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
# Fix documentation configuration which causes a syntax error with sphinx 4.*
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/issues/19962, remove at 8.10.6.
|
||||
./sphinx-4-configuration.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Make Block.h compile with c++ compilers. Remove with the next release
|
||||
(fetchpatch {
|
||||
|
|
@ -192,6 +189,9 @@ stdenv.mkDerivation (rec {
|
|||
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
export NIX_LDFLAGS+=" -no_dtrace_dof"
|
||||
|
||||
# GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
|
||||
export XATTR=${lib.getBin xattr}/bin/xattr
|
||||
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
||||
'' + lib.optionalString targetPlatform.isMusl ''
|
||||
|
|
@ -1,9 +1,11 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "meta-build-env-0.1";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "meta-build-env";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz";
|
||||
url = "http://www.meta-environment.org/releases/meta-build-env-${version}.tar.gz";
|
||||
sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@ assert check-ocaml-version "4";
|
|||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "mezzo-0.0.m8";
|
||||
pname = "mezzo";
|
||||
version = "0.0.m8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protz";
|
||||
|
|
|
|||
|
|
@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Standard ML Compiler and Toolkit";
|
||||
homepage = "https://elsman.com/mlkit/";
|
||||
changelog = "https://github.com/melsman/mlkit/blob/v${version}/NEWS.md";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ athas ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "opendylan-2016.1pre";
|
||||
pname = "opendylan";
|
||||
version = "2016.1pre";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/dylan-lang/opendylan";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ fetchurl, lib, stdenv, ncompress, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "stalin-0.11";
|
||||
pname = "stalin";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.ecn.purdue.edu/qobi/stalin.tar.Z";
|
||||
|
|
@ -22,16 +23,16 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p "$out/share/emacs/site-lisp"
|
||||
cp stalin.el "$out/share/emacs/site-lisp"
|
||||
|
||||
mkdir -p "$out/doc/${name}"
|
||||
cp README "$out/doc/${name}"
|
||||
mkdir -p "$out/doc/stalin-${version}"
|
||||
cp README "$out/doc/stalin-${version}"
|
||||
|
||||
mkdir -p "$out/share/${name}/include"
|
||||
cp "include/"* "$out/share/${name}/include"
|
||||
mkdir -p "$out/share/stalin-${version}/include"
|
||||
cp "include/"* "$out/share/stalin-${version}/include"
|
||||
|
||||
substituteInPlace "$out/bin/stalin" \
|
||||
--replace "$PWD/include/stalin" "$out/share/${name}/include/stalin"
|
||||
--replace "$PWD/include/stalin" "$out/share/stalin-${version}/include/stalin"
|
||||
substituteInPlace "$out/bin/stalin" \
|
||||
--replace "$PWD/include" "$out/share/${name}/include"
|
||||
--replace "$PWD/include" "$out/share/stalin-${version}/include"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ mkCoqDerivation rec {
|
|||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c";
|
||||
release."8.12.0".sha256 = "sha256-ypHmHwzwZ6MQPYwuS3QyZmVOEPUCSbO2lhVaA6TypgQ=";
|
||||
release."8.10.0".sha256 = "sha256-mCLF3JYIiO3AEW9yvlcLeF7zN4SjW3LG+Y5vYB0l55A=";
|
||||
release."8.9.0".sha256 = "sha256-ZJh1BM34iZOQ75zqLIA+KtBjO2y33y0UpAw/ydCWQYc=";
|
||||
|
|
@ -15,16 +16,16 @@ mkCoqDerivation rec {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isGe "8.12"; out = "8.12.0"; }
|
||||
{ case = "8.11"; out = "8.12.0"; }
|
||||
{ case = "8.10"; out = "8.10.0"; }
|
||||
{ case = isGe "8.10"; out = "9.0.0"; }
|
||||
{ case = "8.9"; out = "8.9.0"; }
|
||||
{ case = "8.8"; out = "8.8.0"; }
|
||||
{ case = "8.7"; out = "8.7.0"; }
|
||||
{ case = "8.6"; out = "8.6.0"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = optional (versions.isLe "8.12" defaultVersion) zorns-lemma;
|
||||
propagatedBuildInputs = [ zorns-lemma ];
|
||||
|
||||
useDune2ifVersion = versions.isGe "9.0";
|
||||
|
||||
meta = {
|
||||
description = "General topology in Coq";
|
||||
|
|
|
|||
|
|
@ -3,9 +3,11 @@ with lib;
|
|||
|
||||
mkCoqDerivation {
|
||||
pname = "zorns-lemma";
|
||||
repo = "topology";
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c";
|
||||
release."8.11.0".sha256 = "sha256-2Hf7YwRcFmP/DqwFtF1p78MCNV50qUWfMVQtZbwKd0k=";
|
||||
release."8.10.0".sha256 = "sha256-qLPLK2ZLJQ4SmJX2ADqFiP4kgHuQFJTeNXkBbjiFS+4=";
|
||||
release."8.9.0".sha256 = "sha256-lEh978cXehglFX9D92RVltEuvN8umfPo/hvmFZm2NGo=";
|
||||
|
|
@ -16,8 +18,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isGe "8.11"; out = "8.11.0"; }
|
||||
{ case = "8.10"; out = "8.10.0"; }
|
||||
{ case = isGe "8.10"; out = "9.0.0"; }
|
||||
{ case = "8.9"; out = "8.9.0"; }
|
||||
{ case = "8.8"; out = "8.8.0"; }
|
||||
{ case = "8.7"; out = "8.7.0"; }
|
||||
|
|
@ -25,6 +26,8 @@ mkCoqDerivation {
|
|||
{ case = "8.5"; out = "8.5.0"; }
|
||||
] null;
|
||||
|
||||
useDune2ifVersion = versions.isGe "9.0";
|
||||
|
||||
meta = {
|
||||
description = "Development of basic set theory";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
, avrdude, arduino-core }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "ino-0.3.6";
|
||||
namePrefix = "";
|
||||
pname = "ino";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/i/ino/${name}.tar.gz";
|
||||
url = "mirror://pypi/i/ino/ino-${version}.tar.gz";
|
||||
sha256 = "0k6lzfcn55favbj0w4afrvnmwyskf7bgzg9javv2ycvskp35srwv";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,9 @@
|
|||
# Not needed with buildGoModule
|
||||
, goPackagePath ? ""
|
||||
|
||||
# needed for buildFlags warning
|
||||
, buildFlags ? ""
|
||||
|
||||
, ... }@args':
|
||||
|
||||
with builtins;
|
||||
|
|
@ -268,4 +271,6 @@ let
|
|||
};
|
||||
});
|
||||
in
|
||||
lib.warnIf (buildFlags != "")
|
||||
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`"
|
||||
package
|
||||
|
|
|
|||
|
|
@ -43,6 +43,9 @@
|
|||
|
||||
, CGO_ENABLED ? go.CGO_ENABLED
|
||||
|
||||
# needed for buildFlags warning
|
||||
, buildFlags ? ""
|
||||
|
||||
, meta ? {}, ... } @ args:
|
||||
|
||||
|
||||
|
|
@ -257,4 +260,6 @@ let
|
|||
} // meta;
|
||||
});
|
||||
in
|
||||
lib.warnIf (buildFlags != "")
|
||||
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`"
|
||||
package
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "unstable-2021-07-29";
|
||||
version = "unstable-2021-08-21";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/614852fa4be21ffc283046b92ed9e5b75c7e38af.tar.gz";
|
||||
sha256 = "00p6vmy5s016nkgjk5zf0hqym8y2glgwga81lm6xc1vc3zzkidmc";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/51a4082fefad4642af67a0ae4bf3bb3a7d9b45e0.tar.gz";
|
||||
sha256 = "1qd991ziv54drb0n655dg4ymknlfa0ndx9nq9wb5v00a15i4c04x";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
|
|
|||
|
|
@ -1149,14 +1149,8 @@ self: super: {
|
|||
# $HOME, which we don't have in our build sandbox.
|
||||
cabal-install-parsers = dontCheck super.cabal-install-parsers;
|
||||
|
||||
# jailbreak and patch (for pandoc >= 2.12) ensure compilation with newer dependencies.
|
||||
# can both be removed at the next release (current is 0.13.0.0)
|
||||
gitit = doJailbreak (appendPatch super.gitit
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/jgm/gitit/commit/e8c9d94be332e2f73de9b0eee222a2a09f191faf.patch";
|
||||
sha256 = "1rl2c3sz8cd2c3qwv9b640853s4bblcknvfv29k472wqhs62mwz1";
|
||||
includes = [ "src/**" ];
|
||||
}));
|
||||
# 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage.
|
||||
gitit = doJailbreak super.gitit;
|
||||
|
||||
# Test suite requires database
|
||||
persistent-mysql = dontCheck super.persistent-mysql;
|
||||
|
|
@ -1293,23 +1287,39 @@ self: super: {
|
|||
# Fails with "supports custom headers"
|
||||
Spock-core = dontCheck super.Spock-core;
|
||||
|
||||
# Needed by Hasura 1.3.1
|
||||
dependent-map_0_2_4_0 = super.dependent-map_0_2_4_0.override {
|
||||
dependent-sum = self.dependent-sum_0_4;
|
||||
};
|
||||
|
||||
# Hasura 1.3.1
|
||||
# Because of ghc-heap-view, profiling needs to be disabled.
|
||||
graphql-engine = disableLibraryProfiling( overrideCabal (super.graphql-engine.override {
|
||||
# hasura packages need some extra care
|
||||
graphql-engine = overrideCabal (super.graphql-engine.overrideScope (self: super: {
|
||||
immortal = self.immortal_0_2_2_1;
|
||||
dependent-map = self.dependent-map_0_2_4_0;
|
||||
dependent-sum = self.dependent-sum_0_4;
|
||||
resource-pool = self.hasura-resource-pool;
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
ekg-json = self.hasura-ekg-json;
|
||||
hspec = dontCheck self.hspec_2_8_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_3;
|
||||
tasty-hspec = self.tasty-hspec_1_2;
|
||||
})) (drv: {
|
||||
patches = [ ./patches/graphql-engine-mapkeys.patch ];
|
||||
doHaddock = false;
|
||||
version = "2.0.7";
|
||||
});
|
||||
hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: {
|
||||
hspec = dontCheck self.hspec_2_8_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_3;
|
||||
});
|
||||
hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
hspec = dontCheck self.hspec_2_8_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_3;
|
||||
});
|
||||
pg-client = overrideCabal (super.pg-client.override {
|
||||
resource-pool = self.hasura-resource-pool;
|
||||
}) (drv: {
|
||||
# version in cabal file is invalid
|
||||
version = "1.3.1-beta1";
|
||||
# hasura needs VERSION env exported during build
|
||||
preBuild = "export VERSION=1.3.1-beta1";
|
||||
}));
|
||||
librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
|
||||
# wants a running DB to check against
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# https://github.com/bos/statistics/issues/170
|
||||
statistics = dontCheck super.statistics;
|
||||
|
|
@ -1889,10 +1899,6 @@ EOT
|
|||
# https://github.com/google/proto-lens/issues/413
|
||||
proto-lens = doJailbreak super.proto-lens;
|
||||
|
||||
# Too strict bounds on profunctors
|
||||
# https://github.com/jcranch/tophat/issues/1
|
||||
tophat = doJailbreak super.tophat;
|
||||
|
||||
# 2021-06-20: Outdated upper bounds
|
||||
# https://github.com/Porges/email-validate-hs/issues/58
|
||||
email-validate = doJailbreak super.email-validate;
|
||||
|
|
@ -1946,4 +1952,10 @@ EOT
|
|||
Cabal = self.Cabal_3_6_0_0;
|
||||
};
|
||||
|
||||
# ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6
|
||||
ghc-api-compat = doJailbreak super.ghc-api-compat;
|
||||
|
||||
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
|
||||
streamly-posix = doJailbreak super.streamly-posix;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -194,6 +194,8 @@ self: super: {
|
|||
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
|
||||
hls-splice-plugin = dontCheck super.hls-splice-plugin;
|
||||
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
|
||||
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
|
||||
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
|
||||
|
||||
# We are lacking pure pgrep at the moment for tests to work
|
||||
tmp-postgres = dontCheck super.tmp-postgres;
|
||||
|
|
|
|||
|
|
@ -41,13 +41,6 @@ self: super: {
|
|||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Hasura 1.3.1
|
||||
# Because of ghc-heap-view, profiling needs to be disabled.
|
||||
graphql-engine = overrideCabal (super.graphql-engine) (drv: {
|
||||
# GHC 8.8.x needs a revert of https://github.com/hasura/graphql-engine/commit/a77bb0570f4210fb826985e17a84ddcc4c95d3ea
|
||||
patches = [ ./patches/hasura-884-compat.patch ];
|
||||
});
|
||||
|
||||
# GHC 8.8.x can build haddock version 2.23.*
|
||||
haddock = self.haddock_2_23_1;
|
||||
haddock-api = self.haddock-api_2_23_1;
|
||||
|
|
@ -136,4 +129,5 @@ self: super: {
|
|||
# vector 0.12.2 indroduced doctest checks that don‘t work on older compilers
|
||||
vector = dontCheck super.vector;
|
||||
|
||||
ghc-api-compat = super.ghc-api-compat_8_6;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ broken-packages:
|
|||
- alto
|
||||
- alure
|
||||
- amazon-emailer
|
||||
- amazonka-contrib-rds-utils
|
||||
- amazonka-s3-streaming
|
||||
- amazon-products
|
||||
- amby
|
||||
|
|
@ -180,6 +181,7 @@ broken-packages:
|
|||
- argparser
|
||||
- arguedit
|
||||
- arion
|
||||
- arith-encode
|
||||
- armada
|
||||
- arpa
|
||||
- arpack
|
||||
|
|
@ -467,6 +469,7 @@ broken-packages:
|
|||
- butter
|
||||
- buttplug-hs-core
|
||||
- bv-sized
|
||||
- byline
|
||||
- bytable
|
||||
- bytearray-parsing
|
||||
- bytestring-arbitrary
|
||||
|
|
@ -793,12 +796,14 @@ broken-packages:
|
|||
- consul-haskell
|
||||
- Consumer
|
||||
- containers-benchmark
|
||||
- containers-unicode-symbols
|
||||
- containers-verified
|
||||
- ContArrow
|
||||
- content-store
|
||||
- ContextAlgebra
|
||||
- context-free-grammar
|
||||
- context-stack
|
||||
- contiguous
|
||||
- contiguous-checked
|
||||
- continue
|
||||
- Contract
|
||||
|
|
@ -2183,6 +2188,7 @@ broken-packages:
|
|||
- HOpenCV
|
||||
- hopfield
|
||||
- hops
|
||||
- hoq
|
||||
- ho-rewriting
|
||||
- horizon
|
||||
- horname
|
||||
|
|
@ -2276,6 +2282,7 @@ broken-packages:
|
|||
- hsmodetweaks
|
||||
- Hsmtlib
|
||||
- hsmtpclient
|
||||
- hsnock
|
||||
- hs-nombre-generator
|
||||
- hsns
|
||||
- hsnsq
|
||||
|
|
@ -2388,6 +2395,7 @@ broken-packages:
|
|||
- hunspell-hs
|
||||
- hup
|
||||
- hurriyet
|
||||
- husky
|
||||
- hutton
|
||||
- huttons-razor
|
||||
- hVOIDP
|
||||
|
|
@ -2654,6 +2662,7 @@ broken-packages:
|
|||
- lagrangian
|
||||
- lambda2js
|
||||
- lambdaBase
|
||||
- lambdabot-social-plugins
|
||||
- lambdabot-utils
|
||||
- lambda-bridge
|
||||
- lambda-canvas
|
||||
|
|
@ -3009,6 +3018,7 @@ broken-packages:
|
|||
- miku
|
||||
- milena
|
||||
- mime-directory
|
||||
- miniforth
|
||||
- minilens
|
||||
- minilight
|
||||
- minions
|
||||
|
|
@ -3025,6 +3035,7 @@ broken-packages:
|
|||
- mit-3qvpPyAi6mH
|
||||
- mix-arrows
|
||||
- mixpanel-client
|
||||
- mkcabal
|
||||
- mltool
|
||||
- ml-w
|
||||
- mm2
|
||||
|
|
@ -3324,14 +3335,12 @@ broken-packages:
|
|||
- oblivious-transfer
|
||||
- ocaml-export
|
||||
- Octree
|
||||
- odbc
|
||||
- OddWord
|
||||
- oden-go-packages
|
||||
- oeis2
|
||||
- OGL
|
||||
- ogmarkup
|
||||
- oi
|
||||
- oidc-client
|
||||
- om-actor
|
||||
- omaketex
|
||||
- ombra
|
||||
|
|
@ -3664,6 +3673,7 @@ broken-packages:
|
|||
- polysemy
|
||||
- polysemy-zoo
|
||||
- polytypeable
|
||||
- pomaps
|
||||
- pomohoro
|
||||
- ponder
|
||||
- pong-server
|
||||
|
|
@ -3832,6 +3842,7 @@ broken-packages:
|
|||
- quarantimer
|
||||
- qudb
|
||||
- quenya-verb
|
||||
- questioner
|
||||
- QuickAnnotate
|
||||
- quickbooks
|
||||
- quickcheck-property-comb
|
||||
|
|
@ -3900,6 +3911,7 @@ broken-packages:
|
|||
- read-bounded
|
||||
- read-ctags
|
||||
- read-io
|
||||
- readline-statevar
|
||||
- readme-lhs
|
||||
- readshp
|
||||
- really-simple-xml-parser
|
||||
|
|
@ -4249,6 +4261,7 @@ broken-packages:
|
|||
- shadower
|
||||
- shake-bindist
|
||||
- shakebook
|
||||
- shake-cabal
|
||||
- shake-cabal-build
|
||||
- shake-dhall
|
||||
- shake-extras
|
||||
|
|
@ -4606,6 +4619,7 @@ broken-packages:
|
|||
- svndump
|
||||
- swagger-petstore
|
||||
- swagger-test
|
||||
- swearjure
|
||||
- swf
|
||||
- swift-lda
|
||||
- swiss-ephemeris
|
||||
|
|
@ -4920,6 +4934,7 @@ broken-packages:
|
|||
- twilio
|
||||
- twine
|
||||
- twirp
|
||||
- twitter
|
||||
- twitter-feed
|
||||
- tx
|
||||
- txtblk
|
||||
|
|
@ -5378,6 +5393,7 @@ broken-packages:
|
|||
- yi-solarized
|
||||
- yi-spolsky
|
||||
- yoda
|
||||
- Yogurt
|
||||
- yst
|
||||
- yu-core
|
||||
- yu-tool
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ extra-packages:
|
|||
- sbv == 7.13 # required for pkgs.petrinizer
|
||||
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
|
||||
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
|
||||
- ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5
|
||||
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
|
|
|
|||
|
|
@ -370,6 +370,7 @@ dont-distribute-packages:
|
|||
- XSaiga
|
||||
- YACPong
|
||||
- Yablog
|
||||
- Yogurt-Standalone
|
||||
- Z-Botan
|
||||
- Z-IO
|
||||
- Z-MessagePack
|
||||
|
|
@ -467,8 +468,10 @@ dont-distribute-packages:
|
|||
- atomic-primops-foreign
|
||||
- atp
|
||||
- attoparsec-enumerator
|
||||
- attoparsec-ip
|
||||
- attoparsec-iteratee
|
||||
- attoparsec-text-enumerator
|
||||
- attoparsec-uri
|
||||
- atuin
|
||||
- audiovisual
|
||||
- aura
|
||||
|
|
@ -626,6 +629,7 @@ dont-distribute-packages:
|
|||
- bv-sized-lens
|
||||
- bytehash
|
||||
- bytelog
|
||||
- bytesmith
|
||||
- bytestring-read
|
||||
- c0check
|
||||
- cabal-bounds
|
||||
|
|
@ -708,7 +712,9 @@ dont-distribute-packages:
|
|||
- claferwiki
|
||||
- clash
|
||||
- clash-ghc
|
||||
- clash-ghc_1_4_3
|
||||
- clash-lib
|
||||
- clash-lib_1_4_3
|
||||
- clash-multisignal
|
||||
- clash-prelude-quickcheck
|
||||
- clash-systemverilog
|
||||
|
|
@ -790,6 +796,7 @@ dont-distribute-packages:
|
|||
- consumers
|
||||
- container
|
||||
- containers-accelerate
|
||||
- contiguous-fft
|
||||
- continuum
|
||||
- continuum-client
|
||||
- control
|
||||
|
|
@ -1011,6 +1018,7 @@ dont-distribute-packages:
|
|||
- entangle
|
||||
- enumerate
|
||||
- enumerate-function
|
||||
- enumeration
|
||||
- enumerator-fd
|
||||
- enumerator-tf
|
||||
- ephemeral
|
||||
|
|
@ -1732,6 +1740,7 @@ dont-distribute-packages:
|
|||
- intset
|
||||
- invertible-hlist
|
||||
- ion
|
||||
- ip
|
||||
- ipatch
|
||||
- ipc
|
||||
- ipld-cid
|
||||
|
|
@ -1858,6 +1867,8 @@ dont-distribute-packages:
|
|||
- lambda-options
|
||||
- lambdaFeed
|
||||
- lambdaLit
|
||||
- lambdabot
|
||||
- lambdabot-xmpp
|
||||
- lambdabot-zulip
|
||||
- lambdacms-media
|
||||
- lambdacube
|
||||
|
|
@ -1885,6 +1896,7 @@ dont-distribute-packages:
|
|||
- lapack-carray
|
||||
- lapack-comfort-array
|
||||
- lapack-comfort-array_0_0_1
|
||||
- lapack-hmatrix
|
||||
- lapack_0_4
|
||||
- lat
|
||||
- latex-formulae-hakyll
|
||||
|
|
@ -2038,6 +2050,7 @@ dont-distribute-packages:
|
|||
- markdown-pap
|
||||
- markdown2svg
|
||||
- markov-processes
|
||||
- markup
|
||||
- marmalade-upload
|
||||
- marquise
|
||||
- marvin
|
||||
|
|
@ -2395,6 +2408,8 @@ dont-distribute-packages:
|
|||
- prednote-test
|
||||
- presto-hdbc
|
||||
- preview
|
||||
- primitive-containers
|
||||
- primitive-sort
|
||||
- primula-board
|
||||
- primula-bot
|
||||
- proc
|
||||
|
|
@ -2589,6 +2604,7 @@ dont-distribute-packages:
|
|||
- ribosome-root
|
||||
- ribosome-test
|
||||
- ridley-extras
|
||||
- ring-buffers
|
||||
- rio-process-pool
|
||||
- riot
|
||||
- ripple
|
||||
|
|
@ -2662,6 +2678,7 @@ dont-distribute-packages:
|
|||
- scholdoc
|
||||
- scholdoc-citeproc
|
||||
- scholdoc-texmath
|
||||
- scientific-notation
|
||||
- scion
|
||||
- scion-browser
|
||||
- scope
|
||||
|
|
@ -2722,6 +2739,7 @@ dont-distribute-packages:
|
|||
- sgf
|
||||
- sgrep
|
||||
- sha1
|
||||
- shake-ats
|
||||
- shake-minify-css
|
||||
- shaker
|
||||
- shapefile
|
||||
|
|
@ -2760,6 +2778,7 @@ dont-distribute-packages:
|
|||
- smallstring
|
||||
- smartword
|
||||
- smcdel
|
||||
- smith
|
||||
- smith-cli
|
||||
- smith-client
|
||||
- smtlib2-debug
|
||||
|
|
@ -3088,6 +3107,8 @@ dont-distribute-packages:
|
|||
- urembed
|
||||
- uri-enumerator
|
||||
- uri-enumerator-file
|
||||
- url-bytes
|
||||
- urlpath
|
||||
- usb
|
||||
- usb-enumerator
|
||||
- usb-hid
|
||||
|
|
@ -3099,6 +3120,7 @@ dont-distribute-packages:
|
|||
- uu-cco-examples
|
||||
- uu-cco-hut-parsing
|
||||
- uu-cco-uu-parsinglib
|
||||
- uuid-bytes
|
||||
- uuid-crypto
|
||||
- uvector-algorithms
|
||||
- v4l2
|
||||
|
|
@ -3146,6 +3168,7 @@ dont-distribute-packages:
|
|||
- wai-middleware-cache
|
||||
- wai-middleware-cache-redis
|
||||
- wai-middleware-consul
|
||||
- wai-middleware-content-type
|
||||
- wai-middleware-rollbar
|
||||
- wai-middleware-route
|
||||
- wai-session-tokyocabinet
|
||||
|
|
@ -3187,6 +3210,7 @@ dont-distribute-packages:
|
|||
- wrecker-ui
|
||||
- wright
|
||||
- writer-cps-full
|
||||
- ws
|
||||
- wss-client
|
||||
- wtk-gtk
|
||||
- wu-wei
|
||||
|
|
|
|||
|
|
@ -167,6 +167,7 @@ self: super: builtins.intersectAttrs super {
|
|||
mongoDB = dontCheck super.mongoDB;
|
||||
network-transport-tcp = dontCheck super.network-transport-tcp;
|
||||
network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
|
||||
oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com
|
||||
pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw
|
||||
pixiv = dontCheck super.pixiv;
|
||||
raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw
|
||||
|
|
@ -224,6 +225,9 @@ self: super: builtins.intersectAttrs super {
|
|||
# Test suite wants to connect to $DISPLAY.
|
||||
hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]);
|
||||
|
||||
# Wants to check against a real DB, Needs freetds
|
||||
odbc = dontCheck (addExtraLibraries super.odbc [ pkgs.freetds ]);
|
||||
|
||||
# Tests attempt to use NPM to install from the network into
|
||||
# /homeless-shelter. Disabled.
|
||||
purescript = dontCheck super.purescript;
|
||||
|
|
|
|||
1377
third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
generated
vendored
1377
third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
generated
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -26,14 +26,15 @@ self: super: {
|
|||
|
||||
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
|
||||
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git
|
||||
ci-info = self.callPackage ../misc/haskell/hasura/ci-info {};
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/pg-client-hs.git
|
||||
pg-client = self.callPackage ../misc/haskell/hasura/pg-client {};
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/graphql-parser-hs.git
|
||||
graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {};
|
||||
# cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git
|
||||
graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {};
|
||||
# hasura graphql-engine is not released to hackage.
|
||||
# https://github.com/hasura/graphql-engine/issues/7391
|
||||
ci-info = self.callPackage ../misc/haskell/hasura/ci-info.nix {};
|
||||
pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {};
|
||||
graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser.nix {};
|
||||
graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {};
|
||||
hasura-resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {};
|
||||
hasura-ekg-core = self.callPackage ../misc/haskell/hasura/ekg-core.nix {};
|
||||
hasura-ekg-json = self.callPackage ../misc/haskell/hasura/ekg-json.nix {};
|
||||
|
||||
# Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
|
||||
# cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
|
||||
|
|
|
|||
33
third_party/nixpkgs/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch
vendored
Normal file
33
third_party/nixpkgs/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch
vendored
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs
|
||||
index eaff0dfba..9902cadd0 100644
|
||||
--- a/src-lib/Data/HashMap/Strict/Extended.hs
|
||||
+++ b/src-lib/Data/HashMap/Strict/Extended.hs
|
||||
@@ -7,7 +7,6 @@ module Data.HashMap.Strict.Extended
|
||||
, groupOnNE
|
||||
, differenceOn
|
||||
, lpadZip
|
||||
- , mapKeys
|
||||
, unionsWith
|
||||
) where
|
||||
|
||||
@@ -54,20 +53,6 @@ lpadZip left = catMaybes . flip A.alignWith left \case
|
||||
That b -> Just (Nothing, b)
|
||||
These a b -> Just (Just a, b)
|
||||
|
||||
--- | @'mapKeys' f s@ is the map obtained by applying @f@ to each key of @s@.
|
||||
---
|
||||
--- The size of the result may be smaller if @f@ maps two or more distinct
|
||||
--- keys to the same new key. In this case the value at the greatest of the
|
||||
--- original keys is retained.
|
||||
---
|
||||
--- > mapKeys (+ 1) (fromList [(5,"a"), (3,"b")]) == fromList [(4, "b"), (6, "a")]
|
||||
--- > mapKeys (\ _ -> 1) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 1 "c"
|
||||
--- > mapKeys (\ _ -> 3) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 3 "c"
|
||||
---
|
||||
--- copied from https://hackage.haskell.org/package/containers-0.6.4.1/docs/src/Data.Map.Internal.html#mapKeys
|
||||
-mapKeys :: (Ord k2, Hashable k2) => (k1 -> k2) -> HashMap k1 a -> HashMap k2 a
|
||||
-mapKeys f = fromList . foldrWithKey (\k x xs -> (f k, x) : xs) []
|
||||
-
|
||||
-- | The union of a list of maps, with a combining operation:
|
||||
-- (@'unionsWith' f == 'Prelude.foldl' ('unionWith' f) 'empty'@).
|
||||
--
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
|
||||
index 6cb70cf0..0c3789cd 100644
|
||||
--- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
|
||||
+++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
|
||||
@@ -45,7 +45,7 @@ import GHC.AssertNF
|
||||
import qualified ListT
|
||||
import qualified Network.WebSockets as WS
|
||||
import qualified StmContainers.Map as STMMap
|
||||
-import qualified System.IO.Error as E
|
||||
+--import qualified System.IO.Error as E
|
||||
|
||||
import qualified Hasura.Logging as L
|
||||
|
||||
@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p
|
||||
let rcv = forever $ do
|
||||
-- Process all messages serially (important!), in a separate thread:
|
||||
msg <- liftIO $
|
||||
- -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" :
|
||||
- -- https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112
|
||||
- -- as WS exception signaling cleanup below. It's not clear why exactly this gets
|
||||
- -- raised occasionally; I suspect an equivalent handler is missing from WS itself.
|
||||
- -- Regardless this should be safe:
|
||||
- handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $
|
||||
WS.receiveData conn
|
||||
writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing
|
||||
_hOnMessage wsHandlers wsConn msg
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchgit, mlton }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ceptre-2016-11-27";
|
||||
pname = "ceptre";
|
||||
version = "unstable-2016-11-27";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/chrisamaphone/interactive-lp";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "scsh-0.7pre";
|
||||
pname = "scsh";
|
||||
version = "0.7pre";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scheme/scsh.git";
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "ATSC A/52 stream decoder";
|
||||
homepage = "https://liba52.sourceforge.net/";
|
||||
homepage = "https://liba52.sourceforge.io/";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A utility library to help manage common tasks with OpenAL applications";
|
||||
homepage = "https://kcat.strangesoft.net/alure.html";
|
||||
homepage = "https://github.com/kcat/alure";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "Library for operations on boolean expression binary trees";
|
||||
homepage = "https://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html";
|
||||
homepage = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html";
|
||||
license = "GPL";
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = lib.platforms.all;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "capnproto";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
|
||||
sha256 = "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i";
|
||||
sha256 = "sha256-soBUp6K/6kK/w5LI0AljDZTXLozoaiOtbxi15yV0Bk8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grpc";
|
||||
version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
version = "1.39.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wa7n7mf20fnvxqw093kr7a4c7vilcmx9yl3hicnyfcd663jgqvd";
|
||||
sha256 = "1yrr04g6faphh4hwzryqrwzgcr0hqqh05x9mc3vhpzmdkrrbz4zn";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpqxx";
|
||||
version = "7.5.2";
|
||||
version = "7.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtv";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "15ifd28v6xbbx931icydy8xmkd8030b20xzqjja6vwwvzss2w9fa";
|
||||
sha256 = "sha256-shcGJebjXJ3ORvcdINJFLiuW7ySqe6HyPUQioeUG/wM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnused python3 ];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libupnp";
|
||||
version = "1.14.6";
|
||||
version = "1.14.8";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "pupnp";
|
||||
repo = "pupnp";
|
||||
rev = "release-${version}";
|
||||
sha256 = "1f9861q5dicp6rx3jnp1j788xfjfaf3k4620p9r0b0k0lj2gk38c";
|
||||
sha256 = "sha256-Ipgb7fpIT+P/LwcF8ZmW4C1lj57f5rOQXwUl1Kh/oD8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "talloc";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-J6A++Z44TXeRJN91XesinNF2H5Reym0gDoz9m/Upe9c=";
|
||||
sha256 = "sha256-a+lbI2i9CvHEzXqIFG62zuoY5Gw//JMwv2JitA0diqo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison
|
||||
, flex, twisted
|
||||
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, pkg-config, bison
|
||||
, flex
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost zlib libevent openssl python bison flex twisted
|
||||
boost zlib libevent openssl bison flex (python3.withPackages (ps: [ps.twisted]))
|
||||
];
|
||||
|
||||
preConfigure = "export PY_PREFIX=$out";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkg-config
|
||||
, bison, flex, twisted
|
||||
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, cmake, pkg-config
|
||||
, bison, flex
|
||||
, static ? stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkg-config bison flex ];
|
||||
buildInputs = [ boost zlib libevent openssl ]
|
||||
++ lib.optionals (!static) [ python twisted ];
|
||||
++ lib.optionals (!static) [ (python3.withPackages (ps: [ps.twisted])) ];
|
||||
|
||||
preConfigure = "export PY_PREFIX=$out";
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ucx";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openucx";
|
||||
repo = "ucx";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jl7wrmcpf6lakpi1gvjcs18cy0mmwgsv5wdd80zyl41cpd8gm8d";
|
||||
sha256 = "1ww5a9m1jbjjhsjlvjvlcvcv0sv388irfx8xdh0pd9w03xv754d0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook doxygen ];
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
{ stdenv, lib, fetchFromGitHub, fetchpatch, mcpp, bzip2, expat, openssl, db5
|
||||
{ stdenv, lib, fetchFromGitHub
|
||||
, mcpp, bzip2, expat, openssl, db5
|
||||
, darwin, libiconv, Security
|
||||
, zeroc-ice # to share meta
|
||||
, cpp11 ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zeroc-ice";
|
||||
version = "3.6.3";
|
||||
version = "3.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroc-ice";
|
||||
repo = "ice";
|
||||
rev = "v${version}";
|
||||
sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
|
||||
sha256 = "073h7v1f2sw77cr1a6xxa5l9j547pz24sxa9qdjc4zki0ivcnq15";
|
||||
};
|
||||
|
||||
buildInputs = [ mcpp bzip2 expat openssl db5 ]
|
||||
|
|
@ -27,13 +29,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
patches = [
|
||||
# Fixes compilation issues with GCC 8 using one of the patches
|
||||
# provided in https://github.com/zeroc-ice/ice/issues/82
|
||||
( fetchpatch {
|
||||
url = "https://github.com/zeroc-ice/ice/commit/a6a4981616b669432ff7b588179d6e93694d9e3f.patch";
|
||||
sha256 = "17j5r7gsa3izrm7zln4mrp7l16h532gvmpas0kzglybicbiz7d56";
|
||||
stripLen = 1;
|
||||
})
|
||||
# Fixes compilation warning about uninitialied variables (in test code)
|
||||
./uninitialized-variable-warning.patch
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -58,10 +55,5 @@ stdenv.mkDerivation rec {
|
|||
rm -rf $out/share/slice
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.zeroc.com/ice.html";
|
||||
description = "The internet communications engine";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
inherit (zeroc-ice) meta;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ stdenv, lib, fetchFromGitHub, bzip2, expat, openssl, lmdb
|
||||
{ stdenv, lib, fetchFromGitHub
|
||||
, bzip2, expat, libedit, lmdb, openssl
|
||||
, darwin, libiconv, Security
|
||||
, python3 # for tests only
|
||||
, cpp11 ? false
|
||||
}:
|
||||
|
||||
|
|
@ -21,16 +23,16 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zeroc-ice";
|
||||
version = "3.7.2";
|
||||
version = "3.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeroc-ice";
|
||||
repo = "ice";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m9lh79dfpcwcp2jhmj0wqdcsw3rl633x2hzfw9n2i34jjv64fvg";
|
||||
sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4";
|
||||
};
|
||||
|
||||
buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ]
|
||||
buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy";
|
||||
|
|
@ -51,12 +53,25 @@ in stdenv.mkDerivation rec {
|
|||
)
|
||||
'';
|
||||
|
||||
buildFlags = [ "srcs" ]; # no tests; they require network
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
outputs = [ "out" "bin" "dev" ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = with python3.pkgs; [ passlib ];
|
||||
checkPhase = with lib; let
|
||||
# these tests require network access so we need to skip them.
|
||||
brokenTests = map escapeRegex [
|
||||
"Ice/udp" "Glacier2" "IceGrid/simple" "IceStorm" "IceDiscovery/simple"
|
||||
];
|
||||
# matches CONFIGS flag in makeFlagsArray
|
||||
configFlag = optionalString cpp11 "--config=cpp11-shared";
|
||||
in ''
|
||||
runHook preCheck
|
||||
${python3.interpreter} ./cpp/allTests.py ${configFlag} --rfilter='${concatStringsSep "|" brokenTests}'
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $bin $dev/share
|
||||
mv $out/bin $bin
|
||||
|
|
@ -66,7 +81,7 @@ in stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.zeroc.com/ice.html";
|
||||
description = "The internet communications engine";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue