Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
9d6726a2e3
|
|
@ -768,6 +768,12 @@
|
|||
githubId = 3965744;
|
||||
name = "Arthur Lee";
|
||||
};
|
||||
arthurteisseire = {
|
||||
email = "arthurteisseire33@gmail.com";
|
||||
github = "arthurteisseire";
|
||||
githubId = 37193992;
|
||||
name = "Arthur Teisseire";
|
||||
};
|
||||
arturcygan = {
|
||||
email = "arczicygan@gmail.com";
|
||||
github = "arcz";
|
||||
|
|
@ -3587,6 +3593,12 @@
|
|||
githubId = 443978;
|
||||
name = "Gabriel Volpe";
|
||||
};
|
||||
gytis-ivaskevicius = {
|
||||
name = "Gytis Ivaskevicius";
|
||||
email = "me@gytis.io";
|
||||
github = "gytis-ivaskevicius";
|
||||
githubId = 23264966;
|
||||
};
|
||||
hakuch = {
|
||||
email = "hakuch@gmail.com";
|
||||
github = "hakuch";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,14 @@ let
|
|||
alias = domain: list: "${list}: \"|${pkgs.mlmmj}/bin/mlmmj-receive -L ${listDir domain list}/\"";
|
||||
subjectPrefix = list: "[${list}]";
|
||||
listAddress = domain: list: "${list}@${domain}";
|
||||
customHeaders = domain: list: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ];
|
||||
customHeaders = domain: list: [
|
||||
"List-Id: ${list}"
|
||||
"Reply-To: ${list}@${domain}"
|
||||
"List-Post: <mailto:${list}@${domain}>"
|
||||
"List-Help: <mailto:${list}+help@${domain}>"
|
||||
"List-Subscribe: <mailto:${list}+subscribe@${domain}>"
|
||||
"List-Unsubscribe: <mailto:${list}+unsubscribe@${domain}>"
|
||||
];
|
||||
footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}";
|
||||
createList = d: l:
|
||||
let ctlDir = listCtl d l; in
|
||||
|
|
@ -110,17 +117,29 @@ in
|
|||
services.postfix = {
|
||||
enable = true;
|
||||
recipientDelimiter= "+";
|
||||
extraMasterConf = ''
|
||||
mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nexthop
|
||||
'';
|
||||
masterConfig.mlmmj = {
|
||||
type = "unix";
|
||||
private = true;
|
||||
privileged = true;
|
||||
chroot = false;
|
||||
wakeup = 0;
|
||||
command = "pipe";
|
||||
args = [
|
||||
"flags=ORhu"
|
||||
"user=mlmmj"
|
||||
"argv=${pkgs.mlmmj}/bin/mlmmj-receive"
|
||||
"-F"
|
||||
"-L"
|
||||
"${spoolDir}/$nexthop"
|
||||
];
|
||||
};
|
||||
|
||||
extraAliases = concatMapLines (alias cfg.listDomain) cfg.mailLists;
|
||||
|
||||
extraConfig = ''
|
||||
transport_maps = hash:${stateDir}/transports
|
||||
virtual_alias_maps = hash:${stateDir}/virtuals
|
||||
propagate_unmatched_extensions = virtual
|
||||
'';
|
||||
extraConfig = "propagate_unmatched_extensions = virtual";
|
||||
|
||||
virtual = concatMapLines (virtual cfg.listDomain) cfg.mailLists;
|
||||
transport = concatMapLines (transport cfg.listDomain) cfg.mailLists;
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.mlmmj ];
|
||||
|
|
@ -129,10 +148,8 @@ in
|
|||
${pkgs.coreutils}/bin/mkdir -p ${stateDir} ${spoolDir}/${cfg.listDomain}
|
||||
${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir}
|
||||
${concatMapLines (createList cfg.listDomain) cfg.mailLists}
|
||||
echo "${concatMapLines (virtual cfg.listDomain) cfg.mailLists}" > ${stateDir}/virtuals
|
||||
echo "${concatMapLines (transport cfg.listDomain) cfg.mailLists}" > ${stateDir}/transports
|
||||
${pkgs.postfix}/bin/postmap ${stateDir}/virtuals
|
||||
${pkgs.postfix}/bin/postmap ${stateDir}/transports
|
||||
${pkgs.postfix}/bin/postmap /etc/postfix/virtual
|
||||
${pkgs.postfix}/bin/postmap /etc/postfix/transport
|
||||
'';
|
||||
|
||||
systemd.services.mlmmj-maintd = {
|
||||
|
|
|
|||
|
|
@ -111,7 +111,6 @@ in {
|
|||
group = lib.mkOption {
|
||||
description = ''
|
||||
Group under which mastodon runs.
|
||||
If it is set to "mastodon", a group will be created.
|
||||
'';
|
||||
type = lib.types.str;
|
||||
default = "mastodon";
|
||||
|
|
@ -555,10 +554,9 @@ in {
|
|||
};
|
||||
})
|
||||
(lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package mastodonEnv ])
|
||||
(lib.mkIf cfg.configureNginx {${config.services.nginx.user}.extraGroups = [ cfg.user ];})
|
||||
];
|
||||
|
||||
users.groups.mastodon = lib.mkIf (cfg.group == "mastodon") { };
|
||||
users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user;
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ happy-river erictapen ];
|
||||
|
|
|
|||
|
|
@ -602,6 +602,7 @@ in {
|
|||
"^~ /.well-known" = {
|
||||
priority = 210;
|
||||
extraConfig = ''
|
||||
absolute_redirect off;
|
||||
location = /.well-known/carddav {
|
||||
return 301 /remote.php/dav;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -333,7 +333,6 @@ in
|
|||
redis = handleTest ./redis.nix {};
|
||||
redmine = handleTest ./redmine.nix {};
|
||||
restic = handleTest ./restic.nix {};
|
||||
ripgrep = handleTest ./ripgrep.nix {};
|
||||
robustirc-bridge = handleTest ./robustirc-bridge.nix {};
|
||||
roundcube = handleTest ./roundcube.nix {};
|
||||
rspamd = handleTest ./rspamd.nix {};
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "ripgrep";
|
||||
meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; };
|
||||
|
||||
nodes.ripgrep = { pkgs, ... }: { environment.systemPackages = [ pkgs.ripgrep ]; };
|
||||
|
||||
testScript = ''
|
||||
ripgrep.succeed('echo "abc\nbcd\ncde" > /tmp/foo')
|
||||
assert "bcd" in ripgrep.succeed("rg -N 'bcd' /tmp/foo")
|
||||
assert "bcd\ncde" in ripgrep.succeed("rg -N 'cd' /tmp/foo")
|
||||
assert "ripgrep ${pkgs.ripgrep.version}" in ripgrep.succeed("rg --version | head -1")
|
||||
'';
|
||||
})
|
||||
|
|
@ -56,7 +56,7 @@ mkDerivation rec {
|
|||
description = "Cross-platform Milkdrop-compatible music visualizer";
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ajs124 ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
longDescription = ''
|
||||
The open-source project that reimplements the esteemed Winamp Milkdrop by Geiss in a more modern, cross-platform reusable library.
|
||||
Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, vmopts ? null
|
||||
}:
|
||||
|
||||
{ name, product, version, src, wmClass, jdk, meta }:
|
||||
{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
|
@ -72,11 +72,11 @@ with stdenv; lib.makeOverridable mkDerivation rec {
|
|||
|
||||
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
|
||||
--prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
|
||||
# Some internals want libstdc++.so.6
|
||||
stdenv.cc.cc.lib libsecret
|
||||
libnotify
|
||||
]}" \
|
||||
] ++ extraLdPath)}" \
|
||||
--set JDK_HOME "$jdk" \
|
||||
--set ${hiName}_JDK "$jdk" \
|
||||
--set ANDROID_JAVA_HOME "$jdk" \
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
# Sorted alphabetically
|
||||
|
||||
buildClion = { name, version, src, license, description, wmClass, ... }:
|
||||
lib.overrideDerivation (mkJetBrainsProduct {
|
||||
(mkJetBrainsProduct {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "CLion";
|
||||
meta = with lib; {
|
||||
|
|
@ -25,7 +25,7 @@ let
|
|||
maintainers = with maintainers; [ edwtjo mic92 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}) (attrs: {
|
||||
}).overrideAttrs (attrs: {
|
||||
postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) ''
|
||||
(
|
||||
cd $out/clion-${version}
|
||||
|
|
@ -97,7 +97,7 @@ let
|
|||
});
|
||||
|
||||
buildGoland = { name, version, src, license, description, wmClass, ... }:
|
||||
lib.overrideDerivation (mkJetBrainsProduct {
|
||||
(mkJetBrainsProduct {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "Goland";
|
||||
meta = with lib; {
|
||||
|
|
@ -112,7 +112,7 @@ let
|
|||
maintainers = [ maintainers.miltador ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}) (attrs: {
|
||||
}).overrideAttrs (attrs: {
|
||||
postFixup = (attrs.postFixup or "") + ''
|
||||
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
||||
patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv
|
||||
|
|
@ -125,6 +125,7 @@ let
|
|||
(mkJetBrainsProduct {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "IDEA";
|
||||
extraLdPath = [ zlib ];
|
||||
meta = with lib; {
|
||||
homepage = "https://www.jetbrains.com/idea/";
|
||||
inherit description license;
|
||||
|
|
@ -134,8 +135,8 @@ let
|
|||
with JUnit, TestNG, popular SCMs, Ant & Maven. Also known
|
||||
as IntelliJ.
|
||||
'';
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ edwtjo gytis-ivaskevicius ];
|
||||
platforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -202,7 +203,7 @@ let
|
|||
};
|
||||
|
||||
buildRider = { name, version, src, license, description, wmClass, ... }:
|
||||
lib.overrideDerivation (mkJetBrainsProduct {
|
||||
(mkJetBrainsProduct {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "Rider";
|
||||
meta = with lib; {
|
||||
|
|
@ -219,7 +220,7 @@ let
|
|||
maintainers = [ maintainers.miltador ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}) (attrs: {
|
||||
}).overrideAttrs (attrs: {
|
||||
patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + ''
|
||||
rm -rf lib/ReSharperHost/linux-x64/dotnet
|
||||
mkdir -p lib/ReSharperHost/linux-x64/dotnet/
|
||||
|
|
@ -241,7 +242,7 @@ let
|
|||
});
|
||||
|
||||
buildWebStorm = { name, version, src, license, description, wmClass, ... }:
|
||||
lib.overrideDerivation (mkJetBrainsProduct {
|
||||
(mkJetBrainsProduct {
|
||||
inherit name version src wmClass jdk;
|
||||
product = "WebStorm";
|
||||
meta = with lib; {
|
||||
|
|
@ -255,7 +256,7 @@ let
|
|||
maintainers = with maintainers; [ abaldeau ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}) (attrs: {
|
||||
}).overrideAttrs (attrs: {
|
||||
patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) ''
|
||||
# Webstorm tries to use bundled jre if available.
|
||||
# Lets prevent this for the moment
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub, writeTextDir
|
||||
, lib, stdenv, runCommandNoCC, remarshal, formats, spacevim_config ? import ./init.nix }:
|
||||
with stdenv;
|
||||
{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub
|
||||
, lib, stdenv, formats, spacevim_config ? import ./init.nix }:
|
||||
|
||||
let
|
||||
format = formats.toml {};
|
||||
vim-customized = vim_configurable.customize {
|
||||
|
|
@ -11,7 +11,7 @@ let
|
|||
vimrcConfig.packages.myVimPackage = with vimPlugins; { start = [ ]; };
|
||||
};
|
||||
spacevimdir = format.generate "init.toml" spacevim_config;
|
||||
in mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "spacevim";
|
||||
version = "1.5.0";
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
{stdenv, fetchurl,
|
||||
zlib, libpng, libjpeg, perl, expat, qt3,
|
||||
libX11, libXext, libSM, libICE,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "taskjuggler-2.4.3";
|
||||
src = fetchurl {
|
||||
url = "http://www.taskjuggler.org/download/${name}.tar.bz2";
|
||||
sha256 = "14gkxa2vwfih5z7fffbavps7m44z5bq950qndigw2icam5ks83jl";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[zlib libpng libX11 libXext libSM libICE perl expat libjpeg]
|
||||
;
|
||||
|
||||
patches = [ ./timezone-glibc.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
for i in $(grep -R "/bin/bash" . | sed 's/:.*//'); do
|
||||
substituteInPlace $i --replace /bin/bash $(type -Pp bash)
|
||||
done
|
||||
for i in $(grep -R "/usr/bin/perl" . | sed 's/:.*//'); do
|
||||
substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl
|
||||
done
|
||||
|
||||
# Fix install
|
||||
for i in docs/en/Makefile.in Examples/BigProject/Common/Makefile.in Examples/BigProject/Makefile.in Examples/BigProject/Project1/Makefile.in Examples/BigProject/Project2/Makefile.in Examples/FirstProject/Makefile.in Examples/ShiftSchedule/Makefile.in; do
|
||||
# Do not use variable substitution because there is some text after the last '@'
|
||||
substituteInPlace $i --replace 'docprefix = @PACKAGES_DIR@' 'docprefix = $(docdir)/'
|
||||
done
|
||||
|
||||
# Comment because the ical export need the KDE support.
|
||||
for i in Examples/FirstProject/AccountingSoftware.tjp; do
|
||||
substituteInPlace $i --replace "icalreport" "# icalreport"
|
||||
done
|
||||
|
||||
for i in TestSuite/testdir TestSuite/createrefs \
|
||||
TestSuite/Scheduler/Correct/Expression.sh; do
|
||||
substituteInPlace $i --replace '/bin/rm' 'rm'
|
||||
done
|
||||
|
||||
# Some tests require writing at $HOME
|
||||
HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--without-arts" "--disable-docs"
|
||||
"--x-includes=${libX11.dev}/include"
|
||||
"--x-libraries=${libX11.out}/lib"
|
||||
"--with-qt-dir=${qt3}"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/emacs/site-lisp/
|
||||
cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/
|
||||
'';
|
||||
|
||||
# kde_locale is not defined when installing without kde.
|
||||
installFlags = [ "kde_locale=\${out}/share/locale" ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.taskjuggler.org";
|
||||
license = lib.licenses.gpl2;
|
||||
description = "Project management tool";
|
||||
longDescription = ''
|
||||
TaskJuggler is a modern and powerful, Open Source project management
|
||||
tool. Its new approach to project planing and tracking is more
|
||||
flexible and superior to the commonly used Gantt chart editing
|
||||
tools. It has already been successfully used in many projects and
|
||||
scales easily to projects with hundreds of resources and thousands of
|
||||
tasks.
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
From the discussion in http://groups.google.com/group/taskjuggler-users/browse_thread/thread/f65a3efd4dcae2fc/a44c711a9d28ebee?show_docid=a44c711a9d28ebee
|
||||
|
||||
From: Chris Schlaeger <cs@kde.org>
|
||||
Date: Sat, 27 Feb 2010 06:33:35 +0000 (+0100)
|
||||
Subject: Try to fix time zone check for glibc 2.11.
|
||||
X-Git-Url: http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler.git;a=commitdiff_plain;h=2382ed54f90c3c899badb3f56aaa2b3b5dba361e;hp=c666c5068312fec7db75e17d1c567d94127d1dda
|
||||
|
||||
Try to fix time zone check for glibc 2.11.
|
||||
|
||||
Reported-by: Lee <pFQh8RQn4fqB@dyweni.com>
|
||||
---
|
||||
|
||||
diff --git a/taskjuggler/Utility.cpp b/taskjuggler/Utility.cpp
|
||||
index 5e2bf21..9b7fce2 100644
|
||||
--- a/taskjuggler/Utility.cpp
|
||||
+++ b/taskjuggler/Utility.cpp
|
||||
@@ -206,16 +206,28 @@ setTimezone(const char* tZone)
|
||||
|
||||
/* To validate the tZone value we call tzset(). It will convert the zone
|
||||
* into a three-letter acronym in case the tZone value is good. If not, it
|
||||
- * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back
|
||||
- * to UTC. */
|
||||
+ * will
|
||||
+ * - copy the wrong value to tzname[0] (glibc < 2.5)
|
||||
+ * - or fall back to UTC (glibc >= 2.5 && < 2.11)
|
||||
+ * - copy the part before the '/' to tzname[0] (glibc >= 2.11).
|
||||
+ */
|
||||
tzset();
|
||||
+ char* region = new(char[strlen(tZone) + 1]);
|
||||
+ region[0] = 0;
|
||||
+ if (strchr(tZone, '/'))
|
||||
+ {
|
||||
+ strcpy(region, tZone);
|
||||
+ *strchr(region, '/') = 0;
|
||||
+ }
|
||||
if (timezone2tz(tZone) == 0 &&
|
||||
- (strcmp(tzname[0], tZone) == 0 ||
|
||||
+ (strcmp(tzname[0], tZone) == 0 || strcmp(tzname[0], region) == 0 ||
|
||||
(strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0)))
|
||||
{
|
||||
UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone);
|
||||
+ delete region;
|
||||
return false;
|
||||
}
|
||||
+ delete region;
|
||||
|
||||
if (!LtHashTab)
|
||||
return true;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } :
|
||||
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.6.1";
|
||||
|
|
@ -13,26 +13,29 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
|
||||
buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ];
|
||||
cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ]
|
||||
cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];
|
||||
|
||||
postInstall = if stdenv.isDarwin then ''
|
||||
mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources"
|
||||
cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns"
|
||||
mv $out/XyGrib/XyGrib.app $out/Applications
|
||||
wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib"
|
||||
'' else ''
|
||||
wrapQtApp $out/XyGrib/XyGrib
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/XyGrib/XyGrib $out/bin/xygrib
|
||||
'';
|
||||
postInstall =
|
||||
if stdenv.isDarwin then ''
|
||||
mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources"
|
||||
cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns"
|
||||
mv $out/XyGrib/XyGrib.app $out/Applications
|
||||
wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib"
|
||||
'' else ''
|
||||
wrapQtApp $out/XyGrib/XyGrib
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/XyGrib/XyGrib $out/bin/xygrib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://opengribs.org";
|
||||
description = "Weather Forecast Visualization";
|
||||
longDescription = ''XyGrib is a leading opensource weather visualization package.
|
||||
It interacts with OpenGribs's Grib server providing a choice
|
||||
of global and large area atmospheric and wave models.'';
|
||||
longDescription = ''
|
||||
XyGrib is a leading opensource weather visualization package.
|
||||
It interacts with OpenGribs's Grib server providing a choice
|
||||
of global and large area atmospheric and wave models.
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ j03 SuperSandro2000 ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "88.0.4324.150",
|
||||
"sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf",
|
||||
"sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0",
|
||||
"version": "88.0.4324.182",
|
||||
"sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h",
|
||||
"sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2020-11-05",
|
||||
|
|
|
|||
|
|
@ -1,38 +1,53 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
let
|
||||
version = "0.16.3";
|
||||
{ lib, stdenv, fetchzip }:
|
||||
|
||||
system = stdenv.hostPlatform.system;
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
suffix = {
|
||||
x86_64-linux = "Linux-64bit";
|
||||
aarch64-linux = "Linux-arm64";
|
||||
x86_64-darwin = "macOS-64bit";
|
||||
}."${system}" or (throw "Unsupported system: ${system}");
|
||||
|
||||
baseurl = "https://github.com/vmware-tanzu/octant/releases/download";
|
||||
fetchsrc = sha256: fetchurl {
|
||||
url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz";
|
||||
sha256 = sha256."${system}";
|
||||
};
|
||||
fetchsrc = version: sha256: fetchzip {
|
||||
url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz";
|
||||
sha256 = sha256."${system}";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octant";
|
||||
inherit version;
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchsrc {
|
||||
x86_64-linux = "1c6v7d8i494k32b0zrjn4fn1idza95r6h99c33c5za4hi7gqvy0x";
|
||||
aarch64-linux = "153jd4wsq8qc598w7y4d30dy20ljyhrl68cc3pig1p712l5258zs";
|
||||
x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz";
|
||||
src = fetchsrc version {
|
||||
x86_64-linux = "sha256-kYS8o97HBjNgwmrG4fjsqFWxZy6ATFOhxt6j3KMZbEc=";
|
||||
aarch64-linux = "sha256-/Tpna2Y8+PQt+SeOJ9NDweRWGiQXU/sN+Wh/vLYQPwM=";
|
||||
x86_64-darwin = "sha256-aOUmnD+l/Cc5qTiHxFLBjCatszmPdUc4YYZ6Oy5DT3U=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
mv octant $out/bin
|
||||
runHook preInstall
|
||||
install -D octant $out/bin/octant
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/octant --help
|
||||
$out/bin/octant version | grep "${version}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
dontPatchShebangs = true;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://octant.dev/";
|
||||
changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md";
|
||||
description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters.";
|
||||
longDescription = ''
|
||||
Octant is a tool for developers to understand how applications run on a Kubernetes cluster.
|
||||
|
|
@ -40,9 +55,8 @@ stdenv.mkDerivation rec {
|
|||
Octant offers a combination of introspective tooling, cluster navigation, and object management along with a
|
||||
plugin system to further extend its capabilities.
|
||||
'';
|
||||
homepage = "https://octant.dev/";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ jk ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
38
pkgs/applications/networking/cluster/octant/update.sh
Executable file
38
pkgs/applications/networking/cluster/octant/update.sh
Executable file
|
|
@ -0,0 +1,38 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused gawk nix-prefetch
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
NIX_DRV="$ROOT/default.nix"
|
||||
if [ ! -f "$NIX_DRV" ]; then
|
||||
echo "ERROR: cannot find default.nix in $ROOT"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
fetch_arch() {
|
||||
VER="$1"; ARCH="$2"
|
||||
URL="https://github.com/vmware-tanzu/octant/releases/download/v${VER}/octant_${VER}_${ARCH}.tar.gz"
|
||||
nix-prefetch "{ stdenv, fetchzip }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = \"octant\"; version = \"${VER}\";
|
||||
src = fetchzip { url = \"$URL\"; };
|
||||
}
|
||||
"
|
||||
}
|
||||
|
||||
replace_sha() {
|
||||
sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV"
|
||||
}
|
||||
|
||||
OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//')
|
||||
|
||||
OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit")
|
||||
OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64")
|
||||
OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit")
|
||||
|
||||
sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV"
|
||||
|
||||
replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256"
|
||||
replace_sha "x86_64-darwin" "$OCTANT_LINUX_AARCH64_SHA256"
|
||||
replace_sha "aarch64-linux" "$OCTANT_DARWIN_X64_SHA256"
|
||||
|
|
@ -15,6 +15,8 @@ buildGoModule rec {
|
|||
|
||||
subPackages = [ "." ];
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Synchronize your DNS to multiple providers from a simple DSL";
|
||||
homepage = "https://stackexchange.github.io/dnscontrol/";
|
||||
|
|
|
|||
|
|
@ -1,27 +1,40 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config, python3, sphinx
|
||||
, acl, curl, fuse, libselinux, udev, xz, zstd
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, sphinx
|
||||
, acl
|
||||
, curl
|
||||
, fuse
|
||||
, libselinux
|
||||
, udev
|
||||
, xz
|
||||
, zstd
|
||||
, fuseSupport ? true
|
||||
, selinuxSupport ? true
|
||||
, udevSupport ? true
|
||||
, glibcLocales, rsync
|
||||
, glibcLocales
|
||||
, rsync
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "casync";
|
||||
version = "2-219-ga8f6c84";
|
||||
version = "2-226-gbd8898e";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "systemd";
|
||||
repo = "casync";
|
||||
rev = "a8f6c841ccfe59ca8c68aad64df170b64042dce8";
|
||||
sha256 = "1i3c9wmpabpmx2wfbcyabmwfa66vz92iq5dlbm89v5mvgavz7bws";
|
||||
owner = "systemd";
|
||||
repo = "casync";
|
||||
rev = "bd8898ed92685e12022dd33a04c87786b5262344";
|
||||
sha256 = "04ibglizjzyd7ih13q6m7ic78n0mzw9nfmb3zd1fcm9j62qlq11i";
|
||||
};
|
||||
|
||||
buildInputs = [ acl curl xz zstd ]
|
||||
++ lib.optionals (fuseSupport) [ fuse ]
|
||||
++ lib.optionals (selinuxSupport) [ libselinux ]
|
||||
++ lib.optionals (udevSupport) [ udev ];
|
||||
++ lib.optionals (fuseSupport) [ fuse ]
|
||||
++ lib.optionals (selinuxSupport) [ libselinux ]
|
||||
++ lib.optionals (udevSupport) [ udev ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ];
|
||||
checkInputs = [ glibcLocales rsync ];
|
||||
|
||||
|
|
@ -34,8 +47,8 @@ stdenv.mkDerivation {
|
|||
|
||||
PKG_CONFIG_UDEV_UDEVDIR = "lib/udev";
|
||||
mesonFlags = lib.optionals (!fuseSupport) [ "-Dfuse=false" ]
|
||||
++ lib.optionals (!udevSupport) [ "-Dudev=false" ]
|
||||
++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ];
|
||||
++ lib.optionals (!udevSupport) [ "-Dudev=false" ]
|
||||
++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
|
|
@ -44,9 +57,9 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Content-Addressable Data Synchronizer";
|
||||
homepage = "https://github.com/systemd/casync";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://github.com/systemd/casync";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
{ lib
|
||||
, python3Packages
|
||||
, wrapGAppsHook
|
||||
, xvfb_run
|
||||
, gtk3
|
||||
, gobject-introspection
|
||||
, libcanberra-gtk3
|
||||
, dbus
|
||||
, poppler_gi
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "terminator";
|
||||
version = "1.92";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnome-terminator";
|
||||
repo = "terminator";
|
||||
rev = "v${version}";
|
||||
sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh";
|
||||
sha256 = "sha256-Rd5XieB7K2BkSzrAr6Kmoa30xuwvsGKpPrsG2wrU1o8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
intltool
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
python3.pkgs.pytestrunner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -47,19 +48,13 @@ python3.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs run_tests tests po
|
||||
patchShebangs tests po
|
||||
# dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains.
|
||||
# The wrapped terminator has the correct path added, so ignore this.
|
||||
substituteInPlace setup.py --replace "'dbus-python'," ""
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
./run_tests
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal emulator with support for tiling and tabs";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,24 @@
|
|||
{ lib, stdenv, fetchzip, vim, makeWrapper }:
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, unixtools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microscheme";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}-src";
|
||||
url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz";
|
||||
sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryansuchocki";
|
||||
repo = "microscheme";
|
||||
rev = "v${version}";
|
||||
sha256 = "5qTWsBCfj5DCZ3f9W1bdo6WAc1DZqVxg8D7pwC95duQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper vim ];
|
||||
|
||||
installPhase = ''
|
||||
make install PREFIX=$out
|
||||
postPatch = ''
|
||||
substituteInPlace makefile --replace gcc ${stdenv.cc.targetPrefix}cc
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unixtools.xxd ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://microscheme.org";
|
||||
description = "A Scheme subset for Atmel microcontrollers";
|
||||
|
|
@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
microcontrollers, especially as found on Arduino boards.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ardumont ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ stdenv.mkDerivation {
|
|||
|
||||
makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ];
|
||||
|
||||
# CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux.
|
||||
cmakeFlags = lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $bin/bin $out/include $out/lib
|
||||
|
||||
|
|
|
|||
40
pkgs/development/libraries/libhsts/default.nix
Normal file
40
pkgs/development/libraries/libhsts/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib, stdenv, fetchFromGitLab, fetchurl, autoconf-archive, autoreconfHook, pkg-config, python3 }:
|
||||
let
|
||||
chromium_version = "90.0.4417.1";
|
||||
|
||||
hsts_list = fetchurl {
|
||||
url = "https://raw.github.com/chromium/chromium/${chromium_version}/net/http/transport_security_state_static.json";
|
||||
sha256 = "09f24n30x5dmqk8zk7k2glcilgr27832a3304wj1yp97158sqsfx";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libhsts";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "rockdaboot";
|
||||
repo = pname;
|
||||
rev = "libhsts-${version}";
|
||||
sha256 = "0gbchzf0f4xzb6zjc56dk74hqrmdgyirmgxvvsqp9vqn9wb5kkx4";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
pushd tests
|
||||
cp ${hsts_list} transport_security_state_static.json
|
||||
sed 's/^ *\/\/.*$//g' transport_security_state_static.json >hsts.json
|
||||
popd
|
||||
patchShebangs src/hsts-make-dafsa
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config python3 ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to easily check a domain against the Chromium HSTS Preload list";
|
||||
homepage = "https://gitlab.com/rockdaboot/libhsts";
|
||||
license = with licenses; [ mit bsd3 ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
13
pkgs/development/libraries/libhsts/update.sh
Executable file
13
pkgs/development/libraries/libhsts/update.sh
Executable file
|
|
@ -0,0 +1,13 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq
|
||||
|
||||
set -euo pipefail -x
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
chromium_version=$(curl -s "https://api.github.com/repos/chromium/chromium/tags" | jq -r 'map(select(.prerelease | not)) | .[1].name')
|
||||
sha256=$(nix-prefetch-url "https://raw.github.com/chromium/chromium/$chromium_version/net/http/transport_security_state_static.json")
|
||||
|
||||
sed -e "0,/chromium_version/s/chromium_version = \".*\"/chromium_version = \"$chromium_version\"/" \
|
||||
-e "0,/sha256/s/sha256 = \".*\"/sha256 = \"$sha256\"/" \
|
||||
--in-place ./default.nix
|
||||
|
|
@ -13,6 +13,12 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "0p0hpjajfkskhd7jiv5zwhfa8hi49q3mgifjlkqvy99xspv98ijj";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace blas/Makefile \
|
||||
--replace "ar rcv" "${stdenv.cc.targetPrefix}ar rcv" \
|
||||
--replace "ranlib" "${stdenv.cc.targetPrefix}ranlib"
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osm-gps-map";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz";
|
||||
sha256 = "0fal3mqcf3yypir4f7njz0dm5wr7lqwpimjx28wz9imh48cqx9n9";
|
||||
sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
|
||||
preConfigure() {
|
||||
|
||||
# Patch some of the configure files a bit to get of global paths.
|
||||
# (Buildings using stuff in those paths will fail anyway, but it
|
||||
# will cause ./configure misdetections).
|
||||
for i in config.tests/unix/checkavail config.tests/*/*.test mkspecs/*/qmake.conf; do
|
||||
echo "patching $i..."
|
||||
substituteInPlace "$i" \
|
||||
--replace " /lib" " /FOO" \
|
||||
--replace "/usr" "/FOO"
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
# !!! TODO: -system-libmng
|
||||
configureFlags="-prefix $out $configureFlags"
|
||||
dontAddPrefix=1
|
||||
|
||||
configureScript=configureScript
|
||||
configureScript() {
|
||||
echo yes | ./configure $configureFlags
|
||||
export LD_LIBRARY_PATH=$(pwd)/lib
|
||||
}
|
||||
|
||||
|
||||
postInstall() {
|
||||
# Qt's `make install' is broken; it copies ./bin/qmake, which
|
||||
# is a symlink to ./qmake/qmake. So we end up with a dangling
|
||||
# symlink.
|
||||
rm $out/bin/qmake
|
||||
cp -p qmake/qmake $out/bin
|
||||
}
|
||||
|
||||
|
||||
genericBuild
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, xftSupport ? true, libXft ? null
|
||||
, xrenderSupport ? true, libXrender ? null
|
||||
, xrandrSupport ? true, libXrandr ? null
|
||||
, xineramaSupport ? true, libXinerama ? null
|
||||
, cursorSupport ? true, libXcursor ? null
|
||||
, threadSupport ? true
|
||||
, mysqlSupport ? false, libmysqlclient ? null
|
||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, libGL ? null, libGLU ? null, libXmu ? null
|
||||
, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
|
||||
}:
|
||||
|
||||
assert xftSupport -> libXft != null;
|
||||
assert xrenderSupport -> xftSupport && libXrender != null;
|
||||
assert xrandrSupport -> libXrandr != null;
|
||||
assert cursorSupport -> libXcursor != null;
|
||||
assert mysqlSupport -> libmysqlclient != null;
|
||||
assert openglSupport -> libGL != null && libGLU != null && libXmu != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "qt-3.3.8";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2";
|
||||
sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ];
|
||||
propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = let
|
||||
mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}";
|
||||
in [
|
||||
"-v"
|
||||
"-system-zlib" "-system-libpng" "-system-libjpeg"
|
||||
"-qt-gif"
|
||||
"-I${xorgproto}/include"
|
||||
(mk threadSupport "thread")
|
||||
(mk xrenderSupport "xrender")
|
||||
(mk xrandrSupport "xrandr")
|
||||
(mk xineramaSupport "xinerama")
|
||||
(mk xrandrSupport "xrandr")
|
||||
(mk xftSupport "xft")
|
||||
] ++ lib.optionals openglSupport [
|
||||
"-dlopen-opengl"
|
||||
"-L${libGL}/lib" "-I${libGLU}/include"
|
||||
"-L${libXmu.out}/lib" "-I${libXmu.dev}/include"
|
||||
] ++ lib.optionals xrenderSupport [
|
||||
"-L${libXrender.out}/lib" "-I${libXrender.dev}/include"
|
||||
] ++ lib.optionals xrandrSupport [
|
||||
"-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include"
|
||||
] ++ lib.optionals xineramaSupport [
|
||||
"-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include"
|
||||
] ++ lib.optionals cursorSupport [
|
||||
"-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
|
||||
] ++ lib.optionals mysqlSupport [
|
||||
"-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql"
|
||||
] ++ lib.optionals xftSupport [
|
||||
"-L${libXft.out}/lib" "-I${libXft.dev}/include"
|
||||
"-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
|
||||
"-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Don't strip everything so we can get useful backtraces.
|
||||
./strip.patch
|
||||
|
||||
# Build on NixOS.
|
||||
./qt-pwd.patch
|
||||
|
||||
# randr.h and Xrandr.h need not be in the same prefix.
|
||||
./xrandr.patch
|
||||
|
||||
# Make it build with gcc 4.6.0
|
||||
./qt3-gcc4.6.0.patch
|
||||
];
|
||||
|
||||
passthru = {inherit mysqlSupport;};
|
||||
|
||||
meta = with lib; {
|
||||
license = with licenses; [ gpl2 qpl ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
diff -ruN qt-x11-free-3.3.3/configure qt-x11-free-3.3.3.new/configure
|
||||
--- qt-x11-free-3.3.3/configure 2004-06-14 11:18:55.000000000 +0200
|
||||
+++ qt-x11-free-3.3.3.new/configure 2005-11-12 19:39:43.000000000 +0100
|
||||
@@ -16,9 +16,9 @@
|
||||
relconf=`basename $0`
|
||||
# the directory of this script is the "source tree"
|
||||
relpath=`dirname $0`
|
||||
-relpath=`(cd $relpath; /bin/pwd)`
|
||||
+relpath=`(cd $relpath; pwd)`
|
||||
# the current directory is the "build tree" or "object tree"
|
||||
-outpath=`/bin/pwd`
|
||||
+outpath=`pwd`
|
||||
|
||||
# later cache the command line in config.status
|
||||
OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
I picked it here:
|
||||
https://bugs.archlinux.org/task/23915
|
||||
|
||||
--- qt-x11-free-3.3.8b/src/tools/qmap.h~ 2008-01-15 19:09:13.000000000 +0000
|
||||
+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-04-11 00:16:04.000000000 +0100
|
||||
@@ -50,6 +50,7 @@
|
||||
#endif // QT_H
|
||||
|
||||
#ifndef QT_NO_STL
|
||||
+#include <cstddef>
|
||||
#include <iterator>
|
||||
#include <map>
|
||||
#endif
|
||||
--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h~ 2008-01-15 19:09:13.000000000 +0000
|
||||
+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-04-11 00:16:49.000000000 +0100
|
||||
@@ -48,6 +48,7 @@
|
||||
#endif // QT_H
|
||||
|
||||
#ifndef QT_NO_STL
|
||||
+#include <cstddef>
|
||||
#include <iterator>
|
||||
#include <list>
|
||||
#endif
|
||||
|
|
@ -1 +0,0 @@
|
|||
export QTDIR=@out@
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
diff -rc qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf
|
||||
*** qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf 2004-08-05 16:42:57.000000000 +0200
|
||||
--- qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf 2005-03-02 12:25:55.000000000 +0100
|
||||
***************
|
||||
*** 85,90 ****
|
||||
QMAKE_DEL_FILE = rm -f
|
||||
QMAKE_DEL_DIR = rmdir
|
||||
QMAKE_STRIP = strip
|
||||
! QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
||||
QMAKE_CHK_DIR_EXISTS = test -d
|
||||
QMAKE_MKDIR = mkdir -p
|
||||
--- 85,90 ----
|
||||
QMAKE_DEL_FILE = rm -f
|
||||
QMAKE_DEL_DIR = rmdir
|
||||
QMAKE_STRIP = strip
|
||||
! QMAKE_STRIPFLAGS_LIB += --strip-debug
|
||||
QMAKE_CHK_DIR_EXISTS = test -d
|
||||
QMAKE_MKDIR = mkdir -p
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
diff -rc qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test qt-x11-free-3.3.6/config.tests/x11/xrandr.test
|
||||
*** qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test 2006-09-14 14:00:08.000000000 +0200
|
||||
--- qt-x11-free-3.3.6/config.tests/x11/xrandr.test 2006-09-14 14:10:39.000000000 +0200
|
||||
***************
|
||||
*** 52,69 ****
|
||||
INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include"
|
||||
F=
|
||||
for INCDIR in $INCDIRS; do
|
||||
! if [ -f $INCDIR/$INC -a -f $INCDIR/$INC2 ]; then
|
||||
F=yes
|
||||
! XRANDR_H=$INCDIR/$INC
|
||||
RANDR_H=$INCDIR/$INC2
|
||||
! [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [ -z "$F" ]
|
||||
then
|
||||
XRANDR=no
|
||||
! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS"
|
||||
fi
|
||||
fi
|
||||
|
||||
--- 52,69 ----
|
||||
INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include"
|
||||
F=
|
||||
for INCDIR in $INCDIRS; do
|
||||
! if [ -f $INCDIR/$INC2 ]; then
|
||||
F=yes
|
||||
! # XRANDR_H=$INCDIR/$INC
|
||||
RANDR_H=$INCDIR/$INC2
|
||||
! [ "$VERBOSE" = "yes" ] && echo " Found $INC2 in $INCDIR"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [ -z "$F" ]
|
||||
then
|
||||
XRANDR=no
|
||||
! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC2 anywhere in $INCDIRS"
|
||||
fi
|
||||
fi
|
||||
|
||||
28
pkgs/development/ocaml-modules/sha/default.nix
Normal file
28
pkgs/development/ocaml-modules/sha/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, buildDunePackage
|
||||
, ounit
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "sha";
|
||||
version = "1.13";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "00z2s4fsv9i1h09rj5dy3nd9hhcn79b75sn2ljj5wihlf4y4g304";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Binding for SHA interface code in OCaml";
|
||||
maintainers = [ maintainers.arthurteisseire ];
|
||||
homepage = "https://github.com/djs55/ocaml-${pname}";
|
||||
license = licenses.isc;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -8,8 +8,9 @@ let
|
|||
doCheck = true;
|
||||
in
|
||||
|
||||
assert lib.assertMsg (lib.versionAtLeast ocaml.version minimumOCamlVersion)
|
||||
"${pname} needs at least OCaml ${minimumOCamlVersion}";
|
||||
if !(lib.versionAtLeast ocaml.version minimumOCamlVersion)
|
||||
then builtins.throw "${pname} needs at least OCaml ${minimumOCamlVersion}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,14 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
, flit
|
||||
, lxml, httpx
|
||||
, pytest, pytestcov, pytest-asyncio, pytest-mock, aresponses
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, flit
|
||||
, async-timeout
|
||||
, lxml
|
||||
, httpx
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pytest-httpx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -23,24 +29,18 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
httpx
|
||||
lxml
|
||||
];
|
||||
|
||||
# requires pytest-httpx
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "RMVtransport" ];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestcov
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
# pytest-httpx is missing
|
||||
aresponses
|
||||
pytest-httpx
|
||||
];
|
||||
checkPhase = ''
|
||||
pytest --cov=RMVtransport tests
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cgtobi/PyRMVtransport";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, pygments
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pytestcov
|
||||
, uvloop
|
||||
}:
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
pytestcov
|
||||
uvloop
|
||||
];
|
||||
|
|
@ -37,9 +37,7 @@ buildPythonPackage rec {
|
|||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
pythonImportsCheck = [ "aiorun" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Boilerplate for asyncio applications";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, isPy3k, fetchPypi, fetchpatch, buildPythonPackage
|
||||
{ lib, isPy3k, fetchPypi, buildPythonPackage
|
||||
, uvloop, postgresql }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -16,6 +16,8 @@ buildPythonPackage rec {
|
|||
postgresql
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "asyncpg" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/MagicStack/asyncpg";
|
||||
description = "An asyncio PosgtreSQL driver";
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ buildPythonPackage rec {
|
|||
checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ];
|
||||
propagatedBuildInputs = [ botocore lxml requests requests-kerberos click configparser fido2 ];
|
||||
|
||||
pythonImportsCheck = [ "aws_adfs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tool to ease aws cli authentication against ADFS";
|
||||
homepage = "https://github.com/venth/aws-adfs";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
|
||||
python, twisted, jinja2, zope_interface, future, sqlalchemy,
|
||||
python, twisted, jinja2, zope_interface, sqlalchemy,
|
||||
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
|
||||
txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial,
|
||||
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ buildPythonApplication rec {
|
|||
export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell"
|
||||
'';
|
||||
|
||||
# tries to run not rully installed script
|
||||
# tries to run not fully installed script
|
||||
disabledTests = [ "test_command" ];
|
||||
|
||||
pythonImportsCheck = [ "codespell_lib" ];
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ buildPythonPackage rec {
|
|||
|
||||
# tests not packaged with pypi release
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "cornice" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mozilla-services/cornice";
|
||||
|
|
@ -27,5 +28,4 @@ buildPythonPackage rec {
|
|||
license = licenses.mpl20;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ buildPythonPackage rec {
|
|||
|
||||
# There are no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "easywatch" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dead-simple way to watch a directory";
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [ mock pyfakefs ];
|
||||
|
||||
pythonImportsCheck = [ "fido2" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides library functionality for FIDO 2.0, including communication with a device over USB.";
|
||||
homepage = "https://github.com/Yubico/python-fido2";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ buildPythonPackage, fetchPypi, lib, requests, pytestCheckHook, mock }:
|
||||
{ buildPythonPackage, fetchPypi, pythonAtLeast, lib, requests, pytestCheckHook, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-i18n-address";
|
||||
version = "2.4.0";
|
||||
disabled = pythonAtLeast "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
@ -15,7 +16,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Google's i18n address data packaged for Python";
|
||||
homepage = "https://pypi.org/project/google-i18n-address/";
|
||||
homepage = "https://github.com/mirumee/google-i18n-address";
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hstspreload";
|
||||
version = "2020.12.22";
|
||||
version = "2021.2.1";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sethmlarson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1jzcw4clmpbyw67pzskms5rq5b7285iwh42jzc4ly6jz9amggdzc";
|
||||
sha256 = "sha256-R6tqGxGd6JymFgQX+deDPOtlKlwUjL7uf+zGdNxUW/s=";
|
||||
};
|
||||
|
||||
# tests require network connection
|
||||
|
|
@ -25,6 +25,6 @@ buildPythonPackage rec {
|
|||
description = "Chromium HSTS Preload list as a Python package and updated daily";
|
||||
homepage = "https://github.com/sethmlarson/hstspreload";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchPypi
|
||||
, pytest, pytestcov, watchdog, mock
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, watchdog
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -11,11 +16,14 @@ buildPythonPackage rec {
|
|||
sha256 = "3818f53dabc24da66f65cf4878c1c7a9b5df0c46b813e014abdd7c569eb9a02a";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
# FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent
|
||||
# segfaults in the testsuite that end up failing the tests in a background thread (in myapp)
|
||||
checkInputs = [ pytest pytestcov mock ] ++ lib.optional (!stdenv.isDarwin) watchdog;
|
||||
checkInputs = [ pytestCheckHook pytest-cov ] ++ lib.optional (!stdenv.isDarwin) watchdog;
|
||||
|
||||
meta = with lib; {
|
||||
description = "in-process file monitor / reloader for reloading your code automatically during development";
|
||||
homepage = "https://github.com/Pylons/hupper";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ buildPythonPackage rec {
|
|||
"_generator"
|
||||
"show_versions"
|
||||
"test_make_imbalanced_iris"
|
||||
"test_rusboost[SAMME.R]"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -64,14 +64,17 @@ buildPythonPackage rec {
|
|||
PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
# disable tests which touch network
|
||||
disabledTests = ''
|
||||
disabledTests = [
|
||||
# disable tests which touch network
|
||||
"test_discover"
|
||||
"test_filtered_compressed_cache"
|
||||
"test_get_dir"
|
||||
"test_remote_cat"
|
||||
"http"
|
||||
'';
|
||||
|
||||
# broken test
|
||||
"test_read_pattern_with"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Data load and catalog system";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
From 75baa1751973378cb96fb204b0a18a74e5caa2d1 Mon Sep 17 00:00:00 2001
|
||||
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
|
||||
Date: Wed, 17 Feb 2021 14:03:20 +0100
|
||||
Subject: [PATCH] serialdriver: remove pyserial version check
|
||||
|
||||
This check isn't required on NixOS, since pyserial within NixOS already
|
||||
contains the patches.
|
||||
|
||||
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
|
||||
---
|
||||
labgrid/driver/serialdriver.py | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/labgrid/driver/serialdriver.py b/labgrid/driver/serialdriver.py
|
||||
index 126f674e..59a92269 100644
|
||||
--- a/labgrid/driver/serialdriver.py
|
||||
+++ b/labgrid/driver/serialdriver.py
|
||||
@@ -27,12 +27,6 @@ class SerialDriver(ConsoleExpectMixin, Driver, ConsoleProtocol):
|
||||
bindings = {"port": "SerialPort", }
|
||||
else:
|
||||
bindings = {"port": {"SerialPort", "NetworkSerialPort"}, }
|
||||
- if version.parse(serial.__version__) != version.Version('3.4.0.1'):
|
||||
- message = ("The installed pyserial version does not contain important RFC2217 fixes.\n"
|
||||
- "You can install the labgrid fork via:\n"
|
||||
- "pip uninstall pyserial\n"
|
||||
- "pip install https://github.com/labgrid-project/pyserial/archive/v3.4.0.1.zip#egg=pyserial\n") # pylint: disable=line-too-long
|
||||
- warnings.warn(message)
|
||||
|
||||
txdelay = attr.ib(default=0.0, validator=attr.validators.instance_of(float))
|
||||
timeout = attr.ib(default=3.0, validator=attr.validators.instance_of(float))
|
||||
--
|
||||
2.30.0
|
||||
|
||||
78
pkgs/development/python-modules/labgrid/default.nix
Normal file
78
pkgs/development/python-modules/labgrid/default.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{ ansicolors
|
||||
, attrs
|
||||
, autobahn
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, jinja2
|
||||
, lib
|
||||
, mock
|
||||
, pexpect
|
||||
, psutil
|
||||
, pyserial
|
||||
, pytestCheckHook
|
||||
, pytest-dependency
|
||||
, pytest-mock
|
||||
, pyudev
|
||||
, pyusb
|
||||
, pyyaml
|
||||
, requests
|
||||
, setuptools-scm
|
||||
, xmodem
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "labgrid";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labgrid-project";
|
||||
repo = "labgrid";
|
||||
rev = "v${version}";
|
||||
sha256 = "15298prs2f4wiyn8lf475qicp3y22lcjdcpwp2fmrya642vnr6w5";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-serialdriver-remove-pyserial-version-check.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ansicolors
|
||||
attrs
|
||||
autobahn
|
||||
jinja2
|
||||
pexpect
|
||||
pyserial
|
||||
pyudev
|
||||
pyusb
|
||||
pyyaml
|
||||
requests
|
||||
xmodem
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
psutil
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
pytest-dependency
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"docker"
|
||||
"sshmanager"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Embedded control & testing library";
|
||||
homepage = "https://labgrid.org";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ emantor ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
, flask
|
||||
, pyopenssl
|
||||
, ndg-httpsclient
|
||||
, pytest
|
||||
, pytestcov
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, pytest-mock
|
||||
, pytest-pylint
|
||||
, pytest-click
|
||||
|
|
@ -39,13 +39,9 @@ buildPythonPackage rec {
|
|||
] ++ lib.optionals isPy27 [ functools32 ];
|
||||
|
||||
checkInputs = [
|
||||
pytest pytestcov pytest-mock pytest-pylint pytest-click
|
||||
pytestCheckHook pytest-cov pytest-mock pytest-pylint pytest-click
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
|
||||
# many errors -- tests assume inside of git repo, linting errors 13/317 fail
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -45,5 +45,7 @@ buildPythonPackage rec {
|
|||
license= licenses.bsd3;
|
||||
maintainers = with maintainers; [ evax ];
|
||||
platforms = platforms.unix;
|
||||
# incompatible with nixpkgs scikitlearn version
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
# Test Inputs
|
||||
, glibcLocales
|
||||
, hypothesis
|
||||
, moto
|
||||
, pytestCheckHook
|
||||
# Darwin inputs
|
||||
, runtimeShell
|
||||
|
|
@ -54,7 +53,7 @@ buildPythonPackage rec {
|
|||
xlwt
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook glibcLocales moto hypothesis ];
|
||||
checkInputs = [ pytestCheckHook glibcLocales hypothesis ];
|
||||
|
||||
# doesn't work with -Werror,-Wunused-command-line-argument
|
||||
# https://github.com/NixOS/nixpkgs/issues/39687
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@ buildPythonPackage rec {
|
|||
substituteInPlace pyfakefs/tests/fake_os_test.py \
|
||||
--replace "test_path_links_not_resolved" "notest_path_links_not_resolved" \
|
||||
--replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows"
|
||||
substituteInPlace pyfakefs/tests/fake_filesystem_unittest_test.py \
|
||||
--replace "test_copy_real_file" "notest_copy_real_file"
|
||||
'' + (lib.optionalString stdenv.isDarwin ''
|
||||
# this test fails on darwin due to case-insensitive file system
|
||||
substituteInPlace pyfakefs/tests/fake_os_test.py \
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylint";
|
||||
version = "2.6.0";
|
||||
version = "2.6.2";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210";
|
||||
sha256 = "sha256-cYt0eG6n7QeqDFi/VyFU1Geflg0m6WQcwd4gSjC4f8k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose
|
||||
{ lib, buildPythonPackage, fetchPypi, six, chardet, nose
|
||||
, django, jinja2, tornado, pyramid, pyramid_mako, Mako }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
|
|||
|
|
@ -33,6 +33,8 @@ buildPythonPackage rec {
|
|||
# https://github.com/Pylons/pyramid/issues/1899
|
||||
doCheck = !isPy35;
|
||||
|
||||
pythonImportsCheck = [ "pyramid" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Pyramid Web Framework, a Pylons project";
|
||||
homepage = "https://trypyramid.com/";
|
||||
|
|
|
|||
|
|
@ -19,6 +19,10 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [ beaker pyramid ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Beaker session factory backend for Pyramid";
|
||||
homepage = "https://docs.pylonsproject.org/projects/pyramid_beaker/en/latest/";
|
||||
# idk, see https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt
|
||||
# license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,11 +23,12 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ chameleon pyramid zope_interface setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "pyramid_chameleon" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Chameleon template compiler for pyramid";
|
||||
homepage = "https://github.com/Pylons/pyramid_chameleon";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ pyramid ];
|
||||
|
||||
pythonImportsCheck = [ "pyramid_exclog" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A package which logs to a Python logger when an exception is raised by a Pyramid application";
|
||||
homepage = "https://docs.pylonsproject.org/";
|
||||
|
|
|
|||
|
|
@ -21,10 +21,12 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [ pyramid hawkauthlib tokenlib ];
|
||||
buildInputs = [ webtest ];
|
||||
|
||||
pythonImportsCheck = [ "pyramid_hawkauth" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mozilla-services/pyramid_hawkauth";
|
||||
description = "A Pyramid authentication plugin for HAWK";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,11 +18,12 @@ buildPythonPackage rec {
|
|||
buildInputs = [ webtest ];
|
||||
propagatedBuildInputs = [ jinja2 pyramid ];
|
||||
|
||||
pythonImportsCheck = [ "pyramid_jinja2" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Jinja2 template bindings for the Pyramid web framework";
|
||||
homepage = "https://github.com/Pylons/pyramid_jinja2";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/Pylons/pyramid_mako";
|
||||
description = "Mako template bindings for the Pyramid web framework";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,6 @@ buildPythonPackage rec {
|
|||
description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies";
|
||||
homepage = "https://github.com/mozilla-services/pyramid_multiauth";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
From c8b35f4b871d00e3020f525425517548bed9f6ad Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
|
||||
Date: Sun, 9 Sep 2018 20:13:27 +0200
|
||||
Subject: [PATCH] serial/rfc2217: only subnegotiate on value change
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This was suggested and is a direct copy of Uwe Kleine König's patch
|
||||
from [1].
|
||||
|
||||
[1]: https://github.com/pyserial/pyserial/issues/376#issuecomment-418885211
|
||||
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
|
||||
---
|
||||
serial/rfc2217.py | 14 +++++++++-----
|
||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/serial/rfc2217.py b/serial/rfc2217.py
|
||||
index d962c1e8..2148512d 100644
|
||||
--- a/serial/rfc2217.py
|
||||
+++ b/serial/rfc2217.py
|
||||
@@ -330,11 +330,15 @@ def set(self, value):
|
||||
the client needs to know if the change is performed he has to check the
|
||||
state of this object.
|
||||
"""
|
||||
- self.value = value
|
||||
- self.state = REQUESTED
|
||||
- self.connection.rfc2217_send_subnegotiation(self.option, self.value)
|
||||
- if self.connection.logger:
|
||||
- self.connection.logger.debug("SB Requesting {} -> {!r}".format(self.name, self.value))
|
||||
+ if value != self.value:
|
||||
+ self.value = value
|
||||
+ self.state = REQUESTED
|
||||
+ self.connection.rfc2217_send_subnegotiation(self.option, self.value)
|
||||
+ if self.connection.logger:
|
||||
+ self.connection.logger.debug("SB Requesting {} -> {!r}".format(self.name, self.value))
|
||||
+ else:
|
||||
+ if self.connection.logger:
|
||||
+ self.connection.logger.debug("SB Requesting {} -> {!r} (skipped)".format(self.name, self.value))
|
||||
|
||||
def is_ready(self):
|
||||
"""\
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From a3698dc952fce0d07628133e987b7b43ed6e1157 Mon Sep 17 00:00:00 2001
|
||||
From: Rouven Czerwinski <rouven@czerwinskis.de>
|
||||
Date: Sun, 9 Sep 2018 20:08:40 +0200
|
||||
Subject: [PATCH] serial/rfc2217: add timeout.setter for rfc2217
|
||||
|
||||
Add a new setter method for the timeout property which does not invoke
|
||||
the port reconfiguration.
|
||||
This is a direct copy of the SerialBase timeout property without the port
|
||||
reconfiguration.
|
||||
|
||||
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
|
||||
---
|
||||
serial/rfc2217.py | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/serial/rfc2217.py b/serial/rfc2217.py
|
||||
index d962c1e8..12615cf3 100644
|
||||
--- a/serial/rfc2217.py
|
||||
+++ b/serial/rfc2217.py
|
||||
@@ -722,5 +722,22 @@ def cd(self):
|
||||
raise portNotOpenError
|
||||
return bool(self.get_modem_state() & MODEMSTATE_MASK_CD)
|
||||
|
||||
+ @property
|
||||
+ def timeout(self):
|
||||
+ """Get the current timeout setting."""
|
||||
+ return self._timeout
|
||||
+
|
||||
+ @timeout.setter
|
||||
+ def timeout(self, timeout):
|
||||
+ """Change timeout setting."""
|
||||
+ if timeout is not None:
|
||||
+ try:
|
||||
+ timeout + 1 # test if it's a number, will throw a TypeError if not...
|
||||
+ except TypeError:
|
||||
+ raise ValueError("Not a valid timeout: {!r}".format(timeout))
|
||||
+ if timeout < 0:
|
||||
+ raise ValueError("Not a valid timeout: {!r}".format(timeout))
|
||||
+ self._timeout = timeout
|
||||
+
|
||||
# - - - platform specific - - -
|
||||
# None so far
|
||||
|
|
@ -9,6 +9,11 @@ buildPythonPackage rec {
|
|||
sha256 = "1nyd4m4mnrz8scbfqn4zpq8gnbl4x42w5zz62vcgpzqd2waf0xrw";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./001-rfc2217-only-negotiate-on-value-change.patch
|
||||
./002-rfc2217-timeout-setter-for-rfc2217.patch
|
||||
];
|
||||
|
||||
checkPhase = "python -m unittest discover -s test";
|
||||
doCheck = !stdenv.hostPlatform.isDarwin; # broken on darwin
|
||||
|
||||
|
|
|
|||
26
pkgs/development/python-modules/pytest-httpx/default.nix
Normal file
26
pkgs/development/python-modules/pytest-httpx/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, httpx, pytest }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-httpx";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "pytest_httpx";
|
||||
extension = "tar.gz";
|
||||
sha256 = "13ld6nnsc3f7i4zl4qm1jh358z0awr6xfk05azwgngmjb7jmcz0a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ httpx pytest ];
|
||||
|
||||
# not in pypi tarball
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pytest_httpx" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Send responses to httpx";
|
||||
homepage = "https://github.com/Colin-b/pytest_httpx";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -16,10 +16,11 @@ buildPythonPackage rec {
|
|||
sha256 = "06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pytest colorama docopt watchdog ];
|
||||
|
||||
# No Tests
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ pytest colorama docopt watchdog ];
|
||||
pythonImportsCheck = [ "pytest_watch" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/joeyespo/pytest-watch";
|
||||
|
|
@ -28,4 +29,3 @@ buildPythonPackage rec {
|
|||
maintainers = with maintainers; [ dmvianna ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkInputs = [ pytest six mock pyfakefs unittest2 ];
|
||||
checkInputs = [ pytest mock pyfakefs unittest2 ];
|
||||
|
||||
checkPhase = ''
|
||||
pytest pyu2f/tests
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, httpcore
|
||||
|
|
@ -8,7 +7,6 @@
|
|||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, trio
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
|
|||
|
|
@ -41,5 +41,7 @@ buildPythonPackage rec {
|
|||
changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
# TypeError: __init__() got an unexpected keyword argument 'iid'
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ buildPythonPackage rec {
|
|||
"test_turtle_launc"
|
||||
"test_umr_skip_cython"
|
||||
"test_umr_pathlist"
|
||||
"test_user_sitepackages_in_pathlist"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ buildPythonPackage rec {
|
|||
substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "spyder" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library providing a scientific python development environment";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/TileDB-Inc/TileDB-Py";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
# tiledb/core.cc:556:30: error: ‘struct std::array<long unsigned int, 2>’ has no member named ‘second’
|
||||
broken = true;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,6 @@ buildPythonPackage rec {
|
|||
description = "PyTorch vision library";
|
||||
homepage = "https://pytorch.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ericsagnes SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ ericsagnes ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,24 @@
|
|||
{ lib, fetchFromGitHub, buildPythonPackage, isPy27
|
||||
, awkward0, backports_lzma, cachetools, lz4, pandas
|
||||
, pytestCheckHook, pytestrunner, pkgconfig, mock
|
||||
, pytestCheckHook, pkgconfig, mock
|
||||
, numpy, requests, uproot3-methods, xxhash, zstandard
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uproot3";
|
||||
version = "3.14.2";
|
||||
version = "3.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-hep";
|
||||
repo = "uproot3";
|
||||
rev = version;
|
||||
sha256 = "sha256-6/e+qMgwyFUo8MRRTAaGp9WLPxE2fqMEK4paq26Epzc=";
|
||||
sha256 = "sha256-hVJpKdYvyoCPyqgZzKYp30SvkYm+HWSNBdd9bYCYACE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awkward0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ fetchFromGitHub
|
||||
, lib
|
||||
{ lib
|
||||
, python3
|
||||
, enableTelemetry ? false
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, wrapLisp
|
||||
, sbcl
|
||||
|
|
@ -7,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clpm";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.common-lisp.net/clpm/clpm";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0jivnnp3z148yf4c2nzzr5whz76w5kjhsb97z2vs5maiwf79y2if";
|
||||
sha256 = "04w46yhv31p4cfb84b6qvyfw7x5nx6lzyd4yzhd9x6qvb7p5kmfh";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -22,13 +23,21 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
ln -s ${openssl.out}/lib/libcrypto.so.* .
|
||||
ln -s ${openssl.out}/lib/libssl.so.* .
|
||||
common-lisp.sh --script scripts/build.lisp
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
INSTALL_ROOT=$out sh install.sh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# fixupPhase results in fatal error in SBCL, `Can't find sbcl.core`
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchgit }:
|
||||
{ lib, stdenv, fetchgit, python3 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "gnulib";
|
||||
|
|
@ -10,19 +10,26 @@ stdenv.mkDerivation {
|
|||
sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw";
|
||||
};
|
||||
|
||||
dontFixup = true;
|
||||
# no "make install", gnulib is a collection of source code
|
||||
postPatch = ''
|
||||
patchShebangs gnulib-tool.py
|
||||
'';
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out; mv * $out/
|
||||
ln -s $out/lib $out/include
|
||||
mkdir -p $out/bin
|
||||
cp -r * $out/
|
||||
ln -s $out/lib $out/include
|
||||
ln -s $out/gnulib-tool $out/bin/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# do not change headers to not update all vendored build files
|
||||
dontFixup = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/gnulib/";
|
||||
description = "Central location for code to be shared among GNU packages";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }:
|
||||
{ lib, stdenv, fetchFromGitHub, asciidoc, cmake, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "genkfs";
|
||||
|
|
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ asciidoc cmake ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ asciidoc libxslt.bin cmake ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake bison flex ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ bison cmake flex ];
|
||||
|
||||
buildInputs = [ boost ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kimg";
|
||||
|
|
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake asciidoc ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kpack";
|
||||
|
|
@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ asciidoc libxslt.bin docbook_xsl ];
|
||||
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkrom";
|
||||
|
|
@ -11,10 +11,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
cmake
|
||||
];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mktiupgrade";
|
||||
|
|
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ asciidoc cmake ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, asciidoc, libxslt }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake asciidoc docbook_xsl ];
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ libxslt ];
|
||||
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [ "-DSCAS_LIBRARY=1" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake knightos-scas ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ readline SDL2 ];
|
||||
buildInputs = [ readline SDL2 knightos-scas ];
|
||||
|
||||
cmakeFlags = [ "-Denable-sdl=YES" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
buildPhase = "${stdenv.shell} ${./helper.sh}";
|
||||
installPhase = ":"; # buildPhase does this.
|
||||
dontInstall = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ezquake";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ezQuake";
|
||||
repo = pname + "-source";
|
||||
rev = version;
|
||||
sha256 = "1rfp816gnp7jfd27cg1la5n1q6z2wgd9qljnlmnx7v2jixql8brf";
|
||||
sha256 = "sha256-EBhKmoX11JavTG6tPfg15FY2lqOFfzSDg3058OWfcYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -65,12 +65,12 @@ let
|
|||
|
||||
ale = buildVimPluginFrom2Nix {
|
||||
pname = "ale";
|
||||
version = "2021-02-11";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dense-analysis";
|
||||
repo = "ale";
|
||||
rev = "8cb9f5ef515f73eb3cf3188cc20ff57a51d9217b";
|
||||
sha256 = "1ml2j5l91n1zwp7zxdg2cny48bbj1gw0dfa223bf5iq472c1ggk2";
|
||||
rev = "88d052b5a9ee3a41364497e1b98f01305d01df35";
|
||||
sha256 = "05d4dv9sqvnz0cqiyzkiyv5i7vrdw0niipdv9plm1zkf5arpd2d4";
|
||||
};
|
||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||
};
|
||||
|
|
@ -257,12 +257,12 @@ let
|
|||
|
||||
barbar-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "barbar-nvim";
|
||||
version = "2021-01-16";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "romgrk";
|
||||
repo = "barbar.nvim";
|
||||
rev = "80860e972cdf78e0e0b8dc7f16e07142966f73cf";
|
||||
sha256 = "009gnamainla5z2q98p6mi4gifmlbx5im7d2gx2d0da62cbdrcsl";
|
||||
rev = "130b5bc9de263d89c003bf88190e29ac7ad53978";
|
||||
sha256 = "1ihc25yw53hnflqycl7brjc9xyhrp5ci641vjqh4j7naf60ffapb";
|
||||
};
|
||||
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
|
||||
};
|
||||
|
|
@ -389,12 +389,12 @@ let
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-02-12";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "e3e679e077708ee8a4de6bdcdf4135ac1f1ebd9c";
|
||||
sha256 = "0i7wznlvamybbrz0qjvynkzk6alcxa327nrlw95la6qbw67vkbsl";
|
||||
rev = "c93c385a7c3e43edca1fd9c4e24fbdfb860886cf";
|
||||
sha256 = "1jxmkskr6x1610jjswivvaqi8mqslq797z4bxyd1byqbrrcz3vvy";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -425,12 +425,12 @@ let
|
|||
|
||||
ci_dark = buildVimPluginFrom2Nix {
|
||||
pname = "ci_dark";
|
||||
version = "2021-01-31";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chuling";
|
||||
repo = "ci_dark";
|
||||
rev = "c7537d81a796b4559e03309aeec9cb8d6d7bda21";
|
||||
sha256 = "05p8viz5q7rknzyh7zp3k2qhl14nlamik5gvqy86bfgwmhbac350";
|
||||
rev = "a98f31d7ab86d4886d72f50064fb85d86c6843eb";
|
||||
sha256 = "0s2mgxyzhaj9hvdinkal608yrxyigm7al22cwif6f9ls7aik20zs";
|
||||
};
|
||||
meta.homepage = "https://github.com/chuling/ci_dark/";
|
||||
};
|
||||
|
|
@ -497,12 +497,12 @@ let
|
|||
|
||||
coc-fzf = buildVimPluginFrom2Nix {
|
||||
pname = "coc-fzf";
|
||||
version = "2020-12-29";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "antoinemadec";
|
||||
repo = "coc-fzf";
|
||||
rev = "a8b32b8b8a37d7fb87687c0187b7ad36987e2122";
|
||||
sha256 = "1x6xfizcix1hlcl2dhxbaxxl2q7lpgnfyvdg81c88rcn68qykfn0";
|
||||
rev = "a3272d19bce58f921ed9d112cc8128877307daac";
|
||||
sha256 = "1qg8awk5v6kfdb6livknx3y0v1ww3ashyn1pv1iwj3s0cms91mzr";
|
||||
};
|
||||
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
|
||||
};
|
||||
|
|
@ -618,12 +618,12 @@ let
|
|||
|
||||
compe-tabnine = buildVimPluginFrom2Nix {
|
||||
pname = "compe-tabnine";
|
||||
version = "2021-02-12";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tzachar";
|
||||
repo = "compe-tabnine";
|
||||
rev = "ea3e34dcbe09563c986bc60ec7d3c0db18ce9690";
|
||||
sha256 = "1gsi5ybkqxqv1q3yj2qdv5j2lhkwiabr3mrcj60ah5rb1qjvlmib";
|
||||
rev = "e16e1661574a8bd56e27c67aa6dffa91efdc76b2";
|
||||
sha256 = "1ydcws12xx4prqmhri9pld5j3lz08p15s1j97018fp3vs7aq2wky";
|
||||
};
|
||||
meta.homepage = "https://github.com/tzachar/compe-tabnine/";
|
||||
};
|
||||
|
|
@ -1547,12 +1547,12 @@ let
|
|||
|
||||
ghcid = buildVimPluginFrom2Nix {
|
||||
pname = "ghcid";
|
||||
version = "2021-02-06";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ndmitchell";
|
||||
repo = "ghcid";
|
||||
rev = "298c69898c11c2da574a6d2c32e195b0adc6f356";
|
||||
sha256 = "1999c3x2bpif0ppv1i452fcklgmjdxrvj510sy7dv8aym93vpmax";
|
||||
rev = "abbb157ac9d06fdfba537f97ab96e197b3bb36cb";
|
||||
sha256 = "008alqgqbrjh9sqgazqq1kk5hnpikd8afnia5lx9rv8c2am1d2fv";
|
||||
};
|
||||
meta.homepage = "https://github.com/ndmitchell/ghcid/";
|
||||
};
|
||||
|
|
@ -1571,12 +1571,12 @@ let
|
|||
|
||||
git-messenger-vim = buildVimPluginFrom2Nix {
|
||||
pname = "git-messenger-vim";
|
||||
version = "2021-02-11";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhysd";
|
||||
repo = "git-messenger.vim";
|
||||
rev = "ae0c39167c83507c6c257cd13268c98b8066cb50";
|
||||
sha256 = "1xggg0h7phjjdjpzp884z7xqniyk3ca4yjc86lyh9vhbww87xa9c";
|
||||
rev = "be97d5efca0326f826003d0ca3437e4c20a0ccb2";
|
||||
sha256 = "07ijvgh21nl39f948f5pdlw38ysk5dswximaczmgghngnzk2yqgs";
|
||||
};
|
||||
meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
|
||||
};
|
||||
|
|
@ -1595,12 +1595,12 @@ let
|
|||
|
||||
gitsigns-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "gitsigns-nvim";
|
||||
version = "2021-02-10";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "317750d66a572588eef9a23fefce4aff1cbcad94";
|
||||
sha256 = "0nc52f0hkb701scvnas6my9i92ys1i9c5y9h4h42yk00ph83k2k1";
|
||||
rev = "fb6327c80aa41490fb14df9f270fd68508460374";
|
||||
sha256 = "1sr63ch37fcjhdhxksx4mmxjbza8b4zaswvxrixr3qdnkq1bf5bl";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||
};
|
||||
|
|
@ -1679,12 +1679,12 @@ let
|
|||
|
||||
gruvbox-community = buildVimPluginFrom2Nix {
|
||||
pname = "gruvbox-community";
|
||||
version = "2021-01-17";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruvbox-community";
|
||||
repo = "gruvbox";
|
||||
rev = "c73e63203f76ab8e39b2b05369c0a8877a981435";
|
||||
sha256 = "0lwvv5chxq0fb9k1y73g5zr8v54xghlqnq64k0vx2v2ravp3313r";
|
||||
rev = "8b29832551088fd7ecc1241c2576c8cf89f0842c";
|
||||
sha256 = "0447iplif457yyd6d7xanvrrizfl9jlwim16i31vwnrlrb3s0r4x";
|
||||
};
|
||||
meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
|
||||
};
|
||||
|
|
@ -2136,12 +2136,12 @@ let
|
|||
|
||||
lf-vim = buildVimPluginFrom2Nix {
|
||||
pname = "lf-vim";
|
||||
version = "2021-02-12";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ptzz";
|
||||
repo = "lf.vim";
|
||||
rev = "3223bccf0ee4168aae6753a5cf0c0aa32a60c586";
|
||||
sha256 = "1qka3hqm2376wz5pbr8x2c3rqycv392lv34spkqayq0d0fs4sqq0";
|
||||
rev = "c80801760eeacb6fa9fa231408a8723d6a183262";
|
||||
sha256 = "1bs2f9j28hcd977x0dz40g9p33863l3riyp7qlwzllbas2w3k7bs";
|
||||
};
|
||||
meta.homepage = "https://github.com/ptzz/lf.vim/";
|
||||
};
|
||||
|
|
@ -2268,24 +2268,24 @@ let
|
|||
|
||||
lspsaga-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lspsaga-nvim";
|
||||
version = "2021-02-11";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "glepnir";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "284b357137c3c57ff3716e07c865477788ab8e6d";
|
||||
sha256 = "1n737lqnkgvyjxnmxfg6hmbnjgdx0qyrqql0fxb85m1n06gsm2n7";
|
||||
rev = "ee3b0e75811432d7e6f6e8cfbbd8799394cd315f";
|
||||
sha256 = "00fgcsf77csjyfjj82pyrbxb4v9k1mprp58zpascm6jibs74v6jc";
|
||||
};
|
||||
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
|
||||
};
|
||||
|
||||
lualine-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lualine-nvim";
|
||||
version = "2021-02-10";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoob3rt";
|
||||
repo = "lualine.nvim";
|
||||
rev = "8a4baa804b7b2906eb8b9c325546dceabffdfcfd";
|
||||
sha256 = "1fq5aa4yg5r1dr2g18xnywg7pyid6s9vzm71zy3anmdp4g24amgx";
|
||||
rev = "55c0f0fe9a01389df4671bd1bf9286f869a4d216";
|
||||
sha256 = "0f502gg56kzf811nzmjif3n5a73lpsf7l7jfbz2cmfp9ci3bg9z8";
|
||||
};
|
||||
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
|
||||
};
|
||||
|
|
@ -2808,12 +2808,12 @@ let
|
|||
|
||||
nerdtree = buildVimPluginFrom2Nix {
|
||||
pname = "nerdtree";
|
||||
version = "2021-02-11";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "preservim";
|
||||
repo = "nerdtree";
|
||||
rev = "3a9d533f3de86a43b69f6c47d3394c0d866fdb08";
|
||||
sha256 = "032hn7p7kgvrj0qg4gmpvl072zz4p9s5n8mrbs3k8c3lln1n9wh6";
|
||||
rev = "a1fa4a33bf16b6661e502080fc97788bb98afd35";
|
||||
sha256 = "1qi2jzrps2c2h8c91rxma445yj8knl41sb5yfg37wjnsbig6jcxl";
|
||||
};
|
||||
meta.homepage = "https://github.com/preservim/nerdtree/";
|
||||
};
|
||||
|
|
@ -2916,12 +2916,12 @@ let
|
|||
|
||||
nvim-compe = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-compe";
|
||||
version = "2021-02-11";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-compe";
|
||||
rev = "bef454eecc11fb13e5bc3f29f443f495904470ef";
|
||||
sha256 = "0plhhwip0nwc0fhgx5f1i6qhfl6msxf43vhgrv2xihmb30zjf2qr";
|
||||
rev = "fa13fecd577f90c4fa8a1bd539f405989a8df7f0";
|
||||
sha256 = "06vnavw203k76d7nsn08kp1g9xvl8aijmffy89jfgq3918dd6892";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
|
||||
};
|
||||
|
|
@ -2940,12 +2940,12 @@ let
|
|||
|
||||
nvim-dap = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap";
|
||||
version = "2021-02-07";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-dap";
|
||||
rev = "10a740b2364efc9acff78f4e7466902f153e584b";
|
||||
sha256 = "1w4dvdd9fmi8gmgdq4zkrhrwdii4k7ns782gv4abpkzss5v6s66h";
|
||||
rev = "273890967e76322f726405e6c6c79d4fc69ae068";
|
||||
sha256 = "0azk7n06kn2n4l0xdyvbhvmgzq0rp24dng7vlkairl0sm3bnb3x9";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
|
||||
};
|
||||
|
|
@ -3060,12 +3060,12 @@ let
|
|||
|
||||
nvim-peekup = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-peekup";
|
||||
version = "2021-02-11";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gennaro-tedesco";
|
||||
repo = "nvim-peekup";
|
||||
rev = "d4276b9601c683ad802893fed0cfe12a8631e931";
|
||||
sha256 = "06sazbjcnv77c11b835b7n8p78vmzw9zl3lkqbfl6yarbbzniisi";
|
||||
rev = "94e7279851fdd3da00c3178e64fb448b05fbba7e";
|
||||
sha256 = "1h0n6wfzrlya717571qfgr9zjs1yi2a08k4rppz509jdbkv1mnz9";
|
||||
};
|
||||
meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
|
||||
};
|
||||
|
|
@ -3108,12 +3108,12 @@ let
|
|||
|
||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2021-02-12";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "e5facde11bc8a2577dbfd56e2a4063320b09bc0b";
|
||||
sha256 = "1i1dn4akszkly6cjf3z9s17y1fdgsgk0fr5i50hs4mlnxy7al01i";
|
||||
rev = "34fdacc0e971eccb958c3ce0c88198bcfed8f9cc";
|
||||
sha256 = "1r6q36ri17zrv06qgclidd58dn62kz4yivjyp4qzcyf77x18s9c6";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||
};
|
||||
|
|
@ -3168,12 +3168,12 @@ let
|
|||
|
||||
nvim-web-devicons = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-web-devicons";
|
||||
version = "2021-02-11";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyazdani42";
|
||||
repo = "nvim-web-devicons";
|
||||
rev = "cadf0c30659acc8c60fec8100b81ea0fd92a8a9c";
|
||||
sha256 = "06d32z6rlz153vfbydcjvm6l2qrnjw0d6a60qxjpmbmby66nvcya";
|
||||
rev = "cc7771275822c951767c056a14830d713023247f";
|
||||
sha256 = "1qk2h8cwcb0v12lxayjdxka6wh5r1phn9cz5xkm5hvm1vcwrvlln";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
|
||||
};
|
||||
|
|
@ -3384,12 +3384,12 @@ let
|
|||
|
||||
plenary-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "plenary-nvim";
|
||||
version = "2021-02-09";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lua";
|
||||
repo = "plenary.nvim";
|
||||
rev = "b77fc46c5f35978c03277cd7261c07a36dafc8a4";
|
||||
sha256 = "0a38ma4kn6s75s286bdl5mhqlnbzzpir29gzjq7kxqi4y4zh9spc";
|
||||
rev = "877f7997c61bba8efa55950761dd23403ca3bc1e";
|
||||
sha256 = "11z44n8f2jmzi6m88g6r9zvgszkbnjrm9y7a247imcfq40p7yyma";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
|
||||
};
|
||||
|
|
@ -3757,12 +3757,12 @@ let
|
|||
|
||||
sideways-vim = buildVimPluginFrom2Nix {
|
||||
pname = "sideways-vim";
|
||||
version = "2021-01-31";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "sideways.vim";
|
||||
rev = "6aae3517c612a96c59b5417984889bff388210b2";
|
||||
sha256 = "13d0jzzn7gr6c0zkpa5bkfp06246hbpfb6y7mmsw2waybw3hij9s";
|
||||
rev = "3cb3b47646c95316a739e660d1501d7a85d7f2e5";
|
||||
sha256 = "0a9d4m2gjn9kajfl3dzdxxahly5lrfn46wj0nyfscx0ypz38fr7a";
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
|
||||
};
|
||||
|
|
@ -3901,12 +3901,12 @@ let
|
|||
|
||||
splitjoin-vim = buildVimPluginFrom2Nix {
|
||||
pname = "splitjoin-vim";
|
||||
version = "2020-12-15";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "splitjoin.vim";
|
||||
rev = "91ba14b41f6e767414d7bf2a8e82947c6bfdb978";
|
||||
sha256 = "0q01xfnjqk3vnmknb01zlkzn1jj03lqsygk863vwrdazq86g5aci";
|
||||
rev = "966a3123a7d80333878443c0011e451c29f157cb";
|
||||
sha256 = "19kjvx49vpnl5xs5bib7xqrl5vnqqzavndkwl3cg34mnhnjfzka3";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
|
||||
|
|
@ -4046,12 +4046,12 @@ let
|
|||
|
||||
tagbar = buildVimPluginFrom2Nix {
|
||||
pname = "tagbar";
|
||||
version = "2021-02-01";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "preservim";
|
||||
repo = "tagbar";
|
||||
rev = "7e8aeb69709b73cdbdaf50f4d26ab45d7920b7f0";
|
||||
sha256 = "02mlr9aw4ppi4cs6r1v3d39j3l85sy7q2xm1dxg1ld6k1p5imk94";
|
||||
rev = "2fb3171ed7549df1c27840452b7815a108bd1a27";
|
||||
sha256 = "15djvax4nyxki2kbkmryds4b5zli1v18js90aah9m9ipvpnwrp91";
|
||||
};
|
||||
meta.homepage = "https://github.com/preservim/tagbar/";
|
||||
};
|
||||
|
|
@ -4131,12 +4131,12 @@ let
|
|||
|
||||
telescope-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-nvim";
|
||||
version = "2021-02-09";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "3a7fa41857394cd2d90d00891413c12fada039c3";
|
||||
sha256 = "0bn7jvwwaxfhcqd4l3wi9bshabbrcd4aws7d564kh1js8bklwx1b";
|
||||
rev = "1c5e42a6a5a6d29be8fbf8dcefb0d8da535eac9a";
|
||||
sha256 = "088scjf7iz4j3l0zl3sn4db6w6h456wrlz1g30fgz378cs022d35";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -4660,12 +4660,12 @@ let
|
|||
|
||||
vim-airline-themes = buildVimPluginFrom2Nix {
|
||||
pname = "vim-airline-themes";
|
||||
version = "2020-12-17";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-airline";
|
||||
repo = "vim-airline-themes";
|
||||
rev = "8f1aa2c7fa44bf33b1fd4678f9c7b40c126b0e2b";
|
||||
sha256 = "1gwk7m8ghg5lix14bqxjyxc1wv5agkfhqinsikssydab0liw0xyf";
|
||||
rev = "d148d42d9caf331ff08b6cae683d5b210003cde7";
|
||||
sha256 = "0dd0vp72r95wqa2780rbdmj61mcj77b4hg6fpkwbb07apizrp43b";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
|
||||
};
|
||||
|
|
@ -4912,12 +4912,12 @@ let
|
|||
|
||||
vim-clap = buildVimPluginFrom2Nix {
|
||||
pname = "vim-clap";
|
||||
version = "2021-02-12";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liuchengxu";
|
||||
repo = "vim-clap";
|
||||
rev = "2e8538beaf1cef636deab2d40edcb270044485d1";
|
||||
sha256 = "1ay90j72sknqhp1rdlgzdb5rxs98mwc5ad7q3rgqj8hpsr21x991";
|
||||
rev = "2f16948ca63ee37b27bf9b2a3a6c505204cac1cd";
|
||||
sha256 = "12axglcxxmsyin8wycm5gh72mskjzajv3lf9xdqdg0d8xi4qnq81";
|
||||
};
|
||||
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
||||
};
|
||||
|
|
@ -5476,12 +5476,12 @@ let
|
|||
|
||||
vim-fetch = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fetch";
|
||||
version = "2020-01-31";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wsdjeg";
|
||||
repo = "vim-fetch";
|
||||
rev = "dd674b50b261275a6a75cab6929b7bb7c5c4acba";
|
||||
sha256 = "1hadfzhzkq2n9k3yga55fsl6nm5mgl2vv975jnxsi4qgz9cwcsgr";
|
||||
rev = "0a6ab17e84c7f4808bf05ec380121bce40b40d21";
|
||||
sha256 = "04srlz3zaiqkv9hz6q3vdkfq02k1wj4p9mg4m8930das4nkl7a05";
|
||||
};
|
||||
meta.homepage = "https://github.com/wsdjeg/vim-fetch/";
|
||||
};
|
||||
|
|
@ -5548,12 +5548,12 @@ let
|
|||
|
||||
vim-floaterm = buildVimPluginFrom2Nix {
|
||||
pname = "vim-floaterm";
|
||||
version = "2021-02-12";
|
||||
version = "2021-02-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "voldikss";
|
||||
repo = "vim-floaterm";
|
||||
rev = "bd76979d17c28db94430dbfa4007e5aef667441a";
|
||||
sha256 = "0ih17mimpjkk9w81cpmzks63rd4k5v32i5y1anykcgn9nmmbp8qm";
|
||||
rev = "a892836203b8ce003bee88e9a9da8aefaa08a2ca";
|
||||
sha256 = "0gpqfgfayyqsgvipc65j7xzdbf2kjbygp1va1sqzxqii01yi7m37";
|
||||
};
|
||||
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
|
||||
};
|
||||
|
|
@ -5596,12 +5596,12 @@ let
|
|||
|
||||
vim-fugitive = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fugitive";
|
||||
version = "2021-02-11";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-fugitive";
|
||||
rev = "5c821eb78d4018025a1a9f54a9ef2af2a5ddd365";
|
||||
sha256 = "0vzhc9dr166pn4xpznzxfyhfibas3m0an0z74gl3vih1qlg59h9y";
|
||||
rev = "d4bcc75ef6449c0e5592513fb1e0a42b017db9ca";
|
||||
sha256 = "12621ai3wx43m146cfjpcdz6main3rq6ira6gb2m06zsk1am1fjn";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-fugitive/";
|
||||
};
|
||||
|
|
@ -6138,12 +6138,12 @@ let
|
|||
|
||||
vim-jsdoc = buildVimPluginFrom2Nix {
|
||||
pname = "vim-jsdoc";
|
||||
version = "2020-10-10";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "heavenshell";
|
||||
repo = "vim-jsdoc";
|
||||
rev = "548767343ff221a4efd0c055a43c022d23fcafc5";
|
||||
sha256 = "0scmpjav4zapglybdqilimqb3n805k8gqc46qvkiihprq9j9za4d";
|
||||
rev = "82b10427e9f3af270b3d3e252f2bcfafc61b221e";
|
||||
sha256 = "1sxdk2infw12lf1lkw05zz1aqk1pirjfph9phma89q4hc1i5hndk";
|
||||
};
|
||||
meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
|
||||
};
|
||||
|
|
@ -6366,12 +6366,12 @@ let
|
|||
|
||||
vim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsp";
|
||||
version = "2021-02-02";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "vim-lsp";
|
||||
rev = "21a29936ed74b2212e1904cca6c22bff4e27b637";
|
||||
sha256 = "11jlqri1fyh1mbxrkihg1jj7g8mllh9w6gy64ah8gvpw505fws4c";
|
||||
rev = "6f8dfe19d59041a606f30b7764ccd51d4299d0e5";
|
||||
sha256 = "0rqlzp5qbidd1f02yx1l1cf0a5bdl7ha4wsixakixdrsy4ws68fh";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
||||
};
|
||||
|
|
@ -6511,12 +6511,12 @@ let
|
|||
|
||||
vim-monokai = buildVimPluginFrom2Nix {
|
||||
pname = "vim-monokai";
|
||||
version = "2020-12-02";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "crusoexia";
|
||||
repo = "vim-monokai";
|
||||
rev = "7f42bcd0e05921c7a5d7333c96bae8b21fa76064";
|
||||
sha256 = "10ip0y9p2qf869h2yhp2zs6qc048rw1x5i0spziajca96251gvig";
|
||||
rev = "65fa0678d8426ae2cc7a4c42a8f0d72bde2a7bbe";
|
||||
sha256 = "0r118mxm34kr8yk66x9ddg2yh44gn00iaxljfbhg43nhp8jyzjbn";
|
||||
};
|
||||
meta.homepage = "https://github.com/crusoexia/vim-monokai/";
|
||||
};
|
||||
|
|
@ -8265,26 +8265,26 @@ let
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2021-02-11";
|
||||
version = "2021-02-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "1319bca15f1e25cf8f0ca64818719c860d2d83ac";
|
||||
sha256 = "043x5x4pxhni2isjxh6x4klldyanhpks3pljc246ybiz9q372bsi";
|
||||
rev = "4ff3e993ef17c7101d8db9de79674e320a20fcec";
|
||||
sha256 = "1zx45jyddxx0gqwgwf426ybv1dgghjls685ngsq3j8yhzj3mldfr";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
||||
vimux = buildVimPluginFrom2Nix {
|
||||
pname = "vimux";
|
||||
version = "2017-10-24";
|
||||
version = "2021-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ostera";
|
||||
owner = "preservim";
|
||||
repo = "vimux";
|
||||
rev = "37f41195e6369ac602a08ec61364906600b771f1";
|
||||
sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra";
|
||||
rev = "3693ec6f129fa10b1f3435829645c4607584c3ab";
|
||||
sha256 = "1pmcablswp2q32xc1njzfh5vxbani4a8n95k0jzhq0cz8w4ssxpw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ostera/vimux/";
|
||||
meta.homepage = "https://github.com/preservim/vimux/";
|
||||
};
|
||||
|
||||
vimwiki = buildVimPluginFrom2Nix {
|
||||
|
|
|
|||
|
|
@ -7,9 +7,7 @@
|
|||
, ruby
|
||||
, which
|
||||
, fetchFromGitHub
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, fetchpatch
|
||||
, llvmPackages
|
||||
, rustPlatform
|
||||
|
|
@ -731,7 +729,7 @@ self: super: {
|
|||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c=";
|
||||
cargoSha256 = "0r3ldipdfzhdivgc43bv31c1g9hl458yznabmfzxr2phpyvq2dnn";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
|
|
|||
|
|
@ -503,9 +503,9 @@ def parse_args():
|
|||
|
||||
|
||||
def commit(repo: git.Repo, message: str, files: List[Path]) -> None:
|
||||
files_staged = repo.index.add([str(f.resolve()) for f in files])
|
||||
repo.index.add([str(f.resolve()) for f in files])
|
||||
|
||||
if files_staged:
|
||||
if repo.index.diff("HEAD"):
|
||||
print(f'committing to nixpkgs "{message}"')
|
||||
repo.index.commit(message)
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -433,7 +433,6 @@ Olical/aniseed
|
|||
Olical/conjure
|
||||
onsails/lspkind-nvim
|
||||
OrangeT/vim-csharp
|
||||
ostera/vimux
|
||||
osyo-manga/shabadou.vim
|
||||
osyo-manga/vim-anzu
|
||||
osyo-manga/vim-over
|
||||
|
|
@ -459,6 +458,7 @@ prabirshrestha/vim-lsp
|
|||
preservim/nerdcommenter
|
||||
preservim/nerdtree
|
||||
preservim/tagbar
|
||||
preservim/vimux
|
||||
psliwka/vim-smoothie
|
||||
ptzz/lf.vim
|
||||
puremourning/vimspector
|
||||
|
|
|
|||
|
|
@ -95,9 +95,7 @@ let
|
|||
BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes;
|
||||
IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1
|
||||
MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes;
|
||||
BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes;
|
||||
MQ_IOSCHED_KYBER = whenAtLeast "4.12" yes;
|
||||
IOSCHED_BFQ = whenAtLeast "4.12" module;
|
||||
};
|
||||
|
||||
# Enable NUMA.
|
||||
|
|
|
|||
|
|
@ -7,20 +7,20 @@
|
|||
},
|
||||
"4.19": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.175-hardened1.patch",
|
||||
"sha256": "04pflpzb8fs2wlx2sm46r1lxn4vcmhsygzk088m8rg3jjygany3i",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.175-hardened1/linux-hardened-4.19.175-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.176-hardened1.patch",
|
||||
"sha256": "0h6jv38n98dp395hs9s29yszbr9zj7rwiv9hny82nffllw6d3vxk",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.176-hardened1/linux-hardened-4.19.176-hardened1.patch"
|
||||
},
|
||||
"5.10": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.15-hardened1.patch",
|
||||
"sha256": "1xd0qr58lz38swivhrbhjf1jz3y8y4i9ba1qcij7bydw125qvz14",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.15-hardened1/linux-hardened-5.10.15-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.16-hardened1.patch",
|
||||
"sha256": "0qd38hrc5qhm1gkk7rdlsf897cw7srs0ibz3xqdbl2zvwxrk1f1w",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.16-hardened1/linux-hardened-5.10.16-hardened1.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.97-hardened1.patch",
|
||||
"sha256": "1610lgvxxx6rmbi38q3pcaf9kcw8fqxspwmg2irgmvvzniv5p42x",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.97-hardened1/linux-hardened-5.4.97-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.98-hardened1.patch",
|
||||
"sha256": "0nwj49rb87agkbsv9qfi8wc6mv31a40zdbvl2wp316qxhb1d5n9c",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.98-hardened1/linux-hardened-5.4.98-hardened1.patch"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.175";
|
||||
version = "4.19.176";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "099b3dw9rj2z147dpjppd57g24paxw8x4fq1ir1ss5ibzy24pvnc";
|
||||
sha256 = "0wv0hb25c5jgw6h3zwbb24mfnn19yr0sgcmk1g2xa6x33g9bihz1";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.15";
|
||||
version = "5.10.17";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "00bf1v8zn4qngxhj6sca0lhv71xlnajw02iq6854s76my6y8flnq";
|
||||
sha256 = "05289lr531piv1ncisbazfk0lj0q7gxflqkb0bn4c95vx0y64kp8";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue