Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-06-09 18:14:53 +00:00 committed by GitHub
commit cf8441dd85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
139 changed files with 2075 additions and 1286 deletions

12
.github/CODEOWNERS vendored
View file

@ -196,12 +196,12 @@
/nixos/tests/prometheus-exporters.nix @WilliButz /nixos/tests/prometheus-exporters.nix @WilliButz
# PHP interpreter, packages, extensions, tests and documentation # PHP interpreter, packages, extensions, tests and documentation
/doc/languages-frameworks/php.section.md @NixOS/php /doc/languages-frameworks/php.section.md @NixOS/php @aanderse @etu @globin @ma27 @talyz
/nixos/tests/php @NixOS/php /nixos/tests/php @NixOS/php @aanderse @etu @globin @ma27 @talyz
/pkgs/build-support/build-pecl.nix @NixOS/php /pkgs/build-support/build-pecl.nix @NixOS/php @aanderse @etu @globin @ma27 @talyz
/pkgs/development/interpreters/php @NixOS/php @jtojnar /pkgs/development/interpreters/php @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz
/pkgs/development/php-packages @NixOS/php /pkgs/development/php-packages @NixOS/php @aanderse @etu @globin @ma27 @talyz
/pkgs/top-level/php-packages.nix @NixOS/php @jtojnar /pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz
# Podman, CRI-O modules and related # Podman, CRI-O modules and related
/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq /nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq

View file

@ -59,6 +59,15 @@ Follow these steps to backport a change into a release branch in compliance with
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`. 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`.
6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
## Criteria for Backporting changes
Anything that does not cause user or downstream dependency regressions can be backported. This includes:
- New Packages / Modules
- Security / Patch updates
- Version updates which include new functionality (but no breaking changes)
- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
- Security critical applications (E.g. `firefox`)
## Generating 21.11 Release Notes ## Generating 21.11 Release Notes
Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document. Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document.

View file

@ -1,134 +0,0 @@
on:
issue_comment:
types:
- created
# This action allows people with write access to the repo to rebase a PRs base branch
# by commenting `/rebase ${branch}` on the PR while avoiding CODEOWNER notifications.
jobs:
rebase:
runs-on: ubuntu-latest
if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
steps:
- uses: peter-evans/create-or-update-comment@v1
with:
comment-id: ${{ github.event.comment.id }}
reactions: eyes
- uses: scherermichael-oss/action-has-permission@1.0.6
id: check-write-access
with:
required-permission: write
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: check permissions
run: |
echo "Commenter doesn't have write access to the repo"
exit 1
if: "! steps.check-write-access.outputs.has-permission"
- name: setup
run: |
curl "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}" 2>/dev/null >pr.json
cat <<EOF >>"$GITHUB_ENV"
CAN_MODIFY=$(jq -r '.maintainer_can_modify' pr.json)
COMMITS=$(jq -r '.commits' pr.json)
CURRENT_BASE=$(jq -r '.base.ref' pr.json)
PR_BRANCH=$(jq -r '.head.ref' pr.json)
COMMENT_BRANCH=$(echo ${{ github.event.comment.body }} | awk "/^\/rebase / {print \$2}")
PULL_REQUEST=${{ github.event.issue.number }}
EOF
rm pr.json
- name: check branch
env:
PERMANENT_BRANCHES: "haskell-updates|master|nixos|nixpkgs|python-unstable|release|staging"
VALID_BRANCHES: "haskell-updates|master|python-unstable|release-20.09|release-21.05|staging|staging-20.09|staging-21.05|staging-next|staging-next-21.05"
run: |
message() {
cat <<EOF
Can't rebase $PR_BRANCH from $CURRENT_BASE onto $COMMENT_BRANCH (PR:$PULL_REQUEST COMMITS:$COMMITS)
EOF
}
if ! [[ "$COMMENT_BRANCH" =~ ^($VALID_BRANCHES)$ ]]; then
cat <<EOF
Check that the branch from the comment is valid:
$(message)
This action can only rebase onto these branches:
$VALID_BRANCHES
\`/rebase \${branch}\` must be at the start of the line
EOF
exit 1
fi
if [[ "$COMMENT_BRANCH" == "$CURRENT_BASE" ]]; then
cat <<EOF
Check that the branch from the comment isn't the current base branch:
$(message)
EOF
exit 1
fi
if [[ "$COMMENT_BRANCH" == "$PR_BRANCH" ]]; then
cat <<EOF
Check that the branch from the comment isn't the current branch:
$(message)
EOF
exit 1
fi
if [[ "$PR_BRANCH" =~ ^($PERMANENT_BRANCHES) ]]; then
cat <<EOF
Check that the PR branch isn't a permanent branch:
$(message)
EOF
exit 1
fi
if [[ "$CAN_MODIFY" != "true" ]]; then
cat <<EOF
Check that maintainers can edit the PR branch:
$(message)
EOF
exit 1
fi
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: rebase pull request
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
git fetch origin
gh pr checkout "$PULL_REQUEST"
git rebase \
--onto="$(git merge-base origin/"$CURRENT_BASE" origin/"$COMMENT_BRANCH")" \
"HEAD~$COMMITS"
git push --force
curl \
-X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token $GITHUB_TOKEN" \
-d "{ \"base\": \"$COMMENT_BRANCH\" }" \
"https://api.github.com/repos/${{ github.repository }}/pulls/$PULL_REQUEST"
curl \
-X PATCH \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token $GITHUB_TOKEN" \
-d '{ "state": "closed" }' \
"https://api.github.com/repos/${{ github.repository }}/pulls/$PULL_REQUEST"
- uses: peter-evans/create-or-update-comment@v1
with:
issue-number: ${{ github.event.issue.number }}
body: |
Rebased, please reopen the pull request to restart CI
- uses: peter-evans/create-or-update-comment@v1
if: failure()
with:
issue-number: ${{ github.event.issue.number }}
body: |
[Failed to rebase](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})

View file

@ -269,3 +269,14 @@ Other examples of reasons are:
- Previously the build would fail due to, e.g., `getaddrinfo` not being defined - Previously the build would fail due to, e.g., `getaddrinfo` not being defined
- The previous download links were all broken - The previous download links were all broken
- Crash when starting on some X11 systems - Crash when starting on some X11 systems
#### Acceptable backport criteria
The stable branch does have some changes which cannot be backported. Most notable are breaking changes. The desire is to have stable users be uninterrupted when updating packages.
However, many changes are able to be backported, including:
- New Packages / Modules
- Security / Patch updates
- Version updates which include new functionality (but no breaking changes)
- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
- Security critical applications (E.g. `firefox`)

View file

@ -4821,6 +4821,12 @@
githubId = 587870; githubId = 587870;
name = "Jonathan Mettes"; name = "Jonathan Mettes";
}; };
jo1gi = {
email = "joakimholm@protonmail.com";
github = "jo1gi";
githubId = 26695750;
name = "Joakim Holm";
};
joachifm = { joachifm = {
email = "joachifm@fastmail.fm"; email = "joachifm@fastmail.fm";
github = "joachifm"; github = "joachifm";
@ -8595,6 +8601,12 @@
githubId = 6047658; githubId = 6047658;
name = "Ryan Horiguchi"; name = "Ryan Horiguchi";
}; };
ribose-jeffreylau = {
name = "Jeffrey Lau";
email = "jeffrey.lau@ribose.com";
github = "ribose-jeffreylau";
githubId = 2649467;
};
richardipsum = { richardipsum = {
email = "richardipsum@fastmail.co.uk"; email = "richardipsum@fastmail.co.uk";
github = "richardipsum"; github = "richardipsum";

View file

@ -57,7 +57,7 @@ let
}; };
options.extraOptions = mkOption { options.extraOptions = mkOption {
type = listOf str; type = listOf str;
default = []; default = [ ];
description = '' description = ''
Extra command-line options passed to the daemon. See upstream bees documentation. Extra command-line options passed to the daemon. See upstream bees documentation.
''; '';
@ -67,7 +67,8 @@ let
}; };
}; };
in { in
{
options.services.beesd = { options.services.beesd = {
filesystems = mkOption { filesystems = mkOption {
@ -87,37 +88,42 @@ in {
}; };
}; };
config = { config = {
systemd.services = mapAttrs' (name: fs: nameValuePair "beesd@${name}" { systemd.services = mapAttrs'
description = "Block-level BTRFS deduplication for %i"; (name: fs: nameValuePair "beesd@${name}" {
after = [ "sysinit.target" ]; description = "Block-level BTRFS deduplication for %i";
after = [ "sysinit.target" ];
serviceConfig = let serviceConfig =
configOpts = [ let
fs.spec configOpts = [
"verbosity=${toString fs.verbosity}" fs.spec
"idxSizeMB=${toString fs.hashTableSizeMB}" "verbosity=${toString fs.verbosity}"
"workDir=${fs.workDir}" "idxSizeMB=${toString fs.hashTableSizeMB}"
]; "workDir=${fs.workDir}"
configOptsStr = escapeShellArgs configOpts; ];
in { configOptsStr = escapeShellArgs configOpts;
# Values from https://github.com/Zygo/bees/blob/v0.6.1/scripts/beesd%40.service.in in
ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}"; {
ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}"; # Values from https://github.com/Zygo/bees/blob/v0.6.5/scripts/beesd@.service.in
CPUAccounting = true; ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}";
CPUWeight = 12; ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}";
IOSchedulingClass = "idle"; CPUAccounting = true;
IOSchedulingPriority = 7; CPUSchedulingPolicy = "batch";
IOWeight = 10; CPUWeight = 12;
KillMode = "control-group"; IOSchedulingClass = "idle";
KillSignal = "SIGTERM"; IOSchedulingPriority = 7;
MemoryAccounting = true; IOWeight = 10;
Nice = 19; KillMode = "control-group";
Restart = "on-abnormal"; KillSignal = "SIGTERM";
StartupCPUWeight = 25; MemoryAccounting = true;
StartupIOWeight = 25; Nice = 19;
SyslogIdentifier = "bees"; # would otherwise be "bees-service-wrapper" Restart = "on-abnormal";
}; StartupCPUWeight = 25;
wantedBy = ["multi-user.target"]; StartupIOWeight = 25;
}) cfg.filesystems; SyslogIdentifier = "beesd"; # would otherwise be "bees-service-wrapper"
};
wantedBy = [ "multi-user.target" ];
})
cfg.filesystems;
}; };
} }

View file

@ -145,7 +145,7 @@ let
}; };
}; };
gitlabEnv = { gitlabEnv = cfg.packages.gitlab.gitlabEnv // {
HOME = "${cfg.statePath}/home"; HOME = "${cfg.statePath}/home";
PUMA_PATH = "${cfg.statePath}/"; PUMA_PATH = "${cfg.statePath}/";
GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";

View file

@ -107,8 +107,15 @@ in
''; '';
}; };
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs; [
[ xdotool firefox chromium falkon midori ]; xdotool
# Firefox was disabled here, because we needed to disable p11-kit support in nss,
# which is why it will not use the system certificate store for the time being.
# firefox
chromium
falkon
midori
];
}; };
testScript = '' testScript = ''
@ -145,7 +152,14 @@ in
with subtest("Unknown CA is untrusted in curl"): with subtest("Unknown CA is untrusted in curl"):
machine.fail("curl -fv https://bad.example.com") machine.fail("curl -fv https://bad.example.com")
browsers = ["firefox", "chromium", "falkon", "midori"] browsers = [
# Firefox was disabled here, because we needed to disable p11-kit support in nss,
# which is why it will not use the system certificate store for the time being.
# "firefox",
"chromium",
"falkon",
"midori"
]
errors = ["Security Risk", "not private", "Certificate Error", "Security"] errors = ["Security Risk", "not private", "Certificate Error", "Security"]
machine.wait_for_x() machine.wait_for_x()

View file

@ -31,7 +31,6 @@ with pkgs; {
linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19; linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19;
linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4;
linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10;
linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11;
linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12;
linux_testing = makeKernelTest "testing" linuxPackages_testing; linux_testing = makeKernelTest "testing" linuxPackages_testing;

View file

@ -18,13 +18,13 @@ let
in in
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "picard"; pname = "picard";
version = "2.6.2"; version = "2.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "metabrainz"; owner = "metabrainz";
repo = pname; repo = pname;
rev = "release-${version}"; rev = "release-${version}";
sha256 = "1dhkdzc3601rhg8pqljbv3dz7j0mx75brpfhlizhgwgv65qk3ifj"; sha256 = "sha256-bSqGgRXqHGjT+OYCEafsT/btVe+n91+L0kB8fnrywss=";
}; };
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]

View file

@ -0,0 +1,22 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "base16-universal-manager";
version = "1.0";
src = fetchFromGitHub {
owner = "pinpox";
repo = "base16-universal-manager";
rev = "v${version}";
sha256 = "11kal7x0lajzydbc2cvbsix9ympinsiqzfib7dg4b3xprqkyb9zl";
};
vendorSha256 = "19rba689319w3wf0b10yafydyz01kqg8b051vnijcyjyk0khwvsk";
meta = with lib; {
description = "A universal manager to set base16 themes for any supported application";
homepage = "https://github.com/pinpox/base16-universal-manager";
license = licenses.mit;
maintainers = with maintainers; [ jo1gi ];
};
}

View file

@ -5,10 +5,10 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jotta-cli"; pname = "jotta-cli";
version = "0.9.39536"; version = "0.11.44593";
src = fetchzip { src = fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
sha256 = "sha256-JZtc6Si3ZQoRG3q+ctzPPQm7WbMYRailIuq/Y5Avd2s="; sha256 = "1f06zmcpvm0f3phwc43ai6v4ykhkrd4f3br2j89nx9bfmj6ss2ic";
stripRoot = false; stripRoot = false;
}; };
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad
$out/bin/jotta-cli completion > $out/share/bash-completion/completions/jotta-cli.bash $out/bin/jotta-cli completion bash > $out/share/bash-completion/completions/jotta-cli.bash
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,18 +1,20 @@
{ lib, stdenv, fetchFromGitHub, cmake }: { lib, stdenv, fetchFromGitHub, cmake, asciidoctor }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "timewarrior"; pname = "timewarrior";
version = "1.4.2"; version = "1.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GothenburgBitFactory"; owner = "GothenburgBitFactory";
repo = "timewarrior"; repo = "timewarrior";
rev = "v${version}"; rev = "v${version}";
sha256 = "0qvhpva0hmhybn0c2aajndw5vnxar1jw4pjjajd2k2cr6vax29dw"; sha256 = "00ydikzmxym5jhv6w1ii12a6zw5ighddbzxsw03xg8yabzzfnvzw";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake asciidoctor ];
dontUseCmakeBuildDir = true;
meta = with lib; { meta = with lib; {
description = "A command-line time tracker"; description = "A command-line time tracker";

View file

@ -54,9 +54,9 @@ let
# source tree. # source tree.
extraAttrs = buildFun base; extraAttrs = buildFun base;
githubPatch = commit: sha256: fetchpatch { githubPatch = { commit, sha256, revert ? false }: fetchpatch {
url = "https://github.com/chromium/chromium/commit/${commit}.patch"; url = "https://github.com/chromium/chromium/commit/${commit}.patch";
inherit sha256; inherit sha256 revert;
}; };
mkGnFlags = mkGnFlags =
@ -166,6 +166,14 @@ let
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837): # Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
./patches/fix-missing-atspi2-dependency.patch ./patches/fix-missing-atspi2-dependency.patch
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
] ++ lib.optionals (chromiumVersionAtLeast "93") [
# We need to revert this patch to build M93 with LLVM 12.
(githubPatch {
# Reland "Replace 'blacklist' with 'ignorelist' in ./tools/msan/."
commit = "9d080c0934b848ee4a05013c78641e612fcc1e03";
sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c";
revert = true;
})
]; ];
postPatch = '' postPatch = ''

View file

@ -116,7 +116,9 @@ let
then overrideCC stdenv llvmPackages.clangUseLLVM then overrideCC stdenv llvmPackages.clangUseLLVM
else stdenv; else stdenv;
nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss; # Disable p11-kit support in nss until our cacert packages has caught up exposing CKA_NSS_MOZILLA_CA_POLICY
# https://github.com/NixOS/nixpkgs/issues/126065
nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss.override { useP11kit = false; };
# --enable-release adds -ffunction-sections & LTO that require a big amount of # --enable-release adds -ffunction-sections & LTO that require a big amount of
# RAM and the 32-bit memory space cannot handle that linking # RAM and the 32-bit memory space cannot handle that linking

View file

@ -387,11 +387,13 @@
"version": "3.47.0" "version": "3.47.0"
}, },
"grafana": { "grafana": {
"owner": "terraform-providers", "owner": "grafana",
"provider-source-address": "registry.terraform.io/grafana/grafana",
"repo": "terraform-provider-grafana", "repo": "terraform-provider-grafana",
"rev": "v1.5.0", "rev": "v1.10.0",
"sha256": "0zy3bqgpxymp2zygaxzllk1ysdankwxa1sy1djfgr4fs2nlggkwi", "sha256": "0q3j30q1zxpdm0fmda3ivnl754q2p61xn9l30l0a3n0r5b25w8pk",
"version": "1.5.0" "vendorSha256": null,
"version": "1.10.0"
}, },
"gridscale": { "gridscale": {
"owner": "terraform-providers", "owner": "terraform-providers",
@ -515,6 +517,15 @@
"vendorSha256": "08wg16g4mvn6kl8xwn89195a826cb132ijvrgf32c6p7zp4lgmjd", "vendorSha256": "08wg16g4mvn6kl8xwn89195a826cb132ijvrgf32c6p7zp4lgmjd",
"version": "0.2.12" "version": "0.2.12"
}, },
"kafka-connect": {
"owner": "Mongey",
"provider-source-address": "registry.terraform.io/Mongey/kafka-connect",
"repo": "terraform-provider-kafka-connect",
"rev": "v0.2.3",
"sha256": "0fn03l58lkrlinvnxld2ba7z1gx95vxklbhh2z7930pih0vhr0sr",
"vendorSha256": "17fwqhxh22szdys97dxh069z6s8xr3y9i3pi5ckdcr462j1dr95w",
"version": "0.2.3"
},
"keycloak": { "keycloak": {
"owner": "mrparkers", "owner": "mrparkers",
"provider-source-address": "registry.terraform.io/mrparkers/keycloak", "provider-source-address": "registry.terraform.io/mrparkers/keycloak",

View file

@ -54,6 +54,8 @@ in stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName}
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
# Without || true the install would fail on case-insensitive filesystems
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true
ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png
ln -s "${desktopItem}/share/applications" $out/share/ ln -s "${desktopItem}/share/applications" $out/share/

View file

@ -28,7 +28,7 @@ let
else ""); else "");
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "signal-desktop"; pname = "signal-desktop";
version = "5.4.0"; # Please backport all updates to the stable channel. version = "5.4.1"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release. # All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is # When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with: # applied. The expiration date for the current release can be extracted with:
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "046xy033ars70ay5ryj39i5053py00xj92ajdg212pamq415z1zb"; sha256 = "1f1narpqj8gcyi4r574nqm1cbyi3azk1y7d1j300scr51gk74fq6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchgit, jre, coreutils, gradle_6, git, perl { lib, stdenv, fetchurl, fetchgit, jre_headless, coreutils, gradle_6, git, perl
, makeWrapper }: , makeWrapper }:
let let
@ -52,20 +52,28 @@ in stdenv.mkDerivation rec {
inherit pname src version postPatch patches; inherit pname src version postPatch patches;
buildPhase = '' buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
# Use the local packages from -deps # Use the local packages from -deps
sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle
gradle --offline --no-daemon distTar gradle --offline --no-daemon distTar
runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out mkdir -p $out
tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/
wrapProgram $out/bin/signald \ wrapProgram $out/bin/signald \
--prefix PATH : ${lib.makeBinPath [ coreutils ]} \ --prefix PATH : ${lib.makeBinPath [ coreutils ]} \
--set JAVA_HOME "${jre}" --set JAVA_HOME "${jre_headless}"
runHook postInstall
''; '';
nativeBuildInputs = [ git gradle_6 makeWrapper ]; nativeBuildInputs = [ git gradle_6 makeWrapper ];

View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "teams"; pname = "teams";
version = "1.4.00.7556"; version = "1.4.00.13653";
src = fetchurl { src = fetchurl {
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
sha256 = "0yak3jxh0gdn57wjss0s7sdjssf1b70j0klrcpv66bizqvw1xl7b"; sha256 = "1kx4j837fd344zy90nl0j3r8cdvihy6i6gf56wd5n56zngx1fhjv";
}; };
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip
, lsb-release, freetype, fontconfig, polkit, polkit_gnome , lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils
, pulseaudio }: , pulseaudio }:
let let
@ -76,7 +76,7 @@ in stdenv.mkDerivation rec {
$out/bin/anydesk $out/bin/anydesk
wrapProgram $out/bin/anydesk \ wrapProgram $out/bin/anydesk \
--prefix PATH : ${lib.makeBinPath [ lsb-release ]} --prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]}
substituteInPlace $out/share/applications/*.desktop \ substituteInPlace $out/share/applications/*.desktop \
--subst-var out --subst-var out

View file

@ -9,18 +9,18 @@
buildGoModule rec { buildGoModule rec {
pname = "shellhub-agent"; pname = "shellhub-agent";
version = "0.7.0"; version = "0.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shellhub-io"; owner = "shellhub-io";
repo = "shellhub"; repo = "shellhub";
rev = "v${version}"; rev = "v${version}";
sha256 = "07gfi0l9l19cy7304v18knbfhs7zqhfglw0jjhcmxa79dg6wzdia"; sha256 = "0fgkjv7p2p0k58ifs77qfy0ni2yhrmk8rqyysjxq0im6j3f3az11";
}; };
modRoot = "./agent"; modRoot = "./agent";
vendorSha256 = "0rcb384yxk1dsip15qh32rkd07i2zzr1k53wcfpnrgi6jpixvsvi"; vendorSha256 = "1avl5xvav9y2vni5w3ksvrcz67x2kkadqw9p1cfq5rkjny1c2jrg";
buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ];

View file

@ -8,10 +8,10 @@ let allVersions = with lib; flip map
# N.B. Versions in this list should be ordered from newest to oldest. # N.B. Versions in this list should be ordered from newest to oldest.
[ [
{ {
version = "12.2.0"; version = "12.3.0";
lang = "en"; lang = "en";
language = "English"; language = "English";
sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7"; sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215";
} }
{ {
version = "11.3.0"; version = "11.3.0";

View file

@ -1,20 +1,20 @@
{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 { stdenv, lib, fetchurl, makeWrapper, cmake, git, ftgl, gl2ps, glew, gsl
, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre , libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json
, pkg-config, python, xxHash, zlib, zstd , pkg-config, python, xxHash, zlib, zstd
, libAfterImage, giflib, libjpeg, libtiff, libpng , libAfterImage, giflib, libjpeg, libtiff, libpng
, Cocoa, OpenGL, noSplash ? false }: , Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "root"; pname = "root";
version = "6.22.08"; version = "6.24.00";
src = fetchurl { src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
sha256 = "0vrgi83hrw4n9zgx873fn4ba3vk54slrwk1cl4cc4plgxzv1y1kg"; sha256 = "12crjzd7pzx5qpk2pb3z0rhmxlw5gsqaqzfl48qiq8c9l940b8wx";
}; };
nativeBuildInputs = [ makeWrapper cmake pkg-config llvm_5.dev ]; nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng nlohmann_json python.pkgs.numpy ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
; ;
@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
--replace 'set(lcgpackages ' '#set(lcgpackages ' --replace 'set(lcgpackages ' '#set(lcgpackages '
# Don't require textutil on macOS
: > cmake/modules/RootCPack.cmake
# Hardcode path to fix use with cmake
sed -i cmake/scripts/ROOTConfig.cmake.in \
-e 'iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")'
patchShebangs build/unix/ patchShebangs build/unix/
'' + lib.optionalString noSplash '' '' + lib.optionalString noSplash ''
substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
@ -35,11 +42,13 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-Drpath=ON" "-Drpath=ON"
"-DCMAKE_CXX_STANDARD=17"
"-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_INCLUDEDIR=include"
"-Dbuiltin_nlohmannjson=OFF"
"-Dbuiltin_openui5=OFF"
"-Dalien=OFF" "-Dalien=OFF"
"-Dbonjour=OFF" "-Dbonjour=OFF"
"-Dbuiltin_llvm=OFF"
"-Dcastor=OFF" "-Dcastor=OFF"
"-Dchirp=OFF" "-Dchirp=OFF"
"-Dclad=OFF" "-Dclad=OFF"
@ -53,6 +62,7 @@ stdenv.mkDerivation rec {
"-Dgfal=OFF" "-Dgfal=OFF"
"-Dgviz=OFF" "-Dgviz=OFF"
"-Dhdfs=OFF" "-Dhdfs=OFF"
"-Dhttp=ON"
"-Dkrb5=OFF" "-Dkrb5=OFF"
"-Dldap=OFF" "-Dldap=OFF"
"-Dmonalisa=OFF" "-Dmonalisa=OFF"
@ -64,9 +74,11 @@ stdenv.mkDerivation rec {
"-Dpythia6=OFF" "-Dpythia6=OFF"
"-Dpythia8=OFF" "-Dpythia8=OFF"
"-Drfio=OFF" "-Drfio=OFF"
"-Droot7=OFF"
"-Dsqlite=OFF" "-Dsqlite=OFF"
"-Dssl=OFF" "-Dssl=OFF"
"-Dvdt=OFF" "-Dvdt=OFF"
"-Dwebgui=OFF"
"-Dxml=ON" "-Dxml=ON"
"-Dxrootd=OFF" "-Dxrootd=OFF"
] ]

View file

@ -1,8 +1,8 @@
diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
--- a/cmake/modules/SetUpMacOS.cmake --- a/cmake/modules/SetUpMacOS.cmake
+++ b/cmake/modules/SetUpMacOS.cmake +++ b/cmake/modules/SetUpMacOS.cmake
@@ -8,17 +8,10 @@ set(ROOT_ARCHITECTURE macosx) @@ -28,17 +28,10 @@ if(CMAKE_VERSION VERSION_LESS 3.14.4)
set(ROOT_PLATFORM macosx) endif()
if (CMAKE_SYSTEM_NAME MATCHES Darwin) if (CMAKE_SYSTEM_NAME MATCHES Darwin)
- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" - EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
@ -19,16 +19,15 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
#TODO: check haveconfig and rpath -> set rpath true #TODO: check haveconfig and rpath -> set rpath true
#TODO: check Thread, define link command #TODO: check Thread, define link command
#TODO: more stuff check configure script #TODO: more stuff check configure script
@@ -37,23 +30,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) @@ -57,22 +50,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
- else() - else()
- MESSAGE(STATUS "Found a 32bit system")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
- endif() endif()
- endif() - endif()
- -
- if(MACOSX_VERSION VERSION_GREATER 10.6) - if(MACOSX_VERSION VERSION_GREATER 10.6)
@ -40,11 +39,10 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
- if(MACOSX_VERSION VERSION_GREATER 10.8) - if(MACOSX_VERSION VERSION_GREATER 10.8)
- set(MACOSX_GLU_DEPRECATED ON) - set(MACOSX_GLU_DEPRECATED ON)
- endif() - endif()
+ endif()
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "Found GNU compiler collection") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wshadow -Wall -Woverloaded-virtual -fsigned-char -fno-common")
@@ -115,7 +92,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) @@ -130,7 +108,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
endif() endif()
#---Set Linker flags---------------------------------------------------------------------- #---Set Linker flags----------------------------------------------------------------------

View file

@ -2,8 +2,8 @@
}: }:
let let
version = "1.2.0"; version = "1.2.1";
sha256 = "1z9fmrfxqi56pj7f1506q2z41crz702jk88gv57baf6fz63m93v2"; sha256 = "sha256-sm5SmckaXVjF3odqzYrbC46E1nPzQ9cuNJnNSAa7RWY=";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "git-vendor"; pname = "git-vendor";

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "glab"; pname = "glab";
version = "1.17.0"; version = "1.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "profclems"; owner = "profclems";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-UW6KYqqeDnswPSHrjprbClnIwpX5zA+ePq7kwlsWEfA="; sha256 = "sha256-/WKfMmaFjnzRWCJZEZF/CguU0K7FOtgvKNMSQGvjODQ=";
}; };
vendorSha256 = "sha256-5hVIwEG70r9EDyapQ/OBlHfA1Zw5y4KxEysX415t3xk="; vendorSha256 = "sha256-PCkVjLdOdOhJGNSkVPFK/ONRdJT7MS0COjYgPNT5dNw=";
runVend = true; runVend = true;
# Tests are trying to access /homeless-shelter # Tests are trying to access /homeless-shelter

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-repo"; pname = "git-repo";
version = "2.15.3"; version = "2.15.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "android"; owner = "android";
repo = "tools_repo"; repo = "tools_repo";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SuHp6C5ueUErvRiWDQNEmCybFIa7Iu7C/FtnHys9XqU="; sha256 = "1ayw2pz9falcsi528q63z3w7npzkk7y8z258danqh41j6q9871js";
}; };
# Fix 'NameError: name 'ssl' is not defined' # Fix 'NameError: name 'ssl' is not defined'

View file

@ -131,6 +131,7 @@ stdenv.mkDerivation {
${lib.optionalString (!gitlabEnterprise) '' ${lib.optionalString (!gitlabEnterprise) ''
# Remove all proprietary components # Remove all proprietary components
rm -rf ee rm -rf ee
sed -i 's/-ee//' ./VERSION
''} ''}
# For reasons I don't understand "bundle exec" ignores the # For reasons I don't understand "bundle exec" ignores the
@ -181,6 +182,7 @@ stdenv.mkDerivation {
GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION; GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION;
GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION; GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION;
GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION; GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION;
gitlabEnv.FOSS_ONLY = lib.boolToString (!gitlabEnterprise);
tests = { tests = {
nixos-test-passes = nixosTests.gitlab; nixos-test-passes = nixosTests.gitlab;
}; };

View file

@ -5,7 +5,7 @@
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mpv-playlistmanager"; pname = "mpv-youtube-quality";
version = "unstable-2020-02-11"; version = "unstable-2020-02-11";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "river"; pname = "river";
version = "unstable-2021-05-07"; version = "unstable-2021-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ifreund"; owner = "ifreund";
repo = pname; repo = pname;
rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d"; rev = "0e9dc089d14e2b5c923d483c62d342af29493cf0";
sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j"; sha256 = "sha256-2rIZYr9Y+IBrox5MVrPpHeI8OVSXHsMZmcCagsX56lU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native -Dxwayland -Dman-pages --prefix $out install zig build -Drelease-safe -Dcpu=baseline -Dxwayland -Dman-pages --prefix $out install
runHook postInstall runHook postInstall
''; '';

View file

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
''; '';
mesonFlags = [ mesonFlags = [
"-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm" "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
"-Dvariants=light,darker,dark,lighter" "-Dvariants=light,darker,dark,lighter"
"-Dcinnamon_version=${cinnamon.cinnamon-common.version}" "-Dcinnamon_version=${cinnamon.cinnamon-common.version}"
"-Dgnome_shell_version=${gnome.gnome-shell.version}" "-Dgnome_shell_version=${gnome.gnome-shell.version}"

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vimix-gtk-themes"; pname = "vimix-gtk-themes";
version = "2020-11-28"; version = "2021-04-25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1m84p4cs9dfwc27zfjnwgkfdnfmlzbimq3g5z4mhz23cijm178rf"; sha256 = "0ak763vs27h5z2pgcqpz1g1hypn5gl0p0ylffawc9zdi1wp2mpxb";
}; };
buildInputs = [ gtk_engines ]; buildInputs = [ gtk_engines ];
@ -16,16 +16,18 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
installPhase = '' installPhase = ''
runHook preInstall
patchShebangs . patchShebangs .
mkdir -p $out/share/themes mkdir -p $out/share/themes
name= ./install.sh -d $out/share/themes name= ./install.sh --all --dest $out/share/themes
rm $out/share/themes/*/{AUTHORS,LICENSE} rm $out/share/themes/*/{AUTHORS,LICENSE}
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
description = "Flat Material Design theme for GTK based desktop environments"; description = "Flat Material Design theme for GTK based desktop environments";
homepage = "https://github.com/vinceliuice/vimix-gtk-themes"; homepage = "https://github.com/vinceliuice/vimix-gtk-themes";
license = licenses.gpl3; license = licenses.gpl3Only;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];
}; };

View file

@ -282,11 +282,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members; maintainers = lib.teams.gcc.members;
platforms = platforms = lib.platforms.unix;
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
}; };
} }

View file

@ -287,11 +287,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members; maintainers = lib.teams.gcc.members;
platforms = platforms = lib.platforms.unix;
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
}; };
} }

View file

@ -309,11 +309,7 @@ stdenv.mkDerivation ({
maintainers = with lib.maintainers; [ peti veprbl ]; maintainers = with lib.maintainers; [ peti veprbl ];
platforms = platforms = lib.platforms.unix;
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
badPlatforms = [ "x86_64-darwin" ]; badPlatforms = [ "x86_64-darwin" ];
}; };
} }

View file

@ -321,11 +321,7 @@ stdenv.mkDerivation ({
maintainers = with lib.maintainers; [ peti veprbl ]; maintainers = with lib.maintainers; [ peti veprbl ];
platforms = platforms = lib.platforms.unix;
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
badPlatforms = [ "x86_64-darwin" ]; badPlatforms = [ "x86_64-darwin" ];
}; };
} }

View file

@ -343,11 +343,7 @@ stdenv.mkDerivation ({
maintainers = with lib.maintainers; [ peti ]; maintainers = with lib.maintainers; [ peti ];
platforms = platforms = lib.platforms.unix;
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
}; };
} }

View file

@ -296,11 +296,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members; maintainers = lib.teams.gcc.members;
platforms = platforms = lib.platforms.unix;
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
}; };
} }

View file

@ -278,11 +278,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members; maintainers = lib.teams.gcc.members;
platforms = platforms = lib.platforms.unix;
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
}; };
} }

View file

@ -297,11 +297,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members; maintainers = lib.teams.gcc.members;
platforms = platforms = lib.platforms.unix;
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
}; };
} }

View file

@ -4,12 +4,12 @@
, parsec, process, regex-compat, text, time }: , parsec, process, regex-compat, text, time }:
let let
version = "2.1.1"; version = "2.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koka-lang"; owner = "koka-lang";
repo = "koka"; repo = "koka";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-cq+dljfTKJh5NgwQfxQQP9jRcg2PQxxBVEgQ59ll36o="; sha256 = "sha256-MPMA8ZErEKv1SrkliLsy35k88GrdsPqIK6yokQreIjE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
kklib = stdenv.mkDerivation { kklib = stdenv.mkDerivation {

View file

@ -0,0 +1,26 @@
{ callPackage, fetchpatch, lib, stdenv }:
callPackage ./generic.nix {
version = "1.12.0";
sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g";
patches = [
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch";
sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s";
excludes = [ "src/idl_gen_cpp.cpp" ];
})
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch";
sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4";
})
];
preConfigure = lib.optional stdenv.buildPlatform.isDarwin ''
rm BUILD
'';
}

View file

@ -0,0 +1,6 @@
{ callPackage }:
callPackage ./generic.nix {
version = "2.0.0";
sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8";
}

View file

@ -1,55 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
pname = "flatbuffers";
version = "1.12.0";
src = fetchFromGitHub {
owner = "google";
repo = "flatbuffers";
rev = "v${version}";
sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g";
};
patches = [
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch";
sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s";
excludes = [ "src/idl_gen_cpp.cpp" ];
})
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch";
sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4";
})
];
preConfigure = lib.optional stdenv.buildPlatform.isDarwin ''
rm BUILD
'';
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ];
# tests fail to compile
doCheck = false;
# doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkTarget = "test";
meta = with lib; {
description = "Memory Efficient Serialization Library";
longDescription = ''
FlatBuffers is an efficient cross platform serialization library for
games and other memory constrained apps. It allows you to directly
access serialized data without unpacking/parsing it first, while still
having great forwards/backwards compatibility.
'';
maintainers = [ maintainers.teh ];
license = licenses.asl20;
platforms = platforms.unix;
homepage = "https://google.github.io/flatbuffers/";
};
}

View file

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, version
, sha256
, patches ? [ ]
, preConfigure ? null
}:
stdenv.mkDerivation rec {
pname = "flatbuffers";
inherit version;
src = fetchFromGitHub {
owner = "google";
repo = "flatbuffers";
rev = "v${version}";
inherit sha256;
};
inherit patches preConfigure;
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
];
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkTarget = "test";
meta = with lib; {
description = "Memory Efficient Serialization Library";
longDescription = ''
FlatBuffers is an efficient cross platform serialization library for
games and other memory constrained apps. It allows you to directly
access serialized data without unpacking/parsing it first, while still
having great forwards/backwards compatibility.
'';
maintainers = [ maintainers.teh ];
license = licenses.asl20;
platforms = platforms.unix;
homepage = "https://google.github.io/flatbuffers/";
};
}

View file

@ -0,0 +1,35 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "pico-sdk";
version = "1.2.0";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = pname;
rev = version;
sha256 = "00z160f7ypws5pzp1ql7xrs3gmjcbw6gywnnq2fiwl47940balns";
};
nativeBuildInputs = [ cmake ];
# SDK contains libraries and build-system to develop projects for RP2040 chip
# We only need to compile pioasm binary
sourceRoot = "source/tools/pioasm";
installPhase = ''
runHook preInstall
mkdir -p $out/lib/pico-sdk
cp -a ../../../* $out/lib/pico-sdk/
chmod 755 $out/lib/pico-sdk/tools/pioasm/build/pioasm
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/raspberrypi/picotool";
description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices";
license = licenses.bsd3;
maintainers = with maintainers; [ musfay ];
platforms = platforms.unix;
};
}

View file

@ -8,13 +8,13 @@ let inherit (lib) optional versionAtLeast; in
buildDunePackage rec { buildDunePackage rec {
pname = "lwt"; pname = "lwt";
version = "5.4.0"; version = "5.4.1";
useDune2 = true; useDune2 = true;
src = fetchzip { src = fetchzip {
url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz";
sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d"; sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -1,24 +1,22 @@
{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, cppo }: { lib, buildDunePackage, fetchzip, cppo }:
let version = "1.0"; in buildDunePackage rec {
version = "1.1";
stdenv.mkDerivation { pname = "ocplib-endian";
name = "ocaml${ocaml.version}-ocplib-endian-${version}";
src = fetchzip { src = fetchzip {
url = "https://github.com/OCamlPro/ocplib-endian/archive/${version}.tar.gz"; url = "https://github.com/OCamlPro/ocplib-endian/archive/${version}.tar.gz";
sha256 = "0s1ld3kavz892b8awyxyg1mr98h2g61gy9ci5v6yb49bsii6wicw"; sha256 = "sha256-zKsSkhlZBXSqPtw+/WN3pwo9plM9rDZfMbGVfosqb10=";
}; };
buildInputs = [ ocaml findlib ocamlbuild cppo ]; useDune2 = true;
createFindlibDestdir = true; buildInputs = [ cppo ];
meta = { meta = with lib; {
description = "Optimised functions to read and write int16/32/64"; description = "Optimised functions to read and write int16/32/64";
homepage = "https://github.com/OCamlPro/ocplib-endian"; homepage = "https://github.com/OCamlPro/ocplib-endian";
license = lib.licenses.lgpl21; license = licenses.lgpl21;
platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ];
maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

View file

@ -13,5 +13,10 @@ buildPecl {
makeFlags = [ "phpincludedir=$(dev)/include" ]; makeFlags = [ "phpincludedir=$(dev)/include" ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "Userland cache for PHP";
license = licenses.php301;
homepage = "https://pecl.php.net/package/APCu";
maintainers = teams.php.members;
};
} }

View file

@ -14,6 +14,11 @@ buildPecl {
mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so
''; '';
meta.maintainers = lib.teams.php.members; meta = with lib; {
meta.broken = lib.versionAtLeast php.version "8"; description = "APCu Backwards Compatibility Module";
license = licenses.php301;
homepage = "https://pecl.php.net/package/apcu_bc";
maintainers = teams.php.members;
broken = versionAtLeast php.version "8";
};
} }

View file

@ -6,5 +6,10 @@ buildPecl {
version = "1.0.10"; version = "1.0.10";
sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30"; sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30";
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "Exposes the abstract syntax tree generated by PHP";
license = licenses.bsd3;
homepage = "https://pecl.php.net/package/ast";
maintainers = teams.php.members;
};
} }

View file

@ -44,6 +44,11 @@ buildPecl {
'') '')
]; ];
meta.broken = lib.versionAtLeast php.version "8.0"; meta = with lib; {
meta.maintainers = lib.teams.php.members; description = "Couchbase Server PHP extension";
license = licenses.asl20;
homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html";
maintainers = teams.php.members;
broken = versionAtLeast php.version "8.0";
};
} }

View file

@ -10,5 +10,10 @@ buildPecl {
makeFlags = [ "phpincludedir=$(dev)/include" ]; makeFlags = [ "phpincludedir=$(dev)/include" ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "Binary serialization for PHP";
license = licenses.bsd3;
homepage = "https://github.com/igbinary/igbinary/";
maintainers = teams.php.members;
};
} }

View file

@ -23,5 +23,10 @@ buildPecl {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre2 ]; buildInputs = [ pcre2 ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "Imagick is a native php extension to create and modify images using the ImageMagick API";
license = licenses.php301;
homepage = "https://pecl.php.net/package/imagick";
maintainers = teams.php.members;
};
} }

View file

@ -11,5 +11,10 @@ buildPecl {
echo "#define HAVE_MBSTRING 1" >> config.h echo "#define HAVE_MBSTRING 1" >> config.h
''; '';
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "Mailparse is an extension for parsing and working with email messages";
license = licenses.php301;
homepage = "https://pecl.php.net/package/mailparse";
maintainers = lib.teams.php.members;
};
} }

View file

@ -19,6 +19,7 @@ buildPecl {
meta = with lib; { meta = with lib; {
description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
license = with licenses; [ asl20 ]; license = with licenses; [ asl20 ];
homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php";
maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members;
}; };
} }

View file

@ -26,5 +26,10 @@ buildPecl {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ cyrus_sasl zlib ]; buildInputs = [ cyrus_sasl zlib ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "PHP extension for interfacing with memcached via libmemcached library";
license = licenses.php301;
homepage = "https://github.com/php-memcached-dev/php-memcached";
maintainers = teams.php.members;
};
} }

View file

@ -17,5 +17,10 @@ buildPecl {
pcre2 pcre2
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "MongoDB driver for PHP";
license = licenses.asl20;
homepage = "https://docs.mongodb.com/drivers/php/";
maintainers = teams.php.members;
};
} }

View file

@ -11,5 +11,10 @@ buildPecl {
sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4 sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4
''; '';
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "Extension for Oracle Database";
license = licenses.php301;
homepage = "https://pecl.php.net/package/oci8";
maintainers = teams.php.members;
};
} }

View file

@ -8,5 +8,10 @@ buildPecl {
buildInputs = [ pcre2 ]; buildInputs = [ pcre2 ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "A self contained php-code-coverage compatible driver for PHP.";
license = licenses.php301;
homepage = "https://github.com/krakjoe/pcov";
maintainers = teams.php.members;
};
} }

View file

@ -19,6 +19,7 @@ buildPecl {
meta = with lib; { meta = with lib; {
description = "A PHP extension for Dlib"; description = "A PHP extension for Dlib";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
homepage = "https://github.com/goodspb/pdlib";
maintainers = lib.teams.php.members; maintainers = lib.teams.php.members;
}; };
} }

View file

@ -10,5 +10,10 @@ buildPecl {
buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "Microsoft Drivers for PHP for SQL Server";
license = licenses.mit;
homepage = "https://github.com/Microsoft/msphpsql";
maintainers = teams.php.members;
};
} }

View file

@ -20,6 +20,11 @@ buildPecl {
"--with-libxl-libdir=${libxl}/lib" "--with-libxl-libdir=${libxl}/lib"
]; ];
meta.broken = lib.versionAtLeast php.version "8.0"; meta = with lib; {
meta.maintainers = lib.teams.php.members; description = "PHP Extension interface to the Excel writing/reading library";
license = licenses.php301;
homepage = "https://github.com/iliaal/php_excel";
maintainers = lib.teams.php.members;
broken = lib.versionAtLeast php.version "8.0";
};
} }

View file

@ -2,8 +2,6 @@
let let
pname = "phpmd"; pname = "phpmd";
version = "2.8.2"; version = "2.8.2";
isPhp74 = lib.versionAtLeast php.version "7.4";
in in
mkDerivation { mkDerivation {
inherit pname version; inherit pname version;
@ -28,6 +26,6 @@ mkDerivation {
license = licenses.bsd3; license = licenses.bsd3;
homepage = "https://phpmd.org/"; homepage = "https://phpmd.org/";
maintainers = teams.php.members; maintainers = teams.php.members;
broken = !isPhp74; broken = versionAtLeast php.version "7.4";
}; };
} }

View file

@ -17,6 +17,7 @@ buildPecl {
Pinba is a MySQL storage engine that acts as a realtime monitoring and Pinba is a MySQL storage engine that acts as a realtime monitoring and
statistics server for PHP using MySQL as a read-only interface. statistics server for PHP using MySQL as a read-only interface.
''; '';
license = licenses.lgpl2Plus;
homepage = "http://pinba.org/"; homepage = "http://pinba.org/";
maintainers = teams.php.members; maintainers = teams.php.members;
}; };

View file

@ -15,6 +15,7 @@ buildPecl {
meta = with lib; { meta = with lib; {
description = "Kafka client based on librdkafka"; description = "Kafka client based on librdkafka";
license = licenses.mit;
homepage = "https://github.com/arnaud-lb/php-rdkafka"; homepage = "https://github.com/arnaud-lb/php-rdkafka";
maintainers = teams.php.members; maintainers = teams.php.members;
}; };

View file

@ -14,5 +14,10 @@ buildPecl {
hash hash
]; ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "PHP extension for interfacing with Redis";
license = licenses.php301;
homepage = "https://github.com/phpredis/phpredis/";
maintainers = teams.php.members;
};
} }

View file

@ -10,5 +10,10 @@ buildPecl {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ samba ]; buildInputs = [ samba ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "PHP wrapper for libsmbclient";
license = licenses.bsd2;
homepage = "https://github.com/eduardok/libsmbclient-php";
maintainers = teams.php.members;
};
} }

View file

@ -10,5 +10,10 @@ buildPecl {
unixODBC unixODBC
] ++ lib.optionals stdenv.isDarwin [ libiconv ]; ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "Microsoft Drivers for PHP for SQL Server";
license = licenses.mit;
homepage = "https://github.com/Microsoft/msphpsql";
maintainers = teams.php.members;
};
} }

View file

@ -11,5 +11,10 @@ buildPecl {
zendExtension = true; zendExtension = true;
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "Provides functions for function traces and profiling";
license = licenses.php301;
homepage = "https://xdebug.org/";
maintainers = teams.php.members;
};
} }

View file

@ -10,5 +10,10 @@ buildPecl {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
meta.maintainers = lib.teams.php.members; meta = with lib; {
description = "YAML-1.1 parser and emitter";
license = licenses.mit;
homepage = "http://bd808.com/pecl-file_formats-yaml/";
maintainers = teams.php.members;
};
} }

View file

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "adafruit-platformdetect"; pname = "adafruit-platformdetect";
version = "3.13.3"; version = "3.13.4";
src = fetchPypi { src = fetchPypi {
pname = "Adafruit-PlatformDetect"; pname = "Adafruit-PlatformDetect";
inherit version; inherit version;
sha256 = "sha256-tA3UafaFvUH6Ko0OAXhh8Jz+ht+seTuhPjBsHHaI6rE="; sha256 = "sha256-e8hliPYLvHR3JjZ4AFgJWjPW1vK10BYuVqUYtF54J5c=";
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];

View file

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ailment"; pname = "ailment";
version = "9.0.7833"; version = "9.0.7912";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-GUy1wETKV9Y9RYwJZqV22a0GrWkVRJRuFv/ADzPCzPg="; sha256 = "sha256-q1mi8ZNvjb3XM3le4ysy58bb978102OFKypTp9mSzxo=";
}; };
propagatedBuildInputs = [ pyvex ]; propagatedBuildInputs = [ pyvex ];

View file

@ -5,7 +5,7 @@
, asynctest , asynctest
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, poetry , poetry-core
, pytest-aiohttp , pytest-aiohttp
, pytest-asyncio , pytest-asyncio
, pytestCheckHook , pytestCheckHook
@ -27,7 +27,9 @@ buildPythonPackage rec {
format = "pyproject"; format = "pyproject";
nativeBuildInputs = [ poetry ]; nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [ propagatedBuildInputs = [
aiohttp aiohttp
@ -44,8 +46,17 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
# Ignore the examples as they are prefixed with test_ postPatch = ''
pytestFlagsArray = [ "--ignore examples/" ]; # https://github.com/bachya/aioguardian/pull/66
substituteInPlace pyproject.toml \
--replace 'asyncio_dgram = "^1.0.1"' 'asyncio_dgram = "^2.0.0"'
# https://github.com/bachya/aioguardian/pull/67
substituteInPlace pyproject.toml \
--replace "poetry>=0.12" "poetry-core"
'';
disabledTestPaths = [ "examples/" ];
pythonImportsCheck = [ "aioguardian" ]; pythonImportsCheck = [ "aioguardian" ];
meta = with lib; { meta = with lib; {

View file

@ -42,14 +42,14 @@ in
buildPythonPackage rec { buildPythonPackage rec {
pname = "angr"; pname = "angr";
version = "9.0.7833"; version = "9.0.7912";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1D1FhRhFHpQSQnMAPmp78TRIx9T5LL5MIdaYV/hPCv0="; sha256 = "sha256-261fk0JM37Hq+xsMF95VqLyidWE4ZUeygp8BP/DBXG4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "angrop"; pname = "angrop";
version = "9.0.7833"; version = "9.0.7912";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-JhD4/P5/IhmLBvmG3XoIEYVkowK+dDoLuwOdMhGi5q8="; sha256 = "sha256-nbVvgbTk9LFA376alu4Cxqcu9b9CT9yutnfE5fVT8gY=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "archinfo"; pname = "archinfo";
version = "9.0.7833"; version = "9.0.7912";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-wieg38cHxliHU7esoSOl5ViiS/uR5yVJh9l3SEsb3mo="; sha256 = "sha256-nHXF6Il6rHHrnGYEmv4FPQr6MsurzH1exkJS9UXThBs=";
}; };
checkInputs = [ checkInputs = [

View file

@ -8,13 +8,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "asyncio-dgram"; pname = "asyncio-dgram";
version = "1.2.0"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jsbronder"; owner = "jsbronder";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-wgcL/BdNjzitkkaGyRUQbW1uv1enLDnHk30YHClK58o="; sha256 = "sha256-EL3iOoCfLAtfdMI1J2XMf4izOEo9+a+0PNQs+4HuEfo=";
}; };
# OSError: AF_UNIX path too long # OSError: AF_UNIX path too long

View file

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pytestrunner
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -13,8 +12,6 @@ buildPythonPackage rec {
sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089"; sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089";
}; };
nativeBuildInputs = [ pytestrunner ];
# No tests, need to disable or py3k breaks # No tests, need to disable or py3k breaks
doCheck = false; doCheck = false;

View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "claripy"; pname = "claripy";
version = "9.0.7833"; version = "9.0.7912";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-C+YjpnMpz96v9QUkcdlhGl83V4UHnWAKZV2eR+vZX3c="; sha256 = "sha256-p9i3ajN/CpLdwcg8HLhtION0ghgs1fcnqjzUrxu1wDw=";
}; };
# Use upstream z3 implementation # Use upstream z3 implementation

View file

@ -15,7 +15,7 @@
let let
# The binaries are following the argr projects release cycle # The binaries are following the argr projects release cycle
version = "9.0.7833"; version = "9.0.7912";
# Binary files from https://github.com/angr/binaries (only used for testing and only here) # Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub { binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-P8bz50OgJifGWbWRyGXEB3FRfJHG1m9RgMatKA/XQLc="; sha256 = "sha256-AHJk40uRhrlQbfzRmMJXremKxnxjpmxLLAAYxNV9vkc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -12,12 +12,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-imread"; pname = "python-imread";
version = "0.7.0"; version = "0.7.4";
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "imread"; pname = "imread";
sha256 = "0yb0fmy6ilh5fvbk69wl2bzqgss2g0951668mx8z9yyj4jhr1z2y"; sha256 = "0kvlpy62vc16i0mysv1b2gv746in41q75hb815q6h8d227psv1q4";
}; };

View file

@ -1,26 +1,36 @@
{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, lib, stdenv }: { buildPythonPackage, fetchFromGitHub, pillow, scipy, numpy, pytestCheckHook, imread, freeimage, lib, stdenv }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mahotas"; pname = "mahotas";
version = "1.4.10"; version = "1.4.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "luispedro"; owner = "luispedro";
repo = "mahotas"; repo = "mahotas";
rev = "v${version}"; rev = "v${version}";
sha256 = "0fjiyl82wj1a6xzr9mss2y2rydl4zchl2cbdbg0jm0fcrs99q4hw"; sha256 = "029gvy1fb855pvxvy8zwj44k4s7qpqi0161bg5wldfiprrysn1kw";
}; };
# remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed propagatedBuildInputs = [ numpy imread pillow scipy freeimage ];
patches = [ ./disable-impure-tests.patch ]; checkInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ numpy imread pillow scipy ]; postPatch = ''
checkInputs = [ nose ]; substituteInPlace mahotas/io/freeimage.py --replace "/opt/local/lib" "${freeimage}/lib"
checkPhase= ''
python setup.py test
''; '';
# tests must be run in the build directory
preCheck = ''
cd build/lib*
'';
# re-enable as soon as https://github.com/luispedro/mahotas/issues/97 is fixed
disabledTests = [
"test_colors"
"test_ellipse_axes"
"test_normalize"
"test_haralick3d"
];
disabled = stdenv.isi686; # Failing tests disabled = stdenv.isi686; # Failing tests
meta = with lib; { meta = with lib; {

View file

@ -1,76 +0,0 @@
diff --git a/mahotas/tests/test_colors.py b/mahotas/tests/test_colors.py
index 8a8183b..0d34c9f 100644
--- a/mahotas/tests/test_colors.py
+++ b/mahotas/tests/test_colors.py
@@ -2,7 +2,9 @@ import mahotas
import numpy as np
from mahotas.tests.utils import luispedro_jpg
from mahotas.colors import rgb2xyz, rgb2lab, xyz2rgb, rgb2grey, rgb2sepia
+from nose.tools import nottest
+@nottest
def test_colors():
f = luispedro_jpg()
lab = rgb2lab(f)
diff --git a/mahotas/tests/test_features_shape.py b/mahotas/tests/test_features_shape.py
index 462f467..2381793 100644
--- a/mahotas/tests/test_features_shape.py
+++ b/mahotas/tests/test_features_shape.py
@@ -2,6 +2,7 @@ import mahotas.features.shape
import numpy as np
import mahotas as mh
from mahotas.features.shape import roundness, eccentricity
+from nose.tools import nottest
def test_eccentricity():
D = mh.disk(32, 2)
@@ -29,6 +30,7 @@ def test_zeros():
I[8:4:12] = 1
assert eccentricity(I) == 0
+@nottest
def test_ellipse_axes():
Y,X = np.mgrid[:1024,:1024]
Y = Y/1024.
diff --git a/mahotas/tests/test_moments.py b/mahotas/tests/test_moments.py
index 686c7c3..ba3487b 100644
--- a/mahotas/tests/test_moments.py
+++ b/mahotas/tests/test_moments.py
@@ -1,6 +1,7 @@
import numpy as np
import mahotas as mh
from mahotas.features.moments import moments
+from nose.tools import nottest
def _slow(A, p0, p1, cm):
c0,c1 = cm
@@ -28,7 +29,7 @@ def test_against_slow():
yield perform, 1, 2, (0, 0), A
yield perform, 1, 0, (0, 0), A
-
+@nottest
def test_normalize():
A,B = np.meshgrid(np.arange(128),np.arange(128))
for p0,p1 in [(1,1), (1,2), (2,1), (2,2)]:
diff --git a/mahotas/tests/test_texture.py b/mahotas/tests/test_texture.py
index 7e101ba..af1305d 100644
--- a/mahotas/tests/test_texture.py
+++ b/mahotas/tests/test_texture.py
@@ -2,7 +2,7 @@ import numpy as np
from mahotas.features import texture
import mahotas as mh
import mahotas.features._texture
-from nose.tools import raises
+from nose.tools import raises, nottest
def test__cooccurence():
cooccurence = mahotas.features._texture.cooccurence
@@ -149,6 +149,7 @@ def test_float_haralick():
A[2,2]=12
texture.haralick(A)
+@nottest
def test_haralick3d():
np.random.seed(22)
img = mahotas.stretch(255*np.random.rand(20,20,4))

View file

@ -13,14 +13,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mcstatus"; pname = "mcstatus";
version = "5.2.0"; version = "6.0.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Dinnerbone"; owner = "Dinnerbone";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-RlqzeixaHgyIl/7mMRkZAEsqJEP79Bz1bDGAU8PIetU="; sha256 = "sha256-YBtVWcOZDt2jQB9bHDrSCP9f2OC+IHzJKlBBGorLnZU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -6,13 +6,12 @@
, argcomplete , argcomplete
, packaging , packaging
, importlib-metadata , importlib-metadata
, colorama
, pytestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pipx"; pname = "pipx";
version = "0.16.2.1"; version = "0.16.3";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -21,14 +20,13 @@ buildPythonPackage rec {
owner = "pipxproject"; owner = "pipxproject";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1agdp8j4lw6z0lk2vv1m8d49r5vwfkpal3hdgq67vnjyp9904pf6"; sha256 = "1w5pzn5mgl9rr9zbmqza5is4mvjvcgjps1q9qa1mvbnyvakdkr4c";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
userpath userpath
argcomplete argcomplete
packaging packaging
colorama
] ++ lib.optionals (pythonOlder "3.8") [ ] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata importlib-metadata
]; ];
@ -39,9 +37,17 @@ buildPythonPackage rec {
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
''; '';
# disable tests, which require internet connection pytestFlagsArray = [
pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ]; "--ignore=tests/test_install_all_packages.py"
# start local pypi server and use in tests
"--net-pypiserver"
];
disabledTests = [ disabledTests = [
# disable tests which are difficult to emulate due to shell manipulations
"path_warning"
"script_from_internet"
"ensure_null_pythonpath"
# disable tests, which require internet connection
"install" "install"
"inject" "inject"
"ensure_null_pythonpath" "ensure_null_pythonpath"

View file

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylutron-caseta"; pname = "pylutron-caseta";
version = "0.10.0"; version = "0.11.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gurumitts"; owner = "gurumitts";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-wKnca9sMdjvxxAW5YwLZFK/skmE6QMZG99HZRR3BIzw="; sha256 = "sha256-2w8kRSZK9Bq3O6r6i0CJgxEXGo8KsWah9bMLlDNzMGk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyvex"; pname = "pyvex";
version = "9.0.7833"; version = "9.0.7912";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-vasPukhDpvTNEvSy3A2H4ZkFMpLSoHB6+uuimYH1VT4="; sha256 = "sha256-KqTfu49Muicr5oJcXcoYpz3S7+0hk7dxbU7GMCDlJQA=";
}; };
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''

View file

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "skytemple-dtef"; pname = "skytemple-dtef";
version = "1.1.2"; version = "1.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SkyTemple"; owner = "SkyTemple";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "177ydif01fai6z5yhgpa27pzfgabblzhl8nsczczcmw74vxqwzyc"; sha256 = "0hisg7gq6ph0as9vvx2p1h104bn6x2kx8y477p9zcqc71f3yrx82";
}; };
propagatedBuildInputs = [ skytemple-files ]; propagatedBuildInputs = [ skytemple-files ];

View file

@ -1,3 +1,13 @@
addMakeFlags() {
export prefix="$out"
export MANDIR="${!outputMan}/share/man"
export MANTARGET=man
export BINOWN=
export STRIP_FLAG=
}
preConfigureHooks+=(addMakeFlags)
bmakeBuildPhase() { bmakeBuildPhase() {
runHook preBuild runHook preBuild

View file

@ -8,6 +8,7 @@
, useOpenSSL ? !isBootstrap, openssl , useOpenSSL ? !isBootstrap, openssl
, useNcurses ? false, ncurses , useNcurses ? false, ncurses
, withQt5 ? false, qtbase , withQt5 ? false, qtbase
, buildDocs ? (!isBootstrap && (useNcurses || withQt5)), sphinx, texinfo
}: }:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
@ -35,14 +36,16 @@ stdenv.mkDerivation (rec {
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ]; outputs = [ "out" ]
++ lib.optionals buildDocs [ "man" "info" ];
setOutputFlags = false; setOutputFlags = false;
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ setupHook pkg-config ]; nativeBuildInputs = [ setupHook pkg-config ]
++ lib.optionals buildDocs [ texinfo ];
buildInputs = [] buildInputs = []
++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]
@ -68,6 +71,11 @@ stdenv.mkDerivation (rec {
"--docdir=share/doc/${pname}${version}" "--docdir=share/doc/${pname}${version}"
] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
++ lib.optional withQt5 "--qt-gui" ++ lib.optional withQt5 "--qt-gui"
++ lib.optionals buildDocs [
"--sphinx-build=${sphinx}/bin/sphinx-build"
"--sphinx-man"
"--sphinx-info"
]
# Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568
++ lib.optionals stdenv.hostPlatform.is32bit [ ++ lib.optionals stdenv.hostPlatform.is32bit [
"CFLAGS=-D_FILE_OFFSET_BITS=64" "CFLAGS=-D_FILE_OFFSET_BITS=64"

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "dockle"; pname = "dockle";
version = "0.3.13"; version = "0.3.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goodwithtech"; owner = "goodwithtech";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-U0nIGuQ4QjBaCck0Kg1RTS2IQwfivN3VI5vxh8lxAYE="; sha256 = "sha256-Xe5qgM0yPBVtH9S4OSiNnkKxcH0W89aABJF6PVRBEhQ=";
}; };
vendorSha256 = "sha256-uHHm4AgnjTdPgpu3OpXXIRzrGhkpOoRY8qynfl7DO6w="; vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ btrfs-progs lvm2 ]; buildInputs = [ btrfs-progs lvm2 ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "esbuild"; pname = "esbuild";
version = "0.12.6"; version = "0.12.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "evanw"; owner = "evanw";
repo = "esbuild"; repo = "esbuild";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ncRHsYxG4XVT7TUJv+VgXMsLmQ52+/dXUlgMy8QnzNc="; sha256 = "sha256-LHM3dlVfwgA1HJPg/77Er/RWEDVmmQuuhrS5KzTAtV0=";
}; };
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

View file

@ -46,13 +46,13 @@ let
installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "flatpak-builder"; pname = "flatpak-builder";
version = "1.0.12"; version = "1.0.14";
outputs = [ "out" "doc" "man" "installedTests" ]; outputs = [ "out" "doc" "man" "installedTests" ];
src = fetchurl { src = fetchurl {
url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-R4DBuOCDj/tk6WOb14AUF5ZP2BjHxtXpr8pNVRHe0sg="; sha256 = "sha256-abZa9PY4BBJ1GMVFGE+d/JqTWM3tqr7yseUGI64rjYs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "just"; pname = "just";
version = "0.9.3"; version = "0.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "casey"; owner = "casey";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rcHS0QchUzgcSVIw01x0p1lU/q2CqC5QAwLSFuBTPtE="; sha256 = "sha256-C0W5oMnKlQ5hg/0YLKZKiQfLghJ7yAJYW6k0G6eOFQE=";
}; };
cargoSha256 = "sha256-LZL95AFzbWhdWPGjJr7lZORtVOUdz8lno0T8xSkblHU="; cargoSha256 = "sha256-TqvUunBFpKIog0pG85M/JLz8orncgbRqnQolseXYSo4=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec {
# USER must not be empty # USER must not be empty
export USER=just-user export USER=just-user
export USERNAME=just-user export USERNAME=just-user
export JUST_CHOOSER="${coreutils}/bin/cat"
# Prevent string.rs from being changed # Prevent string.rs from being changed
cp tests/string.rs $TMPDIR/string.rs cp tests/string.rs $TMPDIR/string.rs
@ -38,22 +39,22 @@ rustPlatform.buildRustPackage rec {
sed -i src/justfile.rs \ sed -i src/justfile.rs \
-i tests/*.rs \ -i tests/*.rs \
-e "s@/bin/echo@${coreutils}/bin/echo@g" \ -e "s@/bin/echo@${coreutils}/bin/echo@g" \
-e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ -e "s@/usr/bin/env@${coreutils}/bin/env@g"
-e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
# Return unchanged string.rs # Return unchanged string.rs
cp $TMPDIR/string.rs tests/string.rs cp $TMPDIR/string.rs tests/string.rs
''; '';
# Skip "edit" when running "cargo test", since this test case needs "cat" and "vim". checkFlags = [
# Skip "choose" when running "cargo test", since this test case needs "fzf". "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched
checkFlags = [ "--skip=choose" "--skip=edit" ]; "--skip=run_shebang" # test case very rarely fails with "Text file busy"
];
meta = with lib; { meta = with lib; {
description = "A handy way to save and run project-specific commands";
homepage = "https://github.com/casey/just"; homepage = "https://github.com/casey/just";
changelog = "https://github.com/casey/just/blob/v${version}/CHANGELOG.md";
description = "A handy way to save and run project-specific commands";
license = licenses.cc0; license = licenses.cc0;
maintainers = with maintainers; [ xrelkd ]; maintainers = with maintainers; [ xrelkd jk ];
}; };
} }

View file

@ -0,0 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk }:
stdenv.mkDerivation rec {
pname = "picotool";
version = "1.0.1";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = pname;
rev = version;
sha256 = "1k5j742sj91akdrgnd3wa5csqb638dgaz0c09zsr22fcqz0qhzig";
};
buildInputs = [ libusb1 pico-sdk ];
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ];
installPhase = ''
runHook preInstall
install -Dm755 ./picotool -t $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/raspberrypi/picotool";
description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary";
license = licenses.bsd3;
maintainers = with maintainers; [ musfay ];
platforms = platforms.unix;
};
}

View file

@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped"; pname = "rust-analyzer-unwrapped";
version = "2021-05-31"; version = "2021-06-07";
cargoSha256 = "sha256-atfpcP3esMQQ2lOFTKksQH1nV78KAic51XZi+R++vHg="; cargoSha256 = "sha256-TyoCu2Q4Tr2EIWxQcjSxASni4dkeEVsfrF5UN7IVxSs=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-analyzer"; owner = "rust-analyzer";
repo = "rust-analyzer"; repo = "rust-analyzer";
rev = version; rev = version;
sha256 = "sha256-v2zS9qnvNrImQ3UqU80YagwLJKkVxwvwMMISimFbMOI="; sha256 = "sha256-f8jdBL42+bU8KKchkW4fF6+kDBjgpoOZyP5yOYsebBk=";
}; };
buildAndTestSubdir = "crates/rust-analyzer"; buildAndTestSubdir = "crates/rust-analyzer";

File diff suppressed because it is too large Load diff

View file

@ -1,10 +1,17 @@
{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security { rustPlatform
, fetchFromGitHub
, lib
, openssl
, pkg-config
, stdenv
, curl
, Security
, runCommand , runCommand
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli"; pname = "wasm-bindgen-cli";
version = "0.2.73"; version = "0.2.74";
src = src =
let let
@ -12,9 +19,10 @@ rustPlatform.buildRustPackage rec {
owner = "rustwasm"; owner = "rustwasm";
repo = "wasm-bindgen"; repo = "wasm-bindgen";
rev = version; rev = version;
sha256 = "sha256-JrfS9Z/ZqhoZXJxrxMSLpl2NiktTUkjW6q3xN9AU2zw="; hash = "sha256-GsraYfWzUZjFpPpufTyXF0i2llBzjh04iTKio6m4NRA=";
}; };
in runCommand "source" { } '' in
runCommand "source" { } ''
cp -R ${tarball} $out cp -R ${tarball} $out
chmod -R +w $out chmod -R +w $out
cp ${./Cargo.lock} $out/Cargo.lock cp ${./Cargo.lock} $out/Cargo.lock
@ -23,7 +31,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-GUdoOms4FrNmPkELFX1PXcU/ww7CSN8JGHoCvnm73PQ="; cargoHash = "sha256-djeI7kSGRHMpXnsbVlM2CDek02u5tFAsyAdHwbKC0y8=";
cargoBuildFlags = [ "-p" pname ]; cargoBuildFlags = [ "-p" pname ];
meta = with lib; { meta = with lib; {

Some files were not shown because too many files have changed in this diff Show more