Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
@@ -35,10 +35,6 @@ jobs:
|
||||
pairs:
|
||||
- from: master
|
||||
into: haskell-updates
|
||||
- from: release-23.05
|
||||
into: staging-next-23.05
|
||||
- from: staging-next-23.05
|
||||
into: staging-23.05
|
||||
- from: release-23.11
|
||||
into: staging-next-23.11
|
||||
- from: staging-next-23.11
|
||||
@@ -56,7 +52,7 @@ jobs:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Comment on failure
|
||||
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
|
||||
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
|
||||
if: ${{ failure() }}
|
||||
with:
|
||||
issue-number: 105153
|
||||
|
||||
@@ -50,7 +50,7 @@ jobs:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Comment on failure
|
||||
uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2 # v3.1.0
|
||||
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
|
||||
if: ${{ failure() }}
|
||||
with:
|
||||
issue-number: 105153
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
|
||||
mkdir -p "$out"
|
||||
|
||||
cat > "$out/index.md" << 'EOF'
|
||||
```{=include=} sections
|
||||
```{=include=} sections auto-id-prefix=auto-generated
|
||||
EOF
|
||||
|
||||
${lib.concatMapStrings ({ name, baseName ? name, description }: ''
|
||||
|
||||
+1
-1
@@ -189,7 +189,7 @@ in {
|
||||
they take effect as soon as the oldest release reaches end of life. */
|
||||
oldestSupportedRelease =
|
||||
# Update on master only. Do not backport.
|
||||
2305;
|
||||
2311;
|
||||
|
||||
/* Whether a feature is supported in all supported releases (at the time of
|
||||
release branch-off, if applicable). See `oldestSupportedRelease`. */
|
||||
|
||||
@@ -1904,6 +1904,12 @@
|
||||
githubId = 1217745;
|
||||
name = "Aldwin Vlasblom";
|
||||
};
|
||||
averagebit = {
|
||||
email = "averagebit@pm.me";
|
||||
github = "averagebit";
|
||||
githubId = 97070581;
|
||||
name = "averagebit";
|
||||
};
|
||||
averelld = {
|
||||
email = "averell+nixos@rxd4.com";
|
||||
github = "averelld";
|
||||
@@ -3259,6 +3265,9 @@
|
||||
github = "LostAttractor";
|
||||
githubId = 46527539;
|
||||
name = "ChaosAttractor";
|
||||
keys = [{
|
||||
fingerprint = "A137 4415 DB7C 6439 10EA 5BF1 0FEE 4E47 5940 E125";
|
||||
}];
|
||||
};
|
||||
charlesbaynham = {
|
||||
email = "charlesbaynham@gmail.com";
|
||||
@@ -5495,6 +5504,12 @@
|
||||
githubId = 428026;
|
||||
name = "embr";
|
||||
};
|
||||
emilioziniades = {
|
||||
email = "emilioziniades@protonmail.com";
|
||||
github = "emilioziniades";
|
||||
githubId = 75438244;
|
||||
name = "Emilio Ziniades";
|
||||
};
|
||||
emily = {
|
||||
email = "nixpkgs@emily.moe";
|
||||
github = "emilazy";
|
||||
@@ -6945,6 +6960,12 @@
|
||||
email = "nix@quidecco.pl";
|
||||
name = "Isidor Zeuner";
|
||||
};
|
||||
gmacon = {
|
||||
name = "George Macon";
|
||||
matrix = "@gmacon:matrix.org";
|
||||
github = "gmacon";
|
||||
githubId = 238853;
|
||||
};
|
||||
gmemstr = {
|
||||
email = "git@gmem.ca";
|
||||
github = "gmemstr";
|
||||
@@ -10163,6 +10184,13 @@
|
||||
githubId = 22116767;
|
||||
name = "Kritnich";
|
||||
};
|
||||
krloer = {
|
||||
email = "kriloneri@gmail.com";
|
||||
github = "krloer";
|
||||
githubId = 45591621;
|
||||
name = "Kristoffer Longva Eriksen";
|
||||
matrix = "@krisleri:pvv.ntnu.no";
|
||||
};
|
||||
kroell = {
|
||||
email = "nixosmainter@makroell.de";
|
||||
github = "rokk4";
|
||||
@@ -16790,12 +16818,6 @@
|
||||
fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951";
|
||||
}];
|
||||
};
|
||||
scubed2 = {
|
||||
email = "scubed2@gmail.com";
|
||||
github = "scubed2";
|
||||
githubId = 7401858;
|
||||
name = "Sterling Stein";
|
||||
};
|
||||
sdier = {
|
||||
email = "scott@dier.name";
|
||||
matrix = "@sdier:matrix.org";
|
||||
@@ -20443,6 +20465,12 @@
|
||||
githubId = 13489144;
|
||||
name = "Calle Rosenquist";
|
||||
};
|
||||
xbz = {
|
||||
email = "renatochavez7@gmail.com";
|
||||
github = "Xbz-24";
|
||||
githubId = 68678258;
|
||||
name = "Renato German Chavez Chicoma";
|
||||
};
|
||||
xddxdd = {
|
||||
email = "b980120@hotmail.com";
|
||||
github = "xddxdd";
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.programs.nautilus-open-any-terminal;
|
||||
in
|
||||
{
|
||||
options.programs.nautilus-open-any-terminal = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "nautilus-open-any-terminal");
|
||||
|
||||
terminal = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
The terminal emulator to add to context-entry of nautilus. Supported terminal
|
||||
emulators are listed in https://github.com/Stunkymonkey/nautilus-open-any-terminal#supported-terminal-emulators.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
gnome.nautilus-python
|
||||
nautilus-open-any-terminal
|
||||
];
|
||||
programs.dconf = lib.optionalAttrs (cfg.terminal != null) {
|
||||
enable = true;
|
||||
profiles.user.databases = [{
|
||||
settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal;
|
||||
lockAll = true;
|
||||
}];
|
||||
};
|
||||
};
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ stunkymonkey linsui ];
|
||||
};
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
{ options, config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) any attrValues concatMapStringsSep concatStrings
|
||||
concatStringsSep flatten imap1 isList literalExpression mapAttrsToList
|
||||
inherit (lib) attrValues concatMapStringsSep concatStrings
|
||||
concatStringsSep flatten imap1 literalExpression mapAttrsToList
|
||||
mkEnableOption mkIf mkOption mkRemovedOptionModule optional optionalAttrs
|
||||
optionalString singleton types mkRenamedOptionModule nameValuePair
|
||||
mapAttrs' listToAttrs filter;
|
||||
@@ -14,7 +14,7 @@ let
|
||||
baseDir = "/run/dovecot2";
|
||||
stateDir = "/var/lib/dovecot";
|
||||
|
||||
sieveScriptSettings = mapAttrs' (to: from: nameValuePair "sieve_${to}" "${stateDir}/sieve/${from}") cfg.sieve.scripts;
|
||||
sieveScriptSettings = mapAttrs' (to: _: nameValuePair "sieve_${to}" "${stateDir}/sieve/${to}") cfg.sieve.scripts;
|
||||
imapSieveMailboxSettings = listToAttrs (flatten (imap1 (idx: el:
|
||||
singleton {
|
||||
name = "imapsieve_mailbox${toString idx}_name";
|
||||
|
||||
@@ -103,17 +103,18 @@ in {
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
warnings = []
|
||||
++ optional (cfg.settings.update_manager.enable_system_updates or false)
|
||||
''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.''
|
||||
++ optional (cfg.configDir != null)
|
||||
''
|
||||
services.moonraker.configDir has been deprecated upstream and will be removed.
|
||||
++ (optional (head (cfg.settings.update_manager.enable_system_updates or [false])) ''
|
||||
Enabling system updates is not supported on NixOS and will lead to non-removable warnings in some clients.
|
||||
'')
|
||||
++ (optional (cfg.configDir != null) ''
|
||||
services.moonraker.configDir has been deprecated upstream and will be removed.
|
||||
|
||||
Action: ${
|
||||
if cfg.configDir == unifiedConfigDir then "Simply remove services.moonraker.configDir from your config."
|
||||
else "Move files from `${cfg.configDir}` to `${unifiedConfigDir}` then remove services.moonraker.configDir from your config."
|
||||
}
|
||||
'';
|
||||
Action: ${
|
||||
if cfg.configDir == unifiedConfigDir
|
||||
then "Simply remove services.moonraker.configDir from your config."
|
||||
else "Move files from `${cfg.configDir}` to `${unifiedConfigDir}` then remove services.moonraker.configDir from your config."
|
||||
}
|
||||
'');
|
||||
|
||||
assertions = [
|
||||
{
|
||||
|
||||
@@ -11,7 +11,7 @@ let
|
||||
mkListen = kind: addr: let
|
||||
al_v4 = builtins.match "([0-9.]+):([0-9]+)($)" addr;
|
||||
al_v6 = builtins.match "\\[(.+)]:([0-9]+)(%.*|$)" addr;
|
||||
al_portOnly = builtins.match "([0-9]+)" addr;
|
||||
al_portOnly = builtins.match "(^)([0-9]+)" addr;
|
||||
al = findFirst (a: a != null)
|
||||
(throw "services.kresd.*: incorrect address specification '${addr}'")
|
||||
[ al_v4 al_v6 al_portOnly ];
|
||||
|
||||
@@ -118,9 +118,7 @@ in {
|
||||
(budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
|
||||
budgie.budgie-desktop-view
|
||||
budgie.budgie-screensaver
|
||||
|
||||
# Required by the Budgie Desktop session.
|
||||
(gnome.gnome-session.override { gnomeShellSupport = false; })
|
||||
budgie.budgie-session
|
||||
|
||||
# Required by Budgie Menu.
|
||||
gnome-menus
|
||||
|
||||
@@ -33,14 +33,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
''
|
||||
with subtest("Wait for login"):
|
||||
# wait_for_x() checks graphical-session.target, which is expected to be
|
||||
# inactive on Budgie before #228946 (i.e. systemd managed gnome-session) is
|
||||
# done on upstream.
|
||||
# https://github.com/BuddiesOfBudgie/budgie-desktop/blob/v10.7.2/src/session/budgie-desktop.in#L16
|
||||
# inactive on Budgie before Budgie manages user session with systemd.
|
||||
# https://github.com/BuddiesOfBudgie/budgie-desktop/blob/39e9f0895c978f76/src/session/budgie-desktop.in#L16
|
||||
#
|
||||
# Previously this was unconditionally touched by xsessionWrapper but was
|
||||
# changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP).
|
||||
# machine.wait_for_x()
|
||||
machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
|
||||
machine.wait_until_succeeds('journalctl -t budgie-session-binary --grep "Entering running state"')
|
||||
machine.wait_for_file("${user.home}/.Xauthority")
|
||||
machine.succeed("xauth merge ${user.home}/.Xauthority")
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ let
|
||||
linux_6_1_hardened
|
||||
linux_6_5_hardened
|
||||
linux_6_6_hardened
|
||||
linux_6_7_hardened
|
||||
linux_rt_5_4
|
||||
linux_rt_5_10
|
||||
linux_rt_5_15
|
||||
|
||||
@@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
node.wait_for_unit("netbird.service")
|
||||
node.wait_for_unit("netbird-wt0.service")
|
||||
node.wait_for_file("/var/run/netbird/sock")
|
||||
node.succeed("netbird status | grep -q 'Daemon status: NeedsLogin'")
|
||||
'';
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "10.43";
|
||||
version = "10.44";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${
|
||||
builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
sha256 = "sha256-Y1X0KWf87L8Qjx/G6/RV37iiN7enwXTAaqQ+45FfTT4=";
|
||||
sha256 = "sha256-1JuzlCp9CI979ZT3a3zYfJIowrtQ42p1f9PPG6clQ4s=";
|
||||
stripRoot = false;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tauon";
|
||||
version = "7.7.0";
|
||||
version = "7.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "TauonMusicBox";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-FNRG0NKHQpPHb3P1M0eshFuGu9lyWFgmufFC5aqr7n0=";
|
||||
hash = "sha256-rRYM8wdvwfetoIpS/lzAV/uV5XVpXyXsHSrClPWcsCo=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "unifi-protect-backup";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ep1cman";
|
||||
repo = "unifi-protect-backup";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jICnm9EfPyOLVbZfF+TYcQJo0ZXUDpFgYpL5Zf9b8Bc=";
|
||||
hash = "sha256-KT2saPpkAS/6X491i0Y8+jr8JPD51iQx+YGT5zRTtcU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchgit, python3, gn, ninja
|
||||
, fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib
|
||||
, fontconfig, expat, icu, libglvnd, libjpeg, libpng, libwebp, zlib
|
||||
, mesa, libX11, harfbuzzFull
|
||||
}:
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ python3 gn ninja ];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib
|
||||
fontconfig expat icu libglvnd libjpeg libpng libwebp zlib
|
||||
mesa libX11 harfbuzzFull
|
||||
];
|
||||
|
||||
|
||||
@@ -26,16 +26,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
|
||||
pname = "neovide";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovide";
|
||||
repo = "neovide";
|
||||
rev = version;
|
||||
sha256 = "sha256-lmhTTBlhyEepUNHrm2hq42G1kA7siAsJUcYjBfajaHA=";
|
||||
sha256 = "sha256-M19LKNjUmC0WkVGm4t7vjxgMMe0FdMTmB1mLcG33OUg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1R1JrNhcgC16anr5Gl1b9rHgfRLPJElef5D65joHxj0=";
|
||||
cargoHash = "sha256-2fPprZVT7V+Ot8aCpWj6WTdyFylmzlujFdTJCrtE0rk=";
|
||||
|
||||
SKIA_SOURCE_DIR =
|
||||
let
|
||||
|
||||
@@ -952,8 +952,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-markdownlint";
|
||||
publisher = "DavidAnson";
|
||||
version = "0.53.0";
|
||||
sha256 = "sha256-ApCX636M51zN9obFqrUHmaJB3YoFmJPQfjKEWf9bosk=";
|
||||
version = "0.54.0";
|
||||
sha256 = "sha256-BrPFFRspJIz1U08hPbLziCmRUeZv2NhRrTCx6qvhOJw=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
|
||||
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "http://www.fceux.com/";
|
||||
description = "A Nintendo Entertainment System (NES) Emulator";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ sbruder scubed2 ];
|
||||
maintainers = with maintainers; [ sbruder ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -36,20 +36,20 @@ let
|
||||
pcsx2_patches = fetchFromGitHub {
|
||||
owner = "PCSX2";
|
||||
repo = "pcsx2_patches";
|
||||
rev = "619e75bb8db50325b44863f2ccf3c39470c3d5a3";
|
||||
sha256 = "sha256-2KE0W3WwBJCLe8DosyDVsFtEofKgBsChpQEQe+3O+Hg=";
|
||||
rev = "189f79d73f8cd9fd85c7394a14ee4419ddfa267b";
|
||||
sha256 = "sha256-gxwAxR7N7QU4sTGHTdd656dmsW8MrcfroYPvv2UoeRc=";
|
||||
};
|
||||
in
|
||||
llvmPackages_17.stdenv.mkDerivation rec {
|
||||
pname = "pcsx2";
|
||||
version = "1.7.5474";
|
||||
version = "1.7.5497";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PCSX2";
|
||||
repo = "pcsx2";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5ZCXw6PEQ6Ed6kEP27m9O0U79uVGEFR/vwee6/dZBD8=";
|
||||
sha256 = "sha256-gbJkeelSyEHwD4DH/hbzPNNv47hmdgc4kyvX38txYhc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.35.0";
|
||||
version = "1.36.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oyXeh+/9tzykt2fhsKNrk1iaO8556LyCHGVxAxRojLw=";
|
||||
hash = "sha256-sX/4Sez6gKSgaUJC7iW2BeVp0y9h64YqQi7FL5fzZ4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
|
||||
--prefix PATH ":" "${gnome.zenity}/bin"
|
||||
'';
|
||||
|
||||
env.CXXFLAGS = "-include cstdint";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high dynamic range (HDR) image comparison tool";
|
||||
longDescription = ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bemenu";
|
||||
version = "0.6.16";
|
||||
version = "0.6.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = finalAttrs.pname;
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-K9a9BUodpKwvEOhnF2/TGo5zLm7F9RzqSCcWzuhKcWA=";
|
||||
sha256 = "sha256-HfA8VtYP8YHMQNXrg3E6IwX7rR3rp/gyE62InsddjZE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -1,40 +1,60 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, meerk40t-camera
|
||||
, python3
|
||||
, python3Packages
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "MeerK40t";
|
||||
version = "0.8.1000";
|
||||
format = "setuptools";
|
||||
version = "0.9.3010";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meerk40t";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YCcnqaH4Npmct5IBHsnufswRz8bS7mUb1YFwTta/Dxc=";
|
||||
hash = "sha256-RlIWqxmUiL1gFMxwcdWxDiebmEzVz6kTaSlAZHr8S+I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
] ++ (with python3Packages; [
|
||||
setuptools
|
||||
]);
|
||||
|
||||
# prevent double wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
ezdxf
|
||||
# https://github.com/meerk40t/meerk40t/blob/main/setup.py
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
meerk40t-camera
|
||||
opencv4
|
||||
pillow
|
||||
numpy
|
||||
pyserial
|
||||
pyusb
|
||||
setuptools
|
||||
wxpython
|
||||
];
|
||||
]
|
||||
++ lib.flatten (lib.attrValues passthru.optional-dependencies);
|
||||
|
||||
passthru.optional-dependencies = with python3Packages; {
|
||||
cam = [
|
||||
opencv4
|
||||
];
|
||||
camhead = [
|
||||
opencv4
|
||||
];
|
||||
dxf = [
|
||||
ezdxf
|
||||
];
|
||||
gui = [
|
||||
wxpython
|
||||
pillow
|
||||
opencv4
|
||||
ezdxf
|
||||
];
|
||||
};
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
@@ -43,7 +63,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mozphab";
|
||||
version = "1.4.3";
|
||||
version = "1.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla-conduit";
|
||||
repo = "review";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FUHT4MPzSxO3MCNYWodNxvFR2kL0P4eGmSHPtCt0Cug=";
|
||||
hash = "sha256-HxwQ+mGtjnruppPAD01QUg3aca+k5vpj814BWM+3VfQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-bar";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e64qCthZfGeFIe/g4Bu342d/C46qzJRBdxzzP6rM408=";
|
||||
sha256 = "sha256-5N+WKZ+fuHQ0lVLd95/KkNAwzg/C4ImZ4DnSuKNGunk=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-paths.patch ];
|
||||
@@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
substituteInPlace tools.go --subst-var out
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-YMpq9pgA3KjQMcw7JDwEDbHZ5h3N7ziFVIGvQ+xA3Ds=";
|
||||
vendorHash = "sha256-/kqhZcIuoN/XA0i1ua3lzVGn4ghkekFYScL1o3kgBX4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-look";
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-look";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gw0C5PCVwXuwXWF39P7pc8KdnmCYRH24zizShmniynM=";
|
||||
hash = "sha256-kOoYhJKt7/BsQ0/RuVhj0bWnX9GU8ET3MSq6NMCOw5E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vHqnIkzsoQHiP6mmrwNetq6Pp5UB1CmX7mYvgsbvb0s=";
|
||||
vendorHash = "sha256-V0KXK6jxBYI+tixBLq24pJJcnu4gDF6nfyns2IBTss4=";
|
||||
|
||||
# Replace /usr/ directories with the packages output location
|
||||
# This means it references the correct path
|
||||
|
||||
@@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "process-compose";
|
||||
version = "0.80.0";
|
||||
version = "0.81.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9a850AKcHpKaZJ5C7l8y2dz6zHWyoZ7dIdEqtmXN3ww=";
|
||||
hash = "sha256-HGrqW56gU5IiX5vyMmJyr63LlJaalCY1kWZi7ahrr0o=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -43,7 +43,7 @@ buildGoModule rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-NYb5FLMXRoOTEH7nD3+1LUGD7wY0N8FTTUZ85uxTPrk=";
|
||||
vendorHash = "sha256-vcx8wHqJzL+huCPdzN5h3dLs3PE7NaFWJEFJX22EZV4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
diff -Nurp sigal-2.3.orig/sigal/writer.py sigal-2.3/sigal/writer.py
|
||||
--- sigal-2.3.orig/sigal/writer.py 2022-08-08 19:43:10.934707194 +0200
|
||||
+++ sigal-2.3/sigal/writer.py 2022-08-08 19:44:57.542382532 +0200
|
||||
@@ -103,7 +103,11 @@ class AbstractWriter:
|
||||
os.path.join(THEMES_PATH, 'default', 'static'),
|
||||
os.path.join(self.theme, 'static'),
|
||||
):
|
||||
- shutil.copytree(static_path, self.theme_path, dirs_exist_ok=True)
|
||||
+ # https://stackoverflow.com/a/17022146/4935114
|
||||
+ orig_copystat = shutil.copystat
|
||||
+ shutil.copystat = lambda x, y: x
|
||||
+ shutil.copytree(static_path, self.theme_path, dirs_exist_ok=True, copy_function=shutil.copy)
|
||||
+ shutil.copystat = orig_copystat
|
||||
|
||||
if self.settings["user_css"]:
|
||||
if not os.path.exists(self.settings["user_css"]):
|
||||
@@ -7,15 +7,17 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sigal";
|
||||
version = "2.3";
|
||||
format = "setuptools";
|
||||
version = "2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q=";
|
||||
hash = "sha256-pDTaqtqfuk7tACkyaKClTJotuVcTKli5yx1wbEM93TM=";
|
||||
};
|
||||
|
||||
patches = [ ./copytree-permissions.patch ];
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
# install_requires
|
||||
@@ -31,8 +33,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
feedgenerator
|
||||
zopfli
|
||||
cryptography
|
||||
|
||||
setuptools # needs pkg_resources
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -8,19 +8,18 @@
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stretchly";
|
||||
version = "1.8.1";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
|
||||
sha256 = "sha256-/v74vDGxD5iiOPeBXPAaV42JpyBjeJSO/Lk88pCkDng=";
|
||||
url = "https://github.com/hovancik/stretchly/releases/download/v${finalAttrs.version}/stretchly-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-suTH6o7vtUr2DidPXAwqrya5/WukQOFmS/34LaiWDBs=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/hovancik/stretchly/v${version}/stretchly_128x128.png";
|
||||
sha256 = "0whfg1fy2hjyk1lzpryikc1aj8agsjhfrb0bf7ggl6r9m8s1rvdl";
|
||||
url = "https://raw.githubusercontent.com/hovancik/stretchly/v${finalAttrs.version}/stretchly_128x128.png";
|
||||
hash = "sha256-tO0cNKopG/recQus7KDUTyGpApvR5/tpmF5C4V14DnI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -28,14 +27,14 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/${pname}/
|
||||
mv resources/app.asar* $out/share/${pname}/
|
||||
mkdir -p $out/bin $out/share/${finalAttrs.pname}/
|
||||
mv resources/app.asar* $out/share/${finalAttrs.pname}/
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
ln -s ${finalAttrs.desktopItem}/share/applications/* $out/share/applications/
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/app.asar
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${finalAttrs.pname} \
|
||||
--add-flags $out/share/${finalAttrs.pname}/app.asar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -54,9 +53,9 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = pname;
|
||||
exec = pname;
|
||||
icon = icon;
|
||||
name = finalAttrs.pname;
|
||||
exec = finalAttrs.pname;
|
||||
icon = finalAttrs.icon;
|
||||
desktopName = "Stretchly";
|
||||
genericName = "Stretchly";
|
||||
categories = [ "Utility" ];
|
||||
@@ -77,4 +76,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ _1000101 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
|
||||
sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c
|
||||
'';
|
||||
|
||||
# Fails the build on clang-16 and on upcoming gcc-14.
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";
|
||||
|
||||
# Needs the path to `tclConfig.sh' and `tkConfig.sh'.
|
||||
configureFlags = [
|
||||
"--with-tcl=${tcl}/lib"
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hubble";
|
||||
version = "0.12.3";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GVfPrKPX/y/trtZjIftUW1bH5Z/O/oIUoIjjEET38Mk=";
|
||||
sha256 = "sha256-jFzxAzLv3EfqWgbXsN8d0OPY8pDy7OBjJIzr+x5yFF0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubedog";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "kubedog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B6ITVr+Zk1+uMU9RAupvUIBwj8SICp7UyXi0RfIFiME=";
|
||||
hash = "sha256-dk6ieIUoS1N2UtiLig5dFq0476xh69bjueN05ZKjcLg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lLyIVA7Mkj1bfA/u8VMTwmKmhNfibYpT+dgIWFdOiPs=";
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "terraform-compliance";
|
||||
version = "1.3.46";
|
||||
version = "1.3.47";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-compliance";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-30aQA+VJY2qarpYGZpgt5ebYFt5UHUHJcuBNgKiGnt0=";
|
||||
sha256 = "sha256-QJDKBM5CTOdF7oT42vL+Yp1UsQXWvkSZzo+WSsDxAZw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "discordo";
|
||||
version = "unstable-2023-12-12";
|
||||
version = "unstable-2024-01-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = pname;
|
||||
rev = "320ec7753d552974d4d5ede3fcf6fb3c0d52b6e4";
|
||||
hash = "sha256-LVWOXw8+GbCE6N6kVSXDjjNqOcq7PS4KU7LXoowhBdQ=";
|
||||
rev = "301b7c7a792b427595803679e37fe99007de9451";
|
||||
hash = "sha256-ufAlwlH++g9L3aaA5soJ6r2oiJZi8Ny/6P530oV+BiY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8qr1erKGyJvR4LDKHkZf7nR0tQOcvUHQyJt7OlqNS44=";
|
||||
vendorHash = "sha256-fy3FI1K57hLAgbw3WfmVNZT9ywCSXwRKSq+ATjG+Qpo=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gnmic";
|
||||
version = "0.35.0";
|
||||
version = "0.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openconfig";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PGhU8u2dYo9S0yv8/F7YBSHUZWxxFUXIbjQIjsX6AGw=";
|
||||
hash = "sha256-1Rtq/tRDU8hwrEYhP2/2qPWAYeCPL03m4NpXO3sGUdo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HoOjVfpowb5jvAYdQ3cbCQmSl1RJKPDjvOaOGfhe5TY=";
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, makeWrapper
|
||||
, makeBinaryWrapper
|
||||
, wrapGAppsHook
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ];
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeBinaryWrapper wrapGAppsHook ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
|
||||
chmod -R g-w "$out"
|
||||
|
||||
# Wrap the startup command
|
||||
makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
|
||||
makeBinaryWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer }}" \
|
||||
|
||||
@@ -2,52 +2,52 @@
|
||||
let
|
||||
versions =
|
||||
if stdenv.isLinux then {
|
||||
stable = "0.0.40";
|
||||
ptb = "0.0.64";
|
||||
canary = "0.0.248";
|
||||
development = "0.0.8";
|
||||
stable = "0.0.41";
|
||||
ptb = "0.0.66";
|
||||
canary = "0.0.257";
|
||||
development = "0.0.11";
|
||||
} else {
|
||||
stable = "0.0.291";
|
||||
ptb = "0.0.94";
|
||||
canary = "0.0.394";
|
||||
development = "0.0.18";
|
||||
stable = "0.0.292";
|
||||
ptb = "0.0.96";
|
||||
canary = "0.0.401";
|
||||
development = "0.0.27";
|
||||
};
|
||||
version = versions.${branch};
|
||||
srcs = rec {
|
||||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-kKWbD2fvRq+7VnOE3tEQ1LeGneZOQfD/79bG2uElYSw=";
|
||||
hash = "sha256-yzCOlYIDvbhJRbiqf5NC2iBT2ezlJP81O/wtkWIEp+U=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
hash = "sha256-loA/RdT6Y5c6Upius+vO/383FrutsJEYS/1uiR0gfqo=";
|
||||
hash = "sha256-3ocygqp8eiF3n/BVlTp1T1CRsGj56MGp1yPsvBE7/H4=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-4BjlvunODUSNq2uBiC82FTlNRO3ByLJzwMsB3LirNIw=";
|
||||
hash = "sha256-2AUCTWKEB4cy2tFfnJMn8Ywz1B8a3H6yhkVIcB0fLME=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
hash = "sha256-FD0qozLyNMPVpdD42A/pziwX7tKP3/9mFDIqdf4lopE=";
|
||||
hash = "sha256-bN77yfmz/W3ohSKHV4pwnKEET6yi3p29ZfqH1BvFqXs=";
|
||||
};
|
||||
};
|
||||
x86_64-darwin = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
|
||||
hash = "sha256-k0A5xBWG8cXhDp/d3dw5Eu1cpqayfOzrnwXK8i2CtVE=";
|
||||
hash = "sha256-1BKMIWSb7+oQ+B80GUCslKn5VNdM0hPTNyZkI/RsxhM=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
|
||||
hash = "sha256-SUCVLCorwqQTkJs3UJguBYZwE1lrJgmZ9BU8fHIRgLE=";
|
||||
hash = "sha256-dG0Wcx8X2+kzrpacFZmMCXfLsuLOLbDK4qVLAMzd4RA=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
|
||||
hash = "sha256-lgnZEkXxfn1L5QUBGXcKrIEL5kEehRIc0HF3WXgB8yo=";
|
||||
hash = "sha256-fz/LDQJ/B8luN6Ffobp82hnycBOLg9Kdi0kXLGltCDc=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
|
||||
hash = "sha256-q/8hHRBK9Quj2S1n5QQC3u3yF9OvxqWrC+ge4Jh9i0U=";
|
||||
hash = "sha256-MRCBPe98Czm1OG2l3c1GAW4a27fV8XMtQ9pPIJMgqzA=";
|
||||
};
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
|
||||
@@ -1,60 +1,106 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, libpng
|
||||
, libX11
|
||||
, libXi
|
||||
, libXtst
|
||||
, zlib
|
||||
, electron
|
||||
, xorg
|
||||
, pipewire
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
buildNpmPackage rec {
|
||||
pname = "jitsi-meet-electron";
|
||||
version = "2022.10.1";
|
||||
version = "2023.11.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
|
||||
sha256 = "sha256-98zuAsGT30paxszSO1XcMY8tsrMBeBLDFjK/JWhLC8s=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jitsi";
|
||||
repo = "jitsi-meet-electron";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gE5CP0l3SrAHGNS6Hr5/MefTtE86JTmc85CwOmylEpg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
# robotjs node-gyp dependencies
|
||||
buildInputs = [
|
||||
libpng
|
||||
libX11
|
||||
libXi
|
||||
libXtst
|
||||
zlib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
npmDepsHash = "sha256-JZVJcKzG4X7YIUvIRWZsDQnHx+dNqCj6kFm8mZaSH2k=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace main.js \
|
||||
--replace "require('electron-is-dev')" "false"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# remove some prebuilt binaries
|
||||
find node_modules -type d -name prebuilds -exec rm -r {} +
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
# generate .asar file
|
||||
# asarUnpack makes sure to unwrap binaries so that nix can see the RPATH
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
-c.asarUnpack="**/*.node" \
|
||||
-c.electronDist=${electron}/libexec/electron \
|
||||
-c.electronVersion=${electron.version}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/${pname} $out/share/applications
|
||||
mkdir -p $out/share/jitsi-meet-electron
|
||||
cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/jitsi-meet-electron
|
||||
|
||||
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
|
||||
cp -a ${appimageContents}/jitsi-meet.desktop $out/share/applications/${pname}.desktop
|
||||
cp -a ${appimageContents}/usr/share/icons $out/share
|
||||
makeWrapper ${lib.getExe electron} $out/bin/jitsi-meet-electron \
|
||||
--add-flags $out/share/jitsi-meet-electron/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pipewire ]} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--inherit-argv0
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
install -Dm644 resources/icons/512x512.png $out/share/icons/hicolor/512x512/apps/jitsi-meet-electron.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst pipewire ]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
'';
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "jitsi-meet-electron";
|
||||
exec = "jitsi-meet-electron %U";
|
||||
icon = "jitsi-meet-electron";
|
||||
desktopName = "Jitsi Meet";
|
||||
comment = meta.description;
|
||||
categories = [ "VideoConference" "AudioVideo" "Audio" "Video" "Network" ];
|
||||
mimeTypes = [ "x-scheme-handler/jitsi-meet" ];
|
||||
terminal = false;
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/jitsi/jitsi-meet-electron/releases/tag/${src.rev}";
|
||||
description = "Jitsi Meet desktop application powered by Electron";
|
||||
homepage = "https://github.com/jitsi/jitsi-meet-electron";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.jitsi.members;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "jitsi-meet-electron";
|
||||
maintainers = teams.jitsi.members ++ [ maintainers.tomasajt ];
|
||||
inherit (electron.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Gp+Euuuo51syHmQzzQALxZjejYLoJtGJbo4Gl40UASs=";
|
||||
hash = "sha256-aaUWc0G7KY3PwlIysoL++l7na2M5sxQFW2YsO0AIRY8=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
||||
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DBUILD_UPDATER=off"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
|
||||
"-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
|
||||
"-DMIRALL_VERSION_SUFFIX=" # remove git suffix from version
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
, configText ? ""
|
||||
}:
|
||||
let
|
||||
version = "2309.1";
|
||||
version = "2312";
|
||||
|
||||
sysArch =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
|
||||
@@ -36,8 +36,8 @@ let
|
||||
pname = "vmware-horizon-files";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://download3.vmware.com/software/CART24FQ4_LIN_2309.1_TARBALL/VMware-Horizon-Client-Linux-2309.1-8.11.1-22775487.tar.gz";
|
||||
sha256 = "3f66d21c0e97324d1cb85ac75132a69768e8e7ff57da33841e4e8bd37089d245";
|
||||
url = "https://download3.vmware.com/software/CART24FQ4_LIN_2312_TARBALL/VMware-Horizon-Client-Linux-2312-8.12.0-23149323.tar.gz";
|
||||
sha256 = "15ca1d6028b9ca88e23fa363a2942fd76456c19e95ced4734595c3dc44db38d8";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.4.0";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "paperless-ngx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bIiUG5yLpKOoxByef2Wm7MmSoL5zAYE9x6/zZywG9aE=";
|
||||
hash = "sha256-uFaywZF1e1ELU6EcRxzMqGu3uiFK8MMfrTxb01Drd7k=";
|
||||
};
|
||||
|
||||
python = python3;
|
||||
|
||||
@@ -27,11 +27,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.67.1";
|
||||
version = "0.67.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-Bx1Q7eXJuu/Vh6UuZYlkUlvw6FXTObYAynHV+60cNVY=";
|
||||
hash = "sha256-YmbnV5/wwaDiuDUTx00sIdbVgtqD8vtvpTNFxXutP3U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -104,6 +104,8 @@ in {
|
||||
featuresInfo
|
||||
python
|
||||
;
|
||||
gnuradioOlder = lib.versionOlder versionAttr.major;
|
||||
gnuradioAtLeast = lib.versionAtLeast versionAttr.major;
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
|
||||
inherit qt;
|
||||
} // lib.optionalAttrs (hasFeature "gnuradio-companion") {
|
||||
|
||||
@@ -25,14 +25,14 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "16.1.49";
|
||||
version = "16.1.51";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
hash = "sha256-rzW0dB6LkKnbqHMLII6u3a6iJ1nz6gys/TN0fZFcrBk=";
|
||||
hash = "sha256-7YOBpUeGutFPbMlQ1NnJ6BNyLbw54Meezwfs6mL71BQ=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -22,11 +22,12 @@ stdenv.mkDerivation rec {
|
||||
batteries
|
||||
dune-build-info
|
||||
inifiles
|
||||
why3
|
||||
yojson
|
||||
zarith
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ why3 ];
|
||||
propagatedBuildInputs = [ why3.out ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{ callPackage, fetchurl, lib, stdenv
|
||||
, ocamlPackages, coqPackages, rubber, hevea, emacs
|
||||
, version ? "1.7.0"
|
||||
, version ? "1.7.1"
|
||||
, ideSupport ? true
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -10,15 +12,18 @@ stdenv.mkDerivation rec {
|
||||
src = fetchurl {
|
||||
url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz";
|
||||
hash = {
|
||||
"1.7.0" = "sha256-rygrjzuJVukOvpuXTG/yeoEP98ZFkLQHObgc3My1PVY=";
|
||||
"1.7.1" = "sha256-rG1hcxFhQ2PlE9RTz9ELliDjCuSzLnJ1togRY637cU4=";
|
||||
"1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw=";
|
||||
}."${version}";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
nativeBuildInputs = lib.optional ideSupport
|
||||
wrapGAppsHook
|
||||
++ (with ocamlPackages; [
|
||||
ocaml findlib menhir
|
||||
]) ++ [
|
||||
# Coq Support
|
||||
coqPackages.coq
|
||||
];
|
||||
@@ -29,8 +34,10 @@ stdenv.mkDerivation rec {
|
||||
emacs
|
||||
# Documentation
|
||||
rubber hevea
|
||||
] ++ lib.optional ideSupport
|
||||
# GUI
|
||||
lablgtk3-sourceview3
|
||||
++ [
|
||||
# WebIDE
|
||||
js_of_ocaml js_of_ocaml-ppx
|
||||
# S-expression output for why3pp
|
||||
@@ -44,10 +51,19 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [ "--enable-verbose-make" ];
|
||||
configureFlags = [ "--enable-verbose-make"
|
||||
(lib.enableFeature ideSupport "ide")
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
installTargets = [ "install" "install-lib" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $dev/lib
|
||||
mv $out/lib/ocaml $dev/lib/
|
||||
'';
|
||||
|
||||
passthru.withProvers = callPackage ./with-provers.nix {};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
, extraPkgs ? [ ]
|
||||
}:
|
||||
let
|
||||
version = "8.1.18";
|
||||
version = "8.3.1";
|
||||
|
||||
cbangSrc = fetchFromGitHub {
|
||||
owner = "cauldrondevelopmentllc";
|
||||
repo = "cbang";
|
||||
rev = "bastet-v${version}";
|
||||
hash = "sha256-G0rknVmZiyC4sRTOowFjf7EQ5peGf+HLPPcLWXXFlX4=";
|
||||
hash = "sha256-cuyfJG5aDJ6e2SllxwKTViG0j8FWHvjcTaaBBtkgEdU=";
|
||||
};
|
||||
|
||||
fah-client = stdenv.mkDerivation {
|
||||
@@ -25,7 +25,7 @@ let
|
||||
owner = "FoldingAtHome";
|
||||
repo = "fah-client-bastet";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IgT/5NqCwN8N8OObjtASuT4IRb2EN4bdixxUdjiyddI=";
|
||||
hash = "sha256-Ztc2im4Xmk8f6GotGRgA5zDkcyQFnodUvroJVl+ApT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ scons ];
|
||||
@@ -45,14 +45,15 @@ let
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share/applications,share/feh-client}
|
||||
mkdir -p $out/{bin,share/applications}
|
||||
|
||||
cp fah-client $out/bin/fah-client
|
||||
|
||||
cp install/lin/fah-client.desktop $out/share/applications/
|
||||
cp -r images $out/share/feh-client/
|
||||
|
||||
sed -e "s|Icon=.*|Icon=$out/share/feh-client/images/fahlogo.png|g" -i $out/share/applications/fah-client.desktop
|
||||
cp install/lin/fah-client.desktop.in $out/share/applications/fah-client.desktop
|
||||
sed \
|
||||
-e "s|Icon=.*|Icon=$out/share/feh-client/images/fahlogo.png|g" \
|
||||
-e "s|%(PACKAGE_URL)s|https://github.com/FoldingAtHome/fah-client-bastet|g" \
|
||||
-i $out/share/applications/fah-client.desktop
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.12.184";
|
||||
version = "5.12.186";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-mit";
|
||||
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "PurpleBooth";
|
||||
repo = "git-mit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KFfRfLOl6So9AnmrLiiG3sUG2OHQegb8Nx/ndcO1IjE=";
|
||||
hash = "sha256-895QAtKUzqiWffw5IgovXBiARncelrmz1FUEbeHYoW0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-17Ojhu7xPZYdFeV/rCa/K9HLHD/vsm0FU6Ag9EPngcQ=";
|
||||
cargoHash = "sha256-E3xwZ9oB7oe5gVLAasvo1MWPjDPLKZgSX98VZAq2O3k=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ libgit2.overrideAttrs (oldAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "libgit2";
|
||||
rev = "tag-0ad3d776aa86dd607dc86dcd7f77ad3ed7ebec61";
|
||||
sha256 = "sha256-mXCmspM3fqI14DF9sAIMH5vGdMMjWkdDjdME4EiQuqY=";
|
||||
rev = "tag-2ecf33948a4df9ef45a66c68b8ef24a5e60eaac6";
|
||||
hash = "sha256-Bm3Gj9+AhNQMvkIqdrTkK5D9vrZ1qq6CS8Wrn9kfKiw=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf "$out/share"
|
||||
mkdir -p "$out/share/obs"
|
||||
mv "$out/data/obs-plugins" "$out/share/obs"
|
||||
rm -rf "$out/obs-plugins" "$out/data"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A comprehensive blur plugin for OBS that provides several different blur algorithms, and proper compositing";
|
||||
homepage = "https://github.com/FiniteSingularity/obs-composite-blur";
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.29.0";
|
||||
version = "1.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Vy/sW8Y9SFSBaoectehF7ROxuypD7k7tAkcfrEK+pmI=";
|
||||
sha256 = "sha256-RL4JkEJMVduG06udIVlVdr+bj9wIGbun3rpeTCUehhk=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -39,13 +39,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.13";
|
||||
version = "1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-doGZ1rHHXDRClrTEXYJcU6AqlBTanpNpV6EIbxQgcXY=";
|
||||
hash = "sha256-ElmdYJ4X5C+2BKWgUoL7bg/whvAg2CFBDFAGnJXscB4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,137 @@
|
||||
diff --git a/distrobox-create b/distrobox-create
|
||||
index 64e9911..136659d 100755
|
||||
--- a/distrobox-create
|
||||
+++ b/distrobox-create
|
||||
@@ -74,6 +74,10 @@ unshare_ipc=0
|
||||
unshare_netns=0
|
||||
unshare_process=0
|
||||
unshare_devsys=0
|
||||
+
|
||||
+self_dir="$(dirname "$(realpath "$0")")"
|
||||
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
||||
+
|
||||
# Use cd + dirname + pwd so that we do not have relative paths in mount points
|
||||
# We're not using "realpath" here so that symlinks are not resolved this way
|
||||
# "realpath" would break situations like Nix or similar symlink based package
|
||||
@@ -98,6 +102,7 @@ version="1.6.0.1"
|
||||
# priority over system defaults
|
||||
# leave priority to environment variables.
|
||||
config_files="
|
||||
+ $nix_config_file
|
||||
/usr/share/distrobox/distrobox.conf
|
||||
/usr/share/defaults/distrobox/distrobox.conf
|
||||
/usr/etc/distrobox/distrobox.conf
|
||||
diff --git a/distrobox-enter b/distrobox-enter
|
||||
index 6d8998a..bb05437 100755
|
||||
--- a/distrobox-enter
|
||||
+++ b/distrobox-enter
|
||||
@@ -75,10 +75,14 @@ skip_workdir=0
|
||||
verbose=0
|
||||
version="1.6.0.1"
|
||||
|
||||
+self_dir="$(dirname "$(realpath "$0")")"
|
||||
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
||||
+
|
||||
# Source configuration files, this is done in an hierarchy so local files have
|
||||
# priority over system defaults
|
||||
# leave priority to environment variables.
|
||||
config_files="
|
||||
+ $nix_config_file
|
||||
/usr/share/distrobox/distrobox.conf
|
||||
/usr/share/defaults/distrobox/distrobox.conf
|
||||
/usr/etc/distrobox/distrobox.conf
|
||||
diff --git a/distrobox-generate-entry b/distrobox-generate-entry
|
||||
index 3243691..6a7910a 100755
|
||||
--- a/distrobox-generate-entry
|
||||
+++ b/distrobox-generate-entry
|
||||
@@ -45,10 +45,14 @@ icon_default="${HOME}/.local/share/icons/terminal-distrobox-icon.svg"
|
||||
verbose=0
|
||||
version="1.6.0.1"
|
||||
|
||||
+self_dir="$(dirname "$(realpath "$0")")"
|
||||
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
||||
+
|
||||
# Source configuration files, this is done in an hierarchy so local files have
|
||||
# priority over system defaults
|
||||
# leave priority to environment variables.
|
||||
config_files="
|
||||
+ $nix_config_file
|
||||
/usr/share/distrobox/distrobox.conf
|
||||
/usr/share/defaults/distrobox/distrobox.conf
|
||||
/usr/etc/distrobox/distrobox.conf
|
||||
diff --git a/distrobox-list b/distrobox-list
|
||||
index aaec85e..235e529 100755
|
||||
--- a/distrobox-list
|
||||
+++ b/distrobox-list
|
||||
@@ -44,10 +44,14 @@ verbose=0
|
||||
version="1.6.0.1"
|
||||
container_manager="autodetect"
|
||||
|
||||
+self_dir="$(dirname "$(realpath "$0")")"
|
||||
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
||||
+
|
||||
# Source configuration files, this is done in an hierarchy so local files have
|
||||
# priority over system defaults
|
||||
# leave priority to environment variables.
|
||||
config_files="
|
||||
+ $nix_config_file
|
||||
/usr/share/distrobox/distrobox.conf
|
||||
/usr/share/defaults/distrobox/distrobox.conf
|
||||
/usr/etc/distrobox/distrobox.conf
|
||||
diff --git a/distrobox-rm b/distrobox-rm
|
||||
index 702c1dd..2e37538 100755
|
||||
--- a/distrobox-rm
|
||||
+++ b/distrobox-rm
|
||||
@@ -54,10 +54,14 @@ rm_home=0
|
||||
response_rm_home="N"
|
||||
version="1.6.0.1"
|
||||
|
||||
+self_dir="$(dirname "$(realpath "$0")")"
|
||||
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
||||
+
|
||||
# Source configuration files, this is done in an hierarchy so local files have
|
||||
# priority over system defaults
|
||||
# leave priority to environment variables.
|
||||
config_files="
|
||||
+ $nix_config_file
|
||||
/usr/share/distrobox/distrobox.conf
|
||||
/usr/share/defaults/distrobox/distrobox.conf
|
||||
/usr/etc/distrobox/distrobox.conf
|
||||
diff --git a/distrobox-stop b/distrobox-stop
|
||||
index fd17cc1..e0dbc8f 100755
|
||||
--- a/distrobox-stop
|
||||
+++ b/distrobox-stop
|
||||
@@ -52,10 +52,14 @@ non_interactive=0
|
||||
verbose=0
|
||||
version="1.6.0.1"
|
||||
|
||||
+self_dir="$(dirname "$(realpath "$0")")"
|
||||
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
||||
+
|
||||
# Source configuration files, this is done in an hierarchy so local files have
|
||||
# priority over system defaults
|
||||
# leave priority to environment variables.
|
||||
config_files="
|
||||
+ $nix_config_file
|
||||
/usr/share/distrobox/distrobox.conf
|
||||
/usr/share/defaults/distrobox/distrobox.conf
|
||||
/usr/etc/distrobox/distrobox.conf
|
||||
diff --git a/distrobox-upgrade b/distrobox-upgrade
|
||||
index ab5e96f..dc8d295 100755
|
||||
--- a/distrobox-upgrade
|
||||
+++ b/distrobox-upgrade
|
||||
@@ -39,10 +39,14 @@ rootful=0
|
||||
verbose=0
|
||||
version="1.6.0.1"
|
||||
|
||||
+self_dir="$(dirname "$(realpath "$0")")"
|
||||
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
||||
+
|
||||
# Source configuration files, this is done in an hierarchy so local files have
|
||||
# priority over system defaults
|
||||
# leave priority to environment variables.
|
||||
config_files="
|
||||
+ $nix_config_file
|
||||
/usr/share/distrobox/distrobox.conf
|
||||
/usr/share/defaults/distrobox/distrobox.conf
|
||||
/usr/etc/distrobox/distrobox.conf
|
||||
@@ -2,19 +2,23 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "distrobox";
|
||||
version = "1.5.0.2";
|
||||
version = "1.6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "89luca89";
|
||||
repo = finalAttrs.pname;
|
||||
repo = "distrobox";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ss8049D6n1V/gDzEMjywDnoke5s2we9j3mO8yta72UA=";
|
||||
hash = "sha256-UWrXpb20IHcwadPpwbhSjvOP1MBXic5ay+nP+OEVQE4=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# https://github.com/89luca89/distrobox/pull/1080
|
||||
patches = [ ./always-mount-nix.patch ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -30,6 +34,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/distrobox-generate-entry" \
|
||||
--prefix PATH ":" ${lib.makeBinPath [ wget ]}
|
||||
|
||||
mkdir -p $out/share/distrobox
|
||||
echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@@ -39,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
forward compatibility with software and freedom to use whatever distribution
|
||||
you’re more comfortable with
|
||||
'';
|
||||
homepage = "https://distrobox.privatedns.org/";
|
||||
homepage = "https://distrobox.it/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ atila ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.24.0";
|
||||
version = "2.24.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6wa4kIl65z3kk+wzDX+WhS50J+e0AZ+W8A++bdnRc2M=";
|
||||
hash = "sha256-B6hJXm4SABYTIFPd9unTNkDtQxeMPBk98/2Q1TQedEA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
rm -rf e2e/
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-03jlomVb3jS+SkmIxRtPsaMx2VKLYX/Lp9JH/mlJvK4=";
|
||||
vendorHash = "sha256-ymNd8DMkttSiF167RSIWQbL8RHPYXp4D8ctFoSPC0io=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -23,6 +23,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
url = "https://github.com/virt-manager/virt-manager/commit/6e5c1db6b4a0af96afeb09a09fb2fc2b73308f01.patch";
|
||||
hash = "sha256-zivVo6nHvfB7aHadOouQZCBXn5rY12nxFjQ4FFwjgZI=";
|
||||
})
|
||||
# fix test with libvirt 10
|
||||
(fetchpatch {
|
||||
url = "https://github.com/virt-manager/virt-manager/commit/83fcc5b2e8f2cede84564387756fe8971de72188.patch";
|
||||
hash = "sha256-yEk+md5EkwYpP27u3E+oTJ8thgtH2Uy1x3JIWPBhqeE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
, fetchpatch
|
||||
, gdbm
|
||||
, glib
|
||||
, gst_all_1
|
||||
, gsettings-desktop-schemas
|
||||
, gtk-vnc
|
||||
, gtk3
|
||||
@@ -64,6 +65,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
bash-completion
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
|
||||
@@ -321,7 +321,7 @@ stdenv.mkDerivation {
|
||||
hardening_unsupported_flags+=" pic"
|
||||
''
|
||||
|
||||
+ optionalString targetPlatform.isAvr ''
|
||||
+ optionalString (targetPlatform.isAvr || targetPlatform.isWindows) ''
|
||||
hardening_unsupported_flags+=" relro bindnow"
|
||||
''
|
||||
|
||||
|
||||
@@ -7,12 +7,17 @@
|
||||
, completeBuildDeps
|
||||
, completeDeps
|
||||
, crateAuthors
|
||||
, crateLinks
|
||||
, crateDescription
|
||||
, crateHomepage
|
||||
, crateFeatures
|
||||
, crateHomepage
|
||||
, crateLicense
|
||||
, crateLicenseFile
|
||||
, crateLinks
|
||||
, crateName
|
||||
, crateReadme
|
||||
, crateRenames
|
||||
, crateRepository
|
||||
, crateRustVersion
|
||||
, crateVersion
|
||||
, extraLinkFlags
|
||||
, extraRustcOptsForBuildRs
|
||||
@@ -120,6 +125,8 @@ in ''
|
||||
|
||||
EXTRA_BUILD=""
|
||||
BUILD_OUT_DIR=""
|
||||
|
||||
# Set up Cargo Environment variables: https://doc.rust-lang.org/cargo/reference/environment-variables.html
|
||||
export CARGO_PKG_NAME=${crateName}
|
||||
export CARGO_PKG_VERSION=${crateVersion}
|
||||
export CARGO_PKG_AUTHORS="${authors}"
|
||||
@@ -147,6 +154,11 @@ in ''
|
||||
export CARGO_PKG_VERSION_PATCH=${lib.elemAt version 2}
|
||||
export CARGO_PKG_VERSION_PRE="${versionPre}"
|
||||
export CARGO_PKG_HOMEPAGE="${crateHomepage}"
|
||||
export CARGO_PKG_LICENSE="${crateLicense}"
|
||||
export CARGO_PKG_LICENSE_FILE="${crateLicenseFile}"
|
||||
export CARGO_PKG_README="${crateReadme}"
|
||||
export CARGO_PKG_REPOSITORY="${crateRepository}"
|
||||
export CARGO_PKG_RUST_VERSION="${crateRustVersion}"
|
||||
export NUM_JOBS=$NIX_BUILD_CORES
|
||||
export RUSTC="rustc"
|
||||
export RUSTDOC="rustdoc"
|
||||
|
||||
@@ -314,11 +314,16 @@ crate_: lib.makeOverridable
|
||||
# Either set to a concrete sub path to the crate root
|
||||
# or use `null` for auto-detect.
|
||||
workspace_member = crate.workspace_member or ".";
|
||||
crateVersion = crate.version;
|
||||
crateDescription = crate.description or "";
|
||||
crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [ ];
|
||||
crateDescription = crate.description or "";
|
||||
crateHomepage = crate.homepage or "";
|
||||
crateLicense = crate.license or "";
|
||||
crateLicenseFile = crate.license-file or "";
|
||||
crateLinks = crate.links or "";
|
||||
crateReadme = crate.readme or "";
|
||||
crateRepository = crate.repository or "";
|
||||
crateRustVersion = crate.rust-version or "";
|
||||
crateVersion = crate.version;
|
||||
crateType =
|
||||
if lib.attrByPath [ "procMacro" ] false crate then [ "proc-macro" ] else
|
||||
if lib.attrByPath [ "plugin" ] false crate then [ "dylib" ] else
|
||||
@@ -341,6 +346,7 @@ crate_: lib.makeOverridable
|
||||
inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription
|
||||
crateFeatures crateRenames libName build workspace_member release libPath crateVersion crateLinks
|
||||
extraLinkFlags extraRustcOptsForBuildRs
|
||||
crateLicense crateLicenseFile crateReadme crateRepository crateRustVersion
|
||||
crateAuthors crateHomepage verbose colors codegenUnits;
|
||||
};
|
||||
buildPhase = buildCrate {
|
||||
|
||||
@@ -30,6 +30,7 @@ runCommand testName {
|
||||
}
|
||||
package.meta;
|
||||
} ''
|
||||
touch "$out"
|
||||
for moduleName in $moduleNames; do
|
||||
echo "checking pkg-config module $moduleName in $buildInputs"
|
||||
set +e
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bitmagnet";
|
||||
version = "0.4.1";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitmagnet-io";
|
||||
repo = "bitmagnet";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Geukd4JYwmdG7M+HDCCqpiUjor1TWsqBY42ACd+LasU=";
|
||||
hash = "sha256-tqxmPr7O3WkFgo8tYk4iFr/k76Z5kq75YF+6uDuBOik=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TbfbrvXbO+eOb1Ot/gWRBjggTj9jkSGulHIJdziqsVc=";
|
||||
vendorHash = "sha256-YfsSz72CeHdrh5610Ilo1NYxlCT993hxWRWh0OsvEQc=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, icmake
|
||||
, yodl
|
||||
, libmilter
|
||||
, libX11
|
||||
, openssl
|
||||
, readline
|
||||
, util-linux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bobcat";
|
||||
version = "5.11.01";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "fbb-git";
|
||||
repo = "bobcat";
|
||||
rev = version;
|
||||
hash = "sha256-JLJKaJmztputIon9JkKzpm3Ch60iwm4Imh9p42crYzA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/bobcat";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace INSTALL.im \
|
||||
--replace "/usr" "$out"
|
||||
sed -i "6i #include <cstdint>" logbuf/logbuf
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
icmake
|
||||
yodl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libmilter
|
||||
libX11
|
||||
openssl
|
||||
readline
|
||||
util-linux
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
./build libraries all
|
||||
./build man
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
./build install x
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Brokken's Own Base Classes And Templates";
|
||||
homepage = "https://fbb-git.gitlab.io/bobcat/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, gawk
|
||||
, nix-update-script
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "bullshit";
|
||||
version = "0-unstable-2018-05-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fceschmidt";
|
||||
repo = "bullshit-arch";
|
||||
rev = "d65e4bbbea76bb752842c2c464154a7b417783fa";
|
||||
hash = "sha256-sqtQDaWtfhn9XYRsF8lVLHYb+7o9Hf7rLKsX6dw3Sh4=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 src/bullshit -t $out/bin
|
||||
install -Dm444 src/bullshit_lib $out/share/wordlists/bullshit.txt
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
patchShebangs $out/bin/bullshit
|
||||
substituteInPlace $out/bin/bullshit \
|
||||
--replace /usr/lib/bullshit $out/share/wordlists/bullshit.txt \
|
||||
--replace awk '${gawk}/bin/awk'
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A nonsense phrase generator";
|
||||
homepage = "https://github.com/fceschmidt/bullshit-arch";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ krloer ];
|
||||
inherit (gawk.meta) platforms;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildNpmPackage
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, darwin
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cook-cli";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cooklang";
|
||||
repo = "cookcli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3gLVsk6GCxOG24Md7E9fk28Vnc4kVDdwyZUD/GtSwFE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6lnURuE1cgNAniHl5ozXo1W3cLYYje7er+ZhvZDKdVg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config openssl ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
|
||||
|
||||
postPatch = ''
|
||||
rm -rf "ui/public"
|
||||
ln -s ${passthru.ui} "ui/public"
|
||||
'';
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
passthru.ui = buildNpmPackage {
|
||||
name = "ui";
|
||||
src = "${src}/ui";
|
||||
npmDepsHash = "sha256-uMyOAYLVHhY4ytvEFvVzdoQ7ExzQ4sH+ZtDrEacu5bk=";
|
||||
makeCacheWritable = true;
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mv public/ $out
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/cooklang/cookcli/releases/tag/v${version}";
|
||||
description = "A suite of tools to create shopping lists and maintain recipes";
|
||||
homepage = "https://cooklang.org/";
|
||||
license = [ licenses.mit ];
|
||||
mainProgram = "cook";
|
||||
maintainers = [ maintainers.emilioziniades ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, libopus
|
||||
, openssl
|
||||
, zlib
|
||||
, libsodium
|
||||
, pkg-config
|
||||
, autoPatchelfHook
|
||||
, lib
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dpp";
|
||||
version = "10.0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brainboxdotcc";
|
||||
repo = "DPP";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BJMg3MLSfb9x/2lPHITeI3SWwW1OZVUUMVltTWUcw9I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
zlib
|
||||
libsodium
|
||||
libopus
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Discord C++ Library";
|
||||
longDescription = ''
|
||||
D++ (DPP) is a lightweight and simple library for Discord written in modern C++.
|
||||
It is designed to cover as much of the API specification as possible and to have
|
||||
an incredibly small memory footprint, even when caching large amounts of data.
|
||||
This package contains version ${finalAttrs.version} of the DPP library.
|
||||
'';
|
||||
homepage = "https://github.com/brainboxdotcc/DPP";
|
||||
changelog = "https://github.com/brainboxdotcc/DPP/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ xbz ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, amass
|
||||
, alterx
|
||||
, oam-tools
|
||||
, subfinder
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "easyeasm";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g0ldencybersec";
|
||||
repo = "EasyEASM";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/PhoH+5k63rJL1N3V3IL1TP1oacsBfGfVw/OueN9j8M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g+yaVIx4jxpAQ/+WrGKxhVeliYx7nLQe/zsGpxV4Fn4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/easyeasm \
|
||||
--prefix PATH : "${lib.makeBinPath [
|
||||
amass
|
||||
alterx
|
||||
oam-tools
|
||||
subfinder
|
||||
]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Attack surface management tool";
|
||||
homepage = "https://github.com/g0ldencybersec/EasyEASM";
|
||||
changelog = "https://github.com/g0ldencybersec/EasyEASM/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "easyeasm";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook
|
||||
, glibcLocales, gobject-introspection, gtk3, libsoup_3, libsecret
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gtimelog";
|
||||
version = "unstable-2023-10-05";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "ba606cbe8eef0e3dc098c6ab3bcbe381bf7ef410";
|
||||
hash = "sha256-+iBHfbUJtAtI/vcHj0Y8f9OxAp1SnhQyMqedVzSYPZQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
|
||||
buildInputs = [ glibcLocales gtk3 libsoup_3 libsecret ];
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3
|
||||
];
|
||||
checkInputs = with python3Packages; [
|
||||
freezegun
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
patchShebangs ./runtests
|
||||
./runtests
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "gtimelog" ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# Arguments to be passed to `makeWrapper`, only used by buildPython*
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 gtimelog.desktop $out/share/applications/gtimelog.desktop
|
||||
install -Dm644 src/gtimelog/gtimelog.png $out/share/icons/hicolor/48x48/apps/gtimelog.png
|
||||
install -Dm644 src/gtimelog/gtimelog-large.png $out/share/icons/hicolor/256x256/apps/gtimelog.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A time tracking app";
|
||||
longDescription = ''
|
||||
GTimeLog is a small time tracking application for GNOME.
|
||||
It's main goal is to be as unintrusive as possible.
|
||||
|
||||
To run gtimelog successfully on a system that does not have full GNOME
|
||||
installed, the following NixOS options should be set:
|
||||
- programs.dconf.enable = true;
|
||||
'';
|
||||
homepage = "https://gtimelog.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ oxzi ];
|
||||
};
|
||||
}
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "namespace-cli";
|
||||
version = "0.0.328";
|
||||
version = "0.0.332";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namespacelabs";
|
||||
repo = "foundation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-M6hX+muUC4v7Nmu2N8cONCLPJc6pVv6UJ1WO/uSDYnM=";
|
||||
hash = "sha256-6pTL3mvW8O3vly1a+LUTMBnD5D907CfQIqDwTnUqT1s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AVbRqgk5UldpaqyEmdYDpwzaZEo5r+M3Kwxb3Sh1jLQ=";
|
||||
vendorHash = "sha256-DcGp/5Ohk9gbviA31a1FTu/xglLjrz2S50A5DBAE+lc=";
|
||||
|
||||
subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"];
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "nimlsp";
|
||||
version = "0.4.4";
|
||||
version = "0.4.6";
|
||||
|
||||
requiredNimVersion = 1;
|
||||
|
||||
@@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: {
|
||||
owner = "PMunch";
|
||||
repo = "nimlsp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Z67iKlL+dnRbxdFt/n/fsUcb2wpZwzPpL/G29jfCaMY=";
|
||||
hash = "sha256-MCtpCx8jMQp0VXuMowh69d1DQreU5cDftBf0lww7PUM=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oam-tools";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owasp-amass";
|
||||
repo = "oam-tools";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vt4V8em8Iaz3BVKIqlcAv+VIpJtD58xb3QrkIr4tYuU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yFKYZlA06yE48Wiz0cKgD57JEREwYyYkLM1NZPV8+Xc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Analysis and management tools for an Open Asset Model database";
|
||||
homepage = "https://github.com/owasp-amass/oam-tools";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "paper-clip";
|
||||
version = "4.0";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Diego-Ivan";
|
||||
repo = "Paper-Clip";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8RZE6YzoJ98D++w7v007cdurMdfZoX3oQvN94F1d9cI=";
|
||||
hash = "sha256-lkPX8S/0e7qEAfRiq0MyacDrqSWllncd9STxR7NKUFw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "pmtiles";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protomaps";
|
||||
repo = "go-pmtiles";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Zxf8o0+Vc4l8XV9vYGEWxXSr+KyzTqZNxbgaZtkJ+JQ=";
|
||||
hash = "sha256-yIH5vJTrSH1y30nHU7jrem1kbXp1fO0mhLoGMrv4IAE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y32vDgF7BNjSyGtwgsJdoRy2gGDfhTKtYpSjTjp5dnI=";
|
||||
vendorHash = "sha256-tSQjCdgEXIGlSWcIB6lLQulAiEAebgW3pXL9Z2ujgIs=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
|
||||
|
||||
|
||||
@@ -2,30 +2,38 @@
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, libsixel
|
||||
, testers
|
||||
, presenterm
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "presenterm";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfontanini";
|
||||
repo = "presenterm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OHp/qbuaZ7uVydKGnSiBR5KQGdf8rWQQWRHrka+PI1M=";
|
||||
hash = "sha256-VAcK02dbtuTGn+lPu1vb/wAkroHuHqsU2KYHBiP2Org=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libsixel
|
||||
];
|
||||
|
||||
cargoHash = "sha256-ymSTloz7sPAtMZN1uDgLs89gMcU+UTsMVc6y5UHt7no=";
|
||||
cargoHash = "sha256-bufFiyqRsn4eG57bKn42p5cyX+Z7oiz/USZvg9YOvHA=";
|
||||
|
||||
buildFeatures = [ "sixel" ];
|
||||
|
||||
# Skip test that currently doesn't work
|
||||
checkFlags = [ "--skip=execute::test::shell_code_execution" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = presenterm;
|
||||
command = "presenterm --version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal based slideshow tool";
|
||||
changelog = "https://github.com/mfontanini/presenterm/releases/tag/v${version}";
|
||||
@@ -33,5 +41,8 @@ rustPlatform.buildRustPackage rec {
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ mikaelfangel ];
|
||||
mainProgram = "presenterm";
|
||||
# Crashes at runtime on darwin with:
|
||||
# Library not loaded: .../out/lib/libsixel.1.dylib
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "prowler";
|
||||
version = "3.12.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prowler-cloud";
|
||||
repo = "prowler";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QauDqeCa499AcZurGjn2Yv4GH04F/pahAH2ms7gAca4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"azure-mgmt-security"
|
||||
"boto3"
|
||||
"botocore"
|
||||
"google-api-python-client"
|
||||
"slack-sdk"
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
alive-progress
|
||||
awsipranges
|
||||
azure-identity
|
||||
azure-mgmt-authorization
|
||||
azure-mgmt-security
|
||||
azure-mgmt-sql
|
||||
azure-mgmt-storage
|
||||
azure-mgmt-subscription
|
||||
azure-storage-blob
|
||||
boto3
|
||||
botocore
|
||||
colorama
|
||||
detect-secrets
|
||||
google-api-python-client
|
||||
google-auth-httplib2
|
||||
jsonschema
|
||||
msgraph-core
|
||||
msrestazure
|
||||
pydantic_1
|
||||
schema
|
||||
shodan
|
||||
slack-sdk
|
||||
tabulate
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"prowler"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Security tool for AWS, Azure and GCP to perform Cloud Security best practices assessments";
|
||||
homepage = "https://github.com/prowler-cloud/prowler";
|
||||
changelog = "https://github.com/prowler-cloud/prowler/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "prowler";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoPackage
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "qsreplace";
|
||||
version = "0.0.3";
|
||||
|
||||
goPackagePath = "github.com/tomnomnom/qsreplace";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomnomnom";
|
||||
repo = "qsreplace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j9bqO2gp4RUxZHGBCIxI5nA3nD1dG4nCpJ1i4TM/fbo=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tomnomnom/qsreplace";
|
||||
description = "Accept URLs on stdin, replace all query string values with a user-supplied value";
|
||||
mainProgram = "qsreplace";
|
||||
maintainers = with maintainers; [ averagebit ];
|
||||
platforms = platforms.unix;
|
||||
sourceProvenance = with sourceTypes; [ fromSource ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
+13
-11
@@ -1,4 +1,5 @@
|
||||
{ alsa-lib
|
||||
{ lib
|
||||
, alsa-lib
|
||||
, aubio
|
||||
, cmake
|
||||
, dssi
|
||||
@@ -15,33 +16,32 @@
|
||||
, libvorbis
|
||||
, lilv
|
||||
, lv2
|
||||
, mkDerivation
|
||||
, opusfile
|
||||
, pkg-config
|
||||
, qttools
|
||||
, qtbase
|
||||
, qt6
|
||||
, rubberband
|
||||
, serd
|
||||
, stdenv
|
||||
, sord
|
||||
, sratom
|
||||
, lib
|
||||
, suil
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtractor";
|
||||
version = "0.9.25";
|
||||
version = "0.9.38";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-cKXHH7rugTJ5D7MDJmr/fX6p209wyGMQvSLbv5T0KXU=";
|
||||
url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz";
|
||||
hash = "sha256-aAUOz9gztk9ynQYRq+mniUk++rM6Rdne9U1QM7jKPcU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libtool
|
||||
pkg-config
|
||||
qttools
|
||||
qt6.qttools
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -61,7 +61,8 @@ mkDerivation rec {
|
||||
lilv
|
||||
lv2
|
||||
opusfile
|
||||
qtbase
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
rubberband
|
||||
serd
|
||||
sord
|
||||
@@ -73,6 +74,7 @@ mkDerivation rec {
|
||||
description = "Audio/MIDI multi-track sequencer";
|
||||
homepage = "https://qtractor.sourceforge.io";
|
||||
license = licenses.gpl2Plus;
|
||||
mainProgram = "qtractor";
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
Generated
+12
@@ -0,0 +1,12 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/therootcompany/sclient";
|
||||
fetch = {
|
||||
type = "FromGitHub";
|
||||
owner = "therootcompany";
|
||||
repo = "sclient";
|
||||
rev = "v1.5.0";
|
||||
sha256 = "sha256-NAFTOx2sm92K+d746Z5UpB1HGsJI6cJgmh+YTyVkJ0w=";
|
||||
};
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
buildGoPackage rec {
|
||||
pname = "snicat";
|
||||
version = "0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CTFd";
|
||||
repo = "snicat";
|
||||
rev = version;
|
||||
hash = "sha256-fFlTBOz127le2Y7F9KKhbcldcyFEpAU5QiJ4VCAPs9Y=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
runHook prePatch
|
||||
|
||||
substituteInPlace snicat.go \
|
||||
--replace-warn "v0.0.0" "v${version}"
|
||||
|
||||
runHook postPatch
|
||||
'';
|
||||
|
||||
goPackagePath = "github.com/CTFd/snicat";
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm555 go/bin/snicat $out/bin/sc
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "TLS & SNI aware netcat";
|
||||
homepage = "https://github.com/CTFd/snicat";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "sc";
|
||||
maintainers = with maintainers; [ felixalbrigtsen ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, makeWrapper
|
||||
, undmg
|
||||
, wrapGAppsHook
|
||||
|
||||
, libappindicator
|
||||
, libnotify
|
||||
, libsecret
|
||||
, mpv-unwrapped
|
||||
, xdg-user-dirs
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "spotube";
|
||||
version = "3.4.1";
|
||||
|
||||
meta = {
|
||||
description = "An open source, cross-platform Spotify client compatible across multiple platforms";
|
||||
longDescription = ''
|
||||
Spotube is an open source, cross-platform Spotify client compatible across
|
||||
multiple platforms utilizing Spotify's data API and YouTube (or Piped.video or JioSaavn)
|
||||
as an audio source, eliminating the need for Spotify Premium
|
||||
'';
|
||||
downloadPage = "https://github.com/KRTirtho/spotube/releases";
|
||||
homepage = "https://spotube.netlify.app/";
|
||||
license = lib.licenses.bsdOriginal;
|
||||
mainProgram = "spotube";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
fetchArtifact = { filename, hash }:
|
||||
fetchurl {
|
||||
url = "https://github.com/KRTirtho/spotube/releases/download/v${version}/${filename}";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
darwin = stdenv.mkDerivation {
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchArtifact {
|
||||
filename = "Spotube-macos-universal.dmg";
|
||||
hash = "sha256-VobLCxsmE5kGIlDDa3v5xIHkw2x2YV14fgHHcDb+bLo=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/Applications $out/bin
|
||||
cp -r spotube.app $out/Applications
|
||||
ln -s $out/Applications/spotube.app/Contents/MacOS/spotube $out/bin/spotube
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
linux = stdenv.mkDerivation {
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchArtifact {
|
||||
filename = "Spotube-linux-x86_64.deb";
|
||||
hash = "sha256-NEGhzNz0E8jK2NPmigzoPAvYcU7zN9YHikuXHpzWfx0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libappindicator
|
||||
libnotify
|
||||
libsecret
|
||||
mpv-unwrapped
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -r usr/* $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
patchelf $out/share/spotube/lib/libmedia_kit_native_event_loop.so \
|
||||
--replace-needed libmpv.so.1 libmpv.so
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper $out/share/spotube/spotube $out/bin/spotube \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix LD_LIBRARY_PATH : $out/share/spotube/lib:${lib.makeLibraryPath [ mpv-unwrapped ]} \
|
||||
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
|
||||
'';
|
||||
};
|
||||
in
|
||||
if stdenv.isDarwin then darwin else linux
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.58.0";
|
||||
version = "1.58.2";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "tailscale-nginx-auth";
|
||||
@@ -11,7 +11,7 @@ buildGoModule {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ue1opjT8wkL+hYzMxU/GtOrJd3/KPSOptU8A8nklacY=";
|
||||
hash = "sha256-FiFFfUtse0CKR4XJ82HEjpZNxCaa4FnwSJfEzJ5kZgk=";
|
||||
};
|
||||
vendorHash = "sha256-BK1zugKGtx2RpWHDvFZaFqz/YdoewsG8SscGt25uwtQ=";
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tigerbeetle";
|
||||
version = "0.14.175";
|
||||
version = "0.14.176";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tigerbeetle";
|
||||
repo = "tigerbeetle";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-MabY6kfK/SZ2ps8RZkI6cDhMdHasc1fk6+PKBfVMRm0=";
|
||||
hash = "sha256-prvTE6fingEIzXk++FYP0J9dA9xeophU0LLcknmS2ZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ custom_zig_hook ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yggdrasil";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yggdrasil-network";
|
||||
repo = "yggdrasil-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-or+XTt8V/1BuLSJ53w1aKqJfx3Pka6VmC4TpvpP83+0=";
|
||||
sha256 = "sha256-ZInSgHjur2C+G6h/VcYtlCt0YLWwMIrz84UkDBbR73s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-K7VJ+1x7+DgdwTjEgZ7sJ7SaCssBg+ukQupJ/1FN4F0=";
|
||||
vendorHash = "sha256-Ar0mWVFgLP1eYeKalaazZLKaLMXoe2bOGYkruzaKW88=";
|
||||
|
||||
subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ];
|
||||
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20240105034708";
|
||||
version = "20240123112230";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-8taKbZUWttpTY56lzgWJeAPpt0q9srSwRkNqkOsmY2Y=";
|
||||
hash = "sha256-tt6/JEX1WM6ayBU4NnY/yjz9S6IDAfr6hJmyF9mPHAo=";
|
||||
};
|
||||
vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY=";
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
, glib
|
||||
, gnome
|
||||
, gnome-desktop
|
||||
, gnome-menus
|
||||
, graphene
|
||||
, gst_all_1
|
||||
, gtk-doc
|
||||
@@ -32,19 +31,20 @@
|
||||
, sassc
|
||||
, upower
|
||||
, vala
|
||||
, xfce
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "budgie-desktop";
|
||||
version = "10.8.2";
|
||||
version = "10.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = "budgie-desktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-K5XUYcFjDJCHhjb/UTO206+UT6lI2P7X1v3SqlYbwPM=";
|
||||
hash = "sha256-yyuLBzTDEQH7rBOWTYBvS+3x2mlbF34f7U7oOUO8BeA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
budgie-screensaver
|
||||
glib
|
||||
gnome-desktop
|
||||
gnome-menus
|
||||
gnome.gnome-bluetooth_1_0
|
||||
gnome.gnome-settings-daemon
|
||||
gnome.mutter
|
||||
gnome.zenity
|
||||
@@ -89,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
polkit
|
||||
sassc
|
||||
upower
|
||||
xfce.libxfce4windowing
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gnome
|
||||
, glib
|
||||
, gtk3
|
||||
, gsettings-desktop-schemas
|
||||
, gnome-desktop
|
||||
, dbus
|
||||
, json-glib
|
||||
, libICE
|
||||
, xmlto
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_412
|
||||
, python3
|
||||
, libxslt
|
||||
, gettext
|
||||
, makeWrapper
|
||||
, systemd
|
||||
, xorg
|
||||
, libepoxy
|
||||
, bash
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "budgie-session";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = "budgie-session";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mz+Yh3NK2Tag+MWVofFFXYYXspxhmYBD6YCiuATpZSI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
gsettings = "${glib.bin}/bin/gsettings";
|
||||
dbusLaunch = "${dbus.lib}/bin/dbus-launch";
|
||||
bash = "${bash}/bin/bash";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
makeWrapper
|
||||
xmlto
|
||||
libxslt
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_412
|
||||
python3
|
||||
dbus # for DTD
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libICE
|
||||
gnome-desktop
|
||||
json-glib
|
||||
xorg.xtrans
|
||||
gnome.adwaita-icon-theme
|
||||
gnome.gnome-settings-daemon
|
||||
gsettings-desktop-schemas
|
||||
systemd
|
||||
libepoxy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
'';
|
||||
|
||||
# `bin/budgie-session` will reset the environment when run in wayland, we
|
||||
# therefor wrap `libexec/budgie-session-binary` instead which is the actual
|
||||
# binary needing wrapping
|
||||
preFixup = ''
|
||||
wrapProgram "$out/libexec/budgie-session-binary" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
|
||||
--suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"
|
||||
'';
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
meta = {
|
||||
description = "Session manager for Budgie";
|
||||
homepage = "https://github.com/BuddiesOfBudgie/budgie-session";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [federicoschonborn];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,35 @@
|
||||
diff --git a/gnome-session/budgie-session.in b/gnome-session/budgie-session.in
|
||||
index 8a91e061..3e2ef031 100755
|
||||
--- a/gnome-session/budgie-session.in
|
||||
+++ b/gnome-session/budgie-session.in
|
||||
@@ -7,13 +7,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
|
||||
! (echo "$SHELL" | grep -q "false") &&
|
||||
! (echo "$SHELL" | grep -q "nologin"); then
|
||||
if [ "$1" != '-l' ]; then
|
||||
- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
|
||||
+ # Make sure the shell actually sets up the environment.
|
||||
+ unset __NIXOS_SET_ENVIRONMENT_DONE
|
||||
+ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
|
||||
else
|
||||
shift
|
||||
fi
|
||||
fi
|
||||
|
||||
-SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
|
||||
+SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region)
|
||||
REGION=${SETTING#\'}
|
||||
REGION=${REGION%\'}
|
||||
|
||||
diff --git a/gnome-session/main.c b/gnome-session/main.c
|
||||
index 327c7c7f..301ec7ee 100644
|
||||
--- a/gnome-session/main.c
|
||||
+++ b/gnome-session/main.c
|
||||
@@ -219,7 +219,7 @@ require_dbus_session (int argc,
|
||||
}
|
||||
new_argv[i + 2] = NULL;
|
||||
|
||||
- if (!execvp ("dbus-launch", new_argv)) {
|
||||
+ if (!execvp ("@dbusLaunch@", new_argv)) {
|
||||
g_set_error (error,
|
||||
G_SPAWN_ERROR,
|
||||
G_SPAWN_ERROR_FAILED,
|
||||
@@ -8,5 +8,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
budgie-desktop-with-plugins = callPackage ./budgie-desktop/wrapper.nix { };
|
||||
budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { };
|
||||
budgie-screensaver = callPackage ./budgie-screensaver { };
|
||||
budgie-session = callPackage ./budgie-session { };
|
||||
magpie = callPackage ./magpie { };
|
||||
})
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
, libepoxy
|
||||
, bash
|
||||
, gnome-session-ctl
|
||||
, gnomeShellSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -114,7 +113,7 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram "$out/libexec/gnome-session-binary" \
|
||||
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
|
||||
${lib.optionalString gnomeShellSupport "--suffix XDG_DATA_DIRS : \"${gnome.gnome-shell}/share\""} \
|
||||
--suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \
|
||||
--suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"
|
||||
'';
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
{ lib, mkXfceDerivation, gobject-introspection, glib, gtk3, libwnck, wayland }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "libxfce4windowing";
|
||||
version = "4.19.2";
|
||||
|
||||
sha256 = "sha256-mXxxyfwZB/AJFVVGFAAXLqC5p7pZAeqmhljQym55hyM=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
buildInputs = [ glib gtk3 libwnck wayland ];
|
||||
|
||||
meta = {
|
||||
description = "Windowing concept abstraction library for X11 and Wayland";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib; [ maintainers.federicoschonborn ] ++ teams.xfce.members;
|
||||
};
|
||||
}
|
||||
@@ -32,6 +32,8 @@ makeScopeWithSplicing' {
|
||||
|
||||
libxfce4util = callPackage ./core/libxfce4util { };
|
||||
|
||||
libxfce4windowing = callPackage ./core/libxfce4windowing { };
|
||||
|
||||
thunar = callPackage ./core/thunar {
|
||||
thunarPlugins = [ ];
|
||||
};
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
, icu
|
||||
, gnuradio
|
||||
, thrift
|
||||
, gnuradioAtLeast
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
@@ -25,7 +26,7 @@ mkDerivation rec {
|
||||
rev = "2162103226f3dae43c8c2ab23b79483b84346665";
|
||||
sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b";
|
||||
};
|
||||
disabledForGRafter = "3.9";
|
||||
disabled = gnuradioAtLeast "3.9";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
, libpcap
|
||||
, icu
|
||||
, thrift
|
||||
, gnuradioAtLeast
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -53,7 +54,7 @@ mkDerivation {
|
||||
pname = "gr-grnet";
|
||||
version = version.name;
|
||||
inherit src;
|
||||
disabledForGRafter = "3.10";
|
||||
disabled = gnuradioAtLeast "3.10";
|
||||
|
||||
patches = [
|
||||
# Use cross platform struct ip instead of iphdr
|
||||
@@ -73,7 +74,7 @@ mkDerivation {
|
||||
gmp
|
||||
libpcap
|
||||
icu
|
||||
] ++ (if lib.versionAtLeast gnuradio.versionAttr.major "3.9" then with python.pkgs; [
|
||||
] ++ (if gnuradioAtLeast "3.9" then with python.pkgs; [
|
||||
pybind11
|
||||
numpy
|
||||
] else [
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
, python
|
||||
, libosmocore
|
||||
, osmosdr
|
||||
, gnuradioAtLeast
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@@ -21,7 +22,7 @@ mkDerivation {
|
||||
rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d";
|
||||
sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";
|
||||
};
|
||||
disabledForGRafter = "3.8";
|
||||
disabled = gnuradioAtLeast "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
, gmp
|
||||
, icu
|
||||
, limesuite
|
||||
, gnuradioAtLeast
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -33,7 +34,7 @@ let
|
||||
in mkDerivation {
|
||||
pname = "gr-limesdr";
|
||||
inherit version src;
|
||||
disabledForGRafter = "3.9";
|
||||
disabled = gnuradioAtLeast "3.9";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -7,12 +7,18 @@ mkDerivation:
|
||||
args:
|
||||
|
||||
# Check if it's supposed to not get built for the current gnuradio version
|
||||
if (builtins.hasAttr "disabledForGRafter" args) &&
|
||||
(lib.versionAtLeast unwrapped.versionAttr.major args.disabledForGRafter) then
|
||||
if (builtins.hasAttr "disabled" args) && args.disabled then
|
||||
let name = args.name or "${args.pname}"; in
|
||||
throw "Package ${name} is incompatible with GNURadio ${unwrapped.versionAttr.major}"
|
||||
else
|
||||
|
||||
if builtins.hasAttr "disabledForGRafter" args then
|
||||
throw ''
|
||||
`disabledForGRafter` is superseded by `disabled`.
|
||||
Use `disabled = gnuradioAtLeast "${unwrapped.versionAttr.major}";` instead.
|
||||
''
|
||||
else
|
||||
|
||||
let
|
||||
args_ = {
|
||||
enableParallelBuilding = args.enableParallelBuilding or true;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user