diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:53:37 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:53:37 +0200 |
commit | bb10352242dceb863069797bb92131944b0ac62f (patch) | |
tree | d3f5ceea6723e3d6c901652146e41ffe45100c9b /pkgs/development/tools/misc | |
parent | 7fb1ff90031c59cbc9ef79224516a74bc138c7a6 (diff) | |
parent | 5c70040db2dd2123f7728f1bdcd40d5018de0ef9 (diff) | |
download | nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.gz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.bz2 nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.lz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.xz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.zst nixlib-bb10352242dceb863069797bb92131944b0ac62f.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix | 36 | ||||
-rw-r--r-- | pkgs/development/tools/misc/texlab/default.nix | 6 |
2 files changed, 39 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix new file mode 100644 index 000000000000..412830369b9e --- /dev/null +++ b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, libarchive, python3, file }: + +stdenv.mkDerivation rec { + pname = "remarkable-toolchain"; + version = "1.8-23.9.2019"; + + src = fetchurl { + url = "https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-zero-gravitas-${version}.sh"; + sha256 = "6299955721bcd9bef92a87ad3cfe4d31df8e2da95b0c4b2cdded4431aa6748b0"; + }; + + nativeBuildInputs = [ + libarchive + python3 + file + ]; + + unpackCmd = "mkdir src; install $curSrc src/install-toolchain.sh"; + + dontBuild = true; + + installPhase = '' + patchShebangs install-toolchain.sh + sed -i -e '3,9d' install-toolchain.sh # breaks PATH + sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh + ./install-toolchain.sh -D -y -d $out + ''; + + meta = with stdenv.lib; { + description = "A toolchain for cross-compiling to reMarkable tablets"; + homepage = "https://remarkable.engineering/"; + license = licenses.gpl2; + maintainers = [ maintainers.nickhu ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 1edc86017ba6..5cc67cb5e176 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "1.10.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "12zfcvbihirh38xxzc8fbx293m4vsrhq6kh0qnhnhlrx75m09l9i"; + sha256 = "0y8cv8y92a4nqwrvqk2cxgs6nspqjk8jm4spr8rgkwlpfbrg74xn"; }; - cargoSha256 = "08fi0c4s0d1p2rqxvj1y82zg6xl3n0ikgyhgrjwh6xay8f0121f0"; + cargoSha256 = "1qi1c4v5d5a4xcf1bjbdicrv35w6chl5swlm96c1h3pr9s09lqy7"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; |