Merge branch 'master' into staging-next

This commit is contained in:
Vladimír Čunát 2023-07-13 08:30:35 +02:00
commit c77a0a323a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
115 changed files with 4616 additions and 1127 deletions

View File

@ -214,26 +214,81 @@ The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blo
- Hydra builds for master and staging should not be used as testing platform, its a build farm for changes that have been already tested.
- When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break peoples installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from \@edolstra.
::: {.figure #fig-staging-workflow}
# Staging workflow
<!-- generated from ./staging-workflow.dot using: dot -Tsvg staging-workflow.dot > staging-workflow.svg -->
![Staging workflow](./staging-workflow.svg)
:::
### Branches {#submitting-changes-branches}
[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above. The purple arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the git history.
The `nixpkgs` repository has three major branches:
- `master`
- `staging`
- `staging-next`
The most important distinction between them is that `staging`
(colored red in the diagram below) can receive commits which cause
a mass-rebuild (for example, anything that changes the `drvPath` of
`stdenv`). The other two branches `staging-next` and `master`
(colored green in the diagram below) can *not* receive commits which
cause a mass-rebuild.
Arcs between the branches show possible merges into these branches,
either from other branches or from independently submitted PRs. The
colors of these edges likewise show whether or not they could
trigger a mass rebuild (red) or must not trigger a mass rebuild
(green).
Hydra runs automatic builds for the green branches.
Notice that the automatic merges are all green arrows. This is by
design. Any merge which might cause a mass rebuild on a branch
which has automatic builds (`staging-next`, `master`) will be a
manual merge to make sure it is good use of compute power.
Nixpkgs has two branches so that there is one branch (`staging`)
which accepts mass-rebuilding commits, and one fast-rebuilding
branch which accepts independent PRs (`master`). The `staging-next`
branch allows the Hydra operators to batch groups of commits to
`staging` to be built. By keeping the `staging-next` branch
separate from `staging`, this batching does not block
developers from merging changes into `staging`.
```{.graphviz caption="Staging workflow"}
digraph {
master [color="green" fontcolor=green]
"staging-next" [color="green" fontcolor=green]
staging [color="red" fontcolor=red]
"small changes" [fontcolor=green shape=none]
"small changes" -> master [color=green]
"mass-rebuilds and other large changes" [fontcolor=red shape=none]
"mass-rebuilds and other large changes" -> staging [color=red]
"critical security fixes" [fontcolor=green shape=none]
"critical security fixes" -> master [color=green]
"staging fixes which do not cause staging to mass-rebuild" [fontcolor=green shape=none]
"staging fixes which do not cause staging to mass-rebuild" -> "staging-next" [color=green]
"staging-next" -> master [color="red"] [label="manual merge"] [fontcolor="red"]
"staging" -> "staging-next" [color="red"] [label="manual merge"] [fontcolor="red"]
master -> "staging-next" [color="green"] [label="automatic merge (GitHub Action)"] [fontcolor="green"]
"staging-next" -> staging [color="green"] [label="automatic merge (GitHub Action)"] [fontcolor="green"]
}
```
[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the green arrows in the diagram above. The red arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the git history.
### Master branch {#submitting-changes-master-branch}
#### Master branch {#submitting-changes-master-branch}
The `master` branch is the main development branch. It should only see non-breaking commits that do not cause mass rebuilds.
### Staging branch {#submitting-changes-staging-branch}
#### Staging branch {#submitting-changes-staging-branch}
The `staging` branch is a development branch where mass-rebuilds go. Mass rebuilds are commits that cause rebuilds for many packages, like more than 500 (or perhaps, if it's 'light' packages, 1000). It should only see non-breaking mass-rebuild commits. That means it is not to be used for testing, and changes must have been well tested already. If the branch is already in a broken state, please refrain from adding extra new breakages.
During the process of a releasing a new NixOS version, this branch or the release-critical packages can be restricted to non-breaking changes.
### Staging-next branch {#submitting-changes-staging-next-branch}
#### Staging-next branch {#submitting-changes-staging-next-branch}
The `staging-next` branch is for stabilizing mass-rebuilds submitted to the `staging` branch prior to merging them into `master`. Mass-rebuilds must go via the `staging` branch. It must only see non-breaking commits that are fixing issues blocking it from being merged into the `master` branch.
@ -241,7 +296,7 @@ If the branch is already in a broken state, please refrain from adding extra new
During the process of a releasing a new NixOS version, this branch or the release-critical packages can be restricted to non-breaking changes.
### Stable release branches {#submitting-changes-stable-release-branches}
#### Stable release branches {#submitting-changes-stable-release-branches}
The same staging workflow applies to stable release branches, but the main branch is called `release-*` instead of `master`.

View File

@ -86,7 +86,7 @@ rec {
# choice.
else "bfd";
extensions = rec {
sharedLibrary =
sharedLibrary = assert final.hasSharedLibraries;
/**/ if final.isDarwin then ".dylib"
else if final.isWindows then ".dll"
else ".so";
@ -132,6 +132,25 @@ rec {
# uname -r
release = null;
};
# It is important that hasSharedLibraries==false when the platform has no
# dynamic library loader. Various tools (including the gcc build system)
# have knowledge of which platforms are incapable of dynamic linking, and
# will still build on/for those platforms with --enable-shared, but simply
# omit any `.so` build products such as libgcc_s.so. When that happens,
# it causes hard-to-troubleshoot build failures.
hasSharedLibraries = with final;
(isAndroid || isGnu || isMusl # Linux (allows multiple libcs)
|| isDarwin || isSunOS || isOpenBSD || isFreeBSD || isNetBSD # BSDs
|| isCygwin || isMinGW # Windows
) && !isStatic;
# The difference between `isStatic` and `hasSharedLibraries` is mainly the
# addition of the `staticMarker` (see make-derivation.nix). Some
# platforms, like embedded machines without a libc (e.g. arm-none-eabi)
# don't support dynamic linking, but don't get the `staticMarker`.
# `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
# has the `staticMarker`.
isStatic = final.isWasm || final.isRedox;
# Just a guess, based on `system`

View File

@ -17262,7 +17262,7 @@
githubId = 7953163;
name = "Vika Shleina";
keys = [{
fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A";
fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D";
}];
};
vincentbernat = {

View File

@ -0,0 +1,47 @@
{ lib
, buildGoModule
, fetchFromGitHub
, makeWrapper
, plan9port
}:
buildGoModule rec {
pname = "edwood";
version = "0.3.1";
src = fetchFromGitHub {
owner = "rjkroege";
repo = "edwood";
rev = "v${version}";
hash = "sha256-jKDwNq/iMFqVpPq14kZa+T5fES54f4BAujXUwGlbiTE=";
};
vendorHash = "sha256-M7fa46BERNRHbCsAiGqt4GHVVTyrW6iIb6gRc4UuZxA=";
nativeBuildInputs = [
makeWrapper
];
ldflags = [
"-s"
"-w"
];
postInstall = ''
mkdir -p $out/share
cp -r build/font $out/share
wrapProgram $out/bin/edwood \
--prefix PATH : ${lib.makeBinPath [ "${plan9port}/plan9" ]} \
--set PLAN9 $out/share # envvar is read by edwood to determine the font path prefix
'';
doCheck = false; # Tests has lots of hardcoded mess.
meta = with lib; {
description = "Go version of Plan9 Acme Editor";
homepage = "https://github.com/rjkroege/edwood";
license = with licenses; [ mit bsd3 ];
maintainers = with maintainers; [ kranzes ];
};
}

View File

@ -323,7 +323,7 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "felix"
version = "2.4.1"
version = "2.5.0"
dependencies = [
"chrono",
"content_inspector",

View File

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "felix";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-F2Zw72RdKarrwM47a+Wqe1R1TOK97Ek5AnmAe/0MheY=";
sha256 = "sha256-Zz2kTbY+5ZUxIZmwfg6Lpk1ulfuNSRWeaTZOh7fWAvg=";
};
cargoLock = {

View File

@ -9,49 +9,49 @@
let
pname = "1password";
version = if channel == "stable" then "8.10.7" else "8.10.8-42.BETA";
version = if channel == "stable" then "8.10.8" else "8.10.9-29.BETA";
sources = {
stable = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-5KMAzstoPmNgFejp21R8PcdrmUtkX3qxHYX3rV5JqyE=";
hash = "sha256-E7lXyxoBL2ziMIIisskJJhZ5ymKyuv4zXEqigUtU41I=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
sha256 = "sha256-Tmof+ma1SJMQRSV1T5flLeXfe6W1a2U2mYzi+MrxvJM=";
hash = "sha256-V/qJHt49pPEm1g92hEQCscmJ3ZkSHTY2oA69d6DxkmU=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
sha256 = "sha256-jtqgJJy1ZhyaEUEafT1ywD529aKGDqc0J3mgYSGVTWU=";
hash = "sha256-H2t4sEbm2Mp89a++r8oFSyvg19zc9dAsq3phX/h1VVg=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
sha256 = "sha256-qLqK6CZcqDfIGX0FzEnAZP3Rkxw8CNtT6sFy8u0IqwM=";
hash = "sha256-8lVc69Ra0wYxnlVcehtAIujrmUQXmsgsK8ATR4vkBe0=";
};
};
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-nPstDndWuPMSGJlbyniEfljdEy+TOB9zWMJ+db7xCx4=";
hash = "sha256-gC+niXGxg37pzMWu/yzD5KcrzbI39u//syVlPne6nBQ=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
sha256 = "sha256-waJjvqF6OXGrf90srvvZ+hyxapcQApGTsxTzNMX9V3s=";
hash = "sha256-y9P7032GaNKbDzL922HUwiu3DxqKzTiA5g1I3V+852k=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
sha256 = "sha256-i9hbnjXx2/RWJ9YvrFDOGbi7dpiHtxWsN0HAZPOhK8o=";
hash = "sha256-/avHauTuFmKQiHL1WpRI488F8rcwvEOe26kmGF7sv3k=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
sha256 = "sha256-tat2x2J4/yKhWp4sWCEqU+SSZaNRx8WTcCJAAbo1Kpk=";
hash = "sha256-kMrA8PhAtOjkgbl9m7NtzIJin+a05llQKdEzlkLE0sY=";
};
};
};
src = fetchurl {
inherit (sources.${channel}.${stdenv.system}) url sha256;
inherit (sources.${channel}.${stdenv.system}) url hash;
};
meta = with lib; {

View File

@ -54,7 +54,7 @@
};
};
firefox-devedition = buildMozillaMach rec {
firefox-devedition = (buildMozillaMach rec {
pname = "firefox-devedition";
version = "116.0b3";
applicationName = "Mozilla Firefox Developer Edition";
@ -81,7 +81,9 @@
versionSuffix = "b[0-9]*";
baseUrl = "https://archive.mozilla.org/pub/devedition/releases/";
};
};
}).overrideAttrs (prev: {
env.MOZ_REQUIRE_SIGNING = "";
});
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";

View File

@ -1,11 +1,11 @@
{
"packageVersion": "115.0.1-1",
"packageVersion": "115.0.2-2",
"source": {
"rev": "115.0.1-1",
"sha256": "0ali3jj57m46gcdq3ar4sdr8ppfvz4c77kwmpjbqf7p9r30q74v6"
"rev": "115.0.2-2",
"sha256": "092fp608lcxrax391xc33dqgbxspkflvmkmhc4jmji2ij3my12jn"
},
"firefox": {
"version": "115.0.1",
"sha512": "4368b3fa4ad4eb65752ab706f19175758bfa202c51a4c31d6512ab8e4f19dfdd0bd6fb8d845990d3c0aaad0e96a5c86e4ef699149ba2630c7a3c7dc4a5bc509c"
"version": "115.0.2",
"sha512": "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b"
}
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "odo";
version = "3.11.0";
version = "3.12.0";
src = fetchFromGitHub {
owner = "redhat-developer";
repo = "odo";
rev = "v${version}";
sha256 = "sha256-+5oX6/J/WpJZr/o9l8TZhMJoxonnT0DeIEWffAjZYww=";
sha256 = "sha256-UieMY+YoMjOYUGwkSWxuC+91YfGHhMdhSJFwA+kG4PU=";
};
vendorHash = null;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pachyderm";
version = "2.6.4";
version = "2.6.5";
src = fetchFromGitHub {
owner = "pachyderm";
repo = "pachyderm";
rev = "v${version}";
hash = "sha256-V8N7KaNlpDTOmUdfx3otC7ady57lkXHFcZ1LO8VMnFU=";
hash = "sha256-ZwfJ21Ib9R1YV4TSi0CArii2418uG9hNhGRDyapP/Tg=";
};
vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY=";

View File

@ -37,11 +37,11 @@
"vendorHash": "sha256-oUUl7m7+r10xSklrcsTYOU8wk8n7TLu6Qt50wTKLULk="
},
"akamai": {
"hash": "sha256-xnWlpjH26ywIOXIjkdaQayAOntV1GFz/EdjsxWf22nM=",
"hash": "sha256-gQZ5yH3sV5DTpSE+/bZM12+PHitmUm/TtpAdPijF+Lk=",
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
"owner": "akamai",
"repo": "terraform-provider-akamai",
"rev": "v5.0.0",
"rev": "v5.0.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-xZ0pS7XxfYGbG2kEw5FAjABDQZmektaI7OhToiFMXKk="
},
@ -146,11 +146,11 @@
"vendorHash": null
},
"baiducloud": {
"hash": "sha256-bCn6Zenyy0qGazph+MIiA/EAcdi3VLrl4S9AArdzx20=",
"hash": "sha256-4Lo4Y6KJiHl1M7GdEITS7Q/IBYJpPo9lZ1jbJ0w3sMw=",
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
"owner": "baidubce",
"repo": "terraform-provider-baiducloud",
"rev": "v1.19.8",
"rev": "v1.19.9",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -173,13 +173,13 @@
"vendorHash": "sha256-AcUw5i3st7VfAnpy/6nTYfTv3rOAN2jm4rUmEKcSrXM="
},
"brightbox": {
"hash": "sha256-yKoYjrZs6EOX1pdDuF+LOu/jZ3fidZJBU7yhSp6qSFU=",
"hash": "sha256-Q1P9qpJO+hhYeVxCd61dvYGmWlSNF7pJHRP5EdTGgWU=",
"homepage": "https://registry.terraform.io/providers/brightbox/brightbox",
"owner": "brightbox",
"repo": "terraform-provider-brightbox",
"rev": "v3.4.1",
"rev": "v3.4.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw="
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
},
"buildkite": {
"hash": "sha256-yxL08Eysj/w9uLmuqDKx1ZcYQZSy91pDgR84BdpsF88=",
@ -646,13 +646,13 @@
"vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
},
"kubernetes": {
"hash": "sha256-k3NObpn1/P+hDx32Wjcd5HqFKC8NFUx6gkxlRDyw/vQ=",
"hash": "sha256-J3+F6GJJjGzWBwqnznI/If6I0sZ733h6ShR2EdbqPVs=",
"homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
"owner": "hashicorp",
"repo": "terraform-provider-kubernetes",
"rev": "v2.21.1",
"rev": "v2.22.0",
"spdx": "MPL-2.0",
"vendorHash": null
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
},
"launchdarkly": {
"hash": "sha256-lRkaRy4K43byP0r+wE3gne8pWmPB5il5oK4JMiPMZO4=",
@ -736,11 +736,11 @@
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
},
"minio": {
"hash": "sha256-bgaSaI6eFEHS2DcsDqigKNWt9QfxTBcQoiqlUhgXm80=",
"hash": "sha256-Xszx9eWLufT0Jky+Z9/rky3SLJsRk2gMDjuTFbPTkS8=",
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
"owner": "aminueza",
"repo": "terraform-provider-minio",
"rev": "v1.15.3",
"rev": "v1.16.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0="
},
@ -772,11 +772,11 @@
"vendorHash": null
},
"newrelic": {
"hash": "sha256-ouGJxcoaL05+j/6s71sslojwkBJkHudOo6HsN9zCAN8=",
"hash": "sha256-cKwefGAx4VIdupCOb6XLQaiy+Na7XyFJ7yjZCiJO224=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.25.1",
"rev": "v3.25.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-zp4gqpbJ6avIjV/cvomgqZsdk8XgweWQ6mIX4RlIo7c="
},
@ -790,13 +790,13 @@
"vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc="
},
"ns1": {
"hash": "sha256-IVKxvkps7cDE/l06MXRtRNasbhEpxhkxa7cDQP/6XYQ=",
"hash": "sha256-8m9uj6s7oSaqKUv2kwbPmk7R3MsydWKVLMvcbXg945k=",
"homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
"owner": "ns1-terraform",
"repo": "terraform-provider-ns1",
"rev": "v2.0.3",
"rev": "v2.0.4",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Tyf5byrkB1tB4JrOlLpUdFGVcwvUN7SylVl2OhX3jWY="
"vendorHash": "sha256-37mQ0/2a9nG3+WMvYgQofhhFw94OxSdnzez8RTgWSNU="
},
"null": {
"hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=",
@ -818,11 +818,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-58B09Oo276Eu7Rf34T1iGcmK7jF3c1yvUegyP2rQtqg=",
"hash": "sha256-NyNQht7mWG4+IbyhCPSJnLTIFm7KeBpEfua5oR6ovC0=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v5.3.0",
"rev": "v5.4.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -890,11 +890,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-nQy0LYiYoj+d8LaCRJflMwBA9obBD4XUG0oP/9nq/jY=",
"hash": "sha256-6DYULlwIKC4zVeSuQDrulDxvZeC0cW5wRoS2LbUAFmw=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v2.15.0",
"rev": "v2.15.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1106,11 +1106,11 @@
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
},
"tencentcloud": {
"hash": "sha256-+DseNvTLRai7qitiFNPYDub5MJhTrXDDGg4ni7McH7Y=",
"hash": "sha256-53s1j5Xw7ZERz35lGzv9pHiAzcUX2dn5A74vFqv94Cg=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.81.13",
"rev": "v1.81.14",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1188,14 +1188,14 @@
"vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ="
},
"vault": {
"hash": "sha256-vnCRyrvRH+bsANl2esTUYUPewDG+ZgXlpQdSPiU3WiI=",
"hash": "sha256-XwM+WDfeWKwSz9pboaf5JfP2PrXevaRUw/YRnw8XXGw=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-vault",
"rev": "v3.17.0",
"rev": "v3.18.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU="
"vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0="
},
"vcd": {
"hash": "sha256-AiVmxqktBgvXbMl6jA5sMa86sEAvxD1LjVuxdwdBJvU=",

View File

@ -19,11 +19,11 @@ let
in
stdenv.mkDerivation rec {
pname = "briar-desktop";
version = "0.4.0-beta";
version = "0.5.0-beta";
src = fetchurl {
url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar";
hash = "sha256-7zeIWsdPvROHGaf5igodlZss6Gow3kp6PX+QAzmxMnw=";
hash = "sha256-J93ODYAiRbQxG2BF7P3H792ymAcJ3f07l7zRSw8kM+E=";
};
dontUnpack = true;

View File

@ -3,10 +3,10 @@
mkFranzDerivation rec {
pname = "ferdium";
name = "Ferdium";
version = "6.3.0";
version = "6.4.0";
src = fetchurl {
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
sha256 = "sha256-3i3cEGwUXNITABJRXV+xQ2knYjuG1F818EvhLBrVep8=";
sha256 = "sha256-zIGtGmCtQn26rxDsZfPKUZAFnBaWYRhfVJdazPyZ/g0=";
};
extraBuildInputs = [ xorg.libxshmfence ];

View File

@ -19,14 +19,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "23.6.6";
version = "23.7.1";
in
stdenv.mkDerivation {
inherit pname appname version;
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
hash = "sha256-UXEnoe8TovzghKtEXDis5Gk93oDEyJhhNXMnGaK5VXI=";
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-xrt9xeBANcrTf84YR8jLDZkoTAQ4SXrlGsVJPXCefqw=";
};
nativeBuildInputs = [

View File

@ -29,16 +29,21 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.28.1";
version = "0.29.0";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "refs/tags/v${version}";
hash = "sha256-pAo+bT10rdQOf9j3imKWCCMFGm8KntUeTQUrEE1wYZc=";
hash = "sha256-FTitj43RFCNvSWInXHALyIljfcBBkaq/XI1ZA1k0glk=";
};
vendorHash = "sha256-vq19exqsEtXhN20mgC5GCpYGm8s9AC6nlfCfG1lUiI8=";
goModules = (buildGoModule {
pname = "kitty-go-modules";
inherit src version;
vendorHash = "sha256-jk2EcYVuhV/UQfHAIfpnn8ZIZnwjA/o8YRXmpoC85Vc=";
}).go-modules;
buildInputs = [
harfbuzz
@ -100,11 +105,6 @@ buildPythonApplication rec {
CGO_ENABLED = 0;
GOFLAGS = "-trimpath";
goModules = (buildGoModule {
pname = "kitty-go-modules";
inherit src vendorHash version;
}).go-modules;
configurePhase = ''
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
@ -156,6 +156,8 @@ buildPythonApplication rec {
--replace test_path_mapping_receive dont_test_path_mapping_receive
substituteInPlace kitty_tests/shell_integration.py \
--replace test_fish_integration dont_test_fish_integration
substituteInPlace kitty_tests/shell_integration.py \
--replace test_bash_integration dont_test_bash_integration
substituteInPlace kitty_tests/open_actions.py \
--replace test_parsing_of_open_actions dont_test_parsing_of_open_actions
substituteInPlace kitty_tests/ssh.py \
@ -164,6 +166,8 @@ buildPythonApplication rec {
--replace 'class Rendering(BaseTest)' 'class Rendering'
# theme collection test starts an http server
rm tools/themes/collection_test.go
# passwd_test tries to exec /usr/bin/dscl
rm tools/utils/passwd_test.go
'';
checkPhase = ''
@ -220,8 +224,9 @@ buildPythonApplication rec {
'';
passthru = {
updateScript = nix-update-script {};
go-modules = goModules; # allow for updateScript to handle vendorHash
tests.test = nixosTests.terminal-emulators.kitty;
updateScript = nix-update-script {};
};
meta = with lib; {

View File

@ -9,8 +9,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
@ -22,7 +22,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
@ -69,7 +69,7 @@ let majorVersion = "10";
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ optional (buildPlatform.system == "aarch64-darwin" && targetPlatform != buildPlatform) (fetchpatch {
url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch";
@ -78,7 +78,7 @@ let majorVersion = "10";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -99,7 +99,7 @@ let majorVersion = "10";
binutils
buildPackages
cloog
crossStageStatic
withoutTargetLibc
enableLTO
enableMultilib
enablePlugin
@ -214,7 +214,10 @@ lib.pipe (stdenv.mkDerivation ({
)
'';
inherit noSysDirs staticCompiler crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { })
@ -295,5 +298,5 @@ lib.pipe (stdenv.mkDerivation ({
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
]

View File

@ -9,8 +9,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
@ -22,7 +22,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
@ -82,14 +82,14 @@ let majorVersion = "11";
++ optional (stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
# openjdk build fails without this on -march=opteron; is upstream in gcc12
++ [ ./gcc-issue-103910.patch ];
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -110,7 +110,7 @@ let majorVersion = "11";
binutils
buildPackages
cloog
crossStageStatic
withoutTargetLibc
enableLTO
enableMultilib
enablePlugin
@ -227,7 +227,10 @@ lib.pipe (stdenv.mkDerivation ({
)
'';
inherit noSysDirs staticCompiler crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { })
@ -307,6 +310,6 @@ lib.pipe (stdenv.mkDerivation ({
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
(callPackage ../common/checksum.nix { inherit langC langCC; })
]

View File

@ -9,8 +9,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
@ -23,7 +23,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
@ -127,11 +127,11 @@ let majorVersion = "12";
++ optional (stdenv.isDarwin && langAda) ../gnat-darwin-dylib-install-name.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch;
++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch;
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -152,7 +152,7 @@ let majorVersion = "12";
binutils
buildPackages
cloog
crossStageStatic
withoutTargetLibc
disableBootstrap
disableGdbPlugin
enableLTO
@ -271,7 +271,10 @@ lib.pipe (stdenv.mkDerivation ({
)
'';
inherit noSysDirs staticCompiler crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
@ -353,7 +356,7 @@ lib.pipe (stdenv.mkDerivation ({
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
(callPackage ../common/checksum.nix { inherit langC langCC; })
]

View File

@ -9,8 +9,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
@ -23,7 +23,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
@ -125,7 +125,7 @@ let majorVersion = "13";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -146,7 +146,7 @@ let majorVersion = "13";
binutils
buildPackages
cloog
crossStageStatic
withoutTargetLibc
disableBootstrap
disableGdbPlugin
enableLTO
@ -265,7 +265,10 @@ lib.pipe (stdenv.mkDerivation ({
)
'';
inherit noSysDirs staticCompiler crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
@ -347,7 +350,7 @@ lib.pipe (stdenv.mkDerivation ({
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
(callPackage ../common/checksum.nix { inherit langC langCC; })
]

View File

@ -8,8 +8,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
@ -26,7 +26,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, buildPackages
, callPackage
@ -109,7 +109,7 @@ let majorVersion = "4";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -135,7 +135,7 @@ let majorVersion = "4";
boehmgc
buildPackages
cloog
crossStageStatic
withoutTargetLibc
enableLTO
enableMultilib
enablePlugin
@ -232,7 +232,10 @@ lib.pipe (stdenv.mkDerivation ({
''
else null;
inherit noSysDirs staticCompiler langJava crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler langJava
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { })
@ -323,5 +326,5 @@ lib.pipe (stdenv.mkDerivation ({
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
]

View File

@ -8,8 +8,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
@ -26,7 +26,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, buildPackages
, callPackage
@ -126,7 +126,7 @@ let majorVersion = "4";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -152,7 +152,7 @@ let majorVersion = "4";
boehmgc
buildPackages
cloog
crossStageStatic
withoutTargetLibc
enableLTO
enableMultilib
enablePlugin
@ -253,7 +253,10 @@ lib.pipe (stdenv.mkDerivation ({
''
else null;
inherit noSysDirs staticCompiler langJava crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler langJava
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { })
@ -350,5 +353,5 @@ lib.pipe (stdenv.mkDerivation ({
'';}
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
]

View File

@ -9,8 +9,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, flex
, perl ? null # optional, for texi2pod (then pod2man); required for Java
@ -29,7 +29,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
@ -78,7 +78,7 @@ let majorVersion = "6";
++ optional langGo ./gogcc-workaround-glibc-2.36.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ optional (targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb";
sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2";
@ -111,7 +111,7 @@ let majorVersion = "6";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -137,7 +137,7 @@ let majorVersion = "6";
boehmgc
buildPackages
cloog
crossStageStatic
withoutTargetLibc
enableLTO
enableMultilib
enablePlugin
@ -269,7 +269,10 @@ lib.pipe (stdenv.mkDerivation ({
))
);
inherit noSysDirs staticCompiler langJava crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler langJava
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { })
@ -368,5 +371,5 @@ lib.pipe (stdenv.mkDerivation ({
'';}
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
]

View File

@ -7,8 +7,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
@ -19,7 +19,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
@ -81,13 +81,13 @@ let majorVersion = "7";
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ [ ../libsanitizer-no-cyclades-9.patch ];
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -108,7 +108,7 @@ let majorVersion = "7";
binutils
buildPackages
cloog
crossStageStatic
withoutTargetLibc
enableLTO
enableMultilib
enablePlugin
@ -218,7 +218,10 @@ lib.pipe (stdenv.mkDerivation ({
)
'';
inherit noSysDirs staticCompiler crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { })
@ -302,5 +305,5 @@ lib.pipe (stdenv.mkDerivation ({
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
]

View File

@ -7,8 +7,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
@ -19,7 +19,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
@ -63,12 +63,12 @@ let majorVersion = "8";
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ [ ../libsanitizer-no-cyclades-9.patch ];
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -89,7 +89,7 @@ let majorVersion = "8";
binutils
buildPackages
cloog
crossStageStatic
withoutTargetLibc
enableLTO
enableMultilib
enablePlugin
@ -199,7 +199,10 @@ lib.pipe (stdenv.mkDerivation ({
)
'';
inherit noSysDirs staticCompiler crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { })
@ -277,5 +280,5 @@ lib.pipe (stdenv.mkDerivation ({
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
]

View File

@ -9,8 +9,8 @@
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? !stdenv.targetPlatform.isStatic
, enableLTO ? !stdenv.hostPlatform.isStatic
, enableShared ? stdenv.targetPlatform.hasSharedLibraries
, enableLTO ? stdenv.hostPlatform.hasSharedLibraries
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf, binutils
@ -22,7 +22,7 @@
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, withoutTargetLibc ? false
, gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
@ -74,12 +74,12 @@ let majorVersion = "9";
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch
;
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
callFile = lib.callPackageWith {
@ -100,7 +100,7 @@ let majorVersion = "9";
binutils
buildPackages
cloog
crossStageStatic
withoutTargetLibc
enableLTO
enableMultilib
enablePlugin
@ -213,7 +213,10 @@ lib.pipe (stdenv.mkDerivation ({
)
'';
inherit noSysDirs staticCompiler crossStageStatic
# kludge to prevent a mass-rebuild; will be removed in a PR sent to staging
crossStageStatic = withoutTargetLibc;
inherit noSysDirs staticCompiler
libcCross crossMingw;
inherit (callFile ../common/dependencies.nix { })
@ -292,5 +295,5 @@ lib.pipe (stdenv.mkDerivation ({
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
)
) [
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc enableShared; })
]

View File

@ -1,7 +1,7 @@
{ lib, stdenv
, targetPackages
, crossStageStatic, libcCross
, withoutTargetLibc, libcCross
, threadsCross
, version
@ -59,14 +59,14 @@ let
"--with-as=${if targetPackages.stdenv.cc.bintools.isLLVM then binutils else targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
"--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld"
]
++ (if crossStageStatic then [
++ (if withoutTargetLibc then [
"--disable-libssp"
"--disable-nls"
"--without-headers"
"--disable-threads"
"--disable-libgomp"
"--disable-libquadmath"
"--disable-shared"
(lib.enableFeature enableShared "shared")
"--disable-libatomic" # requires libc
"--disable-decimal-float" # requires libc
"--disable-libmpx" # requires libc
@ -112,7 +112,7 @@ let
"--with-mpfr-lib=${mpfr.out}/lib"
"--with-mpc=${libmpc}"
]
++ lib.optionals (!crossStageStatic) [
++ lib.optionals (!withoutTargetLibc) [
(if libcCross == null
then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include"
else "--with-native-system-header-dir=${lib.getDev libcCross}${libcCross.incdir or "/include"}")

View File

@ -30,7 +30,7 @@
, javaAwtGtk ? false
, langAda ? false
, langGo ? false
, crossStageStatic ? null
, withoutTargetLibc ? null
, threadsCross ? null
}:
@ -88,5 +88,5 @@ in
;
# threadsCross.package after gcc6 so i assume its okay for 4.8 and 4.9 too
depsTargetTarget = optionals (!crossStageStatic && threadsCross != { } && threadsCross.package != null) [ threadsCross.package ];
depsTargetTarget = optionals (!withoutTargetLibc && threadsCross != { } && threadsCross.package != null) [ threadsCross.package ];
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }:
{ lib, stdenv, withoutTargetLibc, langD ? false, libcCross, threadsCross }:
let
inherit (stdenv) hostPlatform targetPlatform;
@ -11,23 +11,23 @@ in
EXTRA_FLAGS_FOR_TARGET = let
mkFlags = dep: langD: lib.optionals (targetPlatform != hostPlatform && dep != null && !langD) ([
"-O2 -idirafter ${lib.getDev dep}${dep.incdir or "/include"}"
] ++ lib.optionals (! crossStageStatic) [
] ++ lib.optionals (! withoutTargetLibc) [
"-B${lib.getLib dep}${dep.libdir or "/lib"}"
]);
in mkFlags libcCross langD
++ lib.optionals (!crossStageStatic) (mkFlags (threadsCross.package or null) langD)
++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null) langD)
;
EXTRA_LDFLAGS_FOR_TARGET = let
mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([
"-Wl,-L${lib.getLib dep}${dep.libdir or "/lib"}"
] ++ (if crossStageStatic then [
] ++ (if withoutTargetLibc then [
"-B${lib.getLib dep}${dep.libdir or "/lib"}"
] else [
"-Wl,-rpath,${lib.getLib dep}${dep.libdir or "/lib"}"
"-Wl,-rpath-link,${lib.getLib dep}${dep.libdir or "/lib"}"
]));
in mkFlags libcCross
++ lib.optionals (!crossStageStatic) (mkFlags (threadsCross.package or null))
++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null))
;
}

View File

@ -4,11 +4,14 @@
, langC
, langCC
, langJit
, enableShared
, targetPlatform
, hostPlatform
, crossStageStatic
, withoutTargetLibc
}:
assert !stdenv.targetPlatform.hasSharedLibraries -> !enableShared;
drv: lib.pipe drv
([
@ -16,8 +19,8 @@ drv: lib.pipe drv
(pkg: pkg.overrideAttrs (previousAttrs:
lib.optionalAttrs (
targetPlatform != hostPlatform &&
targetPlatform.libc == "msvcrt" &&
crossStageStatic
enableShared &&
withoutTargetLibc
) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
@ -31,11 +34,15 @@ drv: lib.pipe drv
lib.optional (lib.versionAtLeast version "11.0")
(let
targetPlatformSlash =
if hostPlatform.config == targetPlatform.config
then ""
else "${targetPlatform.config}/";
enableLibGccOutput =
(with stdenv; targetPlatform == hostPlatform) &&
!langJit &&
!stdenv.hostPlatform.isDarwin &&
!stdenv.hostPlatform.isStatic
enableShared
;
in
@ -50,6 +57,10 @@ in
lib.optionalString (!langC) ''
rm -f $out/lib/libgcc_s.so*
''
+ lib.optionalString (hostPlatform.config != targetPlatform.config) ''
mkdir -p $lib/lib/
ln -s ${targetPlatformSlash}lib $lib/lib
''
# TODO(amjoseph): remove the `libgcc_s.so` symlinks below and replace them
# with a `-L${gccForLibs.libgcc}/lib` in cc-wrapper's
@ -62,10 +73,10 @@ in
+ lib.optionalString enableLibGccOutput (''
# move libgcc from lib to its own output (libgcc)
mkdir -p $libgcc/lib
mv $lib/lib/libgcc_s.so $libgcc/lib/
mv $lib/lib/libgcc_s.so.1 $libgcc/lib/
ln -s $libgcc/lib/libgcc_s.so $lib/lib/
ln -s $libgcc/lib/libgcc_s.so.1 $lib/lib/
mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/lib/
mv $lib/${targetPlatformSlash}lib/libgcc_s.so.1 $libgcc/lib/
ln -s $libgcc/lib/libgcc_s.so $lib/${targetPlatformSlash}lib/
ln -s $libgcc/lib/libgcc_s.so.1 $lib/${targetPlatformSlash}lib/
''
#
# Nixpkgs ordinarily turns dynamic linking into pseudo-static linking:

View File

@ -1,10 +1,13 @@
{ lib, version, buildPlatform, hostPlatform, targetPlatform
{ lib
, stdenv
, version, buildPlatform, hostPlatform, targetPlatform
, gnat-bootstrap ? null
, langAda ? false
, langJava ? false
, langJit ? false
, langGo
, crossStageStatic
, withoutTargetLibc
, enableShared
, enableMultilib
}:
@ -105,10 +108,21 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
# gcc->clang "cross"-compilation manages to evade it: there
# hostPlatform != targetPlatform, hostPlatform.config == targetPlatform.config.
# We explicitly inhibit libc headers use in this case as well.
+ lib.optionalString (targetPlatform != hostPlatform && crossStageStatic) ''
+ lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc) ''
export inhibit_libc=true
''
# Trick to build a gcc that is capable of emitting shared libraries *without* having the
# targetPlatform libc available beforehand. Taken from:
# https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/
# https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff
+ lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && enableShared)
(lib.optionalString (!stdenv.targetPlatform.isPower) ''
echo 'libgcc.a: crti.o crtn.o' >> libgcc/Makefile.in
'' + ''
echo 'SHLIB_LC=' >> libgcc/Makefile.in
'')
+ lib.optionalString (!enableMultilib && hostPlatform.is64bit && !hostPlatform.isMips64n32) ''
export linkLib64toLib=1
''

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,43 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "lune";
version = "0.7.4";
src = fetchFromGitHub {
owner = "filiptibell";
repo = "lune";
rev = "v${version}";
hash = "sha256-um8XsXT0O+gTORrJAVlTku6YURh0wljLaQ7fueF+AoQ=";
fetchSubmodules = true;
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rbx_binary-0.7.0" = "sha256-bwGCQMXN8VdycsyS7Om/9CKMkamAa0eBK2I2aPZ/sZs=";
};
};
nativeBuildInputs = [
pkg-config
];
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "A standalone Luau script runtime";
homepage = "https://github.com/filiptibell/lune";
changelog = "https://github.com/filiptibell/lune/blob/${src.rev}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = with maintainers; [ lammermann ];
};
}

View File

@ -1,14 +1,28 @@
{ lib, stdenv, fetchFromGitHub, readline, openssl, libffi, valgrind, withThread ? true, withSSL ? true, xxd }:
{ lib
, stdenv
, fetchFromGitHub
, libffi
, openssl
, readline
, valgrind
, xxd
, checkLeaks ? false
, enableFFI ? true
, enableSSL ? true
, enableThreads ? true
, lineEditingLibrary ? "readline"
}:
stdenv.mkDerivation rec {
assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "2.8.6";
version = "2.21.33";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${version}";
sha256 = "sha256-0sAPexGKriaJVhBDRsopRYD8xrJAaXZiscCcwfWdEgQ=";
rev = "v${finalAttrs.version}";
hash = "sha256-IpJey3S5iOCGfdfyHzc+lU9JR5fK04fnA0Ulq5Mmqks=";
};
postPatch = ''
@ -18,37 +32,60 @@ stdenv.mkDerivation rec {
--replace 'GIT_VERSION :=' 'GIT_VERSION ?='
'';
makeFlags = [
"GIT_VERSION=\"v${version}\""
(lib.optionalString withThread "THREADS=1")
(lib.optionalString (!withSSL) "NOSSL=1")
(lib.optionalString stdenv.isDarwin "NOLDLIBS=1")
nativeBuildInputs = [
xxd
];
nativeBuildInputs = [ xxd ];
buildInputs = [ readline openssl libffi ];
checkInputs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ valgrind ];
buildInputs =
lib.optional enableFFI libffi
++ lib.optional enableSSL openssl
++ lib.optional (lineEditingLibrary == "readline") readline;
checkInputs = lib.optionals finalAttrs.doCheck [ valgrind ];
dontConfigure = true;
makeFlags = [
"GIT_VERSION=\"v${finalAttrs.version}\""
]
++ lib.optional (lineEditingLibrary == "isocline") "ISOCLINE=1"
++ lib.optional (!enableFFI) "NOFFI=1"
++ lib.optional (!enableSSL) "NOSSL=1"
++ lib.optional enableThreads "THREADS=1";
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin tpl
runHook postInstall
'';
doCheck = true;
preCheck = ''
# Disable tests due to floating point error
rm tests/issues-OLD/test081.pl
rm tests/issues-OLD/test585.pl
# Disable test due to Unicode issues
rm tests/issues-OLD/test252.pl
'';
doCheck = !valgrind.meta.broken;
meta = with lib; {
checkFlags = [
"test"
] ++ lib.optional checkLeaks "leaks";
meta = {
homepage = "https://trealla-prolog.github.io/trealla/";
description = "A compact, efficient Prolog interpreter written in ANSI C";
homepage = "https://github.com/trealla-prolog/trealla";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
longDescription = ''
Trealla is a compact, efficient Prolog interpreter with ISO Prolog
aspirations.
Trealla is not WAM-based. It uses tree-walking, structure-sharing and
deep-binding. Source is byte-code compiled to an AST that is interpreted
at runtime. The intent and continued aim of Trealla is to be a small,
easily ported, Prolog core.
The name Trealla comes from the Liaden Universe books by Lee & Miller
(where it doesn't seem to mean anything) and also a reference to the
Trealla region of Western Australia.
'';
changelog = "https://github.com/trealla-prolog/trealla/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ siraben AndersonTorres ];
mainProgram = "tpl";
platforms = platforms.all;
platforms = lib.platforms.all;
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}
})

View File

@ -1,4 +1,13 @@
{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, automake
, autoconf
, libtool
, autoreconfHook
, gmpxx
}:
stdenv.mkDerivation rec {
pname = "givaro";
version = "4.2.0";
@ -8,6 +17,15 @@ stdenv.mkDerivation rec {
rev = "v${version}";
sha256 = "sha256-KR0WJc0CSvaBnPRott4hQJhWNBb/Wi6MIhcTExtVobQ=";
};
patches = [
# Pull upstream fix for gcc-13:
# https://github.com/linbox-team/givaro/pull/218
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/linbox-team/givaro/commit/c7744bb133496cd7ac04688f345646d505e1bf52.patch";
hash = "sha256-aAA5o8Va10v0Pqgcpx7qM0TAZiNQgXoR6N9xecj7tDA=";
})
];
enableParallelBuilding = true;

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.58";
version = "9.2.59";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-SlEcDGpIxUDtCAIE8F74h4t1SbMcNiy1OBLmLs/AV+c=";
hash = "sha256-1AlmVRiGrYe0fS5Ny1JzyA2gGWKaUVioeZQTGhwMoaM=";
};
nativeBuildInputs = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "aliyun-python-sdk-iot";
version = "8.53.0";
version = "8.54.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-dRNrbdFASkh1wWa1Z2VaUPijbyqUyIlVYSKvqR9N1js=";
hash = "sha256-hNEtZQOfhnGNeXkR44fgDKrP+Nut0rqcLlnrDdcuOM4=";
};
propagatedBuildInputs = [

View File

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.58";
version = "9.2.59";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-iTJ/EPqy8qRaavN5q6l/BC8ZttnLsysNT5j49hsn2kQ=";
hash = "sha256-Wel6IxZMAztJj3NZi0hIYMgLa1hsO0apFa6Y29B1Hkg=";
};
propagatedBuildInputs = [

View File

@ -19,7 +19,7 @@
}:
buildPythonPackage rec {
version = "8.2.5";
version = "8.3.1";
pname = "approvaltests";
format = "setuptools";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "approvals";
repo = "ApprovalTests.Python";
rev = "refs/tags/v${version}";
hash = "sha256-guZR996UBqWsBnZx2kdSffkPzkMRfS48b1XcM5L8+I4=";
hash = "sha256-FyYT+w4CX+CdUg0uGwyjw98H8Z+HMVecgMBW/ytrtFU=";
};
propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.58";
version = "9.2.59";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-kKH6+zFtSqM6JUXH6pZboIXtqttMwo3lEADBoehf79o=";
hash = "sha256-6ELsHKtflvJDmWJDGY73j1J88J/8qt+pFE3rmUMXl2w=";
};
nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "async-lru";
version = "2.0.2";
version = "2.0.3";
disabled = pythonOlder "3.8";
@ -18,11 +18,11 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "aio-libs";
repo = "async-lru";
rev = "v${version}";
hash = "sha256-kcvtF/p1L5OVXJSRxRQ0NMFtV29tAysZs8cnTHqOBOo=";
rev = "refs/tags/v${version}";
hash = "sha256-5NlcufnCqcB8k8nscFJGwlpEbDJG5KAEwWBat5dvI84=";
};
propagatedBuildInputs = [
propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [
typing-extensions
];

View File

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
, beautifulsoup4
, demjson3
, html5lib
, lxml
, requests
}:
buildPythonPackage rec {
pname = "bandcamp-api";
version = "0.1.15";
format = "setuptools";
src = fetchPypi {
pname = "bandcamp_api";
inherit version;
hash = "sha256-4pnUiAsOLX1BBQjOhUkjSyHnGyQ3rx3JAFFYgEMLpG4=";
};
postPatch = ''
substituteInPlace setup.py \
--replace bs4 beautifulsoup4
'';
propagatedBuildInputs = [
beautifulsoup4
demjson3
html5lib
lxml
requests
];
pythonImportsCheck = [ "bandcamp_api" ];
# upstream has no tests
doCheck = false;
meta = {
description = "Obtains information from bandcamp.com";
homepage = "https://github.com/RustyRin/bandcamp-api";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.58";
version = "9.2.59";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-G6ROgRdpMZZWNQEv0JlmDs/g687uHNW4FoposdSsxVQ=";
hash = "sha256-QVbLliWVY8Si1dcIhCroYH+uF6nxrTKFsRmxP62AfPI=";
};
nativeBuildInputs = [

View File

@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.58";
version = "9.2.59";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-AtZnsrqd4/SXoqCIFGNSxBed9hehky8n/5Xfg5EREKg=";
hash = "sha256-EYNNNWfqvdrkEAMekY42yrHTgisBxmXbol/IwZ5x3o8=";
};
nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "cpyparsing";
version = "2.4.7.1.2.1";
version = "2.4.7.2.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "evhub";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-HJ0I5DKZ2WV+1pXZCvJHA7Wih3Gkn7vL/ojXnTssKxw=";
hash = "sha256-ZJKWJhqhnTbTAf/48Whq2mSNIp/Ar17syFWvpD3w4fE=";
};
nativeBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "gaphas";
version = "3.11.2";
version = "3.11.3";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-dcE0uWhSJFnSVVenQlSDMwnHe6GRq77hCT6FV2YQN3A=";
hash = "sha256-NpmNIwZqvWAJDkUEb6+GpfQaRCVtjQk4odkaOd2D2ok=";
};
nativeBuildInputs = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "kneed";
version = "0.8.3";
version = "0.8.5";
format = "pyproject";
src = fetchFromGitHub {
owner = "arvkevi";
repo = "kneed";
rev = "v${version}";
sha256 = "K742mOnwTUY09EtbDYM9guqszK1wxgkofPhSjDyB8Ss=";
rev = "refs/tags/v${version}";
sha256 = "sha256-oakP6NkdvTzMZcoXS6cKNsRo//K+CoPLlhvbQLGij00=";
};
postPatch = ''

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "oracledb";
version = "1.3.1";
version = "1.3.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-/OG+vbDYuI+Qjg4dDY5cJM5E4b4EGzYDLCjDuojiExQ=";
hash = "sha256-uzw5HBZ7V3jdsVp1OKKzbbXJuIpQyGxheByp/zArtkM=";
};
nativeBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pipdeptree";
version = "2.9.3";
version = "2.9.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "tox-dev";
repo = "pipdeptree";
rev = "refs/tags/${version}";
hash = "sha256-CNz/TxIxaRzBzlylLgWWW7xom65tK7ZnGtwpMsTDqVk=";
hash = "sha256-Fy9wDPYY1FRRRcu6ucOccFYU6PjfX6SggXIIGEhSFMM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -7,15 +7,15 @@
buildPythonPackage {
pname = "pynvim-pp";
version = "unstable-2023-07-05";
version = "unstable-2023-07-09";
format = "pyproject";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "pynvim_pp";
rev = "e9ac3171c7edcc0be020d63840d6af4222b69540";
hash = "sha256-H1sCwU2wl9HO92LNkvkCb1iLbZrTNMmYA/8qy9uCgyU=";
rev = "93aa25bf3ee039c4eb85f402d6adf6977033013b";
hash = "sha256-gZvIiFpP+eMLD8/xodY7ywWxhWXtethXviVRedW/bgo=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "python-glanceclient";
version = "4.3.0";
version = "4.4.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-5nwCPOc9GBxk9BItiaScfy1eljl+e0okFCEOVsHoXDQ=";
hash = "sha256-ejZuH/Zr23bmJ+7PfNQFO9lPNfo83GkNKa/0fpduBTI=";
};
postPatch = ''

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.58";
version = "9.2.59";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-+eElwydrUnc7rWOiGzfC/VHtjUhNg/4HPJOZCAELZpw=";
hash = "sha256-V4YZFua3SrmUz96dWgMWUZulK6f1+VqlRAf6GWHul0Y=";
};
nativeBuildInputs = [

View File

@ -6,15 +6,15 @@
buildPythonPackage {
pname = "std2";
version = "unstable-2023-07-05";
version = "unstable-2023-07-09";
format = "pyproject";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "std2";
rev = "1080b7b657f75352481808a906939d16b6d956a1";
hash = "sha256-shAuCZvyFGrW26uTnNeyvlAIABb1d9oeKpk9hQbtuEQ=";
rev = "2d5594b40585ecae60ce5175bee68cc8b3085ee6";
hash = "sha256-phGIWow7PGOtS1Pre1Gz0Xg6izGp6BiUTmze5jI/BwY=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, argostranslate
, beautifulsoup4
}:
@ -16,6 +17,14 @@ buildPythonPackage rec {
sha256 = "6b30ceb8b6f174917e2660caf2d2ccbaa71d8d24c815316edf56b061d678820d";
};
patches = [
# https://github.com/argosopentech/translate-html/pull/15
(fetchpatch {
url = "https://github.com/argosopentech/translate-html/commit/b1c2d210ec1b5fcd0eb79f578bdb5d3ed5c9963a.patch";
hash = "sha256-U65vVuRodMS32Aw6PZlLwaCos51P5B88n5hDgJNMZXU=";
})
];
propagatedBuildInputs = [
argostranslate
beautifulsoup4

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "uptime-kuma-api";
version = "1.0.1";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "uptime_kuma_api";
inherit version;
hash = "sha256-6Cwo71pgwBk5B6MaFFs9XlbocJLL/s4+7m7Gi13ddlM=";
hash = "sha256-3Y7PGidtmBjrIXGAElzRAv//kvX0ZcK3OX0xnfeuLWE=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,79 @@
{ fetchurl, lib, stdenv, zstd
, autoPatchelfHook, gcc-unwrapped
}:
let
# NOTE (aseipp): buck2 uses a precompiled binary build for good reason — the
# upstream codebase extensively uses unstable `rustc` nightly features, and as
# a result can't be built upstream in any sane manner. it is only ever tested
# and integrated against a single version of the compiler, which produces all
# usable binaries. you shouldn't try to workaround this or get clever and
# think you can patch it to work; just accept it for now. it is extremely
# unlikely buck2 will build with a stable compiler anytime soon; see related
# upstream issues:
#
# - NixOS/nixpkgs#226677
# - NixOS/nixpkgs#232471
# - facebook/buck2#265
# - facebook/buck2#322
#
# worth noting: it *is* possible to build buck2 from source using
# buildRustPackage, and it works fine, but only if you are using flakes and
# can import `rust-overlay` from somewhere else to vendor your compiler. See
# nixos/nixpkgs#226677 for more information about that.
# map our platform name to the rust toolchain suffix
suffix = {
x86_64-darwin = "x86_64-apple-darwin";
aarch64-darwin = "aarch64-apple-darwin";
# TODO (aseipp): there's an aarch64-linux musl build of buck2, but not a
# x86_64-linux musl build. keep things consistent for now and use glibc
# builds for both; but we should fix this in the future to be less fragile;
# we can then remove autoPatchelfHook.
x86_64-linux = "x86_64-unknown-linux-gnu";
aarch64-linux = "aarch64-unknown-linux-gnu";
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
buck2-version = "2023-07-11";
src =
let
hashes = builtins.fromJSON (builtins.readFile ./hashes.json);
sha256 = hashes."${stdenv.hostPlatform.system}";
url = "https://github.com/facebook/buck2/releases/download/${buck2-version}/buck2-${suffix}.zst";
in fetchurl { inherit url sha256; };
in
stdenv.mkDerivation {
pname = "buck2";
version = "unstable-${buck2-version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made
inherit src;
buildInputs = lib.optionals stdenv.isLinux [ gcc-unwrapped ]; # need libgcc_s.so.1 for patchelf
nativeBuildInputs = [ zstd ]
# TODO (aseipp): move to musl build and nuke this?
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
dontConfigure = true;
unpackPhase = "unzstd ${src} -o ./buck2";
buildPhase = "chmod +x ./buck2";
installPhase = ''
mkdir -p $out/bin
install -D buck2 $out/bin/buck2
'';
# NOTE (aseipp): use installCheckPhase instead of checkPhase so that
# autoPatchelfHook kicks in first.
doInstallCheck = true;
installCheckPhase = "$out/bin/buck2 --version";
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Fast, hermetic, multi-language build system";
homepage = "https://buck2.build";
license = with licenses; [ asl20 /* or */ mit ];
platforms = [
"x86_64-linux" "aarch64-linux"
"x86_64-darwin" "aarch64-darwin"
];
maintainers = with maintainers; [ thoughtpolice ];
};
}

View File

@ -0,0 +1,5 @@
{ "x86_64-linux": "sha256-dVOshrjpsFomstnJsZMPBDfakXOkU+ORbv//fq8Oxss="
, "x86_64-darwin": "sha256-BuzA8irlqLWnv5fGUdIHu0grz9smTBdOs5yTUBZLUKg="
, "aarch64-linux": "sha256-Thr9RsI7AkumBeraq08KoxDAXYKv63bZUTrTYN0GAss="
, "aarch64-darwin": "sha256-vRu0ra6YN7+o1AId6+v0ZLQucO84KwS3Ila6Ksmp1J0="
}

View File

@ -0,0 +1,40 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq nix-prefetch common-updater-scripts nix coreutils
# shellcheck shell=bash
set -euo pipefail
VERSION=$(curl -s https://api.github.com/repos/facebook/buck2/releases \
| jq -r '. |
sort_by(.created_at) | .[] |
select ((.prerelease == true) and (.name != "latest")) |
.name')
echo "Latest buck2 prerelease: $VERSION"
ARCHS=(
"x86_64-linux:x86_64-unknown-linux-gnu"
"x86_64-darwin:x86_64-apple-darwin"
"aarch64-linux:aarch64-unknown-linux-gnu"
"aarch64-darwin:aarch64-apple-darwin"
)
NFILE=pkgs/development/tools/build-managers/buck2/default.nix
HFILE=pkgs/development/tools/build-managers/buck2/hashes.json
rm -f "$HFILE" && touch "$HFILE"
marker="{"
for arch in "${ARCHS[@]}"; do
IFS=: read -r arch_name arch_target <<< "$arch"
sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/buck2-${arch_target}.zst")"
srihash="$(nix hash to-sri --type sha256 "$sha256hash")"
echo "${marker} \"$arch_name\": \"$srihash\"" >> "$HFILE"
marker=","
done
echo "}" >> "$HFILE"
sed -i \
's/buck2-version\s*=\s*".*";/buck2-version = "'"$VERSION"'";/' \
"$NFILE"
echo "Done; wrote $HFILE and updated version"

View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "38acbdb3504a713f6c22e87ea41877988a0dfcfa";
version = "2023-06-07";
rev = "d88419f21872d18ed2c34a6a612d133b1ebccea2";
version = "2023-07-11";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "XkY5W0T/pAtz8HyYShrjN+bmcDRrwZbRwxskZoTR9GY=";
sha256 = "uP8TJ/LsicrVqFXbn8kJNDHRUB/D/y6VxAkVtldwP5U=";
};
dontBuild = true;

View File

@ -48,7 +48,10 @@ stdenv.mkDerivation rec {
in
''
mkdir -p $out
mv ./{lib,licenses,internal/lib/liquibase-core.jar,internal/lib/postgresql.jar,internal/lib/picocli.jar} $out/
mv ./{lib,licenses} $out/
mkdir -p $out/internal/lib
mv ./internal/lib/*.jar $out/internal/lib/
mkdir -p $out/share/doc/${pname}-${version}
mv LICENSE.txt \
@ -63,12 +66,12 @@ stdenv.mkDerivation rec {
#!/usr/bin/env bash
# taken from the executable script in the source
CP=""
${addJars "$out/internal/lib"}
${addJars "$out/lib"}
${addJars "$out"}
${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}
${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \
liquibase.integration.commandline.LiquibaseCommandLine \''${1+"\$@"}
liquibase.integration.commandline.LiquibaseCommandLine \''${1+"\$@"}
EOF
chmod +x $out/bin/liquibase
'';

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, bison
, boost182
@ -19,25 +18,15 @@
stdenv.mkDerivation rec {
pname = "nixd";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nixd";
rev = version;
hash = "sha256-zeBVh9gPMR+1ETx0ujl+TUSoeHHR4fkQfxyOpCDKP9M=";
hash = "sha256-3PI/Bzs5WPIKevbRPz6TQ5yo7QpY4HeALrqbUY/zUgY=";
};
patches = [
# Fix build on Darwin. Remove with next release.
# https://github.com/nix-community/nixd/pull/172
(fetchpatch {
url = "https://github.com/nix-community/nixd/commit/3dbe1eb6bde1949b510e19a2d1863a2f4d2329a6.patch";
hash = "sha256-130L+85bZIBmNfHqH3PdmQCBuxLnCs3IyAAoW15RQSk=";
includes = [ "lib/lspserver/src/Logger.cpp" "lib/nixd/src/ServerController.cpp" ];
})
];
mesonBuildType = "release";
nativeBuildInputs = [

View File

@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "blackfire";
version = "2.16.2";
version = "2.17.0";
src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}");
@ -57,23 +57,23 @@ stdenv.mkDerivation rec {
sources = {
"x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
sha256 = "4VEZU1w0Y4Sk+XVItNo4SOutG1XhPnsRN3J5CNNsKK4=";
sha256 = "7s0gh+H/g8QjyLs42mQFuMhTE8kAE96meVijjryBEFs=";
};
"i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
sha256 = "Fb6k/dCZ5duWDiWgU1UGF/6+eXqlyarA6GLcMkHbmUk=";
sha256 = "yyAcxmM6KF0BUU7glfUoP6ixFX92WDAwu/iGY5ZHUeg=";
};
"aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
sha256 = "vsebmAKb64Z0MvHGgctNAn7DJR5RBo/hHKd/4VZ2qY8=";
sha256 = "SJDjxykt793ZBVbAN0SO4nA7KXbo4ZB4TJarFXkaYxI=";
};
"aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
sha256 = "a1HLdNHo+6YuS1dzPza3C1Rjpia82AXpQuPhJ913e6A=";
sha256 = "pQFseYi2idjCTm+qfyLCTR/sYCIwZIVwYUPnNAtPH78=";
};
"x86_64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
sha256 = "yXXFi/Xk4yOp6i08UpTJdKhlI056phQ/ZxAaY8LUvbA=";
sha256 = "7qq1+P+6nfo3gvWSHU/YnAsEPEPcyJHFANxVcXiz5yA=";
};
};

View File

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "runme";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "stateful";
repo = "runme";
rev = "v${version}";
hash = "sha256-X2zHSqhtVtJZt28/O9i+EDwyRf+qJs2JTtCUveSWUVM=";
hash = "sha256-VA5YgPq/zr3yN59VyrFoIlr/Utvq1P7wyPdsXpyFdxQ=";
};
vendorHash = "sha256-BJhda5mE5f4kvi8CLjgMJYjdUS3vsUSwmHhTW/AVKCI=";

View File

@ -148,17 +148,6 @@ dependencies = [
"wait-timeout",
]
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi 0.1.19",
"libc",
"winapi",
]
[[package]]
name = "autocfg"
version = "1.1.0"
@ -188,18 +177,17 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.3.2"
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
[[package]]
name = "bstr"
version = "1.5.0"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
dependencies = [
"memchr",
"once_cell",
"regex-automata",
"serde",
]
@ -291,9 +279,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.3.8"
version = "4.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211"
checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d"
dependencies = [
"clap_builder",
"clap_derive",
@ -302,22 +290,21 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.3.8"
version = "4.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717"
checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b"
dependencies = [
"anstream",
"anstyle",
"bitflags 1.3.2",
"clap_lex",
"strsim",
]
[[package]]
name = "clap_complete"
version = "4.3.1"
version = "4.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b"
checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce"
dependencies = [
"clap",
]
@ -363,7 +350,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.23",
]
[[package]]
@ -393,13 +380,13 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "colored"
version = "2.0.0"
version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
dependencies = [
"atty",
"is-terminal",
"lazy_static",
"winapi",
"windows-sys 0.48.0",
]
[[package]]
@ -417,6 +404,7 @@ dependencies = [
"encode_unicode",
"lazy_static",
"libc",
"unicode-width",
"windows-sys 0.45.0",
]
@ -577,7 +565,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
"syn 2.0.22",
"syn 2.0.23",
]
[[package]]
@ -588,7 +576,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
dependencies = [
"darling_core",
"quote",
"syn 2.0.22",
"syn 2.0.23",
]
[[package]]
@ -746,7 +734,7 @@ dependencies = [
[[package]]
name = "flake8-to-ruff"
version = "0.0.277"
version = "0.0.278"
dependencies = [
"anyhow",
"clap",
@ -853,27 +841,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
version = "0.1.19"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
"libc",
]
[[package]]
name = "hermit-abi"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
dependencies = [
"libc",
]
[[package]]
name = "hermit-abi"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
[[package]]
name = "hex"
@ -980,6 +950,19 @@ dependencies = [
"hashbrown 0.14.0",
]
[[package]]
name = "indicatif"
version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
dependencies = [
"console",
"instant",
"number_prefix",
"portable-atomic",
"unicode-width",
]
[[package]]
name = "inotify"
version = "0.9.6"
@ -1030,7 +1013,7 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi 0.3.1",
"hermit-abi",
"libc",
"windows-sys 0.48.0",
]
@ -1050,13 +1033,12 @@ dependencies = [
[[package]]
name = "is-terminal"
version = "0.4.7"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
dependencies = [
"hermit-abi 0.3.1",
"io-lifetimes",
"rustix",
"hermit-abi",
"rustix 0.38.3",
"windows-sys 0.48.0",
]
@ -1071,9 +1053,9 @@ dependencies = [
[[package]]
name = "itoa"
version = "1.0.6"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
[[package]]
name = "js-sys"
@ -1155,7 +1137,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libcst"
version = "0.1.0"
source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438"
source = "git+https://github.com/Instagram/LibCST.git?rev=3cacca1a1029f05707e50703b49fe3dd860aa839#3cacca1a1029f05707e50703b49fe3dd860aa839"
dependencies = [
"chic",
"itertools",
@ -1170,7 +1152,7 @@ dependencies = [
[[package]]
name = "libcst_derive"
version = "0.1.0"
source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438"
source = "git+https://github.com/Instagram/LibCST.git?rev=3cacca1a1029f05707e50703b49fe3dd860aa839#3cacca1a1029f05707e50703b49fe3dd860aa839"
dependencies = [
"quote",
"syn 1.0.109",
@ -1198,6 +1180,12 @@ version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
[[package]]
name = "log"
version = "0.4.19"
@ -1351,14 +1339,20 @@ dependencies = [
[[package]]
name = "num_cpus"
version = "1.15.0"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi 0.2.6",
"hermit-abi",
"libc",
]
[[package]]
name = "number_prefix"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "once_cell"
version = "1.18.0"
@ -1397,9 +1391,9 @@ dependencies = [
[[package]]
name = "paste"
version = "1.0.12"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35"
[[package]]
name = "path-absolutize"
@ -1526,7 +1520,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.23",
]
[[package]]
@ -1540,9 +1534,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
version = "0.2.9"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
[[package]]
name = "plotters"
@ -1583,6 +1577,12 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "portable-atomic"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
[[package]]
name = "predicates"
version = "3.0.3"
@ -1694,9 +1694,9 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.28"
version = "1.0.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
dependencies = [
"proc-macro2",
]
@ -1769,26 +1769,32 @@ dependencies = [
[[package]]
name = "regex"
version = "1.8.4"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484"
dependencies = [
"aho-corasick 1.0.2",
"memchr",
"regex-automata",
"regex-syntax",
]
[[package]]
name = "regex-automata"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
dependencies = [
"aho-corasick 1.0.2",
"memchr",
"regex-syntax",
]
[[package]]
name = "regex-automata"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
[[package]]
name = "regex-syntax"
version = "0.7.2"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
[[package]]
name = "result-like"
@ -1829,11 +1835,11 @@ dependencies = [
[[package]]
name = "ruff"
version = "0.0.277"
version = "0.0.278"
dependencies = [
"annotate-snippets 0.9.1",
"anyhow",
"bitflags 2.3.2",
"bitflags 2.3.3",
"chrono",
"clap",
"colored",
@ -1927,15 +1933,14 @@ dependencies = [
[[package]]
name = "ruff_cli"
version = "0.0.277"
version = "0.0.278"
dependencies = [
"annotate-snippets 0.9.1",
"anyhow",
"argfile",
"assert_cmd",
"atty",
"bincode",
"bitflags 2.3.2",
"bitflags 2.3.3",
"cachedir",
"chrono",
"clap",
@ -1979,6 +1984,8 @@ version = "0.0.0"
dependencies = [
"anyhow",
"clap",
"ignore",
"indicatif",
"itertools",
"libcst",
"log",
@ -1989,6 +1996,7 @@ dependencies = [
"ruff",
"ruff_cli",
"ruff_diagnostics",
"ruff_formatter",
"ruff_python_formatter",
"ruff_python_stdlib",
"ruff_textwrap",
@ -1999,6 +2007,7 @@ dependencies = [
"similar",
"strum",
"strum_macros",
"tempfile",
]
[[package]]
@ -2042,7 +2051,7 @@ dependencies = [
"proc-macro2",
"quote",
"ruff_textwrap",
"syn 2.0.22",
"syn 2.0.23",
]
[[package]]
@ -2050,7 +2059,7 @@ name = "ruff_python_ast"
version = "0.0.0"
dependencies = [
"anyhow",
"bitflags 2.3.2",
"bitflags 2.3.3",
"insta",
"is-macro",
"itertools",
@ -2074,7 +2083,7 @@ name = "ruff_python_formatter"
version = "0.0.0"
dependencies = [
"anyhow",
"bitflags 2.3.2",
"bitflags 2.3.3",
"clap",
"countme",
"insta",
@ -2091,6 +2100,8 @@ dependencies = [
"serde_json",
"similar",
"smallvec",
"thiserror",
"unic-ucd-ident",
]
[[package]]
@ -2107,7 +2118,7 @@ dependencies = [
name = "ruff_python_semantic"
version = "0.0.0"
dependencies = [
"bitflags 2.3.2",
"bitflags 2.3.3",
"is-macro",
"nohash-hasher",
"num-traits",
@ -2194,15 +2205,28 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustix"
version = "0.37.20"
version = "0.37.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
dependencies = [
"bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
"linux-raw-sys 0.3.8",
"windows-sys 0.48.0",
]
[[package]]
name = "rustix"
version = "0.38.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4"
dependencies = [
"bitflags 2.3.3",
"errno",
"libc",
"linux-raw-sys 0.4.3",
"windows-sys 0.48.0",
]
@ -2244,7 +2268,7 @@ name = "rustpython-format"
version = "0.2.0"
source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"
dependencies = [
"bitflags 2.3.2",
"bitflags 2.3.3",
"itertools",
"num-bigint",
"num-traits",
@ -2298,15 +2322,15 @@ dependencies = [
[[package]]
name = "rustversion"
version = "1.0.12"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f"
[[package]]
name = "ryu"
version = "1.0.13"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
[[package]]
name = "same-file"
@ -2371,9 +2395,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]]
name = "serde"
version = "1.0.164"
version = "1.0.166"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
dependencies = [
"serde_derive",
]
@ -2391,13 +2415,13 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.164"
version = "1.0.166"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.23",
]
[[package]]
@ -2413,9 +2437,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.99"
version = "1.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"
checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
dependencies = [
"itoa",
"ryu",
@ -2456,7 +2480,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.23",
]
[[package]]
@ -2539,9 +2563,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.22"
version = "2.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
dependencies = [
"proc-macro2",
"quote",
@ -2567,7 +2591,7 @@ dependencies = [
"cfg-if",
"fastrand",
"redox_syscall 0.3.5",
"rustix",
"rustix 0.37.23",
"windows-sys 0.48.0",
]
@ -2636,22 +2660,22 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.40"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.40"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.23",
]
[[package]]
@ -2811,7 +2835,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.23",
]
[[package]]
@ -2901,9 +2925,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
version = "1.0.9"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
[[package]]
name = "unicode-normalization"
@ -2970,9 +2994,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
version = "1.3.4"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81"
checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"
[[package]]
name = "version_check"
@ -3032,7 +3056,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.23",
"wasm-bindgen-shared",
]
@ -3066,7 +3090,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.22",
"syn 2.0.23",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -3177,7 +3201,7 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
"windows-targets 0.48.0",
"windows-targets 0.48.1",
]
[[package]]
@ -3195,7 +3219,7 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.0",
"windows-targets 0.48.1",
]
[[package]]
@ -3215,9 +3239,9 @@ dependencies = [
[[package]]
name = "windows-targets"
version = "0.48.0"
version = "0.48.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
dependencies = [
"windows_aarch64_gnullvm 0.48.0",
"windows_aarch64_msvc 0.48.0",

View File

@ -10,19 +10,19 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.277";
version = "0.0.278";
src = fetchFromGitHub {
owner = "astral-sh";
repo = pname;
rev = "v${version}";
hash = "sha256-oFSMsiy9airi/SwOxA3YO02polvFl8ZZUHkD71c5unA=";
hash = "sha256-CM5oV9q9XYhaUV173VoFZl6dDALan4Lkl5PrvZN81c4=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"libcst-0.1.0" = "sha256-jG9jYJP4reACkFLrQBWOYH6nbKniNyFVItD0cTZ+nW0=";
"libcst-0.1.0" = "sha256-FgQE8ofRXQs/zHh7AKscXu0deN3IG+Nk/h+a09Co5R8=";
"ruff_text_size-0.0.0" = "sha256-N4IzMeU8vqkfPBbC3o2bqkecCUcbgmX35QVdsTCtFfc=";
"unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg=";
};

View File

@ -2,7 +2,7 @@
let
baseName = "scalafmt";
version = "3.7.8";
version = "3.7.9";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@ -12,7 +12,7 @@ let
cp $(< deps) $out/share/java/
'';
outputHashMode = "recursive";
outputHash = "sha256-rOS2wp2EuNh7aMxOcOevsCm4kTOXA7IgKaAMlU1brFQ=";
outputHash = "sha256-r4vv62H0AryjZb+34fVHvqvndipOYyf6XpQC9u8Dxso=";
};
in
stdenv.mkDerivation {

View File

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "vintagestory";
version = "1.18.5";
version = "1.18.6";
src = fetchurl {
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz";
sha256 = "sha256-VW85a8Yi1s+cOSZU5E/Rhhz4IMNLMtdAfOZKJ0axApA=";
sha256 = "sha256-Sa5R/Msg36pKRpZJXXJgM4lcCADJX9x81fMnTD3tjAI=";
};
nativeBuildInputs = [ makeWrapper copyDesktopItems ];

View File

@ -20,7 +20,7 @@ lib.makeScope newScope (self: with self; {
crossThreadsStdenv = overrideCC crossLibcStdenv
(if stdenv.hostPlatform.useLLVM or false
then buildPackages.llvmPackages_8.clangNoLibcxx
else buildPackages.gccCrossStageStatic.override (old: {
else buildPackages.gccWithoutTargetLibc.override (old: {
bintools = old.bintools.override {
libc = libcCross;
};

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "etcd";
version = "3.4.26";
version = "3.4.27";
vendorHash = "sha256-duqOIMIXAuJjvKDM15mDdi+LZUZm0uK0MjTv2Dsl3FA=";
@ -12,7 +12,7 @@ buildGoModule rec {
owner = "etcd-io";
repo = "etcd";
rev = "v${version}";
sha256 = "sha256-EobwFYdFVCal7V1KyODuIry3ZBvRUG1/XYZkVQoibkg=";
sha256 = "sha256-iw9rWfloK1h0M0O10AqCFKETSN6Adn71ujn4twVgsnk=";
};
buildPhase = ''

View File

@ -4,9 +4,9 @@
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
},
"invidious": {
"rev": "545a5937d87d31622e87bb2ba8151f8aecd66c81",
"rev": "507bed6313b49564e53b69a5c9b4d072d1e05e4b",
"sha256": "sha256-1Ra3nLO2DsnTvyovteF0cOIl07GHbJyPbTYBRIyKuAs=",
"version": "unstable-2023-06-06"
"version": "unstable-2023-07-05"
},
"lsquic": {
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",

View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.21.455";
version = "0.21.456";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha512-yeTl0s6mT9Z8bT7HND9XcjRZCvbzg2wUzbZo/gXIGk5MSZ6ktgVSBG8YuSCdIIrfRS0P4VEkyipkSn/QXMBe4Q==";
hash = "sha512-4As4WLtGyMC+zqRd7BUSC/4lLthde+BKWUNF+qleD2MpX7H/D+84ATDn0H8rMxRDP6SkuI0agRnxSJ8ygYzjbw==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "chamber";
version = "2.13.1";
version = "2.13.2";
src = fetchFromGitHub {
owner = "segmentio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-F4JVAW6aKbEofTshF6vny5hnTFnfUKuRyc9zaUxSjG4=";
sha256 = "sha256-O5J1U+nXY+zQN/6AXE334icmqPnUgAKFR/p2l/iRwyk=";
};
CGO_ENABLED = 0;
vendorHash = "sha256-xFZmTsX5OrLu1AkKDHaa5N277J5dLGf5F9ATWirtnXY=";
vendorHash = "sha256-W6PCaGQtVpwDuHv/LGoo7ip1Fzs/tZk7k1CcA+K1Pp4=";
ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "fits-cloudctl";
version = "0.11.10";
version = "0.11.11";
src = fetchFromGitHub {
owner = "fi-ts";
repo = "cloudctl";
rev = "v${version}";
sha256 = "sha256-1jJDgjkay1IsWMWoRf6iRWFr7685uE9Kr9DCreH13CM=";
sha256 = "sha256-Jf6QiGn8C3pQ/FQSEc+h06514kNXHpnKVyZ1l+S/uHw=";
};
vendorHash = "sha256-rHUPtscmG28PyNWzoayThbRt+3t9ewBe8vsRqtVc1WM=";
vendorHash = "sha256-3aoj4G3npO/DYjRu55iP9Y79z3da0edClOJlWuQC//A=";
meta = with lib; {
description = "Command-line client for FI-TS Finance Cloud Native services";

View File

@ -20,7 +20,7 @@ let
};
in python.pkgs.buildPythonApplication rec {
pname = "spotdl";
version = "4.1.11";
version = "4.2.0";
format = "pyproject";
@ -28,7 +28,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "spotDL";
repo = "spotify-downloader";
rev = "refs/tags/v${version}";
hash = "sha256-I/53JapzTo6VXss82/F0qO/Etwd4i6ZP9FPjaFRHwV0=";
hash = "sha256-miIDasbOKmfYESiEIlMxEUfPkLLBz4s1rX2eMz3MrzA=";
};
nativeBuildInputs = with python.pkgs; [
@ -56,6 +56,8 @@ in python.pkgs.buildPythonApplication rec {
pykakasi
syncedlyrics
typing-extensions
soundcloud-v2
bandcamp-api
setuptools # for pkg_resources
] ++ python-slugify.optional-dependencies.unidecode;

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
rustPlatform.buildRustPackage rec {
pname = "bupstash";
version = "0.12.0";

View File

@ -1,7 +1,6 @@
{ lib
, buildDotnetModule
, fetchFromGitHub
, dotnetCorePackages
, testers
, discordchatexporter-cli
}:

View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitLab
, fetchpatch
, python3
, librsync
, ncftp
@ -14,8 +13,6 @@
}:
let
pythonPackages = python3.pkgs;
inherit (lib.versions) majorMinor splitVersion;
majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v));
in
pythonPackages.buildPythonApplication rec {
pname = "duplicity";

View File

@ -1,7 +1,5 @@
{ lib
, pkgs
, fetchFromGitHub
, fetchpatch
, python3
, ffmpeg
}:

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "restic-rest-server";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs, bash, bzip2 }:
{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs, bzip2 }:
let
zshCompletion = fetchurl {

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
{ lib, stdenv, fetchFromGitHub
, cmake, protobufc
, libunwind, lzo, openssl, protobuf, zlib
}:

View File

@ -1,7 +1,6 @@
{ lib
, buildGoModule
, fetchFromGitHub
, zfs
}:
buildGoModule rec {

View File

@ -4,7 +4,6 @@
, makeWrapper
, nixosTests
, openssh
, fetchpatch
}:
buildGoModule rec {
pname = "zrepl";

View File

@ -0,0 +1,31 @@
{ stdenv
, fetchFromGitHub
, lib
, meson
, ninja
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cgif";
version = "0.3.2";
src = fetchFromGitHub {
owner = "dloebl";
repo = "cgif";
rev = "V${finalAttrs.version}";
sha256 = "sha256-FvqpToIVYblpuRWeEaUA8MA2Bnp9dpqGquylnXevhX4=";
};
nativeBuildInputs = [
meson
ninja
];
meta = {
homepage = "https://github.com/dloebl/cgif";
description = "CGIF, a GIF encoder written in C.";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.unix;
};
})

View File

@ -22,7 +22,7 @@
, libtiff
, fftw
, lcms2
, libpng
, libspng
, libimagequant
, imagemagick
, pango
@ -35,6 +35,7 @@
, libjxl
, openslide
, libheif
, cgif
}:
stdenv.mkDerivation rec {
@ -79,7 +80,7 @@ stdenv.mkDerivation rec {
libtiff
fftw
lcms2
libpng
libspng
libimagequant
imagemagick
pango
@ -92,6 +93,7 @@ stdenv.mkDerivation rec {
libjxl
openslide
libheif
cgif
] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ];
# Required by .pc file
@ -100,8 +102,6 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
"-Dcgif=disabled"
"-Dspng=disabled"
"-Dpdfium=disabled"
"-Dnifti=disabled"
] ++ lib.optionals (!stdenv.isDarwin) [

View File

@ -1,4 +1,5 @@
{ lib
, nix-update-script
, rustPlatform
, fetchFromGitHub
, installShellFiles
@ -11,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "rtx";
version = "1.32.2";
version = "1.34.0";
src = fetchFromGitHub {
owner = "jdxcode";
repo = "rtx";
rev = "v${version}";
sha256 = "sha256-Q210UAyPPeBfxFJvmudjhrNsVpBOG2hSQ0PeLLWMZx8=";
sha256 = "sha256-ePRYlTGgZDrIClZ4kb9v62/FiLzZT6DzL3kaY6eAq5g=";
};
cargoHash = "sha256-1Pmt+DWXSkY8uwE4bNu68NTnQLnfsoQr7I7BgCiQ+1E=";
cargoSha256 = "sha256-RFAIc4KfMvxz2BYX8x8j8T5evMqFP8ML4+wHwWdODVk=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
@ -53,6 +54,10 @@ rustPlatform.buildRustPackage rec {
--zsh ./completions/_rtx
'';
passthru = {
updateScript = nix-update-script { };
};
meta = {
homepage = "https://github.com/jdxcode/rtx";
description = "Polyglot runtime manager (asdf rust clone)";

View File

@ -260,7 +260,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.17",
"syn 2.0.25",
]
[[package]]
@ -352,8 +352,8 @@ checksum = "e0a66b39785efd8513d2cca967ede56d6cc57c8d7986a595c7c47d0c78de8dce"
dependencies = [
"cranelift-entity",
"fxhash",
"hashbrown",
"indexmap",
"hashbrown 0.12.3",
"indexmap 1.9.3",
"log",
"smallvec",
]
@ -575,7 +575,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05a6c0bbc92278f84e742f08c0ab9cb16a987376cd2bc39d228ef9c74d98d6f7"
dependencies = [
"indexmap",
"indexmap 1.9.3",
"instant",
"log",
"once_cell",
@ -602,6 +602,12 @@ dependencies = [
"termcolor",
]
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
version = "0.2.8"
@ -732,7 +738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
dependencies = [
"fallible-iterator",
"indexmap",
"indexmap 1.9.3",
"stable_deref_trait",
]
@ -743,7 +749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
dependencies = [
"fallible-iterator",
"indexmap",
"indexmap 1.9.3",
"stable_deref_trait",
]
@ -768,6 +774,12 @@ dependencies = [
"ahash",
]
[[package]]
name = "hashbrown"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
[[package]]
name = "heck"
version = "0.4.1"
@ -827,7 +839,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown",
"hashbrown 0.12.3",
"serde",
]
[[package]]
name = "indexmap"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
dependencies = [
"equivalent",
"hashbrown 0.14.0",
"serde",
]
@ -1044,8 +1067,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
dependencies = [
"crc32fast",
"hashbrown",
"indexmap",
"hashbrown 0.12.3",
"indexmap 1.9.3",
"memchr",
]
@ -1100,7 +1123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
dependencies = [
"fixedbitset",
"indexmap",
"indexmap 1.9.3",
]
[[package]]
@ -1151,9 +1174,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.59"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
dependencies = [
"unicode-ident",
]
@ -1169,9 +1192,9 @@ dependencies = [
[[package]]
name = "pulldown-cmark"
version = "0.8.0"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8"
checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
dependencies = [
"bitflags",
"memchr",
@ -1351,9 +1374,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]]
name = "serde"
version = "1.0.163"
version = "1.0.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
dependencies = [
"serde_derive",
]
@ -1370,13 +1393,13 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.163"
version = "1.0.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.17",
"syn 2.0.25",
]
[[package]]
@ -1396,7 +1419,7 @@ version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
dependencies = [
"indexmap",
"indexmap 1.9.3",
"ryu",
"serde",
"yaml-rust",
@ -1414,6 +1437,15 @@ version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "spdx"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2971cb691ca629f46174f73b1f95356c5617f89b4167f04107167c3dccb8dd89"
dependencies = [
"smallvec",
]
[[package]]
name = "stable_deref_trait"
version = "1.2.0"
@ -1457,9 +1489,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.17"
version = "2.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45b6ddbb36c5b969c182aec3c4a0bce7df3fbad4b77114706a49aacc80567388"
checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2"
dependencies = [
"proc-macro2",
"quote",
@ -1520,7 +1552,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.17",
"syn 2.0.25",
]
[[package]]
@ -1666,7 +1698,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.17",
"syn 2.0.25",
"wasm-bindgen-shared",
]
@ -1688,7 +1720,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.17",
"syn 2.0.25",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -1701,13 +1733,13 @@ checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
[[package]]
name = "wasm-compose"
version = "0.2.17"
version = "0.3.0"
dependencies = [
"anyhow",
"clap 4.3.0",
"glob",
"heck",
"indexmap",
"indexmap 2.0.0",
"log",
"petgraph",
"pretty_assertions",
@ -1715,7 +1747,7 @@ dependencies = [
"serde_yaml",
"smallvec",
"wasm-encoder",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wasmprinter",
"wat",
"wit-component",
@ -1723,30 +1755,32 @@ dependencies = [
[[package]]
name = "wasm-encoder"
version = "0.29.0"
version = "0.30.0"
dependencies = [
"anyhow",
"leb128",
"tempfile",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
]
[[package]]
name = "wasm-metadata"
version = "0.8.0"
version = "0.9.0"
dependencies = [
"anyhow",
"clap 4.3.0",
"indexmap",
"indexmap 2.0.0",
"serde",
"serde_json",
"spdx",
"wasm-encoder",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wat",
]
[[package]]
name = "wasm-mutate"
version = "0.2.27"
version = "0.2.28"
dependencies = [
"anyhow",
"clap 4.3.0",
@ -1756,7 +1790,7 @@ dependencies = [
"rand",
"thiserror",
"wasm-encoder",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wasmprinter",
"wat",
]
@ -1774,14 +1808,14 @@ dependencies = [
"num_cpus",
"rand",
"wasm-mutate",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wasmprinter",
"wasmtime",
]
[[package]]
name = "wasm-shrink"
version = "0.1.28"
version = "0.1.29"
dependencies = [
"anyhow",
"blake3",
@ -1790,32 +1824,32 @@ dependencies = [
"log",
"rand",
"wasm-mutate",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wasmprinter",
"wat",
]
[[package]]
name = "wasm-smith"
version = "0.12.10"
version = "0.12.11"
dependencies = [
"arbitrary",
"criterion",
"flagset",
"indexmap",
"indexmap 2.0.0",
"leb128",
"libfuzzer-sys",
"rand",
"serde",
"wasm-encoder",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wasmprinter",
"wat",
]
[[package]]
name = "wasm-tools"
version = "1.0.35"
version = "1.0.36"
dependencies = [
"addr2line 0.20.0",
"anyhow",
@ -1842,7 +1876,7 @@ dependencies = [
"wasm-mutate",
"wasm-shrink",
"wasm-smith",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wasmprinter",
"wast",
"wat",
@ -1859,7 +1893,7 @@ dependencies = [
"wasm-mutate",
"wasm-shrink",
"wasm-smith",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wasmprinter",
"wast",
"wat",
@ -1878,7 +1912,7 @@ dependencies = [
"wasm-encoder",
"wasm-mutate",
"wasm-smith",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wasmprinter",
"wasmtime",
"wast",
@ -1894,16 +1928,16 @@ version = "0.93.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5a4460aa3e271fa180b6a5d003e728f3963fb30e3ba0fa7c9634caa06049328"
dependencies = [
"indexmap",
"indexmap 1.9.3",
]
[[package]]
name = "wasmparser"
version = "0.107.0"
version = "0.108.0"
dependencies = [
"anyhow",
"criterion",
"indexmap",
"indexmap 2.0.0",
"once_cell",
"rayon",
"semver",
@ -1914,13 +1948,13 @@ dependencies = [
[[package]]
name = "wasmprinter"
version = "0.2.59"
version = "0.2.60"
dependencies = [
"anyhow",
"diff",
"rayon",
"tempfile",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wast",
"wat",
]
@ -1934,7 +1968,7 @@ dependencies = [
"anyhow",
"bincode",
"cfg-if",
"indexmap",
"indexmap 1.9.3",
"libc",
"log",
"object 0.29.0",
@ -1990,7 +2024,7 @@ dependencies = [
"anyhow",
"cranelift-entity",
"gimli 0.26.2",
"indexmap",
"indexmap 1.9.3",
"log",
"object 0.29.0",
"serde",
@ -2053,7 +2087,7 @@ dependencies = [
"anyhow",
"cc",
"cfg-if",
"indexmap",
"indexmap 1.9.3",
"libc",
"log",
"mach",
@ -2082,7 +2116,7 @@ dependencies = [
[[package]]
name = "wast"
version = "60.0.0"
version = "61.0.0"
dependencies = [
"anyhow",
"leb128",
@ -2090,13 +2124,13 @@ dependencies = [
"rayon",
"unicode-width",
"wasm-encoder",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wat",
]
[[package]]
name = "wat"
version = "1.0.66"
version = "1.0.67"
dependencies = [
"wast",
]
@ -2334,18 +2368,18 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "wit-component"
version = "0.11.0"
version = "0.12.0"
dependencies = [
"anyhow",
"bitflags",
"env_logger",
"glob",
"indexmap",
"indexmap 2.0.0",
"log",
"pretty_assertions",
"wasm-encoder",
"wasm-metadata",
"wasmparser 0.107.0",
"wasmparser 0.108.0",
"wasmprinter",
"wat",
"wit-parser",
@ -2353,12 +2387,12 @@ dependencies = [
[[package]]
name = "wit-parser"
version = "0.8.0"
version = "0.9.0"
dependencies = [
"anyhow",
"env_logger",
"id-arena",
"indexmap",
"indexmap 2.0.0",
"log",
"pretty_assertions",
"pulldown-cmark",
@ -2382,12 +2416,13 @@ dependencies = [
[[package]]
name = "wit-smith"
version = "0.1.5"
version = "0.1.6"
dependencies = [
"arbitrary",
"clap 4.3.0",
"indexmap",
"indexmap 2.0.0",
"log",
"semver",
"wit-component",
"wit-parser",
]

View File

@ -5,13 +5,13 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-tools";
version = "1.0.35";
version = "1.0.36";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "${pname}-${version}";
hash = "sha256-+K8yn1qpBUdBYE3SK6yZ4OBDWGhIPpaXmNSnQhvLfEk=";
hash = "sha256-ADwj7Tie02I5HEG5kt3x8TiudMFnYJ1KEyK12bCQ6kc=";
fetchSubmodules = true;
};

View File

@ -10,11 +10,7 @@ buildGoModule rec {
owner = "MetaCubeX";
repo = "Clash.Meta";
rev = "v${version}";
# macOS has a case-insensitive filesystem, so these two can be the same file
postFetch = ''
rm -f $out/.github/workflows/{Delete,delete}.yml
'';
hash = "sha256-trufMtk3t9jA6hc9CenHsd3k41nrCyJYyOuHzzWv+Jw=";
hash = "sha256-QXNMplVy4cDRbUUDwidto7jxgjStX5PmCLdAIW7Edn8=";
};
vendorHash = "sha256-lMeJ3z/iTHIbJI5kTzkQjNPMv5tGMJK/+PM36BUlpjE=";

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "oha";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "hatoo";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-IMr4CAh+XyPnv1GToZVZVpMi0eI565N6W9DivmivU70=";
sha256 = "sha256-TwaGF/ER1VSaDwapm+0f29i7siqFh/njYqwlQIO5yio=";
};
cargoSha256 = "sha256-AXm9tNv0buR40B8cWZRaSvbYXwqalwqJZnBAwrjvBiY=";
cargoSha256 = "sha256-PLOc+bQN4/mjb6Rh0b6Wl/iL1Xys2WXNBNK42Rp4ilQ=";
nativeBuildInputs = lib.optionals stdenv.isLinux [
pkg-config

View File

@ -6,6 +6,6 @@ set(NIX_DEV_INCLUDEPATH "" CACHE STRING "path to nix include directory")
add_executable(nixos-option nixos-option.cc libnix-copy-paste.cc)
target_include_directories(nixos-option PUBLIC "${NIX_DEV_INCLUDEPATH}")
target_link_libraries(nixos-option PRIVATE -lnixmain -lnixexpr -lnixstore -lnixutil -lnixcmd)
target_compile_features(nixos-option PRIVATE cxx_std_17)
target_compile_features(nixos-option PRIVATE cxx_std_20)
install (TARGETS nixos-option DESTINATION bin)

View File

@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-update";
version = "0.18.0";
version = "0.19.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
hash = "sha256-6VROgVx1bQRgoCZJYXQPAgkqArqAnMwTNg7iHLhbKro=";
hash = "sha256-v58x48la837gbqMaQ6PEl9Ick1NH+Y4okf2yttDzqC4=";
};
makeWrapperArgs = [

View File

@ -4,18 +4,18 @@
, swtpm
}:
buildGoModule {
buildGoModule rec {
pname = "age-plugin-tpm";
version = "unstable-2023-05-02";
version = "0.1.0";
src = fetchFromGitHub {
owner = "Foxboron";
repo = "age-plugin-tpm";
rev = "c570739b05c067087c44f651efce6890eedc0647";
hash = "sha256-xlJtyNAYi/6vBWLsjymFLGfr30w80OplwG2xGTEB118=";
rev = "v${version}";
hash = "sha256-Gp7n2/+vgQbsm/En6PQ1to/W6lvFam4Wh3LHdCZnafc=";
};
vendorHash = "sha256-S9wSxw0ZMibCOspgGt5vjzFhPL+bZncjTdIX2mkX5vE=";
vendorHash = "sha256-oZni/n2J0N3ZxNhf+RlUWyWeOFwL4+6KUIk6DQF8YpA=";
postConfigure = ''
substituteInPlace vendor/github.com/foxboron/swtpm_test/swtpm.go \

File diff suppressed because it is too large Load Diff

View File

@ -9,17 +9,20 @@ in
rustPlatform.buildRustPackage rec {
pname = "vaultwarden";
version = "1.28.1";
version = "1.29.0";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = pname;
rev = version;
hash = "sha256-YIR8if6lFJ+534qBN9k1ltFp5M7KBU5qYaI1KppTYwI=";
hash = "sha256-dF27b29n4JUHdXG68UfQwlacZE1SXqk0h854cMR8Ii8=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rocket-0.5.0-rc.3" = "sha256-E71cktkHCbmQyjkjWWJ20KfCm3B/h3jQ2TMluYhvCQw=";
};
};
nativeBuildInputs = [ pkg-config ];

View File

@ -7,13 +7,13 @@
}:
let
version = "2023.3.0b";
version = "2023.5.0";
bw_web_builds = fetchFromGitHub {
owner = "dani-garcia";
repo = "bw_web_builds";
rev = "v${version}";
hash = "sha256-3kCgT+NsYU7sRJvw56vcPXS7j+eHxgek195zZnamjJw=";
hash = "sha256-dH+d206nDaUrX2FcpPTegAtlQvquxk+tfQt3vJQlOjw=";
};
in buildNpmPackage rec {
pname = "vaultwarden-webvault";
@ -23,10 +23,10 @@ in buildNpmPackage rec {
owner = "bitwarden";
repo = "clients";
rev = "web-v${lib.removeSuffix "b" version}";
hash = "sha256-pSaFksfdxVx7vaozR5h+wpPB42qVgs+aXhV7HGFq71E=";
hash = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU=";
};
npmDepsHash = "sha256-ZHbKq7EseYNTWjKi+W66WinmReZbpn3kJB3g0N2z4ww=";
npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY=";
postPatch = ''
ln -s ${bw_web_builds}/{patches,resources} ..

View File

@ -1,6 +1,5 @@
{ stdenv
, lib
, fetchzip
, fetchFromGitHub
, makeWrapper
, substituteAll
@ -17,7 +16,7 @@ let
markdownpl_path = "${perlPackages.TextMarkdown}/bin/Markdown.pl";
pandoc_path = "${pandoc}/bin/pandoc";
in stdenv.mkDerivation rec {
in stdenv.mkDerivation {
pname = "bashblog";
version = "unstable-2022-03-26";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, buildPackages
{ lib, stdenv, fetchFromGitHub
, iconv, nkf, perl, which
, skk-dicts
}:

View File

@ -2,6 +2,17 @@
# It is not intended for manual editing.
version = 3
[[package]]
name = "ahash"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
"getrandom",
"once_cell",
"version_check",
]
[[package]]
name = "aho-corasick"
version = "0.7.20"
@ -223,7 +234,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]]
name = "difftastic"
version = "0.47.0"
version = "0.48.0"
dependencies = [
"assert_cmd",
"bumpalo",
@ -232,6 +243,7 @@ dependencies = [
"const_format",
"crossterm",
"glob",
"hashbrown 0.12.3",
"itertools",
"lazy_static",
"libc",
@ -303,6 +315,17 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "getrandom"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [
"cfg-if",
"libc",
"wasi",
]
[[package]]
name = "glob"
version = "0.3.1"
@ -315,6 +338,15 @@ version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
dependencies = [
"ahash",
]
[[package]]
name = "heck"
version = "0.4.1"
@ -346,7 +378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
dependencies = [
"autocfg",
"hashbrown",
"hashbrown 0.11.2",
]
[[package]]

View File

@ -16,13 +16,13 @@ in
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.47.0";
version = "0.48.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-P54ck7gkDgz6G8/3N1fxvx2R7cMUaDKnUtLgPzoUrtI=";
hash = "sha256-kCCORQKqt9rDydxvddD30RMQ1eS73rgvJzCCx93lRuI=";
};
cargoLock = {

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