diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 2e7051784640..f402376ebfb0 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -24,7 +24,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs
- uses: korthout/backport-action@v1.0.1
+ uses: korthout/backport-action@v1.1.0
with:
# Config README: https://github.com/korthout/backport-action#backport-action
pull_description: |-
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 52956e52afa6..e88054134a3d 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -558,6 +558,12 @@ in mkLicense lset) ({
redistributable = false;
};
+ fair = {
+ fullName = "Fair License";
+ spdxId = "Fair";
+ free = true;
+ };
+
issl = {
fullName = "Intel Simplified Software License";
url = "https://software.intel.com/en-us/license/intel-simplified-software-license";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 564828de1909..94a90d91013b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7799,6 +7799,12 @@
githubId = 17659803;
name = "Matthias Axel Kröll";
};
+ krostar = {
+ email = "alexis.destrez@pm.me";
+ github = "krostar";
+ githubId = 5759930;
+ name = "Alexis Destrez";
+ };
kristian-brucaj = {
email = "kbrucaj@gmail.com";
github = "Kristian-Brucaj";
@@ -8285,6 +8291,12 @@
fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A";
}];
};
+ lorenz = {
+ name = "Lorenz Brun";
+ email = "lorenz@brun.one";
+ github = "lorenz";
+ githubId = 5228892;
+ };
lorenzleutgeb = {
email = "lorenz@leutgeb.xyz";
github = "lorenzleutgeb";
@@ -8401,6 +8413,13 @@
githubId = 4969294;
name = "Louis Tim Larsen";
};
+ loveisgrief = {
+ name = "LoveIsGrief";
+ email = "loveisgrief@tuta.io";
+ keys = [{
+ fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB";
+ }];
+ };
lovek323 = {
email = "jason@oconal.id.au";
github = "lovek323";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index 534cf1ec0d26..f1d68304c864 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -547,6 +547,13 @@
security.
+
+
+ services.dhcpcd service now don’t solicit
+ or accept IPv6 Router Advertisements on interfaces that use
+ static IPv6 addresses.
+
+
The module services.headscale was
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index e2293fb67eee..531a5c442310 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -141,6 +141,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.chronyd` is now started with additional systemd sandbox/hardening options for better security.
+- `services.dhcpcd` service now don't solicit or accept IPv6 Router Advertisements on interfaces that use static IPv6 addresses.
+
- The module `services.headscale` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed:
- Most settings has been migrated under [services.headscale.settings](#opt-services.headscale.settings) which is an attribute-set that
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index bd37fe3b5574..b1f9b7a3bb1f 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -7,20 +7,19 @@ let
cfg = config.services.activemq;
- activemqBroker = stdenv.mkDerivation {
- name = "activemq-broker";
- phases = [ "installPhase" ];
- buildInputs = [ jdk ];
- installPhase = ''
- mkdir -p $out/lib
- source ${activemq}/lib/classpath.env
- export CLASSPATH
- ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java
- javac -d $out/lib ActiveMQBroker.java
- '';
- };
+ activemqBroker = runCommand "activemq-broker"
+ {
+ nativeBuildInputs = [ jdk ];
+ } ''
+ mkdir -p $out/lib
+ source ${activemq}/lib/classpath.env
+ export CLASSPATH
+ ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java
+ javac -d $out/lib ActiveMQBroker.java
+ '';
-in {
+in
+{
options = {
services.activemq = {
diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix
index 99735ff6519d..2d801a7e838f 100644
--- a/nixos/modules/services/hardware/throttled.nix
+++ b/nixos/modules/services/hardware/throttled.nix
@@ -22,10 +22,10 @@ in {
# The upstream package has this in Install, but that's not enough, see the NixOS manual
systemd.services.lenovo_fix.wantedBy = [ "multi-user.target" ];
- environment.etc."lenovo_fix.conf".source =
+ environment.etc."throttled.conf".source =
if cfg.extraConfig != ""
- then pkgs.writeText "lenovo_fix.conf" cfg.extraConfig
- else "${pkgs.throttled}/etc/lenovo_fix.conf";
+ then pkgs.writeText "throttled.conf" cfg.extraConfig
+ else "${pkgs.throttled}/etc/throttled.conf";
# Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs.
# See https://github.com/erpalma/throttled/issues/215
diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix
index 971448545616..30a41fa6a421 100644
--- a/nixos/modules/services/networking/blocky.nix
+++ b/nixos/modules/services/networking/blocky.nix
@@ -31,6 +31,7 @@ in
serviceConfig = {
DynamicUser = true;
ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}";
+ Restart = "on-failure";
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index ac5d45a65e3b..9a0b29fbe5a7 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -33,6 +33,13 @@ let
(if !config.networking.useDHCP && enableDHCP then
map (i: i.name) (filter (i: i.useDHCP == true) interfaces) else null);
+ staticIPv6Addresses = map (i: i.name) (filter (i: i.ipv6.addresses != [ ]) interfaces);
+
+ noIPv6rs = concatStringsSep "\n" (map (name: ''
+ interface ${name}
+ noipv6rs
+ '') staticIPv6Addresses);
+
# Config file adapted from the one that ships with dhcpcd.
dhcpcdConf = pkgs.writeText "dhcpcd.conf"
''
@@ -75,6 +82,8 @@ let
''}
${cfg.extraConfig}
+
+ ${optionalString config.networking.enableIPv6 noIPv6rs}
'';
exitHook = pkgs.writeText "dhcpcd.exit-hook"
diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index cc30896c80bd..1b6e1ac583af 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -94,11 +94,14 @@ let
] else []
) env))));
- mastodonTootctl = pkgs.writeShellScriptBin "mastodon-tootctl" ''
+ mastodonTootctl = let
+ sourceExtraEnv = lib.concatMapStrings (p: "source ${p}\n") cfg.extraEnvFiles;
+ in pkgs.writeShellScriptBin "mastodon-tootctl" ''
set -a
export RAILS_ROOT="${cfg.package}"
source "${envFile}"
source /var/lib/mastodon/.secrets_env
+ ${sourceExtraEnv}
sudo=exec
if [[ "$USER" != ${cfg.user} ]]; then
@@ -427,6 +430,15 @@ in {
'';
};
+ extraEnvFiles = lib.mkOption {
+ type = with lib.types; listOf path;
+ default = [];
+ description = lib.mdDoc ''
+ Extra environment files to pass to all mastodon services. Useful for passing down environemntal secrets.
+ '';
+ example = [ "/etc/mastodon/s3config.env" ];
+ };
+
automaticMigrations = lib.mkOption {
type = lib.types.bool;
default = true;
@@ -579,7 +591,7 @@ in {
};
serviceConfig = {
Type = "oneshot";
- EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ];
+ EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles;
WorkingDirectory = cfg.package;
# System Call Filtering
SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ];
@@ -607,7 +619,7 @@ in {
ExecStart = "${cfg.package}/run-streaming.sh";
Restart = "always";
RestartSec = 20;
- EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ];
+ EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles;
WorkingDirectory = cfg.package;
# Runtime directory and mode
RuntimeDirectory = "mastodon-streaming";
@@ -634,7 +646,7 @@ in {
ExecStart = "${cfg.package}/bin/puma -C config/puma.rb";
Restart = "always";
RestartSec = 20;
- EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ];
+ EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles;
WorkingDirectory = cfg.package;
# Runtime directory and mode
RuntimeDirectory = "mastodon-web";
@@ -662,7 +674,7 @@ in {
ExecStart = "${cfg.package}/bin/sidekiq -c ${toString cfg.sidekiqThreads} -r ${cfg.package}";
Restart = "always";
RestartSec = 20;
- EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ];
+ EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles;
WorkingDirectory = cfg.package;
# System Call Filtering
SystemCallFilter = [ ("~" + lib.concatStringsSep " " systemCallsList) "@chown" "pipe" "pipe2" ];
@@ -675,7 +687,7 @@ in {
environment = env;
serviceConfig = {
Type = "oneshot";
- EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ];
+ EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles;
} // cfgService;
script = let
olderThanDays = toString cfg.mediaAutoRemove.olderThanDays;
diff --git a/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix b/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix
new file mode 100644
index 000000000000..5d5c057d724b
--- /dev/null
+++ b/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix
@@ -0,0 +1,31 @@
+{ lib, fetchurl, stdenv, unzip, fpc }:
+
+stdenv.mkDerivation rec {
+ pname = "dolbybcsoftwaredecode";
+ version = "april-2018";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/dolbybcsoftwaredecode/April-2018/SourceCode.zip";
+ sha256 = "sha256-uLcsRIpwmJlstlGV8I4+/30+D9GDpUt7DOIP/GkXWp4=";
+ };
+
+ nativeBuildInputs = [ unzip fpc ];
+ buildPhase = ''
+ fpc DolbyBi64.PP
+ '';
+ installPhase = ''
+ mkdir -p $out/bin
+ cp DolbyBi64 $out/bin/
+ '';
+
+ meta = with lib; {
+ description = "A Dolby B & C software decoder";
+ homepage = "https://sourceforge.net/projects/dolbybcsoftwaredecode/";
+ maintainers = with maintainers; [ lorenz ];
+
+ # Project is has source code available, but has no explicit license.
+ # I asked upstream to assign a license, so maybe this can be free
+ # in the future, but for now let's play it safe and make it unfree.
+ license = lib.licenses.unfree;
+ };
+}
diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix
index 731578d04e46..151f03797cc8 100644
--- a/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dragonfly-reverb";
- version = "3.2.7";
+ version = "3.2.8";
src = fetchFromGitHub {
owner = "michaelwillis";
repo = "dragonfly-reverb";
rev = version;
- sha256 = "sha256-DJ6J5PuRFDin6PtkNYjIRI1gEVQkKmnZLhnj7L4JtPM=";
+ sha256 = "sha256-Jz0t9IO3H+guL4NiETCBHSb4rxFTxZRHw2v20yS/wlk=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix
index 1837cb107481..ed48c129418c 100644
--- a/pkgs/applications/audio/midi-visualizer/default.nix
+++ b/pkgs/applications/audio/midi-visualizer/default.nix
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "MIDIVisualizer";
- version = "6.5";
+ version = "7.0";
src = fetchFromGitHub {
owner = "kosua20";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-thRcRJ88bz3jwu6rKaQxt2MkBSf5Ri1jygkKDguP2eE=";
+ sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE=";
};
nativeBuildInputs = [ cmake pkg-config makeWrapper];
diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix
index 19b72d1c3788..fa63fee80065 100644
--- a/pkgs/applications/audio/squeezelite/default.nix
+++ b/pkgs/applications/audio/squeezelite/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
EXECUTABLE = binName;
- OPTS = [ "-DLINKALL" ]
+ OPTS = [ "-DLINKALL" "-DGPIO" ]
++ optional dsdSupport "-DDSD"
++ optional (!faad2Support) "-DNO_FAAD"
++ optional ffmpegSupport "-DFFMPEG"
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 2a1deff81a38..2f2dd0416f27 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -6,7 +6,7 @@
ada = buildGrammar {
language = "ada";
version = "e9e2ec9";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "briot";
repo = "tree-sitter-ada";
rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121";
@@ -17,7 +17,7 @@
agda = buildGrammar {
language = "agda";
version = "80ea622";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "AusCyberman";
repo = "tree-sitter-agda";
rev = "80ea622cf952a0059e168e5c92a798b2f1925652";
@@ -28,7 +28,7 @@
arduino = buildGrammar {
language = "arduino";
version = "c473c09";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-arduino";
rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8";
@@ -39,7 +39,7 @@
astro = buildGrammar {
language = "astro";
version = "a1f66bf";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "virchau13";
repo = "tree-sitter-astro";
rev = "a1f66bf72ed68b87f779bce9a52e5c6521fc867e";
@@ -50,7 +50,7 @@
awk = buildGrammar {
language = "awk";
version = "e559793";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "Beaglefoot";
repo = "tree-sitter-awk";
rev = "e559793754c60c2cdf00cbb0409842d75f0a41dc";
@@ -61,7 +61,7 @@
bash = buildGrammar {
language = "bash";
version = "4488aa4";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-bash";
rev = "4488aa41406547e478636a4fcfd24f5bbc3f2f74";
@@ -72,7 +72,7 @@
beancount = buildGrammar {
language = "beancount";
version = "4cbd1f0";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "polarmutex";
repo = "tree-sitter-beancount";
rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c";
@@ -83,7 +83,7 @@
bibtex = buildGrammar {
language = "bibtex";
version = "ccfd77d";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "latex-lsp";
repo = "tree-sitter-bibtex";
rev = "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34";
@@ -94,7 +94,7 @@
blueprint = buildGrammar {
language = "blueprint";
version = "6ef91ca";
- source = fetchFromGitLab {
+ src = fetchFromGitLab {
owner = "gabmus";
repo = "tree-sitter-blueprint";
rev = "6ef91ca8270f0112b9c6d27ecb9966c741a5d103";
@@ -105,7 +105,7 @@
c = buildGrammar {
language = "c";
version = "7175a6d";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c";
rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a";
@@ -116,7 +116,7 @@
c_sharp = buildGrammar {
language = "c_sharp";
version = "a29bac0";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "a29bac0681802139710b4d3875540901504d15cb";
@@ -127,7 +127,7 @@
clojure = buildGrammar {
language = "clojure";
version = "262d6d6";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "sogaiu";
repo = "tree-sitter-clojure";
rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416";
@@ -138,7 +138,7 @@
cmake = buildGrammar {
language = "cmake";
version = "a322653";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "uyha";
repo = "tree-sitter-cmake";
rev = "a32265307aa2d31941056d69e8b6633e61750b2f";
@@ -149,7 +149,7 @@
comment = buildGrammar {
language = "comment";
version = "a37ca37";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "stsewd";
repo = "tree-sitter-comment";
rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e";
@@ -160,7 +160,7 @@
commonlisp = buildGrammar {
language = "commonlisp";
version = "c7e8149";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-commonlisp";
rev = "c7e814975ab0d0d04333d1f32391c41180c58919";
@@ -171,7 +171,7 @@
cooklang = buildGrammar {
language = "cooklang";
version = "5e11341";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "addcninblue";
repo = "tree-sitter-cooklang";
rev = "5e113412aadb78955c27010daa4dbe1d202013cf";
@@ -182,7 +182,7 @@
cpp = buildGrammar {
language = "cpp";
version = "2d2c4ae";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1";
@@ -193,7 +193,7 @@
css = buildGrammar {
language = "css";
version = "769203d";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-css";
rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51";
@@ -204,7 +204,7 @@
cuda = buildGrammar {
language = "cuda";
version = "0091006";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
rev = "0091006d6498ee5647f080ef6c09e5b95e481078";
@@ -215,7 +215,7 @@
d = buildGrammar {
language = "d";
version = "c2fbf21";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "CyberShadow";
repo = "tree-sitter-d";
rev = "c2fbf21bd3aa45495fe13247e040ad5815250032";
@@ -227,7 +227,7 @@
dart = buildGrammar {
language = "dart";
version = "53485a8";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "UserNobody14";
repo = "tree-sitter-dart";
rev = "53485a8f301254e19c518aa20c80f1bcf7cf5c62";
@@ -238,7 +238,7 @@
devicetree = buildGrammar {
language = "devicetree";
version = "ea30a05";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "joelspadin";
repo = "tree-sitter-devicetree";
rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849";
@@ -250,7 +250,7 @@
diff = buildGrammar {
language = "diff";
version = "1d63cd4";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "the-mikedavis";
repo = "tree-sitter-diff";
rev = "1d63cd49529ef3153393cf8f620718b274bba715";
@@ -261,7 +261,7 @@
dockerfile = buildGrammar {
language = "dockerfile";
version = "09e316d";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "camdencheek";
repo = "tree-sitter-dockerfile";
rev = "09e316dba307b869831e9399b11a83bbf0f2a24b";
@@ -272,7 +272,7 @@
dot = buildGrammar {
language = "dot";
version = "9ab8555";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "rydesun";
repo = "tree-sitter-dot";
rev = "9ab85550c896d8b294d9b9ca1e30698736f08cea";
@@ -283,7 +283,7 @@
ebnf = buildGrammar {
language = "ebnf";
version = "ef241bc";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "RubixDev";
repo = "ebnf";
rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c";
@@ -295,7 +295,7 @@
eex = buildGrammar {
language = "eex";
version = "f742f2f";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "connorlay";
repo = "tree-sitter-eex";
rev = "f742f2fe327463335e8671a87c0b9b396905d1d1";
@@ -306,7 +306,7 @@
elixir = buildGrammar {
language = "elixir";
version = "b20eaa7";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "elixir-lang";
repo = "tree-sitter-elixir";
rev = "b20eaa75565243c50be5e35e253d8beb58f45d56";
@@ -317,7 +317,7 @@
elm = buildGrammar {
language = "elm";
version = "28bb193";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "elm-tooling";
repo = "tree-sitter-elm";
rev = "28bb193640d916dfaf947912c1413cebb0484841";
@@ -328,7 +328,7 @@
elvish = buildGrammar {
language = "elvish";
version = "f32711e";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "ckafi";
repo = "tree-sitter-elvish";
rev = "f32711e31e987fd5c2c002f3daba02f25c68672f";
@@ -339,7 +339,7 @@
embedded_template = buildGrammar {
language = "embedded_template";
version = "a130858";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-embedded-template";
rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df";
@@ -350,7 +350,7 @@
erlang = buildGrammar {
language = "erlang";
version = "f0e2f78";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "WhatsApp";
repo = "tree-sitter-erlang";
rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb";
@@ -361,7 +361,7 @@
fennel = buildGrammar {
language = "fennel";
version = "5171959";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "travonted";
repo = "tree-sitter-fennel";
rev = "517195970428aacca60891b050aa53eabf4ba78d";
@@ -372,7 +372,7 @@
fish = buildGrammar {
language = "fish";
version = "6675b56";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "ram02z";
repo = "tree-sitter-fish";
rev = "6675b56266b3f615fb112205b6b83a79315309c4";
@@ -383,7 +383,7 @@
foam = buildGrammar {
language = "foam";
version = "c238f4a";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "FoamScience";
repo = "tree-sitter-foam";
rev = "c238f4af9a5723a212cf1a4c9b31dd5c1d5270a2";
@@ -394,7 +394,7 @@
fortran = buildGrammar {
language = "fortran";
version = "edcb337";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7";
@@ -405,7 +405,7 @@
fsh = buildGrammar {
language = "fsh";
version = "fa33477";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "mgramigna";
repo = "tree-sitter-fsh";
rev = "fa3347712f7a59ed02ccf508284554689c6cde28";
@@ -416,7 +416,7 @@
fusion = buildGrammar {
language = "fusion";
version = "19db2f4";
- source = fetchFromGitLab {
+ src = fetchFromGitLab {
owner = "jirgn";
repo = "tree-sitter-fusion";
rev = "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6";
@@ -427,7 +427,7 @@
gdscript = buildGrammar {
language = "gdscript";
version = "a8fa839";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "PrestonKnopp";
repo = "tree-sitter-gdscript";
rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c";
@@ -438,7 +438,7 @@
git_rebase = buildGrammar {
language = "git_rebase";
version = "127f5b5";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "the-mikedavis";
repo = "tree-sitter-git-rebase";
rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c";
@@ -449,7 +449,7 @@
gitattributes = buildGrammar {
language = "gitattributes";
version = "577a075";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-gitattributes";
rev = "577a075d46ea109905c5cb6179809df88da61ce9";
@@ -460,7 +460,7 @@
gitcommit = buildGrammar {
language = "gitcommit";
version = "190d288";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-gitcommit";
rev = "190d288a1746bddb4abe96b597fb7d17b76e5522";
@@ -471,7 +471,7 @@
gitignore = buildGrammar {
language = "gitignore";
version = "f4685bf";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "shunsambongi";
repo = "tree-sitter-gitignore";
rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504";
@@ -483,7 +483,7 @@
gleam = buildGrammar {
language = "gleam";
version = "cfcbca3";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "J3RN";
repo = "tree-sitter-gleam";
rev = "cfcbca3f8f734773878e00d7bfcedea98eb10be2";
@@ -494,7 +494,7 @@
glimmer = buildGrammar {
language = "glimmer";
version = "c0bfd26";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "alexlafroscia";
repo = "tree-sitter-glimmer";
rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89";
@@ -505,7 +505,7 @@
glsl = buildGrammar {
language = "glsl";
version = "e2c2214";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-glsl";
rev = "e2c2214045de2628b81089b1a739962f59654558";
@@ -516,7 +516,7 @@
go = buildGrammar {
language = "go";
version = "64457ea";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-go";
rev = "64457ea6b73ef5422ed1687178d4545c3e91334a";
@@ -527,7 +527,7 @@
godot_resource = buildGrammar {
language = "godot_resource";
version = "b6ef076";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "PrestonKnopp";
repo = "tree-sitter-godot-resource";
rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a";
@@ -539,7 +539,7 @@
gomod = buildGrammar {
language = "gomod";
version = "4a65743";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "camdencheek";
repo = "tree-sitter-go-mod";
rev = "4a65743dbc2bb3094114dd2b43da03c820aa5234";
@@ -550,7 +550,7 @@
gowork = buildGrammar {
language = "gowork";
version = "949a8a4";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "omertuc";
repo = "tree-sitter-go-work";
rev = "949a8a470559543857a62102c84700d291fc984c";
@@ -561,7 +561,7 @@
graphql = buildGrammar {
language = "graphql";
version = "5e66e96";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "bkegley";
repo = "tree-sitter-graphql";
rev = "5e66e961eee421786bdda8495ed1db045e06b5fe";
@@ -572,7 +572,7 @@
hack = buildGrammar {
language = "hack";
version = "b7bd692";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "slackhq";
repo = "tree-sitter-hack";
rev = "b7bd6928532ada34dddb1dece4a158ab62c6e783";
@@ -583,7 +583,7 @@
haskell = buildGrammar {
language = "haskell";
version = "aee3725";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-haskell";
rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e";
@@ -594,7 +594,7 @@
hcl = buildGrammar {
language = "hcl";
version = "0ff887f";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "MichaHoffmann";
repo = "tree-sitter-hcl";
rev = "0ff887f2a60a147452d52db060de6b42f42f1441";
@@ -605,7 +605,7 @@
heex = buildGrammar {
language = "heex";
version = "2e1348c";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "connorlay";
repo = "tree-sitter-heex";
rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a";
@@ -616,7 +616,7 @@
help = buildGrammar {
language = "help";
version = "9dee68e";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vimdoc";
rev = "9dee68e3912d16e9878b06e3cd87e21ada3d9029";
@@ -627,7 +627,7 @@
hjson = buildGrammar {
language = "hjson";
version = "02fa3b7";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "winston0410";
repo = "tree-sitter-hjson";
rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0";
@@ -638,7 +638,7 @@
hlsl = buildGrammar {
language = "hlsl";
version = "bd0d463";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa";
@@ -649,7 +649,7 @@
hocon = buildGrammar {
language = "hocon";
version = "c390f10";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "antosha417";
repo = "tree-sitter-hocon";
rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc";
@@ -660,7 +660,7 @@
html = buildGrammar {
language = "html";
version = "29f53d8";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-html";
rev = "29f53d8f4f2335e61bf6418ab8958dac3282077a";
@@ -671,7 +671,7 @@
htmldjango = buildGrammar {
language = "htmldjango";
version = "b2dba02";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "interdependence";
repo = "tree-sitter-htmldjango";
rev = "b2dba02eddab66be669022320273d0dfe1ff923d";
@@ -682,7 +682,7 @@
http = buildGrammar {
language = "http";
version = "2c6c445";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "rest-nvim";
repo = "tree-sitter-http";
rev = "2c6c44574031263326cb1e51658bbc0c084326e7";
@@ -693,7 +693,7 @@
ini = buildGrammar {
language = "ini";
version = "1a0ce07";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "justinmk";
repo = "tree-sitter-ini";
rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44";
@@ -704,7 +704,7 @@
java = buildGrammar {
language = "java";
version = "09d650d";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-java";
rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e";
@@ -715,7 +715,7 @@
javascript = buildGrammar {
language = "javascript";
version = "7a29d06";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-javascript";
rev = "7a29d06274b7cf87d643212a433d970b73969016";
@@ -726,7 +726,7 @@
jq = buildGrammar {
language = "jq";
version = "13990f5";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "flurie";
repo = "tree-sitter-jq";
rev = "13990f530e8e6709b7978503da9bc8701d366791";
@@ -737,7 +737,7 @@
jsdoc = buildGrammar {
language = "jsdoc";
version = "189a6a4";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-jsdoc";
rev = "189a6a4829beb9cdbe837260653b4a3dfb0cc3db";
@@ -748,7 +748,7 @@
json = buildGrammar {
language = "json";
version = "7307675";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-json";
rev = "73076754005a460947cafe8e03a8cf5fa4fa2938";
@@ -759,7 +759,7 @@
json5 = buildGrammar {
language = "json5";
version = "5dd5cdc";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "Joakker";
repo = "tree-sitter-json5";
rev = "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2";
@@ -770,7 +770,7 @@
jsonc = buildGrammar {
language = "jsonc";
version = "02b0165";
- source = fetchFromGitLab {
+ src = fetchFromGitLab {
owner = "WhyNotHugo";
repo = "tree-sitter-jsonc";
rev = "02b01653c8a1c198ae7287d566efa86a135b30d5";
@@ -781,7 +781,7 @@
jsonnet = buildGrammar {
language = "jsonnet";
version = "505f5bd";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "sourcegraph";
repo = "tree-sitter-jsonnet";
rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2";
@@ -792,7 +792,7 @@
julia = buildGrammar {
language = "julia";
version = "0412178";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-julia";
rev = "041217800bf423099015e1654c9a4fdd75310bb1";
@@ -803,7 +803,7 @@
kotlin = buildGrammar {
language = "kotlin";
version = "b953dbd";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "fwcd";
repo = "tree-sitter-kotlin";
rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28";
@@ -814,7 +814,7 @@
lalrpop = buildGrammar {
language = "lalrpop";
version = "7744b56";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "traxys";
repo = "tree-sitter-lalrpop";
rev = "7744b56f03ac1e5643fad23c9dd90837fe97291e";
@@ -825,7 +825,7 @@
latex = buildGrammar {
language = "latex";
version = "6b7ea83";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "latex-lsp";
repo = "tree-sitter-latex";
rev = "6b7ea839307670e6bda011f888717d3a882ecc09";
@@ -836,7 +836,7 @@
ledger = buildGrammar {
language = "ledger";
version = "47b8971";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "cbarrete";
repo = "tree-sitter-ledger";
rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9";
@@ -847,7 +847,7 @@
llvm = buildGrammar {
language = "llvm";
version = "e9948ed";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "benwilliamgraham";
repo = "tree-sitter-llvm";
rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6";
@@ -858,7 +858,7 @@
lua = buildGrammar {
language = "lua";
version = "0fc8996";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "tree-sitter-lua";
rev = "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd";
@@ -869,7 +869,7 @@
m68k = buildGrammar {
language = "m68k";
version = "d097b12";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "grahambates";
repo = "tree-sitter-m68k";
rev = "d097b123f19c6eaba2bf181c05420d88b9fc489d";
@@ -880,7 +880,7 @@
make = buildGrammar {
language = "make";
version = "a4b9187";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "alemuller";
repo = "tree-sitter-make";
rev = "a4b9187417d6be349ee5fd4b6e77b4172c6827dd";
@@ -891,7 +891,7 @@
markdown = buildGrammar {
language = "markdown";
version = "16d0b5e";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
@@ -903,7 +903,7 @@
markdown_inline = buildGrammar {
language = "markdown_inline";
version = "16d0b5e";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
rev = "16d0b5e54d781150bea1070ffb360d47e6238659";
@@ -915,7 +915,7 @@
menhir = buildGrammar {
language = "menhir";
version = "db7953a";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "Kerl13";
repo = "tree-sitter-menhir";
rev = "db7953acb0d5551f207373c81fa07a57d7b085cb";
@@ -926,7 +926,7 @@
mermaid = buildGrammar {
language = "mermaid";
version = "d787c66";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "monaqa";
repo = "tree-sitter-mermaid";
rev = "d787c66276e7e95899230539f556e8b83ee16f6d";
@@ -937,7 +937,7 @@
meson = buildGrammar {
language = "meson";
version = "5f3138d";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "tree-sitter-meson";
rev = "5f3138d555aceef976ec9a1d4a3f78e13b31e45f";
@@ -948,7 +948,7 @@
nickel = buildGrammar {
language = "nickel";
version = "092e901";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "nickel-lang";
repo = "tree-sitter-nickel";
rev = "092e90142667482996880044d2c04837d3d1c266";
@@ -959,7 +959,7 @@
ninja = buildGrammar {
language = "ninja";
version = "0a95cfd";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "alemuller";
repo = "tree-sitter-ninja";
rev = "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267";
@@ -970,7 +970,7 @@
nix = buildGrammar {
language = "nix";
version = "6b71a81";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "cstrahan";
repo = "tree-sitter-nix";
rev = "6b71a810c0acd49b980c50fc79092561f7cee307";
@@ -981,7 +981,7 @@
norg = buildGrammar {
language = "norg";
version = "6348056";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "tree-sitter-norg";
rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712";
@@ -992,7 +992,7 @@
ocaml = buildGrammar {
language = "ocaml";
version = "f1106bf";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc";
@@ -1004,7 +1004,7 @@
ocaml_interface = buildGrammar {
language = "ocaml_interface";
version = "f1106bf";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ocaml";
rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc";
@@ -1016,7 +1016,7 @@
ocamllex = buildGrammar {
language = "ocamllex";
version = "ac1d595";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "atom-ocaml";
repo = "tree-sitter-ocamllex";
rev = "ac1d5957e719d49bd6acd27439b79843e4daf8ed";
@@ -1028,7 +1028,7 @@
org = buildGrammar {
language = "org";
version = "081179c";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "milisims";
repo = "tree-sitter-org";
rev = "081179c52b3e8175af62b9b91dc099d010c38770";
@@ -1039,7 +1039,7 @@
pascal = buildGrammar {
language = "pascal";
version = "9e99540";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "Isopod";
repo = "tree-sitter-pascal";
rev = "9e995404ddff8319631d72d4b46552e737206912";
@@ -1050,7 +1050,7 @@
perl = buildGrammar {
language = "perl";
version = "749d26f";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "ganezdragon";
repo = "tree-sitter-perl";
rev = "749d26fe13fb131b92e6515416096e572575b981";
@@ -1061,7 +1061,7 @@
php = buildGrammar {
language = "php";
version = "973694f";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9";
@@ -1072,7 +1072,7 @@
phpdoc = buildGrammar {
language = "phpdoc";
version = "2f4d16c";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "claytonrcarter";
repo = "tree-sitter-phpdoc";
rev = "2f4d16c861b5a454b577d057f247f9902d7b47f5";
@@ -1083,7 +1083,7 @@
pioasm = buildGrammar {
language = "pioasm";
version = "924aada";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "leo60228";
repo = "tree-sitter-pioasm";
rev = "924aadaf5dea2a6074d72027b064f939acf32e20";
@@ -1094,7 +1094,7 @@
prisma = buildGrammar {
language = "prisma";
version = "eca2596";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "victorhqc";
repo = "tree-sitter-prisma";
rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5";
@@ -1105,7 +1105,7 @@
proto = buildGrammar {
language = "proto";
version = "42d82fa";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "mitchellh";
repo = "tree-sitter-proto";
rev = "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f";
@@ -1116,7 +1116,7 @@
pug = buildGrammar {
language = "pug";
version = "26f6ac8";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "zealot128";
repo = "tree-sitter-pug";
rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f";
@@ -1127,7 +1127,7 @@
python = buildGrammar {
language = "python";
version = "9e53981";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-python";
rev = "9e53981ec31b789ee26162ea335de71f02186003";
@@ -1138,7 +1138,7 @@
ql = buildGrammar {
language = "ql";
version = "bd08702";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ql";
rev = "bd087020f0d8c183080ca615d38de0ec827aeeaf";
@@ -1149,7 +1149,7 @@
qmljs = buildGrammar {
language = "qmljs";
version = "ab75be9";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "yuja";
repo = "tree-sitter-qmljs";
rev = "ab75be9750e6f2f804638824d1790034286a830c";
@@ -1160,7 +1160,7 @@
query = buildGrammar {
language = "query";
version = "0717de0";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "tree-sitter-query";
rev = "0717de07078a20a8608c98ad5f26c208949d0e15";
@@ -1171,7 +1171,7 @@
r = buildGrammar {
language = "r";
version = "80efda5";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "r-lib";
repo = "tree-sitter-r";
rev = "80efda55672d1293aa738f956c7ae384ecdc31b4";
@@ -1182,7 +1182,7 @@
racket = buildGrammar {
language = "racket";
version = "dc9c334";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "6cdh";
repo = "tree-sitter-racket";
rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37";
@@ -1193,7 +1193,7 @@
rasi = buildGrammar {
language = "rasi";
version = "5f04634";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "Fymyte";
repo = "tree-sitter-rasi";
rev = "5f04634dd4e12de4574c4a3dc9d6d5d4da4a2a1b";
@@ -1204,7 +1204,7 @@
regex = buildGrammar {
language = "regex";
version = "e1cfca3";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-regex";
rev = "e1cfca3c79896ff79842f057ea13e529b66af636";
@@ -1215,7 +1215,7 @@
rego = buildGrammar {
language = "rego";
version = "b2667c9";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "FallenAngel97";
repo = "tree-sitter-rego";
rev = "b2667c975f07b33be3ceb83bea5cfbad88095866";
@@ -1226,7 +1226,7 @@
rnoweb = buildGrammar {
language = "rnoweb";
version = "502c112";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "bamonroe";
repo = "tree-sitter-rnoweb";
rev = "502c1126dc6777f09af5bef16e72a42f75bd081e";
@@ -1237,7 +1237,7 @@
rst = buildGrammar {
language = "rst";
version = "25e6328";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "stsewd";
repo = "tree-sitter-rst";
rev = "25e6328872ac3a764ba8b926aea12719741103f1";
@@ -1248,7 +1248,7 @@
ruby = buildGrammar {
language = "ruby";
version = "7a1921b";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ruby";
rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4";
@@ -1259,7 +1259,7 @@
rust = buildGrammar {
language = "rust";
version = "f7fb205";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-rust";
rev = "f7fb205c424b0962de59b26b931fe484e1262b35";
@@ -1270,7 +1270,7 @@
scala = buildGrammar {
language = "scala";
version = "067ee61";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20";
@@ -1281,7 +1281,7 @@
scheme = buildGrammar {
language = "scheme";
version = "67b90a3";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "6cdh";
repo = "tree-sitter-scheme";
rev = "67b90a365bebf4406af4e5a546d6336de787e135";
@@ -1292,7 +1292,7 @@
scss = buildGrammar {
language = "scss";
version = "c478c68";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "serenadeai";
repo = "tree-sitter-scss";
rev = "c478c6868648eff49eb04a4df90d703dc45b312a";
@@ -1303,7 +1303,7 @@
slint = buildGrammar {
language = "slint";
version = "0754752";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "jrmoulton";
repo = "tree-sitter-slint";
rev = "07547525cdf4627343dca5891f1743ae45e879bb";
@@ -1314,7 +1314,7 @@
smali = buildGrammar {
language = "smali";
version = "d7f535e";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-smali";
rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff";
@@ -1325,7 +1325,7 @@
solidity = buildGrammar {
language = "solidity";
version = "52ed088";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "YongJieYongJie";
repo = "tree-sitter-solidity";
rev = "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a";
@@ -1336,7 +1336,7 @@
sparql = buildGrammar {
language = "sparql";
version = "05f949d";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "BonaBeavis";
repo = "tree-sitter-sparql";
rev = "05f949d3c1c15e3261473a244d3ce87777374dec";
@@ -1347,7 +1347,7 @@
sql = buildGrammar {
language = "sql";
version = "9d98029";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149";
@@ -1359,7 +1359,7 @@
supercollider = buildGrammar {
language = "supercollider";
version = "90c6d9f";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "madskjeldgaard";
repo = "tree-sitter-supercollider";
rev = "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0";
@@ -1370,7 +1370,7 @@
surface = buildGrammar {
language = "surface";
version = "f4586b3";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "connorlay";
repo = "tree-sitter-surface";
rev = "f4586b35ac8548667a9aaa4eae44456c1f43d032";
@@ -1381,7 +1381,7 @@
svelte = buildGrammar {
language = "svelte";
version = "52e122a";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "Himujjal";
repo = "tree-sitter-svelte";
rev = "52e122ae68b316d3aa960a0a422d3645ba717f42";
@@ -1392,7 +1392,7 @@
swift = buildGrammar {
language = "swift";
version = "0fe0de5";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
rev = "0fe0de56b528cbf24a654c734ca181b48be3831d";
@@ -1404,7 +1404,7 @@
sxhkdrc = buildGrammar {
language = "sxhkdrc";
version = "440d5f9";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "RaafatTurki";
repo = "tree-sitter-sxhkdrc";
rev = "440d5f913d9465c9c776a1bd92334d32febcf065";
@@ -1415,7 +1415,7 @@
t32 = buildGrammar {
language = "t32";
version = "f8106fc";
- source = fetchFromGitea {
+ src = fetchFromGitea {
domain = "codeberg.org";
owner = "xasc";
repo = "tree-sitter-t32";
@@ -1427,7 +1427,7 @@
teal = buildGrammar {
language = "teal";
version = "1ae8c68";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "euclidianAce";
repo = "tree-sitter-teal";
rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2";
@@ -1439,7 +1439,7 @@
terraform = buildGrammar {
language = "terraform";
version = "0ff887f";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "MichaHoffmann";
repo = "tree-sitter-hcl";
rev = "0ff887f2a60a147452d52db060de6b42f42f1441";
@@ -1451,7 +1451,7 @@
thrift = buildGrammar {
language = "thrift";
version = "999a27d";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "duskmoon314";
repo = "tree-sitter-thrift";
rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633";
@@ -1462,7 +1462,7 @@
tiger = buildGrammar {
language = "tiger";
version = "a233ebe";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "ambroisie";
repo = "tree-sitter-tiger";
rev = "a233ebe360a73a92c50978e5c4e9e471bc59ff42";
@@ -1473,7 +1473,7 @@
tlaplus = buildGrammar {
language = "tlaplus";
version = "d3ef05e";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tlaplus-community";
repo = "tree-sitter-tlaplus";
rev = "d3ef05eec4473094e2d691243aa243ce63de6406";
@@ -1484,7 +1484,7 @@
todotxt = buildGrammar {
language = "todotxt";
version = "0207f6a";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "arnarg";
repo = "tree-sitter-todotxt";
rev = "0207f6a4ab6aeafc4b091914d31d8235049a2578";
@@ -1495,7 +1495,7 @@
toml = buildGrammar {
language = "toml";
version = "8bd2056";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "ikatyang";
repo = "tree-sitter-toml";
rev = "8bd2056818b21860e3d756b5a58c4f6e05fb744e";
@@ -1506,7 +1506,7 @@
tsx = buildGrammar {
language = "tsx";
version = "faad909";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7";
@@ -1518,7 +1518,7 @@
turtle = buildGrammar {
language = "turtle";
version = "085437f";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "BonaBeavis";
repo = "tree-sitter-turtle";
rev = "085437f5cb117703b7f520dd92161140a684f092";
@@ -1529,7 +1529,7 @@
twig = buildGrammar {
language = "twig";
version = "2457993";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-twig";
rev = "2457993b13a06dec2706e6a6c3d5b65bb23024b8";
@@ -1540,7 +1540,7 @@
typescript = buildGrammar {
language = "typescript";
version = "faad909";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-typescript";
rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7";
@@ -1552,7 +1552,7 @@
v = buildGrammar {
language = "v";
version = "0b03983";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "vlang";
repo = "vls";
rev = "0b039830a33e759f0c9ee978b47ad10b82d37349";
@@ -1564,7 +1564,7 @@
vala = buildGrammar {
language = "vala";
version = "8f690bf";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "vala-lang";
repo = "tree-sitter-vala";
rev = "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b";
@@ -1575,7 +1575,7 @@
verilog = buildGrammar {
language = "verilog";
version = "4457145";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-verilog";
rev = "4457145e795b363f072463e697dfe2f6973c9a52";
@@ -1586,7 +1586,7 @@
vhs = buildGrammar {
language = "vhs";
version = "8a0df32";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "charmbracelet";
repo = "tree-sitter-vhs";
rev = "8a0df32b72a8cf8d3e3e84f16c19e9ba46d3dba5";
@@ -1597,7 +1597,7 @@
vim = buildGrammar {
language = "vim";
version = "55ff1b0";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "vigoux";
repo = "tree-sitter-viml";
rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9";
@@ -1608,7 +1608,7 @@
vue = buildGrammar {
language = "vue";
version = "91fe275";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "ikatyang";
repo = "tree-sitter-vue";
rev = "91fe2754796cd8fba5f229505a23fa08f3546c06";
@@ -1619,7 +1619,7 @@
wgsl = buildGrammar {
language = "wgsl";
version = "40259f3";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "szebniok";
repo = "tree-sitter-wgsl";
rev = "40259f3c77ea856841a4e0c4c807705f3e4a2b65";
@@ -1630,7 +1630,7 @@
wgsl_bevy = buildGrammar {
language = "wgsl_bevy";
version = "7cd38d6";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-wgsl-bevy";
rev = "7cd38d6895060b023353e04f7af099ec64add5d1";
@@ -1641,7 +1641,7 @@
yaml = buildGrammar {
language = "yaml";
version = "0e36bed";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "ikatyang";
repo = "tree-sitter-yaml";
rev = "0e36bed171768908f331ff7dff9d956bae016efb";
@@ -1652,7 +1652,7 @@
yang = buildGrammar {
language = "yang";
version = "2c0e6be";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "Hubro";
repo = "tree-sitter-yang";
rev = "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502";
@@ -1663,7 +1663,7 @@
zig = buildGrammar {
language = "zig";
version = "d90d38d";
- source = fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "maxxnino";
repo = "tree-sitter-zig";
rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca";
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index 22caf6a1718e..bacebe9a7468 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -4,7 +4,7 @@ self: super:
let
generatedGrammars = callPackage ./generated.nix {
- buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { };
+ inherit (tree-sitter) buildGrammar;
};
generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
index 6963a82d46b6..380100978999 100755
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
@@ -36,7 +36,7 @@ def generate_grammar(item):
generated = f""" {lang} = buildGrammar {{
language = "{lang}";
version = "{rev[:7]}";
- source = """
+ src = """
generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True)
generated += ";"
diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix
index 92b3fae31596..5ac0f5e3abab 100644
--- a/pkgs/applications/file-managers/xfe/default.nix
+++ b/pkgs/applications/file-managers/xfe/default.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "xfe";
- version = "1.44";
+ version = "1.45";
src = fetchurl {
url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz";
- sha256 = "594c14d185bdfc7e3132aefda7cf4e233625258ca9a1939359944a2c07c030b6";
+ sha256 = "sha256-RmvVUzqCsRRwXgC4Yabt46uFHnL0XFWncQfXDG+owDc=";
};
nativeBuildInputs = [ pkg-config intltool ];
diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix
index 9c919273b545..596ae0d07a11 100644
--- a/pkgs/applications/graphics/ovito/default.nix
+++ b/pkgs/applications/graphics/ovito/default.nix
@@ -21,13 +21,13 @@
mkDerivation rec {
pname = "ovito";
- version = "3.7.7";
+ version = "3.7.11";
src = fetchFromGitLab {
owner = "stuko";
repo = "ovito";
rev = "v${version}";
- sha256 = "sha256-wKXnb7ZzWOPPrHj3jOeFazRy0PVqcV/OFeaBs6qgF1I=";
+ sha256 = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix
index 42143cbc9772..f940f5a4af80 100644
--- a/pkgs/applications/misc/polychromatic/default.nix
+++ b/pkgs/applications/misc/polychromatic/default.nix
@@ -20,14 +20,14 @@
python3Packages.buildPythonApplication rec {
name = "polychromatic";
- version = "0.7.3";
+ version = "0.8.0";
format = "other";
src = fetchFromGitHub {
owner = "polychromatic";
repo = "polychromatic";
rev = "v${version}";
- sha256 = "sha256-H++kQ3Fxw56avEsSE1ctu5p0s50s0eQ+jL5zXS3AA94=";
+ sha256 = "sha256-ym2pcGUWM5zCUx/lYs+WECj+wbyBtWnx04W/NRXNKlw=";
};
postPatch = ''
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
substituteInPlace scripts/build-styles.sh \
--replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \
--replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass'
- substituteInPlace pylib/common.py \
+ substituteInPlace polychromatic/paths.py \
--replace "/usr/share/polychromatic" "$out/share/polychromatic"
'';
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index 0fc2697848d0..dcf941cf03aa 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -18,14 +18,14 @@
mkDerivation rec {
pname = "qcad";
- version = "3.27.6.11";
+ version = "3.27.8.7";
src = fetchFromGitHub {
name = "qcad-${version}-src";
owner = "qcad";
repo = "qcad";
rev = "v${version}";
- sha256 = "sha256-FfbHedJgzZdUpamLL2Wz2P8glaC/IVYCGZQk9EEc83k=";
+ sha256 = "sha256-GWDDZzFDOR96ZpmNDUuE+S9zTMVSYFNJKp8z/Cx3hec=";
};
patches = [
diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix
index 678b8968aae1..0b1aa7eb9157 100644
--- a/pkgs/applications/misc/xplr/default.nix
+++ b/pkgs/applications/misc/xplr/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
- version = "0.20.1";
+ version = "0.20.2";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-b3TdhziXPytHitilMBkr6OGaI+CBI3w4qcTIkQtOAjs=";
+ sha256 = "sha256-iPcxDNtwWnvFljZw052aw/ekCahyFBNt/zbUAdaWJA8=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
- cargoSha256 = "sha256-pdXLuogkz5q4+B/y/alA900OHVGBT8W6BR7I2aH8IaA=";
+ cargoSha256 = "sha256-Sn7ZcNdmMDQJHn99iTJX9c3uVhaGpRvEgdoJFmIUgeU=";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";
diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix
index 6b58dd1caf5d..bac11b6899b3 100644
--- a/pkgs/applications/misc/yubioath-flutter/default.nix
+++ b/pkgs/applications/misc/yubioath-flutter/default.nix
@@ -6,6 +6,7 @@
, pcre2
, gnome
, makeWrapper
+, removeReferencesTo
}:
let
vendorHashes = {
@@ -64,16 +65,25 @@ flutter.mkFlutterApp rec {
substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \
--replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \
--replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png"
+
+ # Remove unnecessary references to Flutter.
+ remove-references-to -t ${flutter.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag
'';
nativeBuildInputs = [
makeWrapper
+ removeReferencesTo
];
buildInputs = [
pcre2
];
+ disallowedReferences = [
+ flutter
+ flutter.unwrapped
+ ];
+
meta = with lib; {
description = "Yubico Authenticator for Desktop";
homepage = "https://github.com/Yubico/yubioath-flutter";
diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix
new file mode 100644
index 000000000000..b1b3a5781972
--- /dev/null
+++ b/pkgs/applications/networking/avalanchego/default.nix
@@ -0,0 +1,45 @@
+{ IOKit
+, buildGoModule
+, fetchFromGitHub
+, fetchpatch
+, lib
+, stdenv
+}:
+
+buildGoModule rec {
+ pname = "avalanchego";
+ version = "1.9.7";
+
+ src = fetchFromGitHub {
+ owner = "ava-labs";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-7WiIw2k0ZNm6jFHIiJlKuWFdEhb11qGVot1B50Za/GY=";
+ };
+
+ vendorHash = "sha256-2ezrasgGkMqr+dUF+TfsM5cevLGAFMyq9FlMxzKola8=";
+ # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
+ proxyVendor = true;
+
+ buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
+
+ subPackages = [ "main" ];
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/ava-labs/avalanchego/version.GitCommit=${version}"
+ ];
+
+ postInstall = ''
+ mv $out/bin/{main,${pname}}
+ '';
+
+ meta = with lib; {
+ description = "Go implementation of an Avalanche node";
+ homepage = "https://github.com/ava-labs/avalanchego";
+ changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ urandom ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix
index 0c9d90cd8aac..c90c93f20624 100644
--- a/pkgs/applications/networking/cluster/driftctl/default.nix
+++ b/pkgs/applications/networking/cluster/driftctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "driftctl";
- version = "0.38.1";
+ version = "0.38.2";
src = fetchFromGitHub {
owner = "snyk";
repo = "driftctl";
rev = "v${version}";
- sha256 = "sha256-etH/92Nhl5ZkmBeDtgFN0pLUOzgWhd3lClW4+zXYPr4=";
+ sha256 = "sha256-PPzoZypTP3yrgU50Uv7yBNCc2nAa84quCTWjxyq9h/c=";
};
- vendorSha256 = "sha256-tvl0VlMUD7rVlB/OjyptYyllx6brX+ycGTp4In9yEvE=";
+ vendorHash = "sha256-XVEXWBVqYoAlK4DP0GdWqJDcLy9WxCaUdNbVESJ9zoM=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix
index 65db0b689aab..96e0e4894ec6 100644
--- a/pkgs/applications/networking/cluster/kubeone/default.nix
+++ b/pkgs/applications/networking/cluster/kubeone/default.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "kubeone";
- version = "1.5.4";
+ version = "1.5.5";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
- hash = "sha256-s94o2/wInWMWbJcq8cpEbJYHL6vpD3Vurl/rOigzQRk=";
+ hash = "sha256-PdrU3kKuoT4MP5N2t4E1PIKZOMu8D0ZbUyMTIi/KZ7g=";
};
vendorHash = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA=";
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index a7544e50b380..ce363080f459 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pachyderm";
- version = "2.4.2";
+ version = "2.4.4";
src = fetchFromGitHub {
owner = "pachyderm";
repo = "pachyderm";
rev = "v${version}";
- hash = "sha256-IzZBs6g6MQKofhMIdLr7ty7HzwF+SoyzCJ6RDMHt0mo=";
+ hash = "sha256-53VUZHA+yURikVtcXXa/fZqwAqwjukBKS4NQEBBoHew=";
};
- vendorHash = "sha256-j7zg0vIhdYbzyi4owdVEF4XyUNwGds6J01+3k5K90Yg=";
+ vendorHash = "sha256-k6ODl+whgeeyd8XaOjTDjxfShpOztirjq/Tg98YP8Hs=";
subPackages = [ "src/server/cmd/pachctl" ];
diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix
index 271d82f4d86c..cad2c936a331 100644
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "werf";
- version = "1.2.195";
+ version = "1.2.197";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
- hash = "sha256-rNhCZO4Axeuc5jEAndjma7/jnst1kDNdtb/h/jD2rtE=";
+ hash = "sha256-cRpXdV/aHxVxMd54nmf9bMogiC9V8ryvCtSe+6Vx/Hk=";
};
vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk=";
diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index e637881d968c..f1fc99177084 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, stdenv, lib, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }:
+{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook }:
-mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "chatterino2";
- version = "2.3.5";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "Chatterino";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ozfLLoNUN+1SPXbMNbF1V5sdZgPZEA/J3xXzJP9D3uI=";
+ sha256 = "sha256-6t7Or2heyV0B5zdWZpN80iADe52faNVlIEZYtcixpZo=";
fetchSubmodules = true;
};
- nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
- buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
+ nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+ buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl ];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p "$out/Applications"
mv bin/chatterino.app "$out/Applications/"
diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix
index 1653e9ec8223..43b511c74a6b 100644
--- a/pkgs/applications/office/p3x-onenote/default.nix
+++ b/pkgs/applications/office/p3x-onenote/default.nix
@@ -1,23 +1,19 @@
{ lib, stdenv, appimageTools, desktop-file-utils, fetchurl }:
let
- version = "2020.10.111";
+ version = "2022.10.117";
name = "p3x-onenote-${version}";
plat = {
aarch64-linux = "-arm64";
armv7l-linux = "-armv7l";
- i386-linux = "-i386";
- i686-linux = "-i386";
x86_64-linux = "";
}.${stdenv.hostPlatform.system};
sha256 = {
- aarch64-linux = "0a3c0w1312l6k2jvn7cn8priibnh8wg0184zjcli29f9ds1afl5s";
- armv7l-linux = "172m2d94zzm8q61pvnjy01cl5fg11ad9hfh1han0gycnv3difniy";
- i386-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp";
- i686-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp";
- x86_64-linux = "0bn48r55l5dh8zcf8ijh3z6hlyp3s6fvfyqc1csvnslm63dfkzcq";
+ aarch64-linux = "0plpwymm1bgzbzwk2689lw1fadxdwxzzn5dmayk1ayxz1k3pj9wi";
+ armv7l-linux = "1pvr8f1ccl4nyfmshn3v3jfaa5x519rsy57g4pdapffj10vpbkb8";
+ x86_64-linux = "12j2py8yb81ngahbkbi7269izpc5aydd432cbv0sw45ighhyqhmr";
}.${stdenv.hostPlatform.system};
src = fetchurl {
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index 158c2389a313..99f5e0e249f6 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -17,14 +17,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
- version = "23.1.0";
+ version = "23.1.1";
in
stdenv.mkDerivation {
inherit pname appname version;
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
- sha256 = "sha256-HMs8DTL2BDSDmchadpVvbShjJMPP6W587F38uiixCuQ=";
+ sha256 = "sha256-BMisfFMy3kNoZHCYbGqzT9hxzVpKBUN6fSOilPw9O1w=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix
index 18091b82afaf..fc1087ab2d93 100644
--- a/pkgs/applications/office/super-productivity/default.nix
+++ b/pkgs/applications/office/super-productivity/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "super-productivity";
- version = "7.12.0";
+ version = "7.12.1";
src = fetchurl {
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
- sha256 = "sha256-Ms7wt79iZz0xnrp+yrFs/FzVqINe6BSOEmYG9Oiz5JU=";
+ sha256 = "sha256-zMw6C7kyO8yDLF2vrRlBqcgzcfM4TR7/fJPHPaixw6Y=";
name = "${pname}-${version}.AppImage";
};
diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix
index 0b5b8bb5059d..fe2b773fb0e3 100644
--- a/pkgs/applications/science/biology/last/default.nix
+++ b/pkgs/applications/science/biology/last/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "last";
- version = "1411";
+ version = "1422";
src = fetchFromGitLab {
owner = "mcfrith";
repo = "last";
rev = version;
- sha256 = "sha256-CO3tlFx9NxGplErENG6iFikgE246swPITsVR+nHzsYw=";
+ sha256 = "sha256-3OhttOd6qgO6d+sbVkZj8i/K6bJTvlMyfa3E4mIpt24=";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/applications/science/biology/sambamba/default.nix
index c6e78a134e60..38333cbc9988 100644
--- a/pkgs/applications/science/biology/sambamba/default.nix
+++ b/pkgs/applications/science/biology/sambamba/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "sambamba";
- version = "0.8.2";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "biod";
repo = "sambamba";
rev = "v${version}";
- sha256 = "sha256-FEa9QjQoGNUOAtMNMZcqpTKMKVtXoBuOomTy0mpos/0=";
+ sha256 = "sha256-HwAzsbT71Q35Io6H7Hzs4RTatpRpdHqV0cwPYAlsf6c=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix
new file mode 100644
index 000000000000..f74ba9d2e443
--- /dev/null
+++ b/pkgs/applications/science/biology/tandem-aligner/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, zlib
+}:
+
+stdenv.mkDerivation {
+ pname = "TandemAligner";
+ version = "unstable-2022-09-17";
+
+ src = fetchFromGitHub {
+ owner = "seryrzu";
+ repo = "tandem_aligner";
+ rev = "ac6004f108ad20477045f4d0b037d96051a9df70";
+ hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8=";
+ };
+
+ sourceRoot = "source/tandem_aligner";
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ zlib ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp src/projects/tandem_aligner/tandem_aligner $out/bin
+ runHook postInstall
+ '';
+
+ doCheck = true;
+
+ # adapted from target test_launch in Makefile
+ checkPhase = ''
+ runHook preCheck
+ mkdir -p $TMPDIR/test_launch
+ src/projects/tandem_aligner/tandem_aligner \
+ --first $src/tandem_aligner/test_dataset/first.fasta \
+ --second $src/tandem_aligner/test_dataset/second.fasta \
+ -o $TMPDIR/test_launch \
+ --debug
+ grep -q "Thank you for using TandemAligner!" $TMPDIR/test_launch/tandem_aligner.log
+ diff $TMPDIR/test_launch/cigar.txt $src/tandem_aligner/test_dataset/true_cigar.txt
+ runHook postCheck
+ '';
+
+ meta = {
+ description = "A parameter-free algorithm for sequence alignment";
+ homepage = "https://github.com/seryrzu/tandem_aligner";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ amesgen ];
+ platforms = lib.platforms.linux;
+ mainProgram = "tandem_aligner";
+ };
+}
diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix
index da75983e40f6..d64f5547e71b 100644
--- a/pkgs/applications/science/electronics/openhantek6022/default.nix
+++ b/pkgs/applications/science/electronics/openhantek6022/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "openhantek6022";
- version = "3.3.1";
+ version = "3.3.2.1";
src = fetchFromGitHub {
owner = "OpenHantek";
repo = "OpenHantek6022";
rev = version;
- sha256 = "sha256-8QXFTQQZ5Q1SRQI4jWzRek+3BTuWfGHJIbgvwbZulg8=";
+ sha256 = "sha256-ysluU3UmWtrTAstnCbSy4TdzbjcnSUeE+d8mpC7Ocvk=";
};
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index b1373a7098b1..3126dde50549 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -15,12 +15,12 @@
buildGoPackage rec {
pname = "gitea";
- version = "1.18.2";
+ version = "1.18.3";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
- hash = "sha256-NqlY5s3tZT9HO6X0knlTPwoY6tMsYm9SyH3CEZpIcy0=";
+ hash = "sha256-jqjpbDgcmwZoc/ovgburFeeta9mAJOmz7yrvmUKAwRU=";
};
patches = [
diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix
index 82f422146ac7..fdd85f66e408 100644
--- a/pkgs/data/fonts/material-design-icons/default.nix
+++ b/pkgs/data/fonts/material-design-icons/default.nix
@@ -1,24 +1,30 @@
-{ lib, fetchFromGitHub }:
+{ lib, fetchFromGitHub, stdenvNoCC }:
-let
- version = "7.0.96";
-in fetchFromGitHub {
- name = "material-design-icons-${version}";
- owner = "Templarian";
- repo = "MaterialDesign-Webfont";
- rev = "v${version}";
+stdenvNoCC.mkDerivation rec {
+ pname = "material-design-icons";
+ version = "7.1.96";
- postFetch = ''
- mkdir -p $out/share/fonts/{eot,truetype,woff,woff2}
- mv $out/fonts/*.eot $out/share/fonts/eot/
- mv $out/fonts/*.ttf $out/share/fonts/truetype/
- mv $out/fonts/*.woff $out/share/fonts/woff/
- mv $out/fonts/*.woff2 $out/share/fonts/woff2/
- shopt -s extglob dotglob
- rm -rf $out/!(share)
- shopt -u extglob dotglob
+ dontBuild = true;
+
+ src = fetchFromGitHub {
+ owner = "Templarian";
+ repo = "MaterialDesign-Webfont";
+ rev = "v${version}";
+ sha256 = "sha256-qS7zJQkd0Q5wYLgYXa63fD3Qi2T5JWD6vXW2FoFzZxo=";
+ sparseCheckout = [ "fonts" ];
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p "$out/share/fonts/"{eot,truetype,woff,woff2}
+ cp fonts/*.eot "$out/share/fonts/eot/"
+ cp fonts/*.ttf "$out/share/fonts/truetype/"
+ cp fonts/*.woff "$out/share/fonts/woff/"
+ cp fonts/*.woff2 "$out/share/fonts/woff2/"
+
+ runHook postInstall
'';
- sha256 = "sha256-l60LRXLwLh+7Ls3kMTJ5eDTVpVMcqtshMv/ehIk8fCk=";
meta = with lib; {
description = "7000+ Material Design Icons from the Community";
@@ -30,6 +36,6 @@ in fetchFromGitHub {
homepage = "https://materialdesignicons.com";
license = licenses.asl20;
platforms = platforms.all;
- maintainers = with maintainers; [ vlaci ];
+ maintainers = with maintainers; [ vlaci PlayerNameHere ];
};
}
diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix
index 74e3ac872583..bc9d20342ef0 100644
--- a/pkgs/data/icons/nordzy-icon-theme/default.nix
+++ b/pkgs/data/icons/nordzy-icon-theme/default.nix
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "nordzy-icon-theme";
- version = "1.7.6";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "alvatip";
repo = "Nordzy-icon";
rev = version;
- sha256 = "sha256-VKcbQ6DeQ0zGOPJgfmZMNsHjsMwoCk7jUT2Oc8xuwGc=";
+ sha256 = "sha256-JfVcznGoL/HmNbjZk6RUUp/RZIXYIAoOMA3HBpqlUcE=";
};
# In the post patch phase we should first make sure to patch shebangs.
diff --git a/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch b/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch
new file mode 100644
index 000000000000..787862fbcffa
--- /dev/null
+++ b/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch
@@ -0,0 +1,20 @@
+--- a/gcc/config/avr/avr.c 2022-10-08 19:18:33.000000000 +0200
++++ b/gcc/config/avr/avr.patched.c 2022-10-08 19:19:34.000000000 +0200
+@@ -10196,7 +10196,7 @@
+ to track need of __do_copy_data. */
+
+ static void
+-avr_output_data_section_asm_op (const void *data)
++avr_output_data_section_asm_op (const char *data)
+ {
+ avr_need_copy_data_p = true;
+
+@@ -10209,7 +10209,7 @@
+ to track need of __do_clear_bss. */
+
+ static void
+-avr_output_bss_section_asm_op (const void *data)
++avr_output_bss_section_asm_op (const char *data)
+ {
+ avr_need_clear_bss_p = true;
+
diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix
index 81c1b94b90b8..20da9a97aa5c 100644
--- a/pkgs/development/compilers/gcc/11/default.nix
+++ b/pkgs/development/compilers/gcc/11/default.nix
@@ -78,6 +78,8 @@ let majorVersion = "11";
sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg=";
})
]
+ # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808
+ ++ 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;
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 9c88e2182ff9..c9e9b00f60ed 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -94,10 +94,6 @@ let
# libsanitizer requires netrom/netrom.h which is not
# available in uclibc.
"--disable-libsanitizer"
- ] ++ lib.optionals (targetPlatform.libc == "uclibc") [
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib"
++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
);
diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix
index 58ec15b68253..ac32e2954937 100644
--- a/pkgs/development/compilers/inklecate/default.nix
+++ b/pkgs/development/compilers/inklecate/default.nix
@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "inklecate";
- version = "1.0.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "inkle";
repo = "ink";
rev = "v${version}";
- sha256 = "00lagmwsbxap5mgnw4gndpavmv3xsgincdaq1zvw7fkc3vn3pxqc";
+ hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
};
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
@@ -24,8 +24,8 @@ buildDotnetModule rec {
nugetDeps = ./deps.nix;
executables = [ "inklecate" ];
- dotnet-runtime = dotnetCorePackages.runtime_3_1;
- dotnet-sdk = dotnetCorePackages.sdk_3_1;
+ dotnet-sdk = dotnetCorePackages.sdk_6_0;
+ dotnet-runtime = dotnetCorePackages.runtime_6_0;
meta = with lib; {
description = "Compiler for ink, inkle's scripting language";
diff --git a/pkgs/development/compilers/inklecate/deps.nix b/pkgs/development/compilers/inklecate/deps.nix
index e873809a45ea..f3a17967e25c 100644
--- a/pkgs/development/compilers/inklecate/deps.nix
+++ b/pkgs/development/compilers/inklecate/deps.nix
@@ -2,45 +2,4 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
- (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
- (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
- (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
- (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
- (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
- (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })
- (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
- (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
- (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; })
- (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; })
- (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; })
- (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; })
- (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
- (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
- (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; })
- (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
- (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
- (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; })
- (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
- (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
- (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
- (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
- (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
- (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
- (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
- (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
- (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
- (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
- (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
- (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
- (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
- (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
- (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
- (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
- (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
- (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
- (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
- (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
- (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
- (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
- (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
]
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index c055a6bce193..c9d396bf2e37 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libamqpcpp";
- version = "4.3.18";
+ version = "4.3.19";
src = fetchFromGitHub {
owner = "CopernicaMarketingSoftware";
repo = "AMQP-CPP";
rev = "v${version}";
- sha256 = "sha256-cjxzBw2tjZROx5xzdhzZjGNJQe3tC9fHOhF/+uSM+CY=";
+ sha256 = "sha256-YyWpXh/8gNYTiGAJWr8lRPhstBD0eEVRBg8IlYk8o3w=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix
index 419cbfdb9f5e..79572e430013 100644
--- a/pkgs/development/libraries/libargs/default.nix
+++ b/pkgs/development/libraries/libargs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "args";
- version = "6.4.4";
+ version = "6.4.6";
src = fetchFromGitHub {
owner = "Taywee";
repo = pname;
rev = version;
- sha256 = "sha256-niuBM8tPCedFNCrkgvLE7PZu411sKgcvovr++6dIaus=";
+ sha256 = "sha256-2gH3h3QAl0+XVULt/fR2UUGKNIxTUmnRRdxPOFdpVy4=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index 101c6182f470..c160e7602ce5 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -2,12 +2,12 @@
, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:
stdenv.mkDerivation rec {
- version = "3.14.11";
+ version = "3.14.12";
pname = "libdigidocpp";
src = fetchurl {
url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
- hash = "sha256-5QYKHwRB5nck5yqukX/UA+M3jFlBvkQ/ekB7JFIY5tI=";
+ hash = "sha256-82AH18KcrkD7mHDy+2c9v7E3Kj7Cb7jCoLfmo09D8PU=";
};
nativeBuildInputs = [ cmake pkg-config xxd ];
diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix
index 164c9f9e27dd..fef8ad6da4ef 100644
--- a/pkgs/development/libraries/libgbinder/default.nix
+++ b/pkgs/development/libraries/libgbinder/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libgbinder";
- version = "1.1.26";
+ version = "1.1.31";
src = fetchFromGitHub {
owner = "mer-hybris";
repo = pname;
rev = version;
- sha256 = "sha256-bXptf1ALanzDyhajQtKMs/0M9TWlrjhWQdC1NZiUgd8=";
+ sha256 = "sha256-TrIBI72ammruYbDb46ZfjJ9p8hoqqlApC7ZvnUHK3S8=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix
index e65d0d475ff9..9ba96644102e 100644
--- a/pkgs/development/libraries/libucl/default.nix
+++ b/pkgs/development/libraries/libucl/default.nix
@@ -25,13 +25,13 @@ let
in
stdenv.mkDerivation rec {
pname = "libucl";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "vstakhov";
repo = pname;
rev = version;
- sha256 = "1h52ldxankyhbbm1qbqz1f2q0j03c1b4mig7343bs3mc6fpm18gf";
+ sha256 = "sha256-rpTc0gq8HquDow4NEkRSjyESEMrv8dAhX98yKKu/Fsk=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index 211821e084cc..f82a67b76e1c 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ode";
- version = "0.16.2";
+ version = "0.16.3";
src = fetchurl {
url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz";
- sha256 = "08hgh4gqdk77jcw8b7gq2mwsfg4a5v5y0j7g42bxiqhmn3ffnsmj";
+ sha256 = "sha256-x0Hb9Jv8Rozilkgk5bw/kG6pVrGuNZTFDTUcOD8DxBM=";
};
meta = with lib; {
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 559d8094b287..9becf229c9ef 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -21,46 +21,47 @@ let
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
# https://github.com/matthewbauer/undmg/issues/4
- mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.1.1";
- rel = if stdenvNoCC.isDarwin then "199" else "52";
+ mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2023.0.0";
+ rel = if stdenvNoCC.isDarwin then "199" else "25398";
# Intel openmp uses its own versioning.
- openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "19.1.3";
- openmpRel = "189";
+ openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "2023.0.0";
+ openmpRel = "25370";
# Thread Building Blocks release.
- tbbRel = "119";
+ tbbVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.8.0";
+ tbbRel = "25334";
shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
oneapi-mkl = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
- hash = "sha256-G2Y7iX3UN2YUJhxcMM2KmhONf0ls9owpGlOo8hHOfqA=";
+ hash = "sha256-fiL5TDmQHB+OQb1ERcoDQFpUutpsPe+AqIbMoa85nEk=";
};
oneapi-mkl-common = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
- hash = "sha256-HrMt2OcPIRxM8EL8SPjYTyuHJnC7RhPFUrvLhRH+7vc=";
+ hash = "sha256-AFayUxybi48SgR2mX6mxkNECconIXm1/TWelvE4aqX0=";
};
oneapi-mkl-common-devel = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
- hash = "sha256-XDE2WFJzEcpujFmO2AvqQdipZMvKB6/G+ksBe2sE438=";
+ hash = "sha256-riyIO2xWuvTSzfXgB+K6NSKqWLRmxKSnGZaH5nYTYPk=";
};
oneapi-mkl-devel = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
- hash = "sha256-GhUJZ0Vr/ZXp10maie29/5ryU7zzX3F++wRCuuFcE0s=";
+ hash = "sha256-2IK0t47FaPNp7Oq9LJ5ZdLmlFFjQluWrh+nhvi8MCd8=";
};
oneapi-openmp = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm";
- hash = "sha256-yP2c4aQAFNRffjLoIZgWXLcNXbiez8smsgu2wXitefU=";
+ hash = "sha256-grzVFWqt3Vpwb5K3Bur+sJz8pdKxZ4ISJXF5YAPrwmk=";
};
oneapi-tbb = fetchurl {
- url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${mklVersion}-${mklVersion}-${tbbRel}.x86_64.rpm";
- hash = "sha256-K1BvhGoGVU2Zwy5vg2ZvJWBrSdh5uQwo0znt5039X0A=";
+ url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm";
+ hash = "sha256-8hIoRfV36XVElKCqP9UmCkjLCs3l0ZKCHxg+yxNIHc0=";
};
in stdenvNoCC.mkDerivation ({
@@ -128,23 +129,23 @@ in stdenvNoCC.mkDerivation ({
done
# License
- install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt
+ install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/${mklVersion}/licensing/license.txt
# Dynamic libraries
mkdir -p $out/lib
cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
- cp -a opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* $out/lib
- cp -a opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* $out/lib
+ cp -a opt/intel/oneapi/compiler/${mklVersion}/linux/compiler/lib/intel64_lin/*.so* $out/lib
+ cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/intel64/gcc4.8/*.so* $out/lib
# Headers
cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/
'' +
(if enableStatic then ''
install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a
- install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*.pc
+ install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/tools/pkgconfig/*.pc
'' else ''
cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
- install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*dynamic*.pc
+ install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc
'') + ''
# Setup symlinks for blas / lapack
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}
diff --git a/pkgs/development/python-modules/bencoder/default.nix b/pkgs/development/python-modules/bencoder/default.nix
new file mode 100644
index 000000000000..2fa730630c0b
--- /dev/null
+++ b/pkgs/development/python-modules/bencoder/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, setuptools
+}:
+buildPythonPackage rec {
+ pname = "bencoder";
+ version = "0.2.0";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-rENvM/3X51stkFdJHSq+77VjHvsTyBNAPbCtsRq1L8I=";
+ };
+
+ pythonImportsCheck = [ "bencoder" ];
+
+ # There are no tests.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A simple bencode decoder/encoder library in pure Python";
+ homepage = "https://github.com/utdemir/bencoder";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ somasis ];
+ };
+}
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 7620da37b07f..c1a0de718200 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -118,6 +118,9 @@ let
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
'';
+ # Silence the depreciation warning from SqlAlchemy
+ SQLALCHEMY_SILENCE_UBER_WARNING = 1;
+
# TimeoutErrors on slow machines -> aarch64
doCheck = !stdenv.isAarch64;
@@ -127,6 +130,8 @@ let
# remove testfile which is missing configuration file from sdist
rm buildbot/test/integration/test_graphql.py
+ # tests in this file are flaky, see https://github.com/buildbot/buildbot/issues/6776
+ rm buildbot/test/integration/test_try_client.py
'';
passthru = {
diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix
index bacd4f62ed38..9e31735242cc 100644
--- a/pkgs/development/python-modules/jpylyzer/default.nix
+++ b/pkgs/development/python-modules/jpylyzer/default.nix
@@ -5,6 +5,10 @@
, six
, lxml
, pytestCheckHook
+, doFullCheck ? false # weird filenames cause issues on some filesystems
+
+# for passthru.tests
+, jpylyzer
}:
let
@@ -33,12 +37,12 @@ in buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook lxml ];
- # don't depend on testFiles on darwin as it may not be extractable due to
- # weird filenames
- preCheck = lib.optionalString (!stdenv.isDarwin) ''
+ # don't depend on testFiles unless doFullCheck as it may not be extractable
+ # on some filesystems due to weird filenames
+ preCheck = lib.optionalString doFullCheck ''
sed -i '/^testFilesDir = /ctestFilesDir = "${testFiles}"' tests/unit/test_testfiles.py
'';
- disabledTestPaths = lib.optionals stdenv.isDarwin [
+ disabledTestPaths = lib.optionals (!doFullCheck) [
"tests/unit/test_testfiles.py"
];
@@ -46,6 +50,10 @@ in buildPythonPackage rec {
disallowedReferences = [ testFiles ];
+ passthru.tests = {
+ withFullCheck = jpylyzer.override { doFullCheck = true; };
+ };
+
meta = with lib; {
description = "JP2 (JPEG 2000 Part 1) image validator and properties extractor";
homepage = "https://jpylyzer.openpreservation.org/";
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix
index 4061090b1828..d340cb7562bf 100644
--- a/pkgs/development/tools/analysis/evmdis/default.nix
+++ b/pkgs/development/tools/analysis/evmdis/default.nix
@@ -1,17 +1,25 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage {
- pname = "evmdis-unstable";
- version = "2018-03-23";
- goPackagePath = "github.com/Arachnid/evmdis";
+buildGoModule {
+ pname = "evmdis";
+ version = "unstable-2022-05-09";
src = fetchFromGitHub {
owner = "Arachnid";
repo = "evmdis";
- rev = "0d1406905c5fda6224651fa53260a21c907eb986";
- sha256 = "09y4j7ipgv8yd99g3xk3f079w8fqfj7kl1y7ry81ainysn0qlqrg";
+ rev = "7fad4fbee443262839ce9f88111b417801163086";
+ hash = "sha256-jfbjXoGT8RtwLlqX13kcKdiFlhrVwA7Ems6abGJVRbA=";
};
+ vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+
+ preBuild = ''
+ # Add go modules support
+ cp ${./go.mod} go.mod
+ '';
+
+ ldflags = [ "-s" "-w" ];
+
meta = with lib; {
homepage = "https://github.com/Arachnid/evmdis";
description = "Ethereum EVM disassembler";
diff --git a/pkgs/development/tools/analysis/evmdis/go.mod b/pkgs/development/tools/analysis/evmdis/go.mod
new file mode 100644
index 000000000000..d71cfe70845d
--- /dev/null
+++ b/pkgs/development/tools/analysis/evmdis/go.mod
@@ -0,0 +1,3 @@
+module github.com/Arachnid/evmdis
+
+go 1.18
diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index e7255d6e756b..b371a1f11159 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "bear";
- version = "3.0.20";
+ version = "3.0.21";
src = fetchFromGitHub {
owner = "rizsotto";
repo = pname;
rev = version;
- sha256 = "sha256-8hA0Y/AGczFwggxkTG7PQKOVnr2Oizx4OH38nS5jCU0=";
+ sha256 = "sha256-wT3s8CjgFPKrJiMWHWsvmUQwpuuS4figJZUXJn3RclU=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 7e34249f2075..d8a797dc9189 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -139,20 +139,4 @@ rec {
sha256 = "0p83zgszmrwa26a4q8nvzva2af5lfzy6xvcs57y9588smsw51wyw";
defaultJava = jdk11;
};
-
- # NOTE: No GitHub Release for the following versions. `update.sh` will not work.
-
- gradle_5 = gen {
- version = "5.6.4";
- nativeVersion = "0.18";
- sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z";
- defaultJava = jdk11;
- };
-
- gradle_4 = gen {
- version = "4.10.3";
- nativeVersion = "0.14";
- sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
- defaultJava = jdk8;
- };
}
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index dd503834dd95..1a931b2b10c3 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
pname = "squirrel-sql";
- version = "4.4.0";
+ version = "4.5.1";
src = fetchurl {
url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
- sha256 = "sha256-uMOVhLqjZB21SAvNXT6VhdmFyCFhBYHID9lXeDABvnk=";
+ sha256 = "sha256-LKX8yNSLs60546ZcvLlQF3e++VxHmPsczui4cfrpia0=";
};
nativeBuildInputs = [ makeWrapper unzip ];
diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix
new file mode 100644
index 000000000000..170b9c41dc9f
--- /dev/null
+++ b/pkgs/development/tools/gci/default.nix
@@ -0,0 +1,25 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+buildGoModule rec {
+ pname = "gci";
+ version = "0.9.0";
+
+ src = fetchFromGitHub {
+ owner = "daixiang0";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-qWEEcIbTgYmGVnnTW+hM8e8nw5VLWN1TwzdUIZrxF3s=";
+ };
+
+ vendorSha256 = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60=";
+
+ meta = with lib; {
+ description = "Controls golang package import order and makes it always deterministic";
+ homepage = "https://github.com/daixiang0/gci";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [krostar];
+ };
+}
diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix
index 23fc5cc25e37..19f8929ff58d 100644
--- a/pkgs/development/tools/misc/slint-lsp/default.nix
+++ b/pkgs/development/tools/misc/slint-lsp/default.nix
@@ -25,14 +25,14 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "slint-lsp";
- version = "0.3.0";
+ version = "0.3.3";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-dZYkiYrotW8td5dxnPSvDzkWf+xV4ceISVLRZx2goXo=";
+ sha256 = "sha256-0JOA+T6GJnMUSK+oldZ+8XtgrDDLkccUKYYzjMExM7M=";
};
- cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4=";
+ cargoSha256 = "sha256-282IAKbou3+0CYMcAhPNr35N3ugrN/fY82KTzyoTy2o=";
nativeBuildInputs = [ cmake pkg-config fontconfig ];
buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index 0fc9952b592c..046956057017 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -13,13 +13,13 @@ let
in
let finalPackage = buildDotnetModule rec {
pname = "omnisharp-roslyn";
- version = "1.39.2";
+ version = "1.39.4";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = pname;
rev = "v${version}";
- sha256 = "/MxBdMjPpq3Gwhi/93+JCAI+BuiiWu0n9QThQi+s/kE=";
+ sha256 = "rX0FeURw6WMbcJOomqHFcZ9tpKO1td60/HbbVClV324=";
};
projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix
index ca9228eddb5d..e19073c93356 100644
--- a/pkgs/development/tools/omnisharp-roslyn/deps.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix
@@ -4,13 +4,13 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.9.0"; sha256 = "15nqr100crclha0lzgil25j1wn45517gb34059qypj05j8psfmjx"; })
(fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.9.0"; sha256 = "1gpbvframx4dx4mzfh44cib6dfd26q7878vf073m9gv3y43sws7b"; })
- (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.3.1"; sha256 = "0bi9rg6c77qav8mb0rbvs5pczf9f0ii8i11c9vyib53bv6fiifxp"; })
- (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.3.1"; sha256 = "1v2xd0f2xrkgdznnjad5vhjan51k9qwi4piyg5vdz9mvywail51q"; })
+ (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.4.0"; sha256 = "08269f79r3a7iwf3i661k6vzi9xk21f0z21997dpyl2qhl5igndg"; })
+ (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.4.0"; sha256 = "0mhbxvcf9p48zzc3f2x25ihh1lxzzn63mwld5lkny5m1bx1fp198"; })
(fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
(fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; })
(fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "3.1.0"; sha256 = "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"; })
(fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; })
- (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; })
+ (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
(fetchNuGet { pname = "Microsoft.Build"; version = "17.3.1"; sha256 = "1hwjihnjcycnzqksa6pcljj515nprpqjqbqy3shykd86micyhhxr"; })
(fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.1"; sha256 = "0v27f8nv0q6q3n5h4sdf3hm2j9b1dmjx5hpxv9s16gb4ayiaq8y9"; })
@@ -20,61 +20,47 @@
(fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.1"; sha256 = "0yib6x7hankpr9knfxascybhydkq6zwc3ahg8f2hzph9pcf9krjz"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.4.0-3.22429.3"; sha256 = "1f8jjy4v0f5banvg3d0qwv43w86ja1hz3rq452kg44ikrsnhzvcw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.4.0-3.22429.3/microsoft.codeanalysis.common.4.4.0-3.22429.3.nupkg"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.4.0-3.22429.3"; sha256 = "1y5llwvgzzi294dh501h064l4c2niin4k0hkq1vr5hlyzcbzgdxg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.4.4.0-3.22429.3.nupkg"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.4.0-3.22429.3"; sha256 = "0swcsc4g6k1dfw8gmdk6dq35yrrw2idqzfxjqvx8hns453z33x73"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.features.4.4.0-3.22429.3.nupkg"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.4.0-3.22429.3"; sha256 = "0sbwidq35lakh0y58ci67kpqayiyc69ag850fmrnjg7zwgcjc8p8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.scripting.4.4.0-3.22429.3.nupkg"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.4.0-3.22429.3"; sha256 = "0k4kzg4b3wirp1n6ic995g35h70iwpcwr18c9z1246i0kc0nll2q"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.workspaces.4.4.0-3.22429.3.nupkg"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0-2.22527.10"; sha256 = "0xvlmg1n5aj7ifb1kd6jg1sk6251rz8xi877v8jz4qx178vqcx8s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.5.0-2.22527.10/microsoft.codeanalysis.common.4.5.0-2.22527.10.nupkg"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "15vsv35zzgjysyr5hsrykc9qx8l062i4fyqg6hay7acqfx5kp539"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.4.5.0-2.22527.10.nupkg"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.5.0-2.22527.10"; sha256 = "0bq3512kkhwq5p81svy7s850apdq0qmydjxqmms6f70sspyxh38b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.features.4.5.0-2.22527.10.nupkg"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.5.0-2.22527.10"; sha256 = "0lr2y28amwg5p0bb9gyh1yybci9swjwm0pp85nlr8zj8a8d1633w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.scripting.4.5.0-2.22527.10.nupkg"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0-2.22527.10"; sha256 = "0xwclnvvlq36955vlih56a28fp79c6927rmhlqkdhqs3lsdz9l23"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.workspaces.4.5.0-2.22527.10.nupkg"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.4.0-3.22429.3"; sha256 = "1vi1dfwm4qq5vv10iaza174ikj3jqywv68hbjlm5g92iyw5v2j19"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.4.0-3.22429.3/microsoft.codeanalysis.externalaccess.omnisharp.4.4.0-3.22429.3.nupkg"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.4.0-3.22429.3"; sha256 = "1p49rjcgwb3hsh78h3n5ifi4iaywbkx6jdi4n8xpm8nyicjy524c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.4.0-3.22429.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.4.0-3.22429.3.nupkg"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.4.0-3.22429.3"; sha256 = "19dfwpz35cvgvg9cgmfbf5c63msp1800kgk3v1ssphzfpmc35ws1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.4.0-3.22429.3/microsoft.codeanalysis.features.4.4.0-3.22429.3.nupkg"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.4.0-3.22429.3"; sha256 = "1g0ly8qfz3j26il3pz5xh7kg13a41kbw2rm81srlamgv9djgxa8l"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.4.0-3.22429.3/microsoft.codeanalysis.scripting.common.4.4.0-3.22429.3.nupkg"; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.4.0-3.22429.3"; sha256 = "080r4cwckhmvs9zjwi225q3gssi7f1h4ic93yakmk89mph0wjkaq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.4.0-3.22429.3/microsoft.codeanalysis.workspaces.common.4.4.0-3.22429.3.nupkg"; })
- (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.5.0-2.22527.10"; sha256 = "0lg4bgm4awidj41p8gdjy6j4a2dq5hwvq7rw37sv9af93ri16pfh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.4.5.0-2.22527.10.nupkg"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "1ffcwf7pwcx4s63k6dhbgyj2anrw3n49cyj1845983vm918p9ymw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.5.0-2.22527.10.nupkg"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.5.0-2.22527.10"; sha256 = "1n06zkwpyc6jxsy3mlr23ad42yga40fbsyfnxdi632p4iav294w0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.5.0-2.22527.10/microsoft.codeanalysis.features.4.5.0-2.22527.10.nupkg"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.5.0-2.22527.10"; sha256 = "1xlm9n7kgin9cfr2xybjxgiwwbnfifyx0r4mm1gfdhgfjbykbqhf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.5.0-2.22527.10/microsoft.codeanalysis.scripting.common.4.5.0-2.22527.10.nupkg"; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0-2.22527.10"; sha256 = "00swl909fqjp6vd41jc7f9kd7n5fzzqvpf1jicrbyr2nmh3mk0xk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.5.0-2.22527.10/microsoft.codeanalysis.workspaces.common.4.5.0-2.22527.10.nupkg"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
(fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "1.4.0"; sha256 = "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d"; })
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
(fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; })
(fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.0"; sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; })
- (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; })
- (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; })
- (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; })
- (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; })
- (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
(fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; })
(fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; })
(fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; })
- (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; })
- (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; })
- (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; })
- (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; })
- (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
(fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; })
(fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.1"; sha256 = "0c8yicvhmwgm3z076hy3zgkqznhmrm8qygiscawlc9k01l5ilkrs"; })
- (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
- (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
- (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; })
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; })
@@ -85,46 +71,44 @@
(fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.3.0"; sha256 = "0n0iahawk4cjc7pkddjyaqnb10fn5qcjy59645ni0wy8q3myiskh"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.12"; sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; })
(fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.14.114"; sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; })
- (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; })
- (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; })
- (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; })
+ (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.4.27"; sha256 = "17f9bj01qxdd7mjxslgxkhky6xmg7agpimkf071k451csj5k2vkd"; })
+ (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.4.27"; sha256 = "1js19g9i2vz012l1ma2wx23awyxh2jqng1qs652l9jwj6gmp71v8"; })
+ (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.64"; sha256 = "1qm2dc9v1glpgy2blbcmsljwrsx55k82rjw4hiqh031h8idwryrl"; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
- (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; })
- (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; })
- (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; })
+ (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.57"; sha256 = "05p1vqs09xj6pa3nv08xymzz8sg5sg59598bn1rmfmbpqp3glvax"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
- (fetchNuGet { pname = "NuGet.Common"; version = "5.2.0"; sha256 = "14y7axpmdl9fg8jfc42gxpcq9wj8k3vzc07npmgjnzqlp5xjyyac"; })
+ (fetchNuGet { pname = "NuGet.Common"; version = "6.2.0"; sha256 = "1xvjlly8x3gs26sbcil8vn3xf8wfb7lkmb36sics46b7a6fmkdhn"; })
(fetchNuGet { pname = "NuGet.Common"; version = "6.4.0-preview.1.53"; sha256 = "1p3f3p9md7d880hbp50msp54qkhwknxkz62sm79ndgldnclwrr3i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.4.0-preview.1.53/nuget.common.6.4.0-preview.1.53.nupkg"; })
- (fetchNuGet { pname = "NuGet.Configuration"; version = "5.2.0"; sha256 = "0b4dkym3vnj7qldnqqq6h6ry0gkql5c2ps5wy72b8s4fc3dmnvf1"; })
+ (fetchNuGet { pname = "NuGet.Configuration"; version = "6.2.0"; sha256 = "07hmnm1v5qbqpa2m77gikm0pds8c7blnc98il17alswc5hhmblm8"; })
(fetchNuGet { pname = "NuGet.Configuration"; version = "6.4.0-preview.1.53"; sha256 = "0zlkzgwqspja7j1j7jb5h3wdzvg42zp11ysgl93s96yxjr92ivx5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.4.0-preview.1.53/nuget.configuration.6.4.0-preview.1.53.nupkg"; })
- (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.2.0"; sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; })
+ (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.2.0"; sha256 = "0b00072yx20qnr9riq3b72ia1129llhw9a2fw6yv7ak77a70c3pq"; })
(fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.4.0-preview.1.53"; sha256 = "05gmy611x4vppw2xjkbnnvf97nj3lrjkg5q1ilp625hf5hrmmx68"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.4.0-preview.1.53/nuget.dependencyresolver.core.6.4.0-preview.1.53.nupkg"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
- (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.2.0"; sha256 = "1fh4rp26m77jq5dyln68wz9qm217la9vv21amis2qvcy6gknk2wp"; })
+ (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.2.0"; sha256 = "0swbxdzvrd6jnpnr5kss6v5f7grhgzl1z5nk6b00z2x8pbrjfr42"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "6.4.0-preview.1.53"; sha256 = "0sp7phay7764wfwz9p4yl17zcxi8h9xpzv5x5kpqq9dmv79mx7ld"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.4.0-preview.1.53/nuget.frameworks.6.4.0-preview.1.53.nupkg"; })
- (fetchNuGet { pname = "NuGet.LibraryModel"; version = "5.2.0"; sha256 = "0vxd0y7rzzxvmxji9bzp95p2rx48303r3nqrlhmhhfc4z5fxjlqk"; })
+ (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.2.0"; sha256 = "02l13hkpc6p86ibni8gzk65gdv85fmm1wqn39j86s68p5wf8l892"; })
(fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.4.0-preview.1.53"; sha256 = "1syji2ml2mpsalyd4b7i3vni2d65mjmdy5csky7226m8nwxsaf9m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.4.0-preview.1.53/nuget.librarymodel.6.4.0-preview.1.53.nupkg"; })
- (fetchNuGet { pname = "NuGet.Packaging"; version = "5.2.0"; sha256 = "14frrbdkka9jd6g52bv4lbqnpckw09yynr08f9kfgbc3j8pklqqb"; })
+ (fetchNuGet { pname = "NuGet.Packaging"; version = "6.2.0"; sha256 = "05xkba6bckq1vpni9j7ng20zy0l7srk8lyx4mxy9cf1z14ca30bl"; })
(fetchNuGet { pname = "NuGet.Packaging"; version = "6.4.0-preview.1.53"; sha256 = "1rxbjc2430ry7aqyb9k9bk8qg6l3max84rg81445y0s3f23cbmpp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.4.0-preview.1.53/nuget.packaging.6.4.0-preview.1.53.nupkg"; })
(fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.4.0-preview.1.53"; sha256 = "08fkl1kp4sizncd0mgsgyas0qzq2wdxby7m3r9q3c8isk7m44lw7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.4.0-preview.1.53/nuget.packaging.core.6.4.0-preview.1.53.nupkg"; })
- (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.2.0"; sha256 = "1j23jk2zql52v2nqgi0k6d7z63pjjzrvw8y1s38zpf0sn7lzdr0h"; })
+ (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.2.0"; sha256 = "1fsr9dzxibllhzd80dap593snms7jp7mzsihq7mh55vbj3n6qss8"; })
(fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.4.0-preview.1.53"; sha256 = "08y3gwlw26jbx5chmmgrbvpad42zf5f668cd2vh1xj9i0li9df9g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.4.0-preview.1.53/nuget.projectmodel.6.4.0-preview.1.53.nupkg"; })
- (fetchNuGet { pname = "NuGet.Protocol"; version = "5.2.0"; sha256 = "1vlrrlcy7p2sf23wqax8mfhplnzppd73xqlr2g83ya056w0yf2rd"; })
+ (fetchNuGet { pname = "NuGet.Protocol"; version = "6.2.0"; sha256 = "1fai84b45sv2h4wm6jqghf16x8hc6ksdsq4llay9qh1mak0zfg33"; })
(fetchNuGet { pname = "NuGet.Protocol"; version = "6.4.0-preview.1.53"; sha256 = "064l1cfx2483lvy9w5khigp07bp7y42rnrz8i85jalkrc4p3jvmr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.4.0-preview.1.53/nuget.protocol.6.4.0-preview.1.53.nupkg"; })
- (fetchNuGet { pname = "NuGet.Versioning"; version = "5.2.0"; sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; })
+ (fetchNuGet { pname = "NuGet.Versioning"; version = "6.2.0"; sha256 = "0qpsf9wywwi49d0p9gvb0h6m6ja17lg8wyiyk1gg502cb73b90zn"; })
(fetchNuGet { pname = "NuGet.Versioning"; version = "6.4.0-preview.1.53"; sha256 = "1mvc81qy3s5iwqikyw5hypfkrf9ji5br91dybavznhhls9j96999"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.4.0-preview.1.53/nuget.versioning.6.4.0-preview.1.53.nupkg"; })
- (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.0"; sha256 = "0m9lw21iz90ayl35f24ir3vbiydf4sjqw590qqgwknykpzsi1ai2"; })
- (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.0"; sha256 = "17akjdh9dnyxr01lnlsa41ca52psqnny8j3wxz904zs15pz932ln"; })
- (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.0"; sha256 = "06d4wakdaj42c9qnlhdyqrjnm97azp4hrvfg70f96ldl765y9vrf"; })
- (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.0"; sha256 = "0k1z3zchl1d82fj0ha63i54g5j046iaz8vb3cyxpjb6kp7zah28v"; })
- (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.0"; sha256 = "0s3h9v5p043ip27g9jcvd0np9q3hn2pfv6gn539m45yb5d74a6i5"; })
+ (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.7"; sha256 = "02fsw54jmh037a5q518nrsd9657kdy111m31q13ll759a601bai7"; })
+ (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.7"; sha256 = "15wy1ql68bdbz507488ivdlc4wsd3f73cbwqwc8yci1mwpfcwryd"; })
+ (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.7"; sha256 = "0c2mh69cx4lzf0s146i9ci43inb9mns4rcy08qdzki56irb0y3yh"; })
+ (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.7"; sha256 = "004jacz3w9rqvccfa1f88vzkz68agx786bncg43bc6mzg8j7mcvr"; })
+ (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.7"; sha256 = "05a5vh32vq6jipzvwwjzjf40l2ar2qxp6v9sxpfjnxdvm1bxyxmf"; })
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
@@ -166,21 +150,19 @@
(fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
- (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.7"; sha256 = "083saqlwx1hbhy0rv7vi973aw7jv8q53fcxlrprx1wgxdwnbi5ni"; })
- (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.7"; sha256 = "0b25qz3h1aarza2b74alsl9v6czns3y61i8p10yqgd9djk1b1byj"; })
- (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.7"; sha256 = "0wkrzcpc9vcd27gwj6w537i1i5i3h5zsips8b9v9ngk003n50mia"; })
- (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.7"; sha256 = "1kmyf4v4157n2194j17ijf62xnqiapxhg4aka851zx0hzlxm7ygp"; })
- (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.0.7"; sha256 = "1davv3fqd05353d7dl7wm2sg58fyy59b29pk58w1vf7m33580grj"; })
+ (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; sha256 = "008bnj279y7gxcai69r4bqgxpxwsdb8jvai4kxkd97arlcr1cpjv"; })
+ (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; sha256 = "0kq5x9k5kl6lh7jp1hgjn08wl37zribrykfimhln6mkqbp1myncp"; })
+ (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; })
+ (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.0"; sha256 = "12a6s3knynfrzf9vxxy6hwg4hvxncc0ad59g3bigqx86p8xfb4nq"; })
+ (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; })
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
(fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; })
- (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; })
- (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; })
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; })
@@ -195,35 +177,25 @@
(fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; })
(fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; })
(fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; })
- (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; })
- (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; })
- (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
(fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; })
- (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
(fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; })
(fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; })
- (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; })
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; })
- (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
(fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; })
(fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; })
- (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
- (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
- (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; })
+ (fetchNuGet { pname = "System.IO.Pipelines"; version = "5.0.1"; sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; })
(fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; })
- (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
- (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
@@ -233,56 +205,40 @@
(fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
- (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
- (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
(fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; })
- (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; })
+ (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
(fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.5.1"; sha256 = "0cdnl4i9mfk7kx2ylglayqwqw7kl5k1xr8siaxch45hfyc2cpds8"; })
- (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
- (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
- (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; })
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; })
- (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; })
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.0"; sha256 = "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"; })
(fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; })
- (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
- (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; })
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
(fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; })
- (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
- (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
- (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; })
- (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; })
+ (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
- (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
- (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
- (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
(fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; })
(fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; })
(fetchNuGet { pname = "System.Runtime.InteropServices.WindowsRuntime"; version = "4.3.0"; sha256 = "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9"; })
(fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; })
- (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; })
- (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; })
(fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; })
@@ -296,7 +252,6 @@
(fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; })
(fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; })
(fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; })
- (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.3.0"; sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; })
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; })
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; })
(fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; })
@@ -307,32 +262,22 @@
(fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; })
- (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
- (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
- (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; })
(fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; })
- (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
- (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
- (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; })
+ (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
(fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; })
- (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; })
- (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
- (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; })
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
(fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })
(fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; })
- (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
- (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
]
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 728100c540b3..13ba669bb4f2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -51,14 +51,17 @@ let
'' + (lib.concatStrings (lib.mapAttrsToList
(name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n")
(import ./grammars { inherit lib; }))));
+
+ buildGrammar = callPackage ./grammar.nix { };
+
builtGrammars =
let
- change = name: grammar:
- callPackage ./grammar.nix { } {
- language = if grammar ? language then grammar.language else name;
+ build = name: grammar:
+ buildGrammar {
+ language = grammar.language or name;
inherit version;
- source = if grammar ? src then grammar.src else fetchGrammar grammar;
- location = if grammar ? location then grammar.location else null;
+ src = grammar.src or fetchGrammar grammar;
+ location = grammar.location or null;
};
grammars' = import ./grammars { inherit lib; } // extraGrammars;
grammars = grammars' //
@@ -70,7 +73,7 @@ let
{ tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } //
{ tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; };
in
- lib.mapAttrs change (grammars);
+ lib.mapAttrs build (grammars);
# Usage:
# pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])
@@ -142,7 +145,7 @@ rustPlatform.buildRustPackage {
updater = {
inherit update-all-grammars;
};
- inherit grammars builtGrammars withPlugins allGrammars;
+ inherit grammars buildGrammar builtGrammars withPlugins allGrammars;
tests = {
# make sure all grammars build
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
index 5b62959db0f0..c2c3ce4a8961 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
@@ -9,10 +9,8 @@
{
# language name
language
- # version of tree-sitter
, version
- # source for the language grammar
-, source
+, src
, location ? null
, generate ? false
, ...
@@ -21,7 +19,7 @@
stdenv.mkDerivation ({
pname = "${language}-grammar";
- src = source;
+ inherit src version;
nativeBuildInputs = lib.optionals generate [ nodejs tree-sitter ];
@@ -60,4 +58,4 @@ stdenv.mkDerivation ({
fi
runHook postInstall
'';
-} // removeAttrs args [ "language" "source" "location" "generate" ])
+} // removeAttrs args [ "language" "location" "generate" ])
diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix
index 152d0b494de3..8854ee18bf61 100644
--- a/pkgs/development/tools/ruff/default.nix
+++ b/pkgs/development/tools/ruff/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
- version = "0.0.228";
+ version = "0.0.230";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Dza6SRWYjegUaoZeWJCARdYUM5SY+2zHItYi87q8YLo=";
+ sha256 = "sha256-40QVmxdEuWQEFCkf8ypEWsH1R6A3WjTXWPC99RnWsgI=";
};
- cargoSha256 = "sha256-+u2tJHqAnTaUGVfjTHGIZqIp5VJMoR/W76rSa6IaicU=";
+ cargoSha256 = "sha256-ek/+qYOsFhbwWuHn6ezWzsxxeK0umrNAZZVFJl2ya1M=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix
index 2eb2ddd2d984..0472dd8dfa69 100644
--- a/pkgs/development/tools/rust/cargo-deb/default.nix
+++ b/pkgs/development/tools/rust/cargo-deb/default.nix
@@ -1,49 +1,41 @@
-{ stdenv
-, lib
-, fetchFromGitHub
+{ lib
, rustPlatform
-, rust
-, libiconv
-, Security
+, fetchFromGitHub
+, makeWrapper
+, dpkg
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-deb";
- version = "1.30.0";
+ version = "1.42.0";
src = fetchFromGitHub {
- owner = "mmstick";
+ owner = "kornelski";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-rAmG6Aj0D9dHVueh1BN1Chhit+XFhqGib1WTvMDy0LI=";
+ hash = "sha256-5IWx9tScm64Rwi6RMsbXl1Eajtc/c5PWaZEDrgibTAY=";
};
- buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+ cargoHash = "sha256-nwCfUxIrr4DxKqePu/vwxfLld08+GGXZwQWz6Gltmao=";
- cargoSha256 = "sha256-MEpyEdjLWNZvqE7gJLvQ169tgmJRzec4vqQI9fF3xr8=";
+ nativeBuildInputs = [
+ makeWrapper
+ ];
- preCheck = ''
- substituteInPlace tests/command.rs \
- --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/release"
+ # This is an FHS specific assert depending on glibc location
+ checkFlags = [
+ "--skip=dependencies::resolve_test"
+ ];
- # This is an FHS specific assert depending on glibc location
- substituteInPlace src/dependencies.rs \
- --replace 'assert!(deps.iter().any(|d| d.starts_with("libc")));' '// no libc assert here'
+ postInstall = ''
+ wrapProgram $out/bin/cargo-deb \
+ --prefix PATH : ${lib.makeBinPath [ dpkg ]}
'';
meta = with lib; {
- description = "Generate Debian packages from information in Cargo.toml";
- homepage = "https://github.com/mmstick/cargo-deb";
+ description = "A cargo subcommand that generates Debian packages from information in Cargo.toml";
+ homepage = "https://github.com/kornelski/cargo-deb";
license = licenses.mit;
- # test failures:
- # control::tests::generate_scripts_generates_maintainer_scripts_for_unit
- # dh_installsystemd::tests::find_units_in_empty_dir_finds_nothing
- # dh_lib::tests::apply_with_no_matching_files
- # dh_lib::tests::debhelper_script_subst_with_generated_file_only
- # dh_lib::tests::debhelper_script_subst_with_no_matching_files
- # dh_lib::tests::pkgfile_finds_most_specific_match_without_pkg_file
- # dh_lib::tests::pkgfile_finds_most_specific_match_without_unit_file
- broken = (stdenv.isDarwin && stdenv.isx86_64);
maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 8aa9ccd5388a..11b146e55c5e 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -1,9 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut
+{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, freeglut
, avrgcc, avrlibc
, libGLU, libGL
, GLUT }:
-stdenv.mkDerivation rec {
+let
+ setupHookDarwin = makeSetupHook {
+ name = "darwin-avr-gcc-hook";
+ substitutions = {
+ darwinSuffixSalt = stdenv.cc.suffixSalt;
+ avrSuffixSalt = avrgcc.suffixSalt;
+ };
+ } ./setup-hook-darwin.sh;
+in stdenv.mkDerivation rec {
pname = "simavr";
version = "1.7";
@@ -22,9 +30,8 @@ stdenv.mkDerivation rec {
"AVR=avr-"
];
- NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
-
- nativeBuildInputs = [ which pkg-config avrgcc ];
+ nativeBuildInputs = [ which pkg-config avrgcc ]
+ ++ lib.optional stdenv.isDarwin setupHookDarwin;
buildInputs = [ libelf freeglut libGLU libGL ]
++ lib.optional stdenv.isDarwin GLUT;
@@ -35,7 +42,6 @@ stdenv.mkDerivation rec {
checkTarget = "-C tests run_tests";
meta = with lib; {
- broken = stdenv.isDarwin;
description = "A lean and mean Atmel AVR simulator";
homepage = "https://github.com/buserror/simavr";
license = licenses.gpl3;
diff --git a/pkgs/development/tools/simavr/setup-hook-darwin.sh b/pkgs/development/tools/simavr/setup-hook-darwin.sh
new file mode 100644
index 000000000000..3861e45973ac
--- /dev/null
+++ b/pkgs/development/tools/simavr/setup-hook-darwin.sh
@@ -0,0 +1,34 @@
+
+fixupCFlagsForDarwin() {
+ # Because it’s getting called from a Darwin stdenv, avr-gcc will pick up on
+ # Darwin-specific flags, and it will barf and die on -iframework in
+ # particular. Strip them out, so simavr can compile its test firmware.
+ cflagsFilter='s|-F[^ ]*||g;s|-iframework [^ ]*||g;s|-isystem [^ ]*||g;s| *| |g'
+
+ # The `CoreFoundation` reference is added by `linkSystemCoreFoundationFramework` in the
+ # Apple SDK’s setup hook. Remove that because avr-gcc will fail due to file not found.
+ ldFlagsFilter='s|/nix/store/[^-]*-apple-framework-CoreFoundation[^ ]*||g'
+
+ # `cc-wrapper.sh`` supports getting flags from a system-specific salt. While it is currently a
+ # tuple, that’s not considered a stable interface, so the derivation will provide them.
+ export NIX_CFLAGS_COMPILE_@darwinSuffixSalt@=${NIX_CFLAGS_COMPILE-}
+ export NIX_LDFLAGS_@darwinSuffixSalt@=${NIX_LDFLAGS-}
+
+ echo removing @darwinSuffixSalt@-specific flags from NIX_CFLAGS_COMPILE for @avrSuffixSalt@
+ export NIX_CFLAGS_COMPILE_@avrSuffixSalt@+="$(sed "$cflagsFilter" <<< "$NIX_CFLAGS_COMPILE")"
+ echo removing @darwinSuffixSalt@-specific flags from NIX_LDFLAGS for @avrSuffixSalt@
+ export NIX_LDFLAGS_@avrSuffixSalt@+="$(sed "$ldFlagsFilter;$cflagsFilter" <<< "$NIX_LDFLAGS")"
+
+ # Make sure the global flags aren’t accidentally influencing the platform-specific flags.
+ export NIX_CFLAGS_COMPILE=""
+ export NIX_LDFLAGS=""
+}
+
+# This is pretty hacky, but this hook _must_ run after `linkSystemCoreFoundationFramework`.
+function runFixupCFlagsForDarwinLast() {
+ preConfigureHooks+=(fixupCFlagsForDarwin)
+}
+
+if [ -z "${dontFixupCFlagsForDarwin-}" ]; then
+ postUnpackHooks+=(runFixupCFlagsForDarwinLast)
+fi
diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix
index 8b8cca911a93..fb8e92f23306 100644
--- a/pkgs/os-specific/linux/device-tree/default.nix
+++ b/pkgs/os-specific/linux/device-tree/default.nix
@@ -22,21 +22,19 @@ with lib; {
# skip incompatible and non-matching overlays
if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then
- echo -n "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")"
- continue
- fi
- ${optionalString (o.filter != null) ''
- if [[ "''${dtb//${o.filter}/}" == "$dtb" ]]; then
- echo -n "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")"
- continue
- fi
+ echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")"
+ elif ${if (o.filter == null) then "false" else ''
+ [[ "''${dtb//${o.filter}/}" == "$dtb" ]]
''}
-
- echo -n "Applying overlay ${o.name} to $(basename "$dtb")... "
- mv "$dtb"{,.in}
- fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}"
- echo "ok"
- rm "$dtb.in"
+ then
+ echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")"
+ else
+ echo -n "Applying overlay ${o.name} to $(basename "$dtb")... "
+ mv "$dtb"{,.in}
+ fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}"
+ echo "ok"
+ rm "$dtb.in"
+ fi
'')}
done
diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix
index 1ba01a1c88fb..7a4facebcee8 100644
--- a/pkgs/os-specific/linux/zenpower/default.nix
+++ b/pkgs/os-specific/linux/zenpower/default.nix
@@ -1,14 +1,15 @@
-{ lib, stdenv, kernel, fetchFromGitHub, fetchpatch }:
+{ lib, stdenv, kernel, fetchFromGitea }:
stdenv.mkDerivation rec {
pname = "zenpower";
- version = "unstable-2022-04-13";
+ version = "unstable-2022-11-04";
- src = fetchFromGitHub {
- owner = "Ta180m";
+ src = fetchFromGitea {
+ domain = "git.exozy.me";
+ owner = "a";
repo = "zenpower3";
- rev = "c36a86c64b802e9b90b5166caee6a8e8eddaeb56";
- sha256 = "1i9ap7xgab421f3c68mcmad25xs4h8pfz0g0f9yzg7hxpmb0npxi";
+ rev = "c176fdb0d5bcba6ba2aba99ea36812e40f47751f";
+ sha256 = "sha256-d2WH8Zv7F0phZmEKcDiaak9On+Mo9bAFhMulT/N5FWI=";
};
hardeningDisable = [ "pic" ];
diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix
index 8cd89c2afcf5..f1ff08b930cf 100644
--- a/pkgs/servers/roon-server/default.nix
+++ b/pkgs/servers/roon-server/default.nix
@@ -15,7 +15,7 @@
, stdenv
}:
let
- version = "2.0-1182";
+ version = "2.0-1193";
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
in
stdenv.mkDerivation {
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
- hash = "sha256-2mo45+cbOyej5stJ8DFobvqECTTMLandcoPFnD4nY7s=";
+ hash = "sha256-yvM4mEFBelT8Nox0vzI4tlQbxDUkoMAB6q8l5LW8+b4=";
};
dontConfigure = true;
diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix
index 9ef0e17f9570..535ef7192d84 100644
--- a/pkgs/servers/vouch-proxy/default.nix
+++ b/pkgs/servers/vouch-proxy/default.nix
@@ -1,20 +1,24 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
buildGoModule rec {
pname = "vouch-proxy";
- version = "0.37.3";
+ version = "0.39.0";
src = fetchFromGitHub {
owner = "vouch";
repo = "vouch-proxy";
- rev = "v${version}";
- sha256 = "sha256-zXt1Xo6xq1g1putx4q6z7SEXK4lNGRgRnNPXajL5Znw=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-q4tylXW219jzWrdzOQxewRh1advYEouEKiNJvvnIp9U=";
};
- vendorSha256 = "sha256-E1x1QTagXkL4NQ7REDuTHpUaadiz72e3jMLPVquSSV4=";
+ vendorHash = "sha256-IUjIGht/oQiWKHfbW7nJaybKpKs179mOkpLIwAb8/hk=";
ldflags = [
- "-s" "-w"
+ "-s"
+ "-w"
"-X main.version=${version}"
];
@@ -25,8 +29,9 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://github.com/vouch/vouch-proxy";
description = "An SSO and OAuth / OIDC login solution for NGINX using the auth_request module";
+ changelog = "https://github.com/vouch/vouch-proxy/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ leona erictapen ];
- platforms = lib.platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 80a9aec563fe..a1aa06b4a6a5 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -7,16 +7,16 @@
}:
buildGoModule rec {
pname = "aws-vault";
- version = "6.6.1";
+ version = "6.6.2";
src = fetchFromGitHub {
owner = "99designs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oItDA7PWI6EzEyG9QYb8N1Zttm8yHwMSgpUDV2C5ae0=";
+ sha256 = "sha256-BijZpk0vograOGlyuK7Wpsv8Y5DJvHUoTJVCex7VTTo=";
};
- vendorSha256 = "sha256-zC4v9TlKHGCYRWX0ZWAVdCM7yw9eaAZ/4ZIZ38sM4S0=";
+ vendorHash = "sha256-zC4v9TlKHGCYRWX0ZWAVdCM7yw9eaAZ/4ZIZ38sM4S0=";
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix
index 71f88a9b23b9..88621f236569 100644
--- a/pkgs/tools/admin/kics/default.nix
+++ b/pkgs/tools/admin/kics/default.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kics";
- version = "1.6.7";
+ version = "1.6.8";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
rev = "v${version}";
- sha256 = "sha256-VtQauOf3FavXULFeWWw3aThHZAFMuwuI/FYr0dtZc0A=";
+ sha256 = "sha256-s2M763M4Hoy8gjgkHT69pCUCsWepmt0zEyXYpGzYTn0=";
};
- vendorHash = "sha256-0Y4+tG54McwcRVuHXJBfs6Zg1fJBffeDs7JYInqfXe0=";
+ vendorHash = "sha256-JWdc0BN0GRw79uhb2uubSG1bnZlTHTVrmS0Jft1ZNh8=";
subPackages = [ "cmd/console" ];
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index ccf74e46aeb5..b5a694482cb8 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "partclone";
- version = "0.3.21";
+ version = "0.3.22";
src = fetchFromGitHub {
owner = "Thomas-Tsai";
repo = "partclone";
rev = version;
- sha256 = "sha256-QAvZzu63TSj/kRYd60q2lpxU92xTV8T8jXdtZvrxX+I=";
+ sha256 = "sha256-NSIWuzgv3dQ2Kpl1HOoghrOaKztDjZs8NjF9k41kZQY=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index db27a20d24a7..cbc00b52bd54 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -12,12 +12,16 @@ stdenv.mkDerivation rec {
};
patches = [
- # macOS build fixes backported from master
+ # macOS and FreeBSD build fixes backported from master
# TODO: remove on the next release
(fetchpatch {
url = "https://github.com/dosfstools/dosfstools/commit/77ffb87e8272760b3bb2dec8f722103b0effb801.patch";
sha256 = "sha256-xHxIs3faHK/sK3vAVoG8JcTe4zAV+ZtkozWIIFBvPWI=";
})
+ (fetchpatch {
+ url = "https://github.com/dosfstools/dosfstools/commit/2d3125c4a74895eae1f66b93287031d340324524.patch";
+ sha256 = "nlIuRDsNjk23MKZL9cZ05odOfTXvsyQaKcv/xEr4c+U=";
+ })
];
nativeBuildInputs = [ autoreconfHook pkg-config ]
@@ -37,7 +41,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Utilities for creating and checking FAT and VFAT file systems";
homepage = "https://github.com/dosfstools/dosfstools";
- platforms = lib.platforms.linux ++ lib.platforms.darwin;
+ platforms = lib.platforms.unix;
license = lib.licenses.gpl3;
};
}
diff --git a/pkgs/tools/misc/addlicense/default.nix b/pkgs/tools/misc/addlicense/default.nix
index a01ae0de0834..0ea6beadea80 100644
--- a/pkgs/tools/misc/addlicense/default.nix
+++ b/pkgs/tools/misc/addlicense/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "addlicense";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "google";
repo = "addlicense";
rev = "v${version}";
- sha256 = "sha256-Vi+U0b9tTJitStZr1wSotr82Y2gA4IjvHLAa+rwGH/g=";
+ sha256 = "sha256-YMMHj6wctKtJi/rrcMIrLmNw/uvO6wCwokgYRQxcsFw=";
};
- vendorSha256 = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y=";
+ vendorHash = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y=";
subPackages = [ "." ];
diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix
index 679b575a3d59..20c4221a0816 100644
--- a/pkgs/tools/misc/cf-terraforming/default.nix
+++ b/pkgs/tools/misc/cf-terraforming/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cf-terraforming";
- version = "0.8.8";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cf-terraforming";
rev = "v${version}";
- sha256 = "sha256-wqpVqf4E5Zz8oKjl7XNjAH05wA++MOL9EnHL/YwsSYw=";
+ sha256 = "sha256-wELV3Jp11Iv3G//VOAosL5QDnbNTyEAvq9hmLWDdPBU=";
};
- vendorSha256 = "sha256-tmq55wCQ10WkP+Cp3Ak6mttwL1wxqIAvpn6tsluhI34=";
+ vendorHash = "sha256-XFJGw76Fz9tzknWuzc1aw1uJ34UQfFLe1WUVtPGbn64=";
ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ];
# The test suite insists on downloading a binary release of Terraform from
diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/tools/misc/discocss/default.nix
index e010541c7182..a9e3d124c855 100644
--- a/pkgs/tools/misc/discocss/default.nix
+++ b/pkgs/tools/misc/discocss/default.nix
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "discocss";
- version = "0.2.1";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "mlvzk";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Qp1EixARxEnpNM+Yhn00anR0Ll4aFmkeaGtNju/iWlY=";
+ sha256 = "sha256-of7OMgbuwebnFmbefGD1/dOhyTX1Hy7TccnWSRCweW0=";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/gazelle-origin/default.nix b/pkgs/tools/misc/gazelle-origin/default.nix
new file mode 100644
index 000000000000..800904e909c5
--- /dev/null
+++ b/pkgs/tools/misc/gazelle-origin/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, bencoder
+, pyyaml
+, requests
+, setuptools
+}:
+buildPythonApplication rec {
+ pname = "gazelle-origin";
+ version = "3.0.0";
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ repo = pname;
+ # Use the spinfast319 fork, since it seems that upstream
+ # at is inactive
+ owner = "spinfast319";
+ rev = version;
+ hash = "sha256-+yMKnfG2f+A1/MxSBFLaHfpCgI2m968iXqt+2QanM/c=";
+ };
+
+ propagatedBuildInputs = [
+ bencoder
+ pyyaml
+ requests
+ ];
+
+ pythonImportsCheck = [ "gazelleorigin" ];
+
+ meta = with lib; {
+ description = "Tool for generating origin files using the API of Gazelle-based torrent trackers";
+ homepage = "https://github.com/spinfast319/gazelle-origin";
+ # TODO license is unspecified in the upstream, as well as the fork
+ license = licenses.unfree;
+ maintainers = with maintainers; [ somasis ];
+ };
+}
diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix
index 21089caf0236..0246421e7fdc 100644
--- a/pkgs/tools/misc/gti/default.nix
+++ b/pkgs/tools/misc/gti/default.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, installShellFiles
+}:
stdenv.mkDerivation rec {
pname = "gti";
@@ -15,10 +19,16 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace 'CC=cc' 'CC=${stdenv.cc.targetPrefix}cc'
'';
+ nativeBuildInputs = [
+ installShellFiles
+ ];
+
installPhase = ''
- mkdir -p $out/bin $out/share/man/man6
- cp gti $out/bin
- cp gti.6 $out/share/man/man6
+ install -D gti $out/bin/gti
+ installManPage gti.6
+ installShellCompletion --cmd gti \
+ --bash completions/gti.bash \
+ --zsh completions/gti.zsh
'';
meta = with lib; {
diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/tools/misc/limitcpu/default.nix
index 8be7f974707f..75e50d8a78b1 100644
--- a/pkgs/tools/misc/limitcpu/default.nix
+++ b/pkgs/tools/misc/limitcpu/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "limitcpu";
- version = "2.7";
+ version = "2.8";
src = fetchurl {
url = "mirror://sourceforge/limitcpu/cpulimit-${version}.tar.gz";
- sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA=";
+ sha256 = "sha256-fjGbCR9QEVTmAFxd+WoEAGbuhtsiAdWDXQq9mOO2t/8=";
};
buildFlags = with stdenv; [ (
diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix
index 869abe92e5c2..9b24f4fc6bf4 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/pkgs/tools/networking/minissdpd/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "minissdpd";
- version = "1.5.20180223";
+ version = "1.6.0";
src = fetchurl {
- sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv";
+ sha256 = "sha256-9MLepqRy4KXMncotxMH8NrpVOOrPjXk4JSkyUXJVRr0=";
url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
name = "${pname}-${version}.tar.gz";
};
diff --git a/pkgs/tools/networking/simple-dlna-browser/default.nix b/pkgs/tools/networking/simple-dlna-browser/default.nix
new file mode 100644
index 000000000000..c59a1e28910a
--- /dev/null
+++ b/pkgs/tools/networking/simple-dlna-browser/default.nix
@@ -0,0 +1,68 @@
+{
+ # Derivation stuff
+ fetchFromGitHub,
+ lib,
+ makeWrapper,
+ stdenv,
+ # Dependencies
+ # Add these to the wrapper
+ curl,
+ gawk,
+ gnugrep,
+ gnused,
+ socat,
+ wget,
+}:
+stdenv.mkDerivation {
+ pname = "simple-dlna-browser";
+ version = "unstable-2023-01-09";
+
+ src = fetchFromGitHub {
+ owner = "javier-lopez";
+ repo = "learn";
+ sparseCheckout = [
+ "sh/tools/simple-dlna-browser"
+ ];
+ rev = "666e2c402723251ba19ce9d7c11b83b06c15a2c5";
+ sha256 = "sha256-jwPAEgti5DrjNnNVW/61GGTP+QedGAjz9kPwYhMAdTk=";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ outputWrapper="$out/bin/simple-dlna-browser"
+ outputWrapped="$out/bin/wrapped-simple-dlna-browser"
+
+ mkdir -p $out/bin
+ cp sh/tools/simple-dlna-browser $outputWrapped
+ makeWrapper $outputWrapped $outputWrapper \
+ --prefix PATH : ${lib.makeBinPath [
+ curl
+ gawk
+ gnugrep
+ gnused
+ socat
+ wget
+ ]}
+
+ # Set the program name to a fixed value
+ # Normally it is guessed by the filename, but we don't want it to be the name of the wrapper
+ sed -i -e 's/PROGNAME=".*"/PROGNAME="simple-dlna-browser"/' $outputWrapped
+ '';
+
+ meta = {
+ description = "Query dlna media servers";
+ longDescription = ''
+ A bash script that allows simple interactions with [DLNA] media servers.
+ It is a light-weight, CLI alternative to [VLC], [Kodi], and other players.
+
+ [DLNA]: https://en.wikipedia.org/wiki/Digital_Living_Network_Alliance
+ [Kodi]: https://kodi.tv/
+ [VLC]: https://www.videolan.org/vlc/
+ '';
+ homepage = "https://github.com/javier-lopez/learn/blob/master/sh/tools/simple-dlna-browser";
+ license = lib.licenses.fair;
+ maintainers = with lib.maintainers; [ loveisgrief ];
+ };
+}
+
diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix
index 29b898e8da11..e59715e61f38 100644
--- a/pkgs/tools/networking/xray/default.nix
+++ b/pkgs/tools/networking/xray/default.nix
@@ -20,16 +20,16 @@ let
in
buildGoModule rec {
pname = "xray";
- version = "1.7.0";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "XTLS";
repo = "Xray-core";
rev = "v${version}";
- sha256 = "sha256-aNIb90obew+tvd/rYVddK1MmUqLXSqi9xAu65BQFvk0=";
+ sha256 = "sha256-jwCvo6+YXC471VqGWzcrnrLWOSJW2tBKa5SoynQg0Lo=";
};
- vendorSha256 = "sha256-zZdUPjlul9f1jKy0Zf79KOToHIsvfgwDp6XpFPYyTzk=";
+ vendorSha256 = "sha256-P2g0MqlBScm6yTnpvL5T6l9ntsb4tK9k3Civ7rTevrE=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix
index 2729a16b8687..efbc9ed3dd3f 100644
--- a/pkgs/tools/system/throttled/default.nix
+++ b/pkgs/tools/system/throttled/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "throttled";
- version = "0.9.2";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "erpalma";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4aDa6REDHO7gr1czIv6NlepeMVJI93agxJjE2vHiEmk=";
+ sha256 = "sha256-0MsPp6y4r/uZB2SplKV+SAiJoxIs2jgOQmQoQQ2ZKwI=";
};
nativeBuildInputs = [ python3Packages.wrapPython ];
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
];
# The upstream unit both assumes the install location, and tries to run in a virtualenv
- postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service'';
+ postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/throttled.py|' -i systemd/throttled.service'';
installPhase = ''
runHook preInstall
- install -D -m755 -t $out/bin lenovo_fix.py
- install -D -t $out/bin lenovo_fix.py mmio.py
+ install -D -m755 -t $out/bin throttled.py
+ install -D -t $out/bin throttled.py mmio.py
install -D -m644 -t $out/etc etc/*
install -D -m644 -t $out/lib/systemd/system systemd/*
runHook postInstall
diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix
index ac6a561bb0a6..c9c07c81bcae 100644
--- a/pkgs/tools/system/wsmancli/default.nix
+++ b/pkgs/tools/system/wsmancli/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "wsmancli";
- version = "2.6.0";
+ version = "2.6.2";
src = fetchFromGitHub {
owner = "Openwsman";
repo = "wsmancli";
rev = "v${version}";
- sha256 = "0a67fz9lj7xkyfqim6ai9kj7v6hzx94r1bg0g0l5dymgng648b9j";
+ sha256 = "sha256-A2PVhQuKVTZ/nDKyy+vZVBNLB/3xujBYBzUEWcTIYYg=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5181b19b0cee..565ce41c5c68 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -586,6 +586,8 @@ mapAliases ({
graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15
graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15
gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03
+ gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17
+ gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17
grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07
gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af8689ea805b..dd4e53df1b75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1392,6 +1392,8 @@ with pkgs;
davinci-resolve = callPackage ../applications/video/davinci-resolve { };
+ dolbybcsoftwaredecode = callPackage ../applications/audio/dolbybcsoftwaredecode { };
+
dwarfs = callPackage ../tools/filesystems/dwarfs { };
copier = callPackage ../tools/misc/copier { };
@@ -1512,6 +1514,8 @@ with pkgs;
sgrep = callPackage ../tools/text/sgrep { };
+ simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { };
+
sorted-grep = callPackage ../tools/text/sorted-grep { };
smbscan = callPackage ../tools/security/smbscan { };
@@ -15583,9 +15587,7 @@ with pkgs;
cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks {
inherit (darwin.apple_sdk.frameworks) Security;
};
- cargo-deb = callPackage ../development/tools/rust/cargo-deb {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
+ cargo-deb = callPackage ../development/tools/rust/cargo-deb { };
cargo-deps = callPackage ../development/tools/rust/cargo-deps { };
cargo-edit = callPackage ../development/tools/rust/cargo-edit {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -17731,8 +17733,6 @@ with pkgs;
inherit jdk8 jdk11 jdk17;
};
gradleGen = gradle-packages.gen;
- gradle_4 = callPackage gradle-packages.gradle_4 { };
- gradle_5 = callPackage gradle-packages.gradle_5 { };
gradle_6 = callPackage gradle-packages.gradle_6 { };
gradle_7 = callPackage gradle-packages.gradle_7 { };
gradle = gradle_7;
@@ -26068,6 +26068,8 @@ with pkgs;
iferr = callPackage ../development/tools/iferr { };
+ gci = callPackage ../development/tools/gci { };
+
ginkgo = callPackage ../development/tools/ginkgo { };
gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv {
@@ -28024,6 +28026,10 @@ with pkgs;
av-98 = callPackage ../applications/networking/browsers/av-98 { };
+ avalanchego = callPackage ../applications/networking/avalanchego {
+ inherit (darwin.apple_sdk.frameworks) IOKit;
+ };
+
avizo = callPackage ../applications/misc/avizo { };
avocode = callPackage ../applications/graphics/avocode {};
@@ -29084,6 +29090,8 @@ with pkgs;
gauche = callPackage ../development/interpreters/gauche { };
+ gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { };
+
gcal = callPackage ../applications/misc/gcal { };
gcstar = callPackage ../applications/misc/gcstar { };
@@ -36054,6 +36062,8 @@ with pkgs;
svaba = callPackage ../applications/science/biology/svaba { };
+ tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { };
+
tebreak = callPackage ../applications/science/biology/tebreak { };
treemix = callPackage ../applications/science/biology/treemix { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d73859a0dd18..3b5bda9168c7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1212,6 +1212,8 @@ self: super: with self; {
bellows = callPackage ../development/python-modules/bellows { };
+ bencoder = callPackage ../development/python-modules/bencoder { };
+
beniget = callPackage ../development/python-modules/beniget { };
bespon = callPackage ../development/python-modules/bespon { };