mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 17:49:58 +03:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
f301759f9f
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@ -53,7 +53,7 @@
|
||||
/pkgs/test/nixpkgs-check-by-name @infinisil
|
||||
/pkgs/by-name/README.md @infinisil
|
||||
/pkgs/top-level/by-name-overlay.nix @infinisil
|
||||
/.github/workflows/check-by-name.nix @infinisil
|
||||
/.github/workflows/check-by-name.yml @infinisil
|
||||
|
||||
# Nixpkgs build-support
|
||||
/pkgs/build-support/writers @lassulus @Profpatsch
|
||||
|
||||
4
.github/workflows/check-by-name.yml
vendored
4
.github/workflows/check-by-name.yml
vendored
@ -19,11 +19,13 @@ jobs:
|
||||
steps:
|
||||
- name: Resolving the merge commit
|
||||
run: |
|
||||
if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge); then
|
||||
if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge 2>&1); then
|
||||
mergedSha=$(cut -f1 <<< "$result")
|
||||
echo "The PR appears to not have any conflicts, checking the merge commit $mergedSha"
|
||||
else
|
||||
echo "The PR may have a merge conflict"
|
||||
echo "'git ls-remote' output was:"
|
||||
echo "$result"
|
||||
exit 1
|
||||
fi
|
||||
echo "mergedSha=$mergedSha" >> "$GITHUB_ENV"
|
||||
|
||||
@ -7206,6 +7206,12 @@
|
||||
fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5";
|
||||
}];
|
||||
};
|
||||
hubble = {
|
||||
name = "Hubble the Wolverine";
|
||||
matrix = "@hubofeverything:bark.lgbt";
|
||||
github = "the-furry-hubofeverything";
|
||||
githubId = 53921912;
|
||||
};
|
||||
hufman = {
|
||||
email = "hufman@gmail.com";
|
||||
github = "hufman";
|
||||
@ -14426,6 +14432,12 @@
|
||||
githubId = 1332289;
|
||||
name = "Quentin Machu";
|
||||
};
|
||||
quinn-dougherty = {
|
||||
email = "quinnd@riseup.net";
|
||||
github = "quinn-dougherty";
|
||||
githubId = 39039420;
|
||||
name = "Quinn Dougherty";
|
||||
};
|
||||
qyliss = {
|
||||
email = "hi@alyssa.is";
|
||||
github = "alyssais";
|
||||
@ -15294,6 +15306,12 @@
|
||||
fingerprint = "E4F4 1EAB BF0F C785 06D8 62EF EF68 CF41 D42A 593D";
|
||||
}];
|
||||
};
|
||||
ryangibb = {
|
||||
email = "ryan@freumh.org";
|
||||
github = "ryangibb";
|
||||
githubId = 22669046;
|
||||
name = "Ryan Gibb";
|
||||
};
|
||||
ryanorendorff = {
|
||||
github = "ryanorendorff";
|
||||
githubId = 12442942;
|
||||
@ -16365,6 +16383,16 @@
|
||||
fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442";
|
||||
}];
|
||||
};
|
||||
soispha = {
|
||||
name = "Soispha";
|
||||
email = "soispha@vhack.eu";
|
||||
matrix = "@soispha:vhack.eu";
|
||||
github = "soispha";
|
||||
githubId = 132207423;
|
||||
keys = [{
|
||||
fingerprint = "9606 FC74 9FCE 1636 0723 D4AD A5E9 4010 C3A6 42AD";
|
||||
}];
|
||||
};
|
||||
solson = {
|
||||
email = "scott@solson.me";
|
||||
matrix = "@solson:matrix.org";
|
||||
|
||||
@ -393,7 +393,7 @@ in
|
||||
)
|
||||
) // {
|
||||
# Miscellaneous options
|
||||
inherit (cfg) banaction maxretry;
|
||||
inherit (cfg) banaction maxretry bantime;
|
||||
ignoreip = ''127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}'';
|
||||
backend = "systemd";
|
||||
# Actions
|
||||
|
||||
@ -172,7 +172,7 @@ in {
|
||||
ln -sf '${file}' "${local}"
|
||||
'') rules}
|
||||
|
||||
if [ ! -f /etc/opensnitch-system-fw.json ]; then
|
||||
if [ ! -f /etc/opensnitchd/system-fw.json ]; then
|
||||
cp "${pkgs.opensnitch}/etc/opensnitchd/system-fw.json" "/etc/opensnitchd/system-fw.json"
|
||||
fi
|
||||
'');
|
||||
|
||||
@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwig-studio";
|
||||
version = "5.0.7";
|
||||
version = "5.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||
sha256 = "sha256-jsHGUAVRUiz9soffW1PvF6UUGzbGhltaKtEW5ynq/Xk=";
|
||||
sha256 = "sha256-B6s8FuNvJ3NdU7uZ+AsZkiFf9p6WcLzoZPsfzors1kk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
||||
|
||||
@ -1,38 +1,60 @@
|
||||
{ fetchurl, lib, stdenv, gettext, libmpcdec, libao }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, gettext
|
||||
, libao
|
||||
, libmpcdec
|
||||
}:
|
||||
|
||||
let version = "0.2.4"; in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mpc123";
|
||||
inherit version;
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1";
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "mpc123";
|
||||
rev = "upstream/${finalAttrs.version}";
|
||||
hash = "sha256-+/yxb19CJzyjQmT3O21pEmPR5YudmyCxWwo+W3uOB9Q=";
|
||||
};
|
||||
|
||||
patches = [ ./use-gcc.patch ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gettext
|
||||
libao
|
||||
libmpcdec
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: /build/cc566Cj9.o:(.bss+0x0): multiple definition of `mpc123_file_reader'; ao.o:(.bss+0x40): first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
buildInputs = [ gettext libmpcdec libao ];
|
||||
# XXX: Should install locales too (though there's only 1 available).
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
installPhase =
|
||||
# XXX: Should install locales too (though there's only 1 available).
|
||||
'' mkdir -p "$out/bin"
|
||||
cp -v mpc123 "$out/bin"
|
||||
'';
|
||||
mkdir -p "$out/bin"
|
||||
cp -v mpc123 "$out/bin"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://mpc123.sourceforge.net/";
|
||||
|
||||
description = "A Musepack (.mpc) audio player";
|
||||
|
||||
homepage = "https://github.com/bucciarati/mpc123";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
mainProgram = "mpc123";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
Don't worry, just use GCC and everything's gonna be alright.
|
||||
|
||||
--- mpc123-0.2.4/Makefile 2008-03-21 22:14:38.000000000 +0100
|
||||
+++ mpc123-0.2.4/Makefile 2010-01-28 23:26:49.000000000 +0100
|
||||
@@ -17,7 +17,7 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
-CC := $(shell which colorgcc || which cc)
|
||||
+CC := gcc
|
||||
|
||||
TAGSPRG := ctags
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocenaudio";
|
||||
version = "3.12.7";
|
||||
version = "3.13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
||||
sha256 = "sha256-+D/JvC0emKdxzd0l2n1QZ0geosrMpdpaxru5z61kqxA=";
|
||||
sha256 = "sha256-h5t5DpZD9zmmyGRueXBG5Pn+vZstm5yCUr6Mx3eyvsc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -25,13 +25,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.82";
|
||||
version = "7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = url_for_platform version stdenv.hostPlatform.qemuArch;
|
||||
hash = {
|
||||
x86_64-linux = "sha256-2vtkOodMj0JGLQQn4a+XHxodHQqpnSW1ea7v6aC9sHo=";
|
||||
aarch64-linux = "sha256-FBNfXTnxqq22CnFrE2zvf6kDy/p/+SXOzqz7JS3IdG8=";
|
||||
x86_64-linux = "sha256-lHXy1xSwhNht6dt30e35nE1ZpOm8oTMMpoZJI7ELsjg=";
|
||||
aarch64-linux = "sha256-a/e8DQ9NvbLyZHqg7pUxm+kV7i5vKCjeq9EOO0/5TJk=";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "besu";
|
||||
version = "23.7.2";
|
||||
version = "23.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-90sywaNDy62QqIqlkna0xe7+pGQ+5UKrorv4mPha4kI=";
|
||||
sha256 = "sha256-wSymqYYVV+C/jycHb4yK/M5vFWRofl8Cv9yWwrGIRv8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvi";
|
||||
version = "7.4.23";
|
||||
version = "7.4.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnsonjh";
|
||||
repo = "OpenVi";
|
||||
rev = version;
|
||||
hash = "sha256-DwecSnByRkjBFqy3gWJ0+1srF2YsNACqKrAITn6wXJw=";
|
||||
hash = "sha256-jfh82Ti8iVqsh7G9BnHbc3cQP8D9dGV71YJ28SBjjgA=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses perl ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1246,6 +1246,10 @@ self: super: {
|
||||
meta.maintainers = with lib.maintainers; [enderger];
|
||||
};
|
||||
|
||||
typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs {
|
||||
dependencies = with self; [ nvim-lspconfig plenary-nvim ];
|
||||
};
|
||||
|
||||
unicode-vim =
|
||||
let
|
||||
unicode-data = fetchurl {
|
||||
|
||||
@ -864,6 +864,7 @@ https://github.com/Pocco81/true-zen.nvim/,,
|
||||
https://github.com/jgdavey/tslime.vim/,,
|
||||
https://github.com/Quramy/tsuquyomi/,,
|
||||
https://github.com/folke/twilight.nvim/,,
|
||||
https://github.com/pmizio/typescript-tools.nvim/,,
|
||||
https://github.com/leafgarland/typescript-vim/,,
|
||||
https://github.com/jose-elias-alvarez/typescript.nvim/,,
|
||||
https://github.com/kaarmu/typst.vim/,HEAD,
|
||||
|
||||
@ -732,8 +732,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "chatgpt-reborn";
|
||||
publisher = "chris-hayes";
|
||||
version = "3.16.3";
|
||||
sha256 = "wkitG5gmYKYKXRw/zVW04HN1dePiTjbnynFOY/bwxfI=";
|
||||
version = "3.19.1";
|
||||
sha256 = "1msb3lqy9p2v26nsw0clfsisiwxcid3jp1l6549hk1i1gcqhd84w";
|
||||
};
|
||||
};
|
||||
|
||||
@ -741,8 +741,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "path-intellisense";
|
||||
publisher = "christian-kohler";
|
||||
version = "2.8.4";
|
||||
sha256 = "sha256-FEBYcjJHOwmxVHhhyxqOpk/V6hvtMkhkvLVpmJCMSZw=";
|
||||
version = "2.8.5";
|
||||
sha256 = "1ndffv1m4ayiija1l42m28si44vx9y6x47zpxzqv2j4jj7ga1n5z";
|
||||
};
|
||||
meta = {
|
||||
description = "Visual Studio Code plugin that autocompletes filenames";
|
||||
@ -1575,9 +1575,10 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
version = "1.89.156";
|
||||
sha256 = "sha256-BJnYd9D3bWrZI8UETnAua8ngVjZJ7EXB1UrZAjVnx1E=";
|
||||
version = "1.126.493";
|
||||
sha256 = "1an7z8z3xz2piw2xz1hdrs6l5rhpyvnjmb650ff2m4k24n01svfy";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor.";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot";
|
||||
@ -1645,8 +1646,8 @@ let
|
||||
# the VSCode Marketplace and use a calver scheme. We should avoid
|
||||
# using preview versions, because they can require insider versions
|
||||
# of VS Code
|
||||
version = "0.68.1";
|
||||
sha256 = "sha256-d60ZxWQLZa2skOB3Iv9K04aGNZA1d1A82N7zRaxAzlI=";
|
||||
version = "0.75.2023101209";
|
||||
sha256 = "1saz4brd5k1wyy7pz1h3jcl4kq35f78s2q8drjd7v2k97jhy8la1";
|
||||
};
|
||||
meta = { license = lib.licenses.mit; };
|
||||
};
|
||||
@ -1891,8 +1892,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
publisher = "James-Yu";
|
||||
version = "9.10.0";
|
||||
sha256 = "s0+8952svPSA69M4H29zuIxUWV6xNRpIqLNd8pzGJhY=";
|
||||
version = "9.14.1";
|
||||
sha256 = "1a8im7n25jy2zyqcqhscj62bamhwzp6kk6hdarb0p38d4pwwzxbm";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||
@ -2361,9 +2362,10 @@ let
|
||||
mktplcRef = {
|
||||
name = "direnv";
|
||||
publisher = "mkhl";
|
||||
version = "0.14.0";
|
||||
sha256 = "sha256-T+bt6ku+zkqzP1gXNLcpjtFAevDRiSKnZaE7sM4pUOs=";
|
||||
version = "0.15.2";
|
||||
sha256 = "06lp4qgnksklgc6nvx1l9z38y7apbx0a6v886nd15aq9rq8my0ka";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "direnv support for Visual Studio Code";
|
||||
license = lib.licenses.bsd0;
|
||||
@ -2726,12 +2728,15 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
nvarner.typst-lsp = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-lsp";
|
||||
publisher = "nvarner";
|
||||
version = "0.5.0";
|
||||
sha256 = "sha256-4bZbjbcd/EjSRBMkzMs1pD00qyQb5W6gePh4xfoU6Ug=";
|
||||
# Please update the corresponding binary (typst-lsp) when updating
|
||||
# this extension.
|
||||
version = "0.10.1";
|
||||
sha256 = "sha256-+LOw9JPpL5eLNxmP4kyPo9S/w8ZxfPGSaY1oR8THmvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
@ -2832,8 +2837,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "material-icon-theme";
|
||||
publisher = "PKief";
|
||||
version = "4.29.0";
|
||||
sha256 = "sha256-YqleqYSpZuhGFGkNo3FRLjiglxX+iUCJl69CRCY/oWM=";
|
||||
version = "4.31.0";
|
||||
sha256 = "0rn4dyqr46wbgi4k27ni6a6i3pa83gyaprhds5rlndjaw90iakb4";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -2898,8 +2903,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-xml";
|
||||
publisher = "redhat";
|
||||
version = "0.25.2023032304";
|
||||
sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8=";
|
||||
version = "0.26.2023092519";
|
||||
sha256 = "00p98qihw7ndwl4h18jx8n0lmrqsn1vab7h2k3cbjdz0b623j773";
|
||||
};
|
||||
meta.license = lib.licenses.epl20;
|
||||
};
|
||||
@ -2908,8 +2913,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-yaml";
|
||||
publisher = "redhat";
|
||||
version = "1.12.0";
|
||||
sha256 = "sha256-r/me14KonxnQeensIYyWU4dQrhomc8h2ntYoiZ+Y7jE=";
|
||||
version = "1.14.0";
|
||||
sha256 = "0pww9qndd2vsizsibjsvscz9fbfx8srrj67x4vhmwr581q674944";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -3339,8 +3344,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-tailscale";
|
||||
publisher = "tailscale";
|
||||
version = "0.4.0";
|
||||
sha256 = "sha256-c/BZHKHs2EKd37148dSxEeP1wBXv75HhDqzegmHPjOs=";
|
||||
version = "0.6.4";
|
||||
sha256 = "1jcq5kdcdyb5yyy0p9cnv56vmclvb6wdwq8xvy1qbkfdqbmy05gm";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/tailscale.vscode-tailscale/changelog";
|
||||
@ -3516,8 +3521,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "uiua-vscode";
|
||||
publisher = "uiua-lang";
|
||||
version = "0.0.15";
|
||||
sha256 = "sha256-q+hSssxOIfeRUw2z9nMiCmH8cAF+GPTvlmc1jl/L4uU=";
|
||||
version = "0.0.19";
|
||||
sha256 = "sha256-Tww1urq6CfLma254Sn5lwOYwbvxAeDZuBuFBQlzks1c=";
|
||||
};
|
||||
meta = {
|
||||
description = "VSCode language extension for Uiua";
|
||||
@ -3548,8 +3553,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "errorlens";
|
||||
publisher = "usernamehw";
|
||||
version = "3.12.0";
|
||||
sha256 = "sha256-G5+We49/f5UwYqoBovegRK+UOT6KPZo85cvoDjD1Mu4=";
|
||||
version = "3.14.0";
|
||||
sha256 = "0k70f5f4hcv3jl3a04736ml8amx8w7wb3mb8f6l5gngnvq9fj528";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";
|
||||
@ -3750,8 +3755,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitblame";
|
||||
publisher = "waderyan";
|
||||
version = "10.1.0";
|
||||
sha256 = "TTYBaJ4gcMVICz4bGZTvbNRPpWD4tXuAJbI8QcHNDv0=";
|
||||
version = "10.5.1";
|
||||
sha256 = "119rf52xnxz0cwvvjjfc5m5iv19288cxz33xzr79b67wyfd79hl9";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog";
|
||||
@ -3888,8 +3893,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "material-theme";
|
||||
publisher = "zhuangtongfa";
|
||||
version = "3.15.8";
|
||||
sha256 = "sha256-PwWGs9KRfV3qpYbgdiw8FYvnkaJQ2VW2H6p6+umk7eg=";
|
||||
version = "3.16.2";
|
||||
sha256 = "0ava94zn68lxy3ph78r5rma39qz03al5l5i6x070mpa1hzj3i319";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl jq unzip
|
||||
#! nix-shell -i bash -p cacert curl jq unzip
|
||||
# shellcheck shell=bash
|
||||
set -eu -o pipefail
|
||||
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "browsr";
|
||||
version = "1.16.0";
|
||||
version = "1.17.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juftin";
|
||||
repo = "browsr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Tb/7ek5aKFxv8g4jAmj9nQ909LiHqrAXJoeC9o6fwFM=";
|
||||
hash = "sha256-FExDKugFP94C3zMnR1V4QDPWeM2OtRH2ei0LNs3h06c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "batik";
|
||||
version = "1.16";
|
||||
version = "1.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz";
|
||||
sha256 = "sha256-Y4bJ6X46sKx1+fmNkOS2RU7gn7n0fKDnkOYMq0S8fYM=";
|
||||
sha256 = "sha256-sEJphF3grlwZCEt3gHHm4JF8RpvKKBLLvKXf2lu/dhA=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nomacs";
|
||||
version = "3.17.2285";
|
||||
version = "3.17.2287";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nomacs";
|
||||
repo = "nomacs";
|
||||
rev = version;
|
||||
hash = "sha256-/K7LRPwNy2PG7tIGD0tiKnEOPZ491lxFRlgf4xWYtxs=";
|
||||
hash = "sha256-OwiMB6O4+WuAt87sRbD1Qby3U7igqgCgddiWs3a4j3k=";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
|
||||
@ -1,25 +1,43 @@
|
||||
{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl, cmake }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, perl
|
||||
, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libpano13";
|
||||
version = "2.9.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/panotools/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM=";
|
||||
url = "mirror://sourceforge/panotools/libpano13-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl libjpeg libpng libtiff ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
strictDeps = true;
|
||||
|
||||
# one of the tests succeeds on my machine but fails on Hydra (no idea why)
|
||||
#doCheck = true;
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
perl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Carbon
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://panotools.sourceforge.net/";
|
||||
description = "Free software suite for authoring and displaying virtual reality panoramas";
|
||||
homepage = "https://panotools.sourceforge.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
|
||||
maintainers = [ lib.maintainers.wegank ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -30,8 +30,10 @@ let
|
||||
});
|
||||
flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec {
|
||||
version = "0.15.1";
|
||||
format = "setuptools";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
pname = "Flask-WTF";
|
||||
hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw=";
|
||||
};
|
||||
disabledTests = [
|
||||
|
||||
@ -6,19 +6,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "furtherance";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lakoliu";
|
||||
repo = "Furtherance";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KNC0e1Qfls+TcUDPvLaTWWF4ELBJYPE7Oo9/4PK10js=";
|
||||
hash = "sha256-tr7TBqfqKzMnYBMHJmrAW/HViqT4rydBBZvBqgpnfSk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}";
|
||||
hash = "sha256-NHrKk7XgqeEuNAOyIDfzFJzIExTpUfv83Pdv/NPkgYQ=";
|
||||
hash = "sha256-MFiMoTMW83QxV3BOyZaa1XmfRNieCT007N/4vfSD67Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moonlight-embedded";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-stream";
|
||||
repo = "moonlight-embedded";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BZYFN6X6UNllwlovnpEwDSocA5ZfSDUOyr8JTg4z9ak=";
|
||||
sha256 = "sha256-/gRm3fViTpoTOkIEu6+mrGTVTAFTmwdWV0MKoFF5vkc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -86,11 +86,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appgate-sdp";
|
||||
version = "6.2.2";
|
||||
version = "6.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
|
||||
sha256 = "sha256-5xbwBCLTlZ0cE273n3ErykZSEr59dZjQWhVTK91W9a4=";
|
||||
sha256 = "sha256-W6P83+DPd2VRz52UKPJp+D1WcjgDwyXYcx6rViHbmlk=";
|
||||
};
|
||||
|
||||
# just patch interpreter
|
||||
|
||||
@ -85,8 +85,8 @@ mkChromiumDerivation (base: rec {
|
||||
then "https://github.com/ungoogled-software/ungoogled-chromium"
|
||||
else "https://www.chromium.org/";
|
||||
maintainers = with lib.maintainers; if ungoogled
|
||||
then [ squalus primeos michaeladler networkexception ]
|
||||
else [ primeos thefloweringash networkexception ];
|
||||
then [ squalus primeos michaeladler networkexception emilylange ]
|
||||
else [ primeos thefloweringash networkexception emilylange ];
|
||||
license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "chromium";
|
||||
|
||||
@ -2,24 +2,24 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube-router";
|
||||
version = "1.6.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudnativelabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3hfStQ87t8zKyRqUoUViAqRcI8AQXhYSwOGqwIm6Q/w=";
|
||||
hash = "sha256-7laXw0tC25zPTeLJlB/rX6WVcRFCd6DCB+3EUPnE4cM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kV5tUGhOm0/q5btOQu4TtDO5dVmACNNvDS7iNgm/Xio=";
|
||||
vendorHash = "sha256-qJA6gnb+VIkJD24iq6yyn8r4zYY19ZywcyalwfaTtbo=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/cloudnativelabs/kube-router/pkg/version.Version=${version}"
|
||||
"-X github.com/cloudnativelabs/kube-router/pkg/version.BuildDate=Nix"
|
||||
"-X github.com/cloudnativelabs/kube-router/v2/pkg/version.Version=${version}"
|
||||
"-X github.com/cloudnativelabs/kube-router/v2/pkg/version.BuildDate=Nix"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "odo";
|
||||
version = "3.14.0";
|
||||
version = "3.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redhat-developer";
|
||||
repo = "odo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d6C+nOz60CPnEsSf74+WBTaeIXGKtysVELg0+dXM1cU=";
|
||||
sha256 = "sha256-UPq211Lo95r2b/Ov/a7uhb5p9M3MlNd72VwkMXPHy2Y=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
{ lib
|
||||
, writeShellScriptBin
|
||||
, buildGoPackage
|
||||
, buildGoModule
|
||||
, makeWrapper
|
||||
, fetchFromGitHub
|
||||
, coreutils
|
||||
, nettools
|
||||
, busybox
|
||||
, util-linux
|
||||
, stdenv
|
||||
, dmidecode
|
||||
@ -29,22 +28,29 @@ let
|
||||
-r) echo "''${VERSION:-unknown}";;
|
||||
esac
|
||||
'';
|
||||
|
||||
binaries = {
|
||||
"core" = "amazon-ssm-agent";
|
||||
"agent" = "ssm-agent-worker";
|
||||
"cli-main" = "ssm-cli";
|
||||
"worker" = "ssm-document-worker";
|
||||
"logging" = "ssm-session-logger";
|
||||
"sessionworker" = "ssm-session-worker";
|
||||
};
|
||||
in
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ssm-agent";
|
||||
version = "3.2.1630.0";
|
||||
|
||||
goPackagePath = "github.com/aws/${pname}";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "refs/tags/${version}";
|
||||
owner = "aws";
|
||||
repo = "amazon-ssm-agent";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0tN0rBfz2VZ4UkYLFDGg9218O9vyyRT2Lrppu9TETao=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
patches = [
|
||||
# Some tests use networking, so we skip them.
|
||||
./0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch
|
||||
@ -54,6 +60,8 @@ buildGoPackage rec {
|
||||
./0002-version-gen-don-t-use-unnecessary-constants.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1630.0/makefile#L120-L138
|
||||
# The updater is not built because it cannot work on NixOS
|
||||
subPackages = [
|
||||
@ -65,10 +73,7 @@ buildGoPackage rec {
|
||||
"agent/framework/processor/executer/outofproc/sessionworker"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postPatch = ''
|
||||
printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh
|
||||
@ -94,43 +99,36 @@ buildGoPackage rec {
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
pushd go/src/${goPackagePath}
|
||||
|
||||
# Note: if this step fails, please patch the code to fix it! Please only skip
|
||||
# tests if it is not feasible for the test to pass in a sandbox.
|
||||
make quick-integtest
|
||||
|
||||
make pre-release
|
||||
make pre-build
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
pushd go/bin
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv core amazon-ssm-agent
|
||||
mv agent ssm-agent-worker
|
||||
mv cli-main ssm-cli
|
||||
mv worker ssm-document-worker
|
||||
mv logging ssm-session-logger
|
||||
mv sessionworker ssm-session-worker
|
||||
declare -A map=(${builtins.concatStringsSep " " (lib.mapAttrsToList (name: value: "[\"${name}\"]=\"${value}\"") binaries)})
|
||||
|
||||
popd
|
||||
'';
|
||||
for key in ''${!map[@]}; do
|
||||
install -D -m 0555 -T "$GOPATH/bin/''${key}" "$out/bin/''${map[''${key}]}"
|
||||
done
|
||||
|
||||
# These templates retain their `.template` extensions on installation. The
|
||||
# amazon-ssm-agent.json.template is required as default configuration when an
|
||||
# amazon-ssm-agent.json isn't present. Here, we retain the template to show
|
||||
# we're using the default configuration.
|
||||
# These templates retain their `.template` extensions on installation. The
|
||||
# amazon-ssm-agent.json.template is required as default configuration when an
|
||||
# amazon-ssm-agent.json isn't present. Here, we retain the template to show
|
||||
# we're using the default configuration.
|
||||
|
||||
# seelog.xml isn't actually required to run, but it does ship as a template
|
||||
# with debian packages, so it's here for reference. Future work in the nixos
|
||||
# module could use this template and substitute a different log level.
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/amazon/ssm
|
||||
cp go/src/${goPackagePath}/amazon-ssm-agent.json.template $out/etc/amazon/ssm/amazon-ssm-agent.json.template
|
||||
cp go/src/${goPackagePath}/seelog_unix.xml $out/etc/amazon/ssm/seelog.xml.template
|
||||
# seelog.xml isn't actually required to run, but it does ship as a template
|
||||
# with debian packages, so it's here for reference. Future work in the nixos
|
||||
# module could use this template and substitute a different log level.
|
||||
|
||||
install -D -m 0444 -t $out/etc/amazon/ssm amazon-ssm-agent.json.template
|
||||
install -D -m 0444 -T seelog_unix.xml $out/etc/amazon/ssm/seelog.xml.template
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@ -31,13 +31,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "firewalld";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firewalld";
|
||||
repo = "firewalld";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-seOokeFbjCuwUsB6MbrxaeTlPUzwNzkJPbByM9/oDDU=";
|
||||
sha256 = "sha256-hGMO3uqUlh5h4HYmJiFdfZZw+y1yjprlSadYvix2LIU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2023-09-26
|
||||
# Last updated: 2023-10-16
|
||||
{
|
||||
version = "3.2.1-17153";
|
||||
urlhash = "b69de82d";
|
||||
arm64_hash = "sha256-BtmmVpKZF15aU7RRmXl9g5leg2jz5sT4vYXluq9aIYk=";
|
||||
amd64_hash = "sha256-+GjTjv0K2vnlkb46KhMvRRFWuIEBz23Lg3QhiA7QzkA=";
|
||||
version = "3.2.1-17412";
|
||||
urlhash = "423936b9";
|
||||
arm64_hash = "sha256-gvKBcfQafDtNioFg4Cyy92VMAX4uKL5H7wBkxQgDwjI=";
|
||||
amd64_hash = "sha256-cg2YXB1/pf5eDRHFgzydIb4GICjh9XRtCquPspgCL6c=";
|
||||
}
|
||||
|
||||
@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/";
|
||||
description = "Jabber/XMPP connection manager for the Telepathy framework";
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }:
|
||||
{ lib, stdenv, fetchurl, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-haze";
|
||||
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "A Telepathy connection manager based on libpurple";
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # Random choice
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-haze/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "IRC connection manager for the Telepathy framework";
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux;
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-idle/";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python3, pkg-config
|
||||
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus
|
||||
, fetchpatch
|
||||
, fetchpatch, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
dbus-glib libxml2 sqlite telepathy-glib
|
||||
dbus
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-call" ];
|
||||
@ -39,8 +42,8 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Logger service for Telepathy framework";
|
||||
homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/";
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
, python3
|
||||
, libxslt
|
||||
, makeWrapper
|
||||
, autoreconfHook
|
||||
, gtk-doc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -27,6 +29,9 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
libxslt
|
||||
makeWrapper
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
autoreconfHook
|
||||
gtk-doc
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -49,7 +54,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,23 +6,23 @@
|
||||
, pipewire
|
||||
, libpulseaudio
|
||||
, xdg-utils
|
||||
, electron_25
|
||||
, electron_27
|
||||
, makeDesktopItem
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "webcord";
|
||||
version = "4.4.3";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpacingBat3";
|
||||
repo = "WebCord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Se73TANnZUvbSe3v4woofRzYARP2h2HjO1kv/5sDRyA=";
|
||||
hash = "sha256-SIGV/Hl5O+xs1DbA25TGasXJVYgCzAP/GCtsDmxKDvI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-O3eFtgDO+2A7PygrLj6iT/rptnG+oR5tD2lhhz6Iwug=";
|
||||
npmDepsHash = "sha256-ClPcLHO4+CzOswQaItbFYHVlb0W6Y5NZF140jGpoSJ8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
@ -59,7 +59,7 @@ buildNpmPackage rec {
|
||||
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
|
||||
|
||||
# Add xdg-utils to path via suffix, per PR #181171
|
||||
makeWrapper '${lib.getExe electron_25}' $out/bin/webcord \
|
||||
makeWrapper '${lib.getExe electron_27}' $out/bin/webcord \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
|
||||
--suffix PATH : "${binPath}" \
|
||||
--add-flags "--ozone-platform-hint=auto" \
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcoap";
|
||||
version = "4.3.3";
|
||||
version = "4.3.4";
|
||||
src = fetchFromGitHub {
|
||||
repo = "libcoap";
|
||||
owner = "obgm";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-RS37Fpo1uzwEKzCysilXiH/NYOySEYGPOk0R/+rqiag=";
|
||||
sha256 = "sha256-x8r5fHY8J0NYE7nPSw/bPpK/iTLKioKpQKmVw73KOtg=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
automake
|
||||
|
||||
@ -10,15 +10,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
thunderbird-unwrapped = thunderbirdPackages.thunderbird-102;
|
||||
thunderbird-unwrapped = thunderbirdPackages.thunderbird-115;
|
||||
|
||||
version = "102.15.1";
|
||||
version = "115.3.2";
|
||||
majVer = lib.versions.major version;
|
||||
|
||||
betterbird-patches = fetchFromGitHub {
|
||||
owner = "Betterbird";
|
||||
repo = "thunderbird-patches";
|
||||
rev = "${version}-bb41";
|
||||
rev = "${version}-bb15";
|
||||
postFetch = ''
|
||||
echo "Retrieving external patches"
|
||||
|
||||
@ -36,7 +36,7 @@ let
|
||||
. ./external.sh
|
||||
rm external.sh
|
||||
'';
|
||||
hash = "sha256-fP763ec4B8LbivzmYHzQ4j39QMxWrymqI8chXfF3KX8=";
|
||||
hash = "sha256-6alAGEid7ipr01I52TB0xrlLroCIc03N2IagGJq8te8=";
|
||||
};
|
||||
in ((buildMozillaMach {
|
||||
pname = "betterbird";
|
||||
@ -49,7 +49,7 @@ in ((buildMozillaMach {
|
||||
src = fetchurl {
|
||||
# https://download.cdn.mozilla.net/pub/thunderbird/releases/
|
||||
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||
hash = "sha256-og1Tu7PAHOqGs02jkHU291BCGuKDy1J+72v4Gsu4oDg=";
|
||||
hash = "sha256-kn35avKqUdMix8VJrKJjSWViMLe/WnnxNasPpM7/cdM=";
|
||||
};
|
||||
|
||||
extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ ''
|
||||
@ -57,8 +57,6 @@ in ((buildMozillaMach {
|
||||
patches=$(mktemp -d)
|
||||
for dir in branding bugs external features misc; do
|
||||
cp -r ${betterbird-patches}/${majVer}/$dir/*.patch $patches/
|
||||
# files is not in series file and duplicated with external patch
|
||||
[[ $dir == bugs ]] && rm $patches/1820504-optimise-grapheme-m-c.patch
|
||||
done
|
||||
cp ${betterbird-patches}/${majVer}/series* $patches/
|
||||
chmod -R +w $patches
|
||||
|
||||
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://gnunet.org/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ pstn vrthra ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}";
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flamp";
|
||||
version = "2.2.07";
|
||||
version = "2.2.09";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/fldigi/flamp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BnKL1iwaw1iJC5qcGCvdMr461n0BSYxk61dbAnhpz2c=";
|
||||
hash = "sha256-ev+Ik/e1zQGTH4FeiCDPHbrcXlctencEo4R0+M2Kg+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport);
|
||||
|
||||
gnuradioMinimal.pkgs.mkDerivation rec {
|
||||
pname = "gqrx";
|
||||
version = "2.17";
|
||||
version = "2.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gqrx-sdr";
|
||||
repo = "gqrx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QnwkiH8KqoHa2Q3knh0OAyGBySAArEtdpO+lTzqJ4j0=";
|
||||
hash = "sha256-dwqb/TYNkaXSLXQ0QJEQpy1es0hgNrkNnZww9RpfTt8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,11 +14,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kstars";
|
||||
version = "3.6.6";
|
||||
version = "3.6.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
|
||||
sha256 = "sha256-Z4PatRvtIJBoeRDJJYkkBTOB/R+R7nGdDT38bfAShJQ=";
|
||||
sha256 = "sha256-uEgzvhlHHpXyvi3Djfwg3GmYeZq+r48m7OJFIDARpe4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.10.3";
|
||||
version = "1.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-0KLya2B+gs7aoOvkQdHuJuQtCHLUeSYATToBfIDhm/c=";
|
||||
hash = "sha256-f4VjSBoJnsGb8MHKegJDlomPG32DuTgFcyv1w0GxKvA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,26 +1,32 @@
|
||||
{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew
|
||||
, qtbase, wrapQtAppsHook, python3
|
||||
, cmake, libjpeg }:
|
||||
{ lib, stdenv, fetchurl, libxml2, freetype, libGLU, libGL, glew
|
||||
, qtbase, wrapQtAppsHook, autoPatchelfHook, python3
|
||||
, cmake, libjpeg, llvmPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tulip";
|
||||
version = "5.6.1";
|
||||
version = "5.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz";
|
||||
sha256 = "1fy3nvgxv3igwc1d23zailcgigj1d0f2kkh7a5j24c0dyqz5zxmw";
|
||||
url = "mirror://sourceforge/auber/tulip-${version}_src.tar.gz";
|
||||
hash = "sha256-b+XFCS6Ks+EpwxgYFzWdRomfCpHXmZHXnrQM+ZSLN/0=";
|
||||
};
|
||||
|
||||
buildInputs = [ libxml2 freetype glew libGLU libGL libjpeg qtbase python3 ];
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ]
|
||||
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ]
|
||||
++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]
|
||||
++ lib.optionals stdenv.isLinux [ libGLU libGL ];
|
||||
|
||||
qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ];
|
||||
|
||||
# error: format string is not a string literal (potentially insecure)
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-format-security";
|
||||
|
||||
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "A visualization framework for the analysis and visualization of relational data";
|
||||
|
||||
longDescription =
|
||||
@ -36,6 +42,6 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepgit";
|
||||
version = "4.3";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.syntevo.com/downloads/deepgit/deepgit-linux-${lib.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
|
||||
hash = "sha256-bA/EySZjuSDYaZplwHcpeP1VakcnG5K1hYTk7cSVbz0=";
|
||||
hash = "sha256-Ovd9MjgpMJvNySW/FPXYVtpLoCSQP1W1nlcNkgI7sgA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.12.158";
|
||||
version = "5.12.159";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-mit";
|
||||
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "PurpleBooth";
|
||||
repo = "git-mit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vMrIkM8ShfaSrIEFiY6Jiwo8/6LMrjlqpD1B8DNtWcI=";
|
||||
hash = "sha256-6zifouzFYIMmdTySDFs9Q4MkZrDd1oaK479rEDk45r4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kdXnj1O9AWFwFWQwZ6QPe5ePlxjr/F68vJEpAZgph6I=";
|
||||
cargoHash = "sha256-GBQ0GyKLrrPlHKbZDG0ZuiCVEqkFIT5FrYbojvP/je0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-quick-stats";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "git-quick-stats";
|
||||
owner = "arzzen";
|
||||
rev = version;
|
||||
sha256 = "sha256-zUw0rjsYdH4mlqKXADvfqWCBM8tCL6BmVHq27JZLpd0=";
|
||||
sha256 = "sha256-IIvpUKJxeJYKmTSzEEMZPV6JElt6Ww/Whx3ytNcha7k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "13.9.1";
|
||||
version = "14.0.0";
|
||||
pname = "mediathekview";
|
||||
src = fetchurl {
|
||||
url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
|
||||
sha256 = "4BYKkYhl1YjiAZyfNRdV5KQL+dVkL058uhTG892mXUM=";
|
||||
sha256 = "sha256-vr0yqKVRodtXalHEIsm5gdEp9wPU9U5nnYhMk7IiPF4=";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
, doctest
|
||||
, libdrm
|
||||
, libexecinfo
|
||||
, libevdev
|
||||
, libinput
|
||||
, libjpeg
|
||||
, libxkbcommon
|
||||
@ -18,19 +19,20 @@
|
||||
, wayland-scanner
|
||||
, wlroots
|
||||
, pango
|
||||
, nlohmann_json
|
||||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wayfire";
|
||||
version = "0.7.5";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wayfire";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is=";
|
||||
hash = "sha256-YI8N1rY71b2ulv7tAdah7sibG4qq3kY0/hyS0cls5to=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wf-config
|
||||
libdrm
|
||||
libexecinfo
|
||||
libevdev
|
||||
libinput
|
||||
libjpeg
|
||||
libxkbcommon
|
||||
@ -52,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wayland
|
||||
cairo
|
||||
pango
|
||||
nlohmann_json
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -8,22 +9,32 @@
|
||||
, wf-config
|
||||
, gtkmm3
|
||||
, gtk-layer-shell
|
||||
, libevdev
|
||||
, libinput
|
||||
, libxkbcommon
|
||||
, xcbutilwm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wayfire-plugins-extra";
|
||||
version = "0.7.5";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wayfire-plugins-extra";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-hnsRwIrl0+pRKhRlrF/Wdlu6HkzLfYukGk4Hzx3wNeo=";
|
||||
hash = "sha256-OVyP1AgZ1d9DXFkbHnROwtSQIquEX5ccVIkcmCdDZtA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "check-dependency-libevdev.patch";
|
||||
url = "https://github.com/WayfireWM/wayfire-plugins-extra/commit/f3bbf1fcbafd28016e36be7a5043bd82574ac9e4.patch";
|
||||
hash = "sha256-8X1lpf8H8NuA845cIslahKDQKW/IA/KiMExU4Snk72o=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace metadata/meson.build \
|
||||
--replace "wayfire.get_variable(pkgconfig: 'metadatadir')" "join_paths(get_option('prefix'), 'share/wayfire/metadata')"
|
||||
@ -38,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
wayfire
|
||||
wf-config
|
||||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
xcbutilwm
|
||||
gtkmm3
|
||||
|
||||
@ -12,20 +12,22 @@
|
||||
, wayland-scanner
|
||||
, wayland-protocols
|
||||
, gtk3
|
||||
, gtkmm3
|
||||
, libevdev
|
||||
, libxml2
|
||||
, libxkbcommon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wcm";
|
||||
version = "0.7.5";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wcm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU=";
|
||||
hash = "sha256-UwHJ4Wi83ATnA1CQKNSt8Qga7ooLnAY7QARz2FXvUIo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -43,8 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wayland
|
||||
wayland-protocols
|
||||
gtk3
|
||||
gtkmm3
|
||||
libevdev
|
||||
libxml2
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wf-config";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wf-config";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA=";
|
||||
hash = "sha256-4QszCGlJqehnavTOdR2vZ95XuHKiNUIsA893sa9qph8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,18 +11,19 @@
|
||||
, gtkmm3
|
||||
, gtk-layer-shell
|
||||
, pulseaudio
|
||||
, libdbusmenu-gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wf-shell";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wf-shell";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA=";
|
||||
hash = "sha256-K5g9DfFlqZyPHDUswx3vtzh0D9ogOQ1p87ZrqyH35vs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtkmm3
|
||||
gtk-layer-shell
|
||||
pulseaudio
|
||||
libdbusmenu-gtk3
|
||||
];
|
||||
|
||||
mesonFlags = [ "--sysconfdir /etc" ];
|
||||
|
||||
@ -17,6 +17,7 @@ let
|
||||
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
|
||||
composer
|
||||
composer-local-repo-plugin
|
||||
phpDrv
|
||||
phpDrv.composerHooks.composerInstallHook
|
||||
];
|
||||
|
||||
@ -53,6 +54,13 @@ let
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = previousAttrs.doInstallCheck or false;
|
||||
installCheckPhase = previousAttrs.installCheckPhase or ''
|
||||
runHook preCheckInstall
|
||||
|
||||
runHook postCheckInstall
|
||||
'';
|
||||
|
||||
composerRepository = phpDrv.mkComposerRepository {
|
||||
inherit composer composer-local-repo-plugin;
|
||||
inherit (finalAttrs) patches pname src vendorHash version;
|
||||
@ -63,6 +71,10 @@ let
|
||||
composerNoScripts = previousAttrs.composerNoScripts or true;
|
||||
};
|
||||
|
||||
COMPOSER_CACHE_DIR="/dev/null";
|
||||
COMPOSER_DISABLE_NETWORK="1";
|
||||
COMPOSER_MIRROR_PATH_REPOS="1";
|
||||
|
||||
meta = previousAttrs.meta or { } // {
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@ -41,6 +41,7 @@ let
|
||||
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
|
||||
composer
|
||||
composer-local-repo-plugin
|
||||
phpDrv
|
||||
phpDrv.composerHooks.composerRepositoryHook
|
||||
];
|
||||
|
||||
@ -74,6 +75,13 @@ let
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = previousAttrs.doInstallCheck or false;
|
||||
installCheckPhase = previousAttrs.installCheckPhase or ''
|
||||
runHook preCheckInstall
|
||||
|
||||
runHook postCheckInstall
|
||||
'';
|
||||
|
||||
COMPOSER_CACHE_DIR = "/dev/null";
|
||||
COMPOSER_MIRROR_PATH_REPOS = "1";
|
||||
COMPOSER_HTACCESS_PROTECT = "0";
|
||||
|
||||
@ -49,7 +49,7 @@ composerInstallConfigureHook() {
|
||||
fi
|
||||
|
||||
echo "Validating consistency between composer.lock and ${composerRepository}/composer.lock"
|
||||
if [[! @diff@ composer.lock "${composerRepository}/composer.lock"]]; then
|
||||
if ! @cmp@ -s "composer.lock" "${composerRepository}/composer.lock"; then
|
||||
echo
|
||||
echo "ERROR: vendorHash is out of date"
|
||||
echo
|
||||
@ -77,9 +77,9 @@ composerInstallBuildHook() {
|
||||
# because the file contains hardcoded nix store paths, we generate it here.
|
||||
composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" .
|
||||
|
||||
# Remove all the repositories of type "composer"
|
||||
# Remove all the repositories of type "composer" and "vcs"
|
||||
# from the composer.json file.
|
||||
jq -r -c 'del(try .repositories[] | select(.type == "composer"))' composer.json | sponge composer.json
|
||||
jq -r -c 'del(try .repositories[] | select(.type == "composer" or .type == "vcs"))' composer.json | sponge composer.json
|
||||
|
||||
# Configure composer to disable packagist and avoid using the network.
|
||||
composer config repo.packagist false
|
||||
@ -88,7 +88,6 @@ composerInstallBuildHook() {
|
||||
|
||||
# Since the composer.json file has been modified in the previous step, the
|
||||
# composer.lock file needs to be updated.
|
||||
COMPOSER_DISABLE_NETWORK=1 \
|
||||
COMPOSER_ROOT_VERSION="${version}" \
|
||||
composer \
|
||||
--lock \
|
||||
@ -118,10 +117,7 @@ composerInstallInstallHook() {
|
||||
# the autoloader.
|
||||
# The COMPOSER_ROOT_VERSION environment variable is needed only for
|
||||
# vimeo/psalm.
|
||||
COMPOSER_CACHE_DIR=/dev/null \
|
||||
COMPOSER_DISABLE_NETWORK=1 \
|
||||
COMPOSER_ROOT_VERSION="${version}" \
|
||||
COMPOSER_MIRROR_PATH_REPOS="1" \
|
||||
composer \
|
||||
--no-ansi \
|
||||
--no-interaction \
|
||||
|
||||
@ -55,7 +55,6 @@ composerRepositoryBuildHook() {
|
||||
# Build the local composer repository
|
||||
# The command 'build-local-repo' is provided by the Composer plugin
|
||||
# nix-community/composer-local-repo-plugin.
|
||||
COMPOSER_CACHE_DIR=/dev/null \
|
||||
composer-local-repo-plugin --no-ansi build-local-repo ${composerNoDev:+--no-dev} -r repository
|
||||
|
||||
echo "Finished composerRepositoryBuildHook"
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, makeSetupHook
|
||||
, diffutils
|
||||
, jq
|
||||
, moreutils
|
||||
, makeBinaryWrapper
|
||||
, php
|
||||
, cacert
|
||||
, buildPackages
|
||||
}:
|
||||
@ -12,18 +12,18 @@
|
||||
composerRepositoryHook = makeSetupHook
|
||||
{
|
||||
name = "composer-repository-hook.sh";
|
||||
propagatedBuildInputs = [ jq moreutils php cacert ];
|
||||
propagatedBuildInputs = [ jq moreutils cacert ];
|
||||
substitutions = { };
|
||||
} ./composer-repository-hook.sh;
|
||||
|
||||
composerInstallHook = makeSetupHook
|
||||
{
|
||||
name = "composer-install-hook.sh";
|
||||
propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php cacert ];
|
||||
propagatedBuildInputs = [ jq makeBinaryWrapper moreutils cacert ];
|
||||
substitutions = {
|
||||
# Specify the stdenv's `diff` by abspath to ensure that the user's build
|
||||
# inputs do not cause us to find the wrong `diff`.
|
||||
diff = "${lib.getBin buildPackages.diffutils}/bin/diff";
|
||||
cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp";
|
||||
};
|
||||
} ./composer-install-hook.sh;
|
||||
}
|
||||
|
||||
@ -71,7 +71,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
composer global config --quiet minimum-stability dev
|
||||
composer global config --quiet prefer-stable true
|
||||
composer global config --quiet autoloader-suffix "nixPredictableAutoloaderSuffix"
|
||||
composer global config --quiet apcu-autoloader false
|
||||
composer global config --quiet allow-plugins.nix-community/composer-local-repo-plugin true
|
||||
composer global config --quiet repo.packagist false
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "Boogie";
|
||||
version = "3.0.4";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boogie-org";
|
||||
repo = "boogie";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yebThnIOpZ5crYsSZtbDj8Gn6DznTNJ4T/TsFR3gWvs=";
|
||||
sha256 = "sha256-KciQakwus7cKjtfp5x8nDV7bbTXlzILcL3ivCJAV6Vk=";
|
||||
};
|
||||
|
||||
projectFile = [ "Source/Boogie.sln" ];
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpu-x";
|
||||
version = "4.5.3";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "X0rg";
|
||||
repo = "CPU-X";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o48NkOPabfnwsu+nyXJOstW6g0JSUgIrEFx1nNCR7XE=";
|
||||
sha256 = "sha256-mykN+E2ghp2+a06WLYXg9oaQQ2SJDyxIVQSUM00zrCo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];
|
||||
59
pkgs/by-name/mi/migra/package.nix
Normal file
59
pkgs/by-name/mi/migra/package.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, postgresql
|
||||
, postgresqlTestHook
|
||||
,
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "migra";
|
||||
version = "3.0.1647431138";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djrobstep";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-LSCJA5Ym1LuV3EZl6gnl9jTHGc8A1LXmR1fj0ZZc+po=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
schemainspect
|
||||
six
|
||||
sqlbag
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
postgresql
|
||||
postgresqlTestHook
|
||||
];
|
||||
preCheck = ''
|
||||
export PGUSER="nixbld";
|
||||
'';
|
||||
disabledTests = [
|
||||
# These all fail with "List argument must consist only of tuples or dictionaries":
|
||||
# See this issue: https://github.com/djrobstep/migra/issues/232
|
||||
"test_excludeschema"
|
||||
"test_fixtures"
|
||||
"test_rls"
|
||||
"test_singleschema"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-x"
|
||||
"-svv"
|
||||
"tests"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Like diff but for PostgreSQL schemas";
|
||||
homepage = "https://github.com/djrobstep/migra";
|
||||
license = with licenses; [ unlicense ];
|
||||
maintainers = with maintainers; [ soispha ];
|
||||
};
|
||||
}
|
||||
50
pkgs/by-name/oc/octorpki/package.nix
Normal file
50
pkgs/by-name/oc/octorpki/package.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "octorpki";
|
||||
version = "1.5.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cfrpki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eqIAauwFh1Zbv3Jkk8plz1OR3ZW8fs0ugNwwTnSHSFM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/cloudflare/cfrpki/pull/150
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cloudflare/cfrpki/commit/fd0c4e95b880c463430c91ce1f86205b9309399b.patch";
|
||||
hash = "sha256-cJ0mWkjtGvgTIH5eEum8h2Gy2PqR+nPto+mj5m/I/d4=";
|
||||
})
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=v${version}"
|
||||
"-X main.talpath=${placeholder "out"}/share/tals"
|
||||
];
|
||||
|
||||
subPackages = [
|
||||
"cmd/octorpki"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -R cmd/octorpki/tals $out/share/tals
|
||||
'';
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cloudflare/cfrpki#octorpki";
|
||||
changelog = "https://github.com/cloudflare/cfrpki/releases/tag/v${version}";
|
||||
description = "A software used to download RPKI (RFC 6480) certificates and validate them";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = teams.wdz.members;
|
||||
};
|
||||
}
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raft-cowsql";
|
||||
version = "0.17.3";
|
||||
version = "0.17.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cowsql";
|
||||
repo = "raft";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ad09giGVsAVtm/0GRU/OaZx7BGjL5TlU8BrzFaFlE9k=";
|
||||
hash = "sha256-ZAUC2o0VWpC/zMOVOAxW+CAdiDTXa5JG0gfHirTjm88=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
1998
pkgs/by-name/ru/rustplayer/Cargo.lock
generated
Normal file
1998
pkgs/by-name/ru/rustplayer/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
13
pkgs/by-name/ru/rustplayer/dynamic-lib.patch
Normal file
13
pkgs/by-name/ru/rustplayer/dynamic-lib.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/thirdparty/ffmpeg-decoder-rs/Cargo.toml b/thirdparty/ffmpeg-decoder-rs/Cargo.toml
|
||||
index 9db9ac9..4546253 100644
|
||||
--- a/thirdparty/ffmpeg-decoder-rs/Cargo.toml
|
||||
+++ b/thirdparty/ffmpeg-decoder-rs/Cargo.toml
|
||||
@@ -20,7 +20,7 @@ default = []
|
||||
rodio_source = ['rodio']
|
||||
|
||||
[dependencies]
|
||||
-ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample", "static"] }
|
||||
+ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample"] }
|
||||
|
||||
thiserror = "1.0"
|
||||
log = "0.4"
|
||||
47
pkgs/by-name/ru/rustplayer/package.nix
Normal file
47
pkgs/by-name/ru/rustplayer/package.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, alsa-lib
|
||||
, ffmpeg_4
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "rustplayer";
|
||||
version = "unstable-2022-12-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kingtous";
|
||||
repo = "RustPlayer";
|
||||
rev = "a369bc19ab4a8c568c73be25c5e6117e1ee5d848";
|
||||
sha256 = "sha256-x82EdA7ezCzux1C85IcI2ZQ3M95sH6/k97Rv6lqc5eo=";
|
||||
};
|
||||
|
||||
# This patch is from the source
|
||||
patches = [
|
||||
./dynamic-lib.patch
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ffmpeg-sys-next-4.4.0" = "sha256-TBgf+J+ud7nnVjf0r98/rujFPEayjEaVi+vnSE6/5Ak=";
|
||||
};
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
buildInputs = [ alsa-lib openssl ffmpeg_4 ];
|
||||
|
||||
checkFlags = [
|
||||
# network required
|
||||
"--skip=fetch_and_play"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Kingtous/RustPlayer";
|
||||
description = "A local audio player and network m3u8 radio player using a terminal interface";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ oluceps ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
40
pkgs/by-name/se/serial-unit-testing/package.nix
Normal file
40
pkgs/by-name/se/serial-unit-testing/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, udev
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "serial-unit-testing";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "markatk";
|
||||
repo = "serial-unit-testing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SLwTwEQdwbus9RFskFjU8m4fS9Pnp8HsgnKkBvTqmSI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PoV2v0p0L3CTtC9VMAx2Z/ZsSAIFi2gh2TtOp64S6ZQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
udev
|
||||
];
|
||||
|
||||
# tests require a serial port
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automate testing of serial communication with any serial port device";
|
||||
homepage = "https://github.com/markatk/serial-unit-testing";
|
||||
changelog = "https://github.com/markatk/serial-unit-testing/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rudolfvesely ];
|
||||
mainProgram = "sut";
|
||||
};
|
||||
}
|
||||
39
pkgs/by-name/sw/swipe-guess/package.nix
Normal file
39
pkgs/by-name/sw/swipe-guess/package.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swipe-guess";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~earboxer";
|
||||
repo = "swipeGuess";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8bPsnqjLeeZ7btTre9j1T93VWY9+FdBdJdxyvBVt34s=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
${lib.getExe stdenv.cc} swipeGuess.c -o swipeGuess
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm555 swipeGuess -t $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Completion plugin for touchscreen-keyboards on mobile devices";
|
||||
homepage = "https://git.sr.ht/~earboxer/swipeGuess/";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "swipeGuess";
|
||||
maintainers = with lib.maintainers; [ eclairevoyant ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
576
pkgs/by-name/sy/symbolicator/Cargo.lock
generated
576
pkgs/by-name/sy/symbolicator/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -11,13 +11,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "symbolicator";
|
||||
version = "23.9.1";
|
||||
version = "23.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "symbolicator";
|
||||
rev = version;
|
||||
hash = "sha256-QsU9hxBF7Te3vO6in/nWn6hYbovI1jOWYXB6PcqWGTA=";
|
||||
hash = "sha256-yD1uXqFN1T7bgbW20zu7VauELZTsTPpv4sdtVa/Xc3I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
50
pkgs/by-name/tu/tusc-sh/package.nix
Normal file
50
pkgs/by-name/tu/tusc-sh/package.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, writeShellApplication
|
||||
, curl
|
||||
, coreutils
|
||||
, jq
|
||||
}:
|
||||
|
||||
let
|
||||
tusc = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tusc-sh";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adhocore";
|
||||
repo = "tusc.sh";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RFgQMYit12pmWnEAE1cyl34SFW87xEbS7gq5Nyel/ss=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 tusc.sh -t $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
});
|
||||
in
|
||||
writeShellApplication {
|
||||
name = "tusc";
|
||||
runtimeInputs = [ tusc curl coreutils jq ];
|
||||
text = ''
|
||||
tusc.sh "$@"
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Tus 1.0.0 client protocol implementation for bash";
|
||||
homepage = "https://github.com/adhocore/tusc.sh";
|
||||
changelog = "https://github.com/adhocore/tusc.sh/blob/${tusc.version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
mainProgram = "tusc";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uiua";
|
||||
version = "0.0.19";
|
||||
version = "0.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uiua-lang";
|
||||
repo = "uiua";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2DopXsYhEyD6JHEJgtiCGCzpcl/6nOQCDp0uHDCSEcs=";
|
||||
hash = "sha256-fFsMN+4ORB//Ch+wrRRMeZKXvW8ta5m66Vy3I3uyHO8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WWIxXXuMbk7QqldJIxjWaaM946WGLuMl6mSw7Vc8LKo=";
|
||||
cargoHash = "sha256-old+U0sJWnp8wTiZBjcQ7+mv+6N15cpyyTDEjTUnghk=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20231011001633";
|
||||
version = "20231015073627";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-dU/y4rLjdzTOBvewPKRLBlq+DBc8i6oJGk8LDxTtaiM=";
|
||||
hash = "sha256-DffJ9d5ppTVLMTfITKd0zwCqBEKKMCwupLAFMr/o+dw=";
|
||||
};
|
||||
vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
let
|
||||
validThemes = [ "bat" "bottom" "btop" "k9s" "lazygit" ];
|
||||
validThemes = [ "bat" "bottom" "btop" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ];
|
||||
in
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
@ -40,6 +40,14 @@ let
|
||||
hash = "sha256-J3UezOQMDdxpflGax0rGBF/XMiKqdqZXuX4KMVGTxFk=";
|
||||
};
|
||||
|
||||
hyprland = fetchFromGitHub {
|
||||
name = "hyprland";
|
||||
owner = "catppuccin";
|
||||
repo = "hyprland";
|
||||
rev = "v1.2";
|
||||
hash = "sha256-07B5QmQmsUKYf38oWU3+2C6KO4JvinuTwmW1Pfk8CT8=";
|
||||
};
|
||||
|
||||
k9s = fetchFromGitHub {
|
||||
name = "k9s";
|
||||
owner = "catppuccin";
|
||||
@ -48,6 +56,14 @@ let
|
||||
hash = "sha256-PtBJRBNbLkj7D2ko7ebpEjbfK9Ywjs7zbE+Y8FQVEfA=";
|
||||
};
|
||||
|
||||
kvantum = fetchFromGitHub {
|
||||
name = "kvantum";
|
||||
owner = "catppuccin";
|
||||
repo = "Kvantum";
|
||||
rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc";
|
||||
sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk=";
|
||||
};
|
||||
|
||||
lazygit = fetchFromGitHub {
|
||||
name = "lazygit";
|
||||
owner = "catppuccin";
|
||||
@ -55,6 +71,38 @@ let
|
||||
rev = "0543c28e8af1a935f8c512ad9451facbcc17d8a8";
|
||||
hash = "sha256-OVihY5E+elPKag2H4RyWiSv+MdIqHtfGNM3/1u2ik6U=";
|
||||
};
|
||||
|
||||
plymouth = fetchFromGitHub {
|
||||
name = "plymouth";
|
||||
owner = "catppuccin";
|
||||
repo = "plymouth";
|
||||
rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c";
|
||||
hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE=";
|
||||
};
|
||||
|
||||
refind = fetchFromGitHub {
|
||||
name = "refind";
|
||||
owner = "catppuccin";
|
||||
repo = "refind";
|
||||
rev = "ff0b593c19bb9b469ee0ee36068b8d373f0fadc5";
|
||||
hash = "sha256-itUMo0lA23bJzH0Ndq7L2IaEYoVdNPYxbB/VWkRfRso=";
|
||||
};
|
||||
|
||||
rofi = fetchFromGitHub {
|
||||
name = "rofi";
|
||||
owner = "catppuccin";
|
||||
repo = "rofi";
|
||||
rev = "5350da41a11814f950c3354f090b90d4674a95ce";
|
||||
hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY=";
|
||||
};
|
||||
|
||||
waybar = fetchFromGitHub {
|
||||
name = "waybar";
|
||||
owner = "catppuccin";
|
||||
repo = "waybar";
|
||||
rev = "v1.0";
|
||||
hash = "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw=";
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.checkListOfEnum "${pname}: variant" validVariants [ variant ]
|
||||
@ -77,6 +125,9 @@ stdenvNoCC.mkDerivation {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
local capitalizedVariant=$(sed 's/^\(.\)/\U\1/' <<< "${variant}")
|
||||
local capitalizedAccent=$(sed 's/^\(.\)/\U\1/' <<< "${accent}")
|
||||
|
||||
'' + lib.optionalString (lib.elem "bat" themeList) ''
|
||||
mkdir -p $out/bat
|
||||
cp "${sources.bat}/Catppuccin-${variant}.tmTheme" "$out/bat/"
|
||||
@ -89,15 +140,41 @@ stdenvNoCC.mkDerivation {
|
||||
mkdir -p $out/bottom
|
||||
cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/"
|
||||
|
||||
'' + lib.optionalString (lib.elem "hyprland" themeList) ''
|
||||
mkdir -p $out/hyprland
|
||||
cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/"
|
||||
|
||||
'' + lib.optionalString (lib.elem "k9s" themeList) ''
|
||||
mkdir -p $out/k9s
|
||||
cp "${sources.k9s}/dist/${variant}.yml" "$out/k9s/"
|
||||
|
||||
'' + lib.optionalString (lib.elem "kvantum" themeList) ''
|
||||
mkdir -p $out/share/Kvantum
|
||||
cp -r ${sources.kvantum}/src/Catppuccin-"$capitalizedVariant"-"$capitalizedAccent" $out/share/Kvantum
|
||||
|
||||
'' + lib.optionalString (lib.elem "lazygit" themeList) ''
|
||||
mkdir -p $out/lazygit/{themes,themes-mergable}
|
||||
cp "${sources.lazygit}/themes/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes/"
|
||||
cp "${sources.lazygit}/themes-mergable/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes-mergable/"
|
||||
|
||||
'' + lib.optionalString (lib.elem "plymouth" themeList) ''
|
||||
mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
|
||||
cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant}
|
||||
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth
|
||||
|
||||
'' + lib.optionalString (lib.elem "rofi" themeList) ''
|
||||
mkdir -p $out/rofi
|
||||
cp ${sources.rofi}/basic/.local/share/rofi/themes/catppuccin-${variant}.rasi $out/rofi/
|
||||
|
||||
'' + lib.optionalString (lib.elem "refind" themeList) ''
|
||||
mkdir -p $out/refind/assets
|
||||
cp ${sources.refind}/${variant}.conf $out/refind/
|
||||
cp -r ${sources.refind}/assets/${variant} $out/refind/assets/
|
||||
|
||||
'' + lib.optionalString (lib.elem "waybar" themeList) ''
|
||||
mkdir -p $out/waybar
|
||||
cp ${sources.waybar}/${variant}.css $out/waybar/
|
||||
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
|
||||
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
|
||||
@@ -362,10 +360,8 @@
|
||||
if (EXISTS ${EXTERNAL_SRC_DIR}/git/openal AND STATIC_OPENAL)
|
||||
amsg("${CL_YEL}Building OpenAL static from external/git mirror${CL_RST}")
|
||||
ExternalProject_Add(OpenAL
|
||||
- SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/openal
|
||||
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/openal"
|
||||
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/openal_static
|
||||
- UPDATE_COMMAND ""
|
||||
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/openal"
|
||||
${EXTERNAL_DEFS}
|
||||
${CMAKE_EXTERNAL_DEFS}
|
||||
-DALSOFT_BACKEND_DSOUND=OFF
|
||||
@ -1,17 +0,0 @@
|
||||
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
|
||||
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
|
||||
@@ -419,12 +415,7 @@
|
||||
set(LUA_TAG "luajit51")
|
||||
if (EXISTS ${EXTERNAL_SRC_DIR}/git/luajit)
|
||||
ExternalProject_Add(luajit
|
||||
- SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/luajit
|
||||
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/luajit"
|
||||
- CONFIGURE_COMMAND ""
|
||||
- GIT_TAG "v2.1.0-beta3"
|
||||
- UPDATE_COMMAND ""
|
||||
- INSTALL_COMMAND ""
|
||||
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/luajit"
|
||||
BUILD_IN_SOURCE 1
|
||||
BUILD_COMMAND "${EXTMAKE_CMD}"
|
||||
DEFAULT_CC=${CMAKE_C_COMPILER}
|
||||
@ -1,15 +0,0 @@
|
||||
diff -Naur source-old/src/frameserver/decode/default/CMakeLists.txt source-new/src/frameserver/decode/default/CMakeLists.txt
|
||||
--- source-old/src/frameserver/decode/default/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ source-new/src/frameserver/decode/default/CMakeLists.txt 2021-10-29 12:01:31.989933725 -0300
|
||||
@@ -62,10 +62,8 @@
|
||||
if (STATIC_LIBUVC)
|
||||
pkg_check_modules(LIBUSB_1 REQUIRED libusb-1.0)
|
||||
ExternalProject_Add(libuvc
|
||||
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/frameserver/decode/libuvc"
|
||||
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/libuvc"
|
||||
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/libuvc_static"
|
||||
- UPDATE_COMMAND ""
|
||||
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/libuvc"
|
||||
${EXTERNAL_DEFS}
|
||||
${CMAKE_EXTERNAL_DEFS}
|
||||
-DBUILD_UVC_STATIC=ON
|
||||
@ -1,25 +0,0 @@
|
||||
{ fetchgit, fetchFromGitHub }:
|
||||
{
|
||||
letoram-openal-src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "openal";
|
||||
rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a";
|
||||
sha256 = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420=";
|
||||
};
|
||||
freetype-src = fetchgit {
|
||||
url = "git://git.sv.nongnu.org/freetype/freetype2.git";
|
||||
rev = "275b116b40c9d183d42242099ea9ff276985855b";
|
||||
sha256 = "sha256-YVyJttaXt19MSuD0pmazwxNKz65jcqqWvIgmDj4d3MA=";
|
||||
};
|
||||
libuvc-src = fetchFromGitHub {
|
||||
owner = "libuvc";
|
||||
repo = "libuvc";
|
||||
rev = "a4de53e7e265f8c6a64df7ccd289f318104e1916";
|
||||
hash = "sha256-a+Q0PTV4ujGnX55u49VJfMgQljZunZYRvkR0tIkGnHI=";
|
||||
};
|
||||
luajit-src = fetchgit {
|
||||
url = "https://luajit.org/git/luajit-2.0.git";
|
||||
rev = "899093a9e0fa5b16f27016381ef4b15529dadff2";
|
||||
sha256 = "sha256-bCi1ms78HCOOgStIY2tSGM9LUEX3qnwadLLeYWWu1KI=";
|
||||
};
|
||||
}
|
||||
@ -32,10 +32,12 @@
|
||||
, makeWrapper
|
||||
, mesa
|
||||
, mupdf
|
||||
, ninja
|
||||
, openal
|
||||
, openjpeg
|
||||
, pcre
|
||||
, pcre2
|
||||
, pkg-config
|
||||
, ruby
|
||||
, sqlite
|
||||
, tesseract
|
||||
, valgrind
|
||||
@ -44,28 +46,54 @@
|
||||
, xcbutil
|
||||
, xcbutilwm
|
||||
, xz
|
||||
, buildManPages ? true, ruby
|
||||
, buildManPages ? true
|
||||
, useBuiltinLua ? true
|
||||
, useStaticFreetype ? false
|
||||
, useStaticLibuvc ? false
|
||||
, useEspeak ? !stdenv.isDarwin
|
||||
, useStaticLibuvc ? true
|
||||
, useStaticOpenAL ? true
|
||||
, useStaticSqlite ? false
|
||||
, useStaticSqlite ? true
|
||||
, useTracy ? true
|
||||
}:
|
||||
|
||||
let
|
||||
cmakeFeatureFlag = feature: flag:
|
||||
"-D${feature}=${if flag then "on" else "off"}";
|
||||
allSources = {
|
||||
letoram-arcan-src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "arcan";
|
||||
rev = "85c8564bdbee8468a5716bea64daf1d78937ffbf";
|
||||
hash = "sha256-etmj1vpZTjxbmr4UiLBEK57WFJ1NeEnY5WfBYajX3ls=";
|
||||
};
|
||||
letoram-openal-src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "openal";
|
||||
rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a";
|
||||
hash = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420=";
|
||||
};
|
||||
libuvc-src = fetchFromGitHub {
|
||||
owner = "libuvc";
|
||||
repo = "libuvc";
|
||||
rev = "68d07a00e11d1944e27b7295ee69673239c00b4b";
|
||||
hash = "sha256-IdV18mnPTDBODpS1BXl4ulkFyf1PU2ZmuVGNOIdQwzE=";
|
||||
};
|
||||
luajit-src = fetchFromGitHub {
|
||||
owner = "LuaJIT";
|
||||
repo = "LuaJIT";
|
||||
rev = "656ecbcf8f669feb94e0d0ec4b4f59190bcd2e48";
|
||||
hash = "sha256-/gGQzHgYuWGqGjgpEl18Rbh3Sx2VP+zLlx4N9/hbYLc=";
|
||||
};
|
||||
tracy-src = fetchFromGitHub {
|
||||
owner = "wolfpld";
|
||||
repo = "tracy";
|
||||
rev = "93537dff336e0796b01262e8271e4d63bf39f195";
|
||||
hash = "sha256-FNB2zTbwk8hMNmhofz9GMts7dvH9phBRVIdgVjRcyQM=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
|
||||
version = "0.6.2.1";
|
||||
pname = "arcan";
|
||||
version = "0.6.2.1-unstable-2023-10-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "arcan";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-7H3fVSsW5VANLqwhykY+Q53fPjz65utaGksh/OpZnJM=";
|
||||
};
|
||||
src = allSources.letoram-arcan-src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -77,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
espeak
|
||||
ffmpeg
|
||||
file
|
||||
freetype
|
||||
@ -100,13 +127,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libvncserver
|
||||
libxcb
|
||||
libxkbcommon
|
||||
lua5_1
|
||||
luajit
|
||||
mesa
|
||||
mupdf.dev
|
||||
openal
|
||||
openjpeg.dev
|
||||
pcre
|
||||
pcre2
|
||||
sqlite
|
||||
tesseract
|
||||
valgrind
|
||||
@ -115,40 +140,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xcbutil
|
||||
xcbutilwm
|
||||
xz
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Nixpkgs-specific: redirect vendoring
|
||||
./000-openal.patch
|
||||
./001-luajit.patch
|
||||
./002-libuvc.patch
|
||||
]
|
||||
++ lib.optionals useEspeak [
|
||||
espeak
|
||||
];
|
||||
|
||||
# Emulate external/git/clone.sh
|
||||
postUnpack = let
|
||||
inherit (import ./clone-sources.nix { inherit fetchFromGitHub fetchgit; })
|
||||
letoram-openal-src freetype-src libuvc-src luajit-src;
|
||||
inherit (allSources)
|
||||
letoram-openal-src libuvc-src luajit-src tracy-src;
|
||||
prepareSource = flag: source: destination:
|
||||
lib.optionalString flag ''
|
||||
cp -va ${source}/ ${destination}
|
||||
chmod --recursive 744 ${destination}
|
||||
'';
|
||||
in
|
||||
''
|
||||
pushd $sourceRoot/external/git/
|
||||
''
|
||||
+ (lib.optionalString useStaticOpenAL ''
|
||||
cp -a ${letoram-openal-src}/ openal
|
||||
chmod --recursive 744 openal
|
||||
'')
|
||||
+ (lib.optionalString useStaticFreetype ''
|
||||
cp -a ${freetype-src}/ freetype
|
||||
chmod --recursive 744 freetype
|
||||
'')
|
||||
+ (lib.optionalString useStaticLibuvc ''
|
||||
cp -a ${libuvc-src}/ libuvc
|
||||
chmod --recursive 744 libuvc
|
||||
'')
|
||||
+ (lib.optionalString useBuiltinLua ''
|
||||
cp -a ${luajit-src}/ luajit
|
||||
chmod --recursive 744 luajit
|
||||
'') +
|
||||
''
|
||||
+ prepareSource useStaticOpenAL letoram-openal-src "openal"
|
||||
+ prepareSource useStaticLibuvc libuvc-src "libuvc"
|
||||
+ prepareSource useBuiltinLua luajit-src "luajit"
|
||||
+ prepareSource useTracy tracy-src "tracy"
|
||||
+ ''
|
||||
popd
|
||||
'';
|
||||
|
||||
@ -156,11 +170,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace ./src/platform/posix/paths.c \
|
||||
--replace "/usr/bin" "$out/bin" \
|
||||
--replace "/usr/share" "$out/share"
|
||||
|
||||
substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID"
|
||||
substituteInPlace ./src/CMakeLists.txt \
|
||||
--replace "SETUID" "# SETUID"
|
||||
'';
|
||||
|
||||
# INFO: Arcan build scripts require the manpages to be generated before the
|
||||
# INFO: Arcan build scripts require the manpages to be generated *before* the
|
||||
# `configure` phase
|
||||
preConfigure = lib.optionalString buildManPages ''
|
||||
pushd doc
|
||||
@ -169,17 +183,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_PRESET=everything"
|
||||
# The upstream project recommends tagging the distribution
|
||||
"-DDISTR_TAG=Nixpkgs"
|
||||
"-DENGINE_BUILDTAG=${finalAttrs.version}"
|
||||
(cmakeFeatureFlag "HYBRID_SDL" true)
|
||||
(cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua)
|
||||
(cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua)
|
||||
(cmakeFeatureFlag "STATIC_FREETYPE" useStaticFreetype)
|
||||
(cmakeFeatureFlag "STATIC_LIBUVC" useStaticLibuvc)
|
||||
(cmakeFeatureFlag "STATIC_OPENAL" useStaticOpenAL)
|
||||
(cmakeFeatureFlag "STATIC_SQLite3" useStaticSqlite)
|
||||
(lib.cmakeFeature "DISTR_TAG" "Nixpkgs")
|
||||
(lib.cmakeFeature "ENGINE_BUILDTAG" finalAttrs.src.rev)
|
||||
(lib.cmakeFeature "BUILD_PRESET" "everything")
|
||||
(lib.cmakeBool "BUILTIN_LUA" useBuiltinLua)
|
||||
(lib.cmakeBool "DISABLE_JIT" useBuiltinLua)
|
||||
(lib.cmakeBool "STATIC_LIBUVC" useStaticLibuvc)
|
||||
(lib.cmakeBool "STATIC_SQLite3" useStaticSqlite)
|
||||
(lib.cmakeBool "ENABLE_TRACY" useTracy)
|
||||
"../src"
|
||||
];
|
||||
|
||||
@ -187,7 +199,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"format"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://arcan-fe.com/";
|
||||
description = "Combined Display Server, Multimedia Framework, Game Engine";
|
||||
longDescription = ''
|
||||
@ -196,8 +208,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
e.g. game development, real-time streaming video, monitoring and
|
||||
surveillance, up to and including desktop compositors and window managers.
|
||||
'';
|
||||
license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ];
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
license = with lib.licenses; [ bsd3 gpl2Plus lgpl2Plus ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cat9";
|
||||
version = "unstable-2023-02-11";
|
||||
version = "unstable-2023-06-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "cat9";
|
||||
rev = "1da9949c728e0734a883d258a8a05ca0e3dd5897";
|
||||
hash = "sha256-kit+H9u941oK2Ko8S/1w+3DN6ktnfBtd+3s9XgU+qOQ=";
|
||||
rev = "4d8a0c539a5c756acada96fd80e7eb3b9554ac05";
|
||||
hash = "sha256-T3RPuldKTzHm0EdfdMOtHv9kcr9oE9YQgdzv/jjPPnc=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "durden";
|
||||
version = "unstable-2023-01-19";
|
||||
version = "unstable-2023-08-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "durden";
|
||||
rev = "bba1bcc8992ea5826fd3b1c798cb271141b7c8e2";
|
||||
hash = "sha256-PK9ObMJ3SbHZLnLjxk4smh5N0WaM/2H/Y+T5vKBdHWA=";
|
||||
rev = "728d7fc3292cc162b1cea505c8a71512b2e84925";
|
||||
hash = "sha256-UL36JeppnoFDdzdsJMsWKJL58ioz9eOaNEZp/7DGV9w=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalPackages: {
|
||||
pname = "pipeworld";
|
||||
version = "unstable-2023-02-05";
|
||||
version = "unstable-2023-03-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "pipeworld";
|
||||
rev = "58b2e9fe15ef0baa4b04c27079bfa386ec62b28e";
|
||||
hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM=";
|
||||
rev = "9ea79f72ad500fe78b9f46e680be87eaac3bfb0e";
|
||||
hash = "sha256-/cjse6XXrdLoUB35GLgl871qINOm4SvKPTbfoBceLu0=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -12,15 +12,15 @@
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "budgie-desktop-view";
|
||||
version = "1.2.1";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-USsySJuDov2oe9UXyzACBAyYIRLKSXOMXdia8Ix/8TE=";
|
||||
repo = "budgie-desktop-view";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-k6VfAGWvUarhBFnREasOvWH3M9uuT5SFUpMFmKo1fmE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -38,16 +38,12 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
substituteInPlace ../scripts/mesonPostInstall.sh --replace "update-desktop-database -q" "update-desktop-database $out/share/applications"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "The official Budgie desktop icons application/implementation";
|
||||
homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop-view";
|
||||
mainProgram = "org.buddiesofbudgie.budgie-desktop-view";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
license = licenses.asl20;
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ federicoschonborn ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-terminal";
|
||||
version = "6.0.7";
|
||||
version = "6.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-vXykC/x9F+cPTSqKTWimUhnr+IsfoeQncdj75sXG4/g=";
|
||||
hash = "sha256-7Yyw4aw+44JX9SKuwmJSrLz04WETvs3E3cnt0/O+Ls0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
@ -64,6 +64,12 @@ python3Packages.buildPythonApplication rec {
|
||||
# Disable check because there is no test in the source distribution
|
||||
doCheck = false;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "${pname}-"; };
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:
|
||||
let
|
||||
version = "2201.6.0";
|
||||
version = "2201.8.1";
|
||||
codeName = "swan-lake";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "ballerina";
|
||||
@ -8,7 +8,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
|
||||
sha256 = "sha256-yttRswqNq8Tam1OwnC9klwrryDDqdHMzzRs9T9pYlnU=";
|
||||
hash = "sha256-tfsaZnZOsKVm56s3nNI/27wrbVg5fcJ8tW2THSQ8ec0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chez-scheme";
|
||||
version = "9.6.2";
|
||||
version = "9.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-cUaVeJ4brTUY5s1fvIroIE92ED1a0roFo/HAY+stXQI=";
|
||||
hash = "sha256-9YJ2gvolnEeXX/4Hh4X7Vh5KXFT3ZDMe9mwyEyhDaF0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin cctools;
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "erg";
|
||||
version = "0.6.22";
|
||||
version = "0.6.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erg-lang";
|
||||
repo = "erg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dUGwSNN6eAMXIaIn3/xQxZAcyH1tTOrj4oRMkkI1KXU=";
|
||||
hash = "sha256-7UzITXvEpzMdKj9YIsuz6uYBLtk//OmTlnUegTLu+HA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TLEFy4r+CA8XcPYw5cX7qCIRrj/8q9Z1YOnkAKpjwug=";
|
||||
cargoHash = "sha256-A2HjobYgM22CIWYJusJUfPObNHlhN7y1lsv2mVzvluk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }:
|
||||
|
||||
let
|
||||
version = "weekly.2023.19";
|
||||
version = "weekly.2023.42";
|
||||
ptraceSubstitution = ''
|
||||
#include <sys/types.h>
|
||||
#include <sys/ptrace.h>
|
||||
@ -9,12 +9,12 @@ let
|
||||
# Required for bootstrap.
|
||||
vc = stdenv.mkDerivation {
|
||||
pname = "v.c";
|
||||
version = "unstable-2023-05-14";
|
||||
version = "unstable-2023-10-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vc";
|
||||
rev = "f7c2b5f2a0738d0d236161c9de9f31dd0280ac86";
|
||||
sha256 = "sha256-xU3TvyNgc0o4RCsHtoC6cZTNaue2yuAiolEOvP37TKA=";
|
||||
rev = "bbfdece2ef5cab8a52b03c4df1ca0f803639069b";
|
||||
hash = "sha256-UdifiUDTivqJ94NJB25mF/xXeiEAE55QaIUwWwdAllQ=";
|
||||
};
|
||||
|
||||
# patch the ptrace reference for darwin
|
||||
@ -30,8 +30,8 @@ let
|
||||
markdown = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "markdown";
|
||||
rev = "6e970bd0a7459ad7798588f1ace4aa46c5e789a2";
|
||||
hash = "sha256-hFf7c8ZNMU1j7fgmDakuO7tBVr12Wq0dgQddJnkMajE=";
|
||||
rev = "3a173bee57a48dcfc1c0177555e45116befac48e";
|
||||
hash = "sha256-TWiCUMzAzHidtzXEYtUQ7uuksW+EIjE/fZ+s2Mr+uWI=";
|
||||
};
|
||||
boehmgcStatic = boehmgc.override {
|
||||
enableStatic = true;
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation {
|
||||
owner = "vlang";
|
||||
repo = "v";
|
||||
rev = version;
|
||||
sha256 = "sha256-fHn1z2q3LmSycCOa1ii4DoHvbEW4uJt3Psq3/VuZNVQ=";
|
||||
hash = "sha256-sQ3M6tMufL560lvtWoa5f5MpOT4D8K5uq4kDPHNmUog=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ glfw freetype openssl ]
|
||||
|
||||
@ -7,12 +7,14 @@ mkCoqDerivation {
|
||||
owner = "arthuraa";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.11" "8.18"; out = "0.1.1"; }
|
||||
defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [
|
||||
{ cases = [(range "8.17" "8.18") (isGe "2.0.0")] ; out = "0.2.0"; }
|
||||
{ cases = [(range "8.11" "8.18") (isLe "2.0.0")] ; out = "0.1.1"; }
|
||||
] null;
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM=";
|
||||
release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI=";
|
||||
release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh";
|
||||
|
||||
|
||||
20
pkgs/development/coq-modules/vcfloat/default.nix
Normal file
20
pkgs/development/coq-modules/vcfloat/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ lib, mkCoqDerivation, coq, interval, compcert, flocq, bignums, version ? null }:
|
||||
|
||||
with lib; mkCoqDerivation {
|
||||
pname = "vcfloat";
|
||||
owner = "VeriNum";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.16" "8.17"; out = "2.1.1"; }
|
||||
] null;
|
||||
release."2.1.1".sha256 = "sha256-bd/XSQhyFUAnSm2bhZEZBWB6l4/Ptlm9JrWu6w9BOpw=";
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
propagatedBuildInputs = [ interval compcert flocq bignums ];
|
||||
|
||||
meta = {
|
||||
description = "A tool for Coq proofs about floating-point round-off error";
|
||||
maintainers = with maintainers; [ quinn-dougherty ];
|
||||
license = licenses.lgpl3Plus;
|
||||
};
|
||||
}
|
||||
@ -12,13 +12,10 @@ rustPlatform.buildRustPackage rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
cargoHash = "sha256-nFKk6T3S86lPxn/JCEid2Xd9c5zQPOMFcKTi6eM89uE=";
|
||||
|
||||
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
|
||||
cargoPatches = [
|
||||
# this patch is necessary until cargo-auditable is bumped on the rust platform
|
||||
./patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From a59bb5f9deeff156bd7bc9d22bc199e0f902b7dc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
|
||||
<ereslibre@ereslibre.es>
|
||||
Date: Mon, 4 Sep 2023 15:25:15 +0200
|
||||
Subject: [PATCH] Use `dep:` dependency due to `cargo-auditable` limitation
|
||||
|
||||
`cargo-auditable` fails to process the current `Cargo.toml` as it
|
||||
is (cargo/rustc 1.72.0 is able to process this crate without any
|
||||
issues).
|
||||
---
|
||||
crates/c-api/Cargo.toml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml
|
||||
index a464c0dbd..1e793432c 100644
|
||||
--- a/crates/c-api/Cargo.toml
|
||||
+++ b/crates/c-api/Cargo.toml
|
||||
@@ -37,4 +37,4 @@ default = ['jitdump', 'wat', 'wasi', 'cache', 'parallel-compilation']
|
||||
jitdump = ["wasmtime/jitdump"]
|
||||
cache = ["wasmtime/cache"]
|
||||
parallel-compilation = ['wasmtime/parallel-compilation']
|
||||
-wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'cap-std', 'wasi-common']
|
||||
+wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'dep:cap-std', 'wasi-common']
|
||||
--
|
||||
2.40.1
|
||||
|
||||
54
pkgs/development/libraries/applet-window-appmenu/default.nix
Normal file
54
pkgs/development/libraries/applet-window-appmenu/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, kcoreaddons
|
||||
, kdeclarative
|
||||
, kdecoration
|
||||
, plasma-framework
|
||||
, plasma-workspace
|
||||
, libSM
|
||||
, qtx11extras
|
||||
, kwindowsystem
|
||||
, libdbusmenu
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "applet-window-appmenu";
|
||||
version = "unstable-2022-06-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psifidotos";
|
||||
repo = "applet-window-appmenu";
|
||||
rev = "1de99c93b0004b80898081a1acfd1e0be807326a";
|
||||
hash = "sha256-PLlZ2qgdge8o1mZOiPOXSmTQv1r34IUmWTmYFGEzNTI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kcoreaddons
|
||||
kdeclarative
|
||||
kdecoration
|
||||
kwindowsystem
|
||||
plasma-framework
|
||||
plasma-workspace
|
||||
libSM
|
||||
qtx11extras
|
||||
libdbusmenu
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plasma 5 applet in order to show window menu in your panels";
|
||||
homepage = "https://github.com/psifidotos/applet-window-appmenu";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ greydot ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "actor-framework";
|
||||
version = "0.19.0";
|
||||
version = "0.19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actor-framework";
|
||||
repo = "actor-framework";
|
||||
rev = version;
|
||||
hash = "sha256-pGX8BjDupJb7rmaxig0XX9RCKiIw2GjM4TVmcB5HJ+I=";
|
||||
hash = "sha256-Qi3nyUSwrYBy8lCP+R6/u/WtnZJcgSwb07pZVScAzcU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
|
||||
"-DCAF_ENABLE_EXAMPLES:BOOL=OFF"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation";
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkTarget = "test";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user