Merge branch 'staging-next' into staging
This commit is contained in:
Dmitry Kalinkin
commit
0cf94e8de4
@ -72,7 +72,7 @@ The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given
|
||||
To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions:
|
||||
|
||||
* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. This can be an array of multiple projects as well.
|
||||
* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. This file should be generated using `nuget-to-nix` tool, which is available in nixpkgs.
|
||||
* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. A script to fetch these is available as `passthru.fetch-deps`. This file can also be generated manually using `nuget-to-nix` tool, which is available in nixpkgs.
|
||||
* `packNupkg` is used to pack project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`.
|
||||
* `projectReferences` can be used to resolve `ProjectReference` project items. Referenced projects can be packed with `buildDotnetModule` by setting the `packNupkg = true` attribute and passing a list of derivations to `projectReferences`. Since we are sharing referenced projects as NuGets they must be added to csproj/fsproj files as `PackageReference` as well.
|
||||
For example, your project has a local dependency:
|
||||
@ -99,6 +99,8 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila
|
||||
* `dotnetPackFlags` can be used to pass flags to `dotnet pack`. Used only if `packNupkg` is set to `true`.
|
||||
* `dotnetFlags` can be used to pass flags to all of the above phases.
|
||||
|
||||
When packaging a new application, you need to fetch it's dependencies. You can set `nugetDeps` to an empty string to make the derivation temporarily evaluate, and then run `nix-build -A package.passthru.fetch-deps` to generate it's dependency fetching script. After running the script, you should have the location of the generated lockfile printed to the console. This can be copied to a stable directory. Note that if either `projectFile` or `nugetDeps` are unset, this script cannot be generated!
|
||||
|
||||
Here is an example `default.nix`, using some of the previously discussed arguments:
|
||||
```nix
|
||||
{ lib, buildDotnetModule, dotnetCorePackages, ffmpeg }:
|
||||
@ -112,7 +114,8 @@ in buildDotnetModule rec {
|
||||
src = ./.;
|
||||
|
||||
projectFile = "src/project.sln";
|
||||
nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix`.
|
||||
nugetDeps = ./deps.nix; # File generated with `nix-build -A package.passthru.fetch-deps`.
|
||||
|
||||
projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure.
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_3_1;
|
||||
|
||||
@ -293,7 +293,7 @@ Test flags, e.g., `--package foo`, can be passed to `cargo test` via the
|
||||
|
||||
Another attribute, called `checkFlags`, is used to pass arguments to the test
|
||||
binary itself, as stated
|
||||
(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html].
|
||||
[here](https://doc.rust-lang.org/cargo/commands/cargo-test.html).
|
||||
|
||||
#### Tests relying on the structure of the `target/` directory {#tests-relying-on-the-structure-of-the-target-directory}
|
||||
|
||||
|
||||
@ -12130,6 +12130,12 @@
|
||||
githubId = 122319;
|
||||
name = "Renato Alves";
|
||||
};
|
||||
unrooted = {
|
||||
name = "Konrad Klawikowski";
|
||||
email = "konrad.root.klawikowski@gmail.com";
|
||||
github = "unrooted";
|
||||
githubId = 30440603;
|
||||
};
|
||||
uralbash = {
|
||||
email = "root@uralbash.ru";
|
||||
github = "uralbash";
|
||||
@ -12579,6 +12585,12 @@
|
||||
githubId = 78392041;
|
||||
name = "Winter";
|
||||
};
|
||||
wintrmvte = {
|
||||
name = "Jakub Lutczyn";
|
||||
email = "kubalutczyn@gmail.com";
|
||||
github = "wintrmvte";
|
||||
githubId = 41823252;
|
||||
};
|
||||
wirew0rm = {
|
||||
email = "alex@wirew0rm.de";
|
||||
github = "wirew0rm";
|
||||
@ -12657,6 +12669,12 @@
|
||||
githubId = 28888242;
|
||||
name = "WORLDofPEACE";
|
||||
};
|
||||
wr0belj = {
|
||||
name = "Jakub Wróbel";
|
||||
email = "wrobel.jakub@protonmail.com";
|
||||
github = "wr0belj";
|
||||
githubId = 40501814;
|
||||
};
|
||||
wscott = {
|
||||
email = "wsc9tt@gmail.com";
|
||||
github = "wscott";
|
||||
|
||||
@ -247,6 +247,15 @@ with lib.maintainers; {
|
||||
scope = "Maintain Podman and CRI-O related packages and modules.";
|
||||
};
|
||||
|
||||
redcodelabs = {
|
||||
members = [
|
||||
unrooted
|
||||
wr0belj
|
||||
wintrmvte
|
||||
];
|
||||
scope = "Maintain Red Code Labs related packages and modules.";
|
||||
};
|
||||
|
||||
sage = {
|
||||
members = [
|
||||
timokau
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.150.0";
|
||||
version = "1.152.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-6XG4v2S7InKA6OVrV+q1lT/CzNxmzVQfmAAo2cqbqBY=";
|
||||
sha256 = "sha256-LwPlWfna+/LsQxOBuTFpE7e7Qr5g9NN14rVasMZVImQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -99,6 +99,8 @@ stdenv.mkDerivation rec {
|
||||
fi
|
||||
'') additionalLexers;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform code editor";
|
||||
longDescription = ''
|
||||
|
||||
@ -16,8 +16,8 @@
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.11.25",
|
||||
"sha256": "sha256-CbH0C+UOJ9X2wKG5IEbgitda06lazujYM8l961k7C7g="
|
||||
"rev": "2021.12.12",
|
||||
"sha256": "sha256-glP2Srw3Lw1JNQO+DIwixf4Xdbo5M6pBdYufwGERPW4="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
@ -26,13 +26,13 @@
|
||||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.10.21",
|
||||
"sha256": "sha256-RyRpHihmmr/EeVWk9CR0S3pvKy0FzqLZNGti33+4fkI="
|
||||
"rev": "2021.12.07",
|
||||
"sha256": "sha256-givCklAHao26psWLI2qK246igxcAQEeIYTGH61FX6Xo="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.11.25",
|
||||
"sha256": "sha256-6hk9wNdoz1d3VpuW7yHyIQnnYseEAfgjCNGl6+o0Hjs="
|
||||
"rev": "2021.12.07",
|
||||
"sha256": "sha256-/2Fv/vrpbHSiJro11cjbziUaT4gfwa6y5aQBoYgq3OQ="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
||||
23
pkgs/applications/editors/cudatext/update.sh
Executable file
23
pkgs/applications/editors/cudatext/update.sh
Executable file
@ -0,0 +1,23 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused jq nix-prefetch moreutils
|
||||
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
version=$(curl -s https://api.github.com/repos/Alexey-T/CudaText/releases/latest | jq -r '.tag_name')
|
||||
url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz"
|
||||
hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url)
|
||||
sriHash=$(nix hash to-sri --type sha256 $hash)
|
||||
|
||||
sed -i "s#version = \".*\"#version = \"$version\"#" default.nix
|
||||
sed -i "s#sha256 = \".*\"#sha256 = \"$sriHash\"#" default.nix
|
||||
|
||||
while IFS=$'\t' read repo owner rev; do
|
||||
latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name')
|
||||
if [ "$latest" != "$rev" ]; then
|
||||
url="https://github.com/${owner}/${repo}/archive/refs/tags/${latest}.tar.gz"
|
||||
hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url)
|
||||
sriHash=$(nix hash to-sri --type sha256 $hash)
|
||||
jq ".${repo}.rev = \"${latest}\" | .${repo}.sha256 = \"${sriHash}\"" deps.json | sponge deps.json
|
||||
fi
|
||||
done <<< $(jq -r 'to_entries[]|[.key,.value.owner,.value.rev]|@tsv' deps.json)
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "464";
|
||||
version = "466";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZAndODbl6cH0H1rA3Bhn3AlfIuba0LjxWxusGPDYvlA=";
|
||||
sha256 = "sha256-ih2BctOC9cuTYP8A9ikhGBqNP0SToSAkqmZhtBvgpIo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver";
|
||||
version = "21.3.0"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "21.3.1"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "iKxnuMm5hpreP706N+XxaBrDVVwVFRWKNmiCyXkOUCQ=";
|
||||
sha256 = "ePy3uS+LpyDzweLocSk3O/G2zFPISKbMbci9fdELrpE=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "4.2.7";
|
||||
version = "4.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
|
||||
sha256 = "sha256-PVG4KZX6KxkrooywgEmqOItyLt5hGs+b/KCaguduGyc=";
|
||||
sha256 = "sha256-bbGFSy2ZuUtFWyAgje6s+RSQ6S7NZGAhjvZMbIWfYhE=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchFromGitHub, mkYarnPackage, nixosTests, writeText, python3 }:
|
||||
|
||||
let
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngoduykhanh";
|
||||
repo = "PowerDNS-Admin";
|
||||
rev = "v${version}";
|
||||
sha256 = "16faz57d77mxkflkvwyi8gb9wvnq2vhw79b84v1fmqvxri1yaphw";
|
||||
sha256 = "sha256-xJ0NNnDVwGl+t9q1INPhCxcTmQayYBYdjEG0PbPCI9E=";
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
@ -22,7 +22,7 @@ let
|
||||
};
|
||||
|
||||
pythonDeps = with python.pkgs; [
|
||||
flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-sslify
|
||||
flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify
|
||||
mysqlclient psycopg2 sqlalchemy
|
||||
cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython
|
||||
gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core
|
||||
@ -125,6 +125,6 @@ in stdenv.mkDerivation rec {
|
||||
description = "A PowerDNS web interface with advanced features";
|
||||
homepage = "https://github.com/ngoduykhanh/PowerDNS-Admin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
maintainers = with maintainers; [ Flakebi zhaofengli ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,5 +12,5 @@
|
||||
"multiselect": "^0.9.12"
|
||||
},
|
||||
"name": "powerdns-admin-assets",
|
||||
"version": "0.2.3"
|
||||
"version": "0.2.4"
|
||||
}
|
||||
|
||||
@ -114,11 +114,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "bn.js___bn.js_4.11.9.tgz";
|
||||
name = "bn.js___bn.js_4.12.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "bn.js___bn.js_4.11.9.tgz";
|
||||
url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz";
|
||||
sha1 = "26d556829458f9d1e81fc48952493d0ba3507828";
|
||||
name = "bn.js___bn.js_4.12.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz";
|
||||
sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -530,11 +530,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "elliptic___elliptic_6.5.3.tgz";
|
||||
name = "elliptic___elliptic_6.5.4.tgz";
|
||||
path = fetchurl {
|
||||
name = "elliptic___elliptic_6.5.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz";
|
||||
sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6";
|
||||
name = "elliptic___elliptic_6.5.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz";
|
||||
sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, glib
|
||||
, libX11
|
||||
@ -16,22 +17,23 @@
|
||||
, gtk3
|
||||
, libselinux
|
||||
, libxml2
|
||||
, libffi
|
||||
, python3Packages
|
||||
, cpio
|
||||
, autoPatchelfHook
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nice-dcv-client";
|
||||
version = "2020.2.1737-1";
|
||||
|
||||
version = "2021.2.3797-1";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://d1uj6qtbmh3dt5.cloudfront.net/2020.2/Clients/nice-dcv-viewer-${version}.el8.x86_64.rpm";
|
||||
sha256 = "sha256-SUpfHd/Btc07cfjc3zx5I5BiNatr/c4E2/mfJuU4R1E=";
|
||||
url = "https://d1uj6qtbmh3dt5.cloudfront.net/2021.2/Clients/nice-dcv-viewer-${version}.el8.x86_64.rpm";
|
||||
sha256 = "sha256-iLz25SB5v7ghkAZOMGPmpNaPihd8ikzCQS//r1xBNRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook python3Packages.rpm ];
|
||||
nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook python3Packages.rpm ];
|
||||
unpackPhase = ''
|
||||
rpm2cpio $src | ${cpio}/bin/cpio -idm
|
||||
'';
|
||||
@ -57,31 +59,28 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin/
|
||||
mkdir -p $out/lib64/
|
||||
|
||||
mv usr/bin/dcvviewer $out/bin/dcvviewer
|
||||
mv usr/lib64/* $out/lib64/
|
||||
|
||||
mkdir -p $out/libexec/dcvviewer
|
||||
mv usr/libexec/dcvviewer/dcvviewer $out/libexec/dcvviewer/dcvviewer
|
||||
patchelf \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
$out/libexec/dcvviewer/dcvviewer
|
||||
|
||||
# Fix the wrapper script to have the right basedir.
|
||||
sed -i "s#basedir=/usr#basedir=$out#" $out/bin/dcvviewer
|
||||
|
||||
mv usr/share $out/
|
||||
|
||||
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
|
||||
# broken symlink, seems to give a warning message if i don't delete it
|
||||
rm $out/lib64/dcvviewer/gio/modules/libdconfsettings.so
|
||||
# we already ship libffi.so.7
|
||||
ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib64/libffi.so.6
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "High-performance remote display protocol";
|
||||
homepage = "https://aws.amazon.com/hpc/dcv/";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ rmcgibbo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,8 +3,8 @@ libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil,
|
||||
sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
|
||||
|
||||
let
|
||||
majorVersion = "7.14";
|
||||
minorVersion = "2";
|
||||
majorVersion = "7.18";
|
||||
minorVersion = "1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "BOINC";
|
||||
repo = "boinc";
|
||||
rev = "client_release/${majorVersion}/${version}";
|
||||
sha256 = "0nicpkag18xq0libfqqvs0im22mijpsxzfk272iwdd9l0lmgfvyd";
|
||||
sha256 = "sha256-ijkfWTFwwJXvh6f0P5hkzWODxU+Ugz6iQUK+5jEpWXQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
|
||||
@ -37,10 +37,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [ "--disable-server" ];
|
||||
|
||||
meta = {
|
||||
postInstall = ''
|
||||
install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free software for distributed and grid computing";
|
||||
homepage = "https://boinc.berkeley.edu/";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
platforms = lib.platforms.linux; # arbitrary choice
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux; # arbitrary choice
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenvNoCC, linkFarmFromDrvs, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }:
|
||||
{ lib, stdenvNoCC, linkFarmFromDrvs, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }:
|
||||
|
||||
{ name ? "${args.pname}-${args.version}"
|
||||
, enableParallelBuilding ? true
|
||||
@ -28,7 +28,7 @@
|
||||
# The packages project file, which contains instructions on how to compile it. This can be an array of multiple project files as well.
|
||||
, projectFile ? null
|
||||
# The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched.
|
||||
# This can be generated using the `nuget-to-nix` tool.
|
||||
# This can be generated by running the `passthru.fetch-deps` script.
|
||||
, nugetDeps ? null
|
||||
# A list of derivations containing nupkg packages for local project references.
|
||||
# Referenced derivations can be built with `buildDotnetModule` with `packNupkg=true` flag.
|
||||
@ -63,7 +63,7 @@ assert projectFile == null -> throw "Defining the `projectFile` attribute is req
|
||||
|
||||
# TODO: Automatically generate a dependency file when a lockfile is present.
|
||||
# This file is unfortunately almost never present, as Microsoft recommands not to push this in upstream repositories.
|
||||
assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated using the `nuget-to-nix` tool.";
|
||||
assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script.";
|
||||
|
||||
let
|
||||
_nugetDeps = linkFarmFromDrvs "${name}-nuget-deps" (import nugetDeps {
|
||||
@ -113,6 +113,41 @@ let
|
||||
DOTNET_NOLOGO = true; # This disables the welcome message.
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT = true;
|
||||
|
||||
passthru.fetch-deps = args.passthru.fetch-deps or writeScript "fetch-${args.pname}-deps" ''
|
||||
set -euo pipefail
|
||||
cd "$(dirname "''${BASH_SOURCE[0]}")"
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
deps_file="/tmp/${args.pname}-deps.nix"
|
||||
|
||||
store_src="${package.src}"
|
||||
src="$(mktemp -d /tmp/${args.pname}.XXX)"
|
||||
cp -rT "$store_src" "$src"
|
||||
chmod -R +w "$src"
|
||||
|
||||
trap "rm -rf $src $HOME" EXIT
|
||||
pushd "$src"
|
||||
|
||||
export DOTNET_NOLOGO=1
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
|
||||
mkdir -p "$HOME/nuget_pkgs"
|
||||
|
||||
for project in "${lib.concatStringsSep "\" \"" (lib.toList projectFile)}"; do
|
||||
${dotnet-sdk}/bin/dotnet restore "$project" \
|
||||
${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--packages "$HOME/nuget_pkgs" \
|
||||
"''${dotnetRestoreFlags[@]}" \
|
||||
"''${dotnetFlags[@]}"
|
||||
done
|
||||
|
||||
echo "Writing lockfile..."
|
||||
${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file"
|
||||
echo "Succesfully wrote lockfile to: $deps_file"
|
||||
'';
|
||||
|
||||
configurePhase = args.configurePhase or ''
|
||||
runHook preConfigure
|
||||
|
||||
|
||||
@ -98,12 +98,12 @@ in {
|
||||
|
||||
nim-unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "nim-unwrapped";
|
||||
version = "1.6.0";
|
||||
version = "1.6.2";
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
|
||||
hash = "sha256-UgZdSNcqcnAuwa/l96mDHhFnNTHiec3/nK7AGgfuxj0=";
|
||||
hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M=";
|
||||
};
|
||||
|
||||
buildInputs = [ boehmgc openssl pcre readline sqlite ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
|
||||
# Docs cause an immense increase in build time, up to 2 additional hours
|
||||
, withDocs ? false
|
||||
@ -11,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-watcom-v2";
|
||||
version = "unstable-2021-11-30";
|
||||
version = "unstable-2021-12-10";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "982c958eb4840e1c6a98773ba0600f652500f5a7";
|
||||
sha256 = "18dp9nd1gjnpd1870149v67vzxbna25l6zi052z1r51xvaqwc3cx";
|
||||
rev = "ca685c1b780149f7210426f0bb78dd7b67b19e6d";
|
||||
sha256 = "1nmmj94z5hips2426rcdqdcsm8015jjj51rm9fnx81qagdj52j5d";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -82,6 +83,10 @@ stdenv.mkDerivation rec {
|
||||
# Stripping breaks many tools
|
||||
dontStrip = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
url = "https://github.com/open-watcom/open-watcom-v2.git";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "The v2 fork of the Open Watcom suite of compilers and tools";
|
||||
longDescription = ''
|
||||
|
||||
@ -123,6 +123,8 @@ let
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
inherit (open-watcom) meta;
|
||||
};
|
||||
in
|
||||
lib.makeOverridable wrapper
|
||||
|
||||
@ -30,6 +30,10 @@ self: super: ({
|
||||
|
||||
double-conversion = addExtraLibrary pkgs.libcxx super.double-conversion;
|
||||
|
||||
hercules-ci-cnix-store = super.hercules-ci-cnix-store.overrideAttrs (drv: {
|
||||
NIX_CFLAGS_COMPILE = "-D_LIBCPP_DISABLE_AVAILABILITY";
|
||||
});
|
||||
|
||||
apecs-physics = addPkgconfigDepends [
|
||||
darwin.apple_sdk.frameworks.ApplicationServices
|
||||
] super.apecs-physics;
|
||||
|
||||
@ -20,7 +20,15 @@ let
|
||||
envs = let
|
||||
inherit python;
|
||||
pythonEnv = python.withPackages(ps: with ps; [ ]);
|
||||
pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]);
|
||||
pythonVirtualEnv = if python.isPy3k
|
||||
then
|
||||
python.withPackages(ps: with ps; [ virtualenv ])
|
||||
else
|
||||
python.buildEnv.override {
|
||||
extraLibs = with python.pkgs; [ virtualenv ];
|
||||
# Collisions because of namespaces __init__.py
|
||||
ignoreCollisions = true;
|
||||
};
|
||||
in {
|
||||
# Plain Python interpreter
|
||||
plain = rec {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib, buildPythonPackage, fetchPypi, setuptools-scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "filelock";
|
||||
@ -9,6 +9,10 @@ buildPythonPackage rec {
|
||||
sha256 = "1qry67zv2pmz8px6wdfbjqv75nmryy2ac7asqgs6q6db2722kpcw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/benediktschmitt/py-filelock";
|
||||
description = "A platform independent file lock for Python";
|
||||
|
||||
27
pkgs/development/python-modules/flask-session/default.nix
Normal file
27
pkgs/development/python-modules/flask-session/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, pytestCheckHook, flask, cachelib }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-Session";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ye1UMh+oxMoBMv/TNpWCdZ7aclL7SzvuSA5pDRukH0Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ flask cachelib ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# The rest of the tests require database servers and optional db connector dependencies
|
||||
pytestFlagsArray = [ "-k" "'null_session or filesystem_session'" ];
|
||||
|
||||
pythonImportsCheck = [ "flask_session" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Flask extension that adds support for server-side sessions";
|
||||
homepage = "https://github.com/fengsp/flask-session";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
||||
43
pkgs/development/python-modules/platformdirs/2.nix
Normal file
43
pkgs/development/python-modules/platformdirs/2.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, appdirs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, platformdirs
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "platformdirs";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yCvfOPuX9hbQO9gbFHfeu+dGH+Vb9FM7wng1XU2D8hE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
appdirs
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "platformdirs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for determining appropriate platform-specific directories";
|
||||
homepage = "https://platformdirs.readthedocs.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -2,24 +2,29 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, sphinx
|
||||
, pytestCheckHook
|
||||
, beautifulsoup4
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxext-opengraph";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wpilibsuite";
|
||||
repo = "sphinxext-opengraph";
|
||||
rev = "v${version}";
|
||||
sha256 = "0iri6sh6h7l1p8xg04bj3bphs1hwxh43sfnrv1c8b1wy84w988y9";
|
||||
sha256 = "sha256-US0UXxcTlN7x5v2ilpL+umTr7tadqthqhvfaQnm7tCc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sphinx
|
||||
];
|
||||
|
||||
doCheck = false; # no tests
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
beautifulsoup4
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sphinxext.opengraph" ];
|
||||
|
||||
|
||||
@ -74,6 +74,9 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# Permission Error
|
||||
"test_bad_exe_py_info_no_raise"
|
||||
] ++ lib.optionals isPy27 [
|
||||
"test_python_via_env_var"
|
||||
"test_python_multi_value_prefer_newline_via_env_var"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "virtualenv" ];
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, python3
|
||||
|
||||
, writeTextDir
|
||||
, substituteAll
|
||||
, fetchpatch
|
||||
@ -0,0 +1,19 @@
|
||||
--- a/mesonbuild/coredata.py
|
||||
+++ b/mesonbuild/coredata.py
|
||||
@@ -506,7 +506,6 @@ class CoreData:
|
||||
return value
|
||||
if option.name.endswith('dir') and value.is_absolute() and \
|
||||
option not in BULITIN_DIR_NOPREFIX_OPTIONS:
|
||||
- # Value must be a subdir of the prefix
|
||||
# commonpath will always return a path in the native format, so we
|
||||
# must use pathlib.PurePath to do the same conversion before
|
||||
# comparing.
|
||||
@@ -518,7 +517,7 @@ class CoreData:
|
||||
try:
|
||||
value = value.relative_to(prefix)
|
||||
except ValueError:
|
||||
- raise MesonException(msg.format(option, value, prefix))
|
||||
+ pass
|
||||
if '..' in str(value):
|
||||
raise MesonException(msg.format(option, value, prefix))
|
||||
return value.as_posix()
|
||||
@ -0,0 +1,21 @@
|
||||
diff -Naur meson-0.60.2-old/mesonbuild/dependencies/boost.py meson-0.60.2-new/mesonbuild/dependencies/boost.py
|
||||
--- meson-0.60.2-old/mesonbuild/dependencies/boost.py 2021-11-02 16:58:07.000000000 -0300
|
||||
+++ meson-0.60.2-new/mesonbuild/dependencies/boost.py 2021-12-12 19:21:27.895705897 -0300
|
||||
@@ -682,16 +682,7 @@
|
||||
else:
|
||||
tmp = [] # type: T.List[Path]
|
||||
|
||||
- # Add some default system paths
|
||||
- tmp += [Path('/opt/local')]
|
||||
- tmp += [Path('/usr/local/opt/boost')]
|
||||
- tmp += [Path('/usr/local')]
|
||||
- tmp += [Path('/usr')]
|
||||
-
|
||||
- # Cleanup paths
|
||||
- tmp = [x for x in tmp if x.is_dir()]
|
||||
- tmp = [x.resolve() for x in tmp]
|
||||
- roots += tmp
|
||||
+ # Remove such spurious, non-explicit "system" paths for Nix&Nixpkgs
|
||||
|
||||
self.check_and_set_roots(roots, use_system=True)
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
|
||||
index 4176b9a03..faaabf616 100644
|
||||
--- a/mesonbuild/scripts/depfixer.py
|
||||
+++ b/mesonbuild/scripts/depfixer.py
|
||||
@@ -336,6 +336,15 @@ class Elf(DataSizes):
|
||||
if not new_rpath:
|
||||
self.remove_rpath_entry(entrynum)
|
||||
else:
|
||||
+ # Clear old rpath to avoid stale references,
|
||||
+ # not heeding the warning above about de-duplication
|
||||
+ # since it does not seem to cause issues for us
|
||||
+ # and not doing so trips up Nix’s reference checker.
|
||||
+ # See https://github.com/NixOS/nixpkgs/pull/46020
|
||||
+ # and https://github.com/NixOS/nixpkgs/issues/95163
|
||||
+ self.bf.seek(rp_off)
|
||||
+ self.bf.write(b'\0'*len(old_rpath))
|
||||
+
|
||||
self.bf.seek(rp_off)
|
||||
self.bf.write(new_rpath)
|
||||
self.bf.write(b'\0')
|
||||
109
pkgs/development/tools/build-managers/meson/0.60/default.nix
Normal file
109
pkgs/development/tools/build-managers/meson/0.60/default.nix
Normal file
@ -0,0 +1,109 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "meson";
|
||||
version = "0.60.2";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZOaWhWW/G4FS9PnWyoFU77nhTKqaq/eyLnHmxdBT6SE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream insists on not allowing bindir and other dir options
|
||||
# outside of prefix for some reason:
|
||||
# https://github.com/mesonbuild/meson/issues/2561
|
||||
# We remove the check so multiple outputs can work sanely.
|
||||
./allow-dirs-outside-of-prefix.patch
|
||||
|
||||
# Meson is currently inspecting fewer variables than autoconf does, which
|
||||
# makes it harder for us to use setup hooks, etc. Taken from
|
||||
# https://github.com/mesonbuild/meson/pull/6827
|
||||
./more-env-vars.patch
|
||||
|
||||
# Unlike libtool, vanilla Meson does not pass any information
|
||||
# about the path library will be installed to to g-ir-scanner,
|
||||
# breaking the GIR when path other than ${!outputLib}/lib is used.
|
||||
# We patch Meson to add a --fallback-library-path argument with
|
||||
# library install_dir to g-ir-scanner.
|
||||
./gir-fallback-path.patch
|
||||
|
||||
# In common distributions, RPATH is only needed for internal libraries so
|
||||
# meson removes everything else. With Nix, the locations of libraries
|
||||
# are not as predictable, therefore we need to keep them in the RPATH.
|
||||
# At the moment we are keeping the paths starting with /nix/store.
|
||||
# https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
|
||||
(substituteAll {
|
||||
src = ./fix-rpath.patch;
|
||||
inherit (builtins) storeDir;
|
||||
})
|
||||
|
||||
# When Meson removes build_rpath from DT_RUNPATH entry, it just writes
|
||||
# the shorter NUL-terminated new rpath over the old one to reduce
|
||||
# the risk of potentially breaking the ELF files.
|
||||
# But this can cause much bigger problem for Nix as it can produce
|
||||
# cut-in-half-by-\0 store path references.
|
||||
# Let’s just clear the whole rpath and hope for the best.
|
||||
./clear-old-rpath.patch
|
||||
|
||||
# Patch out default boost search paths to avoid impure builds on
|
||||
# unsandboxed non-NixOS builds, see:
|
||||
# https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
|
||||
./boost-Do-not-add-system-paths-on-nix.patch
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
# Meson included tests since 0.45, however they fail in Nixpkgs because they
|
||||
# require a typical building environment (including C compiler and stuff).
|
||||
# Just for the sake of documentation, the next lines are maintained here.
|
||||
doCheck = false;
|
||||
checkInputs = [ ninja pkg-config ];
|
||||
checkPhase = ''
|
||||
python ./run_project_tests.py
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
pushd $out/bin
|
||||
# undo shell wrapper as meson tools are called with python
|
||||
for i in *; do
|
||||
mv ".$i-wrapped" "$i"
|
||||
done
|
||||
popd
|
||||
|
||||
# Do not propagate Python
|
||||
rm $out/nix-support/propagated-build-inputs
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --zsh data/shell-completions/zsh/_meson
|
||||
installShellCompletion --bash data/shell-completions/bash/meson
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mesonbuild.com";
|
||||
description = "An open source, fast and friendly build system made in Python";
|
||||
longDescription = ''
|
||||
Meson is an open source build system meant to be both extremely fast, and,
|
||||
even more importantly, as user friendly as possible.
|
||||
|
||||
The main design point of Meson is that every moment a developer spends
|
||||
writing or debugging build definitions is a second wasted. So is every
|
||||
second spent waiting for the build system to actually start compiling
|
||||
code.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jtojnar mbe AndersonTorres ];
|
||||
inherit (python3.meta) platforms;
|
||||
};
|
||||
}
|
||||
# TODO: a more Nixpkgs-tailoired test suite
|
||||
@ -0,0 +1,24 @@
|
||||
--- a/mesonbuild/backend/backends.py
|
||||
+++ b/mesonbuild/backend/backends.py
|
||||
@@ -456,6 +456,21 @@ class Backend:
|
||||
args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang))
|
||||
except Exception:
|
||||
pass
|
||||
+
|
||||
+ nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split()
|
||||
+ next_is_path = False
|
||||
+ # Try to add rpaths set by user or ld-wrapper so that they are not removed.
|
||||
+ # Based on https://github.com/NixOS/nixpkgs/blob/69711a2f5ffe8cda208163be5258266172ff527f/pkgs/build-support/bintools-wrapper/ld-wrapper.sh#L148-L177
|
||||
+ for flag in nix_ldflags:
|
||||
+ if flag == '-rpath' or flag == '-L':
|
||||
+ next_is_path = True
|
||||
+ elif next_is_path or flag.startswith('-L/'):
|
||||
+ if flag.startswith('-L/'):
|
||||
+ flag = flag[2:]
|
||||
+ if flag.startswith('@storeDir@'):
|
||||
+ dirs.add(flag)
|
||||
+ next_is_path = False
|
||||
+
|
||||
# Match rpath formats:
|
||||
# -Wl,-rpath=
|
||||
# -Wl,-rpath,
|
||||
@ -0,0 +1,21 @@
|
||||
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
||||
index 1c6952df7..9466a0b7d 100644
|
||||
--- a/mesonbuild/modules/gnome.py
|
||||
+++ b/mesonbuild/modules/gnome.py
|
||||
@@ -923,6 +923,16 @@ class GnomeModule(ExtensionModule):
|
||||
if fatal_warnings:
|
||||
scan_command.append('--warn-error')
|
||||
|
||||
+ if len(set(girtarget.get_custom_install_dir()[0] for girtarget in girtargets if girtarget.get_custom_install_dir())) > 1:
|
||||
+ raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets])))
|
||||
+
|
||||
+ if girtargets[0].get_custom_install_dir():
|
||||
+ fallback_libpath = girtargets[0].get_custom_install_dir()[0]
|
||||
+ else:
|
||||
+ fallback_libpath = None
|
||||
+ if fallback_libpath is not None and isinstance(fallback_libpath, str) and len(fallback_libpath) > 0 and fallback_libpath[0] == "/":
|
||||
+ scan_command += ['--fallback-library-path=' + fallback_libpath]
|
||||
+
|
||||
generated_files = [f for f in libsources if isinstance(f, (GeneratedList, CustomTarget, CustomTargetIndex))]
|
||||
|
||||
scan_target = self._make_gir_target(state, girfile, scan_command, generated_files, depends, kwargs)
|
||||
@ -0,0 +1,12 @@
|
||||
diff -Naur meson-0.60.2-old/mesonbuild/environment.py meson-0.60.2-new/mesonbuild/environment.py
|
||||
--- meson-0.60.2-old/mesonbuild/environment.py 2021-11-02 16:58:13.000000000 -0300
|
||||
+++ meson-0.60.2-new/mesonbuild/environment.py 2021-12-12 17:44:00.350499307 -0300
|
||||
@@ -68,7 +68,7 @@
|
||||
# compiling we fall back on the unprefixed host version. This
|
||||
# allows native builds to never need to worry about the 'BUILD_*'
|
||||
# ones.
|
||||
- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]),
|
||||
+ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]),
|
||||
# Always just the unprefixed host versions
|
||||
[var_name]
|
||||
)[for_machine]
|
||||
@ -0,0 +1,37 @@
|
||||
mesonConfigurePhase() {
|
||||
runHook preConfigure
|
||||
|
||||
if [ -z "${dontAddPrefix-}" ]; then
|
||||
mesonFlags="--prefix=$prefix $mesonFlags"
|
||||
fi
|
||||
|
||||
# See multiple-outputs.sh and meson’s coredata.py
|
||||
mesonFlags="\
|
||||
--libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \
|
||||
--bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \
|
||||
--includedir=${!outputInclude}/include \
|
||||
--mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
|
||||
--localedir=${!outputLib}/share/locale \
|
||||
-Dauto_features=${mesonAutoFeatures:-enabled} \
|
||||
-Dwrap_mode=${mesonWrapMode:-nodownload} \
|
||||
$mesonFlags"
|
||||
|
||||
mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags"
|
||||
|
||||
echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"
|
||||
|
||||
meson build $mesonFlags "${mesonFlagsArray[@]}"
|
||||
cd build
|
||||
|
||||
if ! [[ -v enableParallelBuilding ]]; then
|
||||
enableParallelBuilding=1
|
||||
echo "meson: enabled parallel building"
|
||||
fi
|
||||
|
||||
runHook postConfigure
|
||||
}
|
||||
|
||||
if [ -z "${dontUseMesonConfigure-}" -a -z "${configurePhase-}" ]; then
|
||||
setOutputFlags=
|
||||
configurePhase=mesonConfigurePhase
|
||||
fi
|
||||
@ -11,20 +11,23 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2021-11-29";
|
||||
cargoSha256 = "sha256-UgYR0e3Pt3lcbkSDnizlwtwjnqTaqGlXRgR724U4rSU=";
|
||||
version = "2021-12-13";
|
||||
cargoSha256 = "sha256-VF4pwSl3Wei7KxyQFOPj7hVX/NG2zImRLv4iN+ijAs8=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-analyzer";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=";
|
||||
sha256 = "sha256-xt7iDfIoaBhStgqsgttyOFF4NYPQ8jeVwDoYUwrvtrA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Code format and git history check require more dependencies but don't really matter for packaging.
|
||||
# So just ignore them.
|
||||
./ignore-git-and-rustfmt-tests.patch
|
||||
|
||||
# Remove when we have rustc >= 1.57.0.
|
||||
./no-1-57-map-while.patch
|
||||
];
|
||||
|
||||
buildAndTestSubdir = "crates/rust-analyzer";
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
--- a/crates/ide_db/src/helpers.rs
|
||||
+++ b/crates/ide_db/src/helpers.rs
|
||||
@@ -309,7 +309,7 @@ pub fn lint_eq_or_in_group(lint: &str, lint_is: &str) -> bool {
|
||||
pub fn parse_tt_as_comma_sep_paths(input: ast::TokenTree) -> Option<Vec<ast::Path>> {
|
||||
let r_paren = input.r_paren_token();
|
||||
let tokens =
|
||||
- input.syntax().children_with_tokens().skip(1).map_while(|it| match it.into_token() {
|
||||
+ input.syntax().children_with_tokens().skip(1).map(|it| match it.into_token() {
|
||||
// seeing a keyword means the attribute is unclosed so stop parsing here
|
||||
Some(tok) if tok.kind().is_keyword() => None,
|
||||
// don't include the right token tree parenthesis if it exists
|
||||
@@ -317,7 +317,7 @@ pub fn parse_tt_as_comma_sep_paths(input: ast::TokenTree) -> Option<Vec<ast::Pat
|
||||
// only nodes that we can find are other TokenTrees, those are unexpected in this parse though
|
||||
None => None,
|
||||
Some(tok) => Some(tok),
|
||||
- });
|
||||
+ }).take_while(|tok| tok.is_some()).map(|tok| tok.unwrap());
|
||||
let input_expressions = tokens.into_iter().group_by(|tok| tok.kind() == T![,]);
|
||||
let paths = input_expressions
|
||||
.into_iter()
|
||||
@ -28,50 +28,8 @@ sed -e "s#version = \".*\"#version = \"$ver\"#" \
|
||||
-e "/fetchFromGitHub/,/}/ s#sha256 = \".*\"#sha256 = \"$sha256\"#" \
|
||||
-e "s#cargoSha256 = \".*\"#cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"#" \
|
||||
--in-place ./default.nix
|
||||
node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code"
|
||||
|
||||
# Check vscode compatibility
|
||||
req_vscode_ver="$(jq '.engines.vscode' "$node_src/package.json" --raw-output)"
|
||||
req_vscode_ver="${req_vscode_ver#^}"
|
||||
cur_vscode_ver="$(nix-instantiate --eval --strict "$nixpkgs" -A vscode.version | tr -d '"')"
|
||||
if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then
|
||||
echo "vscode $cur_vscode_ver is incompatible with the extension requiring ^$req_vscode_ver"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Prebuilding for cargoSha256"
|
||||
cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).rust-analyzer-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
|
||||
sed "s#cargoSha256 = \".*\"#cargoSha256 = \"$cargo_sha256\"#" \
|
||||
--in-place ./default.nix
|
||||
|
||||
# Update vscode extension
|
||||
|
||||
extension_ver=$(curl "https://github.com/rust-analyzer/rust-analyzer/releases/download/$ver/rust-analyzer.vsix" -L |
|
||||
bsdtar -xf - --to-stdout extension/package.json | # Use bsdtar to extract vsix(zip).
|
||||
jq --raw-output '.version')
|
||||
echo "Extension version: $extension_ver"
|
||||
|
||||
build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps"
|
||||
# We need devDependencies to build vsix.
|
||||
# `esbuild` is a binary package an is already in nixpkgs so we omit it here.
|
||||
jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \
|
||||
--arg ver "$extension_ver" \
|
||||
>"$build_deps/package.json.new"
|
||||
|
||||
old_deps="$(jq '.dependencies' "$build_deps"/package.json)"
|
||||
new_deps="$(jq '.dependencies' "$build_deps"/package.json.new)"
|
||||
if [[ "$old_deps" == "$new_deps" ]]; then
|
||||
echo "package.json dependencies not changed, do simple version change"
|
||||
|
||||
sed -E '/^ "rust-analyzer-build-deps/,+3 s/version = ".*"/version = "'"$extension_ver"'"/' \
|
||||
--in-place ../../../node-packages/node-packages.nix
|
||||
mv "$build_deps"/package.json{.new,}
|
||||
|
||||
else
|
||||
echo "package.json dependencies changed, updating nodePackages"
|
||||
mv "$build_deps"/package.json{.new,}
|
||||
|
||||
pushd "../../../node-packages"
|
||||
./generate.sh
|
||||
popd
|
||||
fi
|
||||
|
||||
@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
preInstall = ''
|
||||
find ./target -name libswc_common.${stdenv.hostPlatform.extensions.sharedLibrary} -delete
|
||||
find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Update script: pkgs/development/tools/rust/rust-analyzer/update.sh
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, vscode-utils
|
||||
, jq
|
||||
, rust-analyzer
|
||||
@ -15,14 +15,26 @@ let
|
||||
pname = "rust-analyzer";
|
||||
publisher = "matklad";
|
||||
|
||||
# Use the plugin version as in vscode marketplace, updated by update script.
|
||||
inherit (vsix) version;
|
||||
|
||||
releaseTag = "2021-11-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-analyzer";
|
||||
repo = "rust-analyzer";
|
||||
rev = releaseTag;
|
||||
sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=";
|
||||
};
|
||||
|
||||
build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps";
|
||||
# FIXME: Making a new derivation to link `node_modules` and run `npm run package`
|
||||
# will cause a build failure.
|
||||
vsix = build-deps.override {
|
||||
src = "${rust-analyzer.src}/editors/code";
|
||||
src = "${src}/editors/code";
|
||||
outputs = [ "vsix" "out" ];
|
||||
|
||||
releaseTag = rust-analyzer.version;
|
||||
inherit releaseTag;
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq moreutils esbuild
|
||||
@ -46,9 +58,6 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
# Use the plugin version as in vscode marketplace, updated by update script.
|
||||
inherit (vsix) version;
|
||||
|
||||
in
|
||||
vscode-utils.buildVscodeExtension {
|
||||
inherit version vsix;
|
||||
@ -68,7 +77,7 @@ vscode-utils.buildVscodeExtension {
|
||||
description = "An alternative rust language server to the RLS";
|
||||
homepage = "https://github.com/rust-analyzer/rust-analyzer";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ oxalica ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "greetd";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~kennylevinsen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "b+S3fuJ8gjnSQzLHl3Bs9iO/Un2ynggAplz01GjJvFI=";
|
||||
sha256 = "sha256-20D6HanUeAc0S9czkNJFmhsrfEqodpafkHsmwKccrHQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YSC7osyBPwx+lo7P1ftI72mRWeQlDc2srRPzTFqVTxM=";
|
||||
cargoHash = "sha256-8nMQ81Y0DnPs9WmxNASlcjTEVw5lh+nZtZ7vmmBCu2g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
scdoc
|
||||
|
||||
@ -2,51 +2,51 @@
|
||||
"4.14": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.257-hardened1.patch",
|
||||
"sha256": "1jqd7drkjpfs9ajkvz0m0l6p0hp74ffchffcrkivqqc99cgzi666",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.257-hardened1/linux-hardened-4.14.257-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.258-hardened1.patch",
|
||||
"sha256": "0rni42mbvyw0f9032i6bkgcwnzfw472vimd5l1q7rp52m63z6vbk",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.258-hardened1/linux-hardened-4.14.258-hardened1.patch"
|
||||
},
|
||||
"sha256": "0jnw02jphvm9zcviwwymxyhq8kd0bk0v1827ninnv6bdy3140izv",
|
||||
"version": "4.14.257"
|
||||
"sha256": "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi",
|
||||
"version": "4.14.258"
|
||||
},
|
||||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.220-hardened1.patch",
|
||||
"sha256": "0i2vcwcan23h6vq9xy2fpi95saw6cgk2l2sfmy7xspkff1avhnns",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.220-hardened1/linux-hardened-4.19.220-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.221-hardened1.patch",
|
||||
"sha256": "0lw4lysiv5h1vlkwlz2z1kv78wsszj1xc383i2qkzfsb4l9vsm7h",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.221-hardened1/linux-hardened-4.19.221-hardened1.patch"
|
||||
},
|
||||
"sha256": "0q5hrh6q2f2r97nff136db7367p3hn0la2gl7q4knms3g8fis1jq",
|
||||
"version": "4.19.220"
|
||||
"sha256": "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3",
|
||||
"version": "4.19.221"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.84-hardened1.patch",
|
||||
"sha256": "1hl213iwf3gv81w68win2z4zwbkq6vxpg3dwy9h8md3kdm9pnhzr",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.84-hardened1/linux-hardened-5.10.84-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.87-hardened1.patch",
|
||||
"sha256": "1r1vyf9wy49s7pfskxlng17n0khi1dpxg5cm4yfnbbq0gdisnh1f",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.87-hardened1/linux-hardened-5.10.87-hardened1.patch"
|
||||
},
|
||||
"sha256": "0g935v0khv0i2qlrwr656hxl28m6zlbclc9rv15nq46xf8fjg5kf",
|
||||
"version": "5.10.84"
|
||||
"sha256": "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3",
|
||||
"version": "5.10.87"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.7-hardened1.patch",
|
||||
"sha256": "0s3lh59lgl5ki5wvpigiv0n3psa9k0aq058aiyxykaw36qdwahy6",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.7-hardened1/linux-hardened-5.15.7-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.10-hardened1.patch",
|
||||
"sha256": "1fn37pg10w1m4cr4g0ibs5fvqs1yx3y776daxv836naffl1001fm",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.10-hardened1/linux-hardened-5.15.10-hardened1.patch"
|
||||
},
|
||||
"sha256": "1caxpqmik6gkhk3437pcgfq6vvlbs962hylgbh64iizd76l5142x",
|
||||
"version": "5.15.7"
|
||||
"sha256": "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8",
|
||||
"version": "5.15.10"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.164-hardened1.patch",
|
||||
"sha256": "1kynk3979jx7b03gkan7b92vf3719wvkdzn5dmdrliy1g5pzx87k",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.164-hardened1/linux-hardened-5.4.164-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.167-hardened1.patch",
|
||||
"sha256": "03mj8nncfpqf5j6l66239saxv251rh5infhl0jjyx1znhfzavg0p",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.167-hardened1/linux-hardened-5.4.167-hardened1.patch"
|
||||
},
|
||||
"sha256": "0142nic300xjdz9s6w1cp6cyhk2c2wpks9wxzqca6jz4da7k0l9r",
|
||||
"version": "5.4.164"
|
||||
"sha256": "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l",
|
||||
"version": "5.4.167"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.257";
|
||||
version = "4.14.258";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0jnw02jphvm9zcviwwymxyhq8kd0bk0v1827ninnv6bdy3140izv";
|
||||
sha256 = "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.220";
|
||||
version = "4.19.221";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0q5hrh6q2f2r97nff136db7367p3hn0la2gl7q4knms3g8fis1jq";
|
||||
sha256 = "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.294";
|
||||
version = "4.4.295";
|
||||
extraMeta.branch = "4.4";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0k0h5m1ng2049d5ggrq4q81vgsfmdpkqla73vg2a3bf2v6ycjmc7";
|
||||
sha256 = "1h3i2lgm2sy325f58jildip7m6sb4hr2n9pm3gc3h2gash65kc2r";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.292";
|
||||
version = "4.9.293";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0y3b6qqv6vrh2p5wwv5bicvbqrvxf1y5xm4myy5pk6yp2igws3kd";
|
||||
sha256 = "0l64rz6ly5ls23lqq0cv98xb4z2mimp2jrsjrs6kq3zm4k2mm4gs";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.84";
|
||||
version = "5.10.87";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0g935v0khv0i2qlrwr656hxl28m6zlbclc9rv15nq46xf8fjg5kf";
|
||||
sha256 = "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.7";
|
||||
version = "5.15.10";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1caxpqmik6gkhk3437pcgfq6vvlbs962hylgbh64iizd76l5142x";
|
||||
sha256 = "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.164";
|
||||
version = "5.4.167";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0142nic300xjdz9s6w1cp6cyhk2c2wpks9wxzqca6jz4da7k0l9r";
|
||||
sha256 = "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,3 @@
|
||||
[
|
||||
{ "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.14.6" }
|
||||
{ "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.16.0" }
|
||||
]
|
||||
|
||||
@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "birdfont";
|
||||
version = "2.29.5";
|
||||
version = "2.29.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-eIqq4ehUB4lF89ikrHeN5Akq14nxYMxREZzPSVnv+nU=";
|
||||
sha256 = "sha256-INHLH3wv1Rr3RLECAN2CQvctIjWdksxdfVfBkWnx+Is=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ];
|
||||
|
||||
@ -26,6 +26,6 @@ buildGoModule rec {
|
||||
description = "Reverse/bind shell generator";
|
||||
homepage = "https://github.com/redcode-labs/GoSH";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,6 +25,6 @@ buildGoModule rec {
|
||||
description = "Tool to extract useful data from documents";
|
||||
homepage = "https://github.com/redcode-labs/Sammler";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,6 +28,6 @@ buildGoModule rec {
|
||||
description = "Polyglot payload generator";
|
||||
homepage = "https://github.com/redcode-labs/SNOWCRASH";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "htmldoc";
|
||||
version = "1.9.12";
|
||||
version = "1.9.13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelrsweet";
|
||||
repo = "htmldoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dqima0g3j301wwzjxdhzk5pvfj724rl615gf8ssxxajfnid1gl0";
|
||||
sha256 = "sha256-wAqH3BKNYbOXMbnaRhz4QZ/49stxC2Qf+yatKBv0i68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
let
|
||||
pname = "pdftk";
|
||||
version = "3.2.1";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "pdftk-java";
|
||||
repo = "pdftk";
|
||||
rev = "v${version}";
|
||||
sha256 = "056db8rjczdfkq7fm3bv5g15y042rc9hb4zh5qccjrdw630vk9y4";
|
||||
sha256 = "1bah0y7nj4r0xwj74lxixhcsc51c93s6m6agkgciv4p1z69y0m66";
|
||||
};
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
@ -32,7 +32,7 @@ let
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "0p59myc5m3ds7fh0zdz3n7l7hx6dj8bpyqxzlhdrqybsyxwpw4w3";
|
||||
outputHash = "06i2la72ag26phlcl52qnjnkscg6adyydwbdylnwbij73q5g15v4";
|
||||
};
|
||||
|
||||
# Point to our local deps repo
|
||||
|
||||
@ -3381,7 +3381,9 @@ with pkgs;
|
||||
|
||||
merriweather-sans = callPackage ../data/fonts/merriweather-sans { };
|
||||
|
||||
meson = callPackage ../development/tools/build-managers/meson { };
|
||||
# TODO: call a sprintable to deprecate Meson 0.57 as soon as possible
|
||||
meson = callPackage ../development/tools/build-managers/meson/0.57 { };
|
||||
meson_0_60 = callPackage ../development/tools/build-managers/meson/0.60 { };
|
||||
|
||||
meson-tools = callPackage ../misc/meson-tools { };
|
||||
|
||||
|
||||
@ -2882,6 +2882,8 @@ in {
|
||||
|
||||
flask-seasurf = callPackage ../development/python-modules/flask-seasurf { };
|
||||
|
||||
flask-session = callPackage ../development/python-modules/flask-session { };
|
||||
|
||||
flask-silk = callPackage ../development/python-modules/flask-silk { };
|
||||
|
||||
flask-socketio = callPackage ../development/python-modules/flask-socketio { };
|
||||
|
||||
@ -396,6 +396,8 @@ with self; with super; {
|
||||
|
||||
pip = callPackage ../development/python-modules/pip/20.nix { };
|
||||
|
||||
platformdirs = callPackage ../development/python-modules/platformdirs/2.nix { };
|
||||
|
||||
pluggy = callPackage ../development/python-modules/pluggy/0.nix { };
|
||||
|
||||
postorius = disabled super.postorius;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user