mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d2cd24fe6a
48 changed files with 3804 additions and 3572 deletions
|
|
@ -7,6 +7,7 @@ import ../make-test-python.nix ({...}: {
|
|||
enable = true;
|
||||
master = "master:7077";
|
||||
};
|
||||
virtualisation.memorySize = 2048;
|
||||
};
|
||||
master = { config, pkgs, ... }: {
|
||||
services.spark.master = {
|
||||
|
|
|
|||
|
|
@ -3,35 +3,52 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
{
|
||||
name = "systemd-oomd";
|
||||
|
||||
# This test is a simplified version of systemd's testsuite-55.
|
||||
# https://github.com/systemd/systemd/blob/v251/test/units/testsuite-55.sh
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
systemd.oomd.extraConfig.DefaultMemoryPressureDurationSec = "1s"; # makes the test faster
|
||||
# Kill cgroups when more than 1% pressure is encountered
|
||||
systemd.slices."-".sliceConfig = {
|
||||
ManagedOOMMemoryPressure = "kill";
|
||||
ManagedOOMMemoryPressureLimit = "1%";
|
||||
};
|
||||
# A service to bring the system under memory pressure
|
||||
systemd.services.testservice = {
|
||||
serviceConfig.ExecStart = "${pkgs.coreutils}/bin/tail /dev/zero";
|
||||
};
|
||||
# Do not kill the backdoor
|
||||
systemd.services.backdoor.serviceConfig.ManagedOOMMemoryPressure = "auto";
|
||||
|
||||
# Limit VM resource usage.
|
||||
virtualisation.memorySize = 1024;
|
||||
systemd.oomd.extraConfig.DefaultMemoryPressureDurationSec = "1s";
|
||||
|
||||
systemd.slices.workload = {
|
||||
description = "Test slice for memory pressure kills";
|
||||
sliceConfig = {
|
||||
MemoryAccounting = true;
|
||||
ManagedOOMMemoryPressure = "kill";
|
||||
ManagedOOMMemoryPressureLimit = "10%";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.testbloat = {
|
||||
description = "Create a lot of memory pressure";
|
||||
serviceConfig = {
|
||||
Slice = "workload.slice";
|
||||
MemoryHigh = "5M";
|
||||
ExecStart = "${pkgs.coreutils}/bin/tail /dev/zero";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.testchill = {
|
||||
description = "No memory pressure";
|
||||
serviceConfig = {
|
||||
Slice = "workload.slice";
|
||||
MemoryHigh = "3M";
|
||||
ExecStart = "${pkgs.coreutils}/bin/sleep infinity";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
# Start the system
|
||||
# Start the system.
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("oomctl")
|
||||
|
||||
# Bring the system into memory pressure
|
||||
machine.succeed("echo 0 > /proc/sys/vm/panic_on_oom") # NixOS tests kill the VM when the OOM killer is invoked - override this
|
||||
machine.succeed("systemctl start testservice")
|
||||
machine.succeed("systemctl start testchill.service")
|
||||
with subtest("OOMd should kill the bad service"):
|
||||
machine.fail("systemctl start --wait testbloat.service")
|
||||
assert machine.get_unit_info("testbloat.service")["Result"] == "oom-kill"
|
||||
|
||||
# Wait for oomd to kill something
|
||||
# Matches these lines:
|
||||
# systemd-oomd[508]: Killed /system.slice/systemd-udevd.service due to memory pressure for / being 3.26% > 1.00% for > 1s with reclaim activity
|
||||
machine.wait_until_succeeds("journalctl -b | grep -q 'due to memory pressure for'")
|
||||
with subtest("Service without memory pressure should be untouched"):
|
||||
machine.require_unit_state("testchill.service", "active")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif
|
||||
{ stdenv, lib, fetchFromGitHub, motif, xorg
|
||||
, withAudioTracking ? false, libpulseaudio, aubio }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
|||
makeFlags = [ "DESTINATION=$(out)/bin/" ]
|
||||
++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1";
|
||||
|
||||
buildInputs = [ xlibsWrapper motif ]
|
||||
buildInputs = [ motif xorg.libX11 xorg.libXext xorg.libXt ]
|
||||
++ lib.optionals withAudioTracking [ libpulseaudio aubio ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "numberstation";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "~martijnbraam";
|
||||
repo = "numberstation";
|
||||
rev = version;
|
||||
hash = "sha256-A6qwsbeNZXfSOZwHp19/4JQ8dZgjsK7Y2zho6vJXsGA=";
|
||||
hash = "sha256-e/KZrBnep5LbzgNnIoZlS5AMxhx4KlmdYDzdldMGVwg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
urwid
|
||||
urwid-readline
|
||||
];
|
||||
format = "other";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -70,9 +70,7 @@ def get_matching_chromedriver(version):
|
|||
'version': chromedriver_version,
|
||||
'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')),
|
||||
'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')),
|
||||
# TODO: No such object: chromedriver/106.0.5249.61/chromedriver_mac64_m1.zip:
|
||||
# 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac64_m1'))
|
||||
'sha256_darwin_aarch64': "0000000000000000000000000000000000000000000000000000000000000000"
|
||||
'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac_arm64'))
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
"version": "106.0.5249.61",
|
||||
"sha256_linux": "0l2270d5az46pc6icpn3zx7yr8ilkszsrfy3qmwrx3cyc4xnmznj",
|
||||
"sha256_darwin": "07k76i9m3j34h6ybn1wafy39d2ngf06bhp24qzwvv45rks714hqa",
|
||||
"sha256_darwin_aarch64": "0000000000000000000000000000000000000000000000000000000000000000"
|
||||
"sha256_darwin_aarch64": "1nvid0s44nlzy46cgxzsyyb3jfpyl3xy7aqafwskmbxdczx7bdap"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3,10 +3,10 @@
|
|||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "105.0.2";
|
||||
version = "105.0.3";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "49f4c0e7ecf2cef6fa7de8362185bd9ce6950304dadbbea0522a5782016587b9d58f32b45f0e0edf7a2cc31ea158ed10c886b287a18d1f2bff3daf50d9f0b926";
|
||||
sha512 = "8a60ed26f3a6e3fafb1eb13a8daf067056d011a17835310f8ce814b86121014796e790f611058aea75334428529028a2e29ba81d9d2653e09517dc7c3cf48e76";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.176";
|
||||
version = "1.2.177";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E6xRnEIo6ks8E9bWjo8d+mDhYe+nsKIFdUEGS6tbgXM=";
|
||||
hash = "sha256-hvMDQlWlAy7gRiSJMt2qAtBpYEbfhGS/DZeQK5ueHYA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NHRPl38/R7yS8Hht118mBc+OBPwfYiHOaGIwryNK8Mo=";
|
||||
vendorHash = "sha256-ZZh6vKbipp/JmDiB2ELKCFuRUDetmA3+WG7o6ZIQXZk=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.3.30";
|
||||
version = "3.3.31";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LwMbqweRtH0l+89pRns6VbQgWOy3j34i76IwYdOUW0M=";
|
||||
hash = "sha256-JUeH62y2Y73N843ADvvK91PpHAwn1QApnz5Qusm64mI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ libressl ];
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [ ./modification-time.patch ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/geomyidae-v0.51/handlr.c b/geomyidae-v0.51/handlr.c
|
||||
index 0c230d32519..9fc043fa3c9 100644
|
||||
--- a/handlr.c
|
||||
+++ b/handlr.c
|
||||
@@ -71,7 +71,7 @@ handledir(int sock, char *path, char *port, char *base, char *args,
|
||||
*type->type,
|
||||
dirent[i]->d_name,
|
||||
humansize(st.st_size),
|
||||
- humantime(&(st.st_mtim.tv_sec)),
|
||||
+ humantime(&(st.st_mtimespec.tv_sec)),
|
||||
e, ohost, port);
|
||||
free(file);
|
||||
free(dirent[i]);
|
||||
|
|
@ -4,11 +4,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocketchat-desktop";
|
||||
version = "3.8.9";
|
||||
version = "3.8.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
|
||||
sha256 = "sha256-IapGlEUUl+iyW1rTCZugN2YOJUpNwd5NP2QPD3FHd0s=";
|
||||
sha256 = "sha256-gRMoLzCAXByLVtzYAZnhmbgbfsav6CkbP3ZE0NDdlMw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -92,6 +92,6 @@ stdenv.mkDerivation rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gbtb ];
|
||||
platforms = platforms.x86_64;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-cli";
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
|
||||
# Building from source would be preferred, but is much more involved.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
|
||||
sha256 = "sha256-ZvCdxUg1eWeE3/4DLCf7FbDF4B1ZdLTcipKeb/1+xOk=";
|
||||
sha256 = "sha256-2Tn/04Bbj+mUsV0gftEUXQmFYWTQyVaPNHZQVk57Avo=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchurl, libarchive }:
|
||||
|
||||
let
|
||||
version = "0.37.0";
|
||||
version = "0.37.4";
|
||||
in fetchurl {
|
||||
name = "sarasa-gothic-${version}";
|
||||
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
sha256 = "sha256-R1vU17PSfOe2w9PutA7zYrNsa4mejbXqWlWQVV5KXqs=";
|
||||
sha256 = "sha256-fbZN4+SHb2Qelnp122M2I0enbcEl+Qh1oSMiDLAYwSs=";
|
||||
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
|
|
|
|||
|
|
@ -1,40 +1,63 @@
|
|||
{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat11, zlib, llvm, lib
|
||||
, backend ? "mcode" }:
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, callPackage
|
||||
, gnat
|
||||
, zlib
|
||||
, llvm
|
||||
, lib
|
||||
, backend ? "mcode"
|
||||
}:
|
||||
|
||||
assert backend == "mcode" || backend == "llvm";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghdl-${backend}";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghdl";
|
||||
repo = "ghdl";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly";
|
||||
sha256 = "sha256-B/G3FGRzYy4Y9VNNB8yM3FohiIjPJhYSVbqsTN3cL5k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Allow compilation with GNAT 11, picked from master
|
||||
# https://github.com/ghdl/ghdl/issues/2056
|
||||
(fetchpatch {
|
||||
name = "fix-gnat-11-compilation.patch";
|
||||
url = "https://github.com/ghdl/ghdl/commit/8356ea3bb4e8d0e5ad8638c3d50914b64fc360ec.patch";
|
||||
sha256 = "04pzn8g7xha8000wbjjmry6h1grfqyn3bjvj47hi4qwgl21wfjra";
|
||||
name = "fix-build-gcc-12.patch";
|
||||
url = "https://github.com/ghdl/ghdl/commit/f8b87697e8b893b6293ebbfc34670c32bfb49397.patch";
|
||||
hash = "sha256-tVbMm8veFkNPs6WFBHvaic5Jkp1niyg0LfFufa+hT/E=";
|
||||
})
|
||||
];
|
||||
|
||||
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
|
||||
|
||||
buildInputs = [ gnat11 zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
|
||||
propagatedBuildInputs = lib.optionals (backend == "llvm") [ zlib ];
|
||||
nativeBuildInputs = [
|
||||
gnat
|
||||
];
|
||||
buildInputs = [
|
||||
zlib
|
||||
] ++ lib.optional (backend == "llvm") [
|
||||
llvm
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
] ++ lib.optionals (backend == "llvm") [
|
||||
zlib
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# If llvm 7.0 works, 7.x releases should work too.
|
||||
sed -i 's/check_version 7.0/check_version 7/g' configure
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm")
|
||||
"--with-llvm-config=${llvm.dev}/bin/llvm-config";
|
||||
configureFlags = [
|
||||
# See https://github.com/ghdl/ghdl/pull/2058
|
||||
"--disable-werror"
|
||||
"--enable-synth"
|
||||
] ++ lib.optionals (backend == "llvm") [
|
||||
"--with-llvm-config=${llvm.dev}/bin/llvm-config"
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -71,39 +71,16 @@ let
|
|||
|
||||
nimHost = parsePlatform stdenv.hostPlatform;
|
||||
nimTarget = parsePlatform stdenv.targetPlatform;
|
||||
|
||||
bootstrapCompiler = let
|
||||
revision = "561b417c65791cd8356b5f73620914ceff845d10";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "nim-bootstrap";
|
||||
version = "g${lib.substring 0 7 revision}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nim-lang";
|
||||
repo = "csources_v1";
|
||||
rev = revision;
|
||||
sha256 = "sha256-gwBFuR7lzO4zttR/6rgdjXMRxVhwKeLqDwpmOwMyU7A=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dt $out/bin bin/nim
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
in {
|
||||
|
||||
nim-unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "nim-unwrapped";
|
||||
version = "1.6.6";
|
||||
version = "1.6.8";
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
|
||||
hash = "sha256-Z7ERzm84YVA7n8wcrln8NNASJWbT7P7zoGSiF0EhpFI=";
|
||||
hash = "sha256-D1tlzbYPeK9BywdcI4mDaJoeH34lyBnxeYYsGKSEz1c=";
|
||||
};
|
||||
|
||||
buildInputs = [ boehmgc openssl pcre readline sqlite ];
|
||||
|
|
@ -118,7 +95,6 @@ in {
|
|||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
cp ${bootstrapCompiler}/bin/nim bin/
|
||||
echo 'define:nixbuild' >> config/nim.cfg
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
|
@ -133,9 +109,11 @@ in {
|
|||
buildPhase = ''
|
||||
runHook preBuild
|
||||
local HOME=$TMPDIR
|
||||
./bin/nim c koch
|
||||
make -j$NIX_BUILD_CORES
|
||||
./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch
|
||||
./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
|
||||
./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
|
||||
./bin/nim js -d:release tools/dochack/dochack.nim
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
|
@ -145,6 +123,7 @@ in {
|
|||
ln -sf $out/nim/bin/nim $out/bin/nim
|
||||
ln -sf $out/nim/lib $out/lib
|
||||
./install.sh $out
|
||||
cp -a tools $out/nim/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,3 @@
|
|||
commit 164ba50fc74b980f77047080b2ae1ea099ae9b27
|
||||
Author: Emery Hemingway <ehmry@posteo.net>
|
||||
Date: Mon Sep 7 14:09:22 2020 +0200
|
||||
|
||||
Load libaries by absolute path on NixOS
|
||||
|
||||
If "nixbuild" is defined then choose dynamic runtime libraries by
|
||||
searching $NIX_LDFLAGS at compile-time.
|
||||
|
||||
Fix #15194
|
||||
|
||||
diff --git a/lib/pure/dynlib.nim b/lib/pure/dynlib.nim
|
||||
index f31ae94dd..debed9c07 100644
|
||||
--- a/lib/pure/dynlib.nim
|
||||
|
|
@ -37,7 +26,7 @@ index f31ae94dd..debed9c07 100644
|
|||
+ # to enable this behavior by default.
|
||||
+ #
|
||||
+ var libDirs = split(getEnv("LD_LIBRARY_PATH"), ':')
|
||||
+ for flag in split(getEnv("NIX_LDFLAGS")):
|
||||
+ for flag in split(replace(getEnv("NIX_LDFLAGS"), "\\ ", " ")):
|
||||
+ if flag.startsWith("-L"):
|
||||
+ libDirs.add(flag[2..flag.high])
|
||||
+ for lib in dest:
|
||||
|
|
|
|||
|
|
@ -1,21 +1,34 @@
|
|||
{ stdenv, lib, fetchFromGitHub, pkg-config
|
||||
, yosys, readline, zlib, ghdl
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, yosys
|
||||
, readline
|
||||
, zlib
|
||||
, ghdl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "yosys-ghdl";
|
||||
version = "2021.01.25";
|
||||
plugin = "ghdl";
|
||||
# This is not the latest commit, but it's the latest that builds with current stable ghdl 2.0.0
|
||||
version = "2022.01.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghdl";
|
||||
repo = "ghdl-yosys-plugin";
|
||||
rev = "cba859cacf8c6631146dbdaa0f297c060b5a68cd";
|
||||
sha256 = "01d9wb7sqkmkf2y9bnn3pmhy08khzs5m1d06whxsiwgwnjzfk9mx";
|
||||
rev = "c9b05e481423c55ffcbb856fd5296701f670808c";
|
||||
sha256 = "sha256-tT2+DXUtbJIBzBUBcyG2sz+3G+dTkciLVIczcRPr0Jw=";
|
||||
};
|
||||
|
||||
buildInputs = [ yosys readline zlib ghdl ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
yosys
|
||||
readline
|
||||
zlib
|
||||
ghdl
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
installPhase = ''
|
||||
|
|
@ -25,6 +38,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = with lib; {
|
||||
description = "GHDL plugin for Yosys";
|
||||
homepage = "https://github.com/ghdl/ghdl-yosys-plugin";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
|
|
|
|||
35
pkgs/development/libraries/libajantv2/default.nix
Normal file
35
pkgs/development/libraries/libajantv2/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libajantv2";
|
||||
version = "16.2-bugfix5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aja-video";
|
||||
repo = "ntv2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h5PKWMwqTeI5/EaTWkjYojuvDU0FyMpzIjWB98UOJwc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against";
|
||||
homepage = "https://github.com/aja-video/ntv2";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ sebtm ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{ callPackage, zlib }:
|
||||
callPackage ./common.nix rec {
|
||||
version = "0.4.2";
|
||||
url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
|
||||
sha512 = "6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2";
|
||||
buildInputs = [ zlib ];
|
||||
knownVulnerabilities = [];
|
||||
}
|
||||
8
pkgs/development/libraries/libdwarf/20210528.nix
Normal file
8
pkgs/development/libraries/libdwarf/20210528.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{ callPackage, zlib, libelf }:
|
||||
callPackage ./common.nix rec {
|
||||
version = "20210528";
|
||||
url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
|
||||
sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870";
|
||||
buildInputs = [ zlib libelf ];
|
||||
knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ];
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{ callPackage, zlib, libelf }:
|
||||
{ callPackage, zlib }:
|
||||
callPackage ./common.nix rec {
|
||||
version = "20210528";
|
||||
url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
|
||||
sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870";
|
||||
buildInputs = [ zlib libelf ];
|
||||
knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ];
|
||||
version = "0.4.2";
|
||||
url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
|
||||
sha512 = "6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2";
|
||||
buildInputs = [ zlib ];
|
||||
knownVulnerabilities = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,21 +8,23 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maeparser";
|
||||
version = "1.2.4";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schrodinger";
|
||||
repo = "maeparser";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qzp8d58ksy88y4fx1b0x65wycslm7zxzbb8ns28gkjh12xpzhwz";
|
||||
sha256 = "sha256-9KxCR/spIZzePjmZe8qihIi1hEhPvxg/9dAlYmHxZPs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ boost zlib ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "maestro file parser";
|
||||
homepage = "https://github.com/schrodinger/maeparser";
|
||||
description = "Maestro file parser";
|
||||
maintainers = [ maintainers.rmcgibbo ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
{ strictDeps ? true, depsBuildBuild ? [ ], nativeBuildInputs ? [ ]
|
||||
, configurePhase ? null, buildPhase ? null, checkPhase ? null
|
||||
, installPhase ? null, meta ? { }, ... }@attrs:
|
||||
, installPhase ? null, enableParallelBuilding ? true, meta ? { }, ... }@attrs:
|
||||
|
||||
stdenv.mkDerivation (attrs // {
|
||||
inherit strictDeps;
|
||||
inherit strictDeps enableParallelBuilding;
|
||||
depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
|
||||
nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
|
||||
|
||||
|
|
|
|||
|
|
@ -119,8 +119,8 @@ proc buildPhase*() =
|
|||
binDir = getOutputDir("bin") / "bin"
|
||||
if bins != @[]:
|
||||
for bin in bins:
|
||||
cmds.add("nim compile $# --outdir:$# $#" %
|
||||
[getenv"nimFlags", binDir, normalizedPath(srcDir / bin)])
|
||||
cmds.add("nim compile $# --parallelBuild:$# --outdir:$# $#" %
|
||||
[getenv("nimFlags"), getenv("NIX_BUILD_CORES","1"), binDir, normalizedPath(srcDir / bin)])
|
||||
if getEnvBool"nimDoc":
|
||||
echo "generating documentation"
|
||||
let docDir = getOutputDir("doc") / "doc"
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
, "asar"
|
||||
, "audiosprite"
|
||||
, "autoprefixer"
|
||||
, "auto-changelog"
|
||||
, "aws-azure-login"
|
||||
, "aws-cdk"
|
||||
, "awesome-lint"
|
||||
|
|
|
|||
6105
pkgs/development/node-packages/node-packages.nix
generated
6105
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.108";
|
||||
version = "2.1.109";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7BJj850k1hiBykIy25lyt09niZOTp7sxbvo5M89ZV08=";
|
||||
hash = "sha256-G9HcDLVvRB+OXmcp2SYp2rSUsbOcKjrN8KdUMQP8DKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatmo";
|
||||
version = "7.1.0";
|
||||
version = "7.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "jabesq";
|
||||
repo = "pyatmo";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-0K4PEDLn9ayEP965RfQFdEXGUPBDFQyd7rTUzt5YQ/A=";
|
||||
sha256 = "sha256-qFF2uhaaw2hz5jH/xeLiNlyvFgx17P+WmujnoF9qcqo=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydata-sphinx-theme";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
dist = "py3";
|
||||
python = "py3";
|
||||
pname = "pydata_sphinx_theme";
|
||||
sha256 = "sha256-RzH5N8f0L1Fukn1Svgo1ara5AWmK74MxsJfmxP2BAPQ=";
|
||||
sha256 = "sha256-ZPH8THmh8Ga5E1QRFs1afoPhQLoOmDUJ7t2eZuH5SMg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma";
|
||||
version = "0.8.8";
|
||||
version = "0.8.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "SigmaHQ";
|
||||
repo = "pySigma";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eTJZ6gAorGf7n1C/5psvaW9Q7py3/b7ZEldmtFHAQ4c=";
|
||||
hash = "sha256-SXZ6bo1b5xhVGSlWr51ZCxT0Ov1g/qd8V43P5KEhY+s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.82.2";
|
||||
version = "1.83.0";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o8Wp9zrpIkeigQhbsaMURIiL6coOX8OwUDQmRfO8VoY=";
|
||||
sha256 = "sha256-dh22Pawrcq+f9Mm014KhOjMwfSQ0IatFuY7C6RcvGXs=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.57";
|
||||
version = "0.0.60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lYOW60e4hiJpQ7Bb5ObzBYmwB3IZrgAbCQEh+W05HKc=";
|
||||
sha256 = "sha256-AHKH5S+3iu+BflHnsR8kuWZKaCoyQXMa300KrvEQg5c=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-R/UJF2oi1uU62zobyBwmSFiuYhyCPPat0lNqFbntb+8=";
|
||||
cargoSha256 = "sha256-SO6MXLqUrFWOXW63fR/RBP7XG2cy5jAKST0nLcEkIPA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ let
|
|||
sha256 = upstream-info.sha256_darwin;
|
||||
};
|
||||
|
||||
# aarch64-darwin = {
|
||||
# system = "mac64_m1";
|
||||
# sha256 = upstream-info.sha256_darwin_aarch64;
|
||||
# };
|
||||
aarch64-darwin = {
|
||||
system = "mac_arm64";
|
||||
sha256 = upstream-info.sha256_darwin_aarch64;
|
||||
};
|
||||
};
|
||||
|
||||
spec = allSpecs.${stdenv.hostPlatform.system}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bootstrap";
|
||||
version = "5.2.1";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";
|
||||
sha256 = "sha256-f/HG5qVgKb8zYd+Pv5IkkYqGcMy+BlEileRC5xiv4WM=";
|
||||
sha256 = "sha256-3zAnCKd+btQFd9aSwfESNz7HNapm2bgQOkf5m1zyMf8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -2,56 +2,56 @@
|
|||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-1.1.65.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.69.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "0rzifli06s3k3gyzxpzzisxkvnvcidw4njkibrld2n5pwhjg8qbb",
|
||||
"sha256": "0ckvcwnwv1hh946qavfgaywhspd3cyasf8v7w0qmbx359dsv6yb9",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.65/alpha/linux64",
|
||||
"version": "1.1.65"
|
||||
"url": "https://factorio.com/get-download/1.1.69/alpha/linux64",
|
||||
"version": "1.1.69"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.1.61.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.69.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "1rgb3i6l9v5vv3qw0ngfxryamql2fhhqymv4dr86rxjy863rpx65",
|
||||
"sha256": "0ckvcwnwv1hh946qavfgaywhspd3cyasf8v7w0qmbx359dsv6yb9",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.61/alpha/linux64",
|
||||
"version": "1.1.61"
|
||||
"url": "https://factorio.com/get-download/1.1.69/alpha/linux64",
|
||||
"version": "1.1.69"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
"experimental": {
|
||||
"name": "factorio_demo_x64-1.1.60.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.69.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "1sckcc8dndml2ahka96qlhyjqinbgzh2sns2qfphsph9x26q1vxn",
|
||||
"sha256": "08nakf6f31dra3rzv2l57pnww04i4ppil6c3vvvhjcv8j35b5k29",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.60/demo/linux64",
|
||||
"version": "1.1.60"
|
||||
"url": "https://factorio.com/get-download/1.1.69/demo/linux64",
|
||||
"version": "1.1.69"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_demo_x64-1.1.59.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.69.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "1nddk8184kgq4ni0y9j2l8sa3szvcbsq9l90b35l9jb6sqflgki0",
|
||||
"sha256": "08nakf6f31dra3rzv2l57pnww04i4ppil6c3vvvhjcv8j35b5k29",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.59/demo/linux64",
|
||||
"version": "1.1.59"
|
||||
"url": "https://factorio.com/get-download/1.1.69/demo/linux64",
|
||||
"version": "1.1.69"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-1.1.65.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.69.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "1h5ziip9jbqr03ci2fvf3zqwmy0l7m25br3rm5xv0af9wig9wvh1",
|
||||
"sha256": "1rgspyynz8b8s1kwh67dwnn2mc53jrmmhy7bp7qi0vgbwpb5vhw3",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.65/headless/linux64",
|
||||
"version": "1.1.65"
|
||||
"url": "https://factorio.com/get-download/1.1.69/headless/linux64",
|
||||
"version": "1.1.69"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.1.61.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.69.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0ndnc0f22bqjg1v6ah7i4nzghvk7cn73sgm22lf715di6f6srr38",
|
||||
"sha256": "1rgspyynz8b8s1kwh67dwnn2mc53jrmmhy7bp7qi0vgbwpb5vhw3",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.61/headless/linux64",
|
||||
"version": "1.1.61"
|
||||
"url": "https://factorio.com/get-download/1.1.69/headless/linux64",
|
||||
"version": "1.1.69"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, fetchFromGitHub, buildPythonPackage, aioredis, aiofiles, django_3
|
||||
, fastapi, msgpack, pynacl, typing-extensions
|
||||
, withLdap ? true, ldap }:
|
||||
, withLdap ? true, python-ldap }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "etebase-server";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
msgpack
|
||||
pynacl
|
||||
typing-extensions
|
||||
] ++ lib.optional withLdap ldap;
|
||||
] ++ lib.optional withLdap python-ldap;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ let
|
|||
mailmanEnv = self.python3.withPackages
|
||||
(ps: [ mailman ps.psycopg2 ]
|
||||
++ lib.optional withHyperkitty mailman-hyperkitty
|
||||
++ lib.optionals withLDAP [ ps.ldap ps.django-auth-ldap ]);
|
||||
++ lib.optionals withLDAP [ ps.python-ldap ps.django-auth-ldap ]);
|
||||
webEnv = self.python3.withPackages
|
||||
(ps: [ web ps.psycopg2 ] ++ lib.optionals withLDAP [ ps.ldap ps.django-auth-ldap ]);
|
||||
(ps: [ web ps.psycopg2 ] ++ lib.optionals withLDAP [ ps.python-ldap ps.django-auth-ldap ]);
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-10-03";
|
||||
version = "2022-10-07";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "23f3ded92d07184b3611d08c62d7b474a76c956f";
|
||||
rev = "11daa7dd5f22acadef1135000e92cc899e22c134";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "s4YwOOog+FxN0Dyyo8Jo7XZE9s0Wg/pexGujhqFxykQ=";
|
||||
sha256 = "xtDymRvgm3VHTY3Hh6ikGTY8DQ5jn7Oc44b3HMXz75U=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromSourcehut, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
|
||||
{ lib, stdenv, fetchFromSourcehut, fetchpatch, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grim";
|
||||
|
|
@ -11,6 +11,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-lwJn1Lysv1qLauqmrduUlzdoKUrUM5uBjv+dWSsrM6w=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Dwerror=false"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fixes build on 32bit platforms. Patch is upstream, but unreleased
|
||||
(fetchpatch {
|
||||
name = "grim-fix-32bit-printf.patch";
|
||||
url = "https://git.sr.ht/~emersion/grim/commit/89e02e663fabc534b7e7039514f60a8c5d70070d.patch";
|
||||
sha256 = "1gwb060v3q856p84y0mqqpkqmgb9jwn70y4mzv35y4b9xld8inci";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "iam-policy-json-to-terraform";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flosell";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-1OQvm3M/n/8F3QHNfPlq9YQVyV97NlHX3dXWA/VXEZU=";
|
||||
sha256 = "sha256-O3JlBWT2YVu3mv/BCbs65k7HMF4cRCihd59wZzeoxcI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Fn5GgGW9QhnQOKV34Kzl1Yctv3XLQ51lCuuGx5kvlIA=";
|
||||
vendorSha256 = "sha256-IXWt/yFapDamfZClI6gm5vPA5VW2gV2iEq5c/nJXiiA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document ";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "phrase-cli";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phrase";
|
||||
repo = "phrase-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-nDeX8h2rGKIuN2h29Fmr5V7THVXnw23lyn/FKUQ3veM=";
|
||||
sha256 = "sha256-VE9HsNZJ6bPgqhWUpxf5/dC6giGaK3H9bawSs0S2SJ8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Y/COa58r/1wN+bkUolXov+LOy0nyXgbUYbkmRWXxl0E=";
|
||||
vendorSha256 = "sha256-1TXDGs3ByBX8UQWoiT7hFZpwbwFlDhHHU03zw4+Zml0=";
|
||||
|
||||
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pspg";
|
||||
version = "5.5.7";
|
||||
version = "5.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-kg3jV3TNG80oviy25U2tmShBACfpXDr4zuc/FD2E/Xo=";
|
||||
sha256 = "sha256-D7aQXP95ax1m4Tmm6ipOLen4WnFcyn4HU0BkTEPCcj4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -9,21 +9,34 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.27";
|
||||
version = "1.29";
|
||||
pname = "fakeroot";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.gz";
|
||||
sha256 = "1p5d3jq6l1pzk96agkf05dck7dbgvldx5sg2d4h7d8h230nyni9w";
|
||||
sha256 = "sha256-j7uvt4DJFz46zkoEr7wdkA8zfzIWiDk59cfbNDG+fCA=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
./einval.patch
|
||||
(fetchpatch {
|
||||
name = "also-wrap-stat-library-call.patch";
|
||||
url = "https://sources.debian.org/data/main/f/fakeroot/1.27-1/debian/patches/also-wrap-stat-library-call.patch";
|
||||
url = "https://sources.debian.org/data/main/f/fakeroot/1.29-1/debian/patches/also-wrap-stat-library-call.patch";
|
||||
sha256 = "0p7lq6m31k3rqsnjbi06a8ykdqa3cp4y5ngsjyk3q1269gx59x8b";
|
||||
})
|
||||
|
||||
# patches needed for musl libc, borrowed from alpine packaging.
|
||||
# it is applied regardless of the environment to prevent patchrot
|
||||
(fetchpatch {
|
||||
name = "do-not-redefine-id_t.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/do-not-redefine-id_t.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158";
|
||||
sha256 = "sha256-i9PoWriSrQ7kLZzbvZT3Kq1oXzK9mTyBqq808BGepOw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fakeroot-no64.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158";
|
||||
sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ getopt gnused ]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shipyard";
|
||||
version = "0.4.10";
|
||||
version = "0.4.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shipyard-run";
|
||||
repo = pname;
|
||||
sha256 = "sha256-3l/lvPSoO4CXMfEDhzCqHT0aOkQLPuvoXg8j/kZdUfU=";
|
||||
sha256 = "sha256-WTmkKWYdPfZGMTPsfzT/H6K+ob5zq5akTqf3viNfcW8=";
|
||||
};
|
||||
vendorSha256 = "sha256-ATXM3+mi/R+/jS6Ds89J75nDVnc3d8iOGhjD3KQZkkA=";
|
||||
|
||||
|
|
|
|||
|
|
@ -19701,7 +19701,7 @@ with pkgs;
|
|||
|
||||
libdwarf = callPackage ../development/libraries/libdwarf { };
|
||||
dwarfdump = libdwarf.bin;
|
||||
libdwarf_0_4 = callPackage ../development/libraries/libdwarf/0.4.nix { };
|
||||
libdwarf_20210528 = callPackage ../development/libraries/libdwarf/20210528.nix { };
|
||||
|
||||
libe57format = callPackage ../development/libraries/libe57format { };
|
||||
|
||||
|
|
@ -24676,6 +24676,8 @@ with pkgs;
|
|||
|
||||
libaio = callPackage ../os-specific/linux/libaio { };
|
||||
|
||||
libajantv2 = callPackage ../development/libraries/libajantv2 {};
|
||||
|
||||
libargon2 = callPackage ../development/libraries/libargon2 { };
|
||||
|
||||
libatasmart = callPackage ../os-specific/linux/libatasmart { };
|
||||
|
|
@ -27643,7 +27645,9 @@ with pkgs;
|
|||
|
||||
elementary-planner = callPackage ../applications/office/elementary-planner { };
|
||||
|
||||
elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { };
|
||||
elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector {
|
||||
libdwarf = libdwarf_20210528;
|
||||
};
|
||||
|
||||
elfx86exts = callPackage ../applications/misc/elfx86exts { };
|
||||
|
||||
|
|
@ -36899,7 +36903,7 @@ with pkgs;
|
|||
|
||||
wasm-pack = callPackage ../development/tools/wasm-pack {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
libressl = libressl_3_4;
|
||||
libressl = libressl_3_5;
|
||||
};
|
||||
|
||||
wasynth = callPackage ../development/tools/wasynth { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue