diff options
90 files changed, 586 insertions, 218 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7fb0eb2175330..4acb19eaa5c21 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -759,13 +759,6 @@ githubId = 11699655; name = "Stanislas Lange"; }; - angustrau = { - name = "Angus Trau"; - email = "nix@angus.ws"; - matrix = "@angustrau:matrix.org"; - github = "angustrau"; - githubId = 13267947; - }; anhdle14 = { name = "Le Anh Duc"; email = "anhdle14@icloud.com"; @@ -3388,6 +3381,12 @@ githubId = 18535642; name = "Emily"; }; + emilytrau = { + name = "Emily Trau"; + email = "nix@angus.ws"; + github = "emilytrau"; + githubId = 13267947; + }; enderger = { email = "endergeryt@gmail.com"; github = "enderger"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 5b70a7b1e6339..86bf52afdc520 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -223,7 +223,7 @@ with lib.maintainers; { openstack = { members = [ - angustrau + emilytrau SuperSandro2000 ]; scope = "Maintain the ecosystem around OpenStack"; diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index e3e28b70a31e5..6326d7cc56301 100644 --- a/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "indicator-sound-switcher"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "yktoo"; repo = pname; rev = "v${version}"; - sha256 = "APU8Y0xUhRd9RbMSG9TD0TBvFLu/VlLGauf56z8gZDw="; + sha256 = "sha256-agzU3Z3E6NvCnlsz9L719LqMTm8EmYg3TY/2lWTYgKs="; }; postPatch = '' diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 3f3c7932a5b16..e40a0d7e5adee 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.16.3"; + version = "6.16.4"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-YR/8ApkuZtO2vJA/VlZ06JdQnGDbTzQ5fNqHgBpFZjQ="; + sha256 = "sha256-hfdKhTUGoVN4DIURO+e3MOSpsL6GWxOV3LItd0nA51Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 41d125f6cca1c..05c985d9d97a1 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-mebxbS0PVP2EdYt31G0HQ0Z+wxpXOe9/xaKdH0wwB60="; + sha256 = "sha256-bgc9M7shcgL1gQ9klUP0JIY4UeraO1oLsLEdG5tOLpY="; }; vendorSha256 = "sha256-T2a5FBjISXprgMA6ye2xwAFLE62Qb3AUQVjpGtnduU0="; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index d29888aee0686..9f3c046a266af 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-VGdYnynEm0ShG96W0uKiWBbUy/EitX3od5Nnho6T0pg="; + sha256 = "sha256-AmJN7hnYuhxYNG/qs7yv3phhffYKVaM8f7irhi9wRfA="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index bf674ef44426c..764ba6a0d79e6 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.34.0"; + version = "8.37.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-85bsu6l/B+lHkjFBXNQ9BEzOn1oYTsFgungG06p9nD0="; + sha256 = "sha256-hU4tqDu95ej8ChiWJq3ZPhEwxBcmTQkA/n///pPVa5U="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 5ba7a1f7b2051..d9683740667ca 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -12,6 +12,7 @@ , Security , AppKit , CoreServices +, desktopToDarwinBundle }: let @@ -36,7 +37,7 @@ mkYarnPackage rec { sha256 = pinData.desktopYarnHash; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; seshat = callPackage ./seshat { inherit CoreServices; }; keytar = callPackage ./keytar { inherit Security AppKit; }; diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 9b70d143e1071..e5edfaa467090 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.91.6"; + version = "3.91.10"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-REoYLxU9p0lECKNwcDHidO+jTCKS1yQSzed9GSHSNGI="; + sha256 = "sha256-RlEgpXco0lkkjlJ8FZz4MxYznKLPl1Lxkb5MSmhOTzI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/applications/networking/ngadmin/default.nix index 8392e05834542..f63fbfcf95033 100644 --- a/pkgs/applications/networking/ngadmin/default.nix +++ b/pkgs/applications/networking/ngadmin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withReadline readline; - enableParallelBuild = true; + enableParallelBuilding = true; configureFlags = with lib; optional (!withReadline) "--without-readline" ++ optional enableEmu "--enable-emu" diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/applications/networking/novnc/default.nix new file mode 100644 index 0000000000000..269944324c64a --- /dev/null +++ b/pkgs/applications/networking/novnc/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "novnc"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "novnc"; + repo = "noVNC"; + rev = "v${version}"; + sha256 = "sha256-Z+bks7kcwj+Z3uf/t0u25DnGOM60QhSH6uuoIi59jqU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 utils/novnc_proxy "$out/bin/novnc" + install -dm755 "$out/share/webapps/novnc/" + cp -a app core po vendor vnc.html karma.conf.js package.json vnc_lite.html "$out/share/webapps/novnc/" + + runHook postInstall + ''; + + meta = with lib; { + description = "VNC client web application"; + homepage = "https://novnc.com"; + license = with licenses; [ mpl20 ofl bsd3 bsd2 mit ]; + maintainers = with maintainers; [ neverbehave ]; + }; +} diff --git a/pkgs/applications/networking/p2p/dht/default.nix b/pkgs/applications/networking/p2p/dht/default.nix index 0088e517914f0..b1d01f82876eb 100644 --- a/pkgs/applications/networking/p2p/dht/default.nix +++ b/pkgs/applications/networking/p2p/dht/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "BitTorrent DHT library"; homepage = "https://github.com/transmission/dht"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/applications/networking/p2p/fragments/default.nix index 721f0ca259f0d..a07869209c7d2 100644 --- a/pkgs/applications/networking/p2p/fragments/default.nix +++ b/pkgs/applications/networking/p2p/fragments/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/World/Fragments"; description = "A GTK3 BitTorrent Client"; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/p2p/libutp/default.nix b/pkgs/applications/networking/p2p/libutp/default.nix index 6fba4faf50c05..a07ffdea6b69d 100644 --- a/pkgs/applications/networking/p2p/libutp/default.nix +++ b/pkgs/applications/networking/p2p/libutp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "uTorrent Transport Protocol library"; homepage = "https://github.com/transmission/libutp"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d6e5c4143a4a2..a9d532a27c24a 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,9 +1,10 @@ -{ fetchurl -, lib +{ lib , stdenv +, fetchurl , aqbanking , boost , cmake +, gettext , glib , glibcLocales , gtest @@ -16,7 +17,6 @@ , libxml2 , libxslt , makeWrapper -, perl , perlPackages , pkg-config , swig @@ -28,13 +28,15 @@ stdenv.mkDerivation rec { pname = "gnucash"; version = "4.9"; + # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; - sha256 = "0bdpzb0wc9bjph5iff7133ppnkcqzfd10yi2qagij4mpq4q1qmcs"; + url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-mlUcMMG3EhmfwiJ6EJr7mE177xjhOBcLvHIlxsH6ty0="; }; nativeBuildInputs = [ cmake + gettext makeWrapper wrapGAppsHook ]; @@ -53,11 +55,15 @@ stdenv.mkDerivation rec { libofx libxml2 libxslt - perl pkg-config swig webkitgtk - ] ++ (with perlPackages; [ FinanceQuote DateManip ]); + ] + ++ (with perlPackages; [ + DateManip + FinanceQuote + perl + ]); patches = [ # this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges @@ -68,16 +74,14 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch ]; - preConfigure = '' - export GUILE_AUTO_COMPILE=0 # this needs to be an env variable and not a cmake flag to suppress guile warning - ''; + # this needs to be an environment variable and not a cmake flag to suppress + # guile warning + GUILE_AUTO_COMPILE="0"; + # `make check` target does not define its prerequisites but expects them to + # have already been built. The list of targets below was built through trial + # and error based on failing tests. doCheck = true; - - /* - GNUcash's `make check` target does not define its prerequisites but expects them to have already been built. - The list of targets below was built through trial and error based on failing tests. - */ preCheck = '' make \ test-account-object \ @@ -156,12 +160,15 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd # specify where db drivers are - --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} # specify where nix puts the gnome settings schemas + # db drivers location + --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd + # gnome settings schemas location on Nix + --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} ) ''; - # wrapGAppsHook would wrap all binaries including the cli utils which need Perl wrapping + # wrapGAppsHook would wrap all binaries including the cli utils which need + # Perl wrapping dontWrapGApps = true; # gnucash is wrapped using the args constructed for wrapGAppsHook. @@ -176,15 +183,31 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Personal and small business double entry accounting application."; + homepage = "https://www.gnucash.org/"; + description = "Free software for double entry accounting"; longDescription = '' - Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. - As quick and intuitive to use as a checkbook register, it is based on professional accounting principles to ensure balanced books and accurate reports. - ''; + GnuCash is personal and small-business financial-accounting software, + freely licensed under the GNU GPL and available for GNU/Linux, BSD, + Solaris, Mac OS X and Microsoft Windows. - homepage = "https://www.gnucash.org/"; + Designed to be easy to use, yet powerful and flexible, GnuCash allows you + to track bank accounts, stocks, income and expenses. As quick and + intuitive to use as a checkbook register, it is based on professional + accounting principles to ensure balanced books and accurate reports. + + Some interesting features: + + - Double-Entry Accounting + - Stock/Bond/Mutual Fund Accounts + - Small-Business Accounting + - Reports, Graphs + - QIF/OFX/HBCI Import, Transaction Matching + - Scheduled Transactions + - Financial Calculations + ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.domenkozar ]; - platforms = platforms.linux; + maintainers = with maintainers; [ domenkozar AndersonTorres ]; + platforms = platforms.unix; }; } +# TODO: investigate Darwin support diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 6ab0921f66fea..688c8c319bd8b 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/logisim-evolution/logisim-evolution"; description = "Digital logic designer and simulator"; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index f94f08e43ab22..b4741aaed86ec 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.cburch.com/logisim/"; description = "Educational tool for designing and simulating digital logic circuits"; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 95b01d9f3f583..019694fd265ef 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -114,18 +114,26 @@ stdenv.mkDerivation rec { # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch + # Upstream will wait until Sage 9.7 to upgrade to linbox 1.7 because it + # does not support gcc 6. We can upgrade earlier. + # https://trac.sagemath.org/ticket/32959 + ./patches/linbox-1.7-upgrade.patch + # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { - base = "9.5.beta8"; + base = "9.5"; name = "sphinx-4.3-update.patch"; rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841"; sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q="; }) - # Upstream has not upgraded to linbox 1.7 yet because it conflicts with - # pre-4.2.1p3 versions of Singular, but we don't have this problem. - # https://trac.sagemath.org/ticket/32959 - ./patches/linbox-1.7-upgrade.patch + # https://trac.sagemath.org/ticket/33189 + (fetchSageDiff { + base = "9.5"; + name = "arb-2.22-update.patch"; + rev = "53532ddd4e2dc92469c1590ebf0c40f8f69bf579"; + sha256 = "sha256-6SoSBvIlqvNwZV3jTB6uPdUtaWIOeNmddi2poK/WvGs="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index a97c434957036..af2c4939ad04b 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "seabios"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { url = "https://www.seabios.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "1zc1brgafbbf5hmdr1qc1p859cabpz73l8sklq83xa4sn9icqw7b"; + sha256 = "sha256-YownF8mUMmtFMlFXPRBZ4qOhEtSqSIds4nyz8d4ZiPg="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/build-support/make-darwin-bundle/default.nix b/pkgs/build-support/make-darwin-bundle/default.nix new file mode 100644 index 0000000000000..b8f58882fff32 --- /dev/null +++ b/pkgs/build-support/make-darwin-bundle/default.nix @@ -0,0 +1,26 @@ +# given a package with an executable and an icon, make a darwin bundle for +# it. This package should be used when generating launchers for native Darwin +# applications. If the package conatins a .desktop file use +# `desktopToDarwinLauncher` instead. + +{ lib, writeShellScript, writeDarwinBundle }: + +{ name # The name of the Application file. +, exec # Executable file. +, icon ? "" # Optional icon file. +}: + +writeShellScript "make-darwin-bundle-${name}" ('' + function makeDarwinBundlePhase() { + mkdir -p "$out/Applications/${name}.app/Contents/MacOS" + mkdir -p "$out/Applications/${name}.app/Contents/Resources" + + if [ -n "${icon}" ]; then + ln -s "${icon}" "$out/Applications/${name}.app/Contents/Resources" + fi + + ${writeDarwinBundle}/bin/write-darwin-bundle "$out" "${name}" "${exec}" + } + + preDistPhases+=" makeDarwinBundlePhase" +'') diff --git a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix new file mode 100644 index 0000000000000..63ef7e6550758 --- /dev/null +++ b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix @@ -0,0 +1,40 @@ +{ writeScriptBin, lib, ... }: + +let + pListText = lib.generators.toPlist { } { + CFBundleDevelopmentRegion = "English"; + CFBundleExecutable = "$name"; + CFBundleIconFiles = [ "$iconPlistArray" ]; + CFBundleIdentifier = "org.nixos.$name"; + CFBundleInfoDictionaryVersion = "6.0"; + CFBundleName = "$name"; + CFBundlePackageType = "APPL"; + CFBundleSignature = "???"; + }; + +# The generation of the CFBundleIconFiles array is a bit of a hack, since we +# will always end up with an empty first element (<string></string>) but macOS +# appears to ignore this which allows us to use the nix PList generator. +in writeScriptBin "write-darwin-bundle" '' + shopt -s nullglob + + readonly prefix="$1" + readonly name="$2" + readonly exec="$3" + iconPlistArray="" + + for icon in "$prefix/Applications/$name.app/Contents/Resources"/*; do + iconPlistArray="$iconPlistArray</string><string>"$(basename "$icon")"" + done + + cat > "$prefix/Applications/$name.app/Contents/Info.plist" <<EOF +${pListText} +EOF + + cat > "$prefix/Applications/$name.app/Contents/MacOS/$name" <<EOF +#!/bin/bash +exec $prefix/bin/$exec +EOF + + chmod +x "$prefix/Applications/$name.app/Contents/MacOS/$name" +'' diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh new file mode 100644 index 0000000000000..d1175d3a5f9b9 --- /dev/null +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash +fixupOutputHooks+=('convertDesktopFiles $prefix') + +# Get a param out of a desktop file. First parameter is the file and the second +# is a pattern of the key who's value we should fetch. +getDesktopParam() { + local file="$1"; + local pattern="$2"; + + awk -F "=" "/${pattern}/ {print \$2}" "${file}" +} + +# For a given .desktop file, generate a darwin '.app' bundle for it. +convertDesktopFile() { + local -r file="$1" + local -r name=$(getDesktopParam "${file}" "^Name") + local -r exec=$(getDesktopParam "${file}" "Exec") + local -r iconName=$(getDesktopParam "${file}" "Icon") + local -r iconFiles=$(find "$out/share/icons/" -name "${iconName}.*" 2>/dev/null); + local -r pixMaps=$(find "$out/share/pixmaps/" -name "${iconName}.xpm" 2>/dev/null); + + mkdir -p "$out/Applications/${name}.app/Contents/MacOS" + mkdir -p "$out/Applications/${name}.app/Contents/Resources" + + local i=0; + for icon in $iconFiles; do + ln -s "$icon" "$out/Applications/${name}.app/Contents/Resources/$i-$(basename "$icon")" + (( i +=1 )); + done + + for pixmap in $pixMaps; do + local newIconName="$i-$(basename "$pixmap")"; + convert "$pixmap" "$out/Applications/${name}.app/Contents/Resources/${newIconName%.xpm}.png" + (( i +=1 )); + done + + write-darwin-bundle "$out" "$name" "$exec" +} + +convertDesktopFiles() { + local dir="$1/share/applications/" + + if [ -d "${dir}" ]; then + for desktopFile in $(find "$dir" -iname "*.desktop"); do + convertDesktopFile "$desktopFile"; + done + fi +} diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 50fad5efe23aa..46591d2369dc1 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.13"; + version = "1.16.14"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-sJJmVOrrAe9DgWY49C17FoHy0/QblVnwdzVSK3r61Bo="; + sha256 = "sha256-RniYzTohbeVNy5AU9UHv536beacVTbwf0t13iwxj+1Y="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 35c16f49f708d..4b2a3d39a9820 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.6"; + version = "1.17.7"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-TcG78/9h8MH/Kxk1Xm2IFRpwEmJopHx2FHdobvlHSMg="; + sha256 = "sha256-wQjNM7c7GRGgK2l3Qd896kPgGlxOCOQJ6LOg43RdK00="; }; # perl is used for testing go vet diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index 488c5b6e729ad..11ed0f1b28b78 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "http://aften.sourceforge.net/"; license = licenses.lgpl21Only; platforms = platforms.unix; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index e47dcd8e0ba20..dc160c37ad236 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "arb"; - version = "2.21.1"; + version = "2.22.1"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; - sha256 = "sha256-OBY2gKVnvrZLVrv+d6rXQLo026mrGB9eyNV4LESgrNI="; + sha256 = "sha256-Xd3dy7zr4i3pULLFOYtedpS5Yj9Ljwyu6r4kfhRynmE="; }; buildInputs = [ mpir gmp mpfr flint ]; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { "--with-flint=${flint}" ]; + enableParallelBuilding = true; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 2b8f006a7558a..2d6951301a116 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = "http://portmedia.sourceforge.net/portmidi/"; description = "Platform independent library for MIDI I/O"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 2190b34410ec6..7db587ed58be6 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.14.1"; + version = "0.14.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9794685d25f8f71d48fef04e2ca8ce8cc243b070f5b08ed70e70ae98341d24bb"; + sha256 = "1fkq8q54s9apqiamdd8vgrhk5p02w5w281q93dfnrd37xv7ysk6h"; }; postPatch = '' diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix index b8ed7721f0642..12aa1590742ac 100644 --- a/pkgs/development/python-modules/crownstone-uart/default.nix +++ b/pkgs/development/python-modules/crownstone-uart/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crownstone-uart"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-uart"; rev = version; - sha256 = "sha256-5K7NzJ7fKOW4Uh1XIlicVkRZuM84qTM5RQc/DfP9OEc="; + sha256 = "sha256-temf+uvGWMMtnhBpbYtTj6OzKqo3Xaa11Q2VX2+HTZc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index cc16231773461..9e6a910b2ba94 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; rev = version; - sha256 = "sha256-u+T3jD/rulfWunWkCa02XKXYvDaB9oAnohgqrJXgtJw="; + sha256 = "sha256-QfI7cwl2c5HOlFNNdG+oOv48X9jJZnZNU/kWgutWe6k="; }; # qt bindings cannot be found during tests diff --git a/pkgs/development/python-modules/ev3dev2/default.nix b/pkgs/development/python-modules/ev3dev2/default.nix index f6233db68dbcb..5afbb7da655fa 100644 --- a/pkgs/development/python-modules/ev3dev2/default.nix +++ b/pkgs/development/python-modules/ev3dev2/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Python language bindings for ev3dev"; homepage = "https://github.com/ev3dev/ev3dev-lang-python"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix index 7e8a1c5dfedd0..46a5f2952902b 100644 --- a/pkgs/development/python-modules/luddite/default.nix +++ b/pkgs/development/python-modules/luddite/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Checks for out-of-date package versions"; homepage = "https://github.com/jumptrading/luddite"; license = licenses.asl20; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 91e0303b4f04b..b717b44911739 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/ManimCommunity/ManimPango"; license = licenses.mit; description = "Binding for Pango"; - maintainers = [ maintainers.angustrau ]; + maintainers = [ maintainers.emilytrau ]; }; } diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index c8df80596f5e0..fa9234c755146 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.81"; + version = "1.2.82"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-ITE3gtcvXMisARlmnhlSzkZr/tGLiDq8aSO6d6jmlOw="; + sha256 = "sha256-HPSJ1D453yQCkPXQodZdISnNwPpk5TZaJ/BY8EbYImI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix index 5cc7eef65366f..a813c1bf95eba 100644 --- a/pkgs/development/python-modules/opensimplex/default.nix +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/lmas/opensimplex"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix index e8a7840d31620..1e60872b2c1b7 100644 --- a/pkgs/development/python-modules/ovoenergy/default.nix +++ b/pkgs/development/python-modules/ovoenergy/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "ovoenergy"; version = "1.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI="; + hash = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "ovoenergy" ]; + pythonImportsCheck = [ + "ovoenergy" + ]; meta = with lib; { description = "Python client for getting data from OVO's API"; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index a3aabdc568a92..6acd81854681f 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "22.2.1"; + version = "22.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - hash = "sha256-VMfvlqpmA2Mg/llVNcY3Enuuq3mwV0G1GYrpbvzo8pU="; + hash = "sha256-9QnimA9y5mVgJA9LkDVC+eNyp6Ltvw+fErtoSVL/1iw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix index d107d8e130014..2bcbc753a9ae1 100644 --- a/pkgs/development/python-modules/pyenvisalink/default.nix +++ b/pkgs/development/python-modules/pyenvisalink/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyenvisalink"; - version = "4.3"; + version = "4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "151a9bdefa2772cc9d2f913a32792625a4dc80c6c08086783ebc57de355e68a1"; + sha256 = "sha256-YUYiCid+XAlfytkyz4Td5CG1zBOrsLx4/nuRubRE14w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfakewebcam/default.nix b/pkgs/development/python-modules/pyfakewebcam/default.nix index 1ef1d2df474d0..c130accd40c01 100644 --- a/pkgs/development/python-modules/pyfakewebcam/default.nix +++ b/pkgs/development/python-modules/pyfakewebcam/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "A library for writing RGB frames to a fake webcam device on Linux"; homepage = "https://github.com/jremmons/pyfakewebcam"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 55cf1e36dec86..f56591efdadf3 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "A GUI system for pygame"; homepage = "https://github.com/MyreMylar/pygame_gui"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 66a1fb0ba287c..68e5a90d0cfd3 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { description = "Python library for games"; homepage = "https://www.pygame.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix index 0d5ed18cfdb74..3b6dd18665b58 100644 --- a/pkgs/development/python-modules/pyhumps/default.nix +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyhumps"; - version = "3.5.0"; + version = "3.5.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "nficano"; repo = "humps"; rev = "v${version}"; - hash = "sha256-dnNtx0VTD2e89yXMz0+acDhOaLBSkAA7n2io6qypN5E="; + hash = "sha256-6F61y0niPPuZBci15j68MFXzzBBimvbZ24+i9AZ7XJs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index c98fb6dddcf8d..f1cc51ec0aab7 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { description = "2d physics library"; homepage = "https://www.pymunk.org"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix index 349532ac523e3..8e7f8f880e2a7 100644 --- a/pkgs/development/python-modules/python-i18n/default.nix +++ b/pkgs/development/python-modules/python-i18n/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Easy to use i18n library"; homepage = "https://github.com/danhper/python-i18n"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix index ffa3a5302ae5f..9ab48ebf59d43 100644 --- a/pkgs/development/python-modules/pyuseragents/default.nix +++ b/pkgs/development/python-modules/pyuseragents/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Giving you a random User-Agent Header"; homepage = "https://github.com/Animenosekai/useragents"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index fc888c2379ee3..99c868eb0b804 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -31,7 +31,8 @@ buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' + --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' \ + --replace 'tomlkit = "^0.7"' 'tomlkit = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index 299d8446cfb77..68f298de10802 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, cython , h5py , matplotlib , numpy @@ -28,6 +29,10 @@ buildPythonPackage rec { sha256 = "1vwqyv215yf51j1278cn7l8mpqmy1grm9j7z3hxjlz4w65cff324"; }; + nativeBuildInputs = [ + cython + ]; + propagatedBuildInputs = [ spglib numpy @@ -44,6 +49,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # slight disagreement between caastepxbin versions + "test_castep_phonon_read_bands" + ]; + postPatch = '' substituteInPlace setup.py \ --replace "castepxbin==0.1.0" "castepxbin>=0.1.0" diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 776fbaa180191..47acd1f53c756 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -413,8 +413,10 @@ let license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; - timeout = 86400; # 24 hours, needed for darwin broken = !(xlaSupport -> cudaSupport); + } // lib.optionalAttrs stdenv.isDarwin { + timeout = 86400; # 24 hours + maxSilent = 14400; # 4h, double the default of 7200s }; }; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index be4cdd6ec0058..93fc92bd6320b 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -14,6 +14,12 @@ buildPythonPackage rec { pname = "testfixtures"; version = "6.18.3"; format = "setuptools"; + # DO NOT CONTACT upstream. + # https://github.com/simplistix/ is only concerned with internal CI process. + # Any attempt by non-standard pip workflows to comment on issues will + # be met with hostility. + # https://github.com/simplistix/testfixtures/issues/169 + # https://github.com/simplistix/testfixtures/issues/168 disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix index 986a16db702b4..44191bcab808c 100644 --- a/pkgs/development/python-modules/translatepy/default.nix +++ b/pkgs/development/python-modules/translatepy/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "A module grouping multiple translation APIs"; homepage = "https://github.com/Animenosekai/translate"; license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index c8f5205241840..affdbbb2b4479 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.3"; + version = "0.10.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "215a7a79198651ec5bdfd66193c1e71eb681a42f3ef7226c9af3123ced62564a"; + sha256 = "sha256-k0DnwVh3FVgbsTkFs68wt5/mivrM/KN3Zl1eY7aUEpo="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 37fedb46d8f05..a82bf972546d1 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.12"; + version = "1.4.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Dx7jxhO3aGCT1Mq6QDsvZLDcC7EY3dX2ltM0tLxSW8Y="; + sha256 = "sha256-SuKpSwIjZioyqmxlcKJ+UXP+ADfJwUwCCttmMAiEkZ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index c6e9ca39128e8..97bf7e96d2bb6 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pJyITEIngSWTDGfCcm8Z6YD6Pkbum0Vk71hqWk+CnUc="; + sha256 = "sha256-Af/rEsVWtMik0sBRZkMfZyyhn8SK9uDjRwTLcPkQpPE="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3a04ba2f86606..2b61d377e9fc1 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.319.2"; + version = "2.319.3"; src = fetchurl { - url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0lx5fng98l9qci5jqwav8dmcnp7k7glfg0ccwqi0xqk90jqqs302"; + url = "http://get.jenkins.io/war-stable/${version}/jenkins.war"; + sha256 = "sha256-c92Rs5W89i/iXm0wdHZfFRDJ5YTswen69EBRBkGBtDQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 2d1548bd86e0c..717a6d7c6951a 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-KNYxHBtPRsxEFrBJsfz5G7ZRZpVQxOph9UUKKhbHA9Y="; + hash = "sha256-kWGj0THunXXv3fz9oRLPx314bBU8mdHElmz0v7ALNpE="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/development/tools/mars-mips/default.nix index 6bca1fa64eee5..97ffd564c45cd 100644 --- a/pkgs/development/tools/mars-mips/default.nix +++ b/pkgs/development/tools/mars-mips/default.nix @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation rec { description = "An IDE for programming in MIPS assembly language intended for educational-level use"; homepage = "https://courses.missouristate.edu/KenVollmar/MARS/"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index ecb198d724804..49186c75c9a12 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Graphical front-end for command-line debuggers"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ angustrau ]; + maintainers = with lib.maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/development/tools/misc/qtspim/default.nix index 23d33a9f81c5d..842cf0eb5b49c 100644 --- a/pkgs/development/tools/misc/qtspim/default.nix +++ b/pkgs/development/tools/misc/qtspim/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "New user interface for spim, a MIPS simulator"; homepage = "http://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/spruce/default.nix b/pkgs/development/tools/misc/spruce/default.nix index 16fd6cde043d4..7c10a6ee0ca7e 100644 --- a/pkgs/development/tools/misc/spruce/default.nix +++ b/pkgs/development/tools/misc/spruce/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "spruce"; - version = "1.29.0"; + version = "unstable-2022-02-10"; src = fetchFromGitHub { owner = "geofffranks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HjJWiBYd1YFDZ+XOFcU2Df6bmKFBwVQ6YbiZv1IVN3A="; + rev = "473931f33fceae90b3f5cfb7616c296343a9559b"; + sha256 = "sha256-TFyWkoAKmj3KH2pqhVKMtP6QKTtu0s7H5gNP+fotUzg="; }; deleteVendor = true; - vendorSha256 = "sha256-67PGSW3wV8i3mAt3rCuWbFmeOe+QhHXn2rTUmeN6YMA="; + vendorSha256 = "sha256-VeC5c/BgcxK3Qawb2QOhqtfTIgbQbrQj546zX6yPD+s="; meta = with lib; { description = "A BOSH template merge tool"; diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/development/tools/misc/xspim/default.nix index 2e6e3e3eb1086..6e11c81cbde03 100644 --- a/pkgs/development/tools/misc/xspim/default.nix +++ b/pkgs/development/tools/misc/xspim/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A MIPS32 simulator"; homepage = "http://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/xxgdb/default.nix b/pkgs/development/tools/misc/xxgdb/default.nix index fc0a38ee74992..cd14705e1ebdd 100644 --- a/pkgs/development/tools/misc/xxgdb/default.nix +++ b/pkgs/development/tools/misc/xxgdb/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple but powerful graphical interface to gdb"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; }; } diff --git a/pkgs/games/itch-setup/default.nix b/pkgs/games/itch-setup/default.nix new file mode 100644 index 0000000000000..55d488bcaac06 --- /dev/null +++ b/pkgs/games/itch-setup/default.nix @@ -0,0 +1,24 @@ +{ lib, writeShellScriptBin, steam-run, fetchurl }: +let + + pname = "itch-setup"; + version = "1.26.0"; + + src = fetchurl { + url = "https://broth.itch.ovh/itch-setup/linux-amd64/${version}/unpacked/default"; + hash = "sha256-bcJKqhgZK42Irx12BIvbTDMb/DHEOEXljetlDokF7x8="; + executable = true; + }; + +in +(writeShellScriptBin pname ''exec ${steam-run}/bin/steam-run ${src} "$@"'') // { + + passthru = { inherit pname version src; }; + meta = with lib; { + description = "An installer for the itch.io desktop app"; + homepage = "https://github.com/itchio/itch-setup"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ pasqui23 ]; + }; +} diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix new file mode 100644 index 0000000000000..a8cfe8f24d76b --- /dev/null +++ b/pkgs/games/itch/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenvNoCC +, fetchurl +, libnotify +, nss +, gtk3 +, fetchFromGitHub +, makeDesktopItem +, itch-setup +, runtimeShell +}: +stdenvNoCC.mkDerivation rec{ + pname = "itch"; + version = "25.5.1"; + + src = fetchFromGitHub { + owner = "itchio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Pi3l3uK4kr+N3p7fGQuqckYIzycRqJHDVX00reoSbp4="; + }; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = pname; + mimeType = "x-scheme-handler/itchio;x-scheme-handler/itch"; + comment = "Install and play itch.io games easily"; + extraDesktopEntries = { + TryExec = "itch %U"; + Categories = "Game;"; + }; + }) + ]; + + itchBin = '' + #!${runtimeShell} + exec ${itch-setup}/bin/itch-setup --prefer-launch -- "$@" + ''; + + passAsFile = [ "itchBin" ]; + + # as taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=itch + installPhase = '' + install -Dm0777 $itchBinPath $out/bin/itch + for icon in release/images/itch-icons/icon*.png + do + iconsize="''${icon#release/images/itch-icons/icon}" + iconsize="''${iconsize%.png}" + icondir="$out/share/icons/hicolor/''${iconsize}x''${iconsize}/apps/" + install -Dm644 "$icon" "$icondir/itch.png" + done + ''; + + meta = with lib; { + description = "The best way to play itch.io games"; + homepage = "https://github.com/itchio/itch"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ pasqui23 ]; + }; +} diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix index 478fd606376a4..c1f03e036c9fe 100644 --- a/pkgs/games/liberation-circuit/default.nix +++ b/pkgs/games/liberation-circuit/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C. ''; homepage = "https://linleyh.itch.io/liberation-circuit"; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl3Only; platforms = platforms.linux; }; diff --git a/pkgs/misc/emulators/dosbox-staging/default.nix b/pkgs/misc/emulators/dosbox-staging/default.nix index 05c970507b2ae..438849e7fd8a3 100644 --- a/pkgs/misc/emulators/dosbox-staging/default.nix +++ b/pkgs/misc/emulators/dosbox-staging/default.nix @@ -4,32 +4,40 @@ , SDL2 , SDL2_net , alsa-lib +, copyDesktopItems , fluidsynth , gtest , libGL , libGLU , libogg , libpng +, libslirp +, makeDesktopItem , makeWrapper , meson , libmt32emu , ninja , opusfile , pkg-config +, libpulseaudio +, glib +, libjack2 +, libsndfile }: stdenv.mkDerivation rec { pname = "dosbox-staging"; - version = "0.77.1"; + version = "0.78.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "07jwmmm1bhfxavlhl854cj8l5iy5hqx5hpwkkjbcwqg7yh9jfs2x"; + hash = "sha256-gozFZcJorZtbEK0joksig6qWmAMy03hmBHiyJMONfpk="; }; nativeBuildInputs = [ + copyDesktopItems gtest makeWrapper meson @@ -42,42 +50,63 @@ stdenv.mkDerivation rec { SDL2_net alsa-lib fluidsynth + glib libGL libGLU + libjack2 libmt32emu libogg libpng + libpulseaudio + libslirp + libsndfile opusfile ]; - hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = [ + "-I${SDL2_net}/include/SDL2" + ]; - mesonFlags = [ - "--buildtype=release" - "-Db_asneeded=true" - "-Ddefault_library=static" - "-Dfluidsynth:enable-floats=true" - "-Dfluidsynth:try-static-deps=true" - "-Dtry_static_libs=png" + desktopItems = [ + (makeDesktopItem { + name = "dosbox-staging"; + exec = "dosbox-staging"; + icon = "dosbox-staging"; + comment = "x86 dos emulator enhanced"; + desktopName = "DosBox-Staging"; + genericName = "DOS emulator"; + categories = "Emulator;Game;"; + }) ]; postFixup = '' # Rename binary, add a wrapper, and copy manual to avoid conflict with - # vanilla dosbox. Doing it this way allows us to work with frontends and + # original dosbox. Doing it this way allows us to work with frontends and # launchers that expect the binary to be named dosbox, but get out of the # way of vanilla dosbox if the user desires to install that as well. - mv $out/bin/dosbox $out/bin/${pname} makeWrapper $out/bin/dosbox-staging $out/bin/dosbox - cp $out/share/man/man1/dosbox.1.gz $out/share/man/man1/${pname}.1.gz + + # Create a symlink to dosbox manual instead of merely copying it + pushd $out/share/man/man1/ + mv dosbox.1.gz ${pname}.1.gz + ln -s ${pname}.1.gz dosbox.1.gz + popd ''; meta = with lib; { homepage = "https://dosbox-staging.github.io/"; description = "A modernized DOS emulator"; + longDescription = '' + DOSBox Staging is an attempt to revitalize DOSBox's development + process. It's not a rewrite, but a continuation and improvement on the + existing DOSBox codebase while leveraging modern development tools and + practices. + ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ joshuafern ]; + maintainers = with maintainers; [ joshuafern AndersonTorres ]; platforms = platforms.unix; priority = 101; }; } +# TODO: report upstream about not finding SDL2_net diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 526c3f377862f..54081b4c7401a 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -795,7 +795,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison"; homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; }; @@ -1372,6 +1372,22 @@ let ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; + ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Theme-TomorrowKit"; + publisher = "ms-vscode"; + version = "0.1.4"; + sha256 = "sha256-qakwJWak+IrIeeVcMDWV/fLPx5M8LQGCyhVt4TS/Lmc="; + }; + meta = with lib; { + description = "Additional Tomorrow and Tomorrow Night themes for VS Code. Based on the TextMate themes."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.Theme-TomorrowKit"; + homepage = "https://github.com/microsoft/vscode-themes"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + ms-python.python = callPackage ./python { extractNuGet = callPackage ./python/extract-nuget.nix { }; }; diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 73b9cf08b8087..5ec2bd70fdb65 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.31"; + version = "1.0.32"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "sha256-agtaQ5Te4WcbIdCt8TDK4Y2y/9aHrDCUWuPRE5+aFjc="; + sha256 = "sha256-EV7byqfoz0sAIkf/hgZh+m7D2+54DEnE4td4CTX6c4s="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "sha256-QFHyrvLR1v09RNlXiO/E+blvxPukKwPRRX+vQvlZSNQ="; + cargoSha256 = "sha256-/bf5JQgyFN8TH7o2TWHX5sv/NkxBLJ495iVW8c9Vqis="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8f4ba61e868ba..22744e2e4c50b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.2.3"; + version = "2022.2.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index adbbc204f3a4e..670d2baa88391 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -121,7 +121,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.2.3"; + hassVersion = "2022.2.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -139,7 +139,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256:OqyWm7O8ajxBlWGzvNhZvFmy5p2dINfMQ3cQ304Er18="; + hash = "sha256-BQrhZCmPbhu7fB5/tqr6LxpzOKPq9fPDXBrQPOv0yA4="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 25bd411b76f69..31dbe64725cec 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -13,6 +13,7 @@ let google_translate = [ mutagen ]; nest = [ ha-av ]; onboarding = [ pymetno rpi-bad-power ]; + version = [ aioaseko ]; voicerss = [ mutagen ]; yandextts = [ mutagen ]; zha = [ pydeconz ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 21620c63548bd..ca59c49439950 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.3.5"; + version = "8.3.6"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-frkrYDiPxP3zDpZyYp/9MbNthaJlBF4Z+DdBs2G4jE8="; + sha256 = "sha256-XYgSXgZJKsVYMtlvMq84OuQBbrbFJUh6m/lKCbOlzus="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-1gk9MK110K5bV3hIPAE2dSS8wgH12dxvmNu3Ku/42e0="; + sha256 = "sha256-8gR95+xCJD3e25WxbmtXBMsS7HdbB+vwrcZ9sApSxFk="; }; - vendorSha256 = "sha256-Wg4VELJyrR/VbaFNamoziRU66GTVJxBUZ1vluKjn0O8="; + vendorSha256 = "sha256:0bj9a45jciaayqlrakdndzjdw4x600xw48wwy1id4n50h2mkrbp8"; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fb07bc39154d6..3254b6f232710 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -10,6 +10,7 @@ , bzip2, lz4, lzo, snappy, xz, zlib, zstd , cracklib, judy, libevent, libxml2 , linux-pam, numactl, pmdk +, fmt_8 , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: @@ -173,7 +174,8 @@ in stdenv.mkDerivation (common // { ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv - ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]; + ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] + ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; patches = common.patches; @@ -235,17 +237,27 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.22"; - sha256 = "000ca1hdnj2jg051cjgdd2ralgwgh2p8nwb1x6b85202xdpc7ga4"; + version = "10.4.23"; + sha256 = "1wlhjd1xvk6p2lb93v8kfjk1scyjz882fx0i0sjyyk047mh2i852"; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.13"; - sha256 = "0n0w1pyypv6wsknaqyykj3lc9zv6smji4q5jcf90w4rid330iw0n"; + version = "10.5.14"; + sha256 = "02y292mfvr6ils4m61lh9vy74z3w2xkz6xinpgg9wl5h7q29gzaf"; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.5"; - sha256 = "13qaqb2h6kysfdi3h1l9zbb2qlpjgxb1n8mxnj5jm96r50209gp0"; + version = "10.6.6"; + sha256 = "1hz1iwkgrlhhrn5ypxszfp5ngfmfakjxl3ihzsm4845xhzn1fr77"; + }; + mariadb_107 = mariadbPackage { + # Supported until 2023-02 + version = "10.7.2"; + sha256 = "1cx5s8vq7s3r4w1drmp549kl2nyijzq6ds2mcjyzc7bk9ylipx6p"; + }; + mariadb_108 = mariadbPackage { + # Supported until 2023-05 + version = "10.8.1"; + sha256 = "0ns0z8w3374jrfdrmq7ncag089xwmf7wkr5aq3p9shk1b5mln9z2"; }; } diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index 47bb6a67cb427..4a11d1e5440fd 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { url = "https://static.realvnc.com/media/documents/LICENSE-4.0a_en.pdf"; free = false; }; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/inputmethods/emote/default.nix b/pkgs/tools/inputmethods/emote/default.nix index 79831d7ef1ec7..b2c0fe6cc61c4 100644 --- a/pkgs/tools/inputmethods/emote/default.nix +++ b/pkgs/tools/inputmethods/emote/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { description = "A modern emoji picker for Linux"; homepage = "https://github.com/tom-james-watson/emote"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 3a9c83a8dad3e..cd30674b31a81 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -13,9 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-eiFG6lgsY5hf+XT3Kf5uA4Ai8vBbPsh1T4ObV+rj30Y="; - # remove when built with >= go 1.17 - tags = [ "zip117" ]; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; excludedPackages = [ "kobotest" ]; diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 5667c8a4c46c5..4e5641e304ce5 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/pkgs/tools/misc/via/default.nix @@ -35,7 +35,7 @@ in appimageTools.wrapType2 { description = "Yet another keyboard configurator"; homepage = "https://caniusevia.com/"; license = licenses.unfree; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/networking/nttcp/default.nix b/pkgs/tools/networking/nttcp/default.nix index c5a4c4c1cd1f3..7c7302cf19c6f 100644 --- a/pkgs/tools/networking/nttcp/default.nix +++ b/pkgs/tools/networking/nttcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "New test TCP program"; license = licenses.unfree; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/tools/networking/sockperf/default.nix index d58bcb2f3cac3..598fb482c382a 100644 --- a/pkgs/tools/networking/sockperf/default.nix +++ b/pkgs/tools/networking/sockperf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Network Benchmarking Utility"; homepage = "https://github.com/Mellanox/sockperf"; license = licenses.bsd3; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index 19768cdc1ae50..9aedd77aff7f1 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.32"; + version = "3.0.33"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-FPSBnM2MLmYVb0A27UhDp5D3oWJlrjZlMYDEr3qwmDY="; + sha256 = "sha256-1oGir5F3wgwRQxz3eXI58wMIKYwvtHrRW4VJh0hIVyE="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/wg-netmanager/default.nix b/pkgs/tools/networking/wg-netmanager/default.nix index 1392934564ebb..57a611664b95b 100644 --- a/pkgs/tools/networking/wg-netmanager/default.nix +++ b/pkgs/tools/networking/wg-netmanager/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wg-netmanager"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "gin66"; repo = "wg_netmanager"; rev = "wg_netmanager-v${version}"; - sha256 = "AAtSSBz2zGLIEpcEMbe1mfYZikiaYEI+6KeSL5n54PE="; + sha256 = "sha256-2LO1OCGlkjdszwgNBZ+Qwp126VfDq3pxf0Gz+6kzuPI="; }; - cargoSha256 = "17k83QkQDq5uRCRADRLD2Q7pv7yES20lpms/N/UK+BM="; + cargoSha256 = "sha256-EM0TPMyWMVpLFhan0boAQoAvMHBVgXp6mnYJLHOHiV8="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index c24de3947f6df..92abdce688809 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -5,21 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "unstable-2022-01-30"; + version = "unstable-2022-02-10"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; - rev = "b72274b052ae06cbe60a97d623829b1458369cc2"; - sha256 = "sha256-snq9C/a/53VivFcLNvdeKwVmPBXbcVzbbjTB+iULFUc="; + rev = "0c095ed50d3bbfd50f9f97832f7ac8092a8c1289"; + hash = "sha256-eIPyrL8C3qQbEahoryS70cJ4FbXDdPQuWaM2jD2BbI0="; }; - cargoSha256 = "sha256-/JzATzRhNexmyjtgjHVkw8LVyr4PdIdPJfUGXz4pZbQ="; + cargoSha256 = "sha256-DyE0TV/dHbDFkFvF9h0+qi+p2XD8lDZzsUByfOt/UjA="; meta = with lib; { - description = "The uncompromising Nix formatter"; + description = "The Uncompromising Nix Code Formatter"; homepage = "https://github.com/kamadorueda/alejandra"; license = licenses.unlicense; - maintainers = with maintainers; [ _0x4A6F ]; + maintainers = with maintainers; [ _0x4A6F kamadorueda ]; }; } diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 8812a16df3a13..bcff98114ca95 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.28" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.29" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index cdd2849be2ca1..015ccc8ef39db 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: b8975cbd6552cc52044250143ffc440775a8a29e - ref: refs/tags/6.1.28 + revision: 61b21e59fe8f4f65fba27f88d49782dece0aad00 + ref: refs/tags/6.1.29 specs: - metasploit-framework (6.1.28) + metasploit-framework (6.1.29) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.71) + metasploit-payloads (= 2.0.72) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -128,7 +128,7 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.552.0) + aws-partitions (1.554.0) aws-sdk-core (3.126.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -251,7 +251,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.71) + metasploit-payloads (2.0.72) metasploit_data_models (5.0.4) activerecord (~> 6.0) activesupport (~> 6.0) @@ -292,7 +292,7 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.13.1) - pdf-reader (2.9.0) + pdf-reader (2.9.1) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -379,7 +379,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.0.1) + ruby_smb (3.0.2) bindata openssl-ccm openssl-cmac @@ -446,4 +446,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.2.24 + 2.3.6 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index d7b2bb8b9e417..71372903384e0 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.28"; + version = "6.1.29"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-3l9yBnOejCVSo/zw46mGv3uBoArtyOPbjE1l8CoVNkg="; + sha256 = "sha256-S0R9D6Tih9+aVdYkpAodfwcRCq8WaqaJ5oYuPl7PgK8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index b55f76e8a85da..7042ed35260c4 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wr4jkylfkd89970hw3akfy7vyj54qz11gq3aar48j8p9px0gl17"; + sha256 = "0c5dyi1hy9xawlicdfzakj279r514vmb93kpwfa92lbb9bz1plg5"; type = "gem"; }; - version = "1.552.0"; + version = "1.554.0"; }; aws-sdk-core = { groups = ["default"]; @@ -684,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "b8975cbd6552cc52044250143ffc440775a8a29e"; - sha256 = "0j1n2lmg0radikdy7j7d1ah82yxzhsly7w7wld92b34yfc374pyy"; + rev = "61b21e59fe8f4f65fba27f88d49782dece0aad00"; + sha256 = "1bw0rxg3wbl6ws4scshnmw5121vz3l5a896nanddz1z2lh7psi2b"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.28"; + version = "6.1.29"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fr3v5mjwlilnlccnbimamz6sq6kckf16vgzpfpgi8gjma3lgb9"; + sha256 = "0ybw1daczslifq684hjxmr5668w7db1fi0z6g53812yva7lf4sv6"; type = "gem"; }; - version = "2.0.71"; + version = "2.0.72"; }; metasploit_data_models = { groups = ["default"]; @@ -967,10 +967,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fh2pq3gk5fh18g71wir98k4bz4rvihhx8qmn8zi9fz6yfqx39qj"; + sha256 = "0pn5l3ayjfn4mv2079q80q0x3q39q25nxcc5l9cjqz4lf5anhlfi"; type = "gem"; }; - version = "2.9.0"; + version = "2.9.1"; }; pg = { groups = ["default"]; @@ -1357,10 +1357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mf3mzxq83y7i8nr6bcl5yacvfz6y5p3hdmvr1m6xq0l0i9a9axy"; + sha256 = "13sp6bqgj06h7jkw5qvafwawfh2akyrsj38vq8qkjfjdg79pkbxf"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; rubyntlm = { groups = ["default"]; diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 4137f20dbbcf0..ea431f7272d77 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HV9WOJ8bWu8Uk1tXMZWqvo3ZvFiWLMGKmw6HzHBxSBY="; + sha256 = "sha256-GIonoedad/ruKN8DaFfFdW4l3ZWIM1NI5DtgBYPw+38="; }; - vendorSha256 = "sha256-MB3/iIStqNBM9YnNaRpV4hbs1gZzWm+7B+qHHm0kOmU="; + vendorSha256 = "sha256-h/mSF4hJ3TS+4b3CCUEXVin8MRcPg8qEe90Mcxk0uVo="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch b/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch deleted file mode 100644 index b19b9ffe8a625..0000000000000 --- a/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 1c915f1..83a8e41 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4,7 +4,7 @@ - WARN_CLANG=-Wformat-nonliteral -Wstrncat-size -Wformat-security -Wsign-conversion -Wconversion -Wfloat-conversion -Wshorten-64-to-32 -Wuninitialized -Wmissing-variable-declarations -Wmissing-declarations - WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral -Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 -Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion -Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fno-common -Wcast-align - CFLAGS ?= -g --OPTS=-I. -O3 $(CFLAGS) -fcommon -Wl,--allow-multiple-definition -+OPTS=-I. -O3 $(CFLAGS) -fcommon - # -Wall -g -pedantic - LIBS=-lm - DESTDIR ?= diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index b12daff003871..b6e3056e0232f 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -3,19 +3,15 @@ stdenv.mkDerivation rec { pname = "thc-hydra"; - version = "9.2"; + version = "9.3"; src = fetchFromGitHub { owner = "vanhauser-thc"; repo = "thc-hydra"; rev = "v${version}"; - sha256 = "sha256-V9rr5fbJWm0pa+Kp8g95XvLPo/uWcDwyU2goImnIq58="; + sha256 = "sha256-SzbaU52IXw5+ztN/GKD6Ki6/cx2icoZEzLHBu/J8sk0="; }; - patches = lib.optionals stdenv.isDarwin [ - ./darwin-remove-ldflag.patch - ]; - postPatch = let makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs); in '' @@ -44,9 +40,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A very fast network logon cracker which support many different services"; - homepage = "https://www.thc.org/thc-hydra/"; - license = licenses.agpl3; + homepage = "https://github.com/vanhauser-thc/thc-hydra"; # https://www.thc.org/ + changelog = "https://github.com/vanhauser-thc/thc-hydra/raw/v${version}/CHANGES"; + license = licenses.agpl3Plus; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; + badPlatforms = platforms.darwin; # fails to build since v9.3 }; } diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix new file mode 100644 index 0000000000000..a4e5badeb92b9 --- /dev/null +++ b/pkgs/tools/text/goawk/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule, fetchFromGitHub, lib }: +buildGoModule rec { + pname = "goawk"; + version = "1.15.0"; + + src = fetchFromGitHub { + owner = "benhoyt"; + repo = "goawk"; + rev = "v${version}"; + sha256 = "sha256-gd26j6c8ORy0qkeHvwPFLkymeRiFr8MLxJ6hIrBwAZw="; + }; + + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + # checks do not pass at the moment + doCheck = false; + + meta = with lib; { + description = "A POSIX-compliant AWK interpreter written in Go"; + homepage = "https://benhoyt.com/writings/goawk/"; + license = licenses.mit; + mainProgram = "goawk"; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64e50b37384aa..535c7e258bda9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -699,6 +699,8 @@ with pkgs; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; + makeDarwinBundle = callPackage ../build-support/make-darwin-bundle { }; + makeAutostartItem = callPackage ../build-support/make-startupitem { }; makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out @@ -807,6 +809,11 @@ with pkgs; substitutions = { inherit (binutils) targetPrefix; }; } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; + writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; + + desktopToDarwinBundle = makeSetupHook { deps = [ writeDarwinBundle imagemagick ]; } + ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; + keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; @@ -1905,6 +1912,10 @@ with pkgs; ipgrep = callPackage ../tools/networking/ipgrep { }; + itch = callPackage ../games/itch {}; + + itch-setup = callPackage ../games/itch-setup {}; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; @@ -3185,6 +3196,8 @@ with pkgs; goa = callPackage ../development/tools/goa { }; + goawk = callPackage ../tools/text/goawk { }; + gohai = callPackage ../tools/system/gohai { }; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; @@ -15538,9 +15551,7 @@ with pkgs; spooles = callPackage ../development/libraries/science/math/spooles {}; - spruce = callPackage ../development/tools/misc/spruce { - buildGoModule = buildGo116Module; - }; + spruce = callPackage ../development/tools/misc/spruce {}; sqlcheck = callPackage ../development/tools/database/sqlcheck { }; @@ -21501,6 +21512,8 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 + mariadb_107 + mariadb_108 ; mariadb = mariadb_106; @@ -27511,6 +27524,8 @@ with pkgs; nootka = qt5.callPackage ../applications/audio/nootka { }; nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + novnc = callPackage ../applications/networking/novnc { }; + nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; |