Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-18 12:04:55 +00:00 committed by GitHub
commit dd892e7e2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
163 changed files with 1857 additions and 570 deletions

View file

@ -3,6 +3,7 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$'
PANDOC ?= pandoc PANDOC ?= pandoc
pandoc_media_dir = media pandoc_media_dir = media
# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh).
# TODO: Remove raw-attribute when we can get rid of DocBook altogether. # TODO: Remove raw-attribute when we can get rid of DocBook altogether.
pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute
pandoc_flags = --extract-media=$(pandoc_media_dir) \ pandoc_flags = --extract-media=$(pandoc_media_dir) \
@ -101,10 +102,10 @@ functions/library/generated: doc-support/result
%.section.xml: %.section.md %.section.xml: %.section.md
$(PANDOC) $^ -t docbook \ $(PANDOC) $^ -t docbook \
$(pandoc_flags) \ $(pandoc_flags) \
| cat > $@ -o $@
%.chapter.xml: %.chapter.md %.chapter.xml: %.chapter.md
$(PANDOC) $^ -t docbook \ $(PANDOC) $^ -t docbook \
--top-level-division=chapter \ --top-level-division=chapter \
$(pandoc_flags) \ $(pandoc_flags) \
| cat > $@ -o $@

View file

@ -6515,10 +6515,14 @@
name = "Matthias C. M. Troffaes"; name = "Matthias C. M. Troffaes";
}; };
McSinyx = { McSinyx = {
email = "vn.mcsinyx@gmail.com"; email = "mcsinyx@disroot.org";
github = "McSinyx"; github = "McSinyx";
githubId = 13689192; githubId = 13689192;
name = "Nguyn Gia Phong"; name = "Nguyn Gia Phong";
keys = [{
longkeyid = "rsa3072/0x27148B2C06A2224B";
fingerprint = "E90E 11B8 0493 343B 6132 E394 2714 8B2C 06A2 224B";
}];
}; };
mcwitt = { mcwitt = {
email = "mcwitt@gmail.com"; email = "mcwitt@gmail.com";
@ -9864,6 +9868,12 @@
githubId = 39732259; githubId = 39732259;
name = "Justus K"; name = "Justus K";
}; };
SubhrajyotiSen = {
email = "subhrajyoti12@gmail.com";
github = "SubhrajyotiSen";
githubId = 12984845;
name = "Subhrajyoti Sen";
};
suhr = { suhr = {
email = "suhr@i2pmail.org"; email = "suhr@i2pmail.org";
github = "suhr"; github = "suhr";
@ -10666,6 +10676,12 @@
githubId = 33242106; githubId = 33242106;
name = "Uri Baghin"; name = "Uri Baghin";
}; };
urlordjames = {
email = "urlordjames@gmail.com";
github = "urlordjames";
githubId = 32751441;
name = "urlordjames";
};
uskudnik = { uskudnik = {
email = "urban.skudnik@gmail.com"; email = "urban.skudnik@gmail.com";
github = "uskudnik"; github = "uskudnik";

View file

@ -3,11 +3,11 @@
<para> <para>
If NixOS fails to boot, there are a number of kernel command line If NixOS fails to boot, there are a number of kernel command line
parameters that may help you to identify or fix the issue. You can parameters that may help you to identify or fix the issue. You can
add these parameters in the GRUB boot menu by pressing add these parameters in the GRUB boot menu by pressing “e” to modify
<quote>e</quote> to modify the selected boot entry and editing the the selected boot entry and editing the line starting with
line starting with <literal>linux</literal>. The following are some <literal>linux</literal>. The following are some useful kernel
useful kernel command line parameters that are recognised by the command line parameters that are recognised by the NixOS boot
NixOS boot scripts or by systemd: scripts or by systemd:
</para> </para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
@ -44,7 +44,7 @@
<para> <para>
Like <literal>boot.debug1</literal>, but runs stage1 until Like <literal>boot.debug1</literal>, but runs stage1 until
kernel modules are loaded and device nodes are created. This kernel modules are loaded and device nodes are created. This
may help with e.g. making the keyboard work. may help with e.g. making the keyboard work.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -117,7 +117,7 @@
if youd chosen <quote>ignore the error and continue</quote>. if youd chosen <quote>ignore the error and continue</quote>.
</para> </para>
<para> <para>
If no login prompts or X11 login screens appear (e.g. due to hanging If no login prompts or X11 login screens appear (e.g. due to hanging
dependencies), you can press Alt+ArrowUp. If youre lucky, this will dependencies), you can press Alt+ArrowUp. If youre lucky, this will
start rescue mode (described above). (Also note that since most start rescue mode (described above). (Also note that since most
units have a 90-second timeout before systemd gives up on them, the units have a 90-second timeout before systemd gives up on them, the

View file

@ -1,5 +1,5 @@
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="release-21.11"> <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-21.11">
<title>Release 21.11 (<quote>?</quote>, 2021.11/??)</title> <title>Release 21.11 (“?”, 2021.11/??)</title>
<para> <para>
In addition to numerous new and upgraded packages, this release has In addition to numerous new and upgraded packages, this release has
the following highlights: the following highlights:
@ -12,7 +12,7 @@
</para> </para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<section xml:id="highlights"> <section xml:id="sec-release-21.11-highlights">
<title>Highlights</title> <title>Highlights</title>
<itemizedlist spacing="compact"> <itemizedlist spacing="compact">
<listitem> <listitem>
@ -22,7 +22,7 @@
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="new-services"> <section xml:id="sec-release-21.11-new-services">
<title>New Services</title> <title>New Services</title>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
@ -50,7 +50,7 @@
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="backward-incompatibilities"> <section xml:id="sec-release-21.11-incompatibilities">
<title>Backward Incompatibilities</title> <title>Backward Incompatibilities</title>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
@ -311,7 +311,7 @@
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="other-notable-changes"> <section xml:id="sec-release-21.11-notable-changes">
<title>Other Notable Changes</title> <title>Other Notable Changes</title>
<para> <para>
</para> </para>

View file

@ -8,25 +8,31 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
pushd $DIR pushd $DIR
# NOTE: Keep in sync with Nixpkgs manual (/doc/Makefile).
# TODO: Remove raw-attribute when we can get rid of DocBook altogether.
pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute
pandoc_flags=(
# media extraction and diagram-generator.lua not needed
"--lua-filter=$DIR/../../../doc/labelless-link-is-xref.lua"
-f "commonmark${pandoc_commonmark_enabled_extensions}+smart"
-t docbook
)
OUT="$DIR/from_md" OUT="$DIR/from_md"
mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$') mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$')
for mf in ${MD_FILES[*]}; do for mf in ${MD_FILES[*]}; do
if [ "${mf: -11}" == ".section.md" ]; then if [ "${mf: -11}" == ".section.md" ]; then
mkdir -p $(dirname "$OUT/$mf") mkdir -p $(dirname "$OUT/$mf")
pandoc "$mf" -t docbook \ pandoc "$mf" "${pandoc_flags[@]}" \
--extract-media=media \ -o "$OUT/${mf%".section.md"}.section.xml"
-f markdown+smart \
| cat > "$OUT/${mf%".section.md"}.section.xml"
fi fi
if [ "${mf: -11}" == ".chapter.md" ]; then if [ "${mf: -11}" == ".chapter.md" ]; then
mkdir -p $(dirname "$OUT/$mf") mkdir -p $(dirname "$OUT/$mf")
pandoc "$mf" -t docbook \ pandoc "$mf" "${pandoc_flags[@]}" \
--top-level-division=chapter \ --top-level-division=chapter \
--extract-media=media \ -o "$OUT/${mf%".chapter.md"}.chapter.xml"
-f markdown+smart \
| cat > "$OUT/${mf%".chapter.md"}.chapter.xml"
fi fi
done done

View file

@ -1,14 +1,14 @@
# Release 21.11 (“?”, 2021.11/??) {#release-21.11} # Release 21.11 (“?”, 2021.11/??) {#sec-release-21.11}
In addition to numerous new and upgraded packages, this release has the following highlights: In addition to numerous new and upgraded packages, this release has the following highlights:
* Support is planned until the end of April 2022, handing over to 22.05. * Support is planned until the end of April 2022, handing over to 22.05.
## Highlights ## Highlights {#sec-release-21.11-highlights}
* PHP now defaults to PHP 8.0, updated from 7.4. * PHP now defaults to PHP 8.0, updated from 7.4.
## New Services ## New Services {#sec-release-21.11-new-services}
* [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP * [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP
database updater from MaxMind. Available as database updater from MaxMind. Available as
@ -22,7 +22,7 @@ In addition to numerous new and upgraded packages, this release has the followin
implementation of the Common Address Redundancy Protocol (CARP). Available as implementation of the Common Address Redundancy Protocol (CARP). Available as
[networking.ucarp](options.html#opt-networking.ucarp.enable). [networking.ucarp](options.html#opt-networking.ucarp.enable).
## Backward Incompatibilities ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
* The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0 * The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0
@ -85,4 +85,4 @@ In addition to numerous new and upgraded packages, this release has the followin
- GitVersionTree - GitVersionTree
- NDeskOptions - NDeskOptions
## Other Notable Changes ## Other Notable Changes {#sec-release-21.11-notable-changes}

View file

@ -1,19 +1,48 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsa-lib { lib
, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor , stdenv
, fetchpatch, fmt , fetchFromGitHub
, adlplugChip ? "-DADLplug_CHIP=OPL3" , fetchpatch
, pname ? "ADLplug" }: , cmake
, pkg-config
, fmt
, liblo
, alsa-lib
, freetype
, libX11
, libXrandr
, libXinerama
, libXext
, libXcursor
, libobjc
, Cocoa
, CoreServices
, WebKit
, DiscRecording
# Enabling JACK requires a JACK server at runtime, no fallback mechanism
, withJack ? false, jack
, type ? "ADL"
}:
assert lib.assertOneOf "type" type [ "ADL" "OPN" ];
let
chip = {
ADL = "OPL3";
OPN = "OPN2";
}.${type};
mainProgram = "${type}plug";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname; pname = "${lib.strings.toLower type}plug";
version = "1.0.2"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jpcima"; owner = "jpcima";
repo = "ADLplug"; repo = "ADLplug";
rev = "v${version}"; rev = "v${version}";
sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f";
}; };
patches = [ patches = [
@ -25,19 +54,52 @@ stdenv.mkDerivation rec {
}) })
]; ];
cmakeFlags = [ adlplugChip "-DADLplug_USE_SYSTEM_FMT=ON" ]; cmakeFlags = [
"-DADLplug_CHIP=${chip}"
"-DADLplug_USE_SYSTEM_FMT=ON"
"-DADLplug_Jack=${if withJack then "ON" else "OFF"}"
];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
"-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers"
]);
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [ buildInputs = [
libjack2 alsa-lib freetype libX11 libXrandr libXinerama libXext fmt
liblo
] ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
freetype
libX11
libXrandr
libXinerama
libXext
libXcursor libXcursor
]; ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
nativeBuildInputs = [ cmake pkg-config fmt ]; libobjc
Cocoa
CoreServices
WebKit
DiscRecording
] ++ lib.optional withJack jack;
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir $out/Applications
mv $out/bin/${mainProgram}.app $out/Applications/
ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram}
'';
meta = with lib; { meta = with lib; {
description = "OPL3 and OPN2 FM Chip Synthesizer"; inherit mainProgram;
description = "${chip} FM Chip Synthesizer";
homepage = src.meta.homepage; homepage = src.meta.homepage;
license = licenses.boost; license = licenses.boost;
platforms = platforms.linux; platforms = platforms.all;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ OPNA2608 ];
}; };
} }

View file

@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
ldLibraryPath = lib.strings.makeLibraryPath buildInputs; ldLibraryPath = lib.strings.makeLibraryPath buildInputs;
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
cp -r opt/bitwig-studio $out/libexec cp -r opt/bitwig-studio $out/libexec
ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio
@ -41,6 +43,8 @@ stdenv.mkDerivation rec {
substitute usr/share/applications/bitwig-studio.desktop \ substitute usr/share/applications/bitwig-studio.desktop \
$out/share/applications/bitwig-studio.desktop \ $out/share/applications/bitwig-studio.desktop \
--replace /usr/bin/bitwig-studio $out/bin/bitwig-studio --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio
runHook postInstall
''; '';
postFixup = '' postFixup = ''
@ -57,7 +61,7 @@ stdenv.mkDerivation rec {
wrapProgram $f \ wrapProgram $f \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
--prefix PATH : "${binPath}" \ --prefix PATH : "${binPath}" \
--prefix LD_LIBRARY_PATH : "${ldLibraryPath}" --suffix LD_LIBRARY_PATH : "${ldLibraryPath}"
done done
''; '';

View file

@ -1,38 +1,51 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsa-lib, makeDesktopItem, libjack2 }: { lib
, mkDerivation
, stdenv
, fetchFromGitHub
, makeDesktopItem
, cmake
, pkg-config
, qtbase
, glib
, alsa-lib
, withJack ? stdenv.hostPlatform.isUnix, jack
}:
let let
desktopItem = makeDesktopItem rec { mainProgram = "mt32emu-qt";
name = "Munt"; in
exec = "mt32emu-qt"; mkDerivation rec {
desktopName = name;
genericName = "Munt synthesiser";
categories = "Audio;AudioVideo;";
};
in mkDerivation rec {
version = "2.4.1";
pname = "munt"; pname = "munt";
version = "2.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = with lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; rev = "munt_${lib.replaceChars [ "." ] [ "_" ] version}";
sha256 = "0bszhkbz24hhx32f973l6h5lkyn4lxhqrckiwmv765d1sba8n5bk"; sha256 = "1lknq2a72gv1ddhzr7f967wpa12lh805jj4gjacdnamgrc1h22yn";
}; };
postInstall = ''
ln -s ${desktopItem}/share/applications $out/share
'';
dontFixCmake = true; dontFixCmake = true;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qtbase alsa-lib libjack2 ];
buildInputs = [ qtbase glib ]
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
++ lib.optional withJack jack;
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir $out/Applications
mv $out/bin/${mainProgram}.app $out/Applications/
wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram}
ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram}
'';
meta = with lib; { meta = with lib; {
inherit mainProgram;
description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices";
homepage = "http://munt.sourceforge.net/"; homepage = "http://munt.sourceforge.net/";
license = with licenses; [ lgpl21 gpl3 ]; license = with licenses; [ lgpl21 gpl3 ];
platforms = platforms.linux; platforms = platforms.all;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ OPNA2608 ];
}; };
} }

View file

@ -1,19 +1,16 @@
{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac { config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }: , usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let stdenv.mkDerivation rec {
version = "0.5.8";
in stdenv.mkDerivation {
pname = "openmpt123"; pname = "openmpt123";
inherit version; version = "0.5.9";
src = fetchurl { src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "sha256-KeLCEXS3P2fyul7naAjWLxgrEw5PcE7i2a6Cg5gtis0="; sha256 = "0h86p8mnpm98vc4v6jbvrmm02fch7dnn332i26fg3a2s1738m04d";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ]
@ -21,11 +18,13 @@ in stdenv.mkDerivation {
configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio"; configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio";
doCheck = true;
meta = with lib; { meta = with lib; {
description = "A cross-platform command-line based module file player"; description = "A cross-platform command-line based module file player";
homepage = "https://lib.openmpt.org/libopenmpt/"; homepage = "https://lib.openmpt.org/libopenmpt/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

View file

@ -1,25 +1,74 @@
{ lib, stdenv, fetchurl, which, libao, pkg-config }: { lib
, stdenv
, fetchFromGitLab
, pkg-config
, which
, makeWrapper
, libao
, libbencodetools
, sox
, lame
, flac
, vorbis-tools
}:
let stdenv.mkDerivation {
version = "2.13";
in stdenv.mkDerivation {
pname = "uade123"; pname = "uade123";
inherit version; version = "unstable-2021-05-21";
src = fetchurl {
url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; src = fetchFromGitLab {
sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; owner = "uade-music-player";
repo = "uade";
rev = "7169a46e777d19957cd7ff8ac31843203e725ddc";
sha256 = "1dm7c924fy79y3wkb0qi71m1k6yw1x6j3whw7d0w4ka9hv6za03b";
}; };
nativeBuildInputs = [ pkg-config which ];
buildInputs = [ libao ]; postPatch = ''
patchShebangs .
substituteInPlace src/frontends/mod2ogg/mod2ogg2.sh.in \
--replace '-e stat' '-n stat' \
--replace '/usr/local' "$out"
'';
nativeBuildInputs = [
pkg-config
which
makeWrapper
];
buildInputs = [
libao
libbencodetools
sox
lame
flac
vorbis-tools
];
configureFlags = [
"--bencode-tools-prefix=${libbencodetools}"
];
enableParallelBuilding = true; enableParallelBuilding = true;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
postInstall = ''
wrapProgram $out/bin/mod2ogg2.sh \
--prefix PATH : $out/bin:${lib.makeBinPath [ sox lame flac vorbis-tools ]}
# This is an old script, don't break expectations by renaming it
ln -s $out/bin/mod2ogg2{.sh,}
'';
meta = with lib; { meta = with lib; {
description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API";
homepage = "http://zakalwe.fi/uade/"; homepage = "https://zakalwe.fi/uade/";
license = licenses.gpl2; # It's a mix of licenses. "GPL", Public Domain, "LGPL", GPL2+, BSD, LGPL21+ and source code with unknown licenses. E.g.
maintainers = [ ]; # - hippel-coso player is "[not] under any Open Source certified license"
# - infogrames player is disassembled from Andi Silvas player, unknown license
# Let's make it easy and flag the whole package as unfree.
license = licenses.unfree;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "faraday"; pname = "faraday";
version = "0.2.3-alpha"; version = "0.2.5-alpha";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lightninglabs"; owner = "lightninglabs";
repo = "faraday"; repo = "faraday";
rev = "v${version}"; rev = "v${version}";
sha256 = "16cqaslsbwda23b5n0sfppybd3ma4ch545100ydxrwac4zhrq4kq"; sha256 = "16mz333a6awii6g46gr597j31jmgws4285s693q0b87fl1ggj2zz";
}; };
vendorSha256 = "1hh99nfprlmhkc36arg3w1kxby59i2l7n258cp40niv7bjn37hrq"; vendorSha256 = "1nclmvypxp5436q6qaagp1k5bfmaia7hsykw47va0pijlsvsbmck";
subPackages = [ "cmd/frcli" "cmd/faraday" ]; subPackages = [ "cmd/frcli" "cmd/faraday" ];
@ -22,6 +22,6 @@ buildGoModule rec {
description = "LND Channel Management Tools"; description = "LND Channel Management Tools";
homepage = "https://github.com/lightninglabs/faraday"; homepage = "https://github.com/lightninglabs/faraday";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ proofofkeags ]; maintainers = with maintainers; [ proofofkeags prusnak ];
}; };
} }

View file

@ -9,17 +9,17 @@ let
in buildGoModule rec { in buildGoModule rec {
pname = "go-ethereum"; pname = "go-ethereum";
version = "1.10.3"; version = "1.10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ethereum"; owner = "ethereum";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-85aUR7MvaPeRilC+4oj6XW2IEUvxRUsVz63tQ/Jc7xw="; sha256 = "sha256-DRlIiO3iXUsQnmOf5T9uk3560tVbS+Hrs8QtVkmllAI=";
}; };
runVend = true; runVend = true;
vendorSha256 = "sha256-8zhVQ8FUdzog7h9RBfuq8uBp0zjulXbDOLAPljp4deA="; vendorSha256 = "sha256-a/vY9iyqSM9QPs7lGFF6E7e2cMjIerVkNf5KwiWdyr0=";
doCheck = false; doCheck = false;

View file

@ -0,0 +1,27 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "lightning-loop";
version = "0.14.1-beta";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "loop";
rev = "v${version}";
sha256 = "0fnbf0cryrw9yk3z1g7innv1rxxk7h2lhfakdj994l5a0pgzghmy";
};
vendorSha256 = "1i7mmf4ab4a6h08df6zlyjdnmvn44i2y3fc05hq6g1ln1bzdrz40";
subPackages = [ "cmd/loop" "cmd/loopd" ];
meta = with lib; {
description = "Lightning Loop Client";
homepage = "https://github.com/lightninglabs/loop";
license = licenses.mit;
maintainers = with maintainers; [ proofofkeags prusnak ];
};
}

View file

@ -0,0 +1,27 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "lightning-pool";
version = "0.5.0-alpha";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "pool";
rev = "v${version}";
sha256 = "0i8qkxnrx3a89aw3v0mx7przlldl8kc0ng6g1m435366y6nzdarb";
};
vendorSha256 = "04v2788w8l734n5xz6fwjbwkqlbk8q77nwncjpn7890mw75yd3rn";
subPackages = [ "cmd/pool" "cmd/poold" ];
meta = with lib; {
description = "Lightning Pool Client";
homepage = "https://github.com/lightninglabs/pool";
license = licenses.mit;
maintainers = with maintainers; [ proofofkeags prusnak ];
};
}

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "lnd"; pname = "lnd";
version = "0.12.1-beta"; version = "0.13.0-beta";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lightningnetwork"; owner = "lightningnetwork";
repo = "lnd"; repo = "lnd";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ly6909cg0qzdsp9idp1g7zqd6liw7f142d7n7vga64s1ksvv6lx"; sha256 = "0fwidjkfzzd7k891x5z7jrx2arl0kwj6vm9z2acsyy7riv4zfjbq";
}; };
vendorSha256 = "00q8dydskzg4rhxnnpzpbmmvc3q4wzm8z3dps2bv0nx3fk0fmrl3"; vendorSha256 = "19myr9f5zh05y6lagd9pra60y8df7pz837310cbpq9a6zzwpdxk2";
subPackages = ["cmd/lncli" "cmd/lnd"]; subPackages = ["cmd/lncli" "cmd/lnd"];

View file

@ -13,16 +13,16 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = { sha256 = {
x86_64-linux = "1bj954kjwrk0nx8griy2y8gp7dys0wf610ki0jrby46mlvrmszs1"; x86_64-linux = "0cklp0mp7qylzrqnfbvzs308q0bzpswlqw5n98qhl1jb5783svx1";
x86_64-darwin = "1dqpz7qpnycd4b7iqg639rab3ds4m06m15rmyp7r70053qaw1s61"; x86_64-darwin = "04yyv0wpkzdjfiy9kj2jslhv7nc5i6nw2207vfnbzysgs55l3x63";
aarch64-linux = "04ifmw39swdl6ybz6jpan2krsqli1kjyjnicjaisww8vhvhr2lzk"; aarch64-linux = "1ygk51902g0q7x3r6kd3s7gi2gx86x10svpvbipl494qcyfngqzs";
armv7l-linux = "0y1rzn2jy4wrn2yr95v7zzyl36pj9mbz4dgvazvy465wzk5ai7b4"; armv7l-linux = "0z5rg1nl8lz7zsvml6dfz093dbyrkr4zvvfssqiyarw4n24d2mim";
}.${system}; }.${system};
in in
callPackage ./generic.nix rec { callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release. # Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem. # This is important for the extension ecosystem.
version = "1.57.0"; version = "1.57.1";
pname = "vscode"; pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders"; executableName = "code" + lib.optionalString isInsiders "-insiders";

View file

@ -1,14 +1,53 @@
{ { mkDerivation
mkDerivation, lib, kdepimTeam, , lib
extra-cmake-modules, kdoctools, , akonadi
akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, , akonadi-import-wizard
kconfigwidgets, kcoreaddons, libkdepim, , akonadi-search
kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap, , extra-cmake-modules
kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, , kaddressbook
kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, , kbookmarks
kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon, , kcalutils
messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi, kdepim-addons, , kcmutils
qtkeychain, libsecret , kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kdepim-addons
, kdepim-runtime
, kdepimTeam
, kdoctools
, kguiaddons
, ki18n
, kiconthemes
, kinit
, kio
, kldap
, kleopatra
, kmail-account-wizard
, kmailtransport
, knotifications
, knotifyconfig
, kontactinterface
, kparts
, kpty
, kservice
, ktextwidgets
, ktnef
, kwallet
, kwidgetsaddons
, kwindowsystem
, kxmlgui
, libgravatar
, libkdepim
, libksieve
, libsecret
, mailcommon
, messagelib
, pim-data-exporter
, pim-sieve-editor
, qtkeychain
, qtscript
, qtwebengine
}: }:
mkDerivation { mkDerivation {
@ -19,13 +58,53 @@ mkDerivation {
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig akonadi-search
kconfigwidgets kcoreaddons kguiaddons ki18n kbookmarks
kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim kcalutils
knotifications knotifyconfig kontactinterface kparts kpty kservice kcmutils
ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar kcompletion
libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine kconfig
kdepim-addons qtkeychain libsecret kconfigwidgets
kcoreaddons
kdepim-addons
kguiaddons
ki18n
kiconthemes
kinit
kio
kldap
kmail-account-wizard
kmailtransport
knotifications
knotifyconfig
kontactinterface
kparts
kpty
kservice
ktextwidgets
ktnef
kwidgetsaddons
kwindowsystem
kxmlgui
libgravatar
libkdepim
libksieve
libsecret
mailcommon
messagelib
pim-sieve-editor
qtkeychain
qtscript
qtwebengine
akonadi-import-wizard
kaddressbook
kleopatra
pim-data-exporter
]; ];
outputs = [ "out" "doc" ];
propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
postFixup = ''
wrapProgram "$out/bin/kmail" \
--prefix PATH : "${lib.makeBinPath [ akonadi akonadi-import-wizard kaddressbook kleopatra kmail-account-wizard pim-data-exporter ]}"
'';
} }

View file

