mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 04:28:40 +03:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
c83509f73d
@ -3084,6 +3084,12 @@
|
||||
fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715";
|
||||
}];
|
||||
};
|
||||
drzoidberg = {
|
||||
email = "jakob@mast3rsoft.com";
|
||||
github = "jakobneufeld";
|
||||
githubId = 24791219;
|
||||
name = "Jakob Neufeld";
|
||||
};
|
||||
dschrempf = {
|
||||
name = "Dominik Schrempf";
|
||||
email = "dominik.schrempf@gmail.com";
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#! @runtimeShell@ -e
|
||||
# shellcheck shell=bash
|
||||
|
||||
# Shows the usage of this command to the user
|
||||
|
||||
@ -29,12 +30,12 @@ while [ $# -gt 0 ]; do
|
||||
nixBuildArgs+=("--option" "$1" "$2"); shift
|
||||
;;
|
||||
*)
|
||||
if [ ! -z "$networkExpr" ]; then
|
||||
if [ -n "$networkExpr" ]; then
|
||||
echo "Network expression already set!"
|
||||
showUsage
|
||||
exit 1
|
||||
fi
|
||||
networkExpr="$(readlink -f $1)"
|
||||
networkExpr="$(readlink -f "$1")"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -49,4 +50,4 @@ fi
|
||||
|
||||
# Build a network of VMs
|
||||
nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
|
||||
--argstr networkExpr $networkExpr "${nixBuildArgs[@]}"
|
||||
--argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}"
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#! @runtimeShell@
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -e
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#! @runtimeShell@
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -e
|
||||
shopt -s nullglob
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#! @runtimeShell@
|
||||
# shellcheck shell=bash
|
||||
|
||||
case "$1" in
|
||||
-h|--help)
|
||||
|
||||
@ -74,6 +74,8 @@ in
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ])
|
||||
(mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ])
|
||||
(mkRenamedOptionModule [ "nix" "daemonIONiceLevel" ] [ "nix" "daemonIOSchedPriority" ])
|
||||
(mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.")
|
||||
];
|
||||
|
||||
###### interface
|
||||
@ -546,7 +548,7 @@ in
|
||||
[ nix
|
||||
pkgs.nix-info
|
||||
]
|
||||
++ optional (config.programs.bash.enableCompletion && !versionAtLeast nixVersion "2.4pre") pkgs.nix-bash-completions;
|
||||
++ optional (config.programs.bash.enableCompletion) pkgs.nix-bash-completions;
|
||||
|
||||
environment.etc."nix/nix.conf".source = nixConf;
|
||||
|
||||
|
||||
@ -13,8 +13,8 @@ let
|
||||
sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2021.1.1.16"; # "Android Studio Bumblebee (2021.1.1) Beta 3"
|
||||
sha256Hash = "pgmBWzq/5RHJTc41kzB43tbsjvrWx9BJ7UKsR8AO0V4=";
|
||||
version = "2021.1.1.17"; # "Android Studio Bumblebee (2021.1.1) Beta 4"
|
||||
sha256Hash = "5WLUgCmdrK0PArc4eQQTNbEokq4DReKRwsZOWKb+Td4=";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "2021.2.1.3"; # "Android Studio Chipmunk (2021.2.1) Canary 3"
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "setzer";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvfosammmm";
|
||||
repo = "Setzer";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rcx2c07jg1ij81pnvg3px49hfbjmkagn68d3gp79z3gcajbp2av";
|
||||
sha256 = "sha256-uh6mXXJP/EpfvHTXL7PH+Yd1F5Q+6B01ns4vRr/2Xqo=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@ -53,6 +53,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pyxdg
|
||||
pdfminer
|
||||
pycairo
|
||||
pexpect
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -18,13 +18,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-15";
|
||||
version = "7.1.0-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
sha256 = "sha256-M5BhCb5caknohwk0oncJBCBJs32p0EdNs4dNqRfDRYc=";
|
||||
sha256 = "sha256-souH5Fop4ss1ysaYylHcykoeB0HvMtqU51xggKoRFDM=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "stretchly";
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
|
||||
sha256 = "sha256-F6p+g0yuDMpNq+cVgA3ZhUwCIiIU1QfYM90lmaNnRWw=";
|
||||
sha256 = "sha256-/v74vDGxD5iiOPeBXPAaV42JpyBjeJSO/Lk88pCkDng=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/${pname}/
|
||||
mv resources/app.asar $out/share/${pname}/
|
||||
mv resources/app.asar* $out/share/${pname}/
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://hovancik.net/stretchly";
|
||||
downloadPage = "https://hovancik.net/stretchly/downloads/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ _1000101 ];
|
||||
maintainers = with maintainers; [ _1000101 oxalica ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -93,11 +93,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.31.91";
|
||||
version = "1.32.113";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "LuzflA96UQehLHUVYdPDTXs+YuFLEkpzTdO2liGrWtE=";
|
||||
sha256 = "PucDKfNPwos5LKzftdXR9Hkkf1UDzHULgyFIdjPiI4g=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pidgin-opensteamworks";
|
||||
version = "1.7";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EionRobb";
|
||||
repo = "pidgin-opensteamworks";
|
||||
rev = version;
|
||||
sha256 = "0zxd45g9ycw5kmm4i0800jnqg1ms2gbqcld6gkyv6n3ac1wxizpj";
|
||||
sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/steam-mobile";
|
||||
|
||||
47
pkgs/applications/office/clockify/default.nix
Normal file
47
pkgs/applications/office/clockify/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ stdenv, lib, fetchurl, dpkg, makeWrapper, electron }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clockify";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20211118160803/https://clockify-resources.s3.eu-central-1.amazonaws.com/downloads/Clockify_Setup.deb";
|
||||
sha256 = "sha256-eVZ3OqM1eoWfST7Qu9o8VmLm8ntD+ETf/0aes6RY4Y8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
|
||||
substituteInPlace $out/share/applications/clockify.desktop \
|
||||
--replace "/opt/Clockify" $out/bin
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/clockify \
|
||||
--add-flags $out/opt/Clockify/resources/app.asar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free time tracker and timesheet app that lets you track work hours across projects";
|
||||
homepage = "https://clockify.me";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
};
|
||||
}
|
||||
@ -19,16 +19,16 @@ let
|
||||
maintainers = with maintainers; [ fliegendewurst ];
|
||||
};
|
||||
|
||||
version = "0.48.6";
|
||||
version = "0.48.7";
|
||||
|
||||
desktopSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
sha256 = "1n7gm6mwzf5yyk8cpn70029p1iiv26bypyfi42sx14yyjvlny4rm";
|
||||
sha256 = "16clrn89mq2n30hb50y45s6qn5l7n1hj4b124wjxrkmmwpdbjwad";
|
||||
};
|
||||
|
||||
serverSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||
sha256 = "0z7cbw11mqf2mfv6ixnczg2i4jcdpvryzl0521ai26gq42jyyy0r";
|
||||
sha256 = "18zwplcai4s82pdy3l30862jdl22311qh78anrjz29fm6srx1y9l";
|
||||
};
|
||||
|
||||
in {
|
||||
|
||||
@ -104,7 +104,8 @@ in stdenv.mkDerivation rec {
|
||||
makeWrapper "$(command -v mono)" $out/bin/picoscope \
|
||||
--add-flags $out/lib/PicoScope.GTK.exe \
|
||||
--prefix MONO_PATH : "$MONO_PATH" \
|
||||
--prefix LD_LIBRARY_PATH : "$MONO_PATH"
|
||||
--prefix LD_LIBRARY_PATH : "$MONO_PATH" \
|
||||
--set LANG C
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -6,64 +6,64 @@
|
||||
"version": "1.1.27-1r153"
|
||||
},
|
||||
"libpicoipp": {
|
||||
"sha256": "87ae49cd5e8dda4a73a835b95ea13e4c3fc4d1c4c9d6495c9affdf6fa6b1b4aa",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.3.0-4r121_amd64.deb",
|
||||
"version": "1.3.0-4r121"
|
||||
"sha256": "0e414ad547f506a39ff11a64772baec923e54f8ca98b81fc9b9cbd19ed573b22",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.3.0-4r130_amd64.deb",
|
||||
"version": "1.3.0-4r130"
|
||||
},
|
||||
"libps2000": {
|
||||
"sha256": "792e506c08cebbd617e833e1547d3e5a13a186f93cea3f84608b7ed9451fb077",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.75-3r2957_amd64.deb",
|
||||
"version": "3.0.75-3r2957"
|
||||
"sha256": "d1e94148719a03b70f233cea9a686ed48be03224f2931c9cd282571819a780c7",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.76-3r2981_amd64.deb",
|
||||
"version": "3.0.76-3r2981"
|
||||
},
|
||||
"libps2000a": {
|
||||
"sha256": "f31b3a8e9c6af14a59e348e4b302f12f582cdb08a47a3c04d8a6a612b4630305",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.75-5r2957_amd64.deb",
|
||||
"version": "2.1.75-5r2957"
|
||||
"sha256": "c665b70c04203c98bb1b509830ec522f58906b2f393f35c1b4f9c27217ac3572",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.76-5r2981_amd64.deb",
|
||||
"version": "2.1.76-5r2981"
|
||||
},
|
||||
"libps3000": {
|
||||
"sha256": "27dce3c924bb0169768a4964ce567b4a18ce74079537ca1fcba61e9234691580",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.75-3r2957_amd64.deb",
|
||||
"version": "4.0.75-3r2957"
|
||||
"sha256": "dbb9f9afdc694c4451e652f22a4c4c67ef609407f45229d26330ce7cfbb02b1c",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.76-3r2981_amd64.deb",
|
||||
"version": "4.0.76-3r2981"
|
||||
},
|
||||
"libps3000a": {
|
||||
"sha256": "31cf00ce136526af6e8b211a44a56b221d137de6eaec4d6fd7f31593b4245d62",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.75-6r2957_amd64.deb",
|
||||
"version": "2.1.75-6r2957"
|
||||
"sha256": "5ab3daadc5d804b224215d138ca94abecc3c311bb91624638e2758ac2a490d25",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.76-6r2981_amd64.deb",
|
||||
"version": "2.1.76-6r2981"
|
||||
},
|
||||
"libps4000": {
|
||||
"sha256": "c976f09647f1fd2c980aafd1efe7f557bfc7c283fb9c135725c38dd59cc297e9",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.75-2r2957_amd64.deb",
|
||||
"version": "2.1.75-2r2957"
|
||||
"sha256": "13504936207f1a7410f726c93358bb21c0c0cd1bd8b473332308a345ff6692c7",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.76-2r2981_amd64.deb",
|
||||
"version": "2.1.76-2r2981"
|
||||
},
|
||||
"libps4000a": {
|
||||
"sha256": "727f24fa74759385902d41d52a26a4636b3e3f08a8743901d15cc49622207b97",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.75-2r2957_amd64.deb",
|
||||
"version": "2.1.75-2r2957"
|
||||
"sha256": "196ccce96e8cf29f5168cda83748857172ae43dc2b990adbacb3327511784492",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.76-2r2981_amd64.deb",
|
||||
"version": "2.1.76-2r2981"
|
||||
},
|
||||
"libps5000": {
|
||||
"sha256": "3237c1dfdb384079b7039d2b4a8e0b0126e804830b29d60e89ae018182667edb",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.75-3r2957_amd64.deb",
|
||||
"version": "2.1.75-3r2957"
|
||||
"sha256": "1793180d4067df12080ba7b01cbdf38397c2931a7f4915f13dbdb9295cc77cb3",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.76-3r2981_amd64.deb",
|
||||
"version": "2.1.76-3r2981"
|
||||
},
|
||||
"libps5000a": {
|
||||
"sha256": "27947f8461a16cf59d64cd23d7a78ddd27826e38dfe9fca3902e3b553591fb19",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.75-5r2957_amd64.deb",
|
||||
"version": "2.1.75-5r2957"
|
||||
"sha256": "b08a73f43bdcfa2bc02d01f398147da9b8cf2599477144b5a2b2af924d0bf0e9",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.76-5r2981_amd64.deb",
|
||||
"version": "2.1.76-5r2981"
|
||||
},
|
||||
"libps6000": {
|
||||
"sha256": "d65e923db969e306fb9f3f3892229a297d6187574d901dde44375270cc1e1404",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.75-6r2957_amd64.deb",
|
||||
"version": "2.1.75-6r2957"
|
||||
"sha256": "dda0fcb8b346f77a715053b52ad9e26b323991f8336001de7ff1bb6d04c716b4",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.76-6r2981_amd64.deb",
|
||||
"version": "2.1.76-6r2981"
|
||||
},
|
||||
"libps6000a": {
|
||||
"sha256": "eff8644ad44f9cc1cf9052e27786a1480a4ab599766c1c01e370fef40a76b224",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.75-0r2957_amd64.deb",
|
||||
"version": "1.0.75-0r2957"
|
||||
"sha256": "786e5772055500e2e445ddfd5402fed359a9afa54177bd731912d24522729004",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.76-0r2981_amd64.deb",
|
||||
"version": "1.0.76-0r2981"
|
||||
},
|
||||
"picoscope": {
|
||||
"sha256": "3d2a0e360c8143fc03c29b394c16bfc2387164e33099a46b6905af992cfab440",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.83-1r9320_amd64.deb",
|
||||
"version": "7.0.83-1r9320"
|
||||
"sha256": "12afae7992b9d60c93e5e39c7fe3f93955be3bdff554b52894064d5f320347f4",
|
||||
"url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.86-1r9656_amd64.deb",
|
||||
"version": "7.0.86-1r9656"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
/*
|
||||
This derivation is impure: it relies on an Xcode toolchain being installed
|
||||
@ -8,15 +8,15 @@
|
||||
option set to `relaxed` or `false`.
|
||||
*/
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iterm2";
|
||||
version = "3.4.0";
|
||||
version = "3.4.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnachman";
|
||||
repo = "iTerm2";
|
||||
rev = "v${version}";
|
||||
sha256 = "09nhrmi25zxw3vp0wlib9kjr3p1j6am2zpwimdzqn0c80fq1lwvi";
|
||||
sha256 = "sha256-GOUdXBQCvM0oJ2/3zgKqDpfyCkHNwd1Qdopg5Mpyekg=";
|
||||
};
|
||||
|
||||
patches = [ ./disable_updates.patch ];
|
||||
|
||||
@ -3,26 +3,28 @@
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, installShellFiles
|
||||
, DiskArbitration
|
||||
, Foundation
|
||||
, libiconv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PkVZag/h1KzOWsE6+61HIixs+DldrGk9khlZy7DEbC8=";
|
||||
sha256 = "sha256-aiWVaqwJGjLyv/ZJU4g1KuBC9zbnBEc/vdNADGPKgxo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-o1HyPJ81g9fLA7CKQNKg1EctoIh3W0uGzKF2YNE+Ado=";
|
||||
cargoSha256 = "sha256-lp9XzZQZJpjhsanZMky3RwkjM7ICq7dSb4PHdstwMxQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name delta.bash etc/completion/completion.bash
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cagebreak";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-repo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-tWfHJajAOYZJ73GckZWWTdVz75YmHA7t/qDhM7+tJgk=";
|
||||
hash = "sha256-YaLGRlvppTUCSHFlt3sEfHgN3pYHuc5oGt3dt0DDw3I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -63,14 +63,12 @@ stdenv.mkDerivation rec {
|
||||
"-Dxwayland=${lib.boolToString withXwayland}"
|
||||
];
|
||||
|
||||
# TODO: investigate why is this happening
|
||||
postPatch = ''
|
||||
# TODO: investigate why is this happening
|
||||
sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -d $out/share/cagebreak/
|
||||
install -m644 $src/examples/config $out/share/cagebreak/
|
||||
# Patch cagebreak to read its default configuration from $out/share/cagebreak
|
||||
sed -i "s|/etc/xdg/cagebreak|$out/share/cagebreak|" meson.build cagebreak.c
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString withXwayland ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "spdx-license-list-data";
|
||||
version = "3.14";
|
||||
version = "3.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spdx";
|
||||
repo = "license-list-data";
|
||||
rev = "v${version}";
|
||||
sha256 = "07fl31732bvcmm93fqrpa7pfq5ynxc1fpd8n9w2iah39lyz49sjm";
|
||||
sha256 = "0r88j00shmhayfq8avswaxsaj1my1vq540rg0srma29862vrjpfk";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,32 +1,34 @@
|
||||
{ lib, stdenv, fetchurl, gtk-engine-murrine }:
|
||||
{ lib, stdenv, fetchurl, unzip, gtk-engine-murrine }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sweet";
|
||||
version = "2.0";
|
||||
version = "3.0";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar-Blue.tar.xz";
|
||||
sha256 = "028pk07im7pab8a2vh3bvjm8jg37dpvn4c1mwn6vhb6wcr9v5c75";
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar-Blue.zip";
|
||||
sha256 = "sha256-6ZrjH5L7Yox7riR+2I7vVbFoG4k7xHGyOq1OnkllyiY";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar.tar.xz";
|
||||
sha256 = "0zmdmqndj65kr43g3z57blrmv0y856zlfprm6y45zbf4xz3ybkg6";
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar.zip";
|
||||
sha256 = "sha256-FAbf682YJCCt8NKSdFoaFLwxLDU1aCcTgNdlybZtPMo=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Dark.tar.xz";
|
||||
sha256 = "02sw664fkrfpsygspq8fn4zgk8rxs9rd29nnx6nyvkji68mb51s6";
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Dark.zip";
|
||||
sha256 = "sha256-t6fczOnKwi4B9hSFhHQaQ533o7MFL+7HPtUJ/p2CIXM=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-mars.tar.xz";
|
||||
sha256 = "14rl3il61jyqwiqlpgbh397q3rcs7jcf2pvr2763ar5a9czmy8h6";
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-mars.zip";
|
||||
sha256 = "sha256-QGkkpUqkxGPM1DXrvToB3taajk7vK3rqibQF2M4N9i0=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet.tar.xz";
|
||||
sha256 = "0rza3yxwj256ibqimymjhd6lpjzr7fkhggq0ijdg1wab3q91x66q";
|
||||
url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet.zip";
|
||||
sha256 = "sha256-1qVC2n7ypN1BFuSzBpbY7QzJUzF1anYNAVcMkNpGTMM";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
, meson
|
||||
, ninja
|
||||
, packagekit
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
, gnome-menus
|
||||
, libgee
|
||||
, wrapGAppsHook
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, granite
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = with lib; {
|
||||
description = "Photo viewer and organizer designed for elementary OS";
|
||||
homepage = "https://github.com/elementary/photos";
|
||||
license = licenses.lgpl21Plus;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, desktop-file-utils
|
||||
, nix-update-script
|
||||
, elementary-gtk-theme
|
||||
@ -13,7 +14,6 @@
|
||||
, libhandy
|
||||
, meson
|
||||
, ninja
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, substituteAll
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Networking Plug";
|
||||
homepage = "https://github.com/elementary/switchboard-plug-network";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,42 +1,30 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, libgee
|
||||
, evolution-data-server
|
||||
, glib
|
||||
, granite
|
||||
, gtk3
|
||||
, libaccounts-glib
|
||||
, libgdata
|
||||
, libhandy
|
||||
, libsignon-glib
|
||||
, json-glib
|
||||
, librest
|
||||
, webkitgtk
|
||||
, libsoup
|
||||
, sqlite
|
||||
, switchboard
|
||||
, evolution-data-server
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-onlineaccounts";
|
||||
version = "6.2.1";
|
||||
version = "6.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1q3f7zr04p2100mb255zy38il2i47l6vqdc9a9acjbk3n7q5sf92";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-L1SL8YbsYKdE+mvRW/fxjNoiyXRXTyV2ru7/tZzgTfM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -48,23 +36,20 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
evolution-data-server
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
json-glib
|
||||
libaccounts-glib
|
||||
libgdata
|
||||
libgee
|
||||
libhandy
|
||||
libsignon-glib
|
||||
libsoup
|
||||
librest
|
||||
sqlite # needed for camel-1.2
|
||||
switchboard
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers";
|
||||
PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services";
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Online Accounts Plug";
|
||||
@ -73,5 +58,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pantheon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, nixos-artwork
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, linkFarm
|
||||
, substituteAll
|
||||
, elementary-greeter
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, desktop-file-utils
|
||||
, pkg-config
|
||||
, writeScript
|
||||
, pantheon
|
||||
, gnome-keyring
|
||||
, gnome-session
|
||||
, wingpanel
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, file-roller
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, gnome
|
||||
, pkg-config
|
||||
, meson
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, wrapGAppsHook
|
||||
, pkg-config
|
||||
, meson
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
, vala
|
||||
, pkg-config
|
||||
, libgee
|
||||
, pantheon
|
||||
, gtk3
|
||||
, glib
|
||||
, gettext
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
@ -10,7 +11,6 @@
|
||||
, libgee
|
||||
, libhandy
|
||||
, libcanberra-gtk3
|
||||
, pantheon
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
geoclue2
|
||||
gtk3
|
||||
libgee
|
||||
];
|
||||
];
|
||||
|
||||
# This should be provided by a post_install.py script - See -> https://github.com/elementary/pantheon-agent-geoclue2/pull/21
|
||||
postInstall = ''
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From da8a4b9c1094a568f443c525ca1ce11f686be1bc Mon Sep 17 00:00:00 2001
|
||||
From: timor <timor.dd@googlemail.com>
|
||||
Date: Thu, 8 Aug 2019 14:13:09 +0200
|
||||
Subject: [PATCH] adjust unit test for finding executables in path for NixOS
|
||||
|
||||
---
|
||||
basis/io/standard-paths/unix/unix-tests.factor | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/basis/io/standard-paths/unix/unix-tests.factor b/basis/io/standard-paths/unix/unix-tests.factor
|
||||
index 986c0564d2..f0772fdcc9 100644
|
||||
--- a/basis/io/standard-paths/unix/unix-tests.factor
|
||||
+++ b/basis/io/standard-paths/unix/unix-tests.factor
|
||||
@@ -5,12 +5,12 @@ sequences tools.test ;
|
||||
|
||||
{ f } [ "" find-in-path ] unit-test
|
||||
{ t } [
|
||||
- "ls" find-in-path { "/bin/ls" "/usr/bin/ls" } member?
|
||||
+ "ls" find-in-path not not
|
||||
] unit-test
|
||||
|
||||
{ t } [
|
||||
"/sbin:" "PATH" os-env append "PATH" [
|
||||
"ps" find-in-path
|
||||
- { "/bin/ps" "/sbin/ps" "/usr/bin/ps" } member?
|
||||
+ not not
|
||||
] with-os-env
|
||||
] unit-test
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@ -1,105 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, glib, git,
|
||||
rlwrap, curl, pkg-config, perl, makeWrapper, tzdata, ncurses,
|
||||
pango, cairo, gtk2, gdk-pixbuf, gtkglext,
|
||||
mesa, xorg, openssl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "factor-lang";
|
||||
version = "0.98";
|
||||
rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip";
|
||||
sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./staging-command-line-0.98-pre.patch
|
||||
./workdir-0.98-pre.patch
|
||||
./fuel-dir.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
buildInputs = with xorg; [ git rlwrap curl pkg-config perl
|
||||
libX11 pango cairo gtk2 gdk-pixbuf gtkglext
|
||||
mesa libXmu libXt libICE libSM openssl ];
|
||||
|
||||
buildPhase = ''
|
||||
sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
|
||||
make linux-x86-64
|
||||
# De-memoize xdg-* functions, otherwise they break the image.
|
||||
sed -ie 's/^MEMO:/:/' basis/xdg/xdg.factor
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib/factor
|
||||
# The released image has library path info embedded, so we
|
||||
# first have to recreate the boot image with Nix paths, and
|
||||
# then use it to build the Nix release image.
|
||||
cp boot.unix-x86.64.image $out/lib/factor/factor.image
|
||||
|
||||
cp -r basis core extra $out/lib/factor
|
||||
|
||||
# Factor uses XDG_CACHE_HOME for cache during compilation.
|
||||
# We can't have that. So set it to $TMPDIR/.cache
|
||||
export XDG_CACHE_HOME=$TMPDIR/.cache && mkdir -p $XDG_CACHE_HOME
|
||||
|
||||
# There is no ld.so.cache in NixOS so we construct one
|
||||
# out of known libraries. The side effect is that find-lib
|
||||
# will work only on the known libraries. There does not seem
|
||||
# to be a generic solution here.
|
||||
find $(echo ${lib.makeLibraryPath (with xorg; [
|
||||
glib libX11 pango cairo gtk2 gdk-pixbuf gtkglext
|
||||
mesa libXmu libXt libICE libSM ])} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
|
||||
|
||||
(echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
|
||||
for l in $(<$TMPDIR/so.lst);
|
||||
do
|
||||
echo " $(basename $l) (libc6,x86-64) => $l";
|
||||
done)> $out/lib/factor/ld.so.cache
|
||||
|
||||
sed -ie "s#/sbin/ldconfig -p#cat $out/lib/factor/ld.so.cache#g" \
|
||||
$out/lib/factor/basis/alien/libraries/finder/linux/linux.factor
|
||||
|
||||
sed -ie 's#/usr/share/zoneinfo/#${tzdata}/share/zoneinfo/#g' \
|
||||
$out/lib/factor/extra/tzinfo/tzinfo.factor
|
||||
|
||||
sed -ie 's#/usr/share/terminfo#${ncurses.out}/share/terminfo#g' \
|
||||
$out/lib/factor/extra/terminfo/terminfo.factor
|
||||
|
||||
cp ./factor $out/bin
|
||||
wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
|
||||
"${lib.makeLibraryPath (with xorg; [ glib
|
||||
libX11 pango cairo gtk2 gdk-pixbuf gtkglext
|
||||
mesa libXmu libXt libICE libSM openssl])}"
|
||||
|
||||
sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor
|
||||
mv $out/bin/.factor-wrapped $out/lib/factor/factor
|
||||
|
||||
# build full factor image from boot image
|
||||
(cd $out/bin && ./factor -script -e='"unix-x86.64" USING: system bootstrap.image memory ; make-image save 0 exit' )
|
||||
|
||||
# make a new bootstrap image
|
||||
(cd $out/bin && ./factor -script -e='"unix-x86.64" USING: system tools.deploy.backend ; make-boot-image 0 exit' )
|
||||
|
||||
# rebuild final full factor image to include all patched sources
|
||||
(cd $out/lib/factor && ./factor -i=boot.unix-x86.64.image)
|
||||
|
||||
# install fuel mode for emacs
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
# update default paths in factor-listener.el for fuel mode
|
||||
substituteInPlace misc/fuel/fuel-listener.el \
|
||||
--subst-var-by fuel_factor_root_dir $out/lib/factor \
|
||||
--subst-var-by fuel_listener_factor_binary $out/bin/factor
|
||||
cp misc/fuel/*.el $out/share/emacs/site-lisp/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://factorcode.org";
|
||||
license = licenses.bsd2;
|
||||
description = "A concatenative, stack-based programming language";
|
||||
|
||||
maintainers = [ maintainers.vrthra maintainers.spacefrogg ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
218
pkgs/development/compilers/factor-lang/factor98.nix
Normal file
218
pkgs/development/compilers/factor-lang/factor98.nix
Normal file
@ -0,0 +1,218 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, cairo
|
||||
, curl
|
||||
, fetchurl
|
||||
, freealut
|
||||
, gdk-pixbuf
|
||||
, git
|
||||
, glib
|
||||
, gnome2
|
||||
, graphviz
|
||||
, gtk2-x11
|
||||
, interpreter
|
||||
, libGL
|
||||
, libGLU
|
||||
, libogg
|
||||
, librsvg
|
||||
, libvorbis
|
||||
, makeWrapper
|
||||
, ncurses
|
||||
, openal
|
||||
, openssl
|
||||
, pango
|
||||
, pcre
|
||||
, runCommand
|
||||
, runtimeShell
|
||||
, tzdata
|
||||
, udis86
|
||||
, unzip
|
||||
, writeScriptBin
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
runtimeLibs = [
|
||||
cairo
|
||||
freealut
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gnome2.gtkglext
|
||||
graphviz
|
||||
gtk2-x11
|
||||
libGL
|
||||
libGLU
|
||||
libogg
|
||||
libvorbis
|
||||
openal
|
||||
openssl
|
||||
pango
|
||||
pcre
|
||||
udis86
|
||||
zlib
|
||||
];
|
||||
|
||||
wrapFactorScript = { from, to ? false, runtimeLibs }: ''
|
||||
# Set Gdk pixbuf loaders file to the one from the build dependencies here
|
||||
unset GDK_PIXBUF_MODULE_FILE
|
||||
# Defined in gdk-pixbuf setup hook
|
||||
findGdkPixbufLoaders "${librsvg}"
|
||||
|
||||
${if to then "makeWrapper ${from} ${to}" else "wrapProgram ${from}"} \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--argv0 factor \
|
||||
--prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs} \
|
||||
--prefix PATH : ${lib.makeBinPath [ graphviz ]}
|
||||
'';
|
||||
|
||||
wrapFactor = runtimeLibs:
|
||||
runCommand (lib.appendToName "with-libs" interpreter).name
|
||||
{
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ gdk-pixbuf ];
|
||||
passthru.runtimeLibs = runtimeLibs ++ interpreter.runtimeLibs;
|
||||
}
|
||||
(wrapFactorScript {
|
||||
from = "${interpreter}/lib/factor/.factor.wrapped";
|
||||
to = "$out/bin/factor";
|
||||
runtimeLibs = (runtimeLibs ++ interpreter.runtimeLibs);
|
||||
});
|
||||
|
||||
# Development helper for use in nix shell
|
||||
wrapLocalFactor = writeScriptBin "wrapFactor" ''
|
||||
#!${runtimeShell}
|
||||
${wrapFactorScript { from = "./factor"; inherit runtimeLibs; }}
|
||||
ln -sf factor.image .factor-wrapped.image
|
||||
'';
|
||||
rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
|
||||
version = "0.98";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "factor-lang";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip";
|
||||
sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./staging-command-line-0.98-pre.patch
|
||||
./workdir-0.98-pre.patch
|
||||
./adjust-paths-in-unit-tests.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ git makeWrapper curl unzip wrapLocalFactor ];
|
||||
buildInputs = runtimeLibs;
|
||||
|
||||
postPatch = ''
|
||||
sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
|
||||
|
||||
# There is no ld.so.cache in NixOS so we patch out calls to that completely.
|
||||
# This should work as long as no application code relies on `find-library*`
|
||||
# to return a match, which currently is the case and also a justified assumption.
|
||||
|
||||
sed -ie "s#/sbin/ldconfig -p#cat $out/lib/factor/ld.so.cache#g" \
|
||||
basis/alien/libraries/finder/linux/linux.factor
|
||||
|
||||
# Some other hard-coded paths to fix:
|
||||
sed -i 's#/usr/share/zoneinfo/#${tzdata}/share/zoneinfo/#g' \
|
||||
extra/tzinfo/tzinfo.factor
|
||||
|
||||
sed -i 's#/usr/share/terminfo#${ncurses.out}/share/terminfo#g' \
|
||||
extra/terminfo/terminfo.factor
|
||||
|
||||
# De-memoize xdg-* functions, otherwise they break the image.
|
||||
sed -ie 's/^MEMO:/:/' basis/xdg/xdg.factor
|
||||
|
||||
# update default paths in factor-listener.el for fuel mode
|
||||
substituteInPlace misc/fuel/fuel-listener.el \
|
||||
--replace '(defcustom fuel-factor-root-dir nil' "(defcustom fuel-factor-root-dir \"$out/lib/factor\""
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
# Necessary here, because ld.so.cache is needed in its final location during rebuild.
|
||||
mkdir -p $out/bin $out/lib/factor
|
||||
patchShebangs ./build.sh
|
||||
# Factor uses XDG_CACHE_HOME for cache during compilation.
|
||||
# We can't have that. So, set it to $TMPDIR/.cache
|
||||
export XDG_CACHE_HOME=$TMPDIR/.cache && mkdir -p $XDG_CACHE_HOME
|
||||
|
||||
# There is no ld.so.cache in NixOS so we construct one
|
||||
# out of known libraries. The side effect is that find-lib
|
||||
# will work only on the known libraries. There does not seem
|
||||
# to be a generic solution here.
|
||||
find $(echo ${lib.makeLibraryPath runtimeLibs} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
|
||||
(echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
|
||||
for l in $(<$TMPDIR/so.lst); do
|
||||
echo " $(basename $l) (libc6,x86-64) => $l";
|
||||
done)> $out/lib/factor/ld.so.cache
|
||||
|
||||
make -j$NIX_BUILD_CORES linux-x86-64
|
||||
./build.sh bootstrap
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# For now, the check phase runs, but should always return 0. This way the logs
|
||||
# contain the test failures until all unit tests are fixed. Then, it should
|
||||
# return 1 if any test failures have occured.
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
set +e
|
||||
./factor -e='USING: tools.test zealot.factor sequences namespaces formatting ;
|
||||
zealot-core-vocabs "compiler" suffix [ test ] each :test-failures
|
||||
test-failures get length "Number of failed Tests: %d\n" printf'
|
||||
[ $? -eq 0 ] || {
|
||||
mkdir -p "$out/nix-support"
|
||||
touch "$out/nix-support/failed"
|
||||
}
|
||||
set -e
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cp -r factor factor.image LICENSE.txt README.md basis core extra misc $out/lib/factor
|
||||
|
||||
# Create a wrapper in bin/ and lib/factor/
|
||||
${wrapFactorScript { from = "$out/lib/factor/factor"; inherit runtimeLibs; }}
|
||||
mv $out/lib/factor/factor.image $out/lib/factor/.factor-wrapped.image
|
||||
cp $out/lib/factor/factor $out/bin/
|
||||
|
||||
# Emacs fuel expects the image being named `factor.image` in the factor base dir
|
||||
ln -s $out/lib/factor/.factor-wrapped.image $out/lib/factor/factor.image
|
||||
|
||||
# install fuel mode for emacs
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
ln -s $out/lib/factor/misc/fuel/*.el $out/share/emacs/site-lisp/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit runtimeLibs wrapFactorScript;
|
||||
withLibs = wrapFactor;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://factorcode.org/";
|
||||
description = "A concatenative, stack-based programming language";
|
||||
longDescription = ''
|
||||
The Factor programming language is a concatenative, stack-based
|
||||
programming language with high-level features including dynamic types,
|
||||
extensible syntax, macros, and garbage collection. On a practical side,
|
||||
Factor has a full-featured library, supports many different platforms, and
|
||||
has been extensively documented.
|
||||
|
||||
The implementation is fully compiled for performance, while still
|
||||
supporting interactive development. Factor applications are portable
|
||||
between all common platforms. Factor can deploy stand-alone applications
|
||||
on all platforms. Full source code for the Factor project is available
|
||||
under a BSD license.
|
||||
'';
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ vrthra spacefrogg ];
|
||||
platforms = lib.intersectLists platforms.x86_64 platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
diff --git a/misc/fuel/fuel-listener.el b/misc/fuel/fuel-listener.el
|
||||
index 2d1b182a75..bf2e573425 100644
|
||||
--- a/misc/fuel/fuel-listener.el
|
||||
+++ b/misc/fuel/fuel-listener.el
|
||||
@@ -30,13 +30,13 @@
|
||||
"Interacting with a Factor listener inside Emacs."
|
||||
:group 'fuel)
|
||||
|
||||
-(defcustom fuel-factor-root-dir nil
|
||||
+(defcustom fuel-factor-root-dir "@fuel_factor_root_dir@"
|
||||
"Full path to the factor root directory when starting a listener."
|
||||
:type 'directory
|
||||
:group 'fuel-listener)
|
||||
|
||||
;;; Is factor.com still valid on Windows...?
|
||||
-(defcustom fuel-listener-factor-binary nil
|
||||
+(defcustom fuel-listener-factor-binary "@fuel_listener_factor_binary@"
|
||||
"Full path to the factor executable to use when starting a listener."
|
||||
:type '(file :must-match t)
|
||||
:group 'fuel-listener)
|
||||
16
pkgs/development/compilers/factor-lang/scope.nix
Normal file
16
pkgs/development/compilers/factor-lang/scope.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ lib, pkgs
|
||||
, overrides ? (self: super: {})}:
|
||||
|
||||
let
|
||||
inside = (self:
|
||||
let callPackage = pkgs.newScope self;
|
||||
in rec {
|
||||
interpreter = callPackage ./factor98.nix { inherit (pkgs) stdenv; };
|
||||
|
||||
# Convenience access for using the returned attribute the same way as the
|
||||
# interpreter derivation. Takes a list of runtime libraries as its only
|
||||
# argument.
|
||||
inherit (self.interpreter) withLibs;
|
||||
});
|
||||
extensible-self = lib.makeExtensible (lib.extends overrides inside);
|
||||
in extensible-self
|
||||
@ -274,7 +274,7 @@ stdenv.mkDerivation rec {
|
||||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://golang.org/";
|
||||
homepage = "https://go.dev/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members;
|
||||
|
||||
@ -269,7 +269,7 @@ stdenv.mkDerivation rec {
|
||||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://golang.org/";
|
||||
homepage = "https://go.dev/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members;
|
||||
|
||||
@ -268,7 +268,7 @@ stdenv.mkDerivation rec {
|
||||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://golang.org/";
|
||||
homepage = "https://go.dev/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members;
|
||||
|
||||
@ -267,7 +267,7 @@ stdenv.mkDerivation rec {
|
||||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://golang.org/";
|
||||
homepage = "https://go.dev/";
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members ++ [ maintainers._3noch ];
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
name = "go-${version}-${platform}-bootstrap";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://golang.org/dl/go${version}.${platform}.tar.gz";
|
||||
url = "https://go.dev/dl/go${version}.${platform}.tar.gz";
|
||||
sha256 = hashes.${platform} or (throw "Missing Go bootstrap hash for platform ${platform}");
|
||||
};
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
BASEURL=https://golang.org/dl/
|
||||
BASEURL=https://go.dev/dl/
|
||||
VERSION=${1:-}
|
||||
|
||||
if [[ -z $VERSION ]]
|
||||
|
||||
@ -71,7 +71,8 @@ stdenv.mkDerivation (args // {
|
||||
# See #144785 for details.
|
||||
configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ];
|
||||
# x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
|
||||
hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie";
|
||||
hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"
|
||||
++ lib.optionals (args ? hardeningDisable) args.hardeningDisable;
|
||||
|
||||
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
|
||||
buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user