mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 21:50:55 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
59ab4de3e0
|
|
@ -64,6 +64,13 @@
|
|||
this version for the entire lifecycle of the 21.11 release.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Those making use of <literal>buildBazelPackage</literal> will
|
||||
need to regenerate the fetch hashes (preferred), or set
|
||||
<literal>fetchConfigured = false;</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="other-notable-changes">
|
||||
|
|
|
|||
|
|
@ -28,4 +28,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
* PHP 7.3 is no longer supported due to upstream not supporting this
|
||||
version for the entire lifecycle of the 21.11 release.
|
||||
|
||||
* Those making use of `buildBazelPackage` will need to regenerate the fetch
|
||||
hashes (preferred), or set `fetchConfigured = false;`.
|
||||
|
||||
## Other Notable Changes
|
||||
|
|
|
|||
|
|
@ -37,7 +37,9 @@ in
|
|||
};
|
||||
|
||||
nixAttribute = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
type = with lib.types; nullOr str;
|
||||
|
||||
default = null;
|
||||
|
||||
description = ''
|
||||
Attribute of `nixFile` that builds the current system.
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ in
|
|||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable Gnome 3 desktop manager.";
|
||||
description = "Enable GNOME desktop manager.";
|
||||
};
|
||||
|
||||
sessionPath = mkOption {
|
||||
|
|
@ -283,7 +283,7 @@ in
|
|||
(mkIf (cfg.enable || flashbackEnabled) {
|
||||
# Seed our configuration into nixos-generate-config
|
||||
system.nixos-generate-config.desktopConfiguration = [''
|
||||
# Enable the GNOME 3 Desktop Environment.
|
||||
# Enable the GNOME Desktop Environment.
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
''];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bshapr";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = "BShapr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2DySlD5ZTxeQ2U++Dr67bek5oVbAiOHCxM6S5rTTZN0=";
|
||||
sha256 = "sha256-9I4DPRl6i/VL8Etw3qLGZkP45BGsbxFxNOvRy3B3I+M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -3,20 +3,25 @@
|
|||
elisp-ffi = melpaBuild rec {
|
||||
pname = "elisp-ffi";
|
||||
version = "1.0.0";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elisp-ffi";
|
||||
rev = version;
|
||||
sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.libffi ];
|
||||
|
||||
preBuild = "make";
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(elisp-ffi
|
||||
:repo "skeeto/elisp-ffi"
|
||||
:fetcher github
|
||||
:files ("ffi-glue" "ffi.el"))
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Emacs Lisp Foreign Function Interface";
|
||||
longDescription = ''
|
||||
|
|
@ -65,27 +70,22 @@
|
|||
};
|
||||
};
|
||||
|
||||
apheleia = callPackage ./apheleia {};
|
||||
|
||||
emacspeak = callPackage ./emacspeak {};
|
||||
|
||||
ess-R-object-popup =
|
||||
callPackage ./ess-R-object-popup { };
|
||||
|
||||
evil-markdown = callPackage ./evil-markdown { };
|
||||
|
||||
font-lock-plus = callPackage ./font-lock-plus { };
|
||||
|
||||
ghc-mod = melpaBuild {
|
||||
pname = "ghc";
|
||||
version = pkgs.haskellPackages.ghc-mod.version;
|
||||
|
||||
src = pkgs.haskellPackages.ghc-mod.src;
|
||||
|
||||
packageRequires = [ haskell-mode ];
|
||||
|
||||
propagatedUserEnvPkgs = [ pkgs.haskellPackages.ghc-mod ];
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
|
||||
'';
|
||||
|
||||
fileSpecs = [ "elisp/*.el" ];
|
||||
|
||||
meta = {
|
||||
description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
|
||||
license = bsd3;
|
||||
|
|
@ -97,32 +97,28 @@
|
|||
haskell-unicode-input-method = melpaBuild {
|
||||
pname = "emacs-haskell-unicode-input-method";
|
||||
version = "20110905.2307";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "roelvandijk";
|
||||
repo = "emacs-haskell-unicode-input-method";
|
||||
rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
|
||||
sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
|
||||
};
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(emacs-haskell-unicode-input-method
|
||||
:repo "roelvandijk/emacs-haskell-unicode-input-method"
|
||||
:fetcher github)
|
||||
'';
|
||||
|
||||
packageRequires = [];
|
||||
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#haskell-unicode-input-method/";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
};
|
||||
|
||||
helm-words = callPackage ./helm-words { };
|
||||
|
||||
isearch-plus = callPackage ./isearch-plus { };
|
||||
|
||||
isearch-prop = callPackage ./isearch-prop { };
|
||||
|
||||
jam-mode = callPackage ./jam-mode { };
|
||||
|
||||
llvm-mode = trivialBuild {
|
||||
pname = "llvm-mode";
|
||||
inherit (pkgs.llvmPackages.llvm) src version;
|
||||
|
|
@ -150,6 +146,7 @@
|
|||
};
|
||||
|
||||
patches = [
|
||||
# Fix: avatar loading when imagemagick support is not available
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
|
||||
sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm";
|
||||
|
|
@ -187,11 +184,6 @@
|
|||
|
||||
};
|
||||
|
||||
mu4e-patch = callPackage ./mu4e-patch { };
|
||||
|
||||
org-mac-link =
|
||||
callPackage ./org-mac-link { };
|
||||
|
||||
ott-mode = self.trivialBuild {
|
||||
pname = "ott-mod";
|
||||
|
||||
|
|
@ -205,11 +197,28 @@
|
|||
};
|
||||
};
|
||||
|
||||
perl-completion =
|
||||
callPackage ./perl-completion { };
|
||||
# Packages made the classical callPackage way
|
||||
|
||||
emacspeak = callPackage ./emacspeak { };
|
||||
|
||||
ess-R-object-popup = callPackage ./ess-R-object-popup { };
|
||||
|
||||
font-lock-plus = callPackage ./font-lock-plus { };
|
||||
|
||||
helm-words = callPackage ./helm-words { };
|
||||
|
||||
jam-mode = callPackage ./jam-mode { };
|
||||
|
||||
nano-theme = callPackage ./nano-theme { };
|
||||
|
||||
org-mac-link = callPackage ./org-mac-link { };
|
||||
|
||||
perl-completion = callPackage ./perl-completion { };
|
||||
|
||||
pod-mode = callPackage ./pod-mode { };
|
||||
|
||||
power-mode = callPackage ./power-mode { };
|
||||
|
||||
railgun = callPackage ./railgun { };
|
||||
|
||||
structured-haskell-mode = self.shm;
|
||||
|
|
@ -243,34 +252,34 @@
|
|||
# closer to the old outdated package infra.
|
||||
#
|
||||
# Ideally this should be dropped some time during/after 20.03
|
||||
|
||||
autoComplete = self.melpaStablePackages.auto-complete;
|
||||
bbdb3 = self.melpaStablePackages.bbdb;
|
||||
jade = self.jade-mode;
|
||||
# scalaMode2 = null; # No clear mapping as of now
|
||||
flymakeCursor = self.melpaStablePackages.flymake-cursor;
|
||||
colorTheme = self.color-theme;
|
||||
cryptol = self.melpaStablePackages.cryptol-mode;
|
||||
d = self.melpaStablePackages.d-mode;
|
||||
emacsw3m = self.w3m;
|
||||
erlangMode = self.melpaStablePackages.erlang;
|
||||
flymakeCursor = self.melpaStablePackages.flymake-cursor;
|
||||
graphvizDot = self.melpaStablePackages.graphviz-dot-mode;
|
||||
haskellMode = self.melpaStablePackages.haskell-mode;
|
||||
hsc3Mode = self.hsc3-mode;
|
||||
idris = self.melpaStablePackages.idris-mode;
|
||||
jade = self.jade-mode;
|
||||
js2 = self.melpaStablePackages.js2-mode;
|
||||
loremIpsum = self.lorem-ipsum;
|
||||
markdownMode = self.melpaStablePackages.markdown-mode;
|
||||
maudeMode = self.maude-mode;
|
||||
phpMode = self.melpaStablePackages.php-mode;
|
||||
idris = self.melpaStablePackages.idris-mode;
|
||||
rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters;
|
||||
colorTheme = self.color-theme;
|
||||
sbtMode = self.melpaStablePackages.sbt-mode;
|
||||
markdownMode = self.melpaStablePackages.markdown-mode;
|
||||
scalaMode1 = self.melpaStablePackages.scala-mode;
|
||||
prologMode = self.prolog-mode;
|
||||
hsc3Mode = self.hsc3-mode;
|
||||
graphvizDot = self.melpaStablePackages.graphviz-dot-mode;
|
||||
proofgeneral_HEAD = self.proof-general;
|
||||
proofgeneral = self.melpaStablePackages.proof-general;
|
||||
haskellMode = self.melpaStablePackages.haskell-mode;
|
||||
writeGood = self.melpaStablePackages.writegood-mode;
|
||||
erlangMode = self.melpaStablePackages.erlang;
|
||||
d = self.melpaStablePackages.d-mode;
|
||||
autoComplete = self.melpaStablePackages.auto-complete;
|
||||
tuaregMode = self.melpaStablePackages.tuareg;
|
||||
proofgeneral_HEAD = self.proof-general;
|
||||
rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters;
|
||||
sbtMode = self.melpaStablePackages.sbt-mode;
|
||||
scalaMode1 = self.melpaStablePackages.scala-mode;
|
||||
# scalaMode2 = null; # No clear mapping as of now
|
||||
structuredHaskellMode = self.melpaStablePackages.shm;
|
||||
tuaregMode = self.melpaStablePackages.tuareg;
|
||||
writeGood = self.melpaStablePackages.writegood-mode;
|
||||
xmlRpc = self.melpaStablePackages.xml-rpc;
|
||||
emacsw3m = self.w3m;
|
||||
loremIpsum = self.lorem-ipsum;
|
||||
js2 = self.melpaStablePackages.js2-mode;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nano-theme";
|
||||
version = "2021-06-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rougier";
|
||||
repo = pname;
|
||||
rev = "99ff1c5e78296a073c6e63b966045e0d83a136e7";
|
||||
hash = "sha256-IDVnl4J4hx2mlLaiA+tKxxRGcIyBULr2HBeY/GMHD90=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install *.el $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rougier/nano-theme";
|
||||
description = "GNU Emacs / N Λ N O Theme";
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "power-mode";
|
||||
version = "2021-06-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elizagamedev";
|
||||
repo = "power-mode.el";
|
||||
rev = "940e0aa36220f863e8f43840b4ed634b464fbdbb";
|
||||
hash = "sha256-Wy8o9QTWqvH9cP7xsTpF5QSd4mWNIPXJTadoADKeHWY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
install *.el $out/share/emacs/site-lisp
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rougier/nano-theme";
|
||||
description = "Imbue Emacs with power!";
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,28 @@
|
|||
{ lib, stdenv, fetchurl, emacs, texinfo }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, emacs
|
||||
, texinfo
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tramp-2.4.2";
|
||||
pname = "tramp";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/tramp/${name}.tar.gz";
|
||||
sha256 = "082nwvi99y0bvpl1yhn4yjc8a613jh1pdck253lxn062lkcxxw61";
|
||||
url = "mirror://gnu/tramp/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-w+6HJA8kFb75Z+7vM1zDnzOnkSSIXKnLVyCcEh+nMGY=";
|
||||
};
|
||||
buildInputs = [ emacs texinfo ];
|
||||
|
||||
buildInputs = [
|
||||
emacs
|
||||
texinfo
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Transparently access remote files from Emacs. Newer versions than built-in.";
|
||||
homepage = "https://www.gnu.org/software/tramp";
|
||||
description = "Transparently access remote files from Emacs. Newer versions than built-in.";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "archivy";
|
||||
version = "1.1.4";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oSmwQcKvp9RABmc7aq6fdLOZapMauIi6+7azVTXVb30=";
|
||||
sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM=";
|
||||
};
|
||||
|
||||
# Relax some dependencies
|
||||
|
|
|
|||
|
|
@ -18,24 +18,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dino";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dino";
|
||||
repo = "dino";
|
||||
rev = "v${version}";
|
||||
sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw";
|
||||
sha256 = "11m38syqzb1z92wmdaf45gryl6gjxwbcnk32j4p984ipqj2vdzd8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes https://github.com/dino/dino/issues/1010 (double' is not a supported generic type argument)
|
||||
(fetchpatch {
|
||||
name = "dino-vala-boxing.patch";
|
||||
url = "https://github.com/dino/dino/commit/9acb54df9254609f2fe4de83c9047d408412de28.patch";
|
||||
sha256 = "1jz4r7d8b1ljwgq846wihp864b6gjdkgh6fnmxh13b2i10x52xsm";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala
|
||||
cmake
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "1.7.29",
|
||||
"version": "1.7.30",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
@ -47,8 +47,9 @@
|
|||
"electron-builder-squirrel-windows": "22.10.5",
|
||||
"electron-devtools-installer": "^3.1.1",
|
||||
"electron-notarize": "^1.0.0",
|
||||
"eslint": "7.3.1",
|
||||
"eslint-config-matrix-org": "^0.1.2",
|
||||
"eslint": "7.18.0",
|
||||
"eslint-config-google": "^0.14.0",
|
||||
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main",
|
||||
"find-npm-prefix": "^1.0.2",
|
||||
"fs-extra": "^8.1.0",
|
||||
"glob": "^7.1.6",
|
||||
|
|
@ -67,7 +68,7 @@
|
|||
},
|
||||
"build": {
|
||||
"appId": "im.riot.app",
|
||||
"electronVersion": "12.0.2",
|
||||
"electronVersion": "12.0.9",
|
||||
"files": [
|
||||
"package.json",
|
||||
{
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
let
|
||||
executableName = "element-desktop";
|
||||
version = "1.7.29";
|
||||
version = "1.7.30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vector-im";
|
||||
repo = "element-desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nCtgVVOdjZ/OK8gMInBbNeuJadchDYUO2UQxEmcOm4s=";
|
||||
sha256 = "09k1xxmzqvw8c1x9ndsdvwj4598rdx9zqraz3rmr3i58s51vycxp";
|
||||
};
|
||||
in mkYarnPackage rec {
|
||||
name = "element-desktop-${version}";
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "element-web";
|
||||
version = "1.7.29";
|
||||
version = "1.7.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
|
||||
sha256 = "sha256-wFC0B9v0V3JK9sLKH7GviVO/JEjePOJ06PwRq/MVqDE=";
|
||||
sha256 = "1pnmgdyacxfk8hdf930rqqvqrcvckc3m4pb5mkznlirsmw06nfay";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ lib
|
||||
, buildBazelPackage
|
||||
, fetchFromGitHub
|
||||
, callPackage
|
||||
, bash
|
||||
, cacert
|
||||
, git
|
||||
, glibcLocales
|
||||
|
|
@ -9,6 +11,7 @@
|
|||
, iptables
|
||||
, makeWrapper
|
||||
, procps
|
||||
, protobuf
|
||||
, python3
|
||||
}:
|
||||
|
||||
|
|
@ -16,9 +19,12 @@ let
|
|||
preBuild = ''
|
||||
patchShebangs .
|
||||
|
||||
substituteInPlace tools/defs.bzl \
|
||||
--replace "#!/bin/bash" "#!${bash}/bin/bash"
|
||||
|
||||
# Tell rules_go to use the Go binary found in the PATH
|
||||
sed -E -i \
|
||||
-e 's|go_version\s*=\s*"[^"]+",|go_version = "host",|g' \
|
||||
-e 's|go_version\s*=\s*"[^"]+"|go_version = "host"|g' \
|
||||
WORKSPACE
|
||||
|
||||
# The gazelle Go tooling needs CA certs
|
||||
|
|
@ -31,20 +37,37 @@ let
|
|||
export GOPATH=
|
||||
'';
|
||||
|
||||
# Patch the protoc alias so that it always builds from source.
|
||||
rulesProto = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "rules_proto";
|
||||
rev = "f7a30f6f80006b591fa7c437fe5a951eb10bcbcf";
|
||||
sha256 = "10bcw0ir0skk7h33lmqm38n9w4nfs24mwajnngkbs6jb5wsvkqv8";
|
||||
extraPostFetch = ''
|
||||
sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release
|
||||
cat <<EOF >>$out/proto/private/BUILD.release
|
||||
alias(name = "protoc", actual = "@com_github_protocolbuffers_protobuf//:protoc", visibility = ["//visibility:public"])
|
||||
EOF
|
||||
'';
|
||||
};
|
||||
|
||||
in buildBazelPackage rec {
|
||||
name = "gvisor-${version}";
|
||||
version = "2019-11-14";
|
||||
version = "20210518.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "gvisor";
|
||||
rev = "release-20191114.0";
|
||||
sha256 = "0kyixjjlws9iz2r2srgpdd4rrq94vpxkmh2rmmzxd9mcqy2i9bg1";
|
||||
rev = "release-${version}";
|
||||
sha256 = "15a6mlclnyfc9mx3bjksnnf4vla0xh0rv9kxdp34la4gw3c4hksn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git glibcLocales go makeWrapper python3 ];
|
||||
|
||||
bazelTarget = "//runsc:runsc";
|
||||
bazelFlags = [
|
||||
"--override_repository=rules_proto=${rulesProto}"
|
||||
];
|
||||
|
||||
# gvisor uses the Starlark implementation of rules_cc, not the built-in one,
|
||||
# so we shouldn't delete it from our dependencies.
|
||||
|
|
@ -76,14 +99,14 @@ in buildBazelPackage rec {
|
|||
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
|
||||
'';
|
||||
|
||||
sha256 = "0fhmlq0d2317gwhma2mz1anb69j4chybk90j71j88wpgw1hxbk34";
|
||||
sha256 = "13pahppm431m198v5bffrzq5iw8m79riplbfqp0afh384ln669hb";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
inherit preBuild;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 bazel-bin/runsc/*_pure_stripped/runsc $out/bin/runsc
|
||||
install -Dm755 bazel-out/*/bin/runsc/runsc_/runsc $out/bin/runsc
|
||||
|
||||
# Needed for the 'runsc do' subcomand
|
||||
wrapProgram $out/bin/runsc \
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ args@{
|
|||
# required for the build as configured, rather than fetching all the dependencies
|
||||
# which may not work in some situations (e.g. Java code which ends up relying on
|
||||
# Debian-specific /usr/share/java paths, but doesn't in the configured build).
|
||||
, fetchConfigured ? false
|
||||
, fetchConfigured ? true
|
||||
|
||||
# Don’t add Bazel --copt and --linkopt from NIX_CFLAGS_COMPILE /
|
||||
# NIX_LDFLAGS. This is necessary when using a custom toolchain which
|
||||
|
|
@ -126,7 +126,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
|||
find $bazelOut/external -maxdepth 1 -type l | while read symlink; do
|
||||
name="$(basename "$symlink")"
|
||||
rm "$symlink"
|
||||
test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker"
|
||||
test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" || true
|
||||
done
|
||||
|
||||
# Patching symlinks to remove build directory reference
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
{ lib, gccStdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "cc65";
|
||||
version = "2.19";
|
||||
|
||||
|
|
@ -13,10 +11,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://cc65.github.io/";
|
||||
|
|
@ -56,6 +53,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = with platforms; unix;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.31";
|
||||
version = "6.40";
|
||||
pname = "clips";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${
|
||||
builtins.replaceStrings [ "." ] [ "" ] version
|
||||
}.tar.gz";
|
||||
sha256 = "165k0z7dsv04q432sanmw0jxmxwf56cnhsdfw5ffjqxd3lzkjnv6";
|
||||
sha256 = "1pr5l61zxf6kjs8b2b028g2aq45pigavwjmrf4l5mrdmlnk3fq5d";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "igraph";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igraph";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-StRXtP2PelPcS+l5O1AOVFkza3hiKFwCdp8XLal4grE=";
|
||||
sha256 = "sha256-tF+cnJRv125bSpZIpABTIHAfJO4TNfSBHjnzpNTbFgk=";
|
||||
};
|
||||
|
||||
# Normally, igraph wants us to call bootstrap.sh, which will call
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "leptonica";
|
||||
version = "1.80.0";
|
||||
version = "1.81.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "192bs676ind8627f0v3v8d1q7r4xwc7q0zvbdbxn1fgvmv14d77c";
|
||||
sha256 = "sha256-0ZKwVem9YLhBEQI8yYDDc5Dm1CexlKj9K9YRVDo73a0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, python2, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, python, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lhapdf";
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ python2 ];
|
||||
buildInputs = [ python ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,25 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
|
||||
{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
then throw "octavius is not available for OCaml ${ocaml.version}" else
|
||||
buildDunePackage rec {
|
||||
pname = "octavius";
|
||||
version = "1.2.2";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-octavius-0.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz";
|
||||
sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-doc";
|
||||
repo = "octavius";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA=";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
minimumOCamlVersion = "4.03";
|
||||
useDune2 = lib.versionAtLeast ocaml.version "4.08";
|
||||
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Ocamldoc comment syntax parser";
|
||||
homepage = "https://github.com/ocaml-doc/octavius";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
inherit (ocaml.meta) platforms;
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-gdacs";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-gdacs";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rcrhdpgj84hfifx9rzxz15ajzsk069iknb28gicw1cm1qv4vfxm";
|
||||
sha256 = "sha256-CIQoQRk5KIPEa/Y/7C1NPctuHvoiZ/o2bDa5YSWY+9M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dwdwfsapi";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PX1b1msaZH8HKVBo3GU7TOr8Lo7INLjjJBkDHHs6mzk=";
|
||||
sha256 = "sha256-JOIg6rLrU8v39z1I6smIPEeiUPdSdJcD2avUsTQq+bU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "georss-qld-bushfire-alert-client";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-georss-qld-bushfire-alert-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "14k7q0ynray1fj0lhxvgxpbdh4pmsqqk9gzmv38p9i7ijx8h1sc8";
|
||||
sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,38 +1,53 @@
|
|||
{ lib, buildPythonPackage, isPy3k, fetchPypi
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, configparser
|
||||
, faker
|
||||
, fetchFromGitHub
|
||||
, future
|
||||
, mock
|
||||
, nose
|
||||
, python-dateutil
|
||||
, pytz
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, urllib3
|
||||
, certifi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minio";
|
||||
version = "7.0.2";
|
||||
disabled = !isPy3k;
|
||||
version = "7.0.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f2f6022cfe4694d946972efef2a752f87d08cc030940faa50a640088772953c8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio-py";
|
||||
rev = version;
|
||||
sha256 = "14symk7b3i9xzfc2wkcnqmfsvh9j3jx2ijz7dgy1xyrbjwb7yzhc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
configparser
|
||||
future
|
||||
python-dateutil
|
||||
pytz
|
||||
urllib3
|
||||
certifi
|
||||
];
|
||||
|
||||
checkInputs = [ faker mock nose pytestCheckHook ];
|
||||
checkInputs = [
|
||||
faker
|
||||
mock
|
||||
nose
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# example credentials aren't present
|
||||
pytestFlagsArray = [ "--ignore=tests/unit/credentials_test.py" ];
|
||||
disabledTestPaths = [
|
||||
"tests/unit/credentials_test.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "minio" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple APIs to access any Amazon S3 compatible object storage server";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyialarm";
|
||||
version = "1.7";
|
||||
version = "1.8.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RyuzakiKK";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Gk5kWOqsPyq/0Vc+jdRRyj+ko3CpmqQ6/McvJYAGjLY=";
|
||||
sha256 = "sha256-Hig1BlgZX2FBh+wx7qz9lmkBIFn/IHActf9FXDU6Yz8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-igraph";
|
||||
version = "0.9.1";
|
||||
version = "0.9.4";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "igraph";
|
||||
repo = "python-igraph";
|
||||
rev = version;
|
||||
sha256 = "1ldyzza25zvwh144lw8x856z76s8gfvnbdm56fcmwkvm7aj81npw";
|
||||
sha256 = "sha256-0iqYzeqVJwBqDL7AllrNaI5c7fmtrVwWpinCnO+ACzo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -288,9 +288,9 @@ let
|
|||
fetchAttrs = {
|
||||
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
|
||||
sha256 = if cudaSupport then
|
||||
"1i7z2a7bc2q1vn1h9nx1xc6g1r1cby2xvbcs20fj9h6c2fgaw9j4"
|
||||
"10m6qj3kchgxfgb6qh59vc51knm9r9pkng8bf90h00dnggvv8234"
|
||||
else
|
||||
"0s8q5rxq8abr50c5jpwv96ncfc0k8jw7w70ri8viqy031g9v9v45";
|
||||
"04a98yrp09nd0p17k0jbzkgjppxs0yma7m5zkfrwgvr4g0w71v68";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ buildBazelPackage rec {
|
|||
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
|
||||
'';
|
||||
|
||||
sha256 = "0rwwjjj6zaj4hdcbsbp0di53xn6203r2vgpddhdrp8iph9ab60cg";
|
||||
sha256 = "1j175z3d4fbi4pl35py7yjq7ywrvwin6id131jv32hx0ck4g1m46";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ let
|
|||
|
||||
rtpPath = "share/vim-plugins";
|
||||
|
||||
nativeImpl = packages: lib.optionalString (packages != null)
|
||||
nativeImpl = packages:
|
||||
(let
|
||||
link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}");
|
||||
packageLinks = (packageName: {start ? [], opt ? []}:
|
||||
|
|
@ -340,8 +340,8 @@ let
|
|||
entries = [
|
||||
beforePlugins
|
||||
vamImpl
|
||||
(nativeImpl packages)
|
||||
]
|
||||
++ lib.optional (packages != null && packages != []) (nativeImpl packages)
|
||||
++ lib.optional (pathogen != null) pathogenImpl
|
||||
++ lib.optional (plug != null) plugImpl
|
||||
++ [ customRC ];
|
||||
|
|
|
|||
|
|
@ -668,6 +668,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
johnpapa.vscode-peacock = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-peacock";
|
||||
publisher = "johnpapa";
|
||||
version = "3.9.1";
|
||||
sha256 = "1g7apzzgfm8s9sjavhwr8jpf9slhq8b9jfkww3q5n41mzzx8m94p";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-styled-components";
|
||||
|
|
@ -1173,6 +1185,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
wix.vscode-import-cost = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-import-cost";
|
||||
publisher = "wix";
|
||||
version = "2.15.0";
|
||||
sha256 = "0d3b6654cdck1syn74vmmd1jmgkrw5v4c4cyrhdxbhggkip732bc";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
xaver.clang-format = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "clang-format";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, cmake
|
||||
, gn
|
||||
, go
|
||||
, jdk
|
||||
, ninja
|
||||
, python3
|
||||
, nixosTests
|
||||
|
|
@ -15,8 +17,8 @@ let
|
|||
# However, the version string is more useful for end-users.
|
||||
# These are contained in a attrset of their own to make it obvious that
|
||||
# people should update both.
|
||||
version = "1.16.2";
|
||||
commit = "e98e41a8e168af7acae8079fc0cd68155f699aa3";
|
||||
version = "1.17.3";
|
||||
commit = "46bf743b97d0d3f01ff437b2f10cc0bd9cdfe6e4";
|
||||
};
|
||||
in
|
||||
buildBazelPackage rec {
|
||||
|
|
@ -26,7 +28,7 @@ buildBazelPackage rec {
|
|||
owner = "envoyproxy";
|
||||
repo = "envoy";
|
||||
rev = srcVer.commit;
|
||||
hash = "sha256-aWVMRKFCZzf9/96NRPCP4jiW38DJhXyi0gEqW7uIpnQ=";
|
||||
hash = "sha256:09zzr4h3zjsb2rkxrvlazpx0jy33yn9j65ilxiqbvv0ckaralqfc";
|
||||
|
||||
extraPostFetch = ''
|
||||
chmod -R +w $out
|
||||
|
|
@ -36,29 +38,29 @@ buildBazelPackage rec {
|
|||
'';
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Quiche needs to be updated to compile under newer GCC.
|
||||
# This is a manual backport of https://github.com/envoyproxy/envoy/pull/13949.
|
||||
./0001-quiche-update-QUICHE-tar-13949.patch
|
||||
|
||||
# upb needs to be updated to compile under newer GCC.
|
||||
# This is a manual backport of https://github.com/protocolbuffers/upb/commit/9bd23dab4240b015321a53c45b3c9e4847fbf020.
|
||||
./0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch
|
||||
];
|
||||
postPatch = ''
|
||||
sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch
|
||||
sed -i '/javabase=/d' .bazelrc
|
||||
# Patch paths to build tools, and disable gold because it just segfaults.
|
||||
substituteInPlace bazel/external/wee8.genrule_cmd \
|
||||
--replace '"''$$gn"' '"''$$(command -v gn)"' \
|
||||
--replace '"''$$ninja"' '"''$$(command -v ninja)"' \
|
||||
--replace '"''$$WEE8_BUILD_ARGS"' '"''$$WEE8_BUILD_ARGS use_gold=false"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
python3
|
||||
gn
|
||||
go
|
||||
jdk
|
||||
ninja
|
||||
];
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "0q72c2zrl5vc8afkhkwyalb2h0mxn3133d4b9z4gag0p95wbwgc0";
|
||||
sha256 = "sha256:1cy2b73x8jzczq9z9c1kl7zrg5iasvsakb50zxn4mswpmajkbj5h";
|
||||
dontUseCmakeConfigure = true;
|
||||
dontUseGnConfigure = true;
|
||||
preInstall = ''
|
||||
# Strip out the path to the build location (by deleting the comment line).
|
||||
find $bazelOut/external -name requirements.bzl | while read requirements; do
|
||||
|
|
@ -78,10 +80,14 @@ buildBazelPackage rec {
|
|||
>$bazelOut/external/config_validation_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
|
||||
>$bazelOut/external/protodoc_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
|
||||
>$bazelOut/external/thrift_pip3/thrift-0.13.0-cp38-cp38-linux_x86_64.whl
|
||||
|
||||
# Remove Unix timestamps from go cache.
|
||||
rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb}
|
||||
'';
|
||||
};
|
||||
buildAttrs = {
|
||||
dontUseCmakeConfigure = true;
|
||||
dontUseGnConfigure = true;
|
||||
dontUseNinjaInstall = true;
|
||||
preConfigure = ''
|
||||
sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl
|
||||
|
|
@ -98,7 +104,6 @@ buildBazelPackage rec {
|
|||
'';
|
||||
};
|
||||
|
||||
fetchConfigured = true;
|
||||
removeRulesCC = false;
|
||||
removeLocalConfigCc = true;
|
||||
removeLocal = false;
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "pomerium";
|
||||
version = "0.13.3";
|
||||
version = "0.14.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pomerium";
|
||||
repo = "pomerium";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g0w1aIHvf2rJANvGWHeUxdnyCDsvy/PQ9Kp8nDdT/0w=";
|
||||
hash = "sha256:097csr8f43cn0iq030ajvvpwnwcfmjxyyk6pcisdy937axlrzska";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-grihU85OcGyf9/KKrv87xZonX5r+Z1oHQTf84Ya61fg=";
|
||||
vendorSha256 = "sha256:0n45xvwjiqyh41dsm4z1rnkgkycf5wfmacm804hqnd5rz7xk2shf";
|
||||
subPackages = [
|
||||
"cmd/pomerium"
|
||||
"cmd/pomerium-cli"
|
||||
|
|
|
|||
|
|
@ -1,36 +1,43 @@
|
|||
{ fetchFromGitHub
|
||||
, lib, stdenv
|
||||
, ncurses, neovim, procps
|
||||
, pandoc, lua51Packages, util-linux
|
||||
, scdoc, lua51Packages, util-linux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvimpager";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lucc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1xy5387szfw0bp8dr7d4z33wd4xva7q219rvz8gc0vvv1vsy73va";
|
||||
sha256 = "sha256-okYnPwuxU/syxcKIMUBc25r791D6Bug2w2axH4vvmAY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ncurses # for tput
|
||||
procps # for nvim_get_proc() which uses ps(1)
|
||||
];
|
||||
nativeBuildInputs = [ pandoc ];
|
||||
nativeBuildInputs = [ scdoc ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
buildFlags = [ "nvimpager.configured" ];
|
||||
buildFlags = [ "nvimpager.configured" "nvimpager.1" ];
|
||||
preBuild = ''
|
||||
patchShebangs nvimpager
|
||||
substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim'
|
||||
# remove git command from makefile as we run from a tarball
|
||||
# replace with actual timestamp of the commit
|
||||
substituteInPlace makefile --replace '$(shell git log -1 --no-show-signature --pretty="%ct")' 1623019602
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ lua51Packages.busted util-linux neovim ];
|
||||
checkPhase = ''script -c "busted --lpath './?.lua' test"'';
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
script -c "busted --lpath './?.lua' test"
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Use neovim as pager";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "isync";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
|
||||
sha256 = "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd";
|
||||
sha256 = "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config perl ];
|
||||
|
|
|
|||
|
|
@ -19109,7 +19109,10 @@ in
|
|||
|
||||
engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; };
|
||||
|
||||
envoy = callPackage ../servers/http/envoy { };
|
||||
envoy = callPackage ../servers/http/envoy {
|
||||
go = go_1_15;
|
||||
jdk = openjdk11;
|
||||
};
|
||||
|
||||
etcd = callPackage ../servers/etcd { };
|
||||
etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
|
||||
|
|
@ -24174,7 +24177,7 @@ in
|
|||
gv = callPackage ../applications/misc/gv { };
|
||||
|
||||
gvisor = callPackage ../applications/virtualization/gvisor {
|
||||
go = go_1_14;
|
||||
go = go_1_16;
|
||||
};
|
||||
|
||||
gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { };
|
||||
|
|
@ -30218,7 +30221,9 @@ in
|
|||
|
||||
herwig = callPackage ../development/libraries/physics/herwig { };
|
||||
|
||||
lhapdf = callPackage ../development/libraries/physics/lhapdf { };
|
||||
lhapdf = callPackage ../development/libraries/physics/lhapdf {
|
||||
python = python3;
|
||||
};
|
||||
|
||||
mela = callPackage ../development/libraries/physics/mela { };
|
||||
|
||||
|
|
|
|||
|
|
@ -3840,6 +3840,10 @@ in {
|
|||
|
||||
lexid = callPackage ../development/python-modules/lexid { };
|
||||
|
||||
lhapdf = toPythonModule (pkgs.lhapdf.override {
|
||||
inherit python;
|
||||
});
|
||||
|
||||
libagent = callPackage ../development/python-modules/libagent { };
|
||||
|
||||
pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue