Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
commit
451d699696
4
.github/workflows/basic-eval.yml
vendored
4
.github/workflows/basic-eval.yml
vendored
@ -19,9 +19,7 @@ jobs:
|
||||
# we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v19
|
||||
with:
|
||||
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
|
||||
- uses: cachix/install-nix-action@v20
|
||||
- uses: cachix/cachix-action@v12
|
||||
with:
|
||||
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
|
||||
|
3
.github/workflows/editorconfig.yml
vendored
3
.github/workflows/editorconfig.yml
vendored
@ -28,12 +28,11 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v19
|
||||
- uses: cachix/install-nix-action@v20
|
||||
with:
|
||||
# nixpkgs commit is pinned so that it doesn't break
|
||||
# editorconfig-checker 2.4.0
|
||||
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz
|
||||
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
|
||||
- name: Checking EditorConfig
|
||||
run: |
|
||||
cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size'
|
||||
|
3
.github/workflows/manual-nixos.yml
vendored
3
.github/workflows/manual-nixos.yml
vendored
@ -18,11 +18,10 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v19
|
||||
- uses: cachix/install-nix-action@v20
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
|
||||
- uses: cachix/cachix-action@v12
|
||||
with:
|
||||
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
|
||||
|
3
.github/workflows/manual-nixpkgs.yml
vendored
3
.github/workflows/manual-nixpkgs.yml
vendored
@ -18,11 +18,10 @@ jobs:
|
||||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v19
|
||||
- uses: cachix/install-nix-action@v20
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
|
||||
- uses: cachix/cachix-action@v12
|
||||
with:
|
||||
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
|
||||
|
3
.github/workflows/manual-rendering.yml
vendored
3
.github/workflows/manual-rendering.yml
vendored
@ -18,11 +18,10 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v19
|
||||
- uses: cachix/install-nix-action@v20
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
|
||||
- uses: cachix/cachix-action@v12
|
||||
with:
|
||||
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
|
||||
|
@ -17,10 +17,9 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v19
|
||||
- uses: cachix/install-nix-action@v20
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixpkgs-unstable
|
||||
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
|
||||
- name: setup
|
||||
id: setup
|
||||
run: |
|
||||
|
@ -11677,6 +11677,12 @@
|
||||
fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E";
|
||||
}];
|
||||
};
|
||||
pinkcreeper100 = {
|
||||
email = "benmoreosm@gmail.com";
|
||||
github = "pinkcreeper100";
|
||||
githubId = 35699052;
|
||||
name = "Oliver Samuel Morris";
|
||||
};
|
||||
pinpox = {
|
||||
email = "mail@pablo.tools";
|
||||
github = "pinpox";
|
||||
@ -16088,6 +16094,12 @@
|
||||
github = "wr0belj";
|
||||
githubId = 40501814;
|
||||
};
|
||||
wraithm = {
|
||||
name = "Matthew Wraith";
|
||||
email = "wraithm@gmail.com";
|
||||
github = "wraithm";
|
||||
githubId = 1512913;
|
||||
};
|
||||
wrmilling = {
|
||||
name = "Winston R. Milling";
|
||||
email = "Winston@Milli.ng";
|
||||
|
@ -81,6 +81,7 @@ with lib.maintainers; {
|
||||
# Verify additions to this team with at least one already existing member of the team.
|
||||
members = [
|
||||
cdepillabout
|
||||
wraithm
|
||||
];
|
||||
scope = "Group registration for packages maintained by Bitnomial.";
|
||||
shortName = "Bitnomial employees";
|
||||
|
@ -142,6 +142,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- `vim_configurable` has been renamed to `vim-full` to avoid confusion: `vim-full`'s build-time features are configurable, but both `vim` and `vim-full` are _customizable_ (in the sense of user configuration, like vimrc).
|
||||
|
||||
- Pantheon now defaults to Mutter 42 and GNOME settings daemon 42, all Pantheon packages are now tracking elementary OS 7 updates.
|
||||
|
||||
- The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules)
|
||||
|
||||
- The module `usbmuxd` now has the ability to change the package used by the daemon. In case you're experiencing issues with `usbmuxd` you can try an alternative program like `usbmuxd2`. Available as [services.usbmuxd.package](#opt-services.usbmuxd.package)
|
||||
|
@ -1,13 +1,13 @@
|
||||
{
|
||||
"version": "3.148.0",
|
||||
"version": "3.150.0",
|
||||
"appimage": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.148.0/standard-notes-3.148.0-linux-x86_64.AppImage",
|
||||
"hash": "sha512-Nzvzl3O7/AXj/Sr5CMfmLktx+w9OUHPZmHH8pxx5GYhmjAgYCh2V0w1iPe5G7/nJpx+jSBJXSKq3jR3wYCeXWA=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-x86_64.AppImage",
|
||||
"hash": "sha512-qDjZ/WQdxXCoTA2PVRiSrIukO+N6gB9UdK7Fed5cvd+xFGteSmfPpP7R6wbvTkxkAe4gkH57taeWg+Tt1jW+nA=="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.148.0/standard-notes-3.148.0-linux-arm64.AppImage",
|
||||
"hash": "sha512-Owwc0WRlATTYZYrUtW6iZK8gXktHstDclqHmo5GZ1AAqB7/W9qTuQ2LNMjfL0kAzIQw/JCBfxvDCG9DjEM6eYA=="
|
||||
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-arm64.AppImage",
|
||||
"hash": "sha512-KxK5Z3x611kp2TU5MTxwBfPirlPRbe8zSbF4mjMGDuzmTK3beqHhIGUh4Lud5opMyvUlbVxQf4SxslMxh7uvmw=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -927,8 +927,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitlens";
|
||||
publisher = "eamodio";
|
||||
version = "2023.2.1404";
|
||||
sha256 = "sha256-hszwiETLDKqV4yqchPA1o3WuAgvmY2AwslvvbAhkRCE=";
|
||||
version = "2023.2.2804";
|
||||
sha256 = "sha256-3jQ0CpAGrPLQPpwZx2u3ylfOwy6cBu7WLr0w3h8IM2Y=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
|
@ -1,67 +1,67 @@
|
||||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, pkg-config
|
||||
, python3
|
||||
, ninja
|
||||
, meson
|
||||
, which
|
||||
, perl
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, gtk3
|
||||
, libpcap
|
||||
, openssl
|
||||
, libepoxy
|
||||
, libsamplerate
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, mesa
|
||||
, libdrm
|
||||
, libGLU
|
||||
, copyDesktopItems
|
||||
, gettext
|
||||
, glib
|
||||
, gtk3
|
||||
, libGLU
|
||||
, libdrm
|
||||
, libepoxy
|
||||
, libpcap
|
||||
, libsamplerate
|
||||
, makeDesktopItem
|
||||
, mesa
|
||||
, meson
|
||||
, ninja
|
||||
, openssl
|
||||
, perl
|
||||
, pkg-config
|
||||
, python3
|
||||
, vte
|
||||
, which
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "xemu";
|
||||
version = "0.7.84";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xemu-project";
|
||||
repo = "xemu";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
meson
|
||||
ninja
|
||||
perl
|
||||
pkg-config
|
||||
python3
|
||||
python3.pkgs.pyyaml
|
||||
ninja
|
||||
which
|
||||
meson
|
||||
perl
|
||||
wrapGAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
openssl
|
||||
mesa
|
||||
libepoxy
|
||||
libdrm
|
||||
libpcap
|
||||
libsamplerate
|
||||
SDL2
|
||||
libGLU
|
||||
SDL2_image
|
||||
gettext
|
||||
glib
|
||||
gtk3
|
||||
libGLU
|
||||
libdrm
|
||||
libepoxy
|
||||
libpcap
|
||||
libsamplerate
|
||||
mesa
|
||||
openssl
|
||||
vte
|
||||
];
|
||||
|
||||
@ -80,23 +80,26 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildFlags = [ "qemu-system-i386" ];
|
||||
|
||||
desktopItems = [(makeDesktopItem {
|
||||
name = "xemu";
|
||||
desktopName = "xemu";
|
||||
exec = "xemu";
|
||||
icon = "xemu";
|
||||
})] ;
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "xemu";
|
||||
desktopName = "xemu";
|
||||
exec = "xemu";
|
||||
icon = "xemu";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = let
|
||||
# When the data below can't be obtained through git, the build process tries
|
||||
# to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar)
|
||||
branch = "master";
|
||||
commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351";
|
||||
inherit (self) version;
|
||||
in ''
|
||||
patchShebangs .
|
||||
configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls")
|
||||
substituteInPlace ./scripts/xemu-version.sh \
|
||||
--replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'"
|
||||
# If the versions can't be obtained through git, the build process tries
|
||||
# to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar)
|
||||
echo '${commit}' > XEMU_COMMIT
|
||||
echo '${branch}' > XEMU_BRANCH
|
||||
echo '${version}' > XEMU_VERSION
|
||||
@ -110,22 +113,29 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share}
|
||||
cp qemu-system-i386 $out/bin/xemu
|
||||
|
||||
for RES in 16x16 24x24 32x32 48x48 128x128 256x256 512x512
|
||||
do
|
||||
mkdir -p $out/share/icons/hicolor/$RES/apps/
|
||||
cp ../ui/icons/xemu_$RES.png $out/share/icons/hicolor/$RES/apps/xemu.png
|
||||
done
|
||||
install -Dm755 -T qemu-system-i386 $out/bin/xemu
|
||||
'' +
|
||||
# Generate code to install the icons
|
||||
(lib.concatMapStringsSep ";\n"
|
||||
(res:
|
||||
"install -Dm644 -T ../ui/icons/xemu_${res}.png $out/share/icons/hicolor/${res}/apps/xemu.png")
|
||||
[ "16x16" "24x24" "32x32" "48x48" "128x128" "256x256" "512x512" ]) +
|
||||
''
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://xemu.app/";
|
||||
description = "Original Xbox emulator";
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2Plus;
|
||||
longDescription = ''
|
||||
A free and open-source application that emulates the original Microsoft
|
||||
Xbox game console, enabling people to play their original Xbox games on
|
||||
Windows, macOS, and Linux systems.
|
||||
'';
|
||||
changelog = "https://github.com/xemu-project/xemu/releases/tag/v${self.version}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
41
pkgs/applications/file-managers/lf/ctpv.nix
Normal file
41
pkgs/applications/file-managers/lf/ctpv.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, file
|
||||
, openssl
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, waylandSupport ? stdenv.isLinux
|
||||
, x11Support ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ctpv";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NikitaIvanovV";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0OuskRCBVm8vMd2zH5u5EPABmCOlEv5N4ZZMdc7bAwM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
file # libmagic
|
||||
openssl
|
||||
];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
ffmpegthumbnailer ffmpeg
|
||||
] ++ lib.optional waylandSupport [ chafa ]
|
||||
++ lib.optional x11Support [ ueberzug ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image previews for lf (list files) file manager";
|
||||
homepage = "https://github.com/NikitaIvanovV/ctpv";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.wesleyjrz ];
|
||||
};
|
||||
}
|
@ -55,13 +55,13 @@ let
|
||||
python = python2.withPackages (pp: [ pp.pygtk ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gimp";
|
||||
version = "2.10.32";
|
||||
version = "2.10.34";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "PxXHBVSvXcwbRubcaPPY8KbMn+VrbXisCMD9hZq4miU=";
|
||||
sha256 = "hABGQtNRs5ikKTzX/TWSBEqUTwW7UoUO5gaPJHxleqM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch2
|
||||
, at-spi2-core
|
||||
, babl
|
||||
, dbus
|
||||
@ -45,6 +46,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./installed-tests-path.patch
|
||||
|
||||
# Support babel 0.1.100
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/64c6f733a44bac5b7f08445a686c000681f93f5f.patch";
|
||||
hash = "sha256-iB5qCcDEH8pEX42ypEGJ9QMJWE8VXirv5JfdC1jP218=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/9db32c3508a8c5d357a053d5f8278c34b4df18f3.patch";
|
||||
hash = "sha256-iz6gSu5rUBZ3Ki5GSRVuLcwX0LRQvJT17XmXQ7WJSmI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
32
pkgs/applications/misc/findex/default.nix
Normal file
32
pkgs/applications/misc/findex/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform, pkg-config, keybinder3, gtk3 }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "findex";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdgaziur";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KaT6lEbrUelv/f9bIBW4bSCuExFu4b7XI7hcrO4mD0M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7A+EF88DJrgsKPOJt2xaBnWSMkyhpFImyZmnHcyp+Dw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
keybinder3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Highly customizable application finder written in Rust and uses Gtk3";
|
||||
homepage = "https://github.com/mdgaziur/findex";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.pinkcreeper100 ];
|
||||
};
|
||||
}
|
@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.8.17";
|
||||
version = "0.8.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
hash = "sha256-z7v59wXvSIDC7f4IMT8bblPgn+3+J54XqIPzXqWDses=";
|
||||
hash = "sha256-tD7uNSgcGMPyiA/HfOOZs3NRbWTrds0AdEXTaHYfUjk=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
@ -8,10 +8,11 @@
|
||||
# - year identifies the year portion of the version, defaults to most recent year.
|
||||
# - pname is either "pdfstudio${year}" or "pdfstudioviewer".
|
||||
|
||||
{ program ? "pdfstudio"
|
||||
{ lib
|
||||
, stdenv
|
||||
, program ? "pdfstudio"
|
||||
, year ? "2022"
|
||||
, fetchurl
|
||||
, libgccjit
|
||||
, callPackage
|
||||
, jdk11
|
||||
, jdk17
|
||||
@ -49,7 +50,7 @@ in
|
||||
sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
libgccjit #for libstdc++.so.6 and libgomp.so.1
|
||||
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
|
||||
];
|
||||
jdk = jdk11;
|
||||
};
|
||||
@ -62,7 +63,7 @@ in
|
||||
sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
libgccjit #for libstdc++.so.6 and libgomp.so.1
|
||||
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
|
||||
];
|
||||
jdk = jdk17;
|
||||
};
|
||||
|
@ -13,7 +13,9 @@
|
||||
, gtk-layer-shell
|
||||
, gtk3
|
||||
, json-glib
|
||||
, libgee
|
||||
, libhandy
|
||||
, libpulseaudio
|
||||
, librsvg
|
||||
, meson
|
||||
, ninja
|
||||
@ -26,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "SwayNotificationCenter";
|
||||
version = "0.7.3";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErikReider";
|
||||
repo = "SwayNotificationCenter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RU6zzhRu7YK+zcazxj2wZ5vSwLwlilBaG9l+rEstefc=";
|
||||
hash = "sha256-E9CjNx/xzkkOZ39XbfIb1nJFheZVFpj/lwmITKtpb7A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -58,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
gtk-layer-shell
|
||||
gtk3
|
||||
json-glib
|
||||
libgee
|
||||
libhandy
|
||||
libpulseaudio
|
||||
librsvg
|
||||
# systemd # ends with broken permission
|
||||
];
|
||||
@ -76,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
meta = with lib; {
|
||||
description = "Simple notification daemon with a GUI built for Sway";
|
||||
homepage = "https://github.com/ErikReider/SwayNotificationCenter";
|
||||
changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${version}";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ berbiche pedrohlc ];
|
||||
|
@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
|
||||
binaryBytecode
|
||||
binaryNativeCode
|
||||
];
|
||||
mainProgram = "XMind";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ michalrus ];
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-O/InVEWSqdcfqchVMYetZ3RCOxgEjQ9XvnKpOIjV2zE=";
|
||||
hash = "sha256-bkjtJidG+UHma15axlLcXtqtWTqesOdHHmH4db5hoAY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM=";
|
||||
vendorHash = "sha256-VPeaT4vPhBa6V+Ir+vNRIWgyVBzEgTDSnDtGrxxdZ0c=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
@ -39,6 +39,7 @@ buildGoModule rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/kubernetes-sigs/cluster-api/releases/tag/${src.rev}";
|
||||
description = "Kubernetes cluster API tool";
|
||||
homepage = "https://cluster-api.sigs.k8s.io/";
|
||||
license = licenses.asl20;
|
||||
|
@ -328,13 +328,13 @@
|
||||
"vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk="
|
||||
},
|
||||
"dnsimple": {
|
||||
"hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=",
|
||||
"hash": "sha256-AbNOqxZOrXUxkuScOgrZ3OyEHWpZ8+tsqqXW6lofaMc=",
|
||||
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
|
||||
"owner": "dnsimple",
|
||||
"repo": "terraform-provider-dnsimple",
|
||||
"rev": "v0.15.0",
|
||||
"rev": "v0.16.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk="
|
||||
"vendorHash": "sha256-rGcCbESdzKGy3I1FcDA3dUbblyG/uk74rizj7INRGPw="
|
||||
},
|
||||
"docker": {
|
||||
"hash": "sha256-M2K4N39vtVDA/vMp/s2KYiS/uoE+STf2e6yh6q0CS28=",
|
||||
@ -648,13 +648,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"launchdarkly": {
|
||||
"hash": "sha256-3zQN7cc4p5ivjPxiIqdv6e/m+2KnhwiLhwSa6RAQ1sk=",
|
||||
"hash": "sha256-7m5+Fu9UjmGWL4PgYCpI9vMStfmU4oQ1cx+7wAirEbQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
|
||||
"owner": "launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.10.0",
|
||||
"rev": "v2.11.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-x5C+WimWRBJQiOwsy+Woop1U6a7nSnO0rDoy4UU6j+4="
|
||||
"vendorHash": "sha256-j8Lit22aWeLvYrq5ao0nIdcVZDSxaAKaW+bxQ/JCSgE="
|
||||
},
|
||||
"libvirt": {
|
||||
"hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=",
|
||||
@ -964,13 +964,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"scaleway": {
|
||||
"hash": "sha256-sUYRsh1t4y9SNdt0QzhP1BM3CglxYy/ciZAEGCLj7c8=",
|
||||
"hash": "sha256-rkDNV58mN/7pgQC1WBnrggHtq7q3O7r3v+huB4oPVLM=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.11.1",
|
||||
"rev": "v2.12.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-e/Pqu58ngWnoMKjDKEUm49e0D0PfYEqxm/BxfN8UX3c="
|
||||
"vendorHash": "sha256-zice1rGuZH9kmQJQ8RdIONJXVXu1BIuRUKjTGLPK7Ns="
|
||||
},
|
||||
"secret": {
|
||||
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
|
||||
@ -1027,11 +1027,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"snowflake": {
|
||||
"hash": "sha256-gXi/S+DMPU0RROYtrLkV7eIgpQMDaFwz5uCeeoe51L4=",
|
||||
"hash": "sha256-nNv2lo7I5+eFmw+BvRB/DmgNE6iuR3Aq0kxyOeQdiqU=",
|
||||
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
|
||||
"owner": "Snowflake-Labs",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.56.5",
|
||||
"rev": "v0.57.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-yFk5ap28JluaKkUPfePBuRUEg6/Ma5MrRkmWK6iAGNg="
|
||||
},
|
||||
|
@ -172,7 +172,8 @@ let
|
||||
makeWrapper $out/lib/slack/slack $out/bin/slack \
|
||||
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
|
||||
--suffix PATH : ${lib.makeBinPath [xdg-utils]} \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags "\''${WAYLAND_DISPLAY:+--enable-features=WebRTCPipeWireCapturer}"
|
||||
|
||||
# Fix the desktop link
|
||||
substituteInPlace $out/share/applications/slack.desktop \
|
||||
|
@ -55,11 +55,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webex";
|
||||
version = "42.12.0.24485";
|
||||
version = "43.2.0.25211";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221206141837/Webex_ubuntu.7z";
|
||||
sha256 = "4c09c13b760abbdcc8bc1a74d137f8bc23386da4425cbefd8ea75bd0a877fdbf";
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230214022524/Webex_ubuntu.7z";
|
||||
sha256 = "c58a0da26c8f64302cc612c60980dbd68c074d6d8a567b3d870d7d6d06b420ad";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -27,11 +27,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.61.0";
|
||||
version = "0.61.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-lpKnhAF/VsbLOHkIy1TFqjT0yKlFMNsN+yMUmpBAZKY=";
|
||||
hash = "sha256-OtFHTZQ+K3CQPEcuirvp8MmW9IC5lEpg42A6FSZVTTA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -7,6 +7,20 @@
|
||||
*/
|
||||
|
||||
let versions = [
|
||||
{
|
||||
version = "13.2.1";
|
||||
lang = "en";
|
||||
language = "English";
|
||||
sha256 = "sha256-GA2k+jvE4mTJsIbMHce5c516h/glHLnXdthEfnNmk0w=";
|
||||
installer = "Mathematica_13.2.1_LINUX.sh";
|
||||
}
|
||||
{
|
||||
version = "13.2.1";
|
||||
lang = "en";
|
||||
language = "English";
|
||||
sha256 = "sha256-ZvgG2W/gjQIo4hyXHsGta5FyTslrz/ltOe/ZK/U2Sx8=";
|
||||
installer = "Mathematica_13.2.1_BNDL_LINUX.sh";
|
||||
}
|
||||
{
|
||||
version = "13.2.0";
|
||||
lang = "en";
|
||||
|
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, lz4
|
||||
, bzip2
|
||||
@ -9,7 +10,6 @@
|
||||
, m4
|
||||
, hdf5
|
||||
, gsl
|
||||
, slurm
|
||||
, unzip
|
||||
, makeWrapper
|
||||
, meson
|
||||
@ -161,10 +161,10 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crystfel";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
src = fetchurl {
|
||||
url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0i9d5ggalic7alj97dxjdys7010kxhm2cb4lwakvigl023j8ms79";
|
||||
sha256 = "sha256-nCO9ndDKS54bVN9IhFBiCVNzqk7BsCljXFrOmlx+sP4=";
|
||||
};
|
||||
nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ]
|
||||
++ lib.optionals withGui [ wrapGAppsHook ];
|
||||
@ -186,12 +186,16 @@ stdenv.mkDerivation rec {
|
||||
argp-standalone
|
||||
memorymappingHook
|
||||
]
|
||||
# slurm is not available for Darwin; when it is, remove the condition
|
||||
++ lib.optionals (!stdenv.isDarwin) [ slurm ]
|
||||
# hdf5-external-filter-plugins doesn't link on Darwin
|
||||
++ lib.optionals (withBitshuffle && !stdenv.isDarwin) [ hdf5-external-filter-plugins ];
|
||||
|
||||
patches = [ ./link-to-argp-standalone-if-needed.patch ];
|
||||
patches = [
|
||||
./link-to-argp-standalone-if-needed.patch
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.desy.de/thomas.white/crystfel/-/commit/3c54d59e1c13aaae716845fed2585770c3ca9d14.diff";
|
||||
hash = "sha256-oaJNBQQn0c+z4p1pnW4osRJA2KdKiz4hWu7uzoKY7wc=";
|
||||
})
|
||||
];
|
||||
|
||||
# CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but
|
||||
# we'd have to do that for every CrystFEL executable (indexamajig, crystfel, partialator). Better to just
|
||||
|
@ -1,9 +1,9 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index efc9002b..070f37e4 100644
|
||||
index 59bbcfb7..dd75d4e2 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -34,6 +34,12 @@ if slurmdep.found()
|
||||
conf_data.set10('HAVE_SLURM', 1)
|
||||
@@ -80,6 +80,12 @@ if cc.has_function('clock_gettime', prefix: '#include <time.h>')
|
||||
conf_data.set10('HAVE_CLOCK_GETTIME', true)
|
||||
endif
|
||||
|
||||
+if build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}')
|
||||
@ -12,15 +12,15 @@ index efc9002b..070f37e4 100644
|
||||
+ argpdep = dependency('', required : false)
|
||||
+endif
|
||||
+
|
||||
# Find HDF5 using inbuilt Meson methods. Requires Meson >= 0.50.0
|
||||
hdf5dep = dependency('hdf5', language: 'c', required: true)
|
||||
# ************************ libcrystfel (subdir) ************************
|
||||
|
||||
@@ -180,7 +186,7 @@ if zmqdep.found()
|
||||
endif
|
||||
subdir('libcrystfel')
|
||||
@@ -180,7 +186,7 @@ endif
|
||||
|
||||
executable('indexamajig', indexamajig_sources,
|
||||
- dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep],
|
||||
+ dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep, argpdep],
|
||||
install: true,
|
||||
install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
|
||||
indexamajig = executable('indexamajig', indexamajig_sources,
|
||||
dependencies: [mdep, libcrystfeldep, gsldep,
|
||||
- pthreaddep, zmqdep, asapodep],
|
||||
+ pthreaddep, zmqdep, asapodep, argpdep],
|
||||
install: true,
|
||||
install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lefthook";
|
||||
version = "1.2.9";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
sha256 = "sha256-MYeQMgac1bqqN2QPz2KO55w7++3MnsRFm/ziSm6e2Rw=";
|
||||
sha256 = "sha256-9XmLQPkc8we5wRZe5+bhL1b9lxWX6JAQeF4DmRXBgew=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg=";
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.1.6";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vmZSt0k6h4Zpbf+/Nq19QIkG3Fzjj3K031XnivFDA2s=";
|
||||
hash = "sha256-W6nqhSEoP2mDp7fCoXqwYAafjfESxymYXAdC3BnJJno=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
|
||||
passthru.tests = { inherit (nixosTests) cri-o podman; };
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/containers/conmon/releases/tag/${src.rev}";
|
||||
homepage = "https://github.com/containers/conmon";
|
||||
description = "An OCI container runtime monitor";
|
||||
license = licenses.asl20;
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.6.18";
|
||||
version = "1.6.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ApQKdd+S02YFNDVrrSKVHZmR1ZQwcU1KoQRfhOP9VHQ=";
|
||||
hash = "sha256-Us7NEv2BngV1Q/Bkuv4XOjVjpqThL0LnIH+yciPG3L8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@ -45,6 +45,7 @@ buildGoModule rec {
|
||||
passthru.tests = { inherit (nixosTests) docker; };
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/containerd/containerd/releases/tag/${src.rev}";
|
||||
homepage = "https://containerd.io/";
|
||||
description = "A daemon to control runC";
|
||||
license = licenses.asl20;
|
||||
|
@ -9,8 +9,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
iconnamingutils
|
||||
gtk2
|
||||
@ -23,6 +26,8 @@ stdenv.mkDerivation rec {
|
||||
rm -r "$out/share/locale"
|
||||
'';
|
||||
|
||||
allowedReferences = [ ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of icons for the GNOME 2 desktop";
|
||||
homepage = "https://download.gnome.org/sources/gnome-icon-theme/";
|
||||
|
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0"
|
||||
"-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
|
||||
];
|
||||
|
129
pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix
Normal file
129
pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix
Normal file
@ -0,0 +1,129 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, runtimeShell
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, qtmultimedia
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, qtmpris
|
||||
, qtdbusextended
|
||||
, gsettings-qt
|
||||
, elfutils
|
||||
, ffmpeg
|
||||
, ffmpegthumbnailer
|
||||
, mpv
|
||||
, xorg
|
||||
, pcre
|
||||
, libdvdread
|
||||
, libdvdnav
|
||||
, libunwind
|
||||
, libva
|
||||
, zstd
|
||||
, glib
|
||||
, gst_all_1
|
||||
, gtest
|
||||
, libpulseaudio
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-movie-reborn";
|
||||
version = "5.10.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0m8wYRQGsdN4zpnHUJKCfF05SdvTauRSp6gCu2F9ZAI";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "chore: dont use </usr/include/linux/cdrom.h>";
|
||||
url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/2afc63541589adab8b0c8c48e290f03535ec2996.patch";
|
||||
sha256 = "sha256-Q9dv5L5sUGeuvNxF8ypQlZuZVuU4NIR/8d8EyP/Q5wk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "feat: rewrite libPath to read LD_LIBRARY_PATH";
|
||||
url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/432bf452ed244c256e99ecaf80bb6a0eef9b4a74.patch";
|
||||
sha256 = "sha256-5hRQ8D9twBKgouVpIBa1pdAGk0lI/wEdQaHBBHFCZBA";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/widgets/toolbox_proxy.cpp \
|
||||
--replace "/bin/bash" "${runtimeShell}"
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
qtx11extras
|
||||
qtmultimedia
|
||||
qtdbusextended
|
||||
qtmpris
|
||||
gsettings-qt
|
||||
elfutils.dev
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
xorg.libXtst
|
||||
xorg.libXdmcp
|
||||
xorg.xcbproto
|
||||
pcre.dev
|
||||
libdvdread
|
||||
libdvdnav
|
||||
libunwind
|
||||
libva
|
||||
zstd.dev
|
||||
mpv
|
||||
gtest
|
||||
libpulseaudio
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]);
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0"
|
||||
"-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVERSION=${version}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Full-featured video player supporting playing local and streaming media in multiple video formats";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-movie-reborn";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
@ -42,6 +42,7 @@ let
|
||||
deepin-draw = callPackage ./apps/deepin-draw { };
|
||||
deepin-editor = callPackage ./apps/deepin-editor { };
|
||||
deepin-image-viewer = callPackage ./apps/deepin-image-viewer { };
|
||||
deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { };
|
||||
deepin-music = callPackage ./apps/deepin-music { };
|
||||
deepin-picker = callPackage ./apps/deepin-picker { };
|
||||
deepin-terminal = callPackage ./apps/deepin-terminal { };
|
||||
@ -57,6 +58,7 @@ let
|
||||
deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { };
|
||||
|
||||
#### TOOLS
|
||||
dde-device-formatter = callPackage ./tools/dde-device-formatter { };
|
||||
deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { };
|
||||
|
||||
#### ARTWORK
|
||||
|
69
pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
Normal file
69
pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
Normal file
@ -0,0 +1,69 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, dtkwidget
|
||||
, deepin-gettext-tools
|
||||
, qt5integration
|
||||
, qmake
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, udisks2-qt5
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-device-formatter";
|
||||
version = "unstable-2022-09-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = "9b8489cb2bb7c85bd62557d16a5eabc94100512e";
|
||||
sha256 = "sha256-Mi48dSDCoKhr8CGt9z64/9d7+r9QSrPPICv+R5VDuaU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "chore: don't use hardcode path";
|
||||
url = "https://github.com/linuxdeepin/dde-device-formatter/commit/b836a498b8e783e0dff3820302957f15ee8416eb.patch";
|
||||
sha256 = "sha256-i/VqJ6EmCyhE6weHKUB66bW6b51gLyssIAzb5li4aJM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dde-device-formatter.pro --replace "/usr" "$out"
|
||||
patchShebangs *.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
deepin-gettext-tools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
udisks2-qt5
|
||||
qtx11extras
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple graphical interface for creating file system in a block device";
|
||||
homepage = "https://github.com/linuxdeepin/dde-device-formatter";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
@ -39,16 +39,15 @@
|
||||
, nss
|
||||
, gcr
|
||||
, gnome-session-ctl
|
||||
, pantheon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "3.38.2";
|
||||
version = "42.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "136p3prdqvc0lvrcqs4h7crpnfqnimqklpzjivq5w4g1rhbdbhrj";
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -63,37 +62,6 @@ stdenv.mkDerivation rec {
|
||||
inherit tzdata;
|
||||
})
|
||||
|
||||
# Adjust to libgweather changes.
|
||||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch";
|
||||
sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg=";
|
||||
})
|
||||
|
||||
# Fix build with new meson
|
||||
# plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments.
|
||||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch";
|
||||
sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ=";
|
||||
})
|
||||
# meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
|
||||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff";
|
||||
sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY=";
|
||||
})
|
||||
|
||||
# Port to gweather4
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/66cae69ad82cfc59435016fba737ce046ffb7e66.patch";
|
||||
sha256 = "zf8/rkKdQQFNV/qx/jo4kx1KoLl7SUSu4/T1OBGrZ4c=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch";
|
||||
sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM=";
|
||||
})
|
||||
|
||||
# Use geocode-glib_2 dependency
|
||||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300
|
||||
(fetchpatch {
|
@ -1,132 +0,0 @@
|
||||
From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 13:26:05 +0200
|
||||
Subject: [PATCH] drop inheritable
|
||||
|
||||
Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01
|
||||
|
||||
We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell.
|
||||
|
||||
---
|
||||
config.h.meson | 3 +++
|
||||
meson.build | 5 +++++
|
||||
meson_options.txt | 6 ++++++
|
||||
src/core/main.c | 11 +++++++++++
|
||||
src/meson.build | 1 +
|
||||
5 files changed, 26 insertions(+)
|
||||
|
||||
diff --git a/config.h.meson b/config.h.meson
|
||||
index 0bab71848..202fb7ed1 100644
|
||||
--- a/config.h.meson
|
||||
+++ b/config.h.meson
|
||||
@@ -58,6 +58,9 @@
|
||||
/* Xwayland applications allowed to issue keyboard grabs */
|
||||
#mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES
|
||||
|
||||
+/* Defined if libcap-ng is available */
|
||||
+#mesondefine HAVE_LIBCAPNG
|
||||
+
|
||||
/* XKB base prefix */
|
||||
#mesondefine XKB_BASE
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 3322bd3b1..01c8020fa 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7'
|
||||
libcanberra_req = '>= 0.26'
|
||||
libwacom_req = '>= 0.13'
|
||||
atk_req = '>= 2.5.3'
|
||||
+libcapng_req = '>= 0.7.9'
|
||||
|
||||
# optional version requirements
|
||||
udev_req = '>= 228'
|
||||
@@ -131,6 +131,7 @@ ice_dep = dependency('ice')
|
||||
atk_dep = dependency('atk', version: atk_req)
|
||||
libcanberra_dep = dependency('libcanberra', version: libcanberra_req)
|
||||
dbus_dep = dependency('dbus-1')
|
||||
+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng'))
|
||||
|
||||
# For now always require X11 support
|
||||
have_x11 = true
|
||||
@@ -256,6 +258,7 @@ have_core_tests = false
|
||||
have_cogl_tests = false
|
||||
have_clutter_tests = false
|
||||
have_installed_tests = false
|
||||
+have_libcapng = libcapng_dep.found()
|
||||
|
||||
if have_tests
|
||||
have_core_tests = get_option('core_tests')
|
||||
@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom)
|
||||
cdata.set('HAVE_SM', have_sm)
|
||||
cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification)
|
||||
cdata.set('HAVE_INTROSPECTION', have_introspection)
|
||||
+cdata.set('HAVE_LIBCAPNG', have_libcapng)
|
||||
cdata.set('HAVE_PROFILER', have_profiler)
|
||||
|
||||
xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')
|
||||
@@ -465,6 +465,7 @@ output = [
|
||||
' Introspection............ ' + have_introspection.to_string(),
|
||||
' Profiler................. ' + have_profiler.to_string(),
|
||||
' Xwayland initfd.......... ' + have_xwayland_initfd.to_string(),
|
||||
+ ' libcap-ng................ ' + have_libcapng.to_string(),
|
||||
'',
|
||||
' Tests:',
|
||||
'',
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 73aa7adde..8bfaacd9a 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules',
|
||||
value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr',
|
||||
description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland'
|
||||
)
|
||||
+
|
||||
+option('libcapng',
|
||||
+ type: 'feature',
|
||||
+ value: 'auto',
|
||||
+ description: 'Enable libcap-ng support'
|
||||
+)
|
||||
diff --git a/src/core/main.c b/src/core/main.c
|
||||
index 7f4f666d2..b27968f13 100644
|
||||
--- a/src/core/main.c
|
||||
+++ b/src/core/main.c
|
||||
@@ -66,6 +66,10 @@
|
||||
#include <girepository.h>
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_LIBCAPNG
|
||||
+#include <cap-ng.h>
|
||||
+#endif
|
||||
+
|
||||
#if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)
|
||||
#include <systemd/sd-login.h>
|
||||
#endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */
|
||||
@@ -670,5 +674,12 @@ int
|
||||
meta_run (void)
|
||||
{
|
||||
meta_start ();
|
||||
+
|
||||
+#ifdef HAVE_LIBCAPNG
|
||||
+ capng_clear(CAPNG_SELECT_BOTH);
|
||||
+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE);
|
||||
+ capng_apply(CAPNG_SELECT_BOTH);
|
||||
+#endif
|
||||
+
|
||||
meta_run_main_loop ();
|
||||
meta_finalize ();
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 90d80734f..a9fffa2c2 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -18,6 +18,7 @@ mutter_pkg_deps = [
|
||||
glib_dep,
|
||||
gsettings_desktop_schemas_dep,
|
||||
gtk3_dep,
|
||||
+ libcapng_dep,
|
||||
pango_dep,
|
||||
]
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
@ -1,27 +0,0 @@
|
||||
From a58ace29db48f98ad59f4f309d49b458c68a6eec Mon Sep 17 00:00:00 2001
|
||||
From: Bobby Rong <rjl931189261@126.com>
|
||||
Date: Wed, 28 Jul 2021 22:08:11 +0800
|
||||
Subject: [PATCH] Fix glitches in gala
|
||||
|
||||
Co-Authored-By: WORLDofPEACE <worldofpeace@protonmail.ch>
|
||||
|
||||
This fixes issues for users of mutter like in gala[0].
|
||||
|
||||
Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536
|
||||
[0]: https://github.com/elementary/gala/issues/605
|
||||
---
|
||||
clutter/clutter/clutter-actor.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
|
||||
index febfb31918..71906000c0 100644
|
||||
--- a/clutter/clutter/clutter-actor.c
|
||||
+++ b/clutter/clutter/clutter-actor.c
|
||||
@@ -15926,7 +15926,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
|
||||
if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
|
||||
{
|
||||
priv->paint_volume_valid = TRUE;
|
||||
- priv->needs_paint_volume_update = FALSE;
|
||||
return &priv->paint_volume;
|
||||
}
|
||||
else
|
@ -15,6 +15,7 @@
|
||||
, zenity
|
||||
, libcanberra
|
||||
, ninja
|
||||
, xvfb-run
|
||||
, xkeyboard_config
|
||||
, libxkbfile
|
||||
, libXdamage
|
||||
@ -47,32 +48,16 @@
|
||||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
pname = "mutter";
|
||||
version = "3.38.6";
|
||||
version = "42.7";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0mxln9azl4krmknq2vmhd15lgpa2q7gh7whiv14nsqbr9iaxmg2x";
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "OwmmsHDRMHwD2EMorIS0+m1jmfk4MEo4wpTxso3yipM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
|
||||
# from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
|
||||
./drop-inheritable.patch
|
||||
|
||||
# Fixes issues for users of mutter like in gala.
|
||||
# https://github.com/elementary/gala/issues/605
|
||||
# https://gitlab.gnome.org/GNOME/mutter/issues/536
|
||||
./fix-glitches-in-gala.patch
|
||||
|
||||
# Stop using source_root()/build_root().
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/6288763671692edbc953a2b80225e9a7c7fc87e7.patch";
|
||||
sha256 = "immnfZiY+Cgu7xTbo5y8xs0olTa6UGsKgDJ1Xhkhns0=";
|
||||
})
|
||||
|
||||
# Fix build with separate sysprof.
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572
|
||||
(fetchpatch {
|
||||
@ -111,6 +96,7 @@ let self = stdenv.mkDerivation rec {
|
||||
mesa # needed for gbm
|
||||
meson
|
||||
ninja
|
||||
xvfb-run
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
@ -156,7 +142,7 @@ let self = stdenv.mkDerivation rec {
|
||||
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
|
||||
|
||||
passthru = {
|
||||
libdir = "${self}/lib/mutter-7";
|
||||
libdir = "${self}/lib/mutter-10";
|
||||
|
||||
tests = {
|
||||
libdirExists = runCommand "mutter-libdir-exists" {} ''
|
@ -75,8 +75,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { };
|
||||
|
||||
# Using 3.38 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon338 = callPackage ./core/gnome-settings-daemon/3.38 { };
|
||||
# Using 42 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon42 = callPackage ./core/gnome-settings-daemon/42 { };
|
||||
|
||||
gnome-software = callPackage ./core/gnome-software { };
|
||||
|
||||
@ -96,8 +96,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
mutter = callPackage ./core/mutter { };
|
||||
|
||||
# Needed for elementary's gala and greeter until support for higher versions is provided
|
||||
mutter338 = callPackage ./core/mutter/3.38 { };
|
||||
# Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
|
||||
mutter42 = callPackage ./core/mutter/42 { };
|
||||
|
||||
nautilus = callPackage ./core/nautilus { };
|
||||
|
||||
@ -271,4 +271,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
gnome-documents = throw "The ‘gnome.gnome-documents’ package was removed as it is broken and abandoned."; # added 2022-10-26
|
||||
gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26
|
||||
|
||||
mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22
|
||||
gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, meson
|
||||
@ -39,19 +38,6 @@ stdenv.mkDerivation rec {
|
||||
src = ./fix-paths.patch;
|
||||
inherit ibus onboard libgnomekbd;
|
||||
})
|
||||
|
||||
# Revert schema key change that requires new GSD and Gala.
|
||||
# TODO(@bobby285271): drop these in #196511.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/switchboard-plug-keyboard/commit/555e9650bb8f74a7664e2393c589fe6664954a88.patch";
|
||||
sha256 = "sha256-koSTYLPRh9rOyxmJPtrj/fPuu2jb1SKZu6BwKsMvAmc=";
|
||||
revert = true;
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6ebd57673b45cc64e1caf895134efc0d5f6cf2be.patch";
|
||||
sha256 = "sha256-Ezsh0t1/909MHCB2EJEnl4kcnXngshNYgrmqUQsfsaY=";
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-mouse-touchpad";
|
||||
version = "6.1.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5";
|
||||
sha256 = "sha256-iXkNdUMHa0IF2FLn34/6G4w3m53GRZun8yzc8dxAg20=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -40,10 +40,10 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
maintainers = lib.teams.pantheon.members;
|
||||
|
||||
mutter = pkgs.gnome.mutter338;
|
||||
mutter = pkgs.gnome.mutter42;
|
||||
|
||||
# Using 3.38 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon338;
|
||||
# Using 42 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon42;
|
||||
|
||||
elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
|
||||
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-default-settings";
|
||||
version = "6.0.2";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "default-settings";
|
||||
rev = version;
|
||||
sha256 = "sha256-qaPj/Qp7RYzHgElFdM8bHV42oiPUbCMTC9Q+MUj4Q6Y=";
|
||||
sha256 = "sha256-RPnERK93GCfWyw1sIW5BitCIo11/t1koV4r1+NF5NdI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,58 +1,44 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
, libxml2
|
||||
, desktop-file-utils
|
||||
, gtk3
|
||||
, gtk4
|
||||
, glib
|
||||
, granite
|
||||
, granite7
|
||||
, libgee
|
||||
, libhandy
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-shortcut-overlay";
|
||||
version = "1.2.1";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "shortcut-overlay";
|
||||
rev = version;
|
||||
sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM=";
|
||||
sha256 = "sha256-YVeCO7mZmf+FEY4d8tvC76lW/HkOwQ6kw7nvmzAFEtw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61
|
||||
# https://github.com/elementary/shortcut-overlay/pull/113
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/shortcut-overlay/commit/130f78eb4b7770586ea98ba0a5fdbbf5bb116f3f.patch";
|
||||
sha256 = "sha256-XXWq9CEv3Z2B8ogcFQAJZCfy19XxNHs3c8NToE2m/aA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
granite7
|
||||
gtk4
|
||||
libgee
|
||||
libhandy
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
@ -26,83 +25,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gala";
|
||||
version = "6.3.1";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-7RZt6gA3wyp1cxIWBYFK+fYFSZDbjHcwYa2snOmDw1Y=";
|
||||
sha256 = "sha256-YHmmF9tYDgMieLCs9My7NU16Ysq4n2sxWT/7MpaerkI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# We look for plugins in `/run/current-system/sw/lib/` because
|
||||
# there are multiple plugin providers (e.g. gala and wingpanel).
|
||||
./plugins-dir.patch
|
||||
|
||||
# WindowManager: save/restore easing on workspace switch
|
||||
# https://github.com/elementary/gala/pull/1430
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/1f94db16c627f73af5dc69714611815e4691b5e8.patch";
|
||||
sha256 = "sha256-PLNbAXyOG0TMn1y2QIBnL6BOQVqBA+DBgPOVJo4nDr8=";
|
||||
})
|
||||
|
||||
# WindowSwitcher: fix initial alt-tab switcher indicator visibility
|
||||
# https://github.com/elementary/gala/pull/1417
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/e0095415cdbfc369e6482e84b8aaffc6a04cafe7.patch";
|
||||
sha256 = "sha256-n/BJPIrUaCQtBgDotOLq/bCAAccdbL6OwciXY115HsM=";
|
||||
})
|
||||
|
||||
# MultitaskingView: fix allocation assertions
|
||||
# https://github.com/elementary/gala/pull/1463
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/23c7edeb0ee9b0ff0aa48c1d19fbd1739df7af78.patch";
|
||||
sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI=";
|
||||
})
|
||||
|
||||
# Work around crash when receiving notifications
|
||||
# https://github.com/elementary/gala/pull/1497
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/8842e576e3e8643a018d506605f80d152e3f5cec.patch";
|
||||
sha256 = "sha256-xu9Rh7TH0ccRU1TInTNTm+dDaCXj5aaEwDw3rBW02q8=";
|
||||
})
|
||||
|
||||
# ShadowEffect: let Clutter know the shadow's size
|
||||
# https://github.com/elementary/gala/pull/1500
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/34a208e26d2ee0bf4a1689c8ad6ddfc06c540ff8.patch";
|
||||
sha256 = "sha256-KPIXNWTlKGc3JImt82t5lmcMu0bqrPx1JNv+TbsxhOg=";
|
||||
})
|
||||
|
||||
# Fix awkward two-finger scroll in multitasking view
|
||||
# https://github.com/elementary/gala/pull/1499
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/c175d2662dd05e940a5b3311cc9dc285242b7fc5.patch";
|
||||
sha256 = "sha256-xsxYDagPmaNSZO/Cj7NjPqBHCc1hrqvpboAvPIg9P58=";
|
||||
})
|
||||
|
||||
# Fix crash when monitor is turned off
|
||||
# https://github.com/elementary/gala/pull/1491
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/1487660812a343e6a6178881e6e7b25c2405cece.patch";
|
||||
sha256 = "sha256-YsRaWmDSg0h0RFTUOoMxlNcKoA4MNa8AhW1GGmk8qLA=";
|
||||
})
|
||||
|
||||
# Fix quick zooming (next 3 patches)
|
||||
# https://github.com/elementary/gala/pull/1501
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/b9c5c9c79a045c3eef7695f74f82d851438ba7e2.patch";
|
||||
sha256 = "sha256-PGjf/B/7UQxpW0Pby7ZXuMoDlamZwEaDvaN9PaRulHU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/49d3ddae5b631027466ff528c2935e05a8f5dc3f.patch";
|
||||
sha256 = "sha256-hvm2GcqiMYYxOLpQFXdyz325jZme7W+VYipu5goKoiU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/45126e4c2d3736e872c05941a2047a54788cd011.patch";
|
||||
sha256 = "sha256-LdhFFFNwvF1p1LqJXer8+DOgAptiHZHlfnQBwVEIZjo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-applications-menu";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "applications-menu";
|
||||
rev = version;
|
||||
sha256 = "sha256-pEBvFN+zYsF8CbB29rTNclwAYhw/Hb0HhLzXtijfI4M=";
|
||||
sha256 = "sha256-WlRrEkX0DGIHYWvUc9G4BbvofzWJwqkiJaJFwQ43GPE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "14";
|
||||
patch_version = "0";
|
||||
sha256 = "sha256:0axcc7c23pf4qinz4vxgkba6pwziwbp9i2ydwzar7x9zlp6diarn";
|
||||
patch_version = "1";
|
||||
sha256 = "sha256-wSeXTQJCV2z0cGGyCqnIbRe+DWqpaH9uyYNd5nvnu28";
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ let compcert = mkCoqDerivation rec {
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
defaultVersion = with lib.versions; lib.switch coq.version [
|
||||
{ case = range "8.14" "8.16"; out = "3.11"; }
|
||||
{ case = range "8.14" "8.16"; out = "3.12"; }
|
||||
{ case = isEq "8.13" ; out = "3.10"; }
|
||||
{ case = isEq "8.12" ; out = "3.9"; }
|
||||
{ case = range "8.8" "8.11"; out = "3.8"; }
|
||||
@ -25,6 +25,7 @@ let compcert = mkCoqDerivation rec {
|
||||
"3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb";
|
||||
"3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6";
|
||||
"3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A=";
|
||||
"3.12".sha256 = "sha256-hXkQ8UnAx3k50OJGBmSm4hgrnRFCosu4+PEMrcKfmV0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@ -138,7 +139,7 @@ compcert.overrideAttrs (o:
|
||||
})
|
||||
];
|
||||
}
|
||||
{ cases = [ (isEq "8.16") "3.11" ];
|
||||
{ cases = [ (isEq "8.16") (range "3.11" "3.12") ];
|
||||
out = [
|
||||
# Support for Coq 8.16.0
|
||||
(fetchpatch {
|
||||
|
@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
|
||||
patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat
|
||||
'';
|
||||
|
||||
patches = [
|
||||
../../../applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./src/
|
||||
'';
|
||||
|
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babl";
|
||||
version = "0.1.98";
|
||||
version = "0.1.100";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "87Ii+E5GJzXeY/qcNlGULyt4/TFMc6IuBf98c6/SOvE=";
|
||||
sha256 = "pebhk2diFdZdfN/q8RWKBgtCoUKjbxqwdtGDMhL50tQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,6 +8,7 @@
|
||||
, gflags
|
||||
, glog
|
||||
, suitesparse
|
||||
, metis
|
||||
, runTests ? false
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, withBlas ? true
|
||||
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = lib.optional runTests gflags;
|
||||
propagatedBuildInputs = [ eigen glog ]
|
||||
++ lib.optionals withBlas [ blas suitesparse ];
|
||||
++ lib.optionals withBlas [ blas suitesparse metis ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}"
|
||||
|
@ -37,25 +37,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gegl";
|
||||
version = "0.4.40";
|
||||
version = "0.4.42";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "zd6A0VpJ2rmmFO+Y+ATIzm5M/hM5o8JAw08/tFQ2uF0=";
|
||||
sha256 = "q6g6DLqmxW7cKeoi8ugXKVClO5bapRWSCD1ZIivd4C0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
name = "libraw.patch";
|
||||
url = "https://src.fedoraproject.org/cgit/rpms/gegl04.git/plain/"
|
||||
+ "libraw.patch?id=5efd0c16a7b0e73abcaecc48af544ef027f4531b";
|
||||
hash = "sha256-ZgVigN1T7JmeBMwSdBsMsmXx0h7UW4Ft9HlSqeB0se8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
|
@ -42,6 +42,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
set(GLEW_VERSION "$version")
|
||||
set(GLEW_LIBRARIES GLEW::glew\''${_glew_target_postfix})
|
||||
get_target_property(GLEW_INCLUDE_DIRS GLEW::glew\''${_glew_target_postfix} INTERFACE_INCLUDE_DIRECTORIES)
|
||||
set_target_properties(GLEW::GLEW\''${_glew_target_postfix} PROPERTIES
|
||||
IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE ""
|
||||
IMPORTED_IMPLIB_RELEASE "GLEW"
|
||||
IMPORTED_IMPLIB_DEBUG "GLEW"
|
||||
)
|
||||
EOF
|
||||
'';
|
||||
|
||||
|
@ -1,27 +1,46 @@
|
||||
{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, autoconf
|
||||
, vala
|
||||
, pkg-config
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libgee";
|
||||
version = "0.20.6";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
url = "mirror://gnome/sources/libgee/${lib.versions.majorMinor finalAttrs.version}/libgee-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "G/g09eENYMxhJNdO08HdONpkZ4f794ciILi0Bo5HbU0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoconf
|
||||
vala
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf vala gobject-introspection ];
|
||||
buildInputs = [ glib ];
|
||||
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
|
||||
env = {
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
|
||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
packageName = "libgee";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
@ -33,4 +52,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -12,6 +12,7 @@
|
||||
, gtest
|
||||
, nlohmann_json
|
||||
, python3
|
||||
, cacert
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
|
||||
buildInputs = [ sqlite libtiff curl nlohmann_json ];
|
||||
|
||||
nativeCheckInputs = [ gtest ];
|
||||
nativeCheckInputs = [ cacert gtest ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_GTEST=ON"
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocsparse";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ROCmSoftwarePlatform";
|
||||
repo = "rocSPARSE";
|
||||
rev = "rocm-${finalAttrs.version}";
|
||||
hash = "sha256-paibzXYvRnd+4yYvteLf7EYmqeqWDc7BoDByfSMrhYo=";
|
||||
hash = "sha256-jzHD55c4rlPab5IAj2UzHTJI9MKhTfevsLthSZKOEzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
29
pkgs/development/libraries/span-lite/default.nix
Normal file
29
pkgs/development/libraries/span-lite/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "span-lite";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinmoene";
|
||||
repo = "span-lite";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WfoyyPLBqXSGGATWN/wny6P++3aCmQMOMLCARhB+R3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A C++20-like span for C++98, C++11 and later in a single-file header-only library";
|
||||
homepage = "https://github.com/martinmoene/span-lite";
|
||||
license = lib.licenses.bsd1;
|
||||
maintainers = with lib.maintainers; [ icewind1991 ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wangle";
|
||||
version = "2023.02.20.00";
|
||||
version = "2023.02.27.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "wangle";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-islo6jbilDaWc48GfipXuPhUaY2Gn95PDjuJsEDnn50=";
|
||||
sha256 = "sha256-r+hS9BJWgIYIHZ0xgLosJrLZT/bQCQdwzNlXxxk5xLU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncwhois";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "pogzyb";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MYK09kszv7CTvZjdA9YQFfhlJ/A5d/aebLRaiMlnuB0=";
|
||||
hash = "sha256-h2RAUedcVTlX/DmaXewSQfw9gb0rE8NG9hdNe+exqqk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "auroranoaa";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djtimca";
|
||||
repo = "aurora-api";
|
||||
rev = version;
|
||||
sha256 = "0bh8amixkg3xigwh3ryra22x6kzhbdassmf1iqv20lhbvzmsqjv0";
|
||||
sha256 = "sha256-ho0O5aEHCKaTuWh2eW2kY5a7dVGIGBLm4nKxAMq0bZ4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "haversine";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "mapado";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iAGG1mjrt6oJ0IkmlJwrvb2Bpk4dNxV7ee9LYov03UY=";
|
||||
hash = "sha256-cwvTs/91eJhjmeuCQAUBgfnKuCiLEg1jSnrXfx9VWkI=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
@ -1,41 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
|
||||
# propagates
|
||||
, fetchpatch
|
||||
, jinja2
|
||||
, lxml
|
||||
, mock
|
||||
, ncclient
|
||||
, netaddr
|
||||
, nose
|
||||
, ntc-templates
|
||||
, paramiko
|
||||
, pyparsing
|
||||
, pyserial
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, scp
|
||||
, six
|
||||
, transitions
|
||||
, yamlordereddictloader
|
||||
|
||||
# tests
|
||||
, mock
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "junos-eznc";
|
||||
version = "2.6.6";
|
||||
version = "2.6.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Juniper";
|
||||
repo = "py-junos-eznc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0JF9/lSIquXp25bM3GESqLC//aorSVT0hHccaOmQuM8=";
|
||||
hash = "sha256-+hGybznip5RpJm89MLg9JO4B/y50OIdgtmV2FIpZShU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/Juniper/py-junos-eznc/issues/1236
|
||||
substituteInPlace lib/jnpr/junos/utils/scp.py \
|
||||
--replace "inspect.getargspec" "inspect.getfullargspec"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jinja2
|
||||
lxml
|
||||
@ -61,11 +65,14 @@ buildPythonPackage rec {
|
||||
nosetests -v -a unit --exclude=test_sw_put_ftp
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "jnpr.junos" ];
|
||||
pythonImportsCheck = [
|
||||
"jnpr.junos"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Juniper/py-junos-eznc";
|
||||
changelog = "https://github.com/Juniper/py-junos-eznc/releases/tag/${version}";
|
||||
description = "Junos 'EZ' automation for non-programmers";
|
||||
homepage = "https://github.com/Juniper/py-junos-eznc";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ xnaveira ];
|
||||
};
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.2.10";
|
||||
version = "23.2.12";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sXCBuN6H5/7cyOW7LuP5cJ5NixN3KWHJyJudT24rpYg=";
|
||||
hash = "sha256-3SxgAFpES53AP9W/Q4cajOmgU8sZgK/LduG4psw2KP4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -3,14 +3,13 @@
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, xmldiff
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "psrpcore";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "jborean93";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KMSyqXKhNH+i9Y0Mx3DHCwJZOkl4Va2n0zu0TEitslU=";
|
||||
hash = "sha256-6d5HQJEH/x+V0rpmQkprMlH1n151KyUF6d4tM9W5TFs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -35,13 +34,6 @@ buildPythonPackage rec {
|
||||
"psrpcore"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.11") [
|
||||
# https://github.com/jborean93/psrpcore/issues/22
|
||||
"test_remote_stream_options"
|
||||
"test_ps_flags"
|
||||
];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for the PowerShell Remoting Protocol (PSRP)";
|
||||
homepage = "https://github.com/jborean93/psrpcore";
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydata-sphinx-theme";
|
||||
version = "0.13.0rc6";
|
||||
version = "0.13.0";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
pname = "pydata_sphinx_theme";
|
||||
sha256 = "sha256-0JrTt5ZPbaEtqn9KbbAFfDjU3/6wAzbcbdAouv5o02I=";
|
||||
sha256 = "sha256-+ITUC7adMdlk/xnWBk97zqqmNBk1/bwJLVwknR/wC1I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrogram";
|
||||
version = "2.0.99";
|
||||
version = "2.0.100";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "pyrogram";
|
||||
repo = "pyrogram";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QQFRDLB+gf5jzCf8imHwkSgOkAyLWJF3UDStnpq6+04=";
|
||||
hash = "sha256-WlKzBhToSrBl6T8XFlqi3p0ABDufBGdhmK/0Fn7V61A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-twfFPtTR2LIAbd5YuOgTG/j/xktLkTD3/9fjo514eXI=";
|
||||
hash = "sha256-GLBekTsJqwzwtSYiYaJSeTt7qNs0gx2nOhlsfECFvKg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "srsly";
|
||||
version = "2.4.5";
|
||||
version = "2.4.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-yEIliWe6pSfOqTZ5huQrgUOhqJDn1KGNJaNu3Dx6M8c=";
|
||||
hash = "sha256-R7QfMjq6TJwzEav2DkQ8A6nv6cafZdxALRc8Mvd0Sm8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sunweg";
|
||||
version = "0.0.11";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "rokam";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-by75V1DXQBPCc/viMcbMqF99kNXDjY2Cx0W3Mh2CfI8=";
|
||||
hash = "sha256-fGaPn4pp1nDL4MX7K8zP2Vq2R/uRtd8rHSaWEG5Ye7s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "toposort";
|
||||
version = "1.9";
|
||||
version = "1.10";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9Bo0SQ1Ek0tTOnva/5ee6KRyA/0tinRtuD8tWrEkWLk=";
|
||||
sha256 = "sha256-v7tHnFPQppbqdAJgH05pPJewNng3yImLxkca38o3pr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twitchapi";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "twitchAPI";
|
||||
inherit version;
|
||||
hash = "sha256-gGLSR6XESaUUt31njQJtPeTOKSgVJHlS+UdYhPKvQJQ=";
|
||||
hash = "sha256-M3Jl3DGvjWdeqYOWmOSe/W9h9yZq4HVGrDR+5tEXBow=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -221,6 +221,10 @@ in
|
||||
buildInputs = [ libffi ];
|
||||
};
|
||||
|
||||
fiddle = attrs: {
|
||||
buildInputs = [ libffi ];
|
||||
};
|
||||
|
||||
gdk_pixbuf2 = attrs: {
|
||||
nativeBuildInputs = [ pkg-config bundler rake ]
|
||||
++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "air";
|
||||
version = "1.41.0";
|
||||
version = "1.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmtrek";
|
||||
repo = "air";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-31C1iNiYokClAZlk9KOVE12lFdOKJBSOwQK+zOp082k=";
|
||||
hash = "sha256-3lnCqetpQ0Gnms5AR7/+eKV8jxhfv0R2LJ4l+74edt4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-i3bXf/EsPAJOg2aWh4mANtNeRXnie4jtuLCd/01DB/0=";
|
||||
vendorHash = "sha256-uVN99Sgjwtg0IaDuMfuDKWRZRYKVp9UDJwinr56eXOg=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ];
|
||||
|
||||
|
23
pkgs/development/tools/click/dbus-test-runner.patch
Normal file
23
pkgs/development/tools/click/dbus-test-runner.patch
Normal file
@ -0,0 +1,23 @@
|
||||
diff --git a/click_package/Makefile.am b/click_package/Makefile.am
|
||||
index 4981d74..9df9e79 100644
|
||||
--- a/click_package/Makefile.am
|
||||
+++ b/click_package/Makefile.am
|
||||
@@ -1,5 +1,3 @@
|
||||
-SUBDIRS = tests
|
||||
-
|
||||
noinst_SCRIPTS = paths.py
|
||||
CLEANFILES = $(noinst_SCRIPTS)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8f4dc9e..adbd366 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -52,8 +52,6 @@ PKG_CHECK_MODULES([SERVICE], [
|
||||
AC_SUBST([SERVICE_CFLAGS])
|
||||
AC_SUBST([SERVICE_LIBS])
|
||||
|
||||
-AC_CHECK_PROG(DBUS_TEST_RUNNER_CHECK,dbus-test-runner,yes)
|
||||
-AS_IF([test "${DBUS_TEST_RUNNER_CHECK}" != "yes"], [AC_MSG_ERROR([dbus-test-runner not found])])
|
||||
AC_CHECK_PROG(GDBUS_CHECK,gdbus,yes)
|
||||
AS_IF([test "${GDBUS_CHECK}" != "yes"], [AC_MSG_ERROR([gdbus (glib) not found])])
|
||||
|
86
pkgs/development/tools/click/default.nix
Normal file
86
pkgs/development/tools/click/default.nix
Normal file
@ -0,0 +1,86 @@
|
||||
{ lib
|
||||
, fetchFromGitLab
|
||||
, buildPythonApplication
|
||||
, autoreconfHook
|
||||
, debian
|
||||
, perl
|
||||
, vala
|
||||
, pkg-config
|
||||
, libgee
|
||||
, json-glib
|
||||
, properties-cpp
|
||||
, gobject-introspection
|
||||
, getopt
|
||||
, setuptools
|
||||
, pygobject3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
buildPythonApplication {
|
||||
pname = "click";
|
||||
version = "unstable-2023-02-22";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/click";
|
||||
rev = "aaf2735e8e6cbeaf2e429c70136733513a81718a";
|
||||
sha256 = "sha256-pNu995/w3tbz15QQVdVYBnWnAoZmqWj1DN/5PZZ0iZw=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
--prefix LD_LIBRARY_PATH : "$out/lib"
|
||||
)
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export click_cv_perl_vendorlib=$out/${perl.libPrefix}
|
||||
export PYTHON_INSTALL_FLAGS="--prefix=$out"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
perl
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
vala
|
||||
getopt
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
# Tests were omitted for time constraint reasons
|
||||
doCheck = false;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [
|
||||
# dbus-test-runner not packaged yet, otherwise build-time dependency even when not running tests
|
||||
./dbus-test-runner.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgee
|
||||
json-glib
|
||||
properties-cpp
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
debian
|
||||
pygobject3
|
||||
setuptools
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A tool to build click packages. Mainly used for Ubuntu Touch.";
|
||||
homepage = "https://gitlab.com/ubports/development/core/click";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ ilyakooo0 OPNA2608 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "evans";
|
||||
version = "0.10.10";
|
||||
version = "0.10.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ktr0731";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4MPb2sEdjcfu7Lupeplpj+3ebEfJB/Obf7fhoa8EZTY=";
|
||||
sha256 = "sha256-V5M7vXlBSQFX2YZ+Vjt63hLziWy0yuAbCMmSZFEO0OA=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-oyFPycyQoYnN261kmGhkN9NMPMA6XChf4jXlYezKiCo=";
|
||||
vendorHash = "sha256-oyFPycyQoYnN261kmGhkN9NMPMA6XChf4jXlYezKiCo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "More expressive universal gRPC client";
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "flyway";
|
||||
version = "9.15.0";
|
||||
version = "9.15.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
|
||||
sha256 = "sha256-/rK7Kd1ofz1D7/o/yMFXS2YBklOEA7jExuYPpnX9xko=";
|
||||
sha256 = "sha256-Ls7PGvpFfXEz93P+VSkI/w+mGjZPJr+Wrf+QdaDFtqE=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "devspace";
|
||||
version = "6.2.5";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loft-sh";
|
||||
repo = "devspace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IdJlYCoI8wTl1kIY5M5Lfn+Y9WjSZkLuWI5pFsfAO0I=";
|
||||
sha256 = "sha256-ISyimfjTWU4niGeL8cSRRsUMNq3OQOvKJw7MCbY0K7o=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-cov";
|
||||
version = "0.5.10";
|
||||
version = "0.5.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-aCrwmo1a88mpK+hrQxjEQeHBrF4uSO+H5mbV9w3FvWo=";
|
||||
sha256 = "sha256-ygjCVpstU+gKcO85bzU9O3/2mFE885zkGwhAtlhjtVA=";
|
||||
};
|
||||
cargoSha256 = "sha256-jhfHTBoIdNcBVrDzJcfBscqrS8SMG6cx4j9Y1FIwBbU=";
|
||||
cargoSha256 = "sha256-WT609RDA1/UKRMniBpBF2UU36u4MeQH0PV0TzTQDWo0=";
|
||||
|
||||
# skip tests which require llvm-tools-preview
|
||||
checkFlags = [
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "worker-build";
|
||||
version = "0.0.12";
|
||||
version = "0.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "workers-rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s5fcs1A31ePr2EvFdNvX55jMRkHZkR+LRkcy59brwXg=";
|
||||
sha256 = "sha256-eJLYe6H8g2ZM3gWt0GMzj0X7+7e7pFtCRCqDJfVzvms=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2jLv3/mLLnSsSKEGaAd4jaM5FOdTvdJg2W1Nc4mVkqs=";
|
||||
cargoHash = "sha256-DjWVJH0XeSPesqQr0Rb9Bd+8Q39I1rUoS4dg7KT4mo4=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.470";
|
||||
version = "0.0.473";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6D106qRd3dsSpZqlOVVV/I38YsjFTEtApvWtCc+LVNw=";
|
||||
hash = "sha256-bTOGrg+dM+FXNvbeJ3fx1aMlT/2sPVYwGOzZaZfHVm8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ExHzf4L0Ibb+tYfBV45hEaUJgSQhgpHk40QhHa5dpQ8=";
|
||||
|
57
pkgs/games/openloco/default.nix
Normal file
57
pkgs/games/openloco/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
, cmake
|
||||
, libpng
|
||||
, libzip
|
||||
, openal
|
||||
, pkg-config
|
||||
, span-lite
|
||||
, yaml-cpp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openloco";
|
||||
version = "23.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenLoco";
|
||||
repo = "OpenLoco";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-35g7tnKez4tnTdZzavfU+X8f3btFG6EbLkU+cqL6Qek=";
|
||||
};
|
||||
|
||||
# the upstream build process determines the version tag from git; since we
|
||||
# are not using a git checkout, we patch it manually
|
||||
postPatch = ''
|
||||
sed -i '/#define NAME "OpenLoco"/a#define OPENLOCO_VERSION_TAG "${version}"' src/OpenLoco/src/Version.cpp
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=null-dereference";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOPENLOCO_BUILD_TESTS=NO"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
libpng
|
||||
libzip
|
||||
openal
|
||||
yaml-cpp
|
||||
span-lite
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "An open source re-implementation of Chris Sawyer's Locomotion";
|
||||
homepage = "https://github.com/OpenLoco/OpenLoco";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ icewind1991 ];
|
||||
};
|
||||
}
|
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpuid";
|
||||
version = "20230120";
|
||||
version = "20230228";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";
|
||||
sha256 = "sha256-uJtB+IldDVj9uwpUECu0kLx8WCjbLNFb6C0U0ZRjpXk=";
|
||||
sha256 = "sha256-EYLFnFqpp7ljNzlABgQ+YN7hQIh6DBeERm1dLAhH7fM=";
|
||||
};
|
||||
|
||||
# For pod2man during the build process.
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eventstat";
|
||||
version = "0.05.00";
|
||||
version = "0.05.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-yGEFegUpWNBsrGZJjWud3aOsRJgXsOJmXkgpXcsPHo0=";
|
||||
hash = "sha256-raODDA1EKtZThFg0NV6EfrWj5mSQNaiekywfOfAvYXI=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powerstat";
|
||||
version = "0.03.00";
|
||||
version = "0.03.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-eiFzWKY4LrudfjMKDk4clmvCqYOGvWFokn6jEryMYBo=";
|
||||
hash = "sha256-+3b6yH5CuFdtjjTmW2mwuvNyhO8/8N7vv6st+ttztBQ=";
|
||||
};
|
||||
|
||||
installFlags = [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rtl88x2bu";
|
||||
version = "${kernel.version}-unstable-2022-12-17";
|
||||
version = "${kernel.version}-unstable-2023-02-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "morrownr";
|
||||
repo = "88x2bu-20210702";
|
||||
rev = "9a04d2bb9d882c7f2708560774d7b96a70d83f4b";
|
||||
sha256 = "sha256-PxTUCYBfyCDB8IjNKsp7aiPtSI3TFzGuJsHqG66e2Q0=";
|
||||
rev = "51a2fb94893c562ec5f2fabce0b80e4da4eda812";
|
||||
sha256 = "sha256-nTas2EkghZeQhc8bTtoQfHEl8QJtClXi9V1IxlIThbI=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
@ -12,26 +12,27 @@ in
|
||||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.77.0";
|
||||
version = "1.78.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-//1BTiNH3n2eNjwOADb1OB7xp5QsH6arV5Pg3B7y3r0=";
|
||||
hash = "sha256-UMP/JQ77qGfAQ+adLBLB8NFI2OiuwjILEbEecEDcK1A=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-B9Z+7VtbbX/S01aaMFHgXH60sg8Lmwku2XPRnpMpwjo=";
|
||||
hash = "sha256-UTuMvTWfOlFlL+4qsCEfVljnkeylBKq0wd5FlAOYAFQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Remove setuptools_rust from runtime dependencies
|
||||
# https://github.com/matrix-org/synapse/blob/v1.69.0/pyproject.toml#L177-L185
|
||||
sed -i '/^setuptools_rust =/d' pyproject.toml
|
||||
sed -i 's/^frozendict = ">=1,!=2.1.2,<2.3.5"/frozendict = ">=1,!=2.1.2,<2.3.6"/g' pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,27 +8,27 @@ let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.28.0a1";
|
||||
version = "1.28.0a3";
|
||||
pname = "tulir-telethon";
|
||||
src = super.fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Kf7S5nSvedhA5RYt5rbTxBiQq6DGwHJ5uEYxd9AsYIc=";
|
||||
hash = "sha256-N1XQGpjfyUqcT+bsSBxC5Purvnd/+4NzVzMhiaq5yDo=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonPackage {
|
||||
python.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-telegram";
|
||||
version = "unstable-2023-02-16";
|
||||
version = "0.13.0";
|
||||
disabled = python.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "telegram";
|
||||
rev = "354b49d9e5f91f913b5fdf9288bc631a9a34d142";
|
||||
hash = "sha256-zdK/0jgw++YwSzP8qs1BqInQlFOoM63TeI1jF1AqDnk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AfCo2uHOcSNCWXgrCLzJwl0Dj8n9Asdqm19wk0OeXgQ=";
|
||||
};
|
||||
|
||||
format = "setuptools";
|
||||
|
37
pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
Normal file
37
pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-dash-n-grab";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "esnet";
|
||||
repo = "gdg";
|
||||
sha256 = "sha256-M4V4ybOizXCLxTTuS17M0y2tRmjQmTIBdXVbumzOoeA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pXo80Tean5OkQ0Sv2+/RlRnAtaClwGP7tuDC2irsh+E=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
"-X github.com/esnet/gdg/version.GitCommit=${src.rev}"
|
||||
];
|
||||
|
||||
# The test suite tries to communicate with a running version of grafana locally. This fails if
|
||||
# you don't have grafana running.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Grafana Dash-n-Grab (gdg) -- backup and restore Grafana dashboards, datasources, and other entities";
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://github.com/esnet/gdg";
|
||||
maintainers = with maintainers; teams.bitnomial.members;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "gdg";
|
||||
changelog =
|
||||
"https://github.com/esnet/gdg/releases/tag/v${version}";
|
||||
};
|
||||
}
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fioctl";
|
||||
version = "0.31";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foundriesio";
|
||||
repo = "fioctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A5XRokrYRENaw0poq9e3o2OwCPn0GZaAT2fPjYu3p0M=";
|
||||
sha256 = "sha256-3k3FoRU1yCtntVe3WTGUuhIBTD6KRvSsDISbjmNvzQI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g8sTQXUk162SlA1iLEMGZ6O3FvF+8v/XINtZR8o0m8U=";
|
||||
vendorHash = "sha256-hSllpWjiYOBbANCX7usdAAF1HNAJ79ELK92qEyn8G1c=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
@ -1,44 +1,44 @@
|
||||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "3.54.0";
|
||||
version = "3.55.0";
|
||||
pulumiPkgs = {
|
||||
x86_64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-linux-x64.tar.gz";
|
||||
sha256 = "0qp32lzdsz806f0jvl6900h4z5597c7yijga24f88c1k90kzyx3f";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-linux-x64.tar.gz";
|
||||
sha256 = "078mvn8aj94z9vbnxzl6q2kgncbna4z72l6q8j06dmx63m7gqs9m";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-amd64.tar.gz";
|
||||
sha256 = "0c5rw7nk9sw2mcccq0a9apy0rfsd14jkg6wqivf0vc0c5frwhgqi";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-linux-amd64.tar.gz";
|
||||
sha256 = "1x0vv5b61achyysm5inffi9dh2nry7qkr62iqjml4n7qb9f3dcxd";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "11f8lha7cqqcp2kfw3mlagsislwn78kl26cw3dcliy82x64wkrm6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-linux-amd64.tar.gz";
|
||||
sha256 = "1hfwk31xxdsqgjckvrqr8n1awdl7spkij71qbrrnzf3bngyaq2lv";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-linux-amd64.tar.gz";
|
||||
sha256 = "17h8iiq50jlwdihjm3x8x4sncyjpgdsrymzz8wjjw6lcyd8mzad9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-linux-amd64.tar.gz";
|
||||
sha256 = "0vis19vj9xj8hrx4a3a6d50ixhkldb2fzg0nkh4azad69pj0jjjl";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-amd64.tar.gz";
|
||||
sha256 = "0jv6gwjpdjhla4dgi6cfcz6c4h38fsc8c5ak168k40d4ixin8g5v";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-amd64.tar.gz";
|
||||
sha256 = "01zjsw7f9r2andc6am09qhs2gy9189i3bvkdyxmv6bkh7907z8pg";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-linux-amd64.tar.gz";
|
||||
sha256 = "1whpm1l1x1mk32npdsdc4fji1z8yyrcma4xfvjsm7cg5mc01c3a2";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-linux-amd64.tar.gz";
|
||||
sha256 = "04spn0180c5y90xvpadwd8ym3ffywvi4nbmjpa1qhy7j20zpd698";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-linux-amd64.tar.gz";
|
||||
sha256 = "1vpwvpmkj8ca7cjb9b4mcrxwdwyzljrzgqrkfak8vs95a895752f";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-linux-amd64.tar.gz";
|
||||
sha256 = "1chrpjsbracndk4mfcck3shvjk4s82x6wlb71q9vrmijw1kll5ac";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-linux-amd64.tar.gz";
|
||||
sha256 = "0d8a66iv03b8wsfx8jidgmvq126ypw5i6dnyd3hz6kd1vbyvvp4d";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-linux-amd64.tar.gz";
|
||||
sha256 = "0i3w5rzgkdy9qz12h0l6hhm9hdg0k8vkrv15fvr8k0vvfmk898kc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-linux-amd64.tar.gz";
|
||||
sha256 = "0pddkbqldlrz9xz0bmv6i0hm0m5gxv7ms8p5p710ww5jbyj6gni6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-amd64.tar.gz";
|
||||
@ -57,8 +57,8 @@
|
||||
sha256 = "0cyrrxd2iyrf8zbvn46vbi6ayg93l284y66lwcggdqh3snj3gc7y";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-linux-amd64.tar.gz";
|
||||
sha256 = "00ispk56g2jb9c410r6khdysyq0g3crn42sa4vq5bmgzkrsz78yv";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-linux-amd64.tar.gz";
|
||||
sha256 = "09k4ni7dl3jndf85ypg00xlxij0ik6j1ndvw1yi4w8shikvy18rx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-amd64.tar.gz";
|
||||
@ -73,12 +73,12 @@
|
||||
sha256 = "15mygp5kbj3z868dfz3w00srm88qn6i38dgfsclhs2flj9h989wh";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-linux-amd64.tar.gz";
|
||||
sha256 = "0c3s36a93pgidv81frbczyqai23d61cs3a6k2zck7kz9l7796mm8";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-linux-amd64.tar.gz";
|
||||
sha256 = "1dql09k9dgz4d91i893xcli4wq1c0i4fmxjcm2ss4cvnkipzhdxv";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-linux-amd64.tar.gz";
|
||||
sha256 = "0yx03k6pipcyxa2ibmyq4a7kpsiy1j3ycfzg8ijdww6i2sh9z5z4";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-amd64.tar.gz";
|
||||
sha256 = "1s76ghsi9p9fda3j2nqyn3q1gjvfssxn74r7zapjl41day6h84wc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-amd64.tar.gz";
|
||||
@ -93,12 +93,12 @@
|
||||
sha256 = "113yrv1yr0lzwslayhzhsyrrfk3vrddicbbbd0fs56pgks2r66ik";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-linux-amd64.tar.gz";
|
||||
sha256 = "1bh70bqjp5jq56yxf4ggvnvz9v1271wads6gmhlik4f0fvss3v8k";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-linux-amd64.tar.gz";
|
||||
sha256 = "180jdyhqv0jkqhfwmn12c62cp3c7839d56vbj3ibi9rjmvipwlg9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-linux-amd64.tar.gz";
|
||||
sha256 = "1cmd779ldxfazksgiyxpagg84a6k5ckqmpf0kq0z7s9s7a6favy8";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-amd64.tar.gz";
|
||||
sha256 = "0hanfcw21n7d2m6zzj98mgfq3kdc70xp7bqc4lilmh6f90dhcrhy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz";
|
||||
@ -117,16 +117,16 @@
|
||||
sha256 = "1cdz32s7bfri7n81gviyg3gh1l6pz95fp6alwrsn797adl3qq3s7";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-linux-amd64.tar.gz";
|
||||
sha256 = "1fhynzw38l7agc4wm8c92n7ig3gnl7gskzq697hq8dk4r7xl2179";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-linux-amd64.tar.gz";
|
||||
sha256 = "0p9kfy12334lzdj3c283fc572rfqav4xvf041z2as28hvbdi5jnc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-linux-amd64.tar.gz";
|
||||
sha256 = "0znz88v2w0fb6yzjjhfs20ampwjngyzskna26qid42d40jbxyqxm";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-linux-amd64.tar.gz";
|
||||
sha256 = "0ddy78rh7m9ikgsl317ibsf4xdyny9034aa6f6dp64bif4mn0mz2";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-linux-amd64.tar.gz";
|
||||
sha256 = "0gfsji7vgxk0kanfbjaxf1ia79n8x3qqhkm2fdhxqlscc0d6vpgp";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-linux-amd64.tar.gz";
|
||||
sha256 = "04bx4hnha1jnbzn0s5rpixqw7xniqih0g3fi4pjmgzbgjcgjgl7q";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-amd64.tar.gz";
|
||||
@ -137,8 +137,8 @@
|
||||
sha256 = "1x0s7k6wplami10qfk8i4qf5cqfzn3pa601yn30hhq0k16g5vm65";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-linux-amd64.tar.gz";
|
||||
sha256 = "0ay5rlvp17jbjkf8ig6k6i35cy0rgg8gng77ldh83r6cjca15l5v";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-linux-amd64.tar.gz";
|
||||
sha256 = "1n0brv4m8xjyd3lk1rgwbj7c5bpa1m6lr95ipzj3nk8338mb420n";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-amd64.tar.gz";
|
||||
@ -149,8 +149,8 @@
|
||||
sha256 = "01jsl59rwns87ybx1hmfr634ma381i7xmx40ahrrfpg851mzsgig";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-linux-amd64.tar.gz";
|
||||
sha256 = "1rkn9l16mfr97h9hi5i0kfm4lh6xm5wwxj4mwz8rwwiwfr963zw9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-linux-amd64.tar.gz";
|
||||
sha256 = "0svlqccq9rb00hz8g5fbpb7r6wf5wbjacab8rvjcb13wvrc8rx54";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-linux-amd64.tar.gz";
|
||||
@ -163,40 +163,40 @@
|
||||
];
|
||||
x86_64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-darwin-x64.tar.gz";
|
||||
sha256 = "09n7q0c218w74vqx3idhjjzqb6wcq3ynqpqnss9w4n7qxxcm953f";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-darwin-x64.tar.gz";
|
||||
sha256 = "12yzj1ibdvki61q2vq9vygj6sl0s1x783v111q7wl328s3383pgj";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1l26w106lrhy3gn3x1x3hc8gackxzm7ipvx37vqxmb2xhraq952z";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1p06n6g4a6mhlfkw38v3xdbci40y4yhin61bw32nqyfg9j1gj87l";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "01w2hh6vf3smjn7dqlfxhfnl1k6fm7mdrafk1ngzyaqg76ggn52j";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1bm1nv00ik2hvncinqwkir9vsixcr05jib5ihhzwcsl1gqgl3i84";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0iyyfx84wn1q2k51llhajlv1vm4yhs6i8654ic00pxp0nrv6gnk5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1jlzny3wns6rr4h620m5wp11fn4v8ycpg8kizpqyl2iccsxxmva0";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0a6hvi15z2viyv97xdq2s1kgrhz45f21rh4zcx4y7kqbv0v4a9aa";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0ypm2xknhz09cmzj57d5r8axn4jscb8r8z9sqx88y3fsh14s3j6d";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0fmv68gr11gap5gczfw51fwwyasxamxd24zwn0gp0rzc4600qd2b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0qbiihqj7dqq85gmy4dkyffaa82z2sz8mq0rjxha9831qcs5qy3c";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-darwin-amd64.tar.gz";
|
||||
sha256 = "181q2hdj6wxj9c3jyndcnkgrz8rh6sqzzqjl6r4g681ci5j4nqrd";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0q14jp0n42m53lhcvl2j7klzgq0s085nhgvcpi85kn9j0gn58n9v";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1xgxqx62116g4i17m4lpzgpcgwqhjisbfc4cvs49n31h0g2xlfl9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1g1bf25d240rfr25v1d6srsfqfxgm9dmzpaf29dipd5ym4cy5v87";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1bjhnaqdclz0ajjvgiqal0k1x6ri0fz4z4ww25hbwjqlvyd4n7ww";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-amd64.tar.gz";
|
||||
@ -215,8 +215,8 @@
|
||||
sha256 = "1dz6vi3c067f51p3ya43hahc82w9r3ywhxdxmbnjc1sk7py1pbi4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1xlhaqb4hpdk5gppcj7014xw3a3x0n8cgyb90j4gi4gczwzq6blg";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1a70h0apgxk5d70rki612s71wd6p0lg1g4v2w564q1f94fpqp9vb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-amd64.tar.gz";
|
||||
@ -231,12 +231,12 @@
|
||||
sha256 = "0dzxv7qkk68bxw9p5xbmb40sqqnbf8dckpk352f5802x78wxhaf5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0ysfyyb0s4r5pph32qik09qzdxn6ac2b601fpfx9cjn8aamcz0nq";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-darwin-amd64.tar.gz";
|
||||
sha256 = "17madjffjskjbgg2ab942d1dqpq74ff618a4yjkz679l490z14mi";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1ivwh2wbhg9fl678292zx1vbb0l4kgnp8xxlx6zkx4gjs24fmls1";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1gjl4yx3g8p487yv61jslkiy1ar7qijhmsm6s52ghxyh8w2wfbrj";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-amd64.tar.gz";
|
||||
@ -251,12 +251,12 @@
|
||||
sha256 = "069hl04cwjvd9hy6sm2wv225r1fmmf7z04p8qiy6kmck588c19lx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1mcjjdi8lvn0lk78y5jbfcl7k78kq83k83bsbi3bvc5wkskv1y2h";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0ca581x90ypw73z0dmy7b21sc0npqivnhfnv5r8pf2abwhbkpny0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0v2qd5jlbnsd85mzw4c465ykjzm92w288vfdd0jgkqqc3kf4cyax";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0y78a6sc81mnbr7djj4nmyra5n3bmqnm9jic0552mqikw59jsikw";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz";
|
||||
@ -275,16 +275,16 @@
|
||||
sha256 = "1p79wp1sk5ka9xisjmmrv9s7aw6dghp22lkiz15vzrqwifm6nxmb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-darwin-amd64.tar.gz";
|
||||
sha256 = "15gpjmak6xp3fwa6rp3whl0aah7m1fmdvpy9icnjxagmd4ixpf1r";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-darwin-amd64.tar.gz";
|
||||
sha256 = "02vp3lar6nj9ssy7cr194vni6vqg2v8rnvwxixbc5ijq5azz5ipi";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-darwin-amd64.tar.gz";
|
||||
sha256 = "09mzdd4271ifmn3b4nm0b47zmkqj408y1dg6d5c4nib67fb8glcq";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-darwin-amd64.tar.gz";
|
||||
sha256 = "071x2z4kb2m5cvlgpmk7ha7857c85fhqb56jas5r8c2vn70spqpv";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0nzlx81yk674xkr2r7q4fkl84c8cxn3ahw9983vsy4jq9a0ik81k";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-darwin-amd64.tar.gz";
|
||||
sha256 = "143802ikmgjgk1w7rkkl4q9hb2skvx4pf5wxi6h5rziav03w97p3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-amd64.tar.gz";
|
||||
@ -295,8 +295,8 @@
|
||||
sha256 = "0mg35il3xdr43y5fq7420dal7a2nmg542v7njm71m98rdw2jlnnq";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1nywayf1c6amhjik0091fdxmr74b5pp4pcpxpnqwss04q7l7qcz3";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1cr0zbfrid4xsyjmabppzg7f867vmhpjf29s4qrb3g9vg0k4fibk";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-amd64.tar.gz";
|
||||
@ -307,8 +307,8 @@
|
||||
sha256 = "1jn1j72s3dqjw0xdyk7mncw61fzqmwg4sqbbh7f3708wv1rznv5a";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0bmdfvdh2smwpdmz8jhkn4cl4zrn7jqw8nmf7y7zkpwpiw8647ir";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1g7jcwrff8nd1m6fmvfri3nfgby8agcwmq60ascd45mkianwf2i8";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-darwin-amd64.tar.gz";
|
||||
@ -321,40 +321,40 @@
|
||||
];
|
||||
aarch64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-linux-arm64.tar.gz";
|
||||
sha256 = "1dixd7dckinp5vj52kb9rzp4qpcacppyv3qwbisxl2g4dadlf88v";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-linux-arm64.tar.gz";
|
||||
sha256 = "0q8bb5mh2zqrf45g1sbwbxlhwvn4j467czbi0zy0iwy3wp7gpp8s";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-arm64.tar.gz";
|
||||
sha256 = "0a0gy3im1ymjqn1pfc1ds8rikp0zsn3msc7g3zrvqlqkypih5fmy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-linux-arm64.tar.gz";
|
||||
sha256 = "0scpn0mz4ljqwb473j1xk39z0cmjv87lmnd3s9fm5rijqcinjw6y";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-linux-arm64.tar.gz";
|
||||
sha256 = "1dhhsdxcg3jhf9yjhjpgsdz92vwj52v45d34paa0qy5xmdw89g23";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-linux-arm64.tar.gz";
|
||||
sha256 = "0qplrij1bbpsdcmxzixrlkb2l49c21alla2g70aqm0vxkpjscn7m";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-linux-arm64.tar.gz";
|
||||
sha256 = "1cg68j7nn0jx3zdfhkxmgbms27xk7mllwll6pwmp1rljh04p48ap";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-linux-arm64.tar.gz";
|
||||
sha256 = "1wviw5iijiq7666kx0c51ka32qv6cr4l2mbmpfg4mp8yq5hlz7cc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-arm64.tar.gz";
|
||||
sha256 = "0hgnwzslhcxf1xp3dza9adf1dlc1v3fsgb22n0dqq65hyixkdlar";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-arm64.tar.gz";
|
||||
sha256 = "0m773l7289rqpkyzmfbdsg4v6m531p8mp4mjhr6px5amii7875qz";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-linux-arm64.tar.gz";
|
||||
sha256 = "0sl8af8arqjg70p9ndw72adfpv8rybw4nb3n120cnwrz3bw0sfqy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-linux-arm64.tar.gz";
|
||||
sha256 = "1z2jss2yc3fylqc8hpgfy4sqyvkgcbmf4hngdzphnknqapiz927w";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-linux-arm64.tar.gz";
|
||||
sha256 = "0bcv46ib2pbsp41rxqb60mvj7f9b2rab6r342rr27azxvf6jzc8i";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-linux-arm64.tar.gz";
|
||||
sha256 = "0ma2n41nz916qr5l2nbmc4h9bz90fk6p9gnqqk5pzgwqxvw55jlh";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-linux-arm64.tar.gz";
|
||||
sha256 = "1z5x90z92q34ibfzm98ir308b7yw9ryw0whdrfrbxd97qdzq226b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-linux-arm64.tar.gz";
|
||||
sha256 = "1pyzmfg0k58l409wflx78ngpvspj5b38pi9janvh7xcajkcj4mfb";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-linux-arm64.tar.gz";
|
||||
sha256 = "064fbh583gfpilb7rn7rwazmf79q8m361nh9jcqxs6r7mihb0ch4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-arm64.tar.gz";
|
||||
@ -373,8 +373,8 @@
|
||||
sha256 = "14qpxps76y1jc995l9h1m3nwbkna0fsa6hm32m11qw9c4clk7npd";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-linux-arm64.tar.gz";
|
||||
sha256 = "0svvm7icwxi4ly7dsbfsw16m4nkg13ag0j03c3x7amfq80n80zdb";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-linux-arm64.tar.gz";
|
||||
sha256 = "0n8vimvn4p7mcrgnd0v8l1q21pswhlxs1mph4928lnpk8h68hz51";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-linux-arm64.tar.gz";
|
||||
@ -389,12 +389,12 @@
|
||||
sha256 = "1ad76i2avaaxfhq5bvhdmp3wy2c0zs959i3i1hsda2qdw5c91rjr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-linux-arm64.tar.gz";
|
||||
sha256 = "1zak9vf9dc2y0ic1mi3aakqcv5iabdnzrzxkl1mwxgl2jibmq2n0";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-linux-arm64.tar.gz";
|
||||
sha256 = "1biq7rjw49d8vpfsb9ab0ixr2a42y404nxa9v8ndkyhqskmjgz68";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-linux-arm64.tar.gz";
|
||||
sha256 = "0pxlcmkrbvdni46kml02vqx22syzdp512zb1cvagnnlkdb00azdg";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-arm64.tar.gz";
|
||||
sha256 = "0y454009cwryi6bcz9k6398bbngdslxkpcvdnl270jk1rkk0b2qz";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-arm64.tar.gz";
|
||||
@ -409,12 +409,12 @@
|
||||
sha256 = "0b8zaqcmlbdl5p38xjk0j7pgd6cy5mf1wc25g6rxflbikx9k43v9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-linux-arm64.tar.gz";
|
||||
sha256 = "0dn0y8hwb7kza27igfwcx3fdy083jpwlbhk4kdnrfl71wf9h7ix2";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-linux-arm64.tar.gz";
|
||||
sha256 = "0xj174k6qk5fkivzj9481smgvvv3i1861kbjiplsfkka8j6wcw09";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-linux-arm64.tar.gz";
|
||||
sha256 = "1zqlilnayrgazd1ad2fhpqrp9mc3hccm55klhz2skxdh9w8fqk3c";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-arm64.tar.gz";
|
||||
sha256 = "087hbcb5y7l3gmr7x2y5kzp1ykdj0samm7vbn5iy2y2rpwirszpw";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz";
|
||||
@ -433,16 +433,16 @@
|
||||
sha256 = "1knyj2djz077c38kls5gyjn0v83qif8qddgji488mr8k8nf4k6lg";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-linux-arm64.tar.gz";
|
||||
sha256 = "08j20ikmfdlgwcrv9csb3fj36cvay0s90yzv0r7p2ma22ganvznj";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-linux-arm64.tar.gz";
|
||||
sha256 = "07agbpg8v32zq27395zzjpvpi5sr8ryzi16hj4jk1144g0bi7gxd";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-linux-arm64.tar.gz";
|
||||
sha256 = "1rrmhwlm7vx8n9p8rymqpwnh7g54k89bj1ywv94v73b4l97vnhm8";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-linux-arm64.tar.gz";
|
||||
sha256 = "0sr7hxxczs90sqhaz3asp1bd3bcld0nw00gah0m36rdr3kb8d2zl";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-linux-arm64.tar.gz";
|
||||
sha256 = "1la6hkcyr1dbqy3pz00wl88v2asbswnidfj1s14gy91gmwdj0593";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-linux-arm64.tar.gz";
|
||||
sha256 = "1w5l6m13113lak1yv4kfhh07adqz3pci9zyzx57llic4mccczpan";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-arm64.tar.gz";
|
||||
@ -453,8 +453,8 @@
|
||||
sha256 = "05xhgy6n4msxvi72a898g4bas7aqxdvj5a4vf1mjf80f55m8hc8k";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-linux-arm64.tar.gz";
|
||||
sha256 = "1r8d77mamkzdaq2c9gqbvywfaa7z5wsbaxpimsd3sdkr8x49j753";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-linux-arm64.tar.gz";
|
||||
sha256 = "0wc2j439pi1s5j6ncmdj0670svis5ljfgn1q49lh37pgn88m7m75";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-arm64.tar.gz";
|
||||
@ -465,8 +465,8 @@
|
||||
sha256 = "1psibvdvnqmcjyd4knwxqq97k72da7qgrm2g08n41bvjdv10j6hh";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-linux-arm64.tar.gz";
|
||||
sha256 = "065bcvm1p6fbhnhq4r0l5km7z7srd6yfpj05qd070lp5iaz90mp7";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-linux-arm64.tar.gz";
|
||||
sha256 = "158iqlvxdc38yn2cdifp94v4jmqbybczm98g3fc8n1ny2wr7akny";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-linux-arm64.tar.gz";
|
||||
@ -479,40 +479,40 @@
|
||||
];
|
||||
aarch64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.54.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1igr2ahjlpcp8m6isz6q19kxjj640rrm6h8sj58b9dr1rm842gsl";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.55.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1c5vivch4ddj63pbiq61890lpnf1jdn3xlv127njmp5syb6ankzl";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1g8adp2q0r4fvaahyx0jqgqvp972h1kjzxrvlfw5012z76qnar47";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0xqwgc89wgfz8sd0yl6w2qqxlb2hraqdap162sa7gafz6hydfjdn";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.2.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0454pqi4qrb9iv30ghj4jqjhxi32b5yrsp0vi7x23m8c474y676m";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.30.0-darwin-arm64.tar.gz";
|
||||
sha256 = "10640g1azg8h65lf7qk11nh8l0ca236xhjp8yciaypn9b074s4rx";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.31.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0fndz76l1h6isspr60ng0dr3rv0v1rs8kp8w5ssx9ixi9r6nvqc5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1giprh33bxkvm3kb0c8hw9kxrjvrsjvvh3l8rq15iv8s11zzmq6l";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1nh9hsv9sc0l9vfamhv8ixbra9xnldai0h3dfgrmy0zl3v1njmh1";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-arm64.tar.gz";
|
||||
sha256 = "02v0p3ksv0rlz1fk216fr1q3smnxw3fvzpbd9bichsmp8hids4gq";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.16.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0jhr9h8m54kc9yqmxmd8di78yk1r6l6p2v621123vbj407l1san4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.29.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1wnmbn5dc7py89ycjhyhjg14g78wjsywqiyygc65hj6yz79w4avc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0jq26kj5v6fj2sw3yyygk0gnawbx85fj4vfn68a9lsfm10xl624p";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-darwin-arm64.tar.gz";
|
||||
sha256 = "00afm28jahxf631sf40vk8fdhsh7v0bdh0bhw3ivhy9hzrkzvww5";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.35.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1s0bk2bbwpqw1qng4mq8kcbz0jnizdvv3xfnhzr30b79qndg22yg";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0lysjbslc5cxybwgjhrm8rjnbqmnjb5ncsl9k1p3wkv7bmawkyvz";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.35.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1zz4j434ngckir5nk8cbnvac8vxfrf92qw3gcrhrnj65bpv8703i";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-arm64.tar.gz";
|
||||
@ -531,8 +531,8 @@
|
||||
sha256 = "0g1n0vkr1lqny1rgb1pgmsvyr2rc0jsj4j6m0ibgcps6j3g9h207";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.17.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0aayd2wx0fyrcqhsm0h29xya9xawfrcylx4485l356xj0jbpdm3b";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0jghq2bl0p7wwdipdqqvrpfdj1n1cl9q53ssjhmaj2f9vmikhdsi";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.6.1-darwin-arm64.tar.gz";
|
||||
@ -547,12 +547,12 @@
|
||||
sha256 = "0ssvm9dwpiisk1n93a522bcc5ijfqz2c25b1qgjsmlgd93phias4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.49.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0n2qjbhaqxdw94ryrq1ma73qfxvms1dvyqjg53ay1zsy889ssbfx";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.50.0-darwin-arm64.tar.gz";
|
||||
sha256 = "156yw48m0aglrk3b6ajz29x3cs9c9fdka4k91h8bss2r0badn9lf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-darwin-arm64.tar.gz";
|
||||
sha256 = "12ksqg1mrqwl2bwn8308l5k5vmxy1xc2makphwrpfd6sq0rsp1jg";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-arm64.tar.gz";
|
||||
sha256 = "140rvajb742r84sb3wjvrr1nvvl6a3lraj5k6lf1hlgvi4rv0q0y";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-arm64.tar.gz";
|
||||
@ -567,12 +567,12 @@
|
||||
sha256 = "09ri5bp9hvq9db1hpgjxjzd9i2fkmr7fry2fdjx6gv1j2djcvryq";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0y46n3wmpm35kb20wfiy0zgkrqrrrj6axkxwv8nxzgyl2hk7ay17";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-darwin-arm64.tar.gz";
|
||||
sha256 = "0pyl0rdwgd4vm4rcass0va4r036nwwj9imwi026gha4y9b3138cp";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.11.0-darwin-arm64.tar.gz";
|
||||
sha256 = "09z55lszcqym65w80zw1s63vcmvhn810si460w9fdzli0x9gg53n";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1wcslax3iih2ripcla3rqcyc4qxy7qcs5gix9n811b6dx20ppdqv";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz";
|
||||
@ -591,16 +591,16 @@
|
||||
sha256 = "1cl9qj041z8fgc95vgsx7y0f5jxyjr8cjb5ain4gl501v4s88hn9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1l0ykg6v6h70197163h5cn1di1ycacrn7j3s23yrphqfdq3xfi4g";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.2-darwin-arm64.tar.gz";
|
||||
sha256 = "0aav8v0hk9r647yxy2a4mxj45iqbjab26q3xm093z43sdq05rm0a";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.0-darwin-arm64.tar.gz";
|
||||
sha256 = "088kzd3lv32520xb57fsj5r284dnkarlf996cv5jdyrl1750rcd4";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.16.2-darwin-arm64.tar.gz";
|
||||
sha256 = "0m4385fndkwrag12w0yclbw0krhij27wa49wckwpvhn80syj80nr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.24.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0s2y6bf283x0vcjj3nrkbbyi0rszlicmdahpjlr8h50w45cg1j44";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.25.0-darwin-arm64.tar.gz";
|
||||
sha256 = "02882h0sgrcxdjsddmqld4k4637h3dmblkb42kjrdq6d518gfivn";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-arm64.tar.gz";
|
||||
@ -611,8 +611,8 @@
|
||||
sha256 = "1k4yvbmhpaf244bwv94swz7nvp07pllica40q2kcgz9aynb9zljy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0r3yrdhsqvwrmpnajqiyyrjnnfazawkwwx6yf6371g4n6zqxqy4c";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.10.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0sxdpvx2hwd1sgaz34ddpa676n0g081ymrldr881cb5lfh01zbji";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-arm64.tar.gz";
|
||||
@ -623,8 +623,8 @@
|
||||
sha256 = "1lnbsfcv1vrgc2hzmqwydxp9j6w9cmgpkpm83hmzz2ryy2vn6g07";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.3.0-darwin-arm64.tar.gz";
|
||||
sha256 = "02739v2jq70s9vxvibffd9xnhfpy0zp3724n79pdcjygj5xw32g9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.4.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1hy2w6x8mr7bi1pkaz4s8881w1nvl1nhrlqmc371xkpfkaahhj25";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v1.2.0-darwin-arm64.tar.gz";
|
||||
|
@ -6,6 +6,7 @@ in
|
||||
{
|
||||
pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { };
|
||||
pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { };
|
||||
pulumi-command = callPackage' ./pulumi-command.nix { };
|
||||
pulumi-language-nodejs = callPackage ./pulumi-language-nodejs.nix { };
|
||||
pulumi-language-python = callPackage ./pulumi-language-python.nix { };
|
||||
pulumi-random = callPackage' ./pulumi-random.nix { };
|
||||
|
33
pkgs/tools/admin/pulumi-packages/pulumi-command.nix
Normal file
33
pkgs/tools/admin/pulumi-packages/pulumi-command.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, mkPulumiPackage
|
||||
}:
|
||||
mkPulumiPackage rec {
|
||||
owner = "pulumi";
|
||||
repo = "pulumi-command";
|
||||
version = "0.7.1";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QrKtnpJGWoc5WwV6bnERrN3iBJpyoFKFwlqBtNNK7F8=";
|
||||
vendorHash = "sha256-HyzWPRYfjdjGGBByCc8N91qWhX2QBJoQMpudHWrkmFM=";
|
||||
cmdGen = "pulumi-gen-command";
|
||||
cmdRes = "pulumi-resource-command";
|
||||
extraLdflags = [
|
||||
"-X github.com/pulumi/${repo}/provider/v4/pkg/version.Version=v${version}"
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
pushd ..
|
||||
|
||||
${cmdGen} provider/cmd/pulumi-resource-command/schema.json --version ${version}
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Pulumi provider to execute commands and scripts either locally or remotely as part of the Pulumi resource model";
|
||||
homepage = "https://github.com/pulumi/pulumi-command";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ veehaitch trundle ];
|
||||
};
|
||||
}
|
@ -30,7 +30,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipxe";
|
||||
version = "unstable-2023-02-20";
|
||||
version = "unstable-2023-02-28";
|
||||
|
||||
nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipxe";
|
||||
repo = "ipxe";
|
||||
rev = "471599dc7721d454b6658062c901b52038a78be2";
|
||||
sha256 = "F158oUVsfIvuWDHwUnJlyyCFsfn0varRA6Borf9VZ60=";
|
||||
rev = "04e60a278abcda47301f6be2c23755e5e1004661";
|
||||
sha256 = "/p+mSn9ZL5H9aTIygpbgFaW5uBBBlSQfh/OksI0bMbY=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
|
||||
|
@ -3,33 +3,37 @@
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
, Security
|
||||
, darwin
|
||||
, curl
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "miniserve";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = "miniserve";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pi+dBJE+EqQpyZAkIV7duK1g378J6BgjIiFcjV5H1fQ=";
|
||||
hash = "sha256-iI9J1BGD7/SDLoJ2WfizAEHUXBJH4DiUbfGingef9lM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-nRTGKW33NO2vRkvpNVk4pT1DrHPEsSfhwf8y5pJ+n9U=";
|
||||
cargoSha256 = "sha256-qvV7rJx0Yrv5CLRqSshGf1JUL6nW5KDb7Sv7B6M6WDs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
curl
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=bind_ipv4_ipv6::case_2"
|
||||
"--skip=cant_navigate_up_the_root"
|
||||
"--skip=qrcode_hidden_in_tty_when_disabled"
|
||||
"--skip=qrcode_shown_in_tty_when_enabled"
|
||||
];
|
||||
@ -44,6 +48,8 @@ rustPlatform.buildRustPackage rec {
|
||||
--zsh <($out/bin/miniserve --print-completions zsh)
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool to serve files and directories over HTTP";
|
||||
homepage = "https://github.com/svenstaro/miniserve";
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user