github-actions[bot]
2 years ago
committed by
GitHub
commit
5dce602f06
@ -0,0 +1,52 @@ |
||||
{ config, pkgs, lib, ... }: |
||||
|
||||
with lib; |
||||
|
||||
{ |
||||
# interface |
||||
options.programs.k3b = { |
||||
enable = mkOption { |
||||
type = types.bool; |
||||
default = false; |
||||
description = '' |
||||
Whether to enable k3b, the KDE disk burning application. |
||||
|
||||
Additionally to installing <package>k3b</package> enabling this will |
||||
add <literal>setuid</literal> wrappers in <literal>/run/wrappers/bin</literal> |
||||
for both <package>cdrdao</package> and <package>cdrecord</package>. On first |
||||
run you must manually configure the path of <package>cdrdae</package> and |
||||
<package>cdrecord</package> to correspond to the appropriate paths under |
||||
<literal>/run/wrappers/bin</literal> in the "Setup External Programs" menu. |
||||
''; |
||||
}; |
||||
}; |
||||
|
||||
# implementation |
||||
config = mkIf config.programs.k3b.enable { |
||||
|
||||
environment.systemPackages = with pkgs; [ |
||||
k3b |
||||
dvdplusrwtools |
||||
cdrdao |
||||
cdrkit |
||||
]; |
||||
|
||||
security.wrappers = { |
||||
cdrdao = { |
||||
setuid = true; |
||||
owner = "root"; |
||||
group = "cdrom"; |
||||
permissions = "u+wrx,g+x"; |
||||
source = "${pkgs.cdrdao}/bin/cdrdao"; |
||||
}; |
||||
cdrecord = { |
||||
setuid = true; |
||||
owner = "root"; |
||||
group = "cdrom"; |
||||
permissions = "u+wrx,g+x"; |
||||
source = "${pkgs.cdrkit}/bin/cdrecord"; |
||||
}; |
||||
}; |
||||
|
||||
}; |
||||
} |
||||
@ -0,0 +1,36 @@ |
||||
{ config, pkgs, lib, ... }: |
||||
|
||||
{ |
||||
config = lib.mkIf (config.boot.initrd.enable && config.boot.initrd.systemd.enable) { |
||||
# Copy secrets into the initrd if they cannot be appended |
||||
boot.initrd.systemd.contents = lib.mkIf (!config.boot.loader.supportsInitrdSecrets) |
||||
(lib.mapAttrs' (dest: source: lib.nameValuePair "/.initrd-secrets/${dest}" { source = if source == null then dest else source; }) config.boot.initrd.secrets); |
||||
|
||||
# Copy secrets to their respective locations |
||||
boot.initrd.systemd.services.initrd-nixos-copy-secrets = lib.mkIf (config.boot.initrd.secrets != {}) { |
||||
description = "Copy secrets into place"; |
||||
# Run as early as possible |
||||
wantedBy = [ "sysinit.target" ]; |
||||
before = [ "cryptsetup-pre.target" ]; |
||||
unitConfig.DefaultDependencies = false; |
||||
|
||||
# We write the secrets to /.initrd-secrets and move them because this allows |
||||
# secrets to be written to /run. If we put the secret directly to /run and |
||||
# drop this service, we'd mount the /run tmpfs over the secret, making it |
||||
# invisible in stage 2. |
||||
script = '' |
||||
for secret in $(cd /.initrd-secrets; find . -type f); do |
||||
mkdir -p "$(dirname "/$secret")" |
||||
cp "/.initrd-secrets/$secret" "/$secret" |
||||
done |
||||
''; |
||||
|
||||
unitConfig = { |
||||
Type = "oneshot"; |
||||
RemainAfterExit = true; |
||||
}; |
||||
}; |
||||
# The script needs this |
||||
boot.initrd.systemd.extraBin.find = "${pkgs.findutils}/bin/find"; |
||||
}; |
||||
} |
||||
@ -0,0 +1,33 @@ |
||||
{ system ? builtins.currentSystem |
||||
, config ? {} |
||||
, pkgs ? import ../.. { inherit system config; } |
||||
}: |
||||
|
||||
{ |
||||
# Some of these tests don't work with systemd stage 1 yet. Uncomment |
||||
# them when fixed. |
||||
inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; }) |
||||
# bcache |
||||
# btrfsSimple |
||||
# btrfsSubvolDefault |
||||
# btrfsSubvols |
||||
# encryptedFSWithKeyfile |
||||
# grub1 |
||||
# luksroot |
||||
# luksroot-format1 |
||||
# luksroot-format2 |
||||
# lvm |
||||
separateBoot |
||||
separateBootFat |
||||
simple |
||||
simpleLabels |
||||
simpleProvided |
||||
simpleSpecialised |
||||
simpleUefiGrub |
||||
simpleUefiGrubSpecialisation |
||||
simpleUefiSystemdBoot |
||||
# swraid |
||||
# zfsroot |
||||
; |
||||
|
||||
} |
||||
@ -0,0 +1,25 @@ |
||||
# Setup hook for checking whether a vim command exists |
||||
echo "Sourcing vim-command-check-hook.sh" |
||||
|
||||
vimCommandCheckHook () { |
||||
echo "Executing vimCommandCheckHook" |
||||
|
||||
if [ -n "$vimCommandCheck" ]; then |
||||
echo "Check whether the following modules can be imported: $vimCommandCheck" |
||||
|
||||
# editorconfig-checker-disable |
||||
export HOME="$TMPDIR" |
||||
@vimBinary@ -es -n -u NONE -i NONE --clean -V1 --cmd "set rtp+=$out" \ |
||||
--cmd "runtime! plugin/*.vim" <<-EOF |
||||
if exists(":$vimCommandCheck") == 2 |
||||
cquit 0 |
||||
else |
||||
cquit 1 |
||||
fi |
||||
EOF |
||||
fi |
||||
} |
||||
|
||||
echo "Using vimCommandCheckHook" |
||||
preDistPhases+=" vimCommandCheckHook" |
||||
|
||||
@ -1,6 +1,6 @@ |
||||
{ |
||||
"version": "1.10.10", |
||||
"desktopSrcHash": "Atgcu+K28pScYokS/lTu+/mMeEC+1yTcn3Akq+KZJNY=", |
||||
"version": "1.10.11", |
||||
"desktopSrcHash": "n74KFmHI6ZQWBEJCR55VZHS//myh2RePcJRVOmZ6XHo=", |
||||
"desktopYarnHash": "0jm0i1yyfkg1ll11pb3qif1vdxx6rp0yl9kd8jg9nhsg2jzw66pr", |
||||
"webHash": "1xp0rhw3k2znwvqqikhd771l2n6xyx8npcz87m9d4cisl82lpnr0" |
||||
"webHash": "02m64bhg1ls4a5igmizkkxnqfmbfhs0xy24ycr75vxmn0zmwa3yd" |
||||
} |
||||
|
||||
@ -0,0 +1,17 @@ |
||||
#!/usr/bin/env nix-shell |
||||
#!nix-shell --pure -i bash -p cacert bundix |
||||
|
||||
# Do these steps before running this script: |
||||
# 1. Copy Gemfile from new Redmine version to this folder |
||||
# 2. Manually modify the database lines in Gemfile (diff the two files, it's obvious) |
||||
|
||||
pkg_dir="$(dirname "$0")" |
||||
cd ${pkg_dir} |
||||
|
||||
for file in "gemset.nix" "Gemfile.lock"; do |
||||
if [ -f ${file} ]; then |
||||
rm ${file} |
||||
fi |
||||
done |
||||
|
||||
bundix -l |
||||
File diff suppressed because one or more lines are too long
@ -1,13 +0,0 @@ |
||||
diff --git a/src/notification.c b/src/notification.c
|
||||
index 5412609..4243e98 100644
|
||||
--- a/src/notification.c
|
||||
+++ b/src/notification.c
|
||||
@@ -366,7 +366,7 @@
|
||||
int status;
|
||||
g_autofree char *err = NULL;
|
||||
g_autoptr(GError) error = NULL;
|
||||
- const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon";
|
||||
+ const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon";
|
||||
const char *args[6];
|
||||
|
||||
if (G_IS_THEMED_ICON (icon))
|
||||
@ -1,32 +1,58 @@ |
||||
{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, flask, blinker, twill }: |
||||
{ lib |
||||
, stdenv |
||||
, blinker |
||||
, pytestCheckHook |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, flask |
||||
, pythonOlder |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "Flask-Testing"; |
||||
pname = "flask-testing"; |
||||
version = "0.8.1"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "0a734d7b68e63a9410b413cd7b1f96456f9a858bd09a6222d465650cc782eb01"; |
||||
pname = "Flask-Testing"; |
||||
inherit version; |
||||
hash = "sha256-CnNNe2jmOpQQtBPNex+WRW+ahYvQmmIi1GVlDMeC6wE="; |
||||
}; |
||||
|
||||
postPatch = '' |
||||
substituteInPlace setup.py --replace "twill==0.9.1" "twill" |
||||
''; |
||||
propagatedBuildInputs = [ |
||||
flask |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
blinker |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ flask ]; |
||||
# Some of the tests use localhost networking on darwin |
||||
doCheck = !stdenv.isDarwin; |
||||
|
||||
checkInputs = [ blinker ] ++ lib.optionals (!isPy3k) [ twill ]; |
||||
disabledTests = [ |
||||
# RuntimeError and NotImplementedError |
||||
"test_assert_redirects" |
||||
"test_server_listening" |
||||
"test_server_process_is_spawned" |
||||
]; |
||||
|
||||
# twill integration is outdated in Python 2, hence it the tests fails. |
||||
# Some of the tests use localhost networking on darwin. |
||||
doCheck = isPy3k && !stdenv.isDarwin; |
||||
disabledTestPaths = [ |
||||
# twill is only used by Python 2 according setup.py |
||||
"tests/test_twill.py" |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "flask_testing" ]; |
||||
pythonImportsCheck = [ |
||||
"flask_testing" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Flask unittest integration."; |
||||
description = "Extension provides unit testing utilities for Flask"; |
||||
homepage = "https://pythonhosted.org/Flask-Testing/"; |
||||
license = licenses.bsd3; |
||||
maintainers = [ maintainers.mic92 ]; |
||||
maintainers = with maintainers; [ mic92 ]; |
||||
}; |
||||
} |
||||
|
||||
@ -1,40 +1,57 @@ |
||||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests |
||||
, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27 |
||||
, poetry-core }: |
||||
{ lib |
||||
, stdenv |
||||
, buildPythonPackage |
||||
, dbus-python |
||||
, fetchFromGitHub |
||||
, flask |
||||
, flask-cors |
||||
, poetry-core |
||||
, pythonOlder |
||||
, requests |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "SwSpotify"; |
||||
pname = "swspotify"; |
||||
version = "1.2.3"; |
||||
disabled = isPy27; |
||||
format = "pyproject"; |
||||
|
||||
disabled = pythonOlder "3.6"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "SwagLyrics"; |
||||
repo = "SwSpotify"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY="; |
||||
hash = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ poetry-core ]; |
||||
|
||||
propagatedBuildInputs = [ requests flask flask-cors ] |
||||
++ lib.optionals stdenv.isLinux [ dbus-python ]; |
||||
|
||||
doCheck = !stdenv.isDarwin; |
||||
|
||||
checkPhase = '' |
||||
pytest tests/test_spotify.py::${if stdenv.isDarwin then "DarwinTests" else "LinuxTests"} |
||||
nativeBuildInputs = [ |
||||
poetry-core |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
dbus-python |
||||
flask |
||||
flask-cors |
||||
requests |
||||
]; |
||||
|
||||
postPatch = '' |
||||
# Detection of the platform doesn't always works with 1.2.3 |
||||
substituteInPlace pyproject.toml \ |
||||
--replace 'dbus-python = {version = "^1.2.16", platform = "linux"}' "" |
||||
''; |
||||
|
||||
checkInputs = [ pytestCheckHook mock ]; |
||||
# Tests want to use Dbus |
||||
doCheck = false; |
||||
|
||||
pythonImportsCheck = [ "SwSpotify" ]; |
||||
pythonImportsCheck = [ |
||||
"SwSpotify" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/SwagLyrics/SwSpotify"; |
||||
description = "Library to get the currently playing song and artist from Spotify"; |
||||
homepage = "https://github.com/SwagLyrics/SwSpotify"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ siraben ]; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
|
||||
@ -1,35 +0,0 @@ |
||||
{ stdenv, fetchurl, lib, zlib, pcre |
||||
, memorymappingHook, memstreamHook |
||||
, tlsSupport ? true, gnutls ? null |
||||
# ^ set { tlsSupport = false; } to reduce closure size by ~= 18.6 MB |
||||
}: |
||||
|
||||
assert tlsSupport -> gnutls != null; |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "tintin"; |
||||
version = "2.02.12"; |
||||
|
||||
src = fetchurl { |
||||
url = "mirror://sourceforge/tintin/tintin-${version}.tar.gz"; |
||||
sha256 = "sha256-tvn9TywefNyM/0Fy16gAFJYbA5Q4DO2RgiCdw014GgA="; |
||||
}; |
||||
|
||||
nativeBuildInputs = lib.optional tlsSupport gnutls.dev; |
||||
buildInputs = [ zlib pcre ] |
||||
++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ] |
||||
++ lib.optional tlsSupport gnutls; |
||||
|
||||
preConfigure = '' |
||||
cd src |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "A free MUD client for macOS, Linux and Windows"; |
||||
homepage = "http://tintin.sourceforge.net"; |
||||
license = licenses.gpl2; |
||||
maintainers = with maintainers; [ lovek323 ]; |
||||
mainProgram = "tt++"; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue