Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-08-04 18:01:05 +00:00 committed by GitHub
commit 3af9469ebd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
96 changed files with 1160 additions and 1133 deletions

View File

@ -187,6 +187,27 @@ Decision: All functions remove trailing slashes in their results.
</details>
### Prefer returning subpaths over components
[subpath-preference]: #prefer-returning-subpaths-over-components
Observing: Functions could return subpaths or lists of path component strings.
Considering: Subpaths are used as inputs for some functions. Using them for outputs, too, makes the library more consistent and composable.
Decision: Subpaths should be preferred over list of path component strings.
<details>
<summary>Arguments</summary>
- (+) It is consistent with functions accepting subpaths, making the library more composable
- (-) It is less efficient when the components are needed, because after creating the normalised subpath string, it will have to be parsed into components again
- (+) If necessary, we can still make it faster by adding builtins to Nix
- (+) Alternatively if necessary, versions of these functions that return components could later still be introduced.
- (+) It makes the path library simpler because there's only two types (paths and subpaths). Only `lib.path.subpath.components` can be used to get a list of components.
And once we have a list of component strings, `lib.lists` and `lib.strings` can be used to operate on them.
For completeness, `lib.path.subpath.join` allows converting the list of components back to a subpath.
</details>
## Other implementations and references
- [Rust](https://doc.rust-lang.org/std/path/struct.Path.html)

View File

@ -438,6 +438,37 @@ in /* No rec! Add dependencies on this file at the top. */ {
${subpathInvalidReason path}''
) 0 subpaths;
/*
Split [a subpath](#function-library-lib.path.subpath.isValid) into its path component strings.
Throw an error if the subpath isn't valid.
Note that the returned path components are also valid subpath strings, though they are intentionally not [normalised](#function-library-lib.path.subpath.normalise).
Laws:
- Splitting a subpath into components and [joining](#function-library-lib.path.subpath.join) the components gives the same subpath but [normalised](#function-library-lib.path.subpath.normalise):
subpath.join (subpath.components s) == subpath.normalise s
Type:
subpath.components :: String -> [ String ]
Example:
subpath.components "."
=> [ ]
subpath.components "./foo//bar/./baz/"
=> [ "foo" "bar" "baz" ]
subpath.components "/foo"
=> <error>
*/
subpath.components =
subpath:
assert assertMsg (isValid subpath) ''
lib.path.subpath.components: Argument is not a valid subpath string:
${subpathInvalidReason subpath}'';
splitRelPath subpath;
/* Normalise a subpath. Throw an error if the subpath isn't valid, see
`lib.path.subpath.isValid`

View File

@ -238,6 +238,19 @@ let
expr = (builtins.tryEval (subpath.normalise "..")).success;
expected = false;
};
testSubpathComponentsExample1 = {
expr = subpath.components ".";
expected = [ ];
};
testSubpathComponentsExample2 = {
expr = subpath.components "./foo//bar/./baz/";
expected = [ "foo" "bar" "baz" ];
};
testSubpathComponentsExample3 = {
expr = (builtins.tryEval (subpath.components "/foo")).success;
expected = false;
};
};
in
if cases == [] then "Unit tests successful"

View File

@ -15,6 +15,7 @@ let
APP_NAME = ${cfg.appName}
RUN_USER = ${cfg.user}
RUN_MODE = prod
WORK_PATH = ${cfg.stateDir}
${generators.toINI {} cfg.settings}

View File

@ -29,23 +29,49 @@ let
ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ];
})));
};
services.dhcpd4 = {
enable = true;
interfaces = map (n: "eth${toString n}") vlanIfs;
extraConfig = flip concatMapStrings vlanIfs (n: ''
subnet 192.168.${toString n}.0 netmask 255.255.255.0 {
option routers 192.168.${toString n}.1;
range 192.168.${toString n}.3 192.168.${toString n}.254;
}
'')
;
machines = flip map vlanIfs (vlan:
{
hostName = "client${toString vlan}";
ethernetAddress = qemu-common.qemuNicMac vlan 1;
ipAddress = "192.168.${toString vlan}.2";
}
);
services.kea = {
dhcp4 = {
enable = true;
settings = {
interfaces-config = {
interfaces = map (n: "eth${toString n}") vlanIfs;
dhcp-socket-type = "raw";
service-sockets-require-all = true;
service-sockets-max-retries = 5;
service-sockets-retry-wait-time = 2500;
};
subnet4 = map (n: {
id = n;
subnet = "192.168.${toString n}.0/24";
pools = [{ pool = "192.168.${toString n}.3 - 192.168.${toString n}.254"; }];
option-data = [{ name = "routers"; data = "192.168.${toString n}.1"; }];
reservations = [{
hw-address = qemu-common.qemuNicMac n 1;
hostname = "client${toString n}";
ip-address = "192.168.${toString n}.2";
}];
}) vlanIfs;
};
};
dhcp6 = {
enable = true;
settings = {
interfaces-config = {
interfaces = map (n: "eth${toString n}") vlanIfs;
service-sockets-require-all = true;
service-sockets-max-retries = 5;
service-sockets-retry-wait-time = 2500;
};
subnet6 = map (n: {
id = n;
subnet = "fd00:1234:5678:${toString n}::/64";
interface = "eth${toString n}";
pools = [{ pool = "fd00:1234:5678:${toString n}::2-fd00:1234:5678:${toString n}::2"; }];
}) vlanIfs;
};
};
};
services.radvd = {
enable = true;
@ -61,17 +87,6 @@ let
};
'');
};
services.dhcpd6 = {
enable = true;
interfaces = map (n: "eth${toString n}") vlanIfs;
extraConfig = ''
authoritative;
'' + flip concatMapStrings vlanIfs (n: ''
subnet6 fd00:1234:5678:${toString n}::/64 {
range6 fd00:1234:5678:${toString n}::2 fd00:1234:5678:${toString n}::2;
}
'');
};
};
testCases = {
@ -117,8 +132,9 @@ let
client.wait_for_unit("network.target")
router.wait_for_unit("network-online.target")
with subtest("Make sure dhcpcd is not started"):
client.fail("systemctl status dhcpcd.service")
with subtest("Make sure DHCP server is not started"):
client.fail("systemctl status kea-dhcp4-server.service")
client.fail("systemctl status kea-dhcp6-server.service")
with subtest("Test vlan 1"):
client.wait_until_succeeds("ping -c 1 192.168.1.1")
@ -1035,7 +1051,7 @@ let
testScript = ''
machine.succeed("udevadm settle")
print(machine.succeed("ip link show dev enCustom"))
machine.wait_until_succeeds("ip link show dev enCustom | grep -q '52:54:00:12:0b:01")
machine.wait_until_succeeds("ip link show dev enCustom | grep -q 52:54:00:12:0b:01")
'';
};
};

View File

@ -107,5 +107,6 @@ mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ];
platforms = [ "x86_64-linux" ];
mainProgram = "cadence";
};
}

View File

@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ offline mirrexagon ];
platforms = platforms.linux;
mainProgram = "cava";
};
}

View File

@ -107,5 +107,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
mainProgram = "easyeffects";
};
}

View File

@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Only;
maintainers = with maintainers; [ fufexan ];
platforms = platforms.linux;
mainProgram = "helvum";
};
}

View File

@ -106,5 +106,6 @@ python3.pkgs.buildPythonApplication rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ lovesegfault ];
platforms = platforms.linux;
mainProgram = "lollypop";
};
}

View File

@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
mainProgram = "mpc";
};
}

View File

@ -51,5 +51,6 @@ python3Packages.buildPythonApplication rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ apfelkuchen6 ];
mainProgram = "mpdevil";
};
}

View File

@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jfrankenau koral lovek323 ];
platforms = platforms.all;
mainProgram = "ncmpcpp";
};
}

File diff suppressed because it is too large Load Diff

View File

@ -23,22 +23,26 @@
stdenv.mkDerivation rec {
pname = "netease-cloud-music-gtk";
version = "2.0.3";
version = "2.2.0";
src = fetchFromGitHub {
owner = "gmg137";
repo = pname;
rev = version;
hash = "sha256-A3mvf6TZ3+aiWA6rg9G5NMaDKvO0VQzwIM1t0MaTpTc=";
hash = "sha256-9qUzRmm3WQEVjzhzHMT1vNw3r3ymWGlBWXnnPsYGSnk=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"netease-cloud-music-api-1.0.2" = "sha256-7Yp2ZBg5wHnDPtdPLwZQnqcSlVuGCrXpV5M/dp/IaOE=";
"netease-cloud-music-api-1.2.0" = "sha256-MR1yVPrNzhZC65mQen88t7NbLfRcoWvT6DMSLGCMeTY=";
};
};
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = [
meson
ninja
@ -75,5 +79,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ diffumist ];
mainProgram = "netease-cloud-music-gtk4";
platforms = platforms.linux;
};
}

View File

@ -51,5 +51,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ abbradar globin ];
platforms = platforms.linux;
mainProgram = "pavucontrol";
};
}

View File

@ -15,6 +15,7 @@ let
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
mainProgram = "spotify";
};
in if stdenv.isDarwin

View File

@ -116,5 +116,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ peterhoeg ];
# upstream says darwin should work but they lack maintainers as of 0.6.6
platforms = platforms.linux;
mainProgram = "strawberry";
};
}

View File

@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.linux;
mainProgram = "tageditor";
};
}

View File

@ -34,5 +34,6 @@ appimageTools.wrapType2 rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.linux;
maintainers = [ maintainers.aacebedo ];
mainProgram = "youtube-music";
};
}

View File

@ -32,5 +32,6 @@ in appimageTools.wrapType2 rec {
license = licenses.cc0;
platforms = platforms.linux;
maintainers = [ maintainers.lgcl ];
mainProgram = "ytmdesktop";
};
}

View File

@ -32,6 +32,7 @@ let
matthewbauer
];
platforms = lib.platforms.all;
mainProgram = "emacs";
};
in
{

View File

@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ frlan ];
platforms = platforms.all;
mainProgram = "geany";
};
}

View File

@ -96,5 +96,6 @@ stdenv.mkDerivation rec {
maintainers = [ ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
mainProgram = "gedit";
};
}

View File

@ -41,5 +41,6 @@ buildGoModule rec {
description = "Modern and intuitive terminal-based text editor";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
mainProgram = "micro";
};
}

View File

@ -75,5 +75,6 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ joachifm nequissimus ];
platforms = platforms.all;
mainProgram = "nano";
};
}

View File

@ -27,5 +27,6 @@ rec {
license = licenses.vim;
maintainers = with maintainers; [ das_j equirosa ];
platforms = platforms.unix;
mainProgram = "vim";
};
}

View File

@ -9376,6 +9376,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
};
telescope-sg = buildVimPluginFrom2Nix {
pname = "telescope-sg";
version = "2023-08-02";
src = fetchFromGitHub {
owner = "Marskey";
repo = "telescope-sg";
rev = "df40e78ed1c1ba3cb3591a799c8e4292c88e1ff0";
sha256 = "0mqqh15jl7y4i1ycb5lpw9fvad4qm03vw5x7paxw8h2yzi39qp0p";
};
meta.homepage = "https://github.com/Marskey/telescope-sg/";
};
telescope-symbols-nvim = buildVimPluginFrom2Nix {
pname = "telescope-symbols.nvim";
version = "2023-02-19";

View File

@ -787,6 +787,7 @@ https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
https://github.com/MrcJkb/telescope-manix/,HEAD,
https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,
https://github.com/nvim-telescope/telescope-project.nvim/,,
https://github.com/Marskey/telescope-sg/,HEAD,
https://github.com/nvim-telescope/telescope-symbols.nvim/,,
https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
https://github.com/fhill2/telescope-ultisnips.nvim/,,

View File

@ -151,5 +151,6 @@ mkDerivation rec {
license = licenses.gpl2;
homepage = "https://www.digikam.org";
platforms = platforms.linux;
mainProgram = "digikam";
};
}

View File

@ -42,5 +42,6 @@ stdenv.mkDerivation rec {
license = licenses.mit-feh;
maintainers = with maintainers; [ viric willibutz globin ma27 ];
platforms = platforms.unix;
mainProgram = "feh";
};
}

View File

@ -159,6 +159,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = [ maintainers.jtojnar ];
platforms = platforms.all;
mainProgram = "inkscape";
longDescription = ''
Inkscape is a feature-rich vector graphics editor that edits
files in the W3C SVG (Scalable Vector Graphics) file format.

View File

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "fluidd";
version = "1.24.1";
version = "1.24.2";
src = fetchurl {
name = "fluidd-v${version}.zip";
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
sha256 = "sha256-iTh8vU6NrJZLyUdeY1wegUue0NIHQtpCEr9pJnC2Wx4=";
sha256 = "sha256-w0IqcvVbeYG9Ly8QzJIxgWIMeYQBf4Ogwi+eRLfD8kk=";
};
nativeBuildInputs = [ unzip ];

View File

@ -31,5 +31,6 @@ buildPythonApplication rec {
license = licenses.mit;
maintainers = with maintainers; [ equirosa dit7ya ];
platforms = platforms.linux;
mainProgram = "rofi-rbw";
};
}

View File

@ -89,7 +89,7 @@ let
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "12.5.1";
version = "12.5.2";
lang = "ALL";
@ -101,7 +101,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
hash = "sha256-Kuq7ZNhaDl2nBcokWKm/XTIjJ8h4czEvwvsF2z3DzJ4=";
hash = "sha256-Mm2/ianon+RtOJqmuZCl+2cPliKiJvIOZ+TyzJ8l5es=";
};
i686-linux = fetchurl {
@ -111,7 +111,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
hash = "sha256-WNIlwDNVUJyO5l33QxLwTn1knADXDzPvgG279QeRXl8=";
hash = "sha256-mouxVi/Y5duIQXHYd8WcIzLZEXs5FZAt20dFq4vHzso=";
};
};

View File

@ -11,8 +11,8 @@
let
pname = "expressvpn";
clientVersion = "3.25.0";
clientBuild = "13";
clientVersion = "3.52.0";
clientBuild = "2";
version = lib.strings.concatStringsSep "." [ clientVersion clientBuild ];
expressvpnBase = stdenvNoCC.mkDerivation {
@ -20,7 +20,7 @@ let
src = fetchurl {
url = "https://www.expressvpn.works/clients/linux/expressvpn_${version}-1_amd64.deb";
hash = "sha256-lyDjG346FrgT7SZbsWET+Hexl9Un6mzMukfO2PwlInA=";
hash = "sha256-cDZ9R+MA3FXEto518bH4/c1X4W9XxgTvXns7zisylew=";
};
nativeBuildInputs = [ dpkg autoPatchelfHook ];

View File

@ -136,5 +136,6 @@ stdenv.mkDerivation rec {
license = licenses.osl3;
maintainers = with maintainers; [ wrmilling ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
mainProgram = "armcord";
};
}

View File

@ -1,7 +1,7 @@
{ lib, callPackage, stdenvNoCC }:
let
pname = "caprine";
version = "2.55.5";
version = "2.58.0";
metaCommon = with lib; {
description = "An elegant Facebook Messenger desktop app";
homepage = "https://sindresorhus.com/caprine";
@ -10,16 +10,17 @@ let
};
x86_64-appimage = callPackage ./build-from-appimage.nix {
inherit pname version metaCommon;
sha256 = "MMbyiLBrdMGENRq493XzkcsDoXr3Aq3rXAni1egkPbo=";
sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4=";
};
x86_64-dmg = callPackage ./build-from-dmg.nix {
inherit pname version metaCommon;
sha256 = "1txuSQk6tH0xsjPk5cWUVnaAw4XBOr1+Fel06NLKFfk=";
sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg=";
};
in
(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {
passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; };
meta = oldAttrs.meta // {
platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms;
mainProgram = "caprine";
};
})

View File

@ -61,6 +61,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
mainProgram = "discord";
};
package =
if stdenv.isLinux

View File

@ -149,5 +149,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
license = licenses.asl20;
maintainers = teams.matrix.members;
inherit (electron.meta) platforms;
mainProgram = "element-desktop";
};
})

View File

@ -17,5 +17,6 @@ buildGoModule rec {
homepage = "https://github.com/erroneousboat/slack-term";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
mainProgram = "slack-term";
};
}

View File

@ -85,6 +85,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ mmahut maxeaubrey ];
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
mainProgram = "slack";
};
linux = stdenv.mkDerivation rec {

View File

@ -39,6 +39,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ liff tricktron ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
mainProgram = "teams";
};
linux = stdenv.mkDerivation rec {

View File

@ -209,5 +209,6 @@ stdenv.mkDerivation rec {
homepage = "https://desktop.telegram.org/";
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
maintainers = with maintainers; [ nickcao ];
mainProgram = "telegram-desktop";
};
}

View File

@ -0,0 +1,25 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
}:
buildNpmPackage rec {
pname = "flood";
version = "unstable-2023-06-03";
src = fetchFromGitHub {
owner = "jesec";
repo = pname;
rev = "2b652f8148dab7134eeeb201b9d81dd6b8bda074";
hash = "sha256-wI6URPGUZUbydSgNaHN2C5IA2x/HHjBWIRT6H6iZU/0=";
};
npmDepsHash = "sha256-XmDnvq+ni5TOf3UQFc4JvGI3LiGpjbrLAocRvrW8qgk=";
meta = with lib; {
description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";
homepage = "https://flood.js.org";
license = licenses.gpl3Only;
maintainers = with maintainers; [ thiagokokada winter ];
};
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }:
{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, findlib, num, camlp5, camlp-streams }:
let
load_num =
@ -15,19 +15,23 @@ let
exec ${ocaml}/bin/ocaml \
-I \`${camlp5}/bin/camlp5 -where\` \
${load_num} \
-I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma
-init make.ml
'';
in
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"hol_light is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation {
pname = "hol_light";
version = "unstable-2019-10-06";
version = "unstable-2023-07-21";
src = fetchFromGitHub {
owner = "jrh13";
repo = "hol-light";
rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e";
sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6";
rev = "29b3e114f5c166584f4fbcfd1e1f9b13a25b7349";
hash = "sha256-Z5/4dCfLRwLMHBmth3xMdFW1M6NzUT/aPEEwSz1/S2E=";
};
patches = [
@ -39,8 +43,8 @@ stdenv.mkDerivation {
strictDeps = true;
nativeBuildInputs = [ ocaml camlp5 ];
propagatedBuildInputs = [ num ];
nativeBuildInputs = [ ocaml findlib camlp5 ];
propagatedBuildInputs = [ camlp-streams num ];
installPhase = ''
mkdir -p "$out/lib/hol_light" "$out/bin"

View File

@ -0,0 +1,59 @@
{ lib
, stdenv
, vdr
, fetchFromGitHub
, graphicsmagick
, pcre
, xorgserver
, ffmpeg
, libiconv
, boost
, libgcrypt
, perl
, util-linux
, groff
, libva
, xorg
, ncurses
, callPackage
}:
stdenv.mkDerivation rec {
pname = "vdr-markad";
version = "3.3.3";
src = fetchFromGitHub {
repo = "vdr-plugin-markad";
owner = "kfb77";
sha256 = "sha256-wU8hfNss0Lxvf9CqFhDAPOxIVaG/9vNR620xpEJkxWI=";
rev = "V${version}";
};
buildInputs = [ vdr ffmpeg ];
postPatch = ''
substituteInPlace command/Makefile --replace '/usr' ""
substituteInPlace plugin/markad.cpp \
--replace "/usr/bin" "$out/bin" \
--replace "/var/lib/markad" "$out/var/lib/markad"
substituteInPlace command/markad-standalone.cpp \
--replace "/var/lib/markad" "$out/var/lib/markad"
'';
buildFlags = [
"DESTDIR=$(out)"
"VDRDIR=${vdr.dev}/lib/pkgconfig"
];
installFlags = buildFlags;
meta = with lib; {
inherit (src.meta) homepage;
description = "Plugin for VDR that marks advertisements";
maintainers = [ maintainers.ck3d ];
license = licenses.gpl2;
inherit (vdr.meta) platforms;
};
}

View File

@ -0,0 +1,24 @@
{ stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }:
stdenv.mkDerivation rec {
pname = "vdr-skin-nopacity";
version = "1.1.14";
src = fetchFromGitLab {
repo = "SkinNopacity";
owner = "kamel5";
sha256 = "sha256-zSAnjBkFR8m+LXeoYO163VkNtVpfQZR5fI5CEzUABdQ=";
rev = version;
};
buildInputs = [ vdr graphicsmagick ];
installFlags = [ "DESTDIR=$(out)" ];
meta = with lib; {
inherit (src.meta) homepage;
description = "Highly customizable native true color skin for the Video Disc Recorder";
maintainers = [ maintainers.ck3d ];
license = licenses.gpl2;
inherit (vdr.meta) platforms;
};
}

View File

@ -1,6 +1,6 @@
{ lib, stdenv, vdr, fetchFromGitHub
, graphicsmagick, pcre, xorgserver, ffmpeg
, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
, graphicsmagick, pcre
, boost, libgcrypt, perl, util-linux, groff, ncurses
, callPackage
}: let
mkPlugin = name: stdenv.mkDerivation {
@ -12,6 +12,10 @@
};
in {
markad = callPackage ./markad {};
nopacity = callPackage ./nopacity {};
softhddevice = callPackage ./softhddevice {};
streamdev = callPackage ./streamdev {};
@ -53,52 +57,6 @@ in {
};
markad = stdenv.mkDerivation rec {
pname = "vdr-markad";
version = "3.1.1";
src = fetchFromGitHub {
repo = "vdr-plugin-markad";
owner = "kfb77";
sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M=";
rev = "V${version}";
};
buildInputs = [ vdr ffmpeg ];
postPatch = ''
substituteInPlace command/Makefile --replace '/usr' ""
substituteInPlace plugin/markad.cpp \
--replace "/usr/bin" "$out/bin" \
--replace "/var/lib/markad" "$out/var/lib/markad"
substituteInPlace command/markad-standalone.cpp \
--replace "/var/lib/markad" "$out/var/lib/markad"
'';
buildFlags = [
"DESTDIR=$(out)"
"LIBDIR=/lib/vdr"
"BINDIR=/bin"
"MANDIR=/share/man"
"APIVERSION=${vdr.version}"
"VDRDIR=${vdr.dev}/include/vdr"
"LOCDIR=/share/locale"
];
installFlags = buildFlags;
meta = with lib; {
inherit (src.meta) homepage;
description = "MarkAd marks advertisements in VDR recordings.";
maintainers = [ maintainers.ck3d ];
license = licenses.gpl2;
inherit (vdr.meta) platforms;
};
};
epgsearch = stdenv.mkDerivation rec {
pname = "vdr-epgsearch";
version = "2.4.2";

View File

@ -12,12 +12,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-softhddevice";
version = "1.10.3";
version = "1.11.1";
src = fetchFromGitHub {
owner = "ua0lnj";
repo = "vdr-plugin-softhddevice";
sha256 = "sha256-iuQ6ZHPrtIQzEqHYrLibZ8uOOwNqMbWYCD5plDQcBZg=";
sha256 = "sha256-+itSxkyst/KJzyT8ALJkCKumrHHKiWfnvikonwexgnc=";
rev = "v${version}";
};

View File

@ -13,6 +13,7 @@
"DaddyTimeMono" = "1w5n170l63hfxh1xclw3jpf8amj60br6py4yx12yhqanp2zg0shj";
"DejaVuSansMono" = "1j22f5jnpmyli686r67c4c07g07ac78aq9wg8hy1vwblxfzdvq9f";
"DroidSansMono" = "13r1sglgwf05swnbn0mha2gpdqammzlg0p6h7c33af1vr7n8cnca";
"EnvyCodeR" = "1y03cb0kq548nm8qh4jh8yw2zpx6ahl0y8561c429p5f16707qxl";
"FantasqueSansMono" = "1k0p6gvas6mgwq0bbvpwbn3mm6yaaapgjqgk30fvpq9zvn4a26bf";
"FiraCode" = "14vbb3w6il32kd8my75vvv786azm7sxmdpba9np0qjx4rs8xdhbn";
"FiraMono" = "1iiz5cnhrb67793ww6pj5y5x9s1a5nlk9kqwbv92kxmbqakarlcb";
@ -27,6 +28,7 @@
"Inconsolata" = "02rar6g3zbbpxxxz37v7d5qzafn59bhp04iv3wk16kqxy0havgx5";
"InconsolataGo" = "0nx6j3v2fvhdw3ygmz65zwlj6zwrkpmf59wfxirpzkcqqsdh4zwl";
"InconsolataLGC" = "00s2051fz3k6jnsfmnlqnd2cghr9sj2pddi5gpid1i5x006rig7a";
"IntelOneMono" = "02cynzrpn93b1kmi21p60lhdai6rppmm3m1f872kvf08damc1660";
"Iosevka" = "1byrmfbsqi06fsy958364jy694dnm7a7pcjsv64w6mwfsi5vjn1r";
"IosevkaTerm" = "1k65jfa0c7c6pvns7vfcxcfc3i1qcr6wg16qafbp9zggabbvl7aa";
"JetBrainsMono" = "0mbzvfl36a6mgb2dnjf8n3kkm28sz0xhv7s5lww141wpgj5jb4a9";

View File

@ -0,0 +1,34 @@
{ lib
, stdenvNoCC
, fetchurl
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sketchybar-app-font";
version = "1.0.13";
src = fetchurl {
url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf";
hash = "sha256-vlvSrN6yxabKnzPmqI9VNkOdR3yLa1QUieZjOOW6w3c=";
};
dontUnpack = true;
installPhase = ''
runHook preInstall
install -Dm644 $src $out/share/fonts/truetype/sketchybar-app-font.ttf
runHook postInstall
'';
meta = {
description = "A ligature-based symbol font and a mapping function for sketchybar";
longDescription = ''
A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons.
'';
homepage = "https://github.com/kvndrsslr/sketchybar-app-font";
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ khaneliman ];
};
})

View File

@ -4,22 +4,24 @@
, autoreconfHook
, guile
, pkg-config
, texinfo
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "guile-commonmark";
version = "0.1.2";
version = "unstable-2020-04-30";
src = fetchFromGitHub {
owner = "OrangeShark";
repo = pname;
rev = "v${version}";
hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo=";
repo = "guile-commonmark";
rev = "538ffea25ca69d9f3ee17033534ba03cc27ba468";
hash = "sha256-9cA7iQ/GGEx+HwsdAxKC3IssqkT/Yg8ZxaiIprS5VuI=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
texinfo # for makeinfo
];
buildInputs = [
guile

View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
libgit2 scheme-bytestructures
];
doCheck = true;
doCheck = !stdenv.isDarwin;
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
enableParallelBuilding = true;

View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
doCheck = true;
doCheck = !stdenv.isDarwin;
preCheck = ''
# Make `libgcc_s.so' visible for `pthread_cancel'.

View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "guile-ncurses";
version = "1.7";
version = "3.1";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q=";
hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM=";
};
nativeBuildInputs = [
@ -25,19 +25,20 @@ stdenv.mkDerivation rec {
ncurses
];
preConfigure = ''
configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site"
'';
configureFlags = [
"--with-gnu-filesystem-hierarchy"
];
postFixup = ''
for f in $out/share/guile/site/ncurses/**.scm; do \
substituteInPlace $f \
--replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \
done
'';
# Undefined symbols for architecture arm64: "_u32_conv_from_encoding"
env.NIX_LDFLAGS = "-lunistring";
postFixup =
let
guileVersion = lib.versions.majorMinor guile.version;
in
''
for f in $out/share/guile/site/ncurses/**.scm; do \
substituteInPlace $f \
--replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \
done
'';
# XXX: 1 of 65 tests failed.
doCheck = false;

View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.1.21";
hash = "sha256-bqSegzXWMhd/VrUHFgqhUcewIBhXianBSFn85dSgd20=";
version = "8.1.22";
hash = "sha256-mSNU44LGxhjQHtS+Br7qjewxeLFBU99k08jEi4Xp+8I=";
});
in

View File

@ -2,12 +2,12 @@
let
base = (callPackage ./generic.nix (_args // {
version = "8.3.0beta1";
version = "8.3.0beta2";
hash = null;
})).overrideAttrs (oldAttrs: {
src = fetchurl {
url = "https://downloads.php.net/~eric/php-8.3.0beta1.tar.xz";
hash = "sha256-eZjhwqkP1RkyzpV5uMUxUWkXiPERBgGtmaX65WhDdl8=";
url = "https://downloads.php.net/~jakub/php-8.3.0beta2.tar.xz";
hash = "sha256-ND1OlmSMtBxTE/0qfgy3Cz/gF08eIzydU2W/eKg58wQ=";
};
});
in

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, meson
, ninja
, pkg-config
@ -15,9 +14,9 @@
, vala
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gtk-layer-shell";
version = "0.8.0";
version = "0.8.1";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # for demo
@ -25,25 +24,10 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "wmww";
repo = "gtk-layer-shell";
rev = "v${version}";
sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE=";
rev = "v${finalAttrs.version}";
hash = "sha256-WW5sdOAJUKbSLWUpI9BK7O63/Uli+Tu9Tj9ccCOREPM=";
};
patches = [
# https://github.com/wmww/gtk-layer-shell/pull/146
# Mark wayland-scanner as a build-time dependency
(fetchpatch {
url = "https://github.com/wmww/gtk-layer-shell/commit/6fd16352e5b35fefc91aa44e73671addaaa95dfc.patch";
hash = "sha256-U/mxmcRcZnsF0fvWW0axo6ajqW40NuOzNIAzoLCboRM=";
})
# https://github.com/wmww/gtk-layer-shell/pull/147
# Remove redundant dependency check for gtk-doc
(fetchpatch {
url = "https://github.com/wmww/gtk-layer-shell/commit/124ccc2772d5ecbb40b54872c22e594c74bd39bc.patch";
hash = "sha256-WfrWe9UJCp1RvVJhURAxGw4jzqPjoaP6182jVdoEAQs=";
})
];
strictDeps = true;
depsBuildBuild = [
@ -74,8 +58,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol";
homepage = "https://github.com/wmww/gtk-layer-shell";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ eonpatapon ];
maintainers = with maintainers; [ eonpatapon donovanglover ];
platforms = platforms.linux;
};
}
})

View File

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "movit";
version = "1.7.0";
version = "1.7.1";
src = fetchurl {
url = "https://movit.sesse.net/${pname}-${version}.tar.gz";
sha256 = "sha256-I1l7k+pTdi1E33Y+zCtwIwj3b8Fzggmek4UiAIHOZhA=";
sha256 = "sha256-szBztwXwzLasSULPURUVFUB7QLtOmi3QIowcLLH7wRo=";
};
outputs = [ "out" "dev" ];

View File

@ -46,9 +46,11 @@ mapAliases {
bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
eslint_d = pkgs.eslint_d; # Added 2023-05-26
flood = pkgs.flood; # Added 2023-07-25
gtop = pkgs.gtop; # added 2023-07-31
manta = pkgs.node-manta; # Added 2023-05-06
readability-cli = pkgs.readability-cli; # Added 2023-06-12
reveal-md = pkgs.reveal-md; # added 2023-07-31
thelounge = pkgs.thelounge; # Added 2023-05-22
triton = pkgs.triton; # Added 2023-05-06
typescript = pkgs.typescript; # Added 2023-06-21

View File

@ -47,6 +47,7 @@
firebase-tools = "firebase";
fkill-cli = "fkill";
fleek-cli = "fleek";
flood = "flood";
git-run = "gr";
gitmoji-cli = "gitmoji";
graphql-cli = "graphql";

View File

@ -140,7 +140,6 @@
, "fixjson"
, "fkill-cli"
, "fleek-cli"
, "flood"
, "forever"
, "fx"
, "ganache"
@ -272,7 +271,6 @@
, "redoc-cli"
, "remod-cli"
, "reveal.js"
, "reveal-md"
, "rimraf"
, "rollup"
, {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"}

View File

@ -107221,24 +107221,6 @@ in
bypassCache = true;
reconstructLock = true;
};
flood = nodeEnv.buildNodePackage {
name = "flood";
packageName = "flood";
version = "4.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/flood/-/flood-4.7.0.tgz";
sha512 = "MAm4Yok64VPa49DM+0TxBBP0mScW5ILGCsY/HJLbATjHEkJFnwD1mkPndruZxO1vXBaFdPzoLl+gYThAUxWQjA==";
};
buildInputs = globalBuildInputs;
meta = {
description = "A modern Web UI for various torrent clients with multi-user and multi-client support";
homepage = "https://github.com/jesec/flood#readme";
license = "GPL-3.0-only";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
forever = nodeEnv.buildNodePackage {
name = "forever";
packageName = "forever";
@ -132227,315 +132209,6 @@ in
bypassCache = true;
reconstructLock = true;
};
reveal-md = nodeEnv.buildNodePackage {
name = "reveal-md";
packageName = "reveal-md";
version = "5.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.5.1.tgz";
sha512 = "6M2jSP4HHEWKRmaeB7Sc7oyUffUL98NVeg9Z8mquJFBZqjBXdL39Du8RCrKgN31XwI8oiLaFs5jRiUzJnQiaTA==";
};
dependencies = [
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."accepts-1.3.8"
sources."agent-base-4.3.0"
sources."ansi-align-3.0.1"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."anymatch-3.1.3"
sources."argparse-1.0.10"
sources."array-flatten-1.1.1"
sources."async-limiter-1.0.1"
sources."balanced-match-1.0.2"
sources."binary-extensions-2.2.0"
(sources."body-parser-1.20.1" // {
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
];
})
sources."boxen-5.1.2"
sources."brace-expansion-2.0.1"
sources."braces-3.0.2"
sources."buffer-crc32-0.2.13"
sources."buffer-from-1.1.2"
sources."bufferutil-4.0.7"
sources."bytes-3.1.2"
(sources."cacheable-request-6.1.0" // {
dependencies = [
sources."get-stream-5.2.0"
sources."lowercase-keys-2.0.0"
];
})
sources."call-bind-1.0.2"
sources."camelcase-6.3.0"
sources."chalk-4.1.2"
sources."chokidar-3.5.3"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.1"
sources."clone-response-1.0.3"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."commander-6.2.1"
sources."concat-map-0.0.1"
sources."concat-stream-1.6.2"
sources."configstore-5.0.1"
sources."content-disposition-0.5.4"
sources."content-type-1.0.5"
sources."cookie-0.5.0"
sources."cookie-signature-1.0.6"
sources."core-util-is-1.0.3"
sources."crypto-random-string-2.0.0"
sources."debug-4.3.4"
sources."decompress-response-3.3.0"
sources."deep-extend-0.6.0"
sources."defer-to-connect-1.1.3"
sources."define-lazy-prop-2.0.0"
sources."depd-2.0.0"
sources."destroy-1.2.0"
sources."dot-prop-5.3.0"
sources."duplexer3-0.1.5"
sources."ee-first-1.1.1"
sources."emoji-regex-8.0.0"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
sources."es6-promise-4.2.8"
sources."es6-promisify-5.0.0"
sources."escape-goat-2.1.1"
sources."escape-html-1.0.3"
sources."esprima-4.0.1"
sources."etag-1.8.1"
(sources."express-4.18.2" // {
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
];
})
(sources."extract-zip-1.7.0" // {
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
];
})
sources."fd-slicer-1.1.0"
sources."fill-range-7.0.1"
(sources."finalhandler-1.2.0" // {
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
];
})
sources."forwarded-0.2.0"
sources."fresh-0.5.2"
sources."fs-extra-11.1.1"
sources."fs.realpath-1.0.0"
sources."fsevents-2.3.2"
sources."function-bind-1.1.1"
sources."get-intrinsic-1.2.1"
sources."get-stream-4.1.0"
sources."glob-8.1.0"
sources."glob-parent-5.1.2"
sources."global-dirs-3.0.1"
sources."got-9.6.0"
sources."graceful-fs-4.2.11"
sources."has-1.0.3"
sources."has-flag-4.0.0"
sources."has-proto-1.0.1"
sources."has-symbols-1.0.3"
sources."has-yarn-2.1.0"
sources."highlight.js-11.8.0"
sources."http-cache-semantics-4.1.1"
sources."http-errors-2.0.0"
(sources."https-proxy-agent-2.2.4" // {
dependencies = [
sources."debug-3.2.7"
];
})
sources."iconv-lite-0.4.24"
sources."import-lazy-2.1.0"
sources."imurmurhash-0.1.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-2.0.0"
sources."ipaddr.js-1.9.1"
sources."is-binary-path-2.1.0"
sources."is-ci-2.0.0"
sources."is-docker-2.2.1"
sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-3.0.0"
sources."is-glob-4.0.3"
sources."is-installed-globally-0.4.0"
sources."is-npm-5.0.0"
sources."is-number-7.0.0"
sources."is-obj-2.0.0"
sources."is-path-inside-3.0.3"
sources."is-typedarray-1.0.0"
sources."is-wsl-2.2.0"
sources."is-yarn-global-0.3.0"
sources."isarray-1.0.0"
sources."js-yaml-3.14.1"
sources."json-buffer-3.0.0"
sources."jsonfile-6.1.0"
sources."keyv-3.1.0"
sources."latest-version-5.1.0"
sources."livereload-0.9.3"
sources."livereload-js-3.4.1"
sources."lodash-4.17.21"
sources."lowercase-keys-1.0.1"
sources."lru-cache-6.0.0"
(sources."make-dir-3.1.0" // {
dependencies = [
sources."semver-6.3.1"
];
})
sources."media-typer-0.3.0"
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
sources."mime-db-1.52.0"
sources."mime-types-2.1.35"
sources."mimic-response-1.0.1"
sources."minimatch-5.1.6"
sources."minimist-1.2.8"
sources."mkdirp-0.5.6"
sources."ms-2.1.2"
sources."mustache-4.2.0"
sources."negotiator-0.6.3"
sources."node-gyp-build-4.6.0"
sources."normalize-path-3.0.0"
sources."normalize-url-4.5.1"
sources."object-inspect-1.12.3"
sources."on-finished-2.4.1"
sources."once-1.4.0"
sources."open-8.4.2"
sources."opts-2.0.2"
sources."p-cancelable-1.1.0"
(sources."package-json-6.5.0" // {
dependencies = [
sources."semver-6.3.1"
];
})
sources."parseurl-1.3.3"
sources."path-is-absolute-1.0.1"
sources."path-to-regexp-0.1.7"
sources."pend-1.2.0"
sources."picomatch-2.3.1"
sources."prepend-http-2.0.0"
sources."process-nextick-args-2.0.1"
sources."progress-2.0.3"
sources."proxy-addr-2.0.7"
sources."proxy-from-env-1.1.0"
sources."pump-3.0.0"
sources."pupa-2.1.1"
(sources."puppeteer-1.20.0" // {
dependencies = [
sources."mime-2.6.0"
sources."ws-6.2.2"
];
})
sources."qs-6.11.0"
sources."range-parser-1.2.1"
sources."raw-body-2.5.1"
(sources."rc-1.2.8" // {
dependencies = [
sources."ini-1.3.8"
];
})
(sources."readable-stream-2.3.8" // {
dependencies = [
sources."safe-buffer-5.1.2"
];
})
sources."readdirp-3.6.0"
sources."registry-auth-token-4.2.2"
sources."registry-url-5.1.0"
sources."responselike-1.0.2"
sources."reveal.js-4.5.0"
(sources."rimraf-2.7.1" // {
dependencies = [
sources."brace-expansion-1.1.11"
sources."glob-7.2.3"
sources."minimatch-3.1.2"
];
})
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."semver-7.5.4"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.1"
];
})
(sources."send-0.18.0" // {
dependencies = [
(sources."debug-2.6.9" // {
dependencies = [
sources."ms-2.0.0"
];
})
sources."ms-2.1.3"
];
})
(sources."serve-favicon-2.5.0" // {
dependencies = [
sources."ms-2.1.1"
sources."safe-buffer-5.1.1"
];
})
sources."serve-static-1.15.0"
sources."setprototypeof-1.2.0"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.7"
sources."sprintf-js-1.0.3"
sources."statuses-2.0.1"
sources."string-width-4.2.3"
(sources."string_decoder-1.1.1" // {
dependencies = [
sources."safe-buffer-5.1.2"
];
})
sources."strip-ansi-6.0.1"
sources."strip-json-comments-2.0.1"
sources."supports-color-7.2.0"
sources."to-readable-stream-1.0.0"
sources."to-regex-range-5.0.1"
sources."toidentifier-1.0.1"
sources."try-require-1.2.1"
sources."type-fest-0.20.2"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
sources."typedarray-to-buffer-3.1.5"
sources."unique-string-2.0.0"
sources."universalify-2.0.0"
sources."unpipe-1.0.0"
sources."update-notifier-5.1.0"
sources."url-parse-lax-3.0.0"
sources."utf-8-validate-5.0.10"
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
sources."vary-1.1.2"
sources."widest-line-3.1.0"
sources."wrap-ansi-7.0.0"
sources."wrappy-1.0.2"
sources."write-file-atomic-3.0.3"
sources."ws-7.5.9"
sources."xdg-basedir-4.0.0"
sources."yallist-4.0.0"
sources."yaml-front-matter-4.1.1"
sources."yargs-parser-21.1.1"
sources."yauzl-2.10.0"
];
buildInputs = globalBuildInputs;
meta = {
description = "reveal.js on steroids! Get beautiful reveal.js presentations from your Markdown files.";
homepage = "https://github.com/webpro/reveal-md#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
rimraf = nodeEnv.buildNodePackage {
name = "rimraf";
packageName = "rimraf";

View File

@ -162,10 +162,6 @@ final: prev: {
nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.xcbuild ];
};
flood = prev.flood.override {
buildInputs = [ final.node-pre-gyp ];
};
git-ssb = prev.git-ssb.override (oldAttrs: {
buildInputs = [ final.node-gyp-build ];
meta = oldAttrs.meta // { broken = since "10"; };
@ -420,19 +416,6 @@ final: prev: {
'';
};
reveal-md = prev.reveal-md.override (
lib.optionalAttrs (!stdenv.isDarwin) {
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
prePatch = ''
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
'';
postInstall = ''
wrapProgram $out/bin/reveal-md \
--set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium
'';
}
);
rush = prev."@microsoft/rush".override {
name = "rush";
};

View File

@ -0,0 +1,21 @@
{ lib, fetchurl, buildDunePackage }:
buildDunePackage rec {
pname = "trace";
version = "0.2";
minimalOCamlVersion = "4.05";
src = fetchurl {
url = "https://github.com/c-cube/trace/releases/download/v${version}/trace-${version}.tbz";
hash = "sha256-iScnZxjgzDqZFxbDDXB0K4TkdDJDcrMC03sK/ltbqJQ=";
};
meta = {
description = "Common interface for tracing/instrumentation libraries in OCaml";
license = lib.licenses.mit;
homepage = "https://c-cube.github.io/trace/";
maintainers = [ lib.maintainers.vbgl ];
};
}

View File

@ -0,0 +1,15 @@
{ buildDunePackage, trace, mtime }:
buildDunePackage {
pname = "trace-tef";
inherit (trace) src version;
propagatedBuildInputs = [ mtime trace ];
doCheck = true;
meta = trace.meta // {
description = "A simple backend for trace, emitting Catapult JSON into a file";
};
}

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "edk2-pytool-library";
version = "0.15.3";
version = "0.15.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "tianocore";
repo = "edk2-pytool-library";
rev = "v${version}";
hash = "sha256-PWjevYUts0dQMBmABpU8neuTqDlglTCCQmuvnVndfto=";
hash = "sha256-jGZa1qfI/OybwgG2L4N1hICHpWZTufgElpl31EhU+O4=";
};
nativeBuildInputs = [

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "gehomesdk";
version = "0.5.13";
version = "0.5.20";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-gkHAIrsk6LKNjieTiSU0ZH6WI2+wJB68edNqJ7n86tY=";
hash = "sha256-5nu7pewkxCZ/F6m7xOwvMwuhFsanQKHtdwGqNto3/zk=";
};
propagatedBuildInputs = [

View File

@ -18,5 +18,6 @@ buildGoModule rec {
license = licenses.unfreeRedistributable;
homepage = "https://github.com/drone-runners/drone-runner-docker";
description = "Drone pipeline runner that executes builds inside Docker containers";
mainProgram = "drone-runner-docker";
};
}

View File

@ -22,5 +22,6 @@ buildGoModule rec {
# https://polyformproject.org/licenses/small-business/1.0.0/
license = licenses.unfree;
maintainers = with maintainers; [ mic92 ];
mainProgram = "drone-runner-exec";
};
}

View File

@ -18,5 +18,6 @@ buildGoModule rec {
homepage = "https://github.com/drone-runners/drone-runner-ssh";
license = licenses.unfreeRedistributable;
maintainers = teams.c3d2.members;
mainProgram = "drone-runner-ssh";
};
}

View File

@ -12,5 +12,6 @@ buildGoModule {
meta = common.meta // {
description = "Command line client for the Woodpecker Continuous Integration server";
mainProgram = "woodpecker-cli";
};
}

View File

@ -76,5 +76,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ raskin globin artturin ];
platforms = platforms.unix;
downloadPage = "https://stedolan.github.io/jq/download/";
mainProgram = "jq";
};
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile_2_2, libxml2 }:
stdenv.mkDerivation rec {
pname = "autogen";
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
buildPackages.buildPackages.autogen buildPackages.texinfo
];
buildInputs = [
guile libxml2
guile_2_2 libxml2
];
preConfigure = ''

View File

@ -41,6 +41,7 @@ mkYarnPackage rec {
doDist = false;
meta = with lib; {
mainProgram = "prettierd";
description = "Prettier, as a daemon, for improved formatting speed";
homepage = "https://github.com/fsouza/prettierd";
license = licenses.isc;

View File

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "viceroy";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "fastly";
repo = pname;
rev = "v${version}";
hash = "sha256-lFDhiBgJFCXE7/BzCuNFPmP8PYHCqu6jYqRNa+M4J8Q=";
hash = "sha256-+vvlj8gGCHKQ2T245fwaZxCiglRnrDFwupQIh3I47Ys=";
};
buildInputs = lib.optional stdenv.isDarwin Security;
cargoHash = "sha256-HJXCNjWjO1GWIP46kqvq8mZVlYVvlG9ahxScpG3rfTA=";
cargoHash = "sha256-0Qr40hMA59WaHinkUkebF0CwPy3aublgfzSz1er7Uws=";
cargoTestFlags = [
"--package viceroy-lib"

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ckan";
version = "1.32.0";
version = "1.33.2";
src = fetchurl {
url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
sha256 = "sha256-cD8S5UcS5tBJoW1IExrmtoYn8k/P7RjCRAx7BEhAWGk=";
sha256 = "sha256-FIndxRyGDgXinP8ZX0o6LEJgGNNw84tCPw5FdVAU3TI=";
};
dontUnpack = true;

View File

@ -49,5 +49,6 @@ in stdenv.mkDerivation {
homepage = "https://store.steampowered.com/";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ jagajaga jonringer ];
mainProgram = "steam";
};
}

View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ megheaiulian ];
platforms = platforms.linux;
mainProgram = "brightnessctl";
};
}

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile
{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2
, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
, freefont_ttf, makeFontsConf
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ];
buildInputs =
[ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm
[ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm
python3 gettext perl fontconfig freetype pango
fontforge help2man groff t1utils boehmgc rsync
];

View File

@ -31,5 +31,6 @@ buildGoModule rec {
homepage = "https://github.com/Luzifer/nginx-sso";
license = licenses.asl20;
maintainers = with maintainers; [ delroth ];
mainProgram = "nginx-sso";
};
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, libX11, guile }:
{ lib, stdenv, fetchurl, pkg-config, libX11, guile_2_2 }:
stdenv.mkDerivation rec {
pname = "xbindkeys";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 guile ];
buildInputs = [ libX11 guile_2_2 ];
meta = {
homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile, openssl }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile_2_2, openssl }:
stdenv.mkDerivation rec {
pname = "junkie";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h
'';
buildInputs = [ libpcap guile openssl ];
buildInputs = [ libpcap guile_2_2 openssl ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [
"GUILELIBDIR=\${out}/share/guile/site"

View File

@ -80,6 +80,8 @@ stdenv.mkDerivation rec {
kea = nixosTests.kea;
prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation;
prometheus-exporter = nixosTests.prometheus-exporters.kea;
networking-scripted = lib.recurseIntoAttrs { inherit (nixosTests.networking.scripted) dhcpDefault dhcpSimple dhcpOneIf; };
networking-networkd = lib.recurseIntoAttrs { inherit (nixosTests.networking.networkd) dhcpDefault dhcpSimple dhcpOneIf; };
};
meta = with lib; {

View File

@ -12,7 +12,7 @@
, gdbm
, gnutls
, gss
, guile
, guile_2_2
, libmysqlclient
, mailcap
, nettools
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
libxcrypt
] ++ lib.optionals stdenv.isLinux [ nettools ]
++ lib.optionals pythonSupport [ python3 ]
++ lib.optionals guileSupport [ guile ];
++ lib.optionals guileSupport [ guile_2_2 ];
patches = [
./fix-build-mb-len-max.patch

View File

@ -6,15 +6,15 @@
buildGoModule rec {
pname = "pgrok";
version = "1.3.3";
version = "1.3.4";
src = fetchFromGitHub {
owner = "pgrok";
repo = "pgrok";
rev = "v${version}";
hash = "sha256-0b7d3wyhRuTxZmpx9oJnZN88yYn+TsR82KrktPAx9P4=";
hash = "sha256-lhcaJVIqZK7GnC/Q/+RDxTVFmgTana3vugDHr/SStFE=";
};
vendorHash = "sha256-laSfyHFkJJkv4EPMIVcai7RXaGIpUp+0tOpt5vhcLkA=";
vendorHash = "sha256-UzNx361cg4IDSQGlX5N9AxYZ8cYA0zsF5JF4Fe7efqM=";
outputs = [ "out" "server" ];

View File

@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/str4d/rage/raw/v${version}/rage/CHANGELOG.md";
license = with licenses; [ asl20 mit ]; # either at your option
maintainers = with maintainers; [ marsam ryantm ];
mainProgram = "rage";
};
}

View File

@ -82,5 +82,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.unix ++ platforms.windows;
maintainers = [ ];
mainProgram = "gawk";
};
}

View File

@ -0,0 +1,41 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
}:
buildNpmPackage rec {
pname = "reveal-md";
version = "5.5.1";
src = fetchFromGitHub {
owner = "webpro";
repo = "reveal-md";
rev = version;
hash = "sha256-BlUZsETMdOmnz+OFGQhQ9aLHxIIAZ12X1ipy3u59zxo=";
};
npmDepsHash = "sha256-xaDBB16egGi8zThHRrhcN8TVf6Nqkx8fkbxWqvJwJb4=";
env = {
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true;
};
dontNpmBuild = true;
doCheck = true;
checkPhase = ''
runHook preCheck
npm run test
runHook postCheck
'';
meta = {
description = "Get beautiful reveal.js presentations from your Markdown files";
homepage = "https://github.com/webpro/reveal-md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sagikazarmark ];
};
}

View File

@ -10,9 +10,9 @@
, imagemagick
, makeWrapper
, pkg-config
, ploticus
, enableEmacs ? false, emacs
, enableLout ? true, lout
, enableLout ? stdenv.isLinux, lout
, enablePloticus ? stdenv.isLinux, ploticus
, enableTex ? true, tex
}:
@ -40,10 +40,10 @@ in stdenv.mkDerivation (finalAttrs: {
guile-lib
guile-reader
imagemagick
ploticus
]
++ optional enableEmacs emacs
++ optional enableLout lout
++ optional enablePloticus ploticus
++ optional enableTex tex;
postInstall =

View File

@ -52,5 +52,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ dit7ya ];
platforms = platforms.linux;
mainProgram = "gtklock";
};
}

View File

@ -1,4 +1,13 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }:
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, lz4
, libxkbcommon
, installShellFiles
, scdoc
}:
rustPlatform.buildRustPackage rec {
pname = "swww";
version = "0.8.1";
@ -11,15 +20,39 @@ rustPlatform.buildRustPackage rec {
};
cargoSha256 = "sha256-AE9bQtW5r1cjIsXA7YEP8TR94wBjaM7emOroVFq9ldE=";
buildInputs = [ lz4 libxkbcommon ];
buildInputs = [
lz4
libxkbcommon
];
doCheck = false; # Integration tests do not work in sandbox environment
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
installShellFiles
scdoc
];
postInstall = ''
for f in doc/*.scd; do
local page="doc/$(basename "$f" .scd)"
scdoc < "$f" > "$page"
installManPage "$page"
done
installShellCompletion --cmd swww \
--bash <(cat completions/swww.bash) \
--fish <(cat completions/swww.fish) \
--zsh <(cat completions/_swww)
'';
meta = with lib; {
description = "Efficient animated wallpaper daemon for wayland, controlled at runtime";
homepage = "https://github.com/Horus645/swww";
license = licenses.gpl3;
maintainers = with maintainers; [ mateodd25 ];
maintainers = with maintainers; [ mateodd25 donovanglover ];
platforms = platforms.linux;
mainProgram = "swww";
};
}

View File

@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
mainProgram = "wlogout";
};
}
# TODO: shell completions

View File

@ -3652,7 +3652,7 @@ with pkgs;
readline = readline63;
};
flood = nodePackages.flood;
flood = callPackage ../applications/networking/p2p/flood { };
font-config-info = callPackage ../tools/misc/font-config-info { };
@ -12427,7 +12427,7 @@ with pkgs;
reuse = callPackage ../tools/package-management/reuse { };
inherit (nodePackages) reveal-md;
reveal-md = callPackage ../tools/text/reveal-md { };
rewritefs = callPackage ../os-specific/linux/rewritefs { };
@ -12912,6 +12912,8 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices MediaRemote SkyLight;
};
sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { };
skippy-xd = callPackage ../tools/X11/skippy-xd { };
sks = callPackage ../servers/sks {
@ -18034,7 +18036,7 @@ with pkgs;
guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { };
guile = guile_2_2;
guile = guile_3_0;
guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
@ -18060,7 +18062,9 @@ with pkgs;
guile-reader = callPackage ../development/guile-modules/guile-reader { };
guile-sdl = callPackage ../development/guile-modules/guile-sdl { };
guile-sdl = callPackage ../development/guile-modules/guile-sdl {
guile = guile_2_2;
};
guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };

View File

@ -1643,6 +1643,10 @@ let
inherit (pkgs.python3Packages) torch;
};
trace = callPackage ../development/ocaml-modules/trace { };
trace-tef = callPackage ../development/ocaml-modules/trace/tef.nix { };
trie = callPackage ../development/ocaml-modules/trie { };
tsdl = callPackage ../development/ocaml-modules/tsdl {