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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-16 18:13:19 +00:00 committed by GitHub
commit 6a0f49f240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 2046 additions and 1365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/misc/matrix-synapse.xml
View File

@ -33,11 +33,11 @@
<link xlink:href="https://github.com/matrix-org/synapse#synapse-installation">
installation instructions of Synapse </link>.
<programlisting>
{ pkgs, ... }:
{ pkgs, lib, ... }:
let
fqdn =
let
join = hostName: domain: hostName + optionalString (domain != null) ".${domain}";
join = hostName: domain: hostName + lib.optionalString (domain != null) ".${domain}";
in join config.networking.hostName config.networking.domain;
in {
networking = {
@ -132,7 +132,7 @@ in {
}
];
};
};
}
</programlisting>
</para>

8
nixos/modules/services/web-apps/discourse.nix
View File

@ -702,7 +702,7 @@ in
cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/
cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/
cp -r ${cfg.package}/share/discourse/plugins.dist/* /run/discourse/plugins/
${lib.concatMapStrings (p: "ln -sf ${p} /run/discourse/plugins/") cfg.plugins}
${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} /run/discourse/plugins/") cfg.plugins}
ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads
ln -sf /var/lib/discourse/backups /run/discourse/public/backups
@ -726,7 +726,8 @@ in
export ADMIN_EMAIL="${cfg.admin.email}"
export ADMIN_NAME="${cfg.admin.fullName}"
export ADMIN_USERNAME="${cfg.admin.username}"
export ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})"
ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})"
export ADMIN_PASSWORD
discourse-rake admin:create_noninteractively
discourse-rake themes:update
@ -938,7 +939,8 @@ in
set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit
export api_key=$(<'${apiKeyPath}')
api_key=$(<'${apiKeyPath}')
export api_key
jq <${mail-receiver-json} \
'.DISCOURSE_API_KEY = $ENV.api_key' \

120
pkgs/applications/editors/emacs-modes/elpa-generated.nix generated
View File

@ -110,6 +110,21 @@
license = lib.licenses.free;
};
}) {};
aggressive-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "aggressive-completion";
ename = "aggressive-completion";
version = "1.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/aggressive-completion-1.5.tar";
sha256 = "1gy0q5yc1a0w31qpyb92f672zcfgxbp5s104ycgk11jxk4y17nw9";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/aggressive-completion.html";
license = lib.licenses.free;
};
}) {};
aggressive-indent = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -219,16 +234,16 @@
license = lib.licenses.free;
};
}) {};
auctex = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
auctex = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.0.5";
version = "13.0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.0.5.tar";
sha256 = "072wwsqfl8n2gi2inbp0s8k1ydr6fh1zyvc3rgynwzibjjniy319";
url = "https://elpa.gnu.org/packages/auctex-13.0.6.tar";
sha256 = "00wp388rh2nnk8fam53kilykg90jylps31qxv9ijy1lsp1hqdjys";
};
packageRequires = [ cl-lib emacs ];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/auctex.html";
license = lib.licenses.free;
@ -925,10 +940,10 @@
elpaBuild {
pname = "dts-mode";
ename = "dts-mode";
version = "0.1.0";
version = "0.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dts-mode-0.1.0.el";
sha256 = "08xwqbdg0gwipc3gfacs3gpc6zz6lhkw7pyj7n9qhg020c4qv7hq";
url = "https://elpa.gnu.org/packages/dts-mode-0.1.1.tar";
sha256 = "1hdbf7snfbg3pfg1vhbak1gq5smaklvaqj1y9mjcnxyipqi47q28";
};
packageRequires = [];
meta = {
@ -1133,10 +1148,10 @@
elpaBuild {
pname = "emms";
ename = "emms";
version = "6.3";
version = "7.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/emms-6.3.tar";
sha256 = "12cfq503li0gcqmm5bmqz8yjvfdif5xvz0l9vx3g5jl6ljygwgmf";
url = "https://elpa.gnu.org/packages/emms-7.1.tar";
sha256 = "1dng8dy0w0wsdvvnjnrllwv5a8wq3kj20jik994b7prdx5dn6y52";
};
packageRequires = [ cl-lib seq ];
meta = {
@ -1205,10 +1220,10 @@
elpaBuild {
pname = "excorporate";
ename = "excorporate";
version = "0.9.3";
version = "0.9.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/excorporate-0.9.3.tar";
sha256 = "1ybj0ww7x7l7ymykk6hs720whabavmwnrwq7x8dkn41wma181zzy";
url = "https://elpa.gnu.org/packages/excorporate-0.9.5.tar";
sha256 = "0z5x8lqvxh8zra23nmh36cdnr2yk855i4fc3mlbwaj5sdy9sqpf5";
};
packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
meta = {
@ -1366,16 +1381,16 @@
license = lib.licenses.free;
};
}) {};
ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
ggtags = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ggtags";
ename = "ggtags";
version = "0.8.13";
version = "0.9.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ggtags-0.8.13.el";
sha256 = "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg";
url = "https://elpa.gnu.org/packages/ggtags-0.9.0.tar";
sha256 = "0p79x9g94jynl83ndvqp9349vhgkzxzhnc517r8hn44iqxqf6ghg";
};
packageRequires = [ cl-lib emacs ];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/ggtags.html";
license = lib.licenses.free;
@ -1779,10 +1794,10 @@
elpaBuild {
pname = "ivy-posframe";
ename = "ivy-posframe";
version = "0.5.5";
version = "0.6.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.5.tar";
sha256 = "184730grclxmlw6nfs41d4g6fvz9c6xnclvwgqx1ii0xm7p9xy95";
url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.0.tar";
sha256 = "07dzglrcdl54lkznyphw97xwd9bcwzdcgzkav0vqfk7f5cwh1wkf";
};
packageRequires = [ emacs ivy posframe ];
meta = {
@ -2497,16 +2512,16 @@
license = lib.licenses.free;
};
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }:
org = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "org";
ename = "org";
version = "9.4.4";
version = "9.4.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.4.4.tar";
sha256 = "05ma8n6hr10323d85ay8ai0xrpc9q2m93n8avqh7j9fmmb3bhr0b";
url = "https://elpa.gnu.org/packages/org-9.4.5.tar";
sha256 = "0h5qhrd984vf17qc227wz68191xfgbpq32dyhw0lcz2d9i0pl3xk";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/org.html";
license = lib.licenses.free;
@ -2561,10 +2576,10 @@
elpaBuild {
pname = "osc";
ename = "osc";
version = "0.2";
version = "0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/osc-0.2.el";
sha256 = "1b1ck9kb9mkyd7nlj4cqahsshar6h8mpvqss6n3dp4cl3r6dk1sw";
url = "https://elpa.gnu.org/packages/osc-0.4.tar";
sha256 = "0zfrzxalvvf9wwwhwsqgl3v2ca6m2rfl5hd7sz662s6gmbwawqqa";
};
packageRequires = [];
meta = {
@ -2726,10 +2741,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
version = "0.8.8";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/posframe-0.8.8.tar";
sha256 = "1ij6brzcxv9viz37qafcinlfx5l20w8x8s6786r1rsda5n1xsmvd";
url = "https://elpa.gnu.org/packages/posframe-1.0.0.tar";
sha256 = "1k06dbh9xqn2vix5qkcapl57v0c21b344r8dx6j5qr4jxirsn2x5";
};
packageRequires = [ emacs ];
meta = {
@ -3676,10 +3691,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.5.0.2";
version = "2.5.0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.0.2.tar";
sha256 = "16f782rjkmxxs5sz3wv4d46i7hbl483ashmrkvljf7lpnrl91s93";
url = "https://elpa.gnu.org/packages/tramp-2.5.0.3.tar";
sha256 = "0c77d1ihn17lzk9jb7ss346ryprnbii1zmijl6zj0kk4lm8fpfl3";
};
packageRequires = [ emacs ];
meta = {
@ -3897,10 +3912,10 @@
elpaBuild {
pname = "verilog-mode";
ename = "verilog-mode";
version = "2021.2.2.263931197";
version = "2021.4.12.188864585";
src = fetchurl {
url = "https://elpa.gnu.org/packages/verilog-mode-2021.2.2.263931197.tar";
sha256 = "0rizadyzrsprc3mw3h2ag4760wapx5gxzsr11rgrllwzzqwin1ks";
url = "https://elpa.gnu.org/packages/verilog-mode-2021.4.12.188864585.tar";
sha256 = "0np2q0jhf1fbb1nl5nx1q9hw40yg62bhlddp2raqryxbkvsh0nbv";
};
packageRequires = [];
meta = {
@ -3908,6 +3923,21 @@
license = lib.licenses.free;
};
}) {};
vertico = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.4.tar";
sha256 = "1af9ri51i7pn1pcsmbavnwqafrn46vbxrbqjzfi6a7q6n5yv77im";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/vertico.html";
license = lib.licenses.free;
};
}) {};
vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "vigenere";
@ -3930,10 +3960,10 @@
elpaBuild {
pname = "visual-filename-abbrev";
ename = "visual-filename-abbrev";
version = "1.0";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.0.el";
sha256 = "086cmyv08jd3qadjrd14b7c932i8msxjdvxxa36pyac18d3i50kj";
url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.1.tar";
sha256 = "1l2wq7q28lcl78flxqvsxc9h96whpynqq8kpmbiy3nzlw2mrgr8g";
};
packageRequires = [ emacs ];
meta = {
@ -4268,10 +4298,10 @@
elpaBuild {
pname = "ztree";
ename = "ztree";
version = "1.0.5";
version = "1.0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ztree-1.0.5.tar";
sha256 = "14pbbsyav1dzz8m8waqdcmcx9bhw5g8m2kh1ahpxc3i2lfhdan1x";
url = "https://elpa.gnu.org/packages/ztree-1.0.6.tar";
sha256 = "1cyd31az566dmh3lyp7czw7kkkih7drr4c88b7da1xzbfkvibm2j";
};
packageRequires = [ cl-lib ];
meta = {

12
pkgs/applications/editors/emacs-modes/org-generated.nix generated
View File

@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "20210322";
version = "20210412";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20210322.tar";
sha256 = "0iv54rhwa0972yr1wqzmlkggs5vc6qajz8mmyfhynp65ap088g6v";
url = "https://orgmode.org/elpa/org-20210412.tar";
sha256 = "17hj4y0c9hjqqa7inzjadz9z64vh621lm4cb0asm13r7d1v186yf";
};
packageRequires = [];
meta = {
@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
version = "20210322";
version = "20210412";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20210322.tar";
sha256 = "0riswc3ira8hsawm37yypji55z47bw2477kaw3qx7ghz3n62r9nf";
url = "https://orgmode.org/elpa/org-plus-contrib-20210412.tar";
sha256 = "162nl1a62l9d4nazply93sx4lih11845z87hxmpfd0n7i7s290mh";
};
packageRequires = [];
meta = {

2877
pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/graphics/digikam/default.nix
View File

@ -55,11 +55,11 @@
mkDerivation rec {
pname = "digikam";
version = "7.1.0";
version = "7.2.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "1gmblnsm0aida3yynyddm6jdh59hx3w177hrhfar616z793ch0xi";
sha256 = "sha256-zYfs4UOu+gLmkqSvXDw8wQe5pNYYBNefp33S40R5ihc=";
};
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];

4
pkgs/applications/misc/go-org/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-org";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "niklasfasching";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nMZzRbu3lxunIlnnmb49Ljt8oSiYpj+8gZ0u/OFRRDM=";
sha256 = "sha256-Wp8WEfRcrtn+VdcbehYcOJI5FkPQiyo6nLsTDvR7riE=";
};
vendorSha256 = "sha256-njx89Ims7GZql8sbVmH/E9gM/ONRWiPRLVs+FzsCSzI=";

12
pkgs/applications/misc/kupfer/default.nix
View File

@ -4,8 +4,11 @@
, python3Packages
, gobject-introspection
, gtk3
, itstool
, libwnck3
, keybinder3
, desktop-file-utils
, shared-mime-info
, wrapGAppsHook
, wafHook
}:
@ -14,19 +17,22 @@ with python3Packages;
buildPythonApplication rec {
pname = "kupfer";
version = "319";
version = "321";
format = "other";
src = fetchurl {
url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz";
sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92";
url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.bz2";
sha256 = "0nagjp63gxkvsgzrpjk78cbqx9a7rbnjivj1avzb2fkhrlxa90c7";
};
nativeBuildInputs = [
wrapGAppsHook intltool
# For setup hook
gobject-introspection wafHook
itstool # for help pages
desktop-file-utils # for update-desktop-database
shared-mime-info # for update-mime-info
];
buildInputs = [ docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];

16
pkgs/applications/misc/waybar/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, meson
, pkg-config
, ninja
@ -28,26 +27,15 @@
stdenv.mkDerivation rec {
pname = "waybar";
version = "0.9.5";
version = "0.9.7";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q";
sha256 = "17cn4d3dx92v40jd9vl41smp8hh3gf5chd1j2f7l1lrpfpnllg5x";
};
patches = [
# XXX: REMOVE ON NEXT VERSION BUMP
# Fixes compatibility of the bluetooth and network modules with linux kernel
# >=5.11
# c.f. https://github.com/Alexays/Waybar/issues/994
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/Alexays/Waybar/pull/1015.patch";
sha256 = "sha256-jQZEM3Yru2yxcXAzapU47DoAv4ZoabrV80dH42I2OFk=";
})
];
nativeBuildInputs = [
meson ninja pkg-config scdoc wrapGAppsHook cmake
] ++ lib.optional withMediaPlayer gobject-introspection;

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.28.22";
version = "0.28.24";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tFM9kRdr98Jm2n6i5QDUKlLsI96RZ+e7MeYc7Y+ryUE=";
sha256 = "sha256-7wfBKXO4uUrFjEklmgfgzIECARsOolwXjNFOFqfn1ds=";
};
vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8=";

11
pkgs/applications/networking/instant-messengers/bluejeans/default.nix
View File

@ -35,16 +35,17 @@
, alsaLib
, pulseaudio
, makeWrapper
, xdg-utils
}:
stdenv.mkDerivation rec {
pname = "bluejeans";
version = "2.19.0";
buildNumber = "61";
version = "2.21.3";
buildNumber = "2";
src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm";
sha256 = "163p67dqry256d454qzk4k4b692kz8s9fcvaxd6gi7zvnsd48ikr";
sha256 = "sha256-a/REuxkqZmLLa7N3CUgUAdq74VMD9D10a/Sx2jOj1QA=";
};
nativeBuildInputs = [ rpmextract makeWrapper ];
@ -100,6 +101,7 @@ stdenv.mkDerivation rec {
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--replace-needed libudev.so.0 libudev.so.1 \
opt/BlueJeans/bluejeans-v2
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
opt/BlueJeans/resources/BluejeansHelper
@ -108,7 +110,8 @@ stdenv.mkDerivation rec {
makeWrapper $out/opt/BlueJeans/bluejeans-v2 $out/bin/bluejeans \
--set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \
--set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so
--set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so \
--prefix PATH : ${lib.makeBinPath [ xdg-utils ]}
substituteInPlace "$out"/share/applications/bluejeans-v2.desktop \
--replace "/opt/BlueJeans/bluejeans-v2" "$out/bin/bluejeans"

5
pkgs/applications/version-management/gitlab/default.nix
View File

@ -122,7 +122,10 @@ stdenv.mkDerivation {
rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools
];
patches = [ ./remove-hardcoded-locations.patch ];
patches = [
# Change hardcoded paths to the NixOS equivalent
./remove-hardcoded-locations.patch
];
postPatch = ''
${lib.optionalString (!gitlabEnterprise) ''

4
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View File

@ -7,14 +7,14 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-wDZLcCBbWjG6wIcEj02eqwWVfAYy1TuAo/xvJB8tt+0=";
sha256 = "sha256-j/80AIIJdRSisu2fNXcqazb4oIzAQP5CfxHX3l6yijY=";
};
buildInputs = [ ruby ];
patches = [ ./remove-hardcoded-locations.patch ];
vendorSha256 = "16fa3bka0008x2yazahc6xxcv4fa6yqg74kk64v8lrp7snbvjf4d";
vendorSha256 = "sha256-/jJTMtS5fcbQroWuaPPfvYxy6znNS0FOXVN7IcE/spQ=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

46
pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
View File

@ -1,34 +1,25 @@
diff --git a/internal/config/config.go b/internal/config/config.go
index 79c2a36..12ba31e 100644
index 36f8625..72ede08 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -3,7 +3,6 @@ package config
import (
"io/ioutil"
"net/url"
- "os"
"path"
"path/filepath"
@@ -12,7 +12,7 @@ import (
)
@@ -59,16 +58,13 @@ func (c *Config) GetHttpClient() *client.HttpClient {
const (
- configFile = "config.yml"
+ configFile = "shell-config.yml"
defaultSecretFileName = ".gitlab_shell_secret"
)
@@ -91,7 +91,7 @@ func (c *Config) GetHttpClient() *client.HttpClient {
// NewFromDirExternal returns a new config from a given root dir. It also applies defaults appropriate for
// gitlab-shell running in an external SSH server.
func NewFromDirExternal(dir string) (*Config, error) {
- cfg, err := newFromFile(filepath.Join(dir, configFile))
+ cfg, err := newFromFile(filepath.Join("/run/gitlab", configFile))
if err != nil {
return nil, err
}
func New() (*Config, error) {
- dir, err := os.Getwd()
- if err != nil {
- return nil, err
- }
+ dir := "/run/gitlab"
return NewFromDir(dir)
}
func NewFromDir(dir string) (*Config, error) {
- return newFromFile(path.Join(dir, configFile))
+ return newFromFile("/run/gitlab/shell-config.yml")
}
func newFromFile(filename string) (*Config, error) {
diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go
index c6f2422..fb0426b 100644
--- a/internal/keyline/key_line.go
@ -55,6 +46,3 @@ index 52ac5ee..d96baa3 100644
end
def auth_file
--
2.28.0

14
pkgs/applications/window-managers/hikari/default.nix
View File

@ -43,14 +43,11 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
# Must replace GNU Make by bmake
buildPhase = with lib; concatStringsSep " " (
[ "bmake" "-j$NIX_BUILD_CORES" "PREFIX=$out" ]
makeFlags = with lib; [ "PREFIX=$(out)" ]
++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES"
++ mapAttrsToList (feat: enabled:
optionalString enabled "WITH_${toUpper feat}=YES"
) features
);
) features;
# Can't suid in nix store
# Run hikari as root (it will drop privileges as early as possible), or create
@ -59,13 +56,6 @@ stdenv.mkDerivation {
substituteInPlace Makefile --replace '4555' '555'
'';
installPhase = ''
bmake \
PREFIX=$out \
install
runHook postInstall
'';
meta = with lib; {
description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux";
homepage = "https://hikari.acmelabs.space";

4
pkgs/desktops/gnome-3/extensions/unite/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
version = "49";
version = "50";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
sha256 = "12kjljw253hshaz6x886kg3mc93lb4pxwd05qihww6m5k4lqjcy5";
sha256 = "14n9lrjbxcmvcjnh6zbwlc1paqfhbg81lj0y2d35sh1c2fbsb7d9";
};
uuid = "unite@hardpixel.eu";

6
pkgs/development/libraries/libfsm/default.nix
View File

@ -22,11 +22,7 @@ stdenv.mkDerivation rec {
# if we use stdenv vs clangStdenv, we don't know which, and CC=cc in all
# cases.) it's unclear exactly what should be done if we want those flags,
# but the defaults work fine.
buildPhase = "PREFIX=$out bmake -r -j$NIX_BUILD_CORES";
installPhase = ''
PREFIX=$out bmake -r install
runHook postInstall
'';
makeFlags = [ "-r" "PREFIX=$(out)" ];
# fix up multi-output install. we also have to fix the pkg-config libdir
# file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in

34
pkgs/development/python-modules/pycomfoconnect/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, protobuf
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pycomfoconnect";
version = "0.4";
src = fetchFromGitHub {
owner = "michaelarnauts";
repo = "comfoconnect";
rev = version;
sha256 = "0bipzv68yw056iz9m2g9h40hzrwd058a7crxp0xbq4rw2d8j0jn6";
};
propagatedBuildInputs = [
protobuf
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pycomfoconnect" ];
meta = with lib; {
description = "Python module to interact with ComfoAir Q350/450/600 units";
homepage = "https://github.com/michaelarnauts/comfoconnect";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests }:
{ lib, buildPythonPackage, fetchFromGitHub, requests, six }:
buildPythonPackage rec {
pname = "pyvmomi";
@ -14,7 +14,7 @@ buildPythonPackage rec {
# requires old version of vcrpy
doCheck = false;
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [ requests six ];
meta = with lib; {
description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter";

6
pkgs/development/python-modules/tqdm/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, setuptools_scm
@ -30,10 +31,11 @@ buildPythonPackage rec {
pytest-timeout
# tests of optional features
numpy
pandas
rich
tkinter
];
] ++
# pandas is not supported on i686
lib.optional (!stdenv.isi686) pandas;
# Remove performance testing.
# Too sensitive for on Hydra.

2
pkgs/development/tools/build-managers/bmake/default.nix
View File

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
./fix-unexport-env-test.patch
];
setupHook = ./setup-hook.sh;
meta = with lib; {
description = "Portable version of NetBSD 'make'";
homepage = "http://www.crufty.net/help/sjg/bmake.html";

117
pkgs/development/tools/build-managers/bmake/setup-hook.sh Normal file
View File

@ -0,0 +1,117 @@
bmakeBuildPhase() {
runHook preBuild
local flagsArray=(
${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
SHELL=$SHELL
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
$buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
)
echoCmd 'build flags' "${flagsArray[@]}"
bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
unset flagsArray
runHook postBuild
}
if [ -z "${dontUseBmakeBuild-}" -a -z "${buildPhase-}" ]; then
buildPhase=bmakeBuildPhase
fi
bmakeCheckPhase() {
runHook preCheck
if [ -z "${checkTarget:-}" ]; then
#TODO(@oxij): should flagsArray influence make -n?
if bmake -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then
checkTarget=check
elif bmake -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then
checkTarget=test
fi
fi
if [ -z "${checkTarget:-}" ]; then
echo "no test target found in bmake, doing nothing"
else
# shellcheck disable=SC2086
local flagsArray=(
${enableParallelChecking:+-j${NIX_BUILD_CORES}}
SHELL=$SHELL
# Old bash empty array hack
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
${checkTarget}
)
echoCmd 'check flags' "${flagsArray[@]}"
bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
unset flagsArray
fi
runHook postCheck
}
if [ -z "${dontUseBmakeCheck-}" -a -z "${checkPhase-}" ]; then
checkPhase=bmakeCheckPhase
fi
bmakeInstallPhase() {
runHook preInstall
if [ -n "$prefix" ]; then
mkdir -p "$prefix"
fi
# shellcheck disable=SC2086
local flagsArray=(
SHELL=$SHELL
# Old bash empty array hack
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
$installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
${installTargets:-install}
)
echoCmd 'install flags' "${flagsArray[@]}"
bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
unset flagsArray
runHook postInstall
}
if [ -z "${dontUseBmakeInstall-}" -a -z "${installPhase-}" ]; then
installPhase=bmakeInstallPhase
fi
bmakeDistPhase() {
runHook preDist
if [ -n "$prefix" ]; then
mkdir -p "$prefix"
fi
# Old bash empty array hack
# shellcheck disable=SC2086
local flagsArray=(
$distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist}
)
echo 'dist flags: %q' "${flagsArray[@]}"
bmake ${makefile:+-f $makefile} "${flagsArray[@]}"
if [ "${dontCopyDist:-0}" != 1 ]; then
mkdir -p "$out/tarballs"
# Note: don't quote $tarballs, since we explicitly permit
# wildcards in there.
# shellcheck disable=SC2086
cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs"
fi
runHook postDist
}
if [ -z "${dontUseBmakeDist-}" -a -z "${distPhase-}" ]; then
distPhase=bmakeDistPhase
fi

6
pkgs/development/tools/wrangler/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wrangler";
version = "1.15.0";
version = "1.16.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/5iIdEUbesX+IRQQzeJazt3i/xAtghblct718EmYci4=";
sha256 = "sha256-ZOkoUMkpp89ON60xgz0ZzL9RAZeHstKTTl/UEc/y3Ls=";
};
cargoSha256 = "sha256-6XWFhfY8QIl4S6zDyyM2YvFUoGMnKZQ3d/GT4yQWb7A=";
cargoSha256 = "sha256-Cppj3sRJzH8UiyM8lXT2dWqsWr83EApYKqYq3nJQZi8=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/games/mindustry/default.nix
View File

@ -191,6 +191,8 @@ stdenv.mkDerivation rec {
platforms = platforms.x86_64;
# Hash mismatch on darwin:
# https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293
broken = stdenv.isDarwin;
broken = stdenv.isDarwin
# does not work with any maintained java version (https://github.com/Anuken/Mindustry/issues/5114)
|| true;
};
}

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

@ -479,8 +479,8 @@ let
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
version = "0.0.209";
sha256 = "1i0wq8zwax4kmy69hh0hclx9a47ycm3qp3gspjq8xpmcq3nmbfaq";
version = "0.0.211";
sha256 = "1di2v1bhlhl1yi9rrmbq0r9gypiydl8xvj24yw64vsnkqs9yxbp3";
};
meta = with lib; {
license = licenses.mit;

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

@ -131,7 +131,7 @@
"coinbase" = ps: with ps; [ ]; # missing inputs: coinbase
"color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief
"comed_hourly_pricing" = ps: with ps; [ ];
"comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect
"comfoconnect" = ps: with ps; [ pycomfoconnect ];
"command_line" = ps: with ps; [ ];
"concord232" = ps: with ps; [ ]; # missing inputs: concord232
"config" = ps: with ps; [ aiohttp-cors ];

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

@ -218,6 +218,7 @@ in with py.pkgs; buildPythonApplication rec {
"cast"
"climate"
"cloud"
"comfoconnect"
"command_line"
"config"
"configurator"

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

@ -6,13 +6,13 @@
}:
let
version = "2.6.3";
version = "2.6.5";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-lAIhVxvmjxEiru1KNxbFV+eDMLUGza/Dma3WU0ex0xs=";
sha256 = "sha256-JQUgHxs2Cl2LBpg/6JLhZxje4RmPREL1IPta84kXwPw=";
};
runtimeDeps = [

36
pkgs/tools/graphics/pikchr/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchurl
}:
stdenv.mkDerivation {
pname = "pikchr";
version = "unstable-2021-04-07";
src = fetchurl {
url = "https://pikchr.org/home/tarball/90b6d5b4a3834ff0/pikchr.tar.gz";
sha256 = "1cqpnljy12gl82rcbb7mwhgv9szcliwkbwwh67hzdv020h1scxym";
};
# can't open generated html files
postPatch = ''
substituteInPlace Makefile --replace open "test -f"
'';
installPhase = ''
install -Dm755 pikchr $out/bin/pikchr
install -Dm755 pikchr.out $out/lib/pikchr.o
install -Dm644 pikchr.h $out/include/pikchr.h
'';
doCheck = true;
checkTarget = "test";
meta = with lib; {
description = "A PIC-like markup language for diagrams in technical documentation";
homepage = "https://pikchr.org";
license = licenses.bsd0;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
};
}

8
pkgs/tools/misc/neofetch/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenvNoCC, fetchFromGitHub, bash }:
{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils }:
stdenvNoCC.mkDerivation rec {
pname = "neofetch";
@ -13,10 +13,16 @@ stdenvNoCC.mkDerivation rec {
strictDeps = true;
buildInputs = [ bash ];
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
patchShebangs --host neofetch
'';
postInstall = ''
wrapProgram $out/bin/neofetch \
--prefix PATH : ${lib.makeBinPath [ pciutils ]}
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
"SYSCONFDIR=${placeholder "out"}/etc"

18
pkgs/tools/networking/gmrender-resurrect/default.nix
View File

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, makeWrapper, gstreamer
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper, gstreamer
, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }:
let
version = "0.0.8";
version = "0.0.9";
makePluginPath = plugins: builtins.concatStringsSep ":" (map (p: p + "/lib/gstreamer-1.0") plugins);
@ -16,17 +16,9 @@ in
owner = "hzeller";
repo = "gmrender-resurrect";
rev = "v${version}";
sha256 = "14i5jrry6qiap5l2x2jqj7arymllajl3wgnk29ccvr8d45zp4jn1";
sha256 = "0byxd28hnhkhf3lqsad43n6czfajvc1ksg9zikxb95wwk4ljqv1q";
};
patches = [
(fetchpatch {
url = "https://github.com/hzeller/gmrender-resurrect/commit/dc8c4d4dc234311b3099e7f1efadf5d9733c81e9.patch";
sha256 = "0fqi58viaq9jg5h5j1725qrach4c3wmfmh0q43q4r8az2pn7dszw";
name = "libupnp.patch";
})
];
buildInputs = [ gstreamer libupnp ];
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
@ -39,8 +31,8 @@ in
meta = with lib; {
description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer";
homepage = "https://github.com/hzeller/gmrender-resurrect";
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ koral ashkitten ];
maintainers = with maintainers; [ koral hzeller ];
};
}

8
pkgs/tools/security/cryptomator/default.nix
View File

@ -6,20 +6,20 @@
let
pname = "cryptomator";
version = "1.5.13";
version = "1.5.14";
src = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator";
rev = version;
sha256 = "1s9jl3nl6yfjzmilz9b8azk8592nd39xflzfdf38v6s4iiq86r8j";
sha256 = "05zgan1i2dzipzw8x510lg2l40dz9hvk43nrwpi0kg9l1qs9sxrq";
};
icons = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator-linux";
rev = version;
sha256 = "1x6h6wp6yxnj576874xj3d2jm8jmb7918wprqvlz4sryxhlcssa7";
sha256 = "0gb5sd5bkpxv4hff1i09rxr90pi5d15vjsfrk9m8221xiypqmccp";
};
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
@ -44,7 +44,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "06q8bqdz3c4i84wxl9z5861zwdsw8jzcvsbgxqrnh8rwi7500sa7";
outputHash = "0gvpjc77g99vcwk77nknvg8z33xbskcfwx3015nhhc089b2frq02";
};
in stdenv.mkDerivation rec {

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

@ -870,6 +870,8 @@ in
nimmm = callPackage ../applications/terminal-emulators/nimmm { };
pikchr = callPackage ../tools/graphics/pikchr { };
roxterm = callPackage ../applications/terminal-emulators/roxterm { };
rxvt = callPackage ../applications/terminal-emulators/rxvt { };

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

@ -5280,6 +5280,8 @@ in {
pycollada = callPackage ../development/python-modules/pycollada { };
pycomfoconnect = callPackage ../development/python-modules/pycomfoconnect { };
pycontracts = callPackage ../development/python-modules/pycontracts { };
pycosat = callPackage ../development/python-modules/pycosat { };