Project import generated by Copybara.
GitOrigin-RevId: 0a5f5bab0e08e968ef25cff393312aa51a3512cf
This commit is contained in:
Default email
parent
139d06eab7
commit
bfd56a1002
86 changed files with 3239 additions and 602 deletions
3
third_party/nixpkgs/.github/CODEOWNERS
vendored
3
third_party/nixpkgs/.github/CODEOWNERS
vendored
|
|
@ -126,9 +126,6 @@
|
|||
# Jetbrains
|
||||
/pkgs/applications/editors/jetbrains @edwtjo
|
||||
|
||||
# Eclipse
|
||||
/pkgs/applications/editors/eclipse @rycee
|
||||
|
||||
# Licenses
|
||||
/lib/licenses.nix @alyssais
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ lua-messagepack,,,,,
|
|||
lua-resty-http,,,,,
|
||||
lua-resty-jwt,,,,,
|
||||
lua-resty-openidc,,,,,
|
||||
lua-resty-openssl,,,,,
|
||||
lua-resty-session,,,,,
|
||||
lua-term,,,,,
|
||||
lua-toml,,,,,
|
||||
|
|
|
|||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ eelco rycee ];
|
||||
maintainers = with lib.maintainers; [ eelco ];
|
||||
description = "Utility to generate a Nix expression for a Perl package from CPAN";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ with lib;
|
|||
|
||||
let
|
||||
cfg = config.services.dnsdist;
|
||||
configFile = pkgs.writeText "dndist.conf" ''
|
||||
configFile = pkgs.writeText "dnsdist.conf" ''
|
||||
setLocal('${cfg.listenAddress}:${toString cfg.listenPort}')
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
environment.systemPackages = with pkgs; [ dbus ];
|
||||
services.packagekit = {
|
||||
enable = true;
|
||||
backend = "test_nop";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
2
third_party/nixpkgs/nixos/tests/searx.nix
vendored
2
third_party/nixpkgs/nixos/tests/searx.nix
vendored
|
|
@ -108,7 +108,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||
"${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"
|
||||
)
|
||||
fancy.succeed(
|
||||
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/js/bootstrap.min.js >&2"
|
||||
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "http://linukz.org/cd-discid.shtml";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
platforms = platforms.unix;
|
||||
description = "Command-line utility to get CDDB discid information from a CD-ROM disc";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hydrogen";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrogen-music";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0snljpvbcgikhz610c325dgvayi0k512p3bglck9vvi90wsqx7l1";
|
||||
sha256 = "sha256-t3f+T1QTNbuJnWmD+q0yPgQxXPXvl91lZN17pKUVFlo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Advanced drum machine";
|
||||
homepage = "http://www.hydrogen-music.org";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ goibhniu orivej ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Command-line MP3 player";
|
||||
homepage = "http://mpg321.sourceforge.net/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/whipper-team/whipper";
|
||||
description = "A CD ripper aiming for accuracy over speed";
|
||||
maintainers = with maintainers; [ rycee emily ];
|
||||
maintainers = with maintainers; [ emily ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -110,7 +110,6 @@ rec {
|
|||
description = "Provides fast jumps to text based on initial letter";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -133,7 +132,6 @@ rec {
|
|||
description = "Adds support for ANSI escape sequences in the Eclipse console";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -156,7 +154,6 @@ rec {
|
|||
homepage = "https://www.antlr.org/";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -179,7 +176,6 @@ rec {
|
|||
homepage = "https://www.antlr.org/";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -202,7 +198,6 @@ rec {
|
|||
description = "Adds new tools to the context menu of text-based editors";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -225,7 +220,6 @@ rec {
|
|||
description = "Show file encoding and line ending for the active editor in the eclipse status bar";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -248,7 +242,6 @@ rec {
|
|||
description = "Shows disassembled bytecode of current java editor or class file";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -287,7 +280,6 @@ rec {
|
|||
description = "Checkstyle integration into the Eclipse IDE";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
|
||||
};
|
||||
|
|
@ -311,7 +303,6 @@ rec {
|
|||
description = "Plugin to switch color themes conveniently and without side effects";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -386,7 +377,6 @@ rec {
|
|||
description = "EclEmma is a free Java code coverage tool for Eclipse";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -409,7 +399,6 @@ rec {
|
|||
description = "Plugin that uses static analysis to look for bugs in Java code";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -482,7 +471,6 @@ rec {
|
|||
homepage = "https://github.com/boothen/Json-Eclipse-Plugin";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -501,7 +489,6 @@ rec {
|
|||
description = "Eclipse Java development tools";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -524,7 +511,6 @@ rec {
|
|||
description = "Provides JDT Java CodeMining";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -567,7 +553,6 @@ rec {
|
|||
description = "The Scala IDE for Eclipse";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -586,7 +571,6 @@ rec {
|
|||
description = "Plugin that uses static analysis to look for bugs in Java code";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -609,7 +593,6 @@ rec {
|
|||
description = "Eclipse plugin for the TestNG testing framework";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -654,7 +637,6 @@ rec {
|
|||
description = "A YAML editor plugin for Eclipse";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@ stdenv.mkDerivation {
|
|||
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
|
||||
--prefix PATH : ${lib.makeBinPath [ jdk which ]} \
|
||||
--prefix JAVA_HOME : ${jdk.home} \
|
||||
--add-flags "--jdkhome ${jdk.home}"
|
||||
--add-flags "--jdkhome ${jdk.home} \
|
||||
-J-Dawt.useSystemAAFontSettings=on -J-Dswing.aatext=true"
|
||||
|
||||
# Extract pngs from the Apple icon image and create
|
||||
# the missing ones from the 1024x1024 image.
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, copyDesktopItems
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, fontconfig
|
||||
|
|
@ -18,18 +19,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver-ce";
|
||||
version = "21.0.2"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "21.0.3"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-3EMSiEq1wdg4dxBU90RVVv0Hrf5dXPc1MPI0+WMk48k=";
|
||||
sha256 = "sha256-ItM8t+gqE0ccuuimfEMUddykl+xt2eZIBd3MbpreRwA=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
name = "dbeaver-${version}-maven-deps";
|
||||
inherit src;
|
||||
inherit src patches;
|
||||
|
||||
buildInputs = [
|
||||
maven
|
||||
|
|
@ -50,9 +51,18 @@ stdenv.mkDerivation rec {
|
|||
dontFixup = true;
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE=";
|
||||
outputHash = "sha256-rsK/B39ogNu5nC41OfyAsLiwBz4gWyH+8Fj7E6+rOng=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix eclipse-color-theme URL (https://github.com/dbeaver/dbeaver/pull/12133)
|
||||
# After April 15, 2021 eclipse-color-theme.github.com no longer redirects to eclipse-color-theme.github.io
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dbeaver/dbeaver/commit/65d65e2c2c711cc87fddcec425a6915aa80f4ced.patch";
|
||||
sha256 = "sha256-pxOcRYkV/5o+tHcRhHDZ1TmZSHMnKBmkNTVAlIf9nUE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -13,6 +13,25 @@ self: super: let
|
|||
in {
|
||||
inherit buildPlugin;
|
||||
|
||||
m86motorsoff = buildPlugin rec {
|
||||
pname = "M84MotorsOff";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ntoff";
|
||||
repo = "Octoprint-M84MotOff";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w6h4hia286lbz2gy33rslq02iypx067yqn413xcipb07ivhvdq7";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Changes the \"Motors off\" button in octoprint's control tab to issue an M84 command to allow compatibility with Repetier firmware Resources";
|
||||
homepage = "https://github.com/ntoff/OctoPrint-M84MotOff";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ stunkymonkey ];
|
||||
};
|
||||
};
|
||||
|
||||
abl-expert = buildPlugin rec {
|
||||
pname = "ABL_Expert";
|
||||
version = "0.6";
|
||||
|
|
@ -52,6 +71,25 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
costestimation = buildPlugin rec {
|
||||
pname = "CostEstimation";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OllisGit";
|
||||
repo = "OctoPrint-${pname}";
|
||||
rev = version;
|
||||
sha256 = "1j476jcw7gh8zqqdc5vddwv5wpjns7cd1hhpn7m9fxq3d5bi077w";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin to display the estimated print cost for the loaded model.";
|
||||
homepage = "https://github.com/malnvenshorn/OctoPrint-CostEstimation";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ stunkymonkey ];
|
||||
};
|
||||
};
|
||||
|
||||
curaenginelegacy = buildPlugin rec {
|
||||
pname = "CuraEngineLegacy";
|
||||
version = "1.1.1";
|
||||
|
|
@ -71,6 +109,25 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
displayprogress = buildPlugin rec {
|
||||
pname = "DisplayProgress";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint-${pname}";
|
||||
rev = version;
|
||||
sha256 = "080prvfwggl4vkzyi369vxh1n8231hrl8a44f399laqah3dn5qw4";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Displays the job progress on the printer's display";
|
||||
homepage = "https://github.com/OctoPrint/OctoPrint-DisplayProgress";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ stunkymonkey ];
|
||||
};
|
||||
};
|
||||
|
||||
displaylayerprogress = buildPlugin rec {
|
||||
pname = "OctoPrint-DisplayLayerProgress";
|
||||
version = "1.24.0";
|
||||
|
|
@ -240,6 +297,27 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
telegram = buildPlugin rec {
|
||||
pname = "Telegram";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabianonline";
|
||||
repo = "OctoPrint-${pname}";
|
||||
rev = version;
|
||||
sha256 = "14d9f9a5m1prcikd7y26qks6c2ls6qq4b97amn24q5a8k5hbgl94";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with super; [ pillow ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plugin to send status messages and receive commands via Telegram messenger.";
|
||||
homepage = "https://github.com/fabianonline/OctoPrint-Telegram";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ stunkymonkey ];
|
||||
};
|
||||
};
|
||||
|
||||
themeify = buildPlugin rec {
|
||||
pname = "Themeify";
|
||||
version = "1.2.2";
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "Free Open-Source filesystem on-the-fly encryption";
|
||||
homepage = "https://www.veracrypt.fr/";
|
||||
license = [ licenses.asl20 /* or */ "TrueCrypt License version 3.0" ];
|
||||
license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ];
|
||||
maintainers = with maintainers; [ dsferruzza ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.51.2";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "sha256-5wBzGj4DkTOqtN7X8/EBDoiBtbYB6vGJJ5IkuME7a9A=";
|
||||
sha256 = "1pvjckh7z803piqyzrvk54jd43f2vcyx20zjcgmq1va8jc3q69k1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
# build stimuli file for PGO build and the script to generate it
|
||||
# independently of the foot's build, so we can cache the result
|
||||
|
|
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
|
||||
sha256 = "1x6nyhlp0zynnbdjx87c4ybfx6fyr0r53vypkfima56dwbfh98ka";
|
||||
sha256 = "0iabj9c0dj1r0m89i5gk2jdmwj4wfsai8na54x2w4fq406q6g9nh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
45
third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/appimage.nix
vendored
Normal file
45
third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/appimage.nix
vendored
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version }:
|
||||
|
||||
let
|
||||
pname = "losslesscut";
|
||||
nameRepo = "lossless-cut";
|
||||
nameCamel = "LosslessCut";
|
||||
name = "${pname}-${version}";
|
||||
nameSource = "${nameCamel}-linux.AppImage";
|
||||
nameExecutable = "losslesscut";
|
||||
owner = "mifi";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}";
|
||||
name = nameSource;
|
||||
sha256 = "0aqz5ijl5japfzzbcdcd2mmihkb8b2fc2hs9kkm3211yb37c5ygv";
|
||||
};
|
||||
extracted = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
profile = ''
|
||||
export LC_ALL=C.UTF-8
|
||||
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
|
||||
'';
|
||||
|
||||
extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/{${name},${nameExecutable}}
|
||||
(
|
||||
mkdir -p $out/share
|
||||
cd ${extracted}/usr
|
||||
find share -mindepth 1 -type d -exec mkdir -p $out/{} \;
|
||||
find share -mindepth 1 -type f,l -exec ln -s $PWD/{} $out/{} \;
|
||||
)
|
||||
ln -s ${extracted}/${nameExecutable}.png $out/share/icons/${nameExecutable}.png
|
||||
mkdir $out/share/applications
|
||||
cp ${extracted}/${nameExecutable}.desktop $out/share/applications
|
||||
substituteInPlace $out/share/applications/${nameExecutable}.desktop \
|
||||
--replace AppRun ${nameExecutable}
|
||||
'';
|
||||
|
||||
meta.platforms = with lib.platforms; [ "x86_64-linux" ];
|
||||
}
|
||||
24
third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix
vendored
Normal file
24
third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/default.nix
vendored
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ callPackage, stdenvNoCC, lib }:
|
||||
let
|
||||
version = "3.33.1";
|
||||
appimage = callPackage ./appimage.nix { inherit version; };
|
||||
dmg = callPackage ./dmg.nix { inherit version; };
|
||||
windows = callPackage ./windows.nix { inherit version; };
|
||||
in (
|
||||
if stdenvNoCC.isDarwin then dmg
|
||||
else if stdenvNoCC.isCygwin then windows
|
||||
else appimage
|
||||
).overrideAttrs
|
||||
(oldAttrs: {
|
||||
meta = with lib; {
|
||||
description = "The swiss army knife of lossless video/audio editing";
|
||||
homepage = "https://mifi.no/losslesscut/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
} // oldAttrs.meta // {
|
||||
platforms =
|
||||
appimage.meta.platforms
|
||||
++ dmg.meta.platforms
|
||||
++ windows.meta.platforms;
|
||||
};
|
||||
})
|
||||
31
third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/dmg.nix
vendored
Normal file
31
third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/dmg.nix
vendored
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ stdenvNoCC, lib, fetchurl, undmg, version }:
|
||||
|
||||
let
|
||||
pname = "losslesscut";
|
||||
nameRepo = "lossless-cut";
|
||||
nameCamel = "LosslessCut";
|
||||
nameSource = "${nameCamel}-mac.dmg";
|
||||
nameApp = nameCamel + ".app";
|
||||
owner = "mifi";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}";
|
||||
name = nameSource;
|
||||
sha256 = "0xa1avbwar7x7kv5yn2ldca4vj3nwaz0dhjm3bcdy59q914xn3dj";
|
||||
};
|
||||
in stdenvNoCC.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
unpackPhase = ''
|
||||
undmg ${src}
|
||||
'';
|
||||
sourceRoot = nameApp;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/Applications/${nameApp}
|
||||
cp -R . $out/Applications/${nameApp}
|
||||
'';
|
||||
|
||||
meta.platforms = lib.platforms.darwin;
|
||||
}
|
||||
45
third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/windows.nix
vendored
Normal file
45
third_party/nixpkgs/pkgs/applications/video/losslesscut-bin/windows.nix
vendored
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchurl
|
||||
, unzip
|
||||
, version
|
||||
, useMklink ? false
|
||||
, customSymlinkCommand ? null
|
||||
}:
|
||||
let
|
||||
pname = "losslesscut";
|
||||
nameRepo = "lossless-cut";
|
||||
nameCamel = "LosslessCut";
|
||||
nameSourceBase = "${nameCamel}-win";
|
||||
nameSource = "${nameSourceBase}.zip";
|
||||
nameExecutable = "${nameCamel}.exe";
|
||||
owner = "mifi";
|
||||
getSymlinkCommand = if (customSymlinkCommand != null) then customSymlinkCommand
|
||||
else if useMklink then (targetPath: linkPath: "mklink ${targetPath} ${linkPath}")
|
||||
else (targetPath: linkPath: "ln -s ${targetPath} ${linkPath}");
|
||||
in stdenvNoCC.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
name = nameSource;
|
||||
url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}";
|
||||
sha256 = "1rq9frab0jl9y1mgmjhzsm734jvz0a646zq2wi5xzzspn4wikhvb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
unpackPhase = ''
|
||||
unzip $src -d ${nameSourceBase}
|
||||
'';
|
||||
|
||||
sourceRoot = nameSourceBase;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/libexec
|
||||
cd ..
|
||||
mv ${nameSourceBase} $out/libexec
|
||||
|
||||
'' + (getSymlinkCommand "${nameSourceBase}/${nameExecutable}" "$out/bin/${nameExecutable}");
|
||||
|
||||
meta.platforms = lib.platforms.windows;
|
||||
}
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
{ lib
|
||||
, fetchFromGitLab
|
||||
# native
|
||||
, intltool
|
||||
, wrapGAppsHook
|
||||
, file
|
||||
# not native
|
||||
, xorg
|
||||
, gobject-introspection
|
||||
|
|
@ -13,22 +11,16 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "screenkey";
|
||||
version = "1.2";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "screenkey";
|
||||
repo = "screenkey";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x13n57iy2pg3h3r994q3g5nbmh2gwk3qidmmcv0g7qa89n2gwbj";
|
||||
sha256 = "1rfngmkh01g5192pi04r1fm7vsz6hg9k3qd313sn9rl9xkjgp11l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.distutils_extra
|
||||
# Shouldn't be needed once https://gitlab.com/screenkey/screenkey/-/issues/122 is fixed.
|
||||
intltool
|
||||
# We are not sure why is this needed, but without it we get "file: command
|
||||
# not found" errors during build.
|
||||
file
|
||||
wrapGAppsHook
|
||||
# for setup hook
|
||||
gobject-introspection
|
||||
|
|
@ -39,6 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
Babel
|
||||
pycairo
|
||||
pygobject3
|
||||
];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ in fetchzip {
|
|||
meta = with lib; {
|
||||
homepage = "http://www.i18nguy.com/unicode/unicode-font.html";
|
||||
description = "Unicode Plane 1 Osmanya script font";
|
||||
maintainers = with maintainers; [ raskin rycee ];
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
license = "unknown";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ in fetchzip rec {
|
|||
most Western and Central European Latin-based languages, plus
|
||||
Greek and Cyrillic. It is designed by Mark Simonson.
|
||||
'';
|
||||
maintainers = with maintainers; [ raskin rycee ];
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ in {
|
|||
sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9";
|
||||
};
|
||||
v5 = font-awesome {
|
||||
version = "5.10.2";
|
||||
sha256 = "0bg28zn2lhrcyj7mbavphkvw3hrbnjsnn84305ax93nj3qd0d4hx";
|
||||
version = "5.15.3";
|
||||
sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.levien.com/type/myfonts/inconsolata.html";
|
||||
description = "A monospace font for both screen and print";
|
||||
maintainers = with maintainers; [ mikoim raskin rycee ];
|
||||
maintainers = with maintainers; [ mikoim raskin ];
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ in fetchzip rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/akryukov/oldstand";
|
||||
description = "An attempt to revive a specific type of Modern style of serif typefaces";
|
||||
maintainers = with maintainers; [ raskin rycee ];
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ fetchzip rec {
|
|||
whatever else you can think of … it’s pretty undefined.
|
||||
'';
|
||||
license = licenses.ofl;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ rycee romildo ];
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,10 @@ mkDerivation rec {
|
|||
patches = [ ./fix-application-path.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/NixOS/nixpkgs/issues/119766
|
||||
substituteInPlace lxqtbacklight/linux_backend/driver/libbacklight_backend.c \
|
||||
--replace "pkexec lxqt-backlight_backend" "pkexec $out/bin/lxqt-backlight_backend"
|
||||
|
||||
sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -10,14 +10,16 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sdcc";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
|
||||
sha256 = "042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8";
|
||||
sha256 = "0gskzli17ghnn5qllvn4d56qf9bvvclqjh63nnj63p52smvggvc1";
|
||||
};
|
||||
|
||||
buildInputs = [ autoconf bison boost flex gputils texinfo zlib ];
|
||||
buildInputs = [ boost gputils texinfo zlib ];
|
||||
|
||||
nativeBuildInputs = [ autoconf bison flex ];
|
||||
|
||||
configureFlags = map (f: "--disable-${f}-port") excludedPorts;
|
||||
|
||||
|
|
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
PIC18 targets. It can be retargeted for other microprocessors.
|
||||
'';
|
||||
homepage = "http://sdcc.sourceforge.net/";
|
||||
license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable;
|
||||
license = with licenses; if (gputils == null) then gpl2Plus else unfreeRedistributable;
|
||||
maintainers = with maintainers; [ bjornfor yorickvp ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ with builtins; with lib; let
|
|||
elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [
|
||||
{ case = "8.11"; out = { version = "1.11.4"; };}
|
||||
{ case = "8.12"; out = { version = "1.12.0"; };}
|
||||
{ case = "8.13"; out = { version = "1.13.0"; };}
|
||||
{ case = "8.13"; out = { version = "1.13.1"; };}
|
||||
] {});
|
||||
in mkCoqDerivation {
|
||||
pname = "elpi";
|
||||
|
|
@ -12,19 +12,24 @@ in mkCoqDerivation {
|
|||
owner = "LPCIC";
|
||||
inherit version;
|
||||
defaultVersion = lib.switch coq.coq-version [
|
||||
{ case = "8.13"; out = "1.9.5"; }
|
||||
{ case = "8.12"; out = "1.8.2_8.12"; }
|
||||
{ case = "8.11"; out = "1.6.2_8.11"; }
|
||||
{ case = "8.13"; out = "1.9.7"; }
|
||||
{ case = "8.12"; out = "1.8.3_8.12"; }
|
||||
{ case = "8.11"; out = "1.6.3_8.11"; }
|
||||
] null;
|
||||
release."1.9.7".sha256 = "0rvn12h9dpk9s4pxy32p8j0a1h7ib7kg98iv1cbrdg25y5vs85n1";
|
||||
release."1.9.5".sha256 = "0gjdwmb6bvb5gh0a6ra48bz5fb3pr5kpxijb7a8mfydvar5i9qr6";
|
||||
release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
|
||||
release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z";
|
||||
release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07";
|
||||
release."1.8.3_8.12".sha256 = "15z2l4zy0qpw0ws7bvsmpmyv543aqghrfnl48nlwzn9q0v89p557";
|
||||
release."1.8.3_8.12".version = "1.8.3";
|
||||
release."1.8.2_8.12".sha256 = "1n6jwcdazvjgj8vsv2r9zgwpw5yqr5a1ndc2pwhmhqfl04b5dk4y";
|
||||
release."1.8.2_8.12".version = "1.8.2";
|
||||
release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
|
||||
release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1";
|
||||
release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8";
|
||||
release."1.6.3_8.11".sha256 = "1j340cr2bv95clzzkkfmsjkklham1mj84cmiyprzwv20q89zr1hp";
|
||||
release."1.6.3_8.11".version = "1.6.3";
|
||||
release."1.6.2_8.11".sha256 = "06xrx0ljilwp63ik2sxxr7h617dgbch042xfcnfpy5x96br147rn";
|
||||
release."1.6.2_8.11".version = "1.6.2";
|
||||
release."1.6.1_8.11".sha256 = "0yyyh35i1nb3pg4hw7cak15kj4y6y9l84nwar9k1ifdsagh5zq53";
|
||||
|
|
|
|||
|
|
@ -1,24 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, premake4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bootil";
|
||||
version = "unstable-2015-12-17";
|
||||
version = "unstable-2019-11-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "garrynewman";
|
||||
repo = "bootil";
|
||||
rev = "1d3e321fc2be359e2350205b8c7f1cad2164ee0b";
|
||||
sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg";
|
||||
rev = "beb4cec8ad29533965491b767b177dc549e62d23";
|
||||
sha256 = "1njdj6nvmwf7j2fwqbyvd1cf5l52797vk2wnsliylqdzqcjmfpij";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/garrynewman/bootil/pull/22.patch";
|
||||
name = "github-pull-request-22.patch";
|
||||
sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
|
||||
})
|
||||
];
|
||||
|
||||
# Avoid guessing where files end up. Just use current directory.
|
||||
postPatch = ''
|
||||
substituteInPlace projects/premake4.lua \
|
||||
|
|
@ -28,6 +24,7 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ premake4 ];
|
||||
|
||||
premakefile = "projects/premake4.lua";
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -40,8 +37,7 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/garrynewman/bootil";
|
||||
# License unsure - see https://github.com/garrynewman/bootil/issues/21
|
||||
license = licenses.free;
|
||||
maintainers = [ maintainers.abigailbuccaneer ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ abigailbuccaneer ];
|
||||
# Build uses `-msse` and `-mfpmath=sse`
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
|
|
|
|||
48
third_party/nixpkgs/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch
vendored
Normal file
48
third_party/nixpkgs/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch
vendored
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
From c0dc376be9154d143574a818417ceed23308b5f2 Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <christoph.neidahl@gmail.com>
|
||||
Date: Sun, 18 Apr 2021 01:45:20 +0200
|
||||
Subject: [PATCH] pkgconfig darwin
|
||||
|
||||
---
|
||||
Makefile | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 971c6d6..0f4be0c 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -153,7 +153,6 @@ endif
|
||||
# -DKISS_FFT_BUILD to TYPEFLAGS
|
||||
#
|
||||
|
||||
-ifneq ($(shell uname -s),Darwin)
|
||||
PKGCONFIG_KISSFFT_VERSION = $(KFVER_MAJOR).$(KFVER_MINOR).$(KFVER_PATCH)
|
||||
PKGCONFIG_KISSFFT_OUTPUT_NAME = $(KISSFFTLIB_SHORTNAME)
|
||||
PKGCONFIG_PKG_KISSFFT_DEFS = $(TYPEFLAGS)
|
||||
@@ -170,7 +169,6 @@ ifneq ($(shell uname -s),Darwin)
|
||||
PKGCONFIG_KISSFFT_LIBDIR = $(ABS_LIBDIR)
|
||||
endif
|
||||
PKGCONFIG_KISSFFT_PKGINCLUDEDIR = $${includedir}/kissfft
|
||||
-endif
|
||||
|
||||
export TYPEFLAGS
|
||||
|
||||
@@ -226,7 +224,6 @@ ifneq ($(KISSFFT_STATIC), 1)
|
||||
ln -sf $(KISSFFTLIB_NAME) $(KISSFFTLIB_SODEVELNAME)
|
||||
endif
|
||||
endif
|
||||
-ifneq ($(shell uname -s),Darwin)
|
||||
mkdir "$(ABS_LIBDIR)/pkgconfig"
|
||||
sed \
|
||||
-e 's+@PKGCONFIG_KISSFFT_VERSION@+$(PKGCONFIG_KISSFFT_VERSION)+' \
|
||||
@@ -238,7 +235,6 @@ ifneq ($(shell uname -s),Darwin)
|
||||
-e 's+@PKGCONFIG_KISSFFT_LIBDIR@+$(PKGCONFIG_KISSFFT_LIBDIR)+' \
|
||||
-e 's+@PKGCONFIG_KISSFFT_PKGINCLUDEDIR@+$(PKGCONFIG_KISSFFT_PKGINCLUDEDIR)+' \
|
||||
kissfft.pc.in 1>"$(ABS_LIBDIR)/pkgconfig/$(KISSFFT_PKGCONFIG)"
|
||||
-endif
|
||||
ifneq ($(KISSFFT_TOOLS), 0)
|
||||
make -C tools install
|
||||
endif
|
||||
--
|
||||
2.29.3
|
||||
|
||||
|
|
@ -1,45 +1,80 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fftw
|
||||
, fftwFloat
|
||||
, python3
|
||||
, datatype ? "double"
|
||||
, withTools ? false
|
||||
, libpng
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, enableOpenmp ? false
|
||||
, llvmPackages
|
||||
}:
|
||||
|
||||
let
|
||||
py = python3.withPackages (ps: with ps; [ numpy ]);
|
||||
option = cond: if cond then "1" else "0";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kissfft";
|
||||
version = "131";
|
||||
pname = "kissfft-${datatype}${lib.optionalString enableOpenmp "-openmp"}";
|
||||
version = "131.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mborgerding";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0axmqav2rclw02mix55cch9xl5py540ac15xbmq7xq6n3k492ng2";
|
||||
repo = "kissfft";
|
||||
rev = version;
|
||||
sha256 = "1yfws5bn4kh62yk6hdyp9h9775l6iz7wsfisbn58jap6b56s8j5s";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Allow installation into our prefix
|
||||
# Fix installation on Darwin
|
||||
# Create necessary directories
|
||||
# Make datatype configurable
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mborgerding/kissfft/pull/38.patch";
|
||||
sha256 = "0cp1awl7lr2vqmcwm9lfjs4b4dv9da8mg4hfd821r5ryadpyijj6";
|
||||
})
|
||||
# Install headers as well
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mborgerding/kissfft/commit/71df949992d2dbbe15ce707cf56c3fa1e43b1080.patch";
|
||||
sha256 = "13h4kzsj388mxxv6napp4gx2ymavz9xk646mnyp1i852dijpmapm";
|
||||
})
|
||||
./0001-pkgconfig-darwin.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "gcc" "${stdenv.cc.targetPrefix}cc" \
|
||||
--replace "ar" "${stdenv.cc.targetPrefix}ar"
|
||||
# https://bugs.llvm.org/show_bug.cgi?id=45034
|
||||
postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "10") ''
|
||||
substituteInPlace test/Makefile \
|
||||
--replace "-ffast-math" ""
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isDarwin) ''
|
||||
substituteInPlace test/Makefile \
|
||||
--replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
|
||||
# Don't know how to make math.h's double long constants available
|
||||
substituteInPlace test/testcpp.cc \
|
||||
--replace "M_PIl" "M_PI"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"DATATYPE=double"
|
||||
"KISSFFT_DATATYPE=${datatype}"
|
||||
"KISSFFT_TOOLS=${option withTools}"
|
||||
"KISSFFT_STATIC=${option enableStatic}"
|
||||
"KISSFFT_OPENMP=${option enableOpenmp}"
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals (withTools && datatype != "simd") [ libpng ]
|
||||
# TODO: This may mismatch the LLVM version in the stdenv, see #79818.
|
||||
++ lib.optional (enableOpenmp && stdenv.cc.isClang) llvmPackages.openmp;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
py
|
||||
(if datatype == "float" then fftwFloat else fftw)
|
||||
];
|
||||
|
||||
checkFlags = [ "testsingle" ];
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${pname}.pc $out/lib/pkgconfig/kissfft.pc
|
||||
'';
|
||||
|
||||
# Tools can't find kissfft libs on Darwin
|
||||
postFixup = lib.optionalString (withTools && stdenv.hostPlatform.isDarwin) ''
|
||||
for bin in $out/bin/*; do
|
||||
install_name_tool -change lib${pname}.dylib $out/lib/lib${pname}.dylib $bin
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A mixed-radix Fast Fourier Transform based up on the KISS principle";
|
||||
homepage = "https://github.com/mborgerding/kissfft";
|
||||
|
|
|
|||
|
|
@ -17,10 +17,7 @@ stdenv.mkDerivation rec {
|
|||
# We need to force the autodetection because detection doesn't
|
||||
# work in pure build environments.
|
||||
configureFlags = [
|
||||
("--with-pcap=" + {
|
||||
linux = "linux";
|
||||
darwin = "bpf";
|
||||
}.${stdenv.hostPlatform.parsed.kernel.name})
|
||||
"--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"--disable-universal"
|
||||
] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform)
|
||||
|
|
|
|||
|
|
@ -693,11 +693,11 @@ lua-messagepack = buildLuarocksPackage {
|
|||
};
|
||||
lua-resty-http = buildLuarocksPackage {
|
||||
pname = "lua-resty-http";
|
||||
version = "0.15-0";
|
||||
version = "0.16.1-0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://luarocks/lua-resty-http-0.15-0.src.rock;
|
||||
sha256 = "1121abcz9y8kis2wdg7i1m75y8lplk3k49v02y804bywbl2km4fz";
|
||||
url = "mirror://luarocks/lua-resty-http-0.16.1-0.src.rock";
|
||||
sha256 = "0n5hiablpc0dsccs6h76zg81wc3jb4mdvyfn9lfxnhls3yqwrgkj";
|
||||
};
|
||||
disabled = (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
|
@ -705,33 +705,35 @@ lua-resty-http = buildLuarocksPackage {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/ledgetech/lua-resty-http";
|
||||
description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua.";
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
license.fullName = "2-clause BSD";
|
||||
};
|
||||
};
|
||||
lua-resty-jwt = buildLuarocksPackage {
|
||||
pname = "lua-resty-jwt";
|
||||
version = "0.2.2-0";
|
||||
version = "0.2.3-0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://luarocks/lua-resty-jwt-0.2.2-0.src.rock;
|
||||
sha256 = "1a4wwiwcjwgr59g2940a2h0i6n1c7xjy2px5bls3x5br4shwhswa";
|
||||
url = "mirror://luarocks/lua-resty-jwt-0.2.3-0.src.rock";
|
||||
sha256 = "0s7ghldwrjnhyc205pvcvgdzrgg46qz42v449vrri0cysh8ad91y";
|
||||
};
|
||||
disabled = (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
propagatedBuildInputs = [ lua lua-resty-openssl ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cdbattags/lua-resty-jwt";
|
||||
description = "JWT for ngx_lua and LuaJIT.";
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
license.fullName = "Apache License Version 2";
|
||||
};
|
||||
};
|
||||
lua-resty-openidc = buildLuarocksPackage {
|
||||
pname = "lua-resty-openidc";
|
||||
version = "1.7.2-1";
|
||||
version = "1.7.4-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://luarocks/lua-resty-openidc-1.7.2-1.src.rock;
|
||||
sha256 = "01mya69r4fncfrpqh5pn2acg18q3slds8zm976qgkjby0pzwzzw7";
|
||||
url = "mirror://luarocks/lua-resty-openidc-1.7.4-1.src.rock";
|
||||
sha256 = "07ny9rl8zir1c3plrbdmd2a23ysrx45qam196nhqsz118xrbds78";
|
||||
};
|
||||
disabled = (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ];
|
||||
|
|
@ -739,16 +741,33 @@ lua-resty-openidc = buildLuarocksPackage {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/zmartzone/lua-resty-openidc";
|
||||
description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality";
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
license.fullName = "Apache 2.0";
|
||||
};
|
||||
};
|
||||
lua-resty-openssl = buildLuarocksPackage {
|
||||
pname = "lua-resty-openssl";
|
||||
version = "0.7.2-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://luarocks/lua-resty-openssl-0.7.2-1.src.rock";
|
||||
sha256 = "00z6adib31ax4givq4zrhbfxa6l99l2hhlxnjpb6rfl4gf8h82kq";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/fffonion/lua-resty-openssl";
|
||||
description = "No summary";
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
license.fullName = "BSD";
|
||||
};
|
||||
};
|
||||
lua-resty-session = buildLuarocksPackage {
|
||||
pname = "lua-resty-session";
|
||||
version = "3.6-1";
|
||||
version = "3.8-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://luarocks/lua-resty-session-3.6-1.src.rock;
|
||||
sha256 = "1r5626x247d1vi5bzqfk11bl4d5c39h1iqj6mgndnwpnz43cag5i";
|
||||
url = "mirror://luarocks/lua-resty-session-3.8-1.src.rock";
|
||||
sha256 = "1x4l6n0dnm4br4p376r8nkg53hwm6a48xkhrzhsh9fcd5xqgqvxz";
|
||||
};
|
||||
disabled = (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
|
@ -756,6 +775,7 @@ lua-resty-session = buildLuarocksPackage {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/bungle/lua-resty-session";
|
||||
description = "Session Library for OpenResty – Flexible and Secure";
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
license.fullName = "BSD";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -192,6 +192,7 @@
|
|||
, "pyright"
|
||||
, "quicktype"
|
||||
, "react-native-cli"
|
||||
, "react-static"
|
||||
, "react-tools"
|
||||
, "readability-cli"
|
||||
, "redoc-cli"
|
||||
|
|
|
|||
2891
third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
generated
vendored
2891
third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
generated
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -1,10 +1,11 @@
|
|||
{ stdenv, lib, fetchzip, buildDunePackage, camlp5
|
||||
, ppxlib, ppx_deriving, re, perl, ncurses
|
||||
, version ? "1.13.0"
|
||||
, version ? "1.13.1"
|
||||
}:
|
||||
with lib;
|
||||
let fetched = import ../../../build-support/coq/meta-fetch/default.nix
|
||||
{inherit lib stdenv fetchzip; } ({
|
||||
release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044";
|
||||
release."1.13.0".sha256 = "0dmzy058m1mkndv90byjaik6lzzfk3aaac7v84mpmkv6my23bygr";
|
||||
release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is";
|
||||
release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, fetchurl, buildDunePackage, fetchpatch
|
||||
{ lib, fetchurl, buildDunePackage
|
||||
, alcotest, cstruct-unix
|
||||
, asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk
|
||||
, asn1-combinators, domain-name, fmt, gmap, pbkdf, rresult, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk
|
||||
, logs, base64
|
||||
}:
|
||||
|
||||
|
|
@ -8,25 +8,17 @@ buildDunePackage rec {
|
|||
minimumOCamlVersion = "4.07";
|
||||
|
||||
pname = "x509";
|
||||
version = "0.11.2";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz";
|
||||
sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22";
|
||||
sha256 = "04g59j8sn8am0z0a94h8cyvr6cqzd5gkn2lj6g51nb5dkwajj19h";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix tests for mirage-crypto >= 0.8.9, can be removed at next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mirleft/ocaml-x509/commit/ba1fdd4432950293e663416a0c454c8c04a71c0f.patch";
|
||||
sha256 = "1rbjf7408772ns3ypk2hyw9v17iy1kcx84plr1rqc56iwk9zzxmr";
|
||||
})
|
||||
];
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [ alcotest cstruct-unix ];
|
||||
propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk rresult logs base64 ];
|
||||
propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf rresult logs base64 ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward";
|
||||
version = "1.1.2";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4ae8371d9e6d5bd3e90f3686b433cebc0541c88072655d2c75ec58e79b5d6943";
|
||||
sha256 = "89f126a072d3a6eee091e1afeed87e0b2ed3c34ed31a1814062174de3cab8d9b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
35
third_party/nixpkgs/pkgs/development/python-modules/pur/default.nix
vendored
Normal file
35
third_party/nixpkgs/pkgs/development/python-modules/pur/default.nix
vendored
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pur";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alanhamlett";
|
||||
repo = "pip-update-requirements";
|
||||
rev = version;
|
||||
sha256 = "1p2g0kz9l0rb59b3rkclb6wwidc93kwqh2hm4xc22b1w9r946six";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pur" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for update and track the requirements";
|
||||
homepage = "https://github.com/alanhamlett/pip-update-requirements";
|
||||
license = with licenses; [ bsd2 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -40,7 +40,6 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/libcdio/";
|
||||
description = "Wrapper around libcdio (CD Input and Control library)";
|
||||
maintainers = with maintainers; [ rycee ];
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ buildPythonPackage rec {
|
|||
description = "Python extension wrapping the ICU C++ API";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-subprocess";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aklajnert";
|
||||
repo = "pytest-subprocess";
|
||||
rev = version;
|
||||
sha256 = "16ghwyv1vy45dd9cysjvcvvpm45958x071id2qrvgaziy2j6yx3j";
|
||||
sha256 = "sha256-r6WNDdvZAHMG1kPtLJlCwvhbVG1gC1NEvRfta+Chxnk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ buildPythonPackage {
|
|||
homepage = "https://github.com/itkach/slob/";
|
||||
description = "Reference implementation of the slob (sorted list of blobs) format";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Formal verification tool for distributed software systems";
|
||||
homepage = "http://spinroot.com/";
|
||||
homepage = "https://spinroot.com/";
|
||||
license = licenses.free;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.58.0";
|
||||
version = "1.59.0";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ buildGoModule rec {
|
|||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zOEd7e9OgkQxVaHIw9LZJ7ufl2sNpMnTTM3KetiWl+w=";
|
||||
sha256 = "sha256-mkFKYWPUEHVtQi9eUPxvWYxNCfVrKdjo2bH2DEwL1d0=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
version = "3.3.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "task";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+JhU0DXSUbpaHWJYEgiUwsR8DucGRwkiNiKDyhJroqk=";
|
||||
sha256 = "sha256-r0AHGgv2huMaZfsbK7o4KKJirNeOff1M3jgG8ZUJoiA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pNKzqUtEIQs0TP387ACHfCv1RsMjZi7O8P1A8df+QtI=";
|
||||
vendorSha256 = "sha256-qKjCGZnCts4GfBafSRXR7xTvfJdqK8zjpu01eiyITkU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,39 @@
|
|||
{ lib, stdenv, fetchurl, perl }:
|
||||
{ lib, stdenv, fetchurl, perl, installShellFiles }:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.0.2";
|
||||
version = "2.21.1";
|
||||
pname = "checkbashisms";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms";
|
||||
sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd";
|
||||
url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
|
||||
hash = "sha256-1ZbIiUrFd38uMVLy7YayLLm5RrmcovsA++JTb8PbTFI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = [ perl ];
|
||||
|
||||
# The link returns directly the script. No need for unpacking
|
||||
dontUnpack = true;
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
substituteInPlace ./scripts/checkbashisms.pl \
|
||||
--replace '###VERSION###' "$version"
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
install -D -m755 $src $out/bin/checkbashisms
|
||||
runHook preInstall
|
||||
|
||||
installManPage scripts/$pname.1
|
||||
installShellCompletion --bash --name $pname scripts/$pname.bash_completion
|
||||
install -D -m755 scripts/$pname.pl $out/bin/$pname
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://sourceforge.net/projects/checkbaskisms/";
|
||||
description = "Check shell scripts for non-portable syntax";
|
||||
license = lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ kaction ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,22 @@
|
|||
{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
|
||||
{ lib, stdenv, autoreconfHook, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inotify-tools";
|
||||
version = "3.20.2.2";
|
||||
version = "3.20.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "inotify-tools";
|
||||
owner = "rvoicilas";
|
||||
rev = version;
|
||||
sha256 = "1r12bglkb0bkqff6kgxjm81hk6z20nrxq3m7iv15d4nrqf9pm7s0";
|
||||
sha256 = "1m8avqccrhm38krlhp88a7v949f3hrzx060bbrr5dp5qw2nmw9j2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/inotify-tools/inotify-tools/commit/7ddf45158af0c1e93b02181a45c5b65a0e5bed25.patch";
|
||||
sha256 = "08imqancx8l0bg9q7xaiql1xlalmbfnpjfjshp495sjais0r6gy7";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rvoicilas/inotify-tools/wiki";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ marcweber pSub ];
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ marcweber pSub shamilton ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sumneko-lua-language-server";
|
||||
version = "1.16.0";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sumneko";
|
||||
repo = "lua-language-server";
|
||||
rev = version;
|
||||
sha256 = "1fqhvmz7a4qgz3zq6qgpcjhhhm2j4wpx0385n3zcphd9h9s3a9xa";
|
||||
sha256 = "sha256-7Ishq/TonJsteHBGDTNjImIwGPdeRgPS1g60d8bhTYg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
ninjaFlags = [
|
||||
"-f ninja/linux.ninja"
|
||||
];
|
||||
"-fninja/linux.ninja"
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
cd ../..
|
||||
|
|
@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/extras
|
||||
cp -r ./{locale,meta,script,*.lua} $out/extras/
|
||||
cp ./bin/Linux/{bee.so,lpeglabel.so} $out/extras
|
||||
|
|
@ -40,6 +42,8 @@ stdenv.mkDerivation rec {
|
|||
--add-flags "-E $out/extras/main.lua \
|
||||
--logpath='~/.cache/sumneko_lua/log' \
|
||||
--metapath='~/.cache/sumneko_lua/meta'"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.170";
|
||||
version = "0.0.210";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9lpO4E6tC2ao1/DFu++siHD0RRtOfUAhfMvVZPGdMsk=";
|
||||
sha256 = "sha256-9SHH54ryll2Mt22Z82YQIcNYk9raPyOZ/QFri2ebPrQ=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-DPbCC2n4NpcUuniig7BLanJ84ny9U6eyhzGhsJLpgHA=";
|
||||
vendorSha256 = "sha256-eEcFxEpVBad57mJXaCCYVeMO+cooUOLsSTKIZnu8Bok=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -106,19 +106,19 @@ self: super: {
|
|||
|
||||
LanguageClient-neovim =
|
||||
let
|
||||
version = "0.1.160";
|
||||
version = "0.1.161";
|
||||
LanguageClient-neovim-src = fetchFromGitHub {
|
||||
owner = "autozimu";
|
||||
repo = "LanguageClient-neovim";
|
||||
rev = version;
|
||||
sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58";
|
||||
sha256 = "Z9S2ie9RxJCIbmjSV/Tto4lK04cZfWmK3IAy8YaySVI=";
|
||||
};
|
||||
LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
|
||||
pname = "LanguageClient-neovim-bin";
|
||||
inherit version;
|
||||
src = LanguageClient-neovim-src;
|
||||
|
||||
cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a";
|
||||
cargoSha256 = "H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4=";
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
# FIXME: Use impure version of CoreFoundation because of missing symbols.
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ let
|
|||
builder = ./builder.sh;
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [matthewbauer];
|
||||
maintainers = with maintainers; [ matthewbauer qyliss ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,11 +8,22 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/darlinghq/darling/archive/d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b.tar.gz";
|
||||
sha256 = "11b51fw47nl505h63bgx5kqiyhf3glhp1q6jkpb6nqfislnzzkrf";
|
||||
postFetch = ''
|
||||
# Get rid of case conflict
|
||||
mkdir $out
|
||||
# The archive contains both `src/opendirectory` and `src/OpenDirectory`,
|
||||
# pre-create the directory to choose the canonical case on
|
||||
# case-insensitive filesystems.
|
||||
mkdir -p $out/src/OpenDirectory
|
||||
|
||||
cd $out
|
||||
tar -xzf $downloadedFile --strip-components=1
|
||||
rm -r $out/src/libm
|
||||
|
||||
# If `src/opendirectory` and `src/OpenDirectory` refer to different
|
||||
# things, then combine them into `src/OpenDirectory` to match the result
|
||||
# on case-insensitive filesystems.
|
||||
if [ "$(stat -c %i src/opendirectory)" != "$(stat -c %i src/OpenDirectory)" ]; then
|
||||
mv src/opendirectory/* src/OpenDirectory/
|
||||
rmdir src/opendirectory
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,5 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/bradfa/flashbench";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ rec {
|
|||
# Policy: use the highest stable version as the default (on our master).
|
||||
stable = if stdenv.hostPlatform.system == "x86_64-linux"
|
||||
then generic {
|
||||
version = "460.67";
|
||||
sha256_64bit = "L2cRySVw7mgYSN25mJV+b4uOeHTdjLGvFPEkwyFgtec=";
|
||||
settingsSha256 = "DB+ZeKm6cYQuVkJWjVd71qOTOmwIcRqx1CxfkgMbDpg=";
|
||||
persistencedSha256 = "HCmZZRlNhOHi5yN2lNHhBILZkdng73q0vCbv7CIX/8s=";
|
||||
version = "460.73.01";
|
||||
sha256_64bit = "120ymf59l6nipczszf82lrm2p4ihhqyv2pfwwfg9wy96vqcckc8i";
|
||||
settingsSha256 = "08jh7g34p9yxv5fh1cw0r2pjx65ryiv3w2lk1qg0gxn2r7xypkx0";
|
||||
persistencedSha256 = "040gx4wqp3hxcfb4aba4sl7b01ixr5slhzw0xldwcqlmhpwqphi5";
|
||||
}
|
||||
else legacy_390;
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ let
|
|||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = args.url or "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
|
||||
url = args.url or "https://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
|
||||
sha256 = sha256_64bit;
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then
|
||||
|
|
|
|||
|
|
@ -40,6 +40,5 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/clbr/radeontop";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ rycee ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, lua, pkg-config, systemd, nixosTests
|
||||
{ lib, stdenv, fetchurl, lua, pkg-config, nixosTests
|
||||
, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, systemd
|
||||
, tlsSupport ? true, openssl
|
||||
}:
|
||||
|
||||
|
|
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ lua ]
|
||||
++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd
|
||||
++ lib.optional withSystemd systemd
|
||||
++ lib.optionals tlsSupport [ openssl ];
|
||||
# More cross-compiling fixes.
|
||||
# Note: this enables libc malloc as a temporary fix for cross-compiling.
|
||||
|
|
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
# It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
|
||||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
|
||||
++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]
|
||||
++ lib.optional withSystemd [ "USE_SYSTEMD=yes" ]
|
||||
++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,23 +1,21 @@
|
|||
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }:
|
||||
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub }:
|
||||
|
||||
with python3Packages;
|
||||
|
||||
toPythonModule (buildPythonApplication rec {
|
||||
pname = "searx";
|
||||
version = "0.18.0";
|
||||
version = "1.0.0";
|
||||
|
||||
# Can not use PyPI because certain test files are missing.
|
||||
# pypi doesn't receive updates
|
||||
src = fetchFromGitHub {
|
||||
owner = "searx";
|
||||
repo = "searx";
|
||||
rev = "v${version}";
|
||||
sha256 = "0idxspvckvsd02v42h4z4wqrfkn1l8n59i91f7pc837cxya8p6hn";
|
||||
sha256 = "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/==.*$//' requirements.txt
|
||||
# skip failing test
|
||||
sed -i '/test_json_serial(/,+3d' tests/unit/test_standalone_searx.py
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -25,16 +23,32 @@ toPythonModule (buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyyaml lxml grequests flaskbabel flask requests
|
||||
gevent speaklater Babel pytz dateutil pygments
|
||||
pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
|
||||
jinja2 werkzeug
|
||||
Babel
|
||||
certifi
|
||||
dateutil
|
||||
flask
|
||||
flaskbabel
|
||||
gevent
|
||||
grequests
|
||||
jinja2
|
||||
langdetect
|
||||
lxml
|
||||
ndg-httpsclient
|
||||
pyasn1
|
||||
pyasn1-modules
|
||||
pygments
|
||||
pysocks
|
||||
pytz
|
||||
pyyaml
|
||||
requests
|
||||
speaklater
|
||||
werkzeug
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
Babel mock nose2 covCore pep8 plone-testing splinter
|
||||
unittest2 zope_testrunner selenium
|
||||
];
|
||||
# tests try to connect to network
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "searx" ];
|
||||
|
||||
postInstall = ''
|
||||
# Create a symlink for easier access to static data
|
||||
|
|
|
|||
|
|
@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; {
|
|||
}) {};
|
||||
|
||||
xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
|
||||
name = "xf86-input-libinput-1.0.0";
|
||||
name = "xf86-input-libinput-1.0.1";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2";
|
||||
sha256 = "0x4ay9y2clm2bql3myqnvhmikjbpzy95c800qiva8pg6dbvc4mgg";
|
||||
url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2";
|
||||
sha256 = "0nr4r9x8c7y1l0ipivjch5zps093mxmg2nqmfn2934am26fc9ppx";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
|
|||
mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-libinput-1.0.1.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
|
||||
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zrepl";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zrepl";
|
||||
repo = "zrepl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wtUL8GGSJxn9yEdyTWKtkHODfxxLOxojNPlPLRjI9xo=";
|
||||
sha256 = "5Bp8XGCjibDJgeAjW98rcABuddI+CV4Fh3hFJaKKwbo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4LBX0bD8qirFaFkV52QFU50lEW4eae6iObIa5fFT/wA=";
|
||||
vendorSha256 = "MwmYiK2z7ZK5kKBZV7K6kCZRSd7v5Sgjoih1eeOh6go=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "miniserve";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = "miniserve";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1nXhAYvvvUQb0RcWidsRMQOhU8eXt7ngzodsMkYvqvg=";
|
||||
sha256 = "sha256-Hv1aefuiu7pOlSMUjZLGY6bxVy+6myFH1afZZ5gtmi0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-P5ukE7eXBRJMrc7+T9/TMq2uGs0AuZliHTtoqiZXNZw=";
|
||||
cargoSha256 = "sha256-CgiHluc9+5+hKwsC7UZimy1586QBUsj+TVlb2lQRXs0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config zlib ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nncp";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
|
||||
sha256 = "1zj0v82zqigcxhpc50mvafvi1ihs92ck35vjfrwb7wzzd7nysb17";
|
||||
sha256 = "0ss6p91r9sr3q8p8f6mjjc2cspx3fq0q4w44gfxl0da2wc8nmhkn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go redo-apenwarr ];
|
||||
|
|
|
|||
|
|
@ -1,16 +1,21 @@
|
|||
{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sta";
|
||||
version = "unstable-2016-01-25";
|
||||
version = "unstable-2020-05-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonccarter";
|
||||
repo = "sta";
|
||||
rev = "2aa2a6035dde88b24978b875e4c45e0e296f77ed";
|
||||
sha256 = "05804f106nb89yvdd0csvpd5skwvnr9x4qr3maqzaw0qr055mrsk";
|
||||
rev = "566e3a77b103aa27a5f77ada8e068edf700f26ef";
|
||||
sha256 = "1v20di90ckl405rj5pn6lxlpxh2m2b3y9h2snjvk0k9sihk7w7d5";
|
||||
};
|
||||
|
||||
buildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple statistics from the command line interface (CLI), fast";
|
||||
|
|
|
|||
|
|
@ -47,6 +47,5 @@ in stdenv.mkDerivation rec {
|
|||
description = "Command-line tool to download videos from svtplay.se and other sites";
|
||||
license = licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A clock application that morphs digits when they are changed";
|
||||
maintainers = with maintainers; [ raskin rycee ];
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = with platforms; linux ++ freebsd;
|
||||
license = licenses.free; #TODO BSD on Gentoo, looks like MIT
|
||||
downloadPage = "http://www.jwz.org/xdaliclock/";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ python3Packages.buildPythonApplication {
|
|||
description = "Tool to convert XDXF dictionary files to slob format";
|
||||
homepage = "https://github.com/itkach/xdxf2slob/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ytfzf";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pystardust";
|
||||
repo = "ytfzf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ST6ZSNJW4Pe8fdwRsQ0BLdCd3AE9OTG6is3J+HMdIzs=";
|
||||
sha256 = "sha256-zRzd+rZxT5IJoFJl9sutTdQC4eMDUCBld5bTGfQWtco=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.37.0";
|
||||
version = "0.37.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3zsEEq6pVo5yHY4v5TXhZo4jo6htjCYypzxMMv8zQGE=";
|
||||
sha256 = "sha256-zenVgWVzKnq9WzJFC6vpE5Gwbv3lJC7aIe3xBQGeWr8=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
25
third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix
vendored
Normal file
25
third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix
vendored
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, linuxHeaders, sqlite, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "innernet";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tonarino";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OomCSA02ypFVzkYMcmkFREWB6x7oxgpt7x2zRANIDMw=";
|
||||
};
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
|
||||
|
||||
nativeBuildInputs = with llvmPackages; [ llvm clang ];
|
||||
buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
cargoSha256 = "sha256-GYNk3j8fjKSo3Qk6Qy0l6kNINK3FxlSYoEkJSx7kVpk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A private network system that uses WireGuard under the hood";
|
||||
homepage = "https://github.com/tonarino/innernet";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tomberek _0x4A6F ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.10.5";
|
||||
version = "1.10.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
sha256 = "0nagn7792qniczzv0912h89bn8rm8hyikdiw7cqwknx0hw8dwz1z";
|
||||
sha256 = "08k5j469750bhlq49qc5nwc2jjgmy9qsm58nf2jfwhxlpflv12sc";
|
||||
};
|
||||
|
||||
cargoSha256 = "0arqc0wnvfkmk8xzsdc6fvd1adazrw950ld8xyh7r588pyphjmhn";
|
||||
cargoSha256 = "1r8w5cdygd26m95q9qpqa85aixx25jr510hpjlllbpfvm7zjpbqk";
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
|
|||
--set JAVA_HOME "${jre.home}"
|
||||
|
||||
# install desktop entry and icons
|
||||
cp -r ${icons}/resources/appimage/AppDir/usr $out/
|
||||
cp -r ${icons}/resources/appimage/AppDir/usr/* $out/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ];
|
||||
|
|
|
|||
|
|
@ -1,25 +1,21 @@
|
|||
{ buildGoModule
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ffuf";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XSdFLfSYDdKI7BYo9emYanvZeSFGxiNLYxuw5QKAyRc=";
|
||||
sha256 = "sha256-0ckpEiXxen2E9IzrsmKoEKagoJ5maAbH1tHKgQjoCjo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU=";
|
||||
|
||||
# tests don't pass due to an issue with the memory addresses
|
||||
# https://github.com/ffuf/ffuf/issues/367
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast web fuzzer written in Go";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, pandoc, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "passphrase2pgp";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Nje77tn55CKRU6igEA/6IquDhXVVQAdiez6nmN49di4";
|
||||
hash = "sha256-VNOoYYnHsSgiSbVxlBwYUq0JsLa4BwZQSvMVSiyB6rg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7q5nwkj4TP7VgHmV9YBbCB11yTPL7tK4gD+uN4Vw3Cs";
|
||||
|
|
|
|||
30
third_party/nixpkgs/pkgs/tools/security/traitor/default.nix
vendored
Normal file
30
third_party/nixpkgs/pkgs/tools/security/traitor/default.nix
vendored
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "traitor";
|
||||
version = "0.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liamg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0mffh4k87ybl0mpglgi2yfwksygrh62mcmkcmfcbszlh5pagsch1";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatic Linux privilege escalation";
|
||||
longDescription = ''
|
||||
Automatically exploit low-hanging fruit to pop a root shell. Traitor packages
|
||||
up a bunch of methods to exploit local misconfigurations and vulnerabilities
|
||||
(including most of GTFOBins) in order to pop a root shell.
|
||||
'';
|
||||
homepage = "https://github.com/liamg/traitor";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "4.10.0";
|
||||
version = "4.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qYxWjvXGaygoe88muQmQWlDJfM04wqxHy8+l7KO688U=";
|
||||
sha256 = "sha256-zU4aSvfW1ph9PrXsAErCOedPn4oeeSh8tpnUj5LRlUw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ let
|
|||
++ recommendedDisplayInformationPrograms;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "inxi";
|
||||
version = "3.3.03-1";
|
||||
version = "3.3.04-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smxi";
|
||||
repo = "inxi";
|
||||
rev = version;
|
||||
sha256 = "sha256-OFjhMlBR1QUYUvpuFATCWZWZp2dop30Iz8qVCIK2UN0=";
|
||||
sha256 = "sha256-/EutIHQGLiRcRD/r8LJYG7oJBb7EAhR5cn6QiC7zMOc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -57,6 +57,6 @@ in stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "frangipanni";
|
||||
version = "0.4.2";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "birchb1024";
|
||||
repo = "frangipanni";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RzXfsaT/CUyWCpB5JGgl511gxgvzerqgwjpORgzyPCQ=";
|
||||
sha256 = "sha256-jIXyqwZWfCBSDTTodHTct4V5rjYv7h4Vcw7cXOFk17w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-TSN5M/UCTtfoTf1hDCfrJMCFdSwL/NVXssgt4aefom8=";
|
||||
|
|
|
|||
|
|
@ -5578,6 +5578,10 @@ in
|
|||
|
||||
infamousPlugins = callPackage ../applications/audio/infamousPlugins { };
|
||||
|
||||
innernet = callPackage ../tools/networking/innernet {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
innoextract = callPackage ../tools/archivers/innoextract { };
|
||||
|
||||
input-utils = callPackage ../os-specific/linux/input-utils { };
|
||||
|
|
@ -9308,6 +9312,8 @@ in
|
|||
|
||||
tradcpp = callPackage ../development/tools/tradcpp { };
|
||||
|
||||
traitor = callPackage ../tools/security/traitor { };
|
||||
|
||||
tre = callPackage ../development/libraries/tre { };
|
||||
|
||||
tremor-rs = callPackage ../tools/misc/tremor-rs { };
|
||||
|
|
@ -24239,6 +24245,8 @@ in
|
|||
portaudio = null;
|
||||
};
|
||||
|
||||
losslesscut-bin = callPackage ../applications/video/losslesscut-bin { };
|
||||
|
||||
loxodo = callPackage ../applications/misc/loxodo { };
|
||||
|
||||
lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { };
|
||||
|
|
|
|||
|
|
@ -5496,6 +5496,8 @@ in {
|
|||
|
||||
pulsectl = callPackage ../development/python-modules/pulsectl { };
|
||||
|
||||
pur = callPackage ../development/python-modules/pur { };
|
||||
|
||||
pure-cdb = callPackage ../development/python-modules/pure-cdb { };
|
||||
|
||||
pure-eval = callPackage ../development/python-modules/pure-eval { };
|
||||
|
|
|
|||
|
|
@ -1280,10 +1280,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p1iviq8q9za2hg0vqyrarrc3mqfskgp7spxp37xj0kl3g89vswq";
|
||||
sha256 = "1nw1gscax8zsv1m682h9f8vys26385nrwpkbigiifs5bsz6272rk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
};
|
||||
libv8 = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
Loading…
Reference in a new issue