Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
@@ -133,7 +133,7 @@ jobs:
|
||||
echo " - Nixpkgs commit: [$rev](https://github.com/${GITHUB_REPOSITORY}/commit/$rev)"
|
||||
echo " - Store path: \`$(realpath result)\`"
|
||||
echo "- Tested Nixpkgs:"
|
||||
echo " - Base branch $GITHUB_BASE_REF"
|
||||
echo " - Base branch: $GITHUB_BASE_REF"
|
||||
echo " - Latest base branch commit: [$baseSha](https://github.com/${GITHUB_REPOSITORY}/commit/$baseSha)"
|
||||
echo " - Latest PR commit: [$headSha](https://github.com/${GITHUB_REPOSITORY}/commit/$headSha)"
|
||||
echo " - Merge commit: [$mergedSha](https://github.com/${GITHUB_REPOSITORY}/commit/$mergedSha)"
|
||||
|
||||
@@ -30,6 +30,14 @@ in mkLicense lset) ({
|
||||
fullName = "Abstyles License";
|
||||
};
|
||||
|
||||
acsl14 = {
|
||||
fullName = "Anti-Capitalist Software License v1.4";
|
||||
url = "https://anticapitalist.software/";
|
||||
/* restrictions on corporations apply for both use and redistribution */
|
||||
free = false;
|
||||
redistributable = false;
|
||||
};
|
||||
|
||||
afl20 = {
|
||||
spdxId = "AFL-2.0";
|
||||
fullName = "Academic Free License v2.0";
|
||||
|
||||
@@ -3683,12 +3683,6 @@
|
||||
githubId = 398996;
|
||||
name = "Christopher Singley";
|
||||
};
|
||||
cstrahan = {
|
||||
email = "charles@cstrahan.com";
|
||||
github = "cstrahan";
|
||||
githubId = 143982;
|
||||
name = "Charles Strahan";
|
||||
};
|
||||
cswank = {
|
||||
email = "craigswank@gmail.com";
|
||||
github = "cswank";
|
||||
@@ -6003,6 +5997,15 @@
|
||||
githubId = 134872;
|
||||
name = "Sergei Lukianov";
|
||||
};
|
||||
fryuni = {
|
||||
name = "Luiz Ferraz";
|
||||
email = "luiz@lferraz.com";
|
||||
github = "Fryuni";
|
||||
githubId = 11063910;
|
||||
keys = [{
|
||||
fingerprint = "2109 4B0E 560B 031E F539 62C8 2B56 8731 DB24 47EC";
|
||||
}];
|
||||
};
|
||||
fsagbuya = {
|
||||
email = "fa@m-labs.ph";
|
||||
github = "fsagbuya";
|
||||
@@ -10350,12 +10353,6 @@
|
||||
githubId = 84395723;
|
||||
name = "Lukas Wurzinger";
|
||||
};
|
||||
lukeadams = {
|
||||
email = "luke.adams@belljar.io";
|
||||
github = "lukeadams";
|
||||
githubId = 3508077;
|
||||
name = "Luke Adams";
|
||||
};
|
||||
lukebfox = {
|
||||
email = "lbentley-fox1@sheffield.ac.uk";
|
||||
github = "lukebfox";
|
||||
@@ -11560,6 +11557,15 @@
|
||||
githubId = 1776903;
|
||||
name = "Andrew Abbott";
|
||||
};
|
||||
mirrorwitch = {
|
||||
email = "mirrorwitch@transmom.love";
|
||||
github = "mirrorwitch";
|
||||
githubId = 146672255;
|
||||
name = "mirrorwitch";
|
||||
keys = [{
|
||||
fingerprint = "C3E7 F8C4 9CBC 9320 D360 B117 8516 D0FA 7D8F 58FC";
|
||||
}];
|
||||
};
|
||||
Misaka13514 = {
|
||||
name = "Misaka13514";
|
||||
email = "Misaka13514@gmail.com";
|
||||
@@ -15365,6 +15371,12 @@
|
||||
githubId = 107703;
|
||||
name = "Samuel Rivas";
|
||||
};
|
||||
samueltardieu = {
|
||||
email = "nixpkgs@sam.rfc1149.net";
|
||||
github = "samueltardieu";
|
||||
githubId = 44656;
|
||||
name = "Samuel Tardieu";
|
||||
};
|
||||
samw = {
|
||||
email = "sam@wlcx.cc";
|
||||
github = "wlcx";
|
||||
|
||||
@@ -225,7 +225,7 @@
|
||||
|
||||
- The `aseprite-unfree` package has been upgraded from 1.2.16.3 to 1.2.40. The free version of aseprite has been dropped because it is EOL and the package attribute now points to the unfree version. A maintained fork of the last free version of Aseprite, named 'LibreSprite', is available in the `libresprite` package.
|
||||
|
||||
- The default `kops` version is now 1.27.0 and support for 1.24 and older has been dropped.
|
||||
- The default `kops` version is now 1.28.0 and support for 1.25 and older has been dropped.
|
||||
|
||||
- `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance.
|
||||
|
||||
|
||||
@@ -457,10 +457,12 @@ in {
|
||||
"inkbird"
|
||||
"keymitt_ble"
|
||||
"led_ble"
|
||||
"medcom_ble"
|
||||
"melnor"
|
||||
"moat"
|
||||
"mopeka"
|
||||
"oralb"
|
||||
"private_ble_device"
|
||||
"qingping"
|
||||
"rapt_ble"
|
||||
"ruuvi_gateway"
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, nixosTests
|
||||
, alsa-lib
|
||||
@@ -14,30 +13,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.69";
|
||||
version = "1.71";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tm0yTh46UKnsjH9hv3cMW0YL2x3OTRL+14x4c7w124U=";
|
||||
hash = "sha256-c2gFq+TgTMI+Eld0z8hryLew3XkrQ7XAfq2s+zdEkBQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Adapt CMake script to be Darwin-compatible
|
||||
# https://github.com/8bitbubsy/ft2-clone/pull/30
|
||||
(fetchpatch {
|
||||
name = "0001-ft2-clone-Make-CMake-script-macOS-compatible.patch";
|
||||
url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/0033a567abf7ddbdb2bc59c7f730d22f986010aa.patch";
|
||||
hash = "sha256-fhA+T6RI+Qmhr7mbG9lEA7esWskgK8+DkWzol0J2lUo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-ft2-clone-Fix-__MACOSX_CORE__-typo.patch";
|
||||
url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/fe50aff9233130150a6631875611c7db67a2d705.patch";
|
||||
hash = "sha256-X4AVuJ0iRlpH1N/YzjdVk5+yv7eiDNoZkk0mhOizgOg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ SDL2 ]
|
||||
++ lib.optional stdenv.isLinux alsa-lib
|
||||
@@ -63,4 +47,3 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.littleEndian;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "furnace";
|
||||
version = "0.6pre18";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tildearrow";
|
||||
repo = "furnace";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-RLmXP/F3WnADx/NUPAJZpGSQZ7CGm1bG4UJYAcIeHME=";
|
||||
hash = "sha256-8we7vKyGWjM9Rx0MJjSKLJcKBHiHt5vjuy17HHx/pP8=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
|
||||
@@ -12,22 +12,23 @@
|
||||
, libXcursor
|
||||
, libXrandr
|
||||
, libXi
|
||||
, vulkan-loader
|
||||
, gnome
|
||||
, libsForQt5
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ludusavi";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtkennerly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6wwBXgR0jutkM3L7Ihi4qryuOeBRItQTyKn2lNcvfdQ=";
|
||||
hash = "sha256-eEuaDMfFxWcNM9+5TvZZXLgbDuGbyIAIuzEMVWbvYbg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-9ksstWNqc2Rq5fdb4/LLHGMUXQgri9BAo2LlkFl3Irg=";
|
||||
cargoSha256 = "sha256-ENo562Y6K238NNEtgYoPw6EXjbcuxPuXiftIp/bGYYU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -67,6 +68,7 @@ rustPlatform.buildRustPackage rec {
|
||||
libXcursor
|
||||
libXrandr
|
||||
libXi
|
||||
vulkan-loader
|
||||
];
|
||||
in
|
||||
''
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ lib, fetchurl, appimageTools }:
|
||||
{ lib, fetchurl, appimageTools, makeWrapper }:
|
||||
|
||||
let
|
||||
pname = "framesh";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
|
||||
sha256 = "sha256-yPNgrC9ZQcl1gCStMXMbZvk15jZylM2NgKM9H3XcJVQ=";
|
||||
hash = "sha256-qTbT1g+9hypBUxRMZ/Eat5OGb1y6yJlxQ6iJzfQH8G4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
@@ -20,6 +20,11 @@ appimageTools.wrapType2 {
|
||||
install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop
|
||||
install -m 444 -D ${appimageContents}/frame.png \
|
||||
$out/share/icons/hicolor/512x512/apps/frame.png
|
||||
|
||||
source "${makeWrapper}/nix-support/setup-hook"
|
||||
wrapProgram "$out/bin/${pname}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
substituteInPlace $out/share/applications/frame.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
@@ -2,14 +2,13 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.66.0";
|
||||
version = "2.69.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-Du2bvtlNjxtkJ31RCKZmGtWxOEIjohbmEC5o3VvFGlY=";
|
||||
hash = "sha256-9eELWlOzUd3xwAoob5XCj16JihOt6SHZe0Ybxb9dtQI=";
|
||||
};
|
||||
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
};
|
||||
@@ -23,6 +22,7 @@ appimageTools.wrapType2 rec {
|
||||
install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png
|
||||
${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png
|
||||
install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png
|
||||
|
||||
substituteInPlace $out/share/applications/ledger-live-desktop.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stellar-core";
|
||||
version = "19.13.0";
|
||||
version = "19.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stellar";
|
||||
repo = "stellar-core";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-C775tL+x1IX4kfCM/7gOg/V8xunq/rkhIfdkwkhLENk=";
|
||||
hash = "sha256-lxBn/T01Tsa7tid3mRJUigUwv9d3BAPZhV9Mp1lywBU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://bviplus.sourceforge.net";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.199.0";
|
||||
version = "1.200.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
hash = "sha256-07IXz2xhnAJFq4YbxjY6EjWiS5MCgylDphYUDk7ILfM=";
|
||||
hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
+8
-8
@@ -11,13 +11,13 @@
|
||||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.09.07",
|
||||
"hash": "sha256-/ebjEOnmMH9pj8EZfyGP98fzBvSJepLTJGqK6xWoQWc="
|
||||
"rev": "2023.10.02",
|
||||
"hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.09.18",
|
||||
"hash": "sha256-JwZ9abeodtPqzZZ8NlAEZQLgb81DB2NPBcbBphwhpb0="
|
||||
"rev": "2023.10.03",
|
||||
"hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
@@ -31,13 +31,13 @@
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.08.12",
|
||||
"hash": "sha256-cEu8qkmcsNwrLR5t3bfMHI9fd3wmAq/dI/iRM4I4wmQ="
|
||||
"rev": "2023.10.02",
|
||||
"hash": "sha256-mn+mTZZyDkc7P7w1PG/rDgp+rpXC3dahoiRk+DUDMHQ="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2023.05.15",
|
||||
"hash": "sha256-8dWitKZB4nLcJ3fIN40jfNnyAGcRPLfA0iKNZ0zWFWo="
|
||||
"rev": "2023.06.29",
|
||||
"hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc="
|
||||
},
|
||||
"Emmet-Pascal": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/LonnyGomes/hexcurse";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://hte.sourceforge.net";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -124,7 +124,7 @@ let
|
||||
server with your local machine, downloads necessary components on the
|
||||
backend, and opens your project in JetBrains Client.
|
||||
'';
|
||||
maintainers = with maintainers; [ kouyk ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@@ -180,7 +180,7 @@ stdenv.mkDerivation {
|
||||
description = "Vim - the text editor - for macOS";
|
||||
homepage = "https://github.com/macvim-dev/macvim";
|
||||
license = licenses.vim;
|
||||
maintainers = with maintainers; [ cstrahan lilyball ];
|
||||
maintainers = with maintainers; [ lilyball ];
|
||||
platforms = platforms.darwin;
|
||||
hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile
|
||||
};
|
||||
|
||||
@@ -48,13 +48,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-18";
|
||||
version = "7.1.1-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-DnmX4dxpOqDGHOFSnq7ms2fLGdB1nKdZbpd0Q9t+X6A=";
|
||||
hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
let
|
||||
|
||||
pname = "1password";
|
||||
version = if channel == "stable" then "8.10.16" else "8.10.16-43.BETA";
|
||||
version = if channel == "stable" then "8.10.16" else "8.10.18-19.BETA";
|
||||
|
||||
sources = {
|
||||
stable = {
|
||||
@@ -33,19 +33,19 @@ let
|
||||
beta = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
|
||||
hash = "sha256-7udgyaj84rnh5yn2RuvZzjDC6QsVdHh7vkJrStlW93I=";
|
||||
hash = "sha256-siQ6w1byDkfNrbkvjLWmQRbJ5nVZZv24vg0RFWaRHmE=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
|
||||
hash = "sha256-2c5pL5C3BgimI8D4+Be/FkKKDBflo5Oc24nzaI4Oa4Y=";
|
||||
hash = "sha256-WX6NzBXBSBf/hIl1kTIuUvCnEZ1+B0NBHfKvMeIZOw4=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
hash = "sha256-f7Wme98qrmdzfipBoEEEa9PSOMiTqAica8gwKfZJLCE=";
|
||||
hash = "sha256-HQRw1OGIT/cVjDk4PGa8x4QdYHQxtqMePsUh+cpyysM=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
hash = "sha256-6hK+qEG5gUo8XBOnxYIC+x5L9ah8m6c6YS/WpIGjENo=";
|
||||
hash = "sha256-1KcTgmxDhbvB6gzTqF3bhu5toCSjskGjCflrBSNYzk4=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -4,39 +4,63 @@
|
||||
, pkg-config
|
||||
, xorg
|
||||
, cairo
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, libconfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "activate-linux";
|
||||
version = "unstable-2022-05-22";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrGlockenspiel";
|
||||
repo = pname;
|
||||
rev = "18a6dc9771c568c557569ef680386d5d67f25e96";
|
||||
sha256 = "wYoCyWZqu/jgqAuNYdNr2bjpz4pFRTnAF7qF4BRs9GE=";
|
||||
repo = "activate-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6XnoAoZwAs2hKToWlDqkaGqucmV1VMkEc4QO0G0xmrg=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
cairo
|
||||
xorg.libXrandr
|
||||
xorg.libXt
|
||||
xorg.xorgproto
|
||||
wayland
|
||||
wayland-protocols
|
||||
libconfig
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/man/man1
|
||||
|
||||
cp activate-linux $out/bin
|
||||
cp activate-linux.1 $out/share/man/man1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The \"Activate Windows\" watermark ported to Linux";
|
||||
homepage = "https://github.com/MrGlockenspiel/activate-linux";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ alexnortung ];
|
||||
maintainers = with maintainers; [ alexnortung donovanglover ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "activate-linux";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -55,6 +55,6 @@ buildGoModule rec {
|
||||
description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)";
|
||||
homepage = "https://perkeep.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cstrahan danderson kalbasit ];
|
||||
maintainers = with maintainers; [ danderson kalbasit ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ in mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Helps you understand your daily habits so you can focus and be more productive";
|
||||
homepage = "https://www.rescuetime.com";
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
|
||||
@@ -98,6 +98,6 @@ mkDerivation rec {
|
||||
homepage = "https://resp.app/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
, plasma-framework
|
||||
, qttools
|
||||
, iconv
|
||||
, cppunit
|
||||
, syncthing
|
||||
, webviewSupport ? true
|
||||
, jsSupport ? true
|
||||
, kioPluginSupport ? stdenv.isLinux
|
||||
@@ -31,14 +33,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.4.6";
|
||||
version = "1.4.7";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-/HAqO0eVFt4YLGeTbZSZcH2pOojvykukAGTBHZTfKLQ=";
|
||||
sha256 = "sha256-ddOyAyvFifsdNMbwcMZTyhA+5pvz6/Eu/VoBmdsHi54=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -58,18 +60,31 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wrapQtAppsHook
|
||||
cmake
|
||||
qttools
|
||||
# Although these are test dependencies, we add them anyway so that we test
|
||||
# whether the test units compile. On Darwin we don't run the tests but we
|
||||
# still build them.
|
||||
cppunit
|
||||
syncthing
|
||||
]
|
||||
++ lib.optionals plasmoidSupport [ extra-cmake-modules ]
|
||||
;
|
||||
|
||||
# No tests are available by upstream, but we test --help anyway
|
||||
# Don't test on Darwin because output is .app
|
||||
# syncthing server seems to hang on darwin, causing tests to fail.
|
||||
doCheck = !stdenv.isDarwin;
|
||||
preCheck = ''
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
# don't test --help on Darwin because output is .app
|
||||
doInstallCheck = !stdenv.isDarwin;
|
||||
installCheckPhase = ''
|
||||
$out/bin/syncthingtray --help | grep ${finalAttrs.version}
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_TESTING=ON"
|
||||
# See https://github.com/Martchus/syncthingtray/issues/208
|
||||
"-DEXCLUDE_TESTS_FROM_ALL=OFF"
|
||||
"-DAUTOSTART_EXEC_PATH=${autostartExecPath}"
|
||||
# See https://github.com/Martchus/syncthingtray/issues/42
|
||||
"-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}"
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
homepage = "https://github.com/julienXX/terminal-notifier";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.darwin;
|
||||
|
||||
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -85,7 +85,8 @@ let
|
||||
++ lib.optional jackSupport libjack2
|
||||
++ lib.optional smartcardSupport opensc
|
||||
++ lib.optional (cfg.speechSynthesisSupport or false) speechd
|
||||
++ pkcs11Modules;
|
||||
++ pkcs11Modules
|
||||
++ gtk_modules;
|
||||
gtk_modules = [ libcanberra-gtk3 ];
|
||||
|
||||
launcherName = "${applicationName}${nameSuffix}";
|
||||
|
||||
@@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
|
||||
homepage = "https://w3m.sourceforge.net/";
|
||||
changelog = "https://github.com/tats/w3m/blob/v${version}/ChangeLog";
|
||||
description = "A text-mode web browser";
|
||||
maintainers = with maintainers; [ cstrahan anthonyroussel ];
|
||||
maintainers = with maintainers; [ anthonyroussel ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
mainProgram = "w3m";
|
||||
|
||||
@@ -48,6 +48,6 @@ buildGoModule rec {
|
||||
homepage = "https://www.cni.dev/plugins/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members;
|
||||
maintainers = with maintainers; [ ] ++ teams.podman.members;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -48,15 +48,9 @@ in
|
||||
rec {
|
||||
mkKops = generic;
|
||||
|
||||
kops_1_25 = mkKops rec {
|
||||
version = "1.25.4";
|
||||
sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_26 = mkKops rec {
|
||||
version = "1.26.5";
|
||||
sha256 = "sha256-DbKzqfcQCHP3ZWJQcRhPDkKVzHB/MkcfukguUDG4UQg=";
|
||||
version = "1.26.6";
|
||||
sha256 = "sha256-qaehvPgB3phZl/K577hig4G4RxAUi6Im94vXP5ctnWM=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
@@ -65,4 +59,10 @@ rec {
|
||||
sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_28 = mkKops rec {
|
||||
version = "1.28.0";
|
||||
sha256 = "sha256-a/3amvgGG7Gro6K7uIi20jwCo+JAlSuPB3/EUf75hxc=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nchat";
|
||||
version = "3.60";
|
||||
version = "3.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "d99kris";
|
||||
repo = "nchat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Fe+Cdh8NlrCkzSO/Juw96eXtGfXajhFIsKeTC3qXIlU=";
|
||||
hash = "sha256-PhvZejtSoDptzoMP5uIe6T0Ws/bQQXVuYH9uoZo3JsI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -19,18 +19,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.3.11";
|
||||
version = "1.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-xSNjAao8pv3jGRK68bkwGy0vo3nm8KRZjTtCEge4kHs=";
|
||||
hash = "sha256-WF2jWP6utopAMZPP/ZWOhqVGZJmACwHyLLE+HQaHJjg=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-j5N6d270myUylDVDFQTScbsGp1wlpt5sISDJBRCV/GU=";
|
||||
hash = "sha256-vgjPGO5qa4IYfW1svClJ+wP/KtIFFd3P02T2sht69C8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];
|
||||
|
||||
@@ -22,15 +22,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "meli";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.meli.delivery/meli/meli.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sHpW2yjqYz4ePR6aQFUBD6BZwgDt3DT22/kWuKr9fAc=";
|
||||
hash = "sha256-iEHTFofga/HV/1jSAqTsqV55zC22tqI7UW7m4PZgz0M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Pg3V6Bd+drFPiJtUwsoKxu6snN88KvM+lsvnWBK/rvk=";
|
||||
cargoHash = "sha256-ijlivyBezLECBSaWBYVy9tVcSO8U+yGDQyU4dIATR6k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A small but very powerful text-based mail client";
|
||||
homepage = "http://www.neomutt.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 raitobezarius ];
|
||||
maintainers = with maintainers; [ erikryb jfrankenau vrthra ma27 raitobezarius ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pyrosimple";
|
||||
version = "2.11.1";
|
||||
version = "2.11.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kannibalox";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-J3eRuQK53Tsh1vhIgEUYBv08c6v3fSMzgK2PIhA13Qw=";
|
||||
hash = "sha256-P12Tx9lEGp9OINL6vJIdyL3+pJbR/uaYe8k7v9kSz/A=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{ fetchurl }:
|
||||
let
|
||||
pname = "roam-research";
|
||||
version = "0.0.18";
|
||||
in
|
||||
{
|
||||
inherit pname version;
|
||||
sources = {
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg";
|
||||
hash = "sha256-jyFNH3qrgrsftExL/b2t8bY3W3fYVz+Gp11AuaIMxbg=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg";
|
||||
hash = "sha256-AnyvFCbyUi6tcgxYQAj+zPLl4/kVh9ZeupetRhzH0PU=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb";
|
||||
hash = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ=";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
{ lib, stdenv, undmg, fetchurl }:
|
||||
let
|
||||
common = import ./common.nix { inherit fetchurl; };
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (common) pname version;
|
||||
src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
appName = "Roam Research";
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/Applications"
|
||||
cp -R *.app "$out/Applications"
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s "$out/Applications/${appName}.app/Contents/MacOS/${appName}" "$out/bin/${appName}"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A note-taking tool for networked thought";
|
||||
homepage = "https://roamresearch.com/";
|
||||
maintainers = with lib.maintainers; [ dbalan ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
@@ -1,81 +1,8 @@
|
||||
{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat
|
||||
, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
|
||||
, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm
|
||||
, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango
|
||||
, udev, }:
|
||||
|
||||
{ stdenv, callPackage, ... }@args:
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libX11
|
||||
libXcomposite
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXi
|
||||
libXrandr
|
||||
libdrm
|
||||
libxcb
|
||||
libxkbcommon
|
||||
libxshmfence
|
||||
mesa
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
stdenv.cc.cc
|
||||
libXScrnSaver
|
||||
libXcursor
|
||||
libXrender
|
||||
libXtst
|
||||
libpulseaudio
|
||||
udev
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "roam-research";
|
||||
version = "0.0.18";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir pkg
|
||||
dpkg-deb -x $src pkg
|
||||
sourceRoot=pkg
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
mv opt "$out/"
|
||||
|
||||
ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research"
|
||||
|
||||
mv usr/* "$out/"
|
||||
|
||||
substituteInPlace $out/share/applications/roam-research.desktop \
|
||||
--replace "/opt/Roam Research/roam-research" "roam-research"
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
meta = with lib; {
|
||||
description = "A note-taking tool for networked thought.";
|
||||
homepage = "https://roamresearch.com/";
|
||||
maintainers = with lib.maintainers; [ dbalan ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
extraArgs = removeAttrs args [ "callPackage" ];
|
||||
in
|
||||
if stdenv.isDarwin then
|
||||
callPackage ./darwin.nix (extraArgs // { })
|
||||
else
|
||||
callPackage ./linux.nix (extraArgs // { })
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat
|
||||
, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
|
||||
, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm
|
||||
, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango
|
||||
, udev, }:
|
||||
|
||||
let
|
||||
common = import ./common.nix { inherit fetchurl; };
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
libPath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libX11
|
||||
libXcomposite
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXi
|
||||
libXrandr
|
||||
libdrm
|
||||
libxcb
|
||||
libxkbcommon
|
||||
libxshmfence
|
||||
mesa
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
stdenv.cc.cc
|
||||
libXScrnSaver
|
||||
libXcursor
|
||||
libXrender
|
||||
libXtst
|
||||
libpulseaudio
|
||||
udev
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit (common) pname version;
|
||||
src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
mv opt "$out/"
|
||||
|
||||
ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research"
|
||||
|
||||
mv usr/* "$out/"
|
||||
|
||||
substituteInPlace $out/share/applications/roam-research.desktop \
|
||||
--replace "/opt/Roam Research/roam-research" "roam-research"
|
||||
'';
|
||||
|
||||
# autoPatchelfHook/patchelf are not used because they cause the binary to coredump.
|
||||
dontPatchELF = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A note-taking tool for networked thought";
|
||||
homepage = "https://roamresearch.com/";
|
||||
maintainers = with lib.maintainers; [ dbalan ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@@ -40,11 +40,7 @@
|
||||
# If one wishes to use a different src or name for a very custom build
|
||||
, overrideSrc ? {}
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.8";
|
||||
minor = "5";
|
||||
patch = "0";
|
||||
}
|
||||
, version ? "3.8.5.0"
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -204,6 +200,11 @@ let
|
||||
gr-zeromq = {
|
||||
runtime = [ cppzmq ];
|
||||
cmakeEnableFlag = "GR_ZEROMQ";
|
||||
pythonRuntime = [
|
||||
# Will compile without this, but it is required by tests, and by some
|
||||
# gr blocks.
|
||||
python.pkgs.pyzmq
|
||||
];
|
||||
};
|
||||
};
|
||||
shared = (import ./shared.nix {
|
||||
@@ -214,7 +215,7 @@ let
|
||||
removeReferencesTo
|
||||
featuresInfo
|
||||
features
|
||||
versionAttr
|
||||
version
|
||||
sourceSha256
|
||||
overrideSrc
|
||||
fetchFromGitHub
|
||||
@@ -222,23 +223,28 @@ let
|
||||
qt = qt5;
|
||||
gtk = gtk3;
|
||||
});
|
||||
inherit (shared) hasFeature; # function
|
||||
inherit (shared.passthru) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
src
|
||||
nativeBuildInputs
|
||||
buildInputs
|
||||
disallowedReferences
|
||||
stripDebugList
|
||||
doCheck
|
||||
dontWrapPythonPrograms
|
||||
dontWrapQtApps
|
||||
meta
|
||||
;
|
||||
stdenv.mkDerivation (finalAttrs: (shared // {
|
||||
inherit pname version;
|
||||
# Will still evaluate correctly if not used here. It only helps nix-update
|
||||
# find the right file in which version is defined.
|
||||
inherit (shared) src;
|
||||
# Remove failing tests
|
||||
preConfigure = (shared.preConfigure or "") + ''
|
||||
# https://github.com/gnuradio/gnuradio/issues/3801
|
||||
rm gr-blocks/python/blocks/qa_cpp_py_binding.py
|
||||
rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py
|
||||
rm gr-blocks/python/blocks/qa_ctrlport_probes.py
|
||||
# Tests that fail due to numpy deprecations upstream hasn't accomodated to yet.
|
||||
rm gr-fec/python/fec/qa_polar_decoder_sc.py
|
||||
rm gr-fec/python/fec/qa_polar_decoder_sc_list.py
|
||||
rm gr-fec/python/fec/qa_polar_decoder_sc_systematic.py
|
||||
rm gr-fec/python/fec/qa_polar_encoder.py
|
||||
rm gr-fec/python/fec/qa_polar_encoder_systematic.py
|
||||
rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py
|
||||
'';
|
||||
patches = [
|
||||
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
|
||||
./modtool-newmod-permissions.3_8.patch
|
||||
@@ -291,4 +297,4 @@ stdenv.mkDerivation {
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
|
||||
''
|
||||
;
|
||||
}
|
||||
}))
|
||||
|
||||
@@ -42,11 +42,7 @@
|
||||
# If one wishes to use a different src or name for a very custom build
|
||||
, overrideSrc ? {}
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.9";
|
||||
minor = "8";
|
||||
patch = "0";
|
||||
}
|
||||
, version ? "3.9.8.0"
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -231,6 +227,11 @@ let
|
||||
gr-zeromq = {
|
||||
runtime = [ cppzmq ];
|
||||
cmakeEnableFlag = "GR_ZEROMQ";
|
||||
pythonRuntime = [
|
||||
# Will compile without this, but it is required by tests, and by some
|
||||
# gr blocks.
|
||||
python.pkgs.pyzmq
|
||||
];
|
||||
};
|
||||
gr-network = {
|
||||
cmakeEnableFlag = "GR_NETWORK";
|
||||
@@ -250,7 +251,7 @@ let
|
||||
removeReferencesTo
|
||||
featuresInfo
|
||||
features
|
||||
versionAttr
|
||||
version
|
||||
sourceSha256
|
||||
overrideSrc
|
||||
fetchFromGitHub
|
||||
@@ -258,24 +259,21 @@ let
|
||||
qt = qt5;
|
||||
gtk = gtk3;
|
||||
});
|
||||
inherit (shared) hasFeature; # function
|
||||
inherit (shared.passthru) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
src
|
||||
nativeBuildInputs
|
||||
buildInputs
|
||||
cmakeFlags
|
||||
disallowedReferences
|
||||
stripDebugList
|
||||
doCheck
|
||||
dontWrapPythonPrograms
|
||||
dontWrapQtApps
|
||||
meta
|
||||
;
|
||||
stdenv.mkDerivation (finalAttrs: (shared // {
|
||||
inherit pname version;
|
||||
# Will still evaluate correctly if not used here. It only helps nix-update
|
||||
# find the right file in which version is defined.
|
||||
inherit (shared) src;
|
||||
# Remove failing tests
|
||||
preConfigure = (shared.preConfigure or "") + ''
|
||||
# https://github.com/gnuradio/gnuradio/issues/3801
|
||||
rm gr-blocks/python/blocks/qa_cpp_py_binding.py
|
||||
rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py
|
||||
rm gr-blocks/python/blocks/qa_ctrlport_probes.py
|
||||
'';
|
||||
patches = [
|
||||
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
|
||||
./modtool-newmod-permissions.patch
|
||||
@@ -303,4 +301,4 @@ stdenv.mkDerivation {
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
|
||||
''
|
||||
;
|
||||
}
|
||||
}))
|
||||
|
||||
@@ -45,11 +45,7 @@
|
||||
# If one wishes to use a different src or name for a very custom build
|
||||
, overrideSrc ? {}
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.10";
|
||||
minor = "7";
|
||||
patch = "0";
|
||||
}
|
||||
, version ? "3.10.7.0"
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -252,6 +248,11 @@ let
|
||||
gr-zeromq = {
|
||||
runtime = [ cppzmq ];
|
||||
cmakeEnableFlag = "GR_ZEROMQ";
|
||||
pythonRuntime = [
|
||||
# Will compile without this, but it is required by tests, and by some
|
||||
# gr blocks.
|
||||
python.pkgs.pyzmq
|
||||
];
|
||||
};
|
||||
gr-network = {
|
||||
cmakeEnableFlag = "GR_NETWORK";
|
||||
@@ -271,7 +272,7 @@ let
|
||||
removeReferencesTo
|
||||
featuresInfo
|
||||
features
|
||||
versionAttr
|
||||
version
|
||||
sourceSha256
|
||||
overrideSrc
|
||||
fetchFromGitHub
|
||||
@@ -279,24 +280,14 @@ let
|
||||
qt = qt5;
|
||||
gtk = gtk3;
|
||||
});
|
||||
inherit (shared) hasFeature; # function
|
||||
inherit (shared.passthru) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
src
|
||||
nativeBuildInputs
|
||||
buildInputs
|
||||
cmakeFlags
|
||||
disallowedReferences
|
||||
stripDebugList
|
||||
doCheck
|
||||
dontWrapPythonPrograms
|
||||
dontWrapQtApps
|
||||
meta
|
||||
;
|
||||
stdenv.mkDerivation (finalAttrs: (shared // {
|
||||
inherit pname version;
|
||||
# Will still evaluate correctly if not used here. It only helps nix-update
|
||||
# find the right file in which version is defined.
|
||||
inherit (shared) src;
|
||||
patches = [
|
||||
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
|
||||
./modtool-newmod-permissions.patch
|
||||
@@ -332,4 +323,4 @@ stdenv.mkDerivation {
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
|
||||
''
|
||||
;
|
||||
}
|
||||
}))
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
, removeReferencesTo
|
||||
, featuresInfo
|
||||
, features
|
||||
, versionAttr
|
||||
, version
|
||||
, sourceSha256
|
||||
# If overridden. No need to set default values, as they are given defaults in
|
||||
# the main expressions
|
||||
@@ -13,10 +13,21 @@
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rec {
|
||||
version = builtins.concatStringsSep "." (
|
||||
lib.attrVals [ "major" "minor" "patch" ] versionAttr
|
||||
let
|
||||
# Check if a feature is enabled, while defaulting to true if feat is not
|
||||
# specified.
|
||||
hasFeature = feat: (
|
||||
if builtins.hasAttr feat features then
|
||||
features.${feat}
|
||||
else
|
||||
true
|
||||
);
|
||||
versionAttr = {
|
||||
major = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion version));
|
||||
minor = builtins.elemAt (lib.splitVersion version) 2;
|
||||
patch = builtins.elemAt (lib.splitVersion version) 3;
|
||||
};
|
||||
in {
|
||||
src = if overrideSrc != {} then
|
||||
overrideSrc
|
||||
else
|
||||
@@ -27,14 +38,6 @@ rec {
|
||||
sha256 = sourceSha256;
|
||||
}
|
||||
;
|
||||
# Check if a feature is enabled, while defaulting to true if feat is not
|
||||
# specified.
|
||||
hasFeature = feat: (
|
||||
if builtins.hasAttr feat features then
|
||||
features.${feat}
|
||||
else
|
||||
true
|
||||
);
|
||||
nativeBuildInputs = lib.flatten (lib.mapAttrsToList (
|
||||
feat: info: (
|
||||
lib.optionals (hasFeature feat) (
|
||||
@@ -109,9 +112,14 @@ rec {
|
||||
# Wrapping is done with an external wrapper
|
||||
dontWrapPythonPrograms = true;
|
||||
dontWrapQtApps = true;
|
||||
# Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order
|
||||
# for it to happen.
|
||||
doCheck = false;
|
||||
# On darwin, it requires playing with DYLD_FALLBACK_LIBRARY_PATH to make if
|
||||
# find libgnuradio-runtim.3.*.dylib .
|
||||
doCheck = !stdenv.isDarwin;
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
export QT_PLUGIN_PATH="${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Software Defined Radio (SDR) software";
|
||||
|
||||
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
|
||||
xorg.libX11.dev
|
||||
];
|
||||
|
||||
configureFlags = [ "LDFLAGS=-lGL" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "kitty-themes";
|
||||
version = "unstable-2023-06-01";
|
||||
version = "unstable-2023-09-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty-themes";
|
||||
rev = "f765eb1715d79c6cb3ad3d571342d612f21b810e";
|
||||
hash = "sha256-Y3N8cyqEsY/kB2xMIlPYnbuYUs8grzepPx/11maG4bo=";
|
||||
rev = "c9c12d20f83b9536febb21e4b53e176c0ccccb51";
|
||||
hash = "sha256-dhzYTHaaTrbE5k+xEC01Y9jGb+ZmEyvWMb4a2WWKGCw=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://github.com/kovidgoyal/kitty-themes";
|
||||
description = "Themes for the kitty terminal emulator";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres nelsonjeppesen ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Change the urxvt font size on the fly";
|
||||
homepage = "https://github.com/majutsushi/urxvt-font-size";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
||||
description = "Perl extensions for the rxvt-unicode terminal emulator";
|
||||
homepage = "https://github.com/effigies/urxvt-perl";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,16 +20,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jujutsu";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinvonz";
|
||||
repo = "jj";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5RN2xaH591/83iNXRcW9i/TyU5ndPZq3P/BesHM9I6w=";
|
||||
hash = "sha256-LJW4Px3K5cz6RJ4sUbwUXsp2+rzEW5wowi+DALHajYA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-G4W3GeTWTuIZO1PupuZ0hACwhNoNBQhULyT9f6qVckg=";
|
||||
cargoHash = "sha256-fs1cWhBFp2u3HiEx/mMnbwvgwKo97KmftA/sr4dGsiM=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
about the current working directory for various version control systems
|
||||
'';
|
||||
homepage = "http://hg.gerg.ca/vcprompt";
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamlink";
|
||||
version = "6.2.0";
|
||||
version = "6.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rq4beEhEb5CZjGIyTnEHyPQfjAgmbbxBm4HhzBs1VZo=";
|
||||
hash = "sha256-64Jmkva7L0oaik1UcCTQlUricL2us+O5CEc6pVsgnRI=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
|
||||
@@ -417,6 +417,7 @@ fi
|
||||
tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")"
|
||||
exit_handlers+=(remove_tmpHomePath)
|
||||
HOME="$tmpHomePath"
|
||||
ln -s /build/.netrc "$HOME/"
|
||||
unset XDG_CONFIG_HOME
|
||||
export GIT_CONFIG_NOSYSTEM=1
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.12.2";
|
||||
version = "0.12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-N9hfHgzqwV/G3/xNY2Vx1i2dW6BcABJ/4lkhnLuvIns=";
|
||||
hash = "sha256-rWfuPk8PWxOmy/WDXGnqBCuGPEI7tBwuOc0IP2FhAq8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3ntsPC6OWtSN3MH+3wN2BgOqH69jiW93/xfLY+niARI=";
|
||||
cargoHash = "sha256-M3eNvY8UwsnV9mvkGD//u1zTiJzV1ce7ODyQjnDSZTo=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
||||
+51
-70
@@ -1,18 +1,53 @@
|
||||
From 5c41e49b79ef85e7e23748fbeeaf65df8b769263 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Mayer <tobim@fastmail.fm>
|
||||
Date: Sat, 10 Jun 2023 14:17:16 +0200
|
||||
Subject: [PATCH] Make arch detection optional and fix targets
|
||||
|
||||
---
|
||||
Makefile | 6 +++---
|
||||
configure.sh | 22 +++++++++++++---------
|
||||
2 files changed, 16 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d21c53bf..fe982b24 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -205,8 +205,8 @@ stuff/%.o: stuff/%.c ctx.h stuff/*.h stuff/*.inc Makefile build.conf
|
||||
diff -Naur --no-dereference ctx-source-old/configure.sh ctx-source-new/configure.sh
|
||||
--- ctx-source-old/configure.sh 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ ctx-source-new/configure.sh 2023-09-27 19:26:05.403569888 -0300
|
||||
@@ -42,15 +42,18 @@
|
||||
ENABLE_SWITCH_DISPATCH=1
|
||||
|
||||
pkg-config sdl2 && HAVE_SDL=1
|
||||
-pkg-config babl && HAVE_BABL=1
|
||||
+
|
||||
+pkg-config babl-0.1 && { HAVE_BABL=1; BABL_NAME=babl-0.1; }
|
||||
+if [ $HAVE_BABL != 1 ]; then
|
||||
+ pkg-config babl && { HAVE_BABL=1; BABL_NAME=babl; }
|
||||
+fi
|
||||
+
|
||||
pkg-config libcurl && HAVE_LIBCURL=1
|
||||
pkg-config alsa && HAVE_ALSA=1
|
||||
pkg-config libdrm && HAVE_KMS=1
|
||||
#pkg-config harfbuzz && HAVE_HARFBUZZ=1
|
||||
|
||||
-
|
||||
-
|
||||
-ARCH=`uname -m`
|
||||
+: "${ARCH:="$(uname -m)"}"
|
||||
|
||||
case "$ARCH" in
|
||||
"x86_64") HAVE_SIMD=1 ;;
|
||||
@@ -224,8 +227,8 @@
|
||||
if [ $HAVE_BABL = 1 ];then
|
||||
echo "#define CTX_BABL 1 " >> local.conf
|
||||
echo "#define CTX_ENABLE_CM 1 " >> local.conf
|
||||
- echo "CTX_CFLAGS+= `pkg-config babl --cflags`" >> build.conf
|
||||
- echo "CTX_LIBS+= `pkg-config babl --libs` " >> build.conf
|
||||
+ echo "CTX_CFLAGS+= `pkg-config "${BABL_NAME}" --cflags`" >> build.conf
|
||||
+ echo "CTX_LIBS+= `pkg-config "${BABL_NAME}" --libs` " >> build.conf
|
||||
else
|
||||
echo "#define CTX_BABL 0 " >> local.conf
|
||||
echo "#define CTX_ENABLE_CM 0 " >> local.conf
|
||||
@@ -335,7 +338,7 @@
|
||||
#echo "Generating build.deps"
|
||||
#make build.deps 2>/dev/null
|
||||
|
||||
-echo -n "configuration summary, architecture $(arch)"
|
||||
+echo -n "configuration summary, architecture $ARCH"
|
||||
[ $HAVE_SIMD = 1 ] && echo " SIMD multi-pass"
|
||||
echo ""
|
||||
echo "Backends:"
|
||||
diff -Naur --no-dereference ctx-source-old/Makefile ctx-source-new/Makefile
|
||||
--- ctx-source-old/Makefile 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ ctx-source-new/Makefile 2023-09-27 19:37:23.779830320 -0300
|
||||
@@ -206,8 +206,8 @@
|
||||
libctx.a: itk.o deps.o $(CTX_OBJS) build.conf Makefile
|
||||
$(AR) rcs $@ $(CTX_OBJS) deps.o itk.o
|
||||
libctx.so: $(CTX_OBJS) deps.o itk.o build.conf Makefile
|
||||
@@ -23,64 +58,10 @@ index d21c53bf..fe982b24 100644
|
||||
|
||||
ctx: main.c ctx.h build.conf Makefile $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) libctx.a
|
||||
$(CCC) main.c $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) -o $@ $(CFLAGS) libctx.a $(LIBS) $(CTX_CFLAGS) $(OFLAGS_LIGHT) -lpthread $(CTX_LIBS)
|
||||
@@ -276,5 +276,5 @@ itk/w3c-constants.h: itk/css.h Makefile squoze/squoze
|
||||
@@ -277,5 +277,5 @@
|
||||
for a in `cat itk/css.h | tr ';' ' ' | tr ',' ' ' | tr ')' ' '|tr ':' ' ' | tr '{' ' ' | tr ' ' '\n' | grep 'SQZ_[a-z][0-9a-zA-Z_]*'| sort | uniq`;do b=`echo $$a|tail -c+5|tr '_' '-'`;echo "#define $$a `./squoze/squoze -33 $$b`u // \"$$b\"";done \
|
||||
>> $@
|
||||
echo '#endif' >> $@
|
||||
-static.inc: static/* static/*/* tools/gen_fs.sh
|
||||
+static.inc: static/* tools/gen_fs.sh
|
||||
./tools/gen_fs.sh static > $@
|
||||
diff --git a/configure.sh b/configure.sh
|
||||
index ad388a5d..fd9d3b96 100755
|
||||
--- a/configure.sh
|
||||
+++ b/configure.sh
|
||||
@@ -43,16 +43,20 @@ ENABLE_FAST_FILL_RECT=1
|
||||
ENABLE_SWITCH_DISPATCH=1
|
||||
|
||||
pkg-config sdl2 && HAVE_SDL=1
|
||||
-pkg-config babl && HAVE_BABL=1
|
||||
-pkg-config cairo && HAVE_CAIRO=1
|
||||
-pkg-config libcurl && HAVE_LIBCURL=1
|
||||
-pkg-config alsa && HAVE_ALSA=1
|
||||
-pkg-config libdrm && HAVE_KMS=1
|
||||
+# https://github.com/GNOME/gimp/blob/828a8a7fe7ecd1825387f37a42922bc50fa32be9/meson.build#L349
|
||||
+pkg-config babl-0.1 && { HAVE_BABL=1; BABL_NAME=babl-0.1; }
|
||||
+if [ $HAVE_BABL != 1 ];then
|
||||
+ pkg-config babl && { HAVE_BABL=1; BABL_NAME=babl; }
|
||||
+fi
|
||||
+pkg-config cairo && HAVE_CAIRO=1
|
||||
+pkg-config libcurl && HAVE_LIBCURL=1
|
||||
+pkg-config alsa && HAVE_ALSA=1
|
||||
+pkg-config libdrm && HAVE_KMS=1
|
||||
#pkg-config harfbuzz && HAVE_HARFBUZZ=1
|
||||
|
||||
|
||||
|
||||
-ARCH=`uname -m`
|
||||
+: "${ARCH:="$(uname -m)"}"
|
||||
|
||||
case "$ARCH" in
|
||||
"x86_64") HAVE_SIMD=1 ;;
|
||||
@@ -229,8 +233,8 @@ echo >> build.conf
|
||||
if [ $HAVE_BABL = 1 ];then
|
||||
echo "#define CTX_BABL 1 " >> local.conf
|
||||
echo "#define CTX_ENABLE_CM 1 " >> local.conf
|
||||
- echo "CTX_CFLAGS+= `pkg-config babl --cflags`" >> build.conf
|
||||
- echo "CTX_LIBS+= `pkg-config babl --libs` " >> build.conf
|
||||
+ echo "CTX_CFLAGS+= `pkg-config "$BABL_NAME" --cflags`" >> build.conf
|
||||
+ echo "CTX_LIBS+= `pkg-config "$BABL_NAME" --libs` " >> build.conf
|
||||
else
|
||||
echo "#define CTX_BABL 0 " >> local.conf
|
||||
echo "#define CTX_ENABLE_CM 0 " >> local.conf
|
||||
@@ -348,7 +352,7 @@ echo "LIBS=$LIBS" >> build.conf
|
||||
#echo "Generating build.deps"
|
||||
#make build.deps 2>/dev/null
|
||||
|
||||
-echo -n "configuration summary, architecture $(arch)"
|
||||
+echo -n "configuration summary, architecture $ARCH"
|
||||
[ $HAVE_SIMD = 1 ] && echo " SIMD multi-pass"
|
||||
echo ""
|
||||
echo "Backends:"
|
||||
--
|
||||
2.40.1
|
||||
|
||||
+22
-19
@@ -1,42 +1,42 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, pkg-config
|
||||
, xxd
|
||||
, SDL2
|
||||
, alsa-lib
|
||||
, babl
|
||||
, bash
|
||||
, cairo
|
||||
, curl
|
||||
, libdrm # Not documented
|
||||
, pkg-config
|
||||
, xxd
|
||||
, enableFb ? false
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ctx";
|
||||
version = "unstable-2023-06-05";
|
||||
version = "unstable-2023-09-03";
|
||||
|
||||
src = fetchgit {
|
||||
name = "ctx-source"; # because of a dash starting the directory
|
||||
url = "https://ctx.graphics/.git/";
|
||||
rev = "2eb3886919d0a0b8c305e4f9e18428dad5e73ca0";
|
||||
sha256 = "sha256-PLUyGArxLU742IKIgpzxdBdc94mWWSkHNFoXGW8L/Zo=";
|
||||
rev = "1bac18c152eace3ca995b3c2b829a452085d46fb";
|
||||
hash = "sha256-fOcQJ2XCeomdtAUmy0A+vU7Vt325OSwrb1+ccW+gZ38=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Make-arch-detection-optional-and-fix-targets.patch
|
||||
# Many problematic things fixed - it should be upstreamed somehow:
|
||||
# - babl changed its name in pkg-config files
|
||||
# - arch detection made optional
|
||||
# - LD changed to CCC
|
||||
# - remove inexistent reference to static/*/*
|
||||
./0001-fix-detections.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./tools/gen_fs.sh
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
env.ARCH = stdenv.hostPlatform.parsed.cpu.arch;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
xxd
|
||||
@@ -47,11 +47,14 @@ stdenv.mkDerivation {
|
||||
alsa-lib
|
||||
babl
|
||||
bash # for ctx-audioplayer
|
||||
cairo
|
||||
curl
|
||||
libdrm
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
env.ARCH = stdenv.hostPlatform.parsed.cpu.arch;
|
||||
|
||||
configureScript = "./configure.sh";
|
||||
configureFlags = lib.optional enableFb "--enable-fb";
|
||||
configurePlatforms = [];
|
||||
@@ -64,16 +67,16 @@ stdenv.mkDerivation {
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.ctx;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://ctx.graphics/";
|
||||
description = "Vector graphics terminal";
|
||||
longDescription= ''
|
||||
longDescription = ''
|
||||
ctx is an interactive 2D vector graphics, audio, text- canvas and
|
||||
terminal, with escape sequences that enable a 2D vector drawing API using
|
||||
a vector graphics protocol.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -17,13 +17,13 @@
|
||||
assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trealla";
|
||||
version = "2.28.1";
|
||||
version = "2.28.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trealla-prolog";
|
||||
repo = "trealla";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Wy4FPvBQY2CvpR9QiFbI1wI2ztUAc1XvaOGaGH7SkKs=";
|
||||
hash = "sha256-uWCpCjYFtK2pNeHHZWhWI6YZ+cllQpkKz//nHracl5s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,29 +1,27 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, lxml
|
||||
, setuptools
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "xmldiff";
|
||||
version = "2.4";
|
||||
|
||||
let
|
||||
version = "2.6.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shoobx";
|
||||
repo = pname;
|
||||
repo = "xmldiff";
|
||||
rev = version;
|
||||
hash = "sha256-xqudHYfwOce2C0pcFzId0JDIIC6R5bllmVKsH+CvTdE=";
|
||||
hash = "sha256-qn8gGultTSNKPUro6Ap4xJGcbpxV+lKgZFpKvyPdhtc=";
|
||||
};
|
||||
in
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "xmldiff";
|
||||
inherit version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
lxml
|
||||
setuptools
|
||||
six
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://xmldiff.readthedocs.io/en/stable/";
|
||||
description = "A library and command line utility for diffing xml";
|
||||
longDescription = ''
|
||||
@@ -37,7 +35,7 @@ buildPythonApplication rec {
|
||||
would not be be readable by a human. xmldiff provides tools to make human
|
||||
readable diffs in those situations.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres anpryl ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres anpryl ];
|
||||
};
|
||||
}
|
||||
@@ -33,7 +33,6 @@ in stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
inherit (iosevka.meta) homepage downloadPage description license platforms;
|
||||
maintainers = with lib.maintainers; [
|
||||
cstrahan
|
||||
montchr
|
||||
];
|
||||
};
|
||||
|
||||
@@ -136,7 +136,6 @@ buildNpmPackage rec {
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [
|
||||
cstrahan
|
||||
jfrankenau
|
||||
ttuegel
|
||||
babariviere
|
||||
|
||||
@@ -56,6 +56,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
description = "A style neutral scalable cursor theme";
|
||||
platforms = platforms.all;
|
||||
license = licenses.cc-by-sa-30;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -247,6 +247,7 @@ in lib.makeScope pkgs.newScope (self: with self; {
|
||||
# see upstream issue https://github.com/dillonkearns/elm-pages/issues/305 for dealing with the read-only problem
|
||||
preFixup = ''
|
||||
patch $out/lib/node_modules/elm-pages/generator/src/codegen.js ${./packages/elm-pages-fix-read-only.patch}
|
||||
patch $out/lib/node_modules/elm-pages/generator/src/init.js ${./packages/elm-pages-fix-init-read-only.patch}
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
diff --git a/generator/src/init.js b/generator/src/init.js
|
||||
index 06386ff..7127dae 100644
|
||||
--- a/generator/src/init.js
|
||||
+++ b/generator/src/init.js
|
||||
@@ -6,6 +6,20 @@ import { fileURLToPath } from "url";
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
|
||||
+let walknDo = function(somePath, doStuff) {
|
||||
+ doStuff(somePath, true);
|
||||
+ const dir = fs.readdirSync(somePath)
|
||||
+ dir.forEach((i) => {
|
||||
+ let p = path.join(somePath, i);
|
||||
+ const s = fs.statSync(p)
|
||||
+ if (s.isDirectory()) {
|
||||
+ walknDo(p, doStuff)
|
||||
+ } else {
|
||||
+ doStuff(p);
|
||||
+ }
|
||||
+ });
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* @param {string} name
|
||||
*/
|
||||
@@ -18,6 +32,13 @@ export async function run(name) {
|
||||
if (!fs.existsSync(name)) {
|
||||
try {
|
||||
await fsExtra.copy(template, appRoot);
|
||||
+ walknDo(appRoot, (file, isDir) => {
|
||||
+ if (isDir) {
|
||||
+ fs.chmodSync(file, 0o755);
|
||||
+ } else {
|
||||
+ fs.chmodSync(file, 0o644);
|
||||
+ }
|
||||
+ });
|
||||
fs.renameSync(
|
||||
path.resolve(appRoot, "gitignore"),
|
||||
path.resolve(appRoot, ".gitignore")
|
||||
@@ -1,18 +1,11 @@
|
||||
diff --git a/generator/src/codegen.js b/generator/src/codegen.js
|
||||
index a0ef8806e..fe00ac904 100644
|
||||
index baf5368..e5edf4d 100644
|
||||
--- a/generator/src/codegen.js
|
||||
+++ b/generator/src/codegen.js
|
||||
@@ -20,33 +20,33 @@ async function generate(basePath) {
|
||||
@@ -37,9 +37,9 @@ export async function generate(basePath) {
|
||||
copyToBoth("SiteConfig.elm"),
|
||||
|
||||
const uiFileContent = elmPagesUiFile();
|
||||
await Promise.all([
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./Page.elm`),
|
||||
- `./.elm-pages/Page.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./.elm-pages/Page.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./Page.elm`))
|
||||
),
|
||||
fs.promises.writeFile("./.elm-pages/Pages.elm", uiFileContent),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./elm-application.json`),
|
||||
- `./elm-stuff/elm-pages/elm-application.json`
|
||||
@@ -20,40 +13,27 @@ index a0ef8806e..fe00ac904 100644
|
||||
+ `./elm-stuff/elm-pages/elm-application.json`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./elm-application.json`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./Page.elm`),
|
||||
- `./elm-stuff/elm-pages/.elm-pages/Page.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./elm-stuff/elm-pages/.elm-pages/Page.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./Page.elm`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./SharedTemplate.elm`),
|
||||
- `./.elm-pages/SharedTemplate.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./.elm-pages/SharedTemplate.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./SharedTemplate.elm`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./SharedTemplate.elm`),
|
||||
- `./elm-stuff/elm-pages/.elm-pages/SharedTemplate.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./elm-stuff/elm-pages/.elm-pages/SharedTemplate.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./SharedTemplate.elm`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./SiteConfig.elm`),
|
||||
- `./.elm-pages/SiteConfig.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./.elm-pages/SiteConfig.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./SiteConfig.elm`))
|
||||
),
|
||||
- fs.promises.copyFile(
|
||||
- path.join(__dirname, `./SiteConfig.elm`),
|
||||
- `./elm-stuff/elm-pages/.elm-pages/SiteConfig.elm`
|
||||
+ fs.promises.writeFile(
|
||||
+ `./elm-stuff/elm-pages/.elm-pages/SiteConfig.elm`,
|
||||
+ fs.readFileSync(path.join(__dirname, `./SiteConfig.elm`))
|
||||
),
|
||||
fs.promises.writeFile("./.elm-pages/Pages.elm", uiFileContent),
|
||||
// write `Pages.elm` with cli interface
|
||||
fs.promises.writeFile(
|
||||
@@ -82,9 +82,9 @@ function writeFetcherModules(basePath, fetcherData) {
|
||||
}
|
||||
|
||||
async function newCopyBoth(modulePath) {
|
||||
- await fs.promises.copyFile(
|
||||
- path.join(__dirname, modulePath),
|
||||
- path.join(`./elm-stuff/elm-pages/client/.elm-pages/`, modulePath)
|
||||
+ await fs.promises.writeFile(
|
||||
+ path.join(`./elm-stuff/elm-pages/client/.elm-pages/`, modulePath),
|
||||
+ fs.readFileSync(path.join(__dirname, modulePath))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ async function copyFileEnsureDir(from, to) {
|
||||
await fs.promises.mkdir(path.dirname(to), {
|
||||
recursive: true,
|
||||
});
|
||||
- await fs.promises.copyFile(from, to);
|
||||
+ await fs.promises.writeFile(to, fs.readFileSync(from));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -5,26 +5,6 @@
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/json" = {
|
||||
sha256 = "1a107nmm905dih4w4mjjkkpdcjbgaf5qjvr7fl30kkpkckfjjnrw";
|
||||
version = "1.1.2";
|
||||
};
|
||||
|
||||
"elm/html" = {
|
||||
sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/svg" = {
|
||||
sha256 = "1cwcj73p61q45wqwgqvrvz3aypjyy3fw732xyxdyj6s256hwkn0k";
|
||||
version = "1.0.1";
|
||||
};
|
||||
|
||||
"elm/project-metadata-utils" = {
|
||||
sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/browser" = {
|
||||
sha256 = "1zlmx672glg7fdgkvh5jm47y85pv7pdfr5mkhg6x7ar6k000vyka";
|
||||
version = "1.0.1";
|
||||
@@ -35,11 +15,31 @@
|
||||
version = "1.0.2";
|
||||
};
|
||||
|
||||
"elm/html" = {
|
||||
sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/http" = {
|
||||
sha256 = "008bs76mnp48b4dw8qwjj4fyvzbxvlrl4xpa2qh1gg2kfwyw56v1";
|
||||
version = "2.0.0";
|
||||
};
|
||||
|
||||
"elm/json" = {
|
||||
sha256 = "1a107nmm905dih4w4mjjkkpdcjbgaf5qjvr7fl30kkpkckfjjnrw";
|
||||
version = "1.1.2";
|
||||
};
|
||||
|
||||
"elm/project-metadata-utils" = {
|
||||
sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/svg" = {
|
||||
sha256 = "1cwcj73p61q45wqwgqvrvz3aypjyy3fw732xyxdyj6s256hwkn0k";
|
||||
version = "1.0.1";
|
||||
};
|
||||
|
||||
"elm/bytes" = {
|
||||
sha256 = "040d7irrawcbnq9jxhzx8p9qacdlw5bncy6lgndd6inm53rvvwbp";
|
||||
version = "1.0.7";
|
||||
@@ -55,13 +55,13 @@
|
||||
version = "1.1.0";
|
||||
};
|
||||
|
||||
"elm/url" = {
|
||||
sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
|
||||
"elm/time" = {
|
||||
sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
"elm/time" = {
|
||||
sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
|
||||
"elm/url" = {
|
||||
sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
|
||||
version = "1.0.0";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary
|
||||
, bytestring, containers, directory, edit-distance, fetchgit
|
||||
, file-embed, filelock, filepath, ghc-prim, haskeline, HTTP
|
||||
, http-client, http-client-tls, http-types, language-glsl, mtl
|
||||
, http-client, http-client-tls, http-types, language-glsl, lib, mtl
|
||||
, network, parsec, process, raw-strings-qq, scientific, SHA
|
||||
, snap-core, snap-server, lib, template-haskell, time
|
||||
, snap-core, snap-server, template-haskell, time
|
||||
, unordered-containers, utf8-string, vector, zip-archive
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "elm";
|
||||
version = "0.19.1";
|
||||
@@ -29,4 +28,5 @@ mkDerivation {
|
||||
homepage = "https://elm-lang.org";
|
||||
description = "The `elm` command line interface";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "elm";
|
||||
}
|
||||
|
||||
+2327
-870
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -119,7 +119,10 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
|
||||
# gcc->clang "cross"-compilation manages to evade it: there
|
||||
# hostPlatform != targetPlatform, hostPlatform.config == targetPlatform.config.
|
||||
# We explicitly inhibit libc headers use in this case as well.
|
||||
+ lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc) ''
|
||||
+ lib.optionalString (targetPlatform != hostPlatform &&
|
||||
withoutTargetLibc &&
|
||||
targetPlatform.config == hostPlatform.config &&
|
||||
(stdenv.cc.isClang || stdenv.targetPlatform.useLLVM)) ''
|
||||
export inhibit_libc=true
|
||||
''
|
||||
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lobster";
|
||||
version = "2023.11";
|
||||
version = "2023.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "lobster";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c0EElDvoFzIZvYZpjWd9az+KUxDXTETOp89I/tRCrQ0=";
|
||||
sha256 = "sha256-0hEcbLq8thlgMtCcWt8SR5XsNgQfNH4+qdE0cHfRveo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -263,7 +263,7 @@ in stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.rust-lang.org/";
|
||||
description = "A safe, concurrent, practical language";
|
||||
maintainers = with maintainers; [ cstrahan globin havvy ] ++ teams.rust.members;
|
||||
maintainers = with maintainers; [ globin havvy ] ++ teams.rust.members;
|
||||
license = [ licenses.mit licenses.asl20 ];
|
||||
platforms = [
|
||||
# Platforms with host tools from
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
# Lambda Lisp has several backends, here we are using
|
||||
# the blc one. Ideally, this should be made into several
|
||||
# packages such as lambda-lisp-blc, lambda-lisp-lazyk,
|
||||
# lambda-lisp-clamb, etc.
|
||||
|
||||
{ lib
|
||||
, gccStdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, runtimeShell
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv = gccStdenv;
|
||||
s = import ./sources.nix { inherit fetchurl fetchFromGitHub; };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lambda-lisp-blc";
|
||||
version = s.lambdaLispVersion;
|
||||
src = s.src;
|
||||
flatSrc = s.flatSrc;
|
||||
blcSrc = s.blcSrc;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p ./build
|
||||
cp $blcSrc ./build/Blc.S
|
||||
cp $flatSrc ./build/flat.lds
|
||||
cd build;
|
||||
cat Blc.S | sed -e 's/#define.*TERMS.*//' > Blc.ext.S;
|
||||
$CC -c -DTERMS=50000000 -o Blc.o Blc.ext.S
|
||||
ld.bfd -o Blc Blc.o -T flat.lds
|
||||
cd ..;
|
||||
mv build/Blc ./bin
|
||||
install -D -t $out/bin bin/Blc
|
||||
install -D -t $out/lib bin/lambdalisp.blc
|
||||
|
||||
cd build;
|
||||
$CC ../tools/asc2bin.c -O2 -o asc2bin;
|
||||
cd ..;
|
||||
mv build/asc2bin ./bin;
|
||||
chmod 755 ./bin/asc2bin;
|
||||
install -D -t $out/bin bin/asc2bin
|
||||
|
||||
echo -e "#!${runtimeShell}\n( cat $out/lib/lambdalisp.blc | $out/bin/asc2bin; cat ) | $out/bin/Blc" > lambda-lisp-blc
|
||||
chmod +x lambda-lisp-blc
|
||||
|
||||
install -D -t $out/bin lambda-lisp-blc
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
a=$(echo "(* (+ 1 2 3 4 5 6 7 8 9 10) 12020569 (- 2 5))" | $out/bin/lambda-lisp-blc | tr -d "> ");
|
||||
test $a == -1983393885
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Lisp interpreter written in untyped lambda calculus";
|
||||
homepage = "https://github.com/woodrush/lambdalisp";
|
||||
longDescription = ''
|
||||
LambdaLisp is a Lisp interpreter written as a closed untyped lambda calculus term.
|
||||
It is written as a lambda calculus term LambdaLisp = λx. ... which takes a string
|
||||
x as an input and returns a string as an output. The input x is the Lisp program
|
||||
and the user's standard input, and the output is the standard output. Characters
|
||||
are encoded into lambda term representations of natural numbers using the Church
|
||||
encoding, and strings are encoded as a list of characters with lists expressed as
|
||||
lambdas in the Mogensen-Scott encoding, so the entire computation process solely
|
||||
consists of the beta-reduction of lambda terms, without introducing any
|
||||
non-lambda-type object.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
let
|
||||
lambdaLispVersion = "2022-08-18";
|
||||
blcVersion = "2";
|
||||
# Archive of "https://justine.lol/lambda/";
|
||||
justineLolArchive = "https://web.archive.org/web/20230614065521if_/https://justine.lol/lambda/";
|
||||
in
|
||||
{ fetchFromGitHub, fetchurl }: {
|
||||
inherit blcVersion;
|
||||
inherit lambdaLispVersion;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woodrush";
|
||||
repo = "lambdalisp";
|
||||
rev = "2119cffed1ab2005f08ab3cfca92028270f08725";
|
||||
hash = "sha256-ml2xQ8s8sux+6GwTw8mID3PEOcH6hn8tyc/UI5tFaO0=";
|
||||
};
|
||||
|
||||
uniCSrc = fetchFromGitHub {
|
||||
owner = "tromp";
|
||||
repo = "tromp.github.io";
|
||||
rev = "b4de12e566c1fb0fa3f3babe89bac885f4c966a4";
|
||||
hash = "sha256-JmbqQp2kkkkkkkkSWQmG3uBxdgyIu4r2Ch8bBGyQ4H4=";
|
||||
};
|
||||
|
||||
# needed later
|
||||
clambSrc = fetchFromGitHub {
|
||||
owner = "irori";
|
||||
repo = "clamb";
|
||||
rev = "44c1208697f394e22857195be5ea73bfdd48ebd1";
|
||||
hash = "sha256-1lGg2NBoxAKDCSnnPn19r/hwBC5paAKUnlcsUv3dpNY=";
|
||||
};
|
||||
|
||||
# needed later
|
||||
lazykSrc = fetchFromGitHub {
|
||||
owner = "irori";
|
||||
repo = "lazyk";
|
||||
rev = "5edb0b834d0af5f7413c484eb3795d47ec2e3894";
|
||||
hash = "sha256-1lGg2NBoxAKDCSnnPn19r/hwBC5paAKUnlcsUv3dpNY=";
|
||||
};
|
||||
|
||||
blcSrc = fetchurl {
|
||||
url = "${justineLolArchive}Blc.S?v=${blcVersion}";
|
||||
hash = "sha256-qt7vDtn9WvDoBaLESCyyscA0u74914e8ZKhLiUAN52A=";
|
||||
};
|
||||
|
||||
flatSrc = fetchurl {
|
||||
url = "${justineLolArchive}flat.lds";
|
||||
hash = "sha256-HxX+10rV86zPv+UtF+n72obtz3DosWLMIab+uskxIjA=";
|
||||
};
|
||||
}
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmer";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wasmerio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7E/of0WP28VM7ceDCBsSCb6ot3FEYUZkHVk0H/LcbGk=";
|
||||
hash = "sha256-GROw9TYKC53ECJUeYhCez8f2jImPla/lGgsP91tTGjQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1YlwYgnZzkYjY2yQlSZTs3JrUnIeZgpCDZBevqlj4WM=";
|
||||
cargoHash = "sha256-JE7FDF4MWhqJbL7ZP+yzfV7/Z79x0NuQLYNwWwMjAao=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/bombela/backward-cpp";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/kupferlauncher/keybinder/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.cstrahan ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
feature is the possibility setting style properties from a CSS format
|
||||
file.'';
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Terminal-emulator State Machine";
|
||||
homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Mozilla's Universal Charset Detector C/C++ API";
|
||||
homepage = "https://www.freedesktop.org/wiki/Software/uchardet/";
|
||||
license = licenses.mpl11;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "A multi-platform support library with a focus on asynchronous I/O";
|
||||
homepage = "https://libuv.org/";
|
||||
changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog";
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ];
|
||||
};
|
||||
|
||||
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://lightstep.com/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/arangodb/linenoise-ng";
|
||||
description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters";
|
||||
maintainers = with lib.maintainers; [ cstrahan ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llhttp";
|
||||
version = "9.1.2";
|
||||
version = "9.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodejs";
|
||||
repo = "llhttp";
|
||||
rev = "release/v${finalAttrs.version}";
|
||||
hash = "sha256-kW6u9ETZJcJBh150chfE3SEwFpT7evZ0cqz8caM7fbQ=";
|
||||
hash = "sha256-QacjukWkRCuQA4qzUq45521YOBLPuOSKNR1pVxgxe9o=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP";
|
||||
homepage = "http://libmailcore.com";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://rapidjson.org/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ cstrahan dotlambda ];
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -55,8 +55,14 @@
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix `call to undeclared function 'sleep'` with clang 16
|
||||
./mariadb-connector-odbc-unistd.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ unixODBC openssl libiconv ];
|
||||
buildInputs = [ unixODBC openssl libiconv zlib ]
|
||||
++ lib.optionals stdenv.isDarwin [ libkrb5 ];
|
||||
|
||||
preConfigure = ''
|
||||
# we don't want to build a .pkg
|
||||
@@ -66,6 +72,7 @@
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_EXTERNAL_ZLIB=ON"
|
||||
"-DODBC_LIB_DIR=${lib.getLib unixODBC}/lib"
|
||||
"-DODBC_INCLUDE_DIR=${lib.getDev unixODBC}/include"
|
||||
"-DWITH_OPENSSL=ON"
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -ur a/test/use_result.c b/test/use_result.c
|
||||
--- a/test/use_result.c 1969-12-31 19:00:01.000000000 -0500
|
||||
+++ b/test/use_result.c 2023-09-05 00:08:12.979889343 -0400
|
||||
@@ -23,6 +23,8 @@
|
||||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
#include "tap.h"
|
||||
|
||||
SQLINTEGER my_max_rows= 100;
|
||||
@@ -174,7 +174,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://v8.dev/";
|
||||
description = "Google's open source JavaScript engine";
|
||||
maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];
|
||||
maintainers = with maintainers; [ proglodyte matthewbauer ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
{ lib, buildNimPackage, fetchFromGitHub, openssl }:
|
||||
|
||||
buildNimPackage (final: prev: {
|
||||
pname = "atlas";
|
||||
@@ -10,6 +10,7 @@ buildNimPackage (final: prev: {
|
||||
rev = "ab22f997c22a644924c1a9b920f8ce207da9b77f";
|
||||
hash = "sha256-TsZ8TriVuKEY9/mV6KR89eFOgYrgTqXmyv/vKu362GU=";
|
||||
};
|
||||
buildInputs = [ openssl ];
|
||||
prePatch = ''
|
||||
rm config.nims
|
||||
''; # never trust a .nims file
|
||||
|
||||
@@ -1,22 +1,26 @@
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchFromGitHub
|
||||
, alcotest
|
||||
, qcheck-core
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "algaeff";
|
||||
version = "0.2.1";
|
||||
version = "1.1.0";
|
||||
|
||||
minimalOCamlVersion = "5.0";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RedPRL";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-jpnJhF+LN2ef6QPLcCHxcMg3Fr3GSLOnJkZ9ZUIOrlY=";
|
||||
hash = "sha256-7kwQmoT8rpQWPHc+BZQi9fcZhgHxS99158ebXAXlpQ8=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest qcheck-core ];
|
||||
|
||||
meta = {
|
||||
description = "Reusable Effects-Based Components";
|
||||
homepage = "https://github.com/RedPRL/algaeff";
|
||||
|
||||
@@ -2,19 +2,15 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "zmq";
|
||||
version = "5.1.5";
|
||||
|
||||
duneVersion = "3";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/issuu/ocaml-zmq/releases/download/${version}/zmq-lwt-${version}.tbz";
|
||||
sha256 = "sha256-mUfRPatLPFeSzWDwCIoFaVl85VkvDch4i6pOn3Kme1Y=";
|
||||
url = "https://github.com/issuu/ocaml-zmq/releases/download/${version}/zmq-${version}.tbz";
|
||||
hash = "sha256-hVKfaTrUFqEBsv5hFB7JwsR630M0DKnqhB0QHpxcHKc=";
|
||||
};
|
||||
|
||||
buildInputs = [ czmq dune-configurator ];
|
||||
|
||||
propagatedBuildInputs = [ stdint ];
|
||||
|
||||
meta = {
|
||||
description = "ZeroMQ bindings for OCaml";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
{ buildDunePackage, zmq, ocaml_lwt }:
|
||||
{ buildDunePackage, zmq, lwt }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "zmq-lwt";
|
||||
inherit (zmq) version src meta;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ zmq ocaml_lwt ];
|
||||
propagatedBuildInputs = [ zmq lwt ];
|
||||
}
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
let
|
||||
pname = "phpstan";
|
||||
version = "1.10.33";
|
||||
version = "1.10.37";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
|
||||
sha256 = "sha256-dFIuCVYmZr6E0181jegKs6d3mA9jPoFqoIY+lyWl7P8=";
|
||||
sha256 = "sha256-i1h3N11MsKhHx/RJxAthnUbjacA5yZJF6bzmQnmEKzg=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-pika";
|
||||
version = "9.1.3";
|
||||
version = "9.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "mosquito";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QCM/9Vt9/uXylaU8xymXJEjVd6sFRcVhpr2CGjB0AoY=";
|
||||
hash = "sha256-Fy3vTXfj+gu/+PYWPfcOZ/D7boRiZYcFPX29p28HoGs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone-cloud";
|
||||
version = "0.2.2";
|
||||
version = "0.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = "aioairzone-cloud";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SGHbM7D21ykFWwg4aTUUMIFpwZ0K8CQohZYtzXOPJQg=";
|
||||
hash = "sha256-7sjiY20jDUHtEnqAMwEHsBboK9XCH5XjE0sHR82YvEA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,23 +5,35 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohue";
|
||||
version = "4.6.2";
|
||||
format = "setuptools";
|
||||
version = "4.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DzslGfKwsXXWWhbTb0apJCsnNdnUe7AbvrRT8ZnPbVU=";
|
||||
hash = "sha256-t48rUPAM0XpbDreCwHU/smoyhPtxhwrpDkb1170GkQM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "0.0.0"' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awesomeversion
|
||||
aiohttp
|
||||
@@ -30,6 +42,8 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-aiohttp
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@@ -10,12 +10,13 @@
|
||||
, pythonOlder
|
||||
, segno
|
||||
, setuptools
|
||||
, trustme
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "62";
|
||||
version = "63";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -24,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5XCF67YuelS4RDUxfImSAELfdb3rJWGprIYQeQPp+yk=";
|
||||
hash = "sha256-am11pFgYMRccUNaK/iKdp6mfk5NQ4QnU41xbFiGCMPs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -51,6 +52,7 @@ buildPythonPackage rec {
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
trustme
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.31.57";
|
||||
version = "1.31.60";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-4o88p6YnnwHc7EZjmAvoCqk9xOsu/MI5aFnOtkdiO4M=";
|
||||
hash = "sha256-mBNODmy8MhpZPYwRpuJTK3TYy4Rkvz880BhLzFnxs54=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user