@ -1,13 +1,12 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE { lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE
, libXext , freetype, libXrender, fontconfig, libXft, libXinerama , libXext , freetype, libXrender, fontconfig, libXft, libXinerama
, libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 , libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3
, curl }: , curl, writeShellScript, common-updater-scripts }:
let let
url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.19-9e79d1da/Hubstaff-1.5.19-9e79d1da.sh";
data = builtins.fromJSON (builtins.readFile ./revision.json); version = "1.5.19-9e79d1da";
sha256 = "1l4sq8cblpl1kclkx5pgy0ldfmqa3n8bvdl5qml0n78r0lpk382j";
inherit (data) version url sha256;
rpath = lib.makeLibraryPath rpath = lib.makeLibraryPath
[ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
@ -56,6 +55,18 @@ stdenv.mkDerivation {
ln -s $opt/data/resources $opt/x86_64/resources ln -s $opt/data/resources $opt/x86_64/resources
''; '';
updateScript = writeShellScript "hubstaff-updater" ''
set -eu -o pipefail
installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux)
version=$(echo "$installation_script_url" | sed -r 's/^https:\/\/hubstaff\-production\.s3\.amazonaws\.com\/downloads\/HubstaffClient\/Builds\/Release\/([^\/]+)\/Hubstaff.+$/\1/')
sha256=$(nix-prefetch-url "$installation_script_url")
${common-updater-scripts}/bin/update-source-version hubstaff "$version" "$sha256" "$installation_script_url"
'';
meta = with lib; { meta = with lib; {
description = "Time tracking software"; description = "Time tracking software";
homepage = "https://hubstaff.com/"; homepage = "https://hubstaff.com/";

View file

@ -1,5 +0,0 @@
{
"url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.15-28673d1c/Hubstaff-1.5.15-28673d1c.sh",
"version": "1.5.15-28673d1c",
"sha256": "0ging41l3a3sdj6bggh913h71gqmb8l3rplp4civpgclnfzv7fg2"
}

View file

@ -1,18 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-prefetch-git curl
SCRIPT_DIR=$(dirname "$(readlink -f "$BASH_SOURCE")")
installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux)
version=$(echo "$installation_script_url" | sed -r 's/^https:\/\/hubstaff\-production\.s3\.amazonaws\.com\/downloads\/HubstaffClient\/Builds\/Release\/([^\/]+)\/Hubstaff.+$/\1/')
sha256=$(nix-prefetch-url "$installation_script_url")
cat <<EOT > $SCRIPT_DIR/revision.json
{
"url": "$installation_script_url",
"version": "$version",
"sha256": "$sha256"
}
EOT

View file

@ -0,0 +1,48 @@
{ lib, fetchFromGitHub
, buildGoModule, pkg-config, wrapGAppsHook, gobject-introspection
, gtk-layer-shell, gtk3, pango, gdk-pixbuf, atk
}:
buildGoModule rec {
pname = "nwg-menu";
version = "unstable-2021-06-12";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-menu";
rev = "b0746e26514a047ed9c6b975a71b7263aa39bd56";
hash = "sha256-rxyf3CfpfWnRAlIR/pl+s7LGAZbZjdtNWPPK7BecdhQ=";
};
vendorSha256 = "sha256-nN5iBleK12SKY9PBiDA+tM4B8FiVGZLXbtJM2+YrEfA=";
runVend = true;
doCheck = false;
buildInputs = [ atk gtk3 gdk-pixbuf gtk-layer-shell pango ];
nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ];
prePatch = ''
for file in main.go tools.go; do
substituteInPlace $file --replace '/usr/share/nwg-menu' $out/share
done
'';
postInstall = ''
mkdir -p $out/share/
cp menu-start.css $out/share/
'';
preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$out/share")
'';
meta = with lib; {
homepage = "https://github.com/nwg-piotr/nwg-menu";
description = "MenuStart plugin for nwg-panel";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ berbiche ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, python3Packages, fetchFromGitHub }: { lib, python3Packages, fetchFromGitHub, glib, wrapGAppsHook }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "printrun"; pname = "printrun";
@ -11,6 +11,8 @@ python3Packages.buildPythonApplication rec {
sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81"; sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81";
}; };
nativeBuildInputs = [ glib wrapGAppsHook ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial
]; ];
@ -29,6 +31,14 @@ python3Packages.buildPythonApplication rec {
done done
''; '';
dontWrapGApps = true;
# https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; { meta = with lib; {
description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software"; description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software";
homepage = "https://github.com/kliment/Printrun"; homepage = "https://github.com/kliment/Printrun";

View file

@ -1,8 +1,8 @@
{ {
"stable": { "stable": {
"version": "91.0.4472.106", "version": "91.0.4472.114",
"sha256": "1fxy1l2dl0f6v8566lykcng18ma6fv4nlwxmdb0hh06fgp6khpjl", "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1",
"sha256bin64": "11l88fqrl1r7b02j78zgrr6kajayl8kw8mb8b91ard18w5kz1xvd", "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-04-06", "version": "2021-04-06",

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "helm"; pname = "helm";
version = "3.6.0"; version = "3.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "helm"; owner = "helm";
repo = "helm"; repo = "helm";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-sVa7d69MuOjH1IhUMcXu79kEE0BKylLYx6yrOV/DExY="; sha256 = "sha256-MXMgCqdFNRMJaStoFMx8BO8OI1B7FqSETk0zW6a/vbE=";
}; };
vendorSha256 = "sha256-PTAyRG6PZK+vaiheUd3oiu4iBGlnFjoCrci0CYbXjBk="; vendorSha256 = "sha256-PTAyRG6PZK+vaiheUd3oiu4iBGlnFjoCrci0CYbXjBk=";

View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kubernetes"; pname = "kubernetes";
version = "1.21.1"; version = "1.21.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";
repo = "kubernetes"; repo = "kubernetes";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gJjCw28SqU49kIiRH+MZgeYN4VBgKVEaRPr5A/2c5Pc="; sha256 = "sha256-GAX8ODjGj5LM44KgJC0N5uuOH4z33lDWoQgImOl8/xo=";
}; };
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];

View file

@ -64,8 +64,8 @@ in
}; };
edge = generic { edge = generic {
channel = "edge"; channel = "edge";
version = "21.6.2"; version = "21.6.3";
sha256 = "sha256-kgdKH+cIYRg5A3+wrJJ7jcY6Xl206EwBYa37PT3xn1k"; sha256 = "sha256-NgfbkeVRl0AGNkZSS2nSAHp4eZ49QNSEYMuFe1G5iBY=";
vendorSha256 = "sha256-QVLg1ZRsNQPM4lERVHpZLbd+I32JZ1pbGNSGIVTbseg="; vendorSha256 = "sha256-rq/MHo5MG2EKZ3d937TIDXFCoWnLlQO3C/fo1bhRxCA=";
}; };
} }

View file

@ -38,14 +38,17 @@
, xdg-utils , xdg-utils
}: }:
let
getFirst = n: v: builtins.concatStringsSep "." (lib.take n (lib.splitString "." v));
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bluejeans"; pname = "bluejeans";
version = "2.21.3"; version = "2.22.0.87";
buildNumber = "2";
src = fetchurl { src = fetchurl {
url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm"; url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
sha256 = "sha256-a/REuxkqZmLLa7N3CUgUAdq74VMD9D10a/Sx2jOj1QA="; sha256 = "sha256-0nobn+YcvqakwvBdkoEJrzHoL+OGym2zJ806oUabYfo=";
}; };
nativeBuildInputs = [ rpmextract makeWrapper ]; nativeBuildInputs = [ rpmextract makeWrapper ];
@ -106,7 +109,7 @@ stdenv.mkDerivation rec {
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
opt/BlueJeans/resources/BluejeansHelper opt/BlueJeans/resources/BluejeansHelper
cc $localtime64_stub -shared -o "$out"/opt/BlueJeans/liblocaltime64_stub.so cc $localtime64_stub -shared -o "${placeholder "out"}"/opt/BlueJeans/liblocaltime64_stub.so
makeWrapper $out/opt/BlueJeans/bluejeans-v2 $out/bin/bluejeans \ makeWrapper $out/opt/BlueJeans/bluejeans-v2 $out/bin/bluejeans \
--set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \ --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \
@ -119,6 +122,8 @@ stdenv.mkDerivation rec {
patchShebangs "$out" patchShebangs "$out"
''; '';
passthru.updateScript = ./update.sh;
meta = with lib; { meta = with lib; {
description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day";
homepage = "https://www.bluejeans.com"; homepage = "https://www.bluejeans.com";
@ -127,3 +132,4 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

View file

@ -0,0 +1,12 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl pup common-updater-scripts
set -eu -o pipefail
version="$(curl -Ls https://www.bluejeans.com/download | \
pup 'a[aria-label~="Linux"] attr{href}' | \
#output contains *.deb and *.rpm
grep "\.rpm" | \
awk -F'[ ._ ]' '{printf $6"."$7"."$8"."$9"\n"}')"
update-source-version bluejeans-gui "$version"

View file

@ -8,6 +8,7 @@
, dpkg , dpkg
, glib , glib
, gtk3 , gtk3
, wrapGAppsHook
, libkrb5 , libkrb5
, libsecret , libsecret
, nss , nss
@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
dpkg dpkg
wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [

View file

@ -24,11 +24,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "PortfolioPerformance"; pname = "PortfolioPerformance";
version = "0.52.0"; version = "0.53.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "1pvjckh7z803piqyzrvk54jd43f2vcyx20zjcgmq1va8jc3q69k1"; sha256 = "0hddq1nijxhr6kgf7gydw0nh07lh86fs8srkhm29ik4hmv8ch19p";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,35 +1,28 @@
{ stdenv, lib, fetchurl, autoPatchelfHook, python2 }: { stdenv, lib, fetchurl, autoPatchelfHook, python3 }:
let stdenv.mkDerivation rec {
majorVersion = "8.1";
in stdenv.mkDerivation rec {
pname = "gurobi"; pname = "gurobi";
version = "${majorVersion}.0"; version = "9.1.2";
src = with lib; fetchurl { src = fetchurl {
url = "http://packages.gurobi.com/${versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz";
sha256 = "1yjqbzqnq4jjkjm616d36bgd3rmqr0a1ii17n0prpdjzmdlq63dz"; sha256 = "7f60bd675f79476bb2b32cd632aa1d470f8246f2b033b7652d8de86f6e7e429b";
}; };
sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64";
nativeBuildInputs = [ autoPatchelfHook ]; nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ (python2.withPackages (ps: [ ps.gurobipy ])) ]; buildInputs = [ (python3.withPackages (ps: [ ps.gurobipy ])) ];
strictDeps = true; strictDeps = true;
buildPhase = '' makeFlags = [ "--directory=src/build" ];
cd src/build
make
cd ../..
'';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp bin/* $out/bin/ cp bin/* $out/bin/
rm $out/bin/gurobi.env
rm $out/bin/gurobi.sh rm $out/bin/gurobi.sh
rm $out/bin/python2.7 rm $out/bin/python*
cp lib/gurobi.py $out/bin/gurobi.sh cp lib/gurobi.py $out/bin/gurobi.sh
@ -48,7 +41,7 @@ in stdenv.mkDerivation rec {
ln -s $out/lib/gurobi-javadoc.jar $out/share/java/ ln -s $out/lib/gurobi-javadoc.jar $out/share/java/
''; '';
passthru.libSuffix = lib.replaceStrings ["."] [""] majorVersion; passthru.libSuffix = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor version);
meta = with lib; { meta = with lib; {
description = "Optimization solver for mathematical programming"; description = "Optimization solver for mathematical programming";

View file

@ -205,6 +205,7 @@ stdenv.mkDerivation rec {
optional fontconfigSupport "-lfontconfig" optional fontconfigSupport "-lfontconfig"
++ optional fribidiSupport "-lfribidi" ++ optional fribidiSupport "-lfribidi"
++ optionals x11Support [ "-lX11" "-lXext" ] ++ optionals x11Support [ "-lX11" "-lXext" ]
++ optional x264Support "-lx264"
++ [ "-lfreetype" ] ++ [ "-lfreetype" ]
); );

View file

@ -1,4 +1,5 @@
{ writeShellScript { lib
, writeShellScript
, coreutils , coreutils
, git , git
, nix , nix
@ -8,6 +9,7 @@
# This is an updater for unstable packages that should always use the latest # This is an updater for unstable packages that should always use the latest
# commit. # commit.
{ url ? null # The git url, if empty it will be set to src.url { url ? null # The git url, if empty it will be set to src.url
, branch ? null
}: }:
let let
@ -25,7 +27,9 @@ let
# Get info about HEAD from a shallow git clone # Get info about HEAD from a shallow git clone
tmpdir="$(${coreutils}/bin/mktemp -d)" tmpdir="$(${coreutils}/bin/mktemp -d)"
${git}/bin/git clone --bare --depth=1 "$url" "$tmpdir" ${git}/bin/git clone --bare --depth=1 \
${lib.optionalString (branch != null) "--branch ${branch}"} \
"$url" "$tmpdir"
pushd "$tmpdir" pushd "$tmpdir"
commit_date="$(${git}/bin/git show -s --pretty='format:%cs')" commit_date="$(${git}/bin/git show -s --pretty='format:%cs')"
commit_sha="$(${git}/bin/git show -s --pretty='format:%H')" commit_sha="$(${git}/bin/git show -s --pretty='format:%H')"

View file

@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
src = fetchurl { src = fetchurl {
url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0fg89946z6n8njxn4mv29jksw8yavg8vypsljn9031pjwl3fmh2q"; sha256 = "sha256-WMDqBuXyhgGSlVRfv9HbyiOup0xiV2K7tMiab0hK6Dk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -6,7 +6,7 @@ mkXfceDerivation {
version = "0.5.2"; version = "0.5.2";
odd-unstable = false; odd-unstable = false;
sha256 = "8UDb4H3zxRKx2y+MRsozQoR3es0fs5ooR/5wBIE11bY="; sha256 = "sha256-8UDb4H3zxRKx2y+MRsozQoR3es0fs5ooR/5wBIE11bY=";
buildInputs = [ gtk3 glib ]; buildInputs = [ gtk3 glib ];

View file

@ -6,7 +6,7 @@ mkXfceDerivation {
version = "0.5.5"; version = "0.5.5";
odd-unstable = false; odd-unstable = false;
sha256 = "1c985xb3395bn1024qhqqdnlkbn02zldsnybxsw49xqh55pa4a2n"; sha256 = "sha256-ViiibikQ90S47stb3egXwK5JbcMYYiJAsKukMVYvKLE=";
nativeBuildInputs = [ gobject-introspection ]; nativeBuildInputs = [ gobject-introspection ];

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; sha256 = "sha256-PPmqRBroPIaIhl+CIXAlzfPrqhUszkVxd3uMKqjdkGI=";
}; };
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
(fetchpatch { (fetchpatch {
name = "fix-libical3.patch"; name = "fix-libical3.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10"; url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10";
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf"; sha256 = "sha256-bsnQMGmeo4mRNGM/7UYXez2bNopXMHRFX7VFVg0IGtE=";
}) })
]; ];

View file

@ -9,7 +9,7 @@ mkXfceDerivation {
pname = "parole"; pname = "parole";
version = "4.16.0"; version = "4.16.0";
sha256 = "07hcnbcd56lq7z3gq1cnk71ppy98hwdvlfp5z3zlc55cqrry26zm"; sha256 = "sha256-9Rvhc8asFEb/+OU6uhuHKPl7w5mWBfzGP5ia0tiyDB4=";
postPatch = '' postPatch = ''
substituteInPlace src/plugins/mpris2/Makefile.am \ substituteInPlace src/plugins/mpris2/Makefile.am \

View file

@ -6,7 +6,7 @@ mkXfceDerivation {
pname = "ristretto"; pname = "ristretto";
version = "0.11.0"; version = "0.11.0";
sha256 = "07np4n6kg6lpd7acrb4aga3l6502c8lhjzf867b38n90cx1nh5gf"; sha256 = "sha256-7hVoQ2cgWTTWMch9CSliAhRDh3qKrMzUaZeaN40l1x4=";
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ]; buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "xfburn"; pname = "xfburn";
version = "0.6.2"; version = "0.6.2";
sha256 = "02axhsbbsvd31jb0xs1d2qxr614qb29pajv0sm2p1n1c2cv2fjh1"; sha256 = "sha256-AUonNhMs2HBF1WBLdZNYmASTOxYt6A6WDKNtvZaGXQk=";
nativeBuildInputs = [ libxslt docbook_xsl ]; nativeBuildInputs = [ libxslt docbook_xsl ];
buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ]; buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ];

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "xfce4-dict"; pname = "xfce4-dict";
version = "0.8.4"; version = "0.8.4";
sha256 = "0gm5gwqxhnv3qz9ggf8dj1sq5s72xcliidkyip9l91msx03hfjah"; sha256 = "sha256-UEkHB+i6hkTTjX62GCnr4uiCdZANuffSx2Nb2DF/pT4=";
patches = [ ./configure-gio.patch ]; patches = [ ./configure-gio.patch ];

View file

@ -6,7 +6,7 @@ mkXfceDerivation {
pname = "xfce4-notifyd"; pname = "xfce4-notifyd";
version = "0.6.2"; version = "0.6.2";
sha256 = "1q8n7dffyqbfyy6vpqlmnsfpavlc7iz6hhv1h27fkwzswy2rx28s"; sha256 = "sha256-Gomehef68+mOgGFDaH48jG51nbaV4ruN925h71w7FuE=";
buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];

View file

@ -6,7 +6,7 @@ mkXfceDerivation {
version = "1.9.9"; version = "1.9.9";
odd-unstable = false; odd-unstable = false;
sha256 = "1myzm9sk968bcl9yqh6zyaa3ck42rw01hbcqn8z4sipiwsbhkrj0"; sha256 = "sha256-QOYJl+bxRk0+spgtGADPgkw2lPLfQOwTZQuZNHWq39c=";
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "xfce4-taskmanager"; pname = "xfce4-taskmanager";
version = "1.4.2"; version = "1.4.2";
sha256 = "1l7k00y3d9j38g4hxjrcrh1y4s6s77sq4sjcadsbpzs6zdf05hld"; sha256 = "sha256-jcICXPtG/7t0U0xqgvU52mjiA8wsyw7JQ0OmNjwA89A=";
nativeBuildInputs = [ exo ]; nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 libwnck3 libXmu ]; buildInputs = [ gtk3 libwnck3 libXmu ];

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "xfce4-terminal"; pname = "xfce4-terminal";
version = "0.8.10"; version = "0.8.10";
sha256 = "0v58qcrdpqpd2nbwlc4ra7j9nkvfzfhb1zcp1kggbn627q86i0ql"; sha256 = "sha256-FINoED7C2PXeDJf9sKD7bk+b5FGZMMqXFe3i2zLDqGw=";
nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ]; nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ];

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "xfce4-volumed-pulse"; pname = "xfce4-volumed-pulse";
version = "0.2.3"; version = "0.2.3";
sha256 = "1rsjng9qmq7vzrx5bfxq76h63y501cfl1mksrxkf1x39by9r628j"; sha256 = "sha256-EgmTk19p9OBmz3rWQB0LoPhhoDm4u1V6/vvgitOzUuc=";
buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ]; buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ];

View file

@ -21,7 +21,7 @@ mkXfceDerivation {
rev-prefix = ""; rev-prefix = "";
odd-unstable = false; odd-unstable = false;
sha256 = "06pvzhhkr2mimsrzlkpsrzf5fxag4fhabyb3cpmgpyp5hcbgvaj3"; sha256 = "sha256-Q6r9FoPl+vvqZWP5paAjT3VX3M/6TvqzrrGKPCH8+xo=";
buildInputs = [ buildInputs = [
clutter clutter

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; sha256 = "sha256-1HhmktVrilY/ZqXyYPHxOt4R6Gx4y8slqfml/EfPZvo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j"; sha256 = "sha256-MhTV8A6XA7XoyefDKH1gbe3scoXOtNXbMy6TraZv1XU=";
}; };
passthru.updateScript = xfce.updateScript { passthru.updateScript = xfce.updateScript {

View file

@ -6,7 +6,7 @@ mkXfceDerivation {
pname = "exo"; pname = "exo";
version = "4.16.2"; version = "4.16.2";
sha256 = "0rsp92j4hkr5jrkrj8anzw9fwd96xbxzpzqzqiyjjwdiq7b29l1v"; sha256 = "sha256-O9Ak1sGxcSl9xB//+/vqJjXuEv9WIZlnliVPSKRIV2c=";
nativeBuildInputs = [ nativeBuildInputs = [
libxslt libxslt

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "garcon"; pname = "garcon";
version = "4.16.1"; version = "4.16.1";
sha256 = "134nm1754i12axl4si60fdwkbk2v6z108nrj9c0lb5in1zmqwa9a"; sha256 = "sha256-KimO6w82lkUBSzJbBMI3W8w1eXPARE1oVyJEUk6olow=";
nativeBuildInputs = [ gobject-introspection ]; nativeBuildInputs = [ gobject-introspection ];

View file

@ -6,7 +6,7 @@ mkXfceDerivation {
pname = "libxfce4ui"; pname = "libxfce4ui";
version = "4.16.0"; version = "4.16.0";
sha256 = "0a9wfdpsv83giwv6kcidvpd6c665aa7sv6f2l1q6qcq214vb0rk2"; sha256 = "sha256-YmawNgkCM2xwoMKZrY9SxRhm2t0tsmk2j2+grW9zPCk=";
nativeBuildInputs = [ gobject-introspection vala ]; nativeBuildInputs = [ gobject-introspection vala ];
buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ]; buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ];

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "libxfce4util"; pname = "libxfce4util";
version = "4.16.0"; version = "4.16.0";
sha256 = "1p0snipc81dhaq5glv7c1zfq5pcvgq7nikl4ikhfm2af9picfsxb"; sha256 = "sha256-q2vH4k1OiergjITOaA9+m92C3Q/sbPoKVrAFxG60Gtw=";
nativeBuildInputs = [ gobject-introspection vala ]; nativeBuildInputs = [ gobject-introspection vala ];

View file

@ -7,7 +7,7 @@ mkXfceDerivation {
buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
sha256 = "002nkxsvcq384dgpj7lv3bmb21ks64hsq13l67z1dcjbj51hzl03"; sha256 = "sha256-A9APQ5FLshb+MXQErCExegax6hqbHnlfI2hgtnWfVgA=";
odd-unstable = false; odd-unstable = false;

View file

@ -23,7 +23,7 @@ let unwrapped = mkXfceDerivation {
pname = "thunar"; pname = "thunar";
version = "4.16.8"; version = "4.16.8";
sha256 = "1r7qkd6l0mgf97m1xnnizm7fkvl4a52r3hsds5z68y6myvb78p18"; sha256 = "sha256-KFx01vbVeGR+0U3DkUVRhO7pTv3R2h7qSe5VQE2b+OQ=";
nativeBuildInputs = [ nativeBuildInputs = [
docbook_xsl docbook_xsl

View file

@ -15,7 +15,7 @@ mkXfceDerivation {
pname = "tumbler"; pname = "tumbler";
version = "4.16.0"; version = "4.16.0";
sha256 = "1z4q858afj3yksim4lc96wylgvymv4cv6iw41qdxl5xd6ii2ddr4"; sha256 = "sha256-JLcmYjStF9obDoRHsxnZ1e9HPTeJUVKjnn5Ip1BBmPw=";
buildInputs = [ buildInputs = [
ffmpegthumbnailer ffmpegthumbnailer

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "xfce4-appfinder"; pname = "xfce4-appfinder";
version = "4.16.1"; version = "4.16.1";
sha256 = "1r7sjdavqadrpgxqclrznds7a1c2i7mlvghx5mi6qqnh42425gsy"; sha256 = "sha256-Xr8iiCDQYmxiLR2+TeuJggV1dLM/U4b7u7kpvFWT+uQ=";
nativeBuildInputs = [ exo ]; nativeBuildInputs = [ exo ];
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];

View file

@ -15,7 +15,7 @@ mkXfceDerivation {
pname = "xfce4-dev-tools"; pname = "xfce4-dev-tools";
version = "4.16.0"; version = "4.16.0";
sha256 = "0w47npi1np9vb7lhzjr680aa1xb8ch6kcbg0l0bqnpm0y0jmvgz6"; sha256 = "sha256-5r9dJfCgXosXoOAtNg1kaPWgFEAmyw/pWTtdG+K1h3A=";
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook

View file

@ -18,7 +18,7 @@ mkXfceDerivation {
pname = "xfce4-panel"; pname = "xfce4-panel";
version = "4.16.3"; version = "4.16.3";
sha256 = "085hxllsf792sgi8nn0qjfj5vclbrw2dgrgzl6gy55lxcbhkml9x"; sha256 = "sha256-PdE64WKdluKfof/l1wTPi7JdpJMYWIvi0yIdpyntsCA=";
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection

View file

@ -6,7 +6,7 @@ mkXfceDerivation {
pname = "xfce4-power-manager"; pname = "xfce4-power-manager";
version = "4.16.0"; version = "4.16.0";
sha256 = "1rfw07xbv83rfb0mz3ayanlcvnaq7xpl2znsyya0hspysvavwks2"; sha256 = "sha256-Qk++1db+agiU99p+QW8/WNnNqFVejV/BcnmgvfoB3OU=";
nativeBuildInputs = [ automakeAddFlags exo ]; nativeBuildInputs = [ automakeAddFlags exo ];
buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "xfce4-session"; pname = "xfce4-session";
version = "4.16.0"; version = "4.16.0";
sha256 = "0b8vkcqn2arjp6qdwmzr0f84n8fjgy2kbf9h4gq03400ar1l111c"; sha256 = "sha256-LIRAQ1YAkAHwIzC5NYV/0iFLkAP5V96wuTIrYTGbGy0=";
buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];

View file

@ -7,7 +7,7 @@ mkXfceDerivation {
pname = "xfce4-settings"; pname = "xfce4-settings";
version = "4.16.2"; version = "4.16.2";
sha256 = "09npyqxsbrvz60bkbardqrizd5rvray5hkp84qgjzc10z4qrnk0f"; sha256 = "sha256-DkybMfkgsC8fJuhOWLzKO5f2Y8YtqzUXMH/npTv21yY=";
postPatch = '' postPatch = ''
for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "xfconf"; pname = "xfconf";
version = "4.16.0"; version = "4.16.0";
sha256 = "00cp2cm1w5a6k7g0fjvqx7d2iwaqw196vii9jkx1aa7mb0f2gk63"; sha256 = "sha256-w8wnHFj1KBX6lCnGbVLgWPEo2ul4SwfemUYVHioTlwE=";
nativeBuildInputs = [ gobject-introspection vala ]; nativeBuildInputs = [ gobject-introspection vala ];

View file

@ -5,7 +5,7 @@ mkXfceDerivation {
pname = "xfdesktop"; pname = "xfdesktop";
version = "4.16.0"; version = "4.16.0";
sha256 = "1znbccr25wvizmzzgdcf719y3qc9gqdi1g4rasgrmi95427lvwn3"; sha256 = "sha256-w/JNjyAlxZqfVpm8EBt+ieHhUziOtfd//XHzIjJjy/4=";
buildInputs = [ buildInputs = [
exo exo

View file

@ -7,7 +7,7 @@ mkXfceDerivation {
pname = "xfwm4"; pname = "xfwm4";
version = "4.16.1"; version = "4.16.1";
sha256 = "1lhxm9ifkrnvn1vq3aak3kd695i1ishpryjnw617ifzawy9lj10b"; sha256 = "sha256-CwRJk+fqu3iC4Vb6fKGOIZZk2hxTqYF3sNvm6WKqHdI=";
nativeBuildInputs = [ exo librsvg ]; nativeBuildInputs = [ exo librsvg ];

View file

@ -57,3 +57,4 @@ let
in in
stdenv.mkDerivation (recursiveUpdate template publicArgs // concatAttrLists [ template args ]) stdenv.mkDerivation (recursiveUpdate template publicArgs // concatAttrLists [ template args ])
# TODO [ AndersonTorres ]: verify if it allows using hash attribute as an option to sha256

View file

@ -3,10 +3,10 @@
mkXfceDerivation { mkXfceDerivation {
category = "panel-plugins"; category = "panel-plugins";
pname = "xfce4-battery-plugin"; pname = "xfce4-battery-plugin";
version = "1.1.3"; version = "1.1.4";
rev-prefix = ""; rev-prefix = "xfce4-battery-plugin-";
odd-unstable = false; odd-unstable = false;
sha256 = "0ligdiasrfc3170kd7sif2ml6lvlpp11lbxz3xdvklqkv7p3323y"; sha256 = "sha256-LwwlyWhtVM+OHR9KtE4DPyU5V/dMOjcgSjsI3o7qfk8=";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];

View file

@ -4,7 +4,7 @@ mkXfceDerivation {
category = "panel-plugins"; category = "panel-plugins";
pname = "xfce4-clipman-plugin"; pname = "xfce4-clipman-plugin";
version = "1.6.2"; version = "1.6.2";
sha256 = "0pm4pzq3imc0m09mg0zk6kwcn5yzdgiqgdbpws01q3xz58jmb4a6"; sha256 = "sha256-RpFVJSq/DxyA5ne1h+Nr3xfL+DTzg1cTqIDVOPC/pF4=";
buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ];

View file

@ -4,7 +4,7 @@ mkXfceDerivation {
category = "panel-plugins"; category = "panel-plugins";
pname = "xfce4-cpufreq-plugin"; pname = "xfce4-cpufreq-plugin";
version = "1.2.5"; version = "1.2.5";
sha256 = "1isqlfhz1ijl1h3hfvi0n4misdjsrhd7pc9h5rkaqm4vh543ggxg"; sha256 = "sha256-r783SIGbVKxmLjCxexrMWjYdK7EgbgcHDFTG8KGjWMc=";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];

View file

@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "13302psv0fzg2dsgadr8j6mb06k1bsa4zw6hxmb644vqlvcwq37v"; sha256 = "sha256-+wzM2aZ4E2JW7dDwT5ReYRqwqpEoN/V0E+87sPUVYIw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -12,7 +12,7 @@ mkXfceDerivation {
version = "0.8.1"; version = "0.8.1";
rev-prefix = "xfce4-datetime-plugin-"; rev-prefix = "xfce4-datetime-plugin-";
sha256 = "06h13bmh2sni4qbr3kfnqaa5dq5f48h4xkywrm9pa6h2nyvn4rma"; sha256 = "sha256-qmZit7cCGnVTzdzPTiAiruBWlMLWzZEXJtFqAesaARo=";
nativeBuildInputs = [ nativeBuildInputs = [
gettext gettext
@ -26,6 +26,6 @@ mkXfceDerivation {
meta = with lib; { meta = with lib; {
description = "Shows the date and time in the panel, and a calendar appears when you left-click on it"; description = "Shows the date and time in the panel, and a calendar appears when you left-click on it";
maintainers = [ maintainers.AndersonTorres ]; maintainers = [ ];
}; };
} }

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "xuzhen"; owner = "xuzhen";
repo = "xfce4-dockbarx-plugin"; repo = "xfce4-dockbarx-plugin";
rev = rev; rev = rev;
sha256 = "0s8bljn4ga2hj480j0jwkc0npp8szbmirmcsys791gk32iq4dasn"; sha256 = "sha256-VqtGcBRjvpCO9prVHOv6Gt1rAZtcAgkQkVCoR6ykC2k=";
}; };
pythonPath = [ pythonPath = [

View file

@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"; sha256 = "sha256-x2ffY2DoGUsyvCSCPdAAl17boMr+Ulwj14VAKTWe4ig=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "1iaszzkagl1mb0cdafrvlfjnjklhhs9y90517par34sjiqbq1dsd"; sha256 = "sha256-TbeAF45Sk5HVPaGA5JOGkE5ppaM7O9UYWDXQp+b/WsU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "Z9jmohmnEXxZaTrbxZw5puujHj8YpUmRie9O8otVQQU="; sha256 = "sha256-Z9jmohmnEXxZaTrbxZw5puujHj8YpUmRie9O8otVQQU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "shGf0P8Z+ik7l+yXsN6OJBeZ4IuGIYUVFnxWi9m1ATU="; sha256 = "sha256-shGf0P8Z+ik7l+yXsN6OJBeZ4IuGIYUVFnxWi9m1ATU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://git.xfce.org/archive/${pname}/snapshot/${pname}-${version}.tar.gz"; url = "https://git.xfce.org/archive/${pname}/snapshot/${pname}-${version}.tar.gz";
sha256 = "11k7m41jxkaqmpp5njkixw60q517xnw923mz34dnm1llx9ilvfk8"; sha256 = "sha256-aLpNY+qUhmobGb8OkbjtJxQMDO9xSlvurVjNLgOpZ4Y=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0bmykjhd3gs1737fl3zn5gg6f3vlncak2xqz89zv5018znz1xy90"; sha256 = "sha256-IPkevv0ogLJ/Qh93MRWzdA9n3iv2D+rOOEG/0aCcvi4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf"; sha256 = "sha256-7v54t7a5UxKzpSgUt/Yy3JKXDBs+lTXeYWMVdJv2d2A=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "HugLifeTiZ"; owner = "HugLifeTiZ";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8"; sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA=";
}; };
nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ]; nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ];

View file

@ -3,10 +3,10 @@
mkXfceDerivation { mkXfceDerivation {
category = "panel-plugins"; category = "panel-plugins";
pname = "xfce4-netload-plugin"; pname = "xfce4-netload-plugin";
version = "1.3.2"; version = "1.4.0";
rev-prefix = "version-"; rev-prefix = "xfce4-netload-plugin-";
odd-unstable = false; odd-unstable = false;
sha256 = "1py1l4z5ah4nlq8l2912k47ffsa5z7p1gbvlk7nw6b9r1x4ykdfl"; sha256 = "sha256-HasaMymMCPidYkaAUK4gvD+Ka7NJdFOTeq43gJ1G3jo=";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];

View file

@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "E/kJyUi2Oflt5kz3k+t0yxd5WJIB05M+/yFO6PNasIg="; sha256 = "sha256-E/kJyUi2Oflt5kz3k+t0yxd5WJIB05M+/yFO6PNasIg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -18,7 +18,7 @@ mkXfceDerivation {
category = "panel-plugins"; category = "panel-plugins";
pname = "xfce4-pulseaudio-plugin"; pname = "xfce4-pulseaudio-plugin";
version = "0.4.3"; version = "0.4.3";
sha256 = "1rfw2w8gl95iawiy57qlvz958dqjc8bmxnc3dma4rqzm6g46jkgq"; sha256 = "sha256-+E1pyDP140xUbYPZXhdiEjdU0t8Un+IjV7Ek+hAX3OU=";
nativeBuildInputs = [ nativeBuildInputs = [
automakeAddFlags automakeAddFlags

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0v44qwrwb95jrlsni1gdlc0zhymlm62w42zs3jbr5mcdc7j4mil3"; sha256 = "sha256-g8ZK5GGN1ZKXHPoLwoWptHr4AaPthWg1zbKkxTPHhGw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0lknh5l30qs5c69wwjcblbyhczvdbxs59fqkb8mpqbfm05w01lan"; sha256 = "sha256-VtEAeAHVLXwrWhO7VHRfbX8G/aKLSc6TYUVjMGiBdlI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "1qr4m3n2l3rvsizsr3h7fyfajszfalqm7rhvjx2yjj8r3f8x4ljb"; sha256 = "sha256-S1LSkRsZSelFlxvmUzFV7mupnHcHjqx/1DsPKuyoJOM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -12,7 +12,7 @@ mkXfceDerivation {
pname = "xfce4-verve-plugin"; pname = "xfce4-verve-plugin";
version = "2.0.1"; version = "2.0.1";
rev-prefix = ""; rev-prefix = "";
sha256 = "YwUOSTZMoHsWWmi/ajQv/fX8a0IJoc3re3laVEmnX/M="; sha256 = "sha256-YwUOSTZMoHsWWmi/ajQv/fX8a0IJoc3re3laVEmnX/M=";
buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ]; buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ];

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "1z2k24d599mxf5gqa35i3xmc3gk2yvqs80hxxpyw06yma6ljw973"; sha256 = "sha256-4yQuqVHVG8D97R0CpPH2Yr7Bah+xDIVfcb2mVBoRU/w=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -6,7 +6,7 @@ mkXfceDerivation {
version = "2.5.3"; version = "2.5.3";
rev-prefix = "v"; rev-prefix = "v";
odd-unstable = false; odd-unstable = false;
sha256 = "15kcph35pji3l1y81snrmpqzhhpdc9h4nk6cjsjyla51a1s2y3hz"; sha256 = "sha256-Hw4vdFChKOqllsxMS2Bi7UL48a3Z6oB8oCPKWwa8bJY=";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "invidian"; owner = "invidian";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0l066a174v2c7ly125v9x1fgbg5bnpwdwnjh69v9kp4plp791q4n"; sha256 = "sha256-luCQzqWX3Jl2MlBa3vi1q7z1XOhpFxE8PUxscoIyBlA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -16,7 +16,7 @@ mkXfceDerivation {
pname = "xfce4-xkb-plugin"; pname = "xfce4-xkb-plugin";
version = "0.8.2"; version = "0.8.2";
rev-prefix = ""; rev-prefix = "";
sha256 = "xmCoNMxykeaThYEJo6BcbraFo9CruFZL6YPjovzb6hg="; sha256 = "sha256-xmCoNMxykeaThYEJo6BcbraFo9CruFZL6YPjovzb6hg=";
buildInputs = [ buildInputs = [
garcon garcon

View file

@ -13,7 +13,7 @@ mkXfceDerivation {
pname = "thunar-archive-plugin"; pname = "thunar-archive-plugin";
version = "0.4.0"; version = "0.4.0";
sha256 = "1793zicm00fail4iknliwy2b668j239ndxhc9hy6jarvdyp08h38"; sha256 = "sha256-aEAErm87K2k8TAz2ZtMQEhmzhOeR2hkJjcoBUFn8I50=";
nativeBuildInputs = [ nativeBuildInputs = [
intltool intltool

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "Jeinzi"; owner = "Jeinzi";
repo = "thunar-dropbox"; repo = "thunar-dropbox";
rev = version; rev = version;
sha256 = "1fshjvh542ffa8npfxv3cassgn6jclb2ix9ir997y4k0abzp1fxb"; sha256 = "sha256-q7tw/1JgEn9SyjH1KBZl0tintWJjd3ctUs4JUuCWULs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gleam"; pname = "gleam";
version = "0.15.1"; version = "0.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gleam-lang"; owner = "gleam-lang";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vBxVGIgg2BpVvEYjmX99YSf1zy9aWOHr6ftaYxJWkzY="; sha256 = "sha256-QcJudP4zhtY1CxV3XLkiC06hrKOqlLdb+X6lHvqc7ZA=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ]; lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoSha256 = "sha256-2zHc7xk5MuEUO9YGifSWbgRTi51ZUk84QLro94LsBtQ="; cargoSha256 = "sha256-een2aI6gDVx450mQcwF1uRG/tn9FzahTMWpPdvUBumE=";
meta = with lib; { meta = with lib; {
description = "A statically typed language for the Erlang VM"; description = "A statically typed language for the Erlang VM";

View file

@ -37,8 +37,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "https://kotlinlang.org/"; homepage = "https://kotlinlang.org/";
license = lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = with lib.maintainers; maintainers = with lib.maintainers; [ SubhrajyotiSen ];
[ ];
platforms = lib.platforms.all; platforms = lib.platforms.all;
}; };
} }

View file

@ -8,9 +8,9 @@ with lib; mkCoqDerivation {
repo = "VST"; repo = "VST";
inherit version; inherit version;
defaultVersion = with versions; switch coq.coq-version [ defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.12" "8.13"; out = "2.7.1"; } { case = range "8.12" "8.13"; out = "2.8"; }
] null; ] null;
release."2.7.1".sha256 = "1674j7bkvihiv19vizm99dp6gj3lryb00zx6a87jz214f3ydcvnj"; release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0=";
releaseRev = v: "v${v}"; releaseRev = v: "v${v}";
propagatedBuildInputs = [ compcert ]; propagatedBuildInputs = [ compcert ];

View file

@ -15,7 +15,8 @@ let compcert = mkCoqDerivation rec {
releaseRev = v: "v${v}"; releaseRev = v: "v${v}";
defaultVersion = with versions; switch coq.version [ defaultVersion = with versions; switch coq.version [
{ case = range "8.8" "8.13"; out = "3.8"; } { case = range "8.8" "8.11"; out = "3.8"; }
{ case = range "8.12" "8.13"; out = "3.9"; }
] null; ] null;
release = { release = {

View file

@ -0,0 +1,50 @@
{ stdenv, fetchFromGitHub, cmake, jsoncpp, libuuid, zlib, openssl, lib }:
stdenv.mkDerivation rec {
pname = "drogon";
version = "1.6.0";
src = fetchFromGitHub {
owner = "an-tao";
repo = "drogon";
rev = "v${version}";
sha256 = "0ncdlsi3zhmpdwh83d52npb1b2q982y858yl88zl2nfq4zhcm3wa";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [
# examples are used in the test during installCheckPhase, otherwise they are unnecessary
"-DBUILD_EXAMPLES=${if doInstallCheck then "ON" else "OFF"}"
];
propagatedBuildInputs = [
jsoncpp
libuuid
zlib
openssl
];
patches = [
# this part of the test fails because it attempts to configure a CMake project that uses find_package on itself
# the rest of the test runs fine because it uses executables that are built in buildPhase when BUILD_EXAMPLES is enabled
./no_cmake_test.patch
];
installCheckPhase = ''
cd ..
patchShebangs test.sh
./test.sh
'';
doInstallCheck = true;
meta = with lib; {
homepage = "https://github.com/an-tao/drogon";
description = "C++14/17 based HTTP web application framework";
license = licenses.mit;
maintainers = [ maintainers.urlordjames ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,42 @@
diff --git a/test.sh b/test.sh
index e5da08e..ba620cc 100755
--- a/test.sh
+++ b/test.sh
@@ -157,37 +157,6 @@ cd ../views
echo "Hello, world!" >>hello.csp
-cd ../build
-if [ $os = "windows" ]; then
- conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths
- cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install"
-fi
-cmake .. $cmake_gen
-
-if [ $? -ne 0 ]; then
- echo "Error in testing"
- exit -1
-fi
-
-cmake --build . -- $make_flags
-
-if [ $? -ne 0 ]; then
- echo "Error in testing"
- exit -1
-fi
-
-if [ $os = "linux" ]; then
- if [ ! -f "drogon_test" ]; then
- echo "Failed to build drogon_test"
- exit -1
- fi
-else
- if [ ! -f "Debug\drogon_test.exe" ]; then
- echo "Failed to build drogon_test"
- exit -1
- fi
-fi
-
cd ../../
rm -rf drogon_test

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