diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 008909e5c76..5ff7a5edefd 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -373,7 +373,7 @@ hashes need to be specified since they are not available through the lock file. For example: ``` -cargoDeps = { +cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a6f68d8d3c0..aabe6f4d595 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10031,6 +10031,12 @@ githubId = 27386; name = "Milan Svoboda"; }; + tfc = { + email = "jacek@galowicz.de"; + github = "tfc"; + githubId = 29044; + name = "Jacek Galowicz"; + }; tg-x = { email = "*@tg-x.net"; github = "tg-x"; diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index d76d7446e6b..b0e4f923f06 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -795,7 +795,7 @@ environment.systemPackages = [ In the module, use of --reuse-key - parameter for Lego has been removed. It was introduced for HKPK, but this security + parameter for Lego has been removed. It was introduced for HKPK, but this security feature is now deprecated. It is a better security practice to rotate key pairs instead of always keeping the same. If you need to keep this parameter, you can add it back using extraLegoRenewFlags as an option for the diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index b5bd22f6ba7..3cde7e95155 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -965,7 +965,7 @@ in mr ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so, '' + optionalString (isEnabled (cfg: cfg.enableKwallet)) '' - mr ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so, + mr ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so, '' + optionalString config.virtualisation.lxc.lxcfs.enable '' mr ${pkgs.lxc}/lib/security/pam_cgfs.so diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 37e61f32823..2b2ee019aeb 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -256,6 +256,17 @@ in default = []; description = "Other GNOME Flashback sessions to enable."; }; + + panelModulePackages = mkOption { + default = [ pkgs.gnome.gnome-applets ]; + type = types.listOf types.path; + description = '' + Packages containing modules that should be made available to gnome-panel (usually for applets). + + If you're packaging something to use here, please install the modules in $out/lib/gnome-panel/modules. + ''; + example = literalExample "[ pkgs.gnome.gnome-applets ]"; + }; }; }; @@ -318,6 +329,7 @@ in (wm: pkgs.gnome.gnome-flashback.mkSessionForWm { inherit (wm) wmName wmLabel wmCommand enableGnomePanel; + inherit (cfg.flashback) panelModulePackages; } ) flashbackWms; diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index b554bc6ea24..c7ceb816a31 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -1,10 +1,20 @@ { pkgs, lib, config, ... }: let cfg = config.virtualisation.containerd; - containerdConfigChecked = pkgs.runCommand "containerd-config-checked.toml" { nativeBuildInputs = [pkgs.containerd]; } '' - containerd -c ${cfg.configFile} config dump >/dev/null - ln -s ${cfg.configFile} $out + + configFile = if cfg.configFile == null then + settingsFormat.generate "containerd.toml" cfg.settings + else + cfg.configFile; + + containerdConfigChecked = pkgs.runCommand "containerd-config-checked.toml" { + nativeBuildInputs = [ pkgs.containerd ]; + } '' + containerd -c ${configFile} config dump >/dev/null + ln -s ${configFile} $out ''; + + settingsFormat = pkgs.formats.toml {}; in { @@ -13,10 +23,21 @@ in configFile = lib.mkOption { default = null; - description = "path to containerd config file"; + description = '' + Path to containerd config file. + Setting this option will override any configuration applied by the settings option. + ''; type = nullOr path; }; + settings = lib.mkOption { + type = settingsFormat.type; + default = {}; + description = '' + Verbatim lines to add to containerd.toml + ''; + }; + args = lib.mkOption { default = {}; description = "extra args to append to the containerd cmdline"; @@ -25,9 +46,19 @@ in }; config = lib.mkIf cfg.enable { - virtualisation.containerd.args.config = lib.mkIf (cfg.configFile != null) (toString containerdConfigChecked); + warnings = lib.optional (cfg.configFile != null) '' + `virtualisation.containerd.configFile` is deprecated. use `virtualisation.containerd.settings` instead. + ''; - environment.systemPackages = [pkgs.containerd]; + virtualisation.containerd = { + args.config = toString containerdConfigChecked; + settings = { + plugins.cri.containerd.snapshotter = lib.mkIf config.boot.zfs.enabled "zfs"; + plugins.cri.cni.bin_dir = lib.mkDefault "${pkgs.cni-plugins}/bin"; + }; + }; + + environment.systemPackages = [ pkgs.containerd ]; systemd.services.containerd = { description = "containerd - container runtime"; @@ -37,7 +68,7 @@ in containerd runc iptables - ]; + ] ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package; serviceConfig = { ExecStart = ''${pkgs.containerd}/bin/containerd ${lib.concatStringsSep " " (lib.cli.toGNUCommandLine {} cfg.args)}''; Delegate = "yes"; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 797d2c1d733..7e276e07224 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -1,16 +1,21 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , autoreconfHook -, alsaLib, python, SDL }: +, alsaLib +, python +, SDL +}: stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20200412"; + version = "20210525"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn"; + sha256 = "06ybkbqry7f7lmzgwb9s7ipafshl5gdj98lcjsjkcbnywj8r9b3h"; }; configureFlags = [ "--enable-dependency-tracking" ] @@ -23,8 +28,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; - license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; }; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 32159e3ebd2..e72d2df43a9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -242,12 +242,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0xzlkf3gq6fcb0q9mcj8k39880l8h21pb1lz0xl2dqj8cfwpws9h"; /* updated by script */ + sha256 = "1zx9qwjx7hwjq25y474yj7sxvp9bqnq9l53afs6d4h6131lhjkcz"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0smg0qbk3mnm2543w0nlvnyvbwmprf0p3z2spwrmcmfagv50crrx"; /* updated by script */ + sha256 = "1znb4m7sv7xqi1mq3yw0m51m06wfwmhhxmvck0xkv8s0cfg18qim"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "02fyrq4px9w34amincgjgm6maxpxn445j5h4nfbskx7z428ynx25"; /* updated by script */ + sha256 = "0g20r7yn4r2h08wv3i8bnnma8x4jljixsbmfml8kixk0pzfhv4px"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1say19p7kgx4b2ccs9bv61phllzhl8gmrd1fp1a5cnagya7vl1c5"; /* updated by script */ + sha256 = "03i5f6p0abr9yfs9fg90fg7hb1a7zar9q4d4iiag30cmndwpslg2"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "19zi4njz79z8gi458kz1m0sia79y3rhbayix4rmh93mwfc0npkii"; /* updated by script */ + sha256 = "0mw4acaik1bkr7gqbwgs3i8f8px8zw95hm1zxgd5gd5kh88n17x5"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -359,12 +359,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1a28pi18j0cb2wxhw1vnfg9gqsgf2kyfg0hl4xgqp50gzv7i3aam"; /* updated by script */ + sha256 = "0k2vpndpachq6g767v2dwfa3xc8mssv0i7wwpm05dgqirpn4n0dw"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -385,12 +385,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1hici40qsxj2fw29g68i6hr1vhr0h7xrlhkialy74ah53wi7myz1"; /* updated by script */ + sha256 = "0q4hn6npm0c30v23d30dnphd6wajif0im1b9vjwa121lqi997l34"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index 3b432ff66b1..c8d6eb3b84c 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -1,4 +1,6 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, substituteAll +, qmake, qttools, qttranslations +}: mkDerivation rec { pname = "gpxlab"; @@ -11,8 +13,13 @@ mkDerivation rec { sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84"; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qttools qttranslations ]; + patches = (substituteAll { + # See https://github.com/NixOS/nixpkgs/issues/86054 + src = ./fix-qttranslations-path.patch; + inherit qttranslations; + }); + + nativeBuildInputs = [ qmake qttools ]; preConfigure = '' lrelease GPXLab/locale/*.ts @@ -24,8 +31,6 @@ mkDerivation rec { wrapQtApp $out/Applications/GPXLab.app/Contents/MacOS/GPXLab ''; - enableParallelBuilding = true; - meta = with lib; { homepage = "https://github.com/BourgeoisLab/GPXLab"; description = "Program to show and manipulate GPS tracks"; @@ -33,8 +38,8 @@ mkDerivation rec { GPXLab is an application to display and manage GPS tracks previously recorded with a GPS tracker. ''; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch b/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch new file mode 100644 index 00000000000..8dcba75d764 --- /dev/null +++ b/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch @@ -0,0 +1,17 @@ +diff --git i/GPXLab/main.cpp w/GPXLab/main.cpp +index b12d2dd..58d37c5 100644 +--- i/GPXLab/main.cpp ++++ w/GPXLab/main.cpp +@@ -19,10 +19,10 @@ int main(int argc, char *argv[]) + app.installTranslator(&gpxlab); + + QTranslator qt; +-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) ++#if defined(Q_OS_WIN32) + qt.load(QLocale::system(), "qt", "_", TRANSLATIONS_DIR); + #else +- qt.load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath)); ++ qt.load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); + #endif + app.installTranslator(&qt); + diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix new file mode 100644 index 00000000000..c5a23840264 --- /dev/null +++ b/pkgs/applications/misc/iptsd/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, systemd, inih }: + +stdenv.mkDerivation rec { + pname = "iptsd"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "linux-surface"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-CoPgkt7n2kk7WlQHe0RjNlxfp2Nd8BbIE2gyf0bOBy4="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + + buildInputs = [ systemd inih ]; + + # Original installs udev rules and service config into global paths + postPatch = '' + substituteInPlace meson.build \ + --replace "install_dir: unitdir" "install_dir: datadir" \ + --replace "install_dir: rulesdir" "install_dir: datadir" \ + ''; + mesonFlags = [ + "-Dsystemd=true" + "-Dsample_config=false" + "-Ddebug_tool=false" + ]; + + meta = with lib; { + description = "Userspace daemon for Intel Precise Touch & Stylus"; + homepage = "https://github.com/linux-surface/iptsd"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ tomberek ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix new file mode 100644 index 00000000000..a67d79f9bf9 --- /dev/null +++ b/pkgs/applications/misc/skytemple/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, wrapGAppsHook, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "skytemple"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9"; + }; + + buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + propagatedBuildInputs = with python3Packages; [ + natsort + packaging + pycairo + pygal + pypresence + setuptools + skytemple-dtef + skytemple-eventserver + skytemple-files + skytemple-icons + skytemple-ssb-debugger + ]; + + doCheck = false; # there are no tests + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple"; + description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index fe4a33e65cf..feff2a74b14 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.24.86"; + version = "1.25.68"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "VKUs8PPyAbuH91Zck0QTiFCEUOMDlLT4Itv4MXi4Ygg="; + sha256 = "OBf42L6pctflNLjtcbnw2wKo7TisRSMF3SriDPFlB6I="; }; dontConfigure = true; diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix new file mode 100644 index 00000000000..933747f3989 --- /dev/null +++ b/pkgs/applications/video/ustreamer/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, libbsd, libevent, libjpeg }: + +stdenv.mkDerivation rec { + pname = "ustreamer"; + version = "3.27"; + + src = fetchFromGitHub { + owner = "pikvm"; + repo = "ustreamer"; + rev = "v${version}"; + sha256 = "1max2171abdpix0wq7mdkji5lvkfzisj166qfgmqkkwc2nh721iw"; + }; + + buildInputs = [ libbsd libevent libjpeg ]; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/bin + cp ustreamer $out/bin/ + ''; + + meta = with lib; { + homepage = "https://github.com/pikvm/ustreamer"; + description = "Lightweight and fast MJPG-HTTP streamer"; + longDescription = '' + µStreamer is a lightweight and very quick server to stream MJPG video from + any V4L2 device to the net. All new browsers have native support of this + video format, as well as most video players such as mplayer, VLC etc. + µStreamer is a part of the Pi-KVM project designed to stream VGA and HDMI + screencast hardware data with the highest resolution and FPS possible. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tfc ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index d75d3cf943a..d3a8cc54a14 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -33,4 +33,5 @@ stdenv.mkDerivation (args // { (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") internalDeps} ''; + checkPhase = "NO_INTERACTON=yes make test"; }) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 5bbf1b63f2b..cfa8204f093 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -90,6 +90,8 @@ rec { , finalImageName ? imageName # This used to set a tag to the pulled image , finalImageTag ? "latest" + # This is used to disable TLS certificate verification, allowing access to http registries on (hopefully) trusted networks + , tlsVerify ? true , name ? fixName "docker-image-${finalImageName}-${finalImageTag}.tar" }: @@ -109,7 +111,13 @@ rec { sourceURL = "docker://${imageName}@${imageDigest}"; destNameTag = "${finalImageName}:${finalImageTag}"; } '' - skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag" + skopeo \ + --src-tls-verify=${lib.boolToString tlsVerify} \ + --insecure-policy \ + --tmpdir=$TMPDIR \ + --override-os ${os} \ + --override-arch ${arch} \ + copy "$sourceURL" "docker-archive://$out:$destNameTag" ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index bd9ab1bb77b..e7543aff666 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,18 +2,16 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210501"; + version = "20210601"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-3KH0oLeCev7WuoIOh4KBTiHTn2/aQlVrW5dpO+LSRT4="; + sha256 = "sha256-AX51udzIv/DO0n8ba2Gm6Leikep6x4tgUuRUdPX/Cds="; }; - nativeBuildInputs = [ - gtk3 - ]; + nativeBuildInputs = [ gtk3 ]; propagatedBuildInputs = [ pantheon.elementary-icon-theme diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/data/misc/cacert/update.sh index 7bf3d46cb02..1c286dc6206 100755 --- a/pkgs/data/misc/cacert/update.sh +++ b/pkgs/data/misc/cacert/update.sh @@ -12,6 +12,14 @@ # # As of this writing there are a few magnitudes more packages depending on # cacert than on nss. +# +# If the current nixpkgs revision contains the attribute `nss_latest` that will +# be used instead of `nss`. This is done to help the stable branch maintenance +# where (usually) after branch-off during the first Firefox upgrade that +# requries a new NSS version that attribute is introduced. +# By having this change in the unstable branch we can safely carry it from +# release to release without requiring more backport churn on those doing the +# stable maintenance. set -ex @@ -20,7 +28,7 @@ BASEDIR="$(dirname "$0")/../../../.." CURRENT_PATH=$(nix-build --no-out-link -A cacert.out) -PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; (cacert.overrideAttrs (_: { inherit (nss) src version; })).out") +PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; let nss_pkg = pkgs.nss_latest or pkgs.nss; in (cacert.overrideAttrs (_: { inherit (nss_pkg) src version; })).out") # Check the hash of the etc subfolder # We can't check the entire output as that contains the nix-support folder diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 1ca9a57eb99..0e1167561eb 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -62,7 +62,7 @@ in rec { gnomeExtensions = lib.recurseIntoAttrs ( (mapReadableNames (produceExtensionsList "40")) // (callPackage ./manuallyPackaged.nix {}) - // lib.optionalAttrs (config.allowAliases or false) { + // lib.optionalAttrs (config.allowAliases or true) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 2e8662ede0c..3df9d7450cd 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -23,10 +23,10 @@ , pam , wrapGAppsHook , writeTextFile -, writeShellScriptBin , xkeyboard_config , xorg , runCommand +, buildEnv }: let pname = "gnome-flashback"; @@ -126,7 +126,7 @@ let versionPolicy = "odd-unstable"; }; - mkSessionForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }: + mkSessionForWm = { wmName, wmLabel, wmCommand, enableGnomePanel, panelModulePackages }: let wmApplication = writeTextFile { name = "gnome-flashback-${wmName}-wm"; @@ -155,15 +155,39 @@ let ''; }; - executable = writeShellScriptBin "gnome-flashback-${wmName}" '' - if [ -z $XDG_CURRENT_DESKTOP ]; then - export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME" - fi + # gnome-panel will only look for applets in a single directory so symlink them into here. + panelModulesEnv = buildEnv { + name = "gnome-panel-modules-env"; + # We always want to find the built-in panel applets. + paths = [ gnome-panel gnome-flashback ] ++ panelModulePackages; + pathsToLink = [ "/lib/gnome-panel/modules" ]; + }; - export XDG_DATA_DIRS=${wmApplication}/share:${gnomeSession}/share:${gnome-flashback}/share:${gnome-panel}/share:$XDG_DATA_DIRS + executable = stdenv.mkDerivation { + name = "gnome-flashback-${wmName}"; + nativeBuildInputs = [ glib wrapGAppsHook ]; + buildInputs = [ gnome-flashback ] ++ lib.optionals enableGnomePanel ([ gnome-panel ] ++ panelModulePackages); - exec ${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName} "$@" - ''; + # We want to use the wrapGAppsHook mechanism to wrap gnome-session + # with the environment that gnome-flashback and gnome-panel need to + # run, including the configured applet packages. This is only possible + # in the fixup phase, so turn everything else off. + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontInstall = true; + dontWrapGApps = true; # We want to do the wrapping ourselves. + + # gnome-flashback and gnome-panel need to be added to XDG_DATA_DIRS so that their .desktop files can be found by gnome-session. + preFixup = '' + makeWrapper ${gnome-session}/bin/gnome-session $out \ + --add-flags "--session=gnome-flashback-${wmName}" \ + --set-default XDG_CURRENT_DESKTOP 'GNOME-Flashback:GNOME' \ + --prefix XDG_DATA_DIRS : '${lib.makeSearchPath "share" ([ wmApplication gnomeSession gnome-flashback ] ++ lib.optional enableGnomePanel gnome-panel)}' \ + "''${gappsWrapperArgs[@]}" \ + ${lib.optionalString enableGnomePanel "--set NIX_GNOME_PANEL_MODULESDIR '${panelModulesEnv}/lib/gnome-panel/modules'"} + ''; + }; in writeTextFile @@ -174,7 +198,7 @@ let [Desktop Entry] Name=GNOME Flashback (${wmLabel}) Comment=This session logs you into GNOME Flashback with ${wmLabel} - Exec=${executable}/bin/gnome-flashback-${wmName} + Exec=${executable} TryExec=${wmCommand} Type=Application DesktopNames=GNOME-Flashback;GNOME; diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index 4e42f91e1e3..8ab1a87d01c 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -32,6 +32,13 @@ stdenv.mkDerivation rec { hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs="; }; + patches = [ + # Load modules from path in `NIX_GNOME_PANEL_MODULESDIR` environment variable + # instead of gnome-panel’s libdir so that the NixOS module can make gnome-panel + # load modules from other packages as well. + ./modulesdir-env-var.patch + ]; + # make .desktop Exec absolute postPatch = '' patch -p0 <=5.2",' "" + substituteInPlace setup.py \ + --replace '"pytest-runner>=5.2",' "" \ + --replace "pyroute2>=0.5.18,!=0.6.1" "pyroute2" ''; checkInputs = [ diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix new file mode 100644 index 00000000000..b0f1a16fe42 --- /dev/null +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub, antlr4-python3-runtime, pygments, python-igraph }: + +buildPythonPackage rec { + pname = "explorerscript"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; + }; + + propagatedBuildInputs = [ antlr4-python3-runtime python-igraph ]; + checkInputs = [ pygments ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/explorerscript"; + description = "A programming language + compiler/decompiler for creating scripts for Pokémon Mystery Dungeon Explorers of Sky"; + license = licenses.mit; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix new file mode 100644 index 00000000000..eeb68b9bbbd --- /dev/null +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, aiohttp +}: + +buildPythonPackage rec { + pname = "garages-amsterdam"; + version = "2.1.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "garages_amsterdam"; + rev = version; + sha256 = "1lg66g0im6v0m294j82229n2b7bhs6kkrp0d9nh87k2rz7zgllil"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # The only test requires network access + doCheck = false; + + pythonImportsCheck = [ "garages_amsterdam" ]; + + meta = with lib; { + description = "Python client for getting garage occupancy in Amsterdam"; + homepage = "https://github.com/klaasnicolaas/garages_amsterdam"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix new file mode 100644 index 00000000000..3268e8fae7b --- /dev/null +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "mitogen"; + version = "0.3.0rc1"; + + src = fetchFromGitHub { + owner = "mitogen-hq"; + repo = pname; + rev = "v${version}"; + sha256 = "0hxb41sshybxjyvyarl2axs0v6w53vqxafgfjrmpp5k20z5kapz4"; + }; + + # Tests require network access and Docker support + doCheck = false; + + pythonImportsCheck = [ "mitogen" ]; + + meta = with lib; { + description = "Python Library for writing distributed self-replicating programs"; + homepage = "https://github.com/mitogen-hq/mitogen"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix new file mode 100644 index 00000000000..9c4d91df9d6 --- /dev/null +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, crcmod }: + +buildPythonPackage rec { + pname = "ndspy"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s0i81gspas22bjwk9vhy3x5sw1svyybk7c2j1ixc77drr9ym20a"; + }; + + propagatedBuildInputs = [ crcmod ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "ndspy" ]; + + meta = with lib; { + homepage = "https://github.com/RoadrunnerWMC/ndspy"; + description = "A Python library for many Nintendo DS file formats"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix new file mode 100644 index 00000000000..a249b0aede1 --- /dev/null +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -0,0 +1,44 @@ +{ lib, buildPythonPackage, fetchFromGitHub, GitPython +, libpcap, meson, ninja, pillow, pkg-config, pygobject3, SDL2 +, alsaLib, soundtouch, openal +}: + +let + desmume = fetchFromGitHub { + owner = "SkyTemple"; + repo = "desmume"; + rev = "8e7af8ada883b7e91344985236f7c7c04ee795d7"; + sha256 = "0svmv2rch9q347gbpbws4agymas8n014gh1ssaf91wx7jwn53842"; + }; +in +buildPythonPackage rec { + pname = "py-desmume"; + version = "0.0.3.post2"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "1chsg70k8kqnlasn88b04ww3yl0lay1bjxvz6lhp6s2cvsxv03x1"; + }; + + postPatch = '' + cp -R --no-preserve=mode ${desmume} __build_desmume + ''; + + buildInputs = [ GitPython libpcap SDL2 alsaLib soundtouch openal ]; + nativeBuildInputs = [ meson ninja pkg-config ]; + propagatedBuildInputs = [ pillow pygobject3 ]; + + hardeningDisable = [ "format" ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "desmume" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/py-desmume"; + description = "Python library to interface with DeSmuME, the Nintendo DS emulator"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix new file mode 100644 index 00000000000..9dcb2b732ca --- /dev/null +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, gobject-introspection, gtk3, pyenchant, pygobject3 }: + +buildPythonPackage rec { + pname = "pygtkspellcheck"; + version = "4.0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pc3xmv1q775hn4kc1kspvpdn4gm7ix3aw6hz9iy3brfcw6ddcl4"; + }; + + nativeBuildInputs = [ gobject-introspection gtk3 ]; + propagatedBuildInputs = [ pyenchant pygobject3 ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "gtkspellcheck" ]; + + meta = with lib; { + homepage = "https://github.com/koehlma/pygtkspellcheck"; + description = "A Python spell-checking library for GtkTextViews based on Enchant"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix new file mode 100644 index 00000000000..0fa188c0771 --- /dev/null +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pypresence"; + version = "4.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c8r7yxih5zp46qb9anq5s91pw2wr7d9d0nzcfh4l42x10c8lqal"; + }; + + doCheck = false; # tests require internet connection + pythonImportsCheck = [ "pypresence" ]; + + meta = with lib; { + homepage = "https://qwertyquerty.github.io/pypresence/html/index.html"; + description = "Discord RPC client written in Python"; + license = licenses.mit; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix new file mode 100644 index 00000000000..4ee37e4bfed --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-core"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.core"; + inherit version; + sha256 = "04v10rzz844w2wfpy4pkh8fxn6dminjmfm1q7ngg5wvpk5r691rj"; + }; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.common" + "pr2modules.config" + "pr2modules.proxy" + ]; + + meta = with lib; { + description = "Core module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix new file mode 100644 index 00000000000..4e671b4e193 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ethtool"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ethtool"; + inherit version; + sha256 = "1gd2vvdkjf6ppiql3znrlzc9xg8c4gsyg2jfm76c2xf329hi66n7"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.ethtool" + ]; + + meta = with lib; { + description = "Ethtool module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix new file mode 100644 index 00000000000..733988f20f5 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ipdb"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ipdb"; + inherit version; + sha256 = "0wnzvy72pjipsdcfnwxpqp0jimg2l3w6gwd3r4b3mhvhackgsvs6"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.ipdb" + ]; + + meta = with lib; { + description = "Ipdb module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix new file mode 100644 index 00000000000..5ea6c7ce5d4 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ipset"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ipset"; + inherit version; + sha256 = "1d5l9f028y7fjfbxpp5wls9ffdgrln24dlz8k4p11b5n445liakx"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.ipset" + ]; + + meta = with lib; { + description = "Ipset module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix new file mode 100644 index 00000000000..7b34b3d341a --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-ndb"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.ndb"; + inherit version; + sha256 = "0lzvh0vva8i86h00add0b45s4f5dn6zbgysfvmzrxxasvda7fhlj"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ "pr2modules.ndb" ]; + + meta = with lib; { + description = "NDB module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix new file mode 100644 index 00000000000..594d57cba1b --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-nftables"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.nftables"; + inherit version; + sha256 = "0g93jsjf77sxjxmgmd8pzy8daxnqnzp2fk9gbh9kxk1n1958p100"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.nftables" + ]; + + meta = with lib; { + description = "Nftables module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix new file mode 100644 index 00000000000..e1076c1d0a0 --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-nslink"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.nslink"; + inherit version; + sha256 = "0hjdi863imppirjrwr87xk2mfbw2djcsh7x94cq4xwps7bxmmkwk"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.nslink" + ]; + + meta = with lib; { + description = "Nslink module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix new file mode 100644 index 00000000000..389ca2ab44d --- /dev/null +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyroute2-core +}: + +buildPythonPackage rec { + pname = "pyroute2-protocols"; + version = "0.6.1"; + + src = fetchPypi { + pname = "pyroute2.protocols"; + inherit version; + sha256 = "16c22ygyxdn1mhnd2f34q9b2mqa27klk6di91w27ycb3aczmadlm"; + }; + + propagatedBuildInputs = [ + pyroute2-core + ]; + + # pyroute2 sub-modules have no tests + doCheck = false; + + pythonImportsCheck = [ + "pr2modules.protocols" + ]; + + meta = with lib; { + description = "Protocols module for pyroute2"; + homepage = "https://github.com/svinota/pyroute2"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 00ce008d6cc..f18bc12caa6 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,17 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, mitogen +, pyroute2-core +, pyroute2-ethtool +, pyroute2-ipdb +, pyroute2-ipset +, pyroute2-ndb +, pyroute2-nftables +, pyroute2-nslink }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.18"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U="; + sha256 = "sha256-nvG1PcuyQoZPrfMS4atsXsvpInjYt1bUIeX6Ol5DsO8="; }; + propagatedBuildInputs = [ + mitogen + pyroute2-core + pyroute2-ethtool + pyroute2-ipdb + pyroute2-ipset + pyroute2-ndb + pyroute2-nftables + pyroute2-nslink + ]; + # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix new file mode 100644 index 00000000000..28156460110 --- /dev/null +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, pythonAtLeast +, buildPythonPackage +, importlib-resources +, pyyaml +, requests +, pytestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "scikit-hep-testdata"; + version = "0.4.3"; + format = "pyproject"; + + # fetch from github as we want the data files + # https://github.com/scikit-hep/scikit-hep-testdata/issues/60 + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-3uy2uZb0Y9nOHlXtsDd9LGALvTXl1ZQ6P3m2dQ2ceHo="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ + pyyaml + requests + ] ++ lib.optional (!pythonAtLeast "3.9") importlib-resources; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + SKHEP_DATA = 1; # install the actual root files + + doCheck = false; # tests require networking + pythonImportsCheck = [ "skhep_testdata" ]; + + meta = with lib; { + homepage = "https://github.com/scikit-hep/scikit-hep-testdata"; + description = "A common package to provide example files (e.g., ROOT) for testing and developing packages against"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix new file mode 100644 index 00000000000..80bebd55696 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, skytemple-files }: + +buildPythonPackage rec { + pname = "skytemple-dtef"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "177ydif01fai6z5yhgpa27pzfgabblzhl8nsczczcmw74vxqwzyc"; + }; + + propagatedBuildInputs = [ skytemple-files ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_dtef" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-dtef"; + description = "A format for standardized rule-based tilesets with 256 adjacency combinations"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/skytemple-eventserver/default.nix b/pkgs/development/python-modules/skytemple-eventserver/default.nix new file mode 100644 index 00000000000..123f4ba6d85 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-eventserver/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "skytemple-eventserver"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "1xcf7ljvi5ixhwx9rkg3hnwcyv4wsgd2yb6is11jffbrdp00j2bq"; + }; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_eventserver" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-eventserver"; + description = "Websocket server that emits SkyTemple UI events"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix new file mode 100644 index 00000000000..cb03d73b427 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant }: + +buildPythonPackage rec { + pname = "skytemple-files"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "1vklg4kcj3kb9ryrzrcmywn131b2bp3vy94cd4x4y4s7hkhgwg74"; + }; + + propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; + + doCheck = false; # requires Pokémon Mystery Dungeon ROM + pythonImportsCheck = [ "skytemple_files" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-files"; + description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix new file mode 100644 index 00000000000..0bf3659605c --- /dev/null +++ b/pkgs/development/python-modules/skytemple-icons/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "skytemple-icons"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "036bxy0n3p0ivcdaymj11z0nw555xjxxj15ja0rpjsvq1mqamd80"; + }; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_icons" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-icons"; + description = "Icons for SkyTemple"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix new file mode 100644 index 00000000000..d22d6109958 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, rustPlatform, setuptools-rust }: + +buildPythonPackage rec { + pname = "skytemple-rust"; + version = "unstable-2021-05-30"; # Contains build bug fixes, but is otherwise identical to 0.0.1.post0 + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = "cff8b2930af6d25d41331fab8c04f56a4fd75e95"; + sha256 = "18y6wwvzyw062zlv3gcirr1hgld9d97ffyrvy0jvw8nr3b9h9x0i"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1ypcsf9gbq1bz29kfn7g4kg8741mxg1lfcbb14a0vfhjq4d6pnx9"; + }; + + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_rust" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-rust"; + description = "Binary Rust extensions for SkyTemple"; + license = licenses.mit; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix new file mode 100644 index 00000000000..88ae80f7242 --- /dev/null +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3 +, wrapGAppsHook, nest-asyncio, pycairo, py-desmume, pygtkspellcheck, setuptools +, skytemple-files, skytemple-icons +}: + +buildPythonPackage rec { + pname = "skytemple-ssb-debugger"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "0jmsli3wg386y0lxwddpwp1xqxsn2bsy4d1f7dyh0jjz8lqiz03i"; + }; + + buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + propagatedBuildInputs = [ + nest-asyncio + pycairo + py-desmume + pygtkspellcheck + setuptools + skytemple-files + skytemple-icons + ]; + + doCheck = false; # requires Pokémon Mystery Dungeon ROM + pythonImportsCheck = [ "skytemple_ssb_debugger" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/skytemple-ssb-debugger"; + description = "Script Engine Debugger for Pokémon Mystery Dungeon Explorers of Sky"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix new file mode 100644 index 00000000000..90caab8ebef --- /dev/null +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, GitPython, click, ordered-set, pillow, sortedcollections }: + +let + aikku93-tilequant = fetchFromGitHub { + owner = "SkyTemple"; + repo = "aikku93-tilequant"; + rev = "6604e0906edff384b6c8d4cde03e6601731f66fd"; + sha256 = "0w19h3n2i0xriqsy0b0rifjgbv4hqd7gl78fw0cappkrdykij5r1"; + }; +in +buildPythonPackage rec { + pname = "tilequant"; + version = "0.4.0.post0"; + + src = fetchFromGitHub { + owner = "SkyTemple"; + repo = pname; + rev = version; + sha256 = "189af203iay3inj1bbgm3hh1fshn879bcm28ypbvfp27fy7j5b25"; + }; + + postPatch = '' + cp -R --no-preserve=mode ${aikku93-tilequant} __aikku93_tilequant + ''; + + buildInputs = [ GitPython ]; + propagatedBuildInputs = [ click ordered-set pillow sortedcollections ]; + + doCheck = false; # there are no tests + pythonImportsCheck = [ "skytemple_tilequant" ]; + + meta = with lib; { + homepage = "https://github.com/SkyTemple/tilequant"; + description = "Tool for quantizing image colors using tile-based palette restrictions"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xfix ]; + }; +} diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix new file mode 100644 index 00000000000..8a687534005 --- /dev/null +++ b/pkgs/development/python-modules/uproot/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, awkward +, numpy +, lz4 +, xxhash +, zstandard +, pytestCheckHook +, scikit-hep-testdata +}: + +buildPythonPackage rec { + pname = "uproot"; + version = "4.0.8"; + + # fetch from github for tests + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "uproot4"; + rev = version; + sha256 = "sha256-E9BRgyMz+3Xl8Q1zsnVtvW44FXTqs29U1oK4te0myq4="; + }; + + propagatedBuildInputs = [ + awkward + numpy + lz4 + xxhash + zstandard + ]; + + checkInputs = [ + pytestCheckHook + scikit-hep-testdata + ]; + preCheck = '' + export HOME="$(mktemp -d)" + ''; + disabledTests = [ + # tests that try to download files + "test_http" + "test_no_multipart" + "test_fallback" + "test_pickle_roundtrip_http" + ]; + disabledTestPaths = [ + # tests that try to download files + "tests/test_0066-fix-http-fallback-freeze.py" + "tests/test_0088-read-with-http.py" + "tests/test_0220-contiguous-byte-ranges-in-http.py" + ]; + pythonImportsCheck = [ "uproot" ]; + + meta = with lib; { + homepage = "https://github.com/scikit-hep/uproot4"; + description = "ROOT I/O in pure Python and Numpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 7fc03422016..6cd378492e3 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -27,12 +27,12 @@ }: let - version = "4.0.0"; + version = "4.1.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1lfdx54dpzwrqysg5ngqhq7a0i01xk981crd4pdk4jb5f07ghl6k"; + sha256 = "1svf9n345m0ag05hlcw3cwsl6bw2imcn4da25yyzcl3ar5axfxzk"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -52,8 +52,8 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v10.5.zip" - else srcs."java_tools_javac11_linux-v10.5.zip") + then srcs."java_tools_javac11_darwin-v10.6.zip" + else srcs."java_tools_javac11_linux-v10.6.zip") srcs."coverage_output_generator-v2.5.zip" srcs.build_bazel_rules_nodejs srcs."android_tools_pkg-0.19.0rc3.tar.gz" @@ -120,7 +120,7 @@ let remote_java_tools = stdenv.mkDerivation { name = "remote_java_tools_${system}"; - src = srcDepsSet."java_tools_javac11_${system}-v10.5.zip"; + src = srcDepsSet."java_tools_javac11_${system}-v10.6.zip"; nativeBuildInputs = [ autoPatchelfHook unzip ]; buildInputs = [ gcc-unwrapped ]; @@ -128,12 +128,20 @@ let sourceRoot = "."; buildPhase = '' + runHook preBuild + mkdir $out; + + runHook postBuild ''; installPhase = '' + runHook preInstall + cp -Ra * $out/ touch $out/WORKSPACE + + runHook postInstall ''; }; @@ -318,7 +326,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; inherit sourceRoot; installPhase = '' + runHook preInstall + cp -r . "$out" + + runHook postInstall ''; }; # update the list of workspace dependencies @@ -430,7 +442,7 @@ stdenv.mkDerivation rec { --replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\"" # substituteInPlace is rather slow, so prefilter the files with grep - grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do + grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. # We default to python3 where possible. See also `postFixup` where @@ -540,6 +552,8 @@ stdenv.mkDerivation rec { # Needed to build fish completion propagatedBuildInputs = [ python3.pkgs.absl-py ]; buildPhase = '' + runHook preBuild + # Increasing memory during compilation might be necessary. # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" @@ -567,9 +581,13 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) ./output/bazel build src/tools/execlog:parser_deploy.jar cd - + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel @@ -632,6 +650,8 @@ stdenv.mkDerivation rec { # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} hello_test + + runHook postInstall ''; # Save paths to hardcoded dependencies so Nix can detect them. diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json index 43ad4100315..3027183aef3 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json @@ -23,14 +23,6 @@ "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" ] }, - "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { - "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" - ] - }, "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", @@ -159,11 +151,11 @@ "generator_function": "grpc_deps", "generator_name": "boringssl", "name": "boringssl", - "sha256": "81333e496d7b74a60aa6fa622c028ba382a0a6b9c815cc6ccb221042383b9a9b", - "strip_prefix": "boringssl-412844d75b14b9090b58423fd5f5ed8c2fd80212", + "sha256": "cb0fd3eda612d4ae4be21108938800a19b015717a7627ea7f530e3469d207707", + "strip_prefix": "boringssl-88aeb757f1a415c71fb4cbf5af936ecae4bc8179", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz", - "https://github.com/google/boringssl/archive/412844d75b14b9090b58423fd5f5ed8c2fd80212.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/88aeb757f1a415c71fb4cbf5af936ecae4bc8179.tar.gz", + "https://github.com/google/boringssl/archive/88aeb757f1a415c71fb4cbf5af936ecae4bc8179.tar.gz" ] }, "build_bazel_apple_support": { @@ -246,13 +238,13 @@ "-p1" ], "patches": [ - "//third_party/grpc:grpc_1.32.0.patch" + "//third_party/grpc:grpc_1.33.1.patch" ], - "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", - "strip_prefix": "grpc-1.32.0", + "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", + "strip_prefix": "grpc-1.33.1", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz", + "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz" ] }, "com_google_absl": { @@ -364,11 +356,11 @@ "generator_function": "grpc_deps", "generator_name": "envoy_api", "name": "envoy_api", - "sha256": "9150f920abd3e710e0e58519cd769822f13d7a56988f2c34c2008815ec8d9c88", - "strip_prefix": "data-plane-api-8dcc476be69437b505af181a6e8b167fdb101d7e", + "sha256": "466585f253471259ce17641348149f458270316e81ec6702fdd8bf0b1b681256", + "strip_prefix": "data-plane-api-9997e1137cdb59e622af13e57ca915a2f3c9f84f", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz", - "https://github.com/envoyproxy/data-plane-api/archive/8dcc476be69437b505af181a6e8b167fdb101d7e.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9997e1137cdb59e622af13e57ca915a2f3c9f84f.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/9997e1137cdb59e622af13e57ca915a2f3c9f84f.tar.gz" ] }, "futures": { @@ -428,25 +420,25 @@ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" ] }, - "java_tools_javac11_darwin-v10.5.zip": { - "name": "java_tools_javac11_darwin-v10.5.zip", - "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "java_tools_javac11_darwin-v10.6.zip": { + "name": "java_tools_javac11_darwin-v10.6.zip", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip" ] }, - "java_tools_javac11_linux-v10.5.zip": { - "name": "java_tools_javac11_linux-v10.5.zip", - "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "java_tools_javac11_linux-v10.6.zip": { + "name": "java_tools_javac11_linux-v10.6.zip", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip" ] }, - "java_tools_javac11_windows-v10.5.zip": { - "name": "java_tools_javac11_windows-v10.5.zip", - "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "java_tools_javac11_windows-v10.6.zip": { + "name": "java_tools_javac11_windows-v10.6.zip", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip" ] }, "java_tools_langtools_javac11": { @@ -673,6 +665,16 @@ "https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-3.7.0.tar" ] }, + "openjdk11_darwin_aarch64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk11_darwin_aarch64_archive", + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] + }, "openjdk11_darwin_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "name": "openjdk11_darwin_archive", @@ -727,6 +729,16 @@ "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" ] }, + "openjdk15_darwin_aarch64_archive": { + "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", + "name": "openjdk15_darwin_aarch64_archive", + "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5", + "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz" + ] + }, "openjdk15_darwin_archive": { "build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n", "name": "openjdk15_darwin_archive", @@ -823,25 +835,50 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" ] }, - "openjdk_macos": { + "openjdk_macos_aarch64": { + "downloaded_file_path": "zulu-macos-aarch64.tar.gz", + "name": "openjdk_macos_aarch64", + "sha256": "a900ef793cb34b03ac5d93ea2f67291b6842e99d500934e19393a8d8f9bfa6ff", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-allmodules-1611665569.tar.gz" + ] + }, + "openjdk_macos_aarch64_minimal": { + "downloaded_file_path": "zulu-macos-aarch64-minimal.tar.gz", + "name": "openjdk_macos_aarch64_minimal", + "sha256": "f4f606926e6deeaa8b8397e299313d9df87642fe464b0ccf1ed0432aeb00640b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.45.27-ca-jdk11.0.10/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64-minimal-1611665562.tar.gz" + ] + }, + "openjdk_macos_aarch64_vanilla": { + "downloaded_file_path": "zulu-macos-aarch64-vanilla.tar.gz", + "name": "openjdk_macos_aarch64_vanilla", + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] + }, + "openjdk_macos_x86_64": { "downloaded_file_path": "zulu-macos.tar.gz", - "name": "openjdk_macos", + "name": "openjdk_macos_x86_64", "sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b", "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz" ] }, - "openjdk_macos_minimal": { + "openjdk_macos_x86_64_minimal": { "downloaded_file_path": "zulu-macos-minimal.tar.gz", - "name": "openjdk_macos_minimal", + "name": "openjdk_macos_x86_64_minimal", "sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6", "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz" ] }, - "openjdk_macos_vanilla": { + "openjdk_macos_x86_64_vanilla": { "downloaded_file_path": "zulu-macos-vanilla.tar.gz", - "name": "openjdk_macos_vanilla", + "name": "openjdk_macos_x86_64_vanilla", "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" @@ -873,11 +910,18 @@ }, "platforms": { "name": "platforms", - "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", - "strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51", + "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", - "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" + ] + }, + "platforms-0.0.4.tar.gz": { + "name": "platforms-0.0.4.tar.gz", + "sha256": "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz" ] }, "remote_coverage_tools": { @@ -922,10 +966,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_darwin-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip" ] }, "remote_java_tools_javac11_test_darwin": { @@ -938,9 +982,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "95aae0a32a170c72a68abb0b9dd6bac7ea3e08c504a5d8c6e8bf7ac51628c98f", + "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_darwin-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip" ] }, "remote_java_tools_javac11_test_linux": { @@ -953,9 +997,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip" ] }, "remote_java_tools_javac11_test_windows": { @@ -968,9 +1012,9 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip" ] }, "remote_java_tools_linux": { @@ -993,10 +1037,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "355c27c603e8fc64bb0e2d7f809741f42576d5f4540f9ce28fd55922085af639", + "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_linux-v10.5.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_linux-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip" ] }, "remote_java_tools_windows": { @@ -1019,10 +1063,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0b4469ca1a9b3f26cb82fb0f4fd00096f0d839ec2fae097e7bdbb982e3a95a59", + "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.5/java_tools_javac11_windows-v10.5.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.5/java_tools_javac11_windows-v10.5.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip", + "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip" ] }, "remotejdk11_linux": { @@ -1152,6 +1196,24 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" ] }, + "remotejdk11_macos_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_macos_aarch64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] + }, "remotejdk11_macos_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk11_macos_for_testing", @@ -1299,6 +1361,24 @@ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz" ] }, + "remotejdk15_macos_aarch64_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk15_macos_aarch64_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5", + "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz" + ] + }, "remotejdk15_macos_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk15_macos_for_testing", @@ -1439,12 +1519,12 @@ "https://github.com/protocolbuffers/upb/archive/382d5afc60e05470c23e8de19b19fc5ad231e732.tar.gz" ] }, - "v1.32.0.tar.gz": { - "name": "v1.32.0.tar.gz", - "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", + "v1.33.1.tar.gz": { + "name": "v1.33.1.tar.gz", + "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz", + "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz" ] }, "v3.13.0.tar.gz": { @@ -1494,5 +1574,12 @@ "urls": [ "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" ] + }, + "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz": { + "name": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", + "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + ] } } diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 08dada094ff..5170297a433 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { meta = { description = "A data constraint language which aims to simplify tasks involving defining and using data"; homepage = "https://cuelang.org/"; - maintainers = with lib.maintainers; [ solson ]; + maintainers = []; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 88bbfda5c73..b85ca99a9e6 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.3"; + version = "0.10.4"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1psmsiwd3xlbrvkdvr2zgs2b66kw8w2jvvqa399g7jhixh2fpbx4"; + outputHash = "0pjgnm5argmc92872vblsz0pw2wniggvkw4w2346ps09ybdv9r3q"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 85d64890180..cfbca202568 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "stagit"; - version = "0.9.5"; + version = "0.9.6"; src = fetchgit { url = "git://git.codemadness.org/stagit"; rev = version; - sha256 = "1wlx5k0v464fr1ifjv04v7ccwb559s54xpsbxdda4whyx1v0fbq4"; + sha256 = "sha256-0vkdxtKZv7LyEHKGPrB4uOI2lD74+haelEanq2sOjkE="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index c0707ed5e86..7f2ad875d8c 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -3,7 +3,7 @@ , fetchurl , cmake , ninja -, zip +, p7zip , pkg-config , asciidoctor , gettext @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { pkg-config cmake ninja - zip + p7zip asciidoctor gettext shaderc diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index bafc7147efd..8618d2c506f 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -21,6 +21,7 @@ , direnv , fzf , gnome +, himalaya , khard , languagetool , llvmPackages @@ -286,6 +287,21 @@ self: super: { }; }); + himalaya-vim = buildVimPluginFrom2Nix { + pname = "himalaya-vim"; + inherit (himalaya) src version; + configurePhase = "cd vim/"; + dependencies = with self; [ himalaya ]; + preFixup = '' + substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \ + --replace 'if !executable("himalaya")' 'if v:false' + ''; + postFixup = '' + mkdir -p $out/bin + ln -s ${himalaya}/bin/himalaya $out/bin/himalaya + ''; + }; + LanguageClient-neovim = let version = "0.1.161"; diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index c4fdbacf95b..897d8dd6c02 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alsa-tools"; - version = "1.2.2"; + version = "1.2.5"; src = fetchurl { url = "mirror://alsa/tools/${pname}-${version}.tar.bz2"; - sha256 = "0jbkjmq038zapj66a7nkppdf644v2mwj581xbmh6k4i8w6mcglxz"; + sha256 = "sha256-NacQJ6AfTX3kci4iNSDpQN5os8VwtsZxaRVnrij5iT4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 9e298697d4b..fba025b29d9 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }: stdenv.mkDerivation rec { - name = "usbutils-012"; + name = "usbutils-013"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; - sha256 = "0iiy0q7fzikavmdsjsb0sl9kp3gfh701qwyjjccvqh0qz4jlcqw8"; + sha256 = "0f0klk6d3hmbpf6p4dcwa1qjzblmkhbxs1wsw87aidvqri7lj8wy"; }; patches = [ diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/pkgs/os-specific/linux/usbutils/fix-paths.patch index d75c68505ef..ef63a41e726 100644 --- a/pkgs/os-specific/linux/usbutils/fix-paths.patch +++ b/pkgs/os-specific/linux/usbutils/fix-paths.patch @@ -1,7 +1,7 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -51,11 +51,11 @@ - usbreset.c +@@ -61,7 +61,7 @@ EXTRA_DIST = \ + LICENSES/GPL-3.0-only.txt lsusb.py: $(srcdir)/lsusb.py.in - sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ @@ -9,8 +9,3 @@ chmod 755 $@ lsusb.8: $(srcdir)/lsusb.8.in -- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@ - - usb-devices.1: $(srcdir)/usb-devices.1.in - sed 's|VERSION|$(VERSION)|g' $< >$@ diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ed8ff19ab75..d4804396497 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.98"; + version = "0.18.100"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-zWbeS+pRkpLTKC50yHM1TgTzIVslVdsD4lH6sTzFI4k="; + sha256 = "sha256-qgIC1PCCEMmt83xqedwmiUttA85zE/frn/Qxo5Y1yoM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index fb5792c6e42..f56766d9b63 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -9,14 +9,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-5W4X1E7794hFVPo4+s826CNIrw6Z/n0cDjj6pmsj2Dk="; - arm64-linux_hash = "sha256-gqCgToAVIS+IEulFY4mo2Mtcb3nyFpzDBqVEewREQcs="; - x64-osx_hash = "sha256-MFpIzSYAvAWVHMdEd+aP67s3po+yb3qWzSd/Ko++5Jc="; + x64-linux_hash = "sha256-/9W8VwA3d7R2pYH45QvGC1q9f9M9C867nKuhSlU6zsg="; + arm64-linux_hash = "sha256-QjIg+XY5vTmYH+wYqU3VZ5MfxSAcUcGVvapyrlMDbLI="; + x64-osx_hash = "sha256-K17tzGdLKpHkkLSOT3a4FXXfeGz6LJ6cxd20IuJ2zVs="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "3.1.1.4954"; + version = "3.2.1.5070"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 5fa331b8540..c4a9fa14131 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FXBClOkGRUey/FnLw3g3uiHUJeNiB4tXqP4Na6CuwIM="; + sha256 = "sha256-BY0/lcBxcfIgKXbXZjiEgVdugmo8vD6UWGsjEVq6j6E="; }; installPhase = '' diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 7642acb25eb..2955be2d793 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,36 +1,36 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.3.0"; + version = "3.3.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.0-linux-x64.tar.gz"; - sha256 = "0kcq7zwgbp465lx7p80l5xc50xdmydq32djzis0973hxlkgliiq6"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.1-linux-x64.tar.gz"; + sha256 = "1mqvx5g1pfc5fi4xmdp8fva1pzfxqm062mzl972fc3yrzfl7792f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.1.0-linux-amd64.tar.gz"; - sha256 = "0vws9mll2k42qx04idyf13vai018552wyrvr1jxjf4fl93yrayz7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; + sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.5.1-linux-amd64.tar.gz"; - sha256 = "0mz9zxlx4vc26g0khvdlg5kzc74shdc4lca8h1l9sxqwgkmyga7q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.6.0-linux-amd64.tar.gz"; + sha256 = "0i2bwxx49nqca3kykxbjfbbmgyr3qdlw3q4wp384ai5r9psk4iac"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-linux-amd64.tar.gz"; - sha256 = "0xs7i9l871x5kr22jg7jjw0rgyvs4j4hazr4n9375xgzc8ysrk09"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0s8z4h0m3ipkxrbw6h8i8ciam3cgmacw3rvc63qydy5gqv9x6h6w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0bfs64za4i5bmk3r8qyhgh0x58cdrn88gv0i3vm4prry53zgy3ny"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-linux-amd64.tar.gz"; + sha256 = "14s6jyackhp324gdlvvqnyi8s7hj0fb92ilrpd460p05p653zb4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.2.0-linux-amd64.tar.gz"; - sha256 = "0s1z33iqf0nvrgpq6rqnm79sr8bnnkfspq8qnfynybcn80drn7vd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-linux-amd64.tar.gz"; + sha256 = "1ppwha1zk73w39msp6jym9in7jsrxzc530qgj4lj0961mb9rdkra"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.2.0-linux-amd64.tar.gz"; - sha256 = "0gk60n5s9hjfsaz09aknivqpz1cw41vs6j84fdb3chkip8xzwdr7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.3.1-linux-amd64.tar.gz"; + sha256 = "1r9cgwb0d332hrx33i40vphimhwcnqw5gkzbin7rmxlmasrkgwwy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; @@ -41,24 +41,24 @@ sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.4.0-linux-amd64.tar.gz"; - sha256 = "1rsqkp76sck0162hz3s5yljs79gis886k1v99k77hr1gbk08rx71"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.6.0-linux-amd64.tar.gz"; + sha256 = "1pagydam6xypb1gbk710v3qid2bn77df9lzqfxk5l2pbbs65cvyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.2-linux-amd64.tar.gz"; - sha256 = "0g5x5wycgbn0iwp9y4fp0aqf36pfa3210n1rmiavx1a2g2zj9zvx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.1.0-linux-amd64.tar.gz"; + sha256 = "08kxd1x8kx2zdwylhprkb6hs02z3b4jmjphail1s395gzq1271bc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-linux-amd64.tar.gz"; - sha256 = "1j8232vw457fl0jhy08abs5hcx8nd2lll3zg9bp3s352wz2r5xl4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-linux-amd64.tar.gz"; + sha256 = "13rchk54wpjwci26kfa519gqagwfrp31w6a9nk1xfdxj45ha9d3x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.0-linux-amd64.tar.gz"; sha256 = "0lqnb1xrb5ma8ssvn63lh92ihja6zx4nrx40pici1ggaln4sphn0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.2.0-linux-amd64.tar.gz"; - sha256 = "010j0xmrb5msva2mcmrpr0h8dhpk7x6bswbsbkkdjrf88baryyq0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.0-linux-amd64.tar.gz"; + sha256 = "0l1pr8yfq901wr8ngan1hrwhb4lvcxa92sg38gqixzma0x6xhgwb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-linux-amd64.tar.gz"; @@ -81,12 +81,12 @@ sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.1-linux-amd64.tar.gz"; - sha256 = "16z2jcixwqasj0rdj83gvsjb51xw5k6kj474sfdx8n0150hplma9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0s1fkj1s5qni84lz0gr1d10xyxp87877jana67lxbarskvzpys8r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.1.1-linux-amd64.tar.gz"; - sha256 = "1lc1i4irkrlv1cxy6xzl1fw8205rvhrdp2if09w4givq351lrmbm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-linux-amd64.tar.gz"; + sha256 = "02g59jaifyjfcx185ir79d8lqic38dgaa9cb8dpi3xhvv32z0b0q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-linux-amd64.tar.gz"; @@ -99,32 +99,32 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.0-darwin-x64.tar.gz"; - sha256 = "1znjqjwasnw9wjdkrwss9shxvizsn5pav1a8rd8c1c6kcgpi01r7"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.1-darwin-x64.tar.gz"; + sha256 = "0ri2wq45qm8fabdfsyr1vipnf6ybshxhqr3zrjs8qq1pyf92m5ks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.1.0-darwin-amd64.tar.gz"; - sha256 = "11cpidiasmsy6d29ycpzwkn0vfac9cd1ng410ljhjw8bmmrgfg6f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.5.1-darwin-amd64.tar.gz"; - sha256 = "195wrwyw25kaixv277ww38mbw19rq6f56m40f3p0rgicjn2dsgyh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.6.0-darwin-amd64.tar.gz"; + sha256 = "1rnb9q8w88jhp9mm3g31dnd4dis3j52pl97cd0yqg046f6jm048q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "0kvr057hdwcxf7gj788sv6ysz25ap3z0akqhhb20mlzv3shwiiji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "1qjz33npwc7wdq3vrvfxhd4g1pwgl3p7cz5fkwyqs4zp24dcx1ga"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "0q4lb32j1bm34sag39w9s6415fni169800k1qyym193s13c4gk89"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "1bb78g8k6gnhyxxvcjspnhbw2fig58flr14zi5i1cbd89xkz0m3i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "167hg0j3rzxv9bsadhzgv5sz2jhqxdfn0sx35ws8v8b1rblmxywc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "1wwldhy6r6985rwx9vv73jb1nsna387sk6mba81lyc55ar67nsp9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "12r9k2ywxi8myvd80gmk1hvhgjmr5js6i5n6jghsyh083kh5wam7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.3.1-darwin-amd64.tar.gz"; + sha256 = "18qisw7m1kih27vl2099rzw44h8qyr2f3dnxby03z95f1nwyz1f1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; @@ -135,24 +135,24 @@ sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.4.0-darwin-amd64.tar.gz"; - sha256 = "121yaplx4nnq9is30iczbqibj1069jh9bqzgbriscd07kifyrpbw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.6.0-darwin-amd64.tar.gz"; + sha256 = "07fdrg3wd3wlsvh37gbxli0xcxd2c7g61ynrxzi0q8dg7687gjpq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.2-darwin-amd64.tar.gz"; - sha256 = "06nkd2pd4hwahbyh8ygn54xq5hdpbphfkkfhrg4jwgmfgacnz5x9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "107b6nlcc99lfysh5v3wz4vz751cdz12k0lm8jh39ikmdck5fphs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "1i3zmflwjjfc13j7w9acavgrbblm9fri041z6qpb3ikcq5s9lqcm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "0qbw4b5zm6dmwdilaz4bjdg55gc5lilwagrxwrab37vq4a8and4c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.0.0-darwin-amd64.tar.gz"; sha256 = "1lkrx2cayhhv432dvzvz8q4i1gfi659rkl59c0y0dkwbs8x425zb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1ix5x92h7i6dlzcpnm819vf4nx1q3p88ky01mfs000xh9pl324ch"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0ic8cnrv8z1qwnlqk3dc3xrczx4ncxwdsdh1shk655hcsfdrcldq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-darwin-amd64.tar.gz"; @@ -175,12 +175,12 @@ sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.1-darwin-amd64.tar.gz"; - sha256 = "00b6i6dai21b8biqdw5ybj2dk7267i99bji2siicvj0nvi3s2wzx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "1x5fm72v9h3lrqcyyq2xm14bc14rsqhjmc4mwa2wgbk4pvjgawyv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.1.1-darwin-amd64.tar.gz"; - sha256 = "1ja36fh8760sw8sb3wzp5kbv71wv1544ir74ffkw6l0v4q29bwlq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "0gd3xnl31892qp8ilz9lc1zdps77nf07jgvh0k37mink8f0ppy2z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-darwin-amd64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index cc7f381ee0f..ed4fbd79ed8 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,31 +3,31 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.3.0" +VERSION="3.3.1" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=2.1.0" - "aws=4.5.1" - "cloudflare=3.0.0" - "consul=3.1.0" - "datadog=3.2.0" - "digitalocean=4.2.0" + "auth0=2.2.0" + "aws=4.6.0" + "cloudflare=3.1.0" + "consul=3.2.0" + "datadog=3.3.0" + "digitalocean=4.3.1" "docker=3.0.0" "equinix-metal=2.0.0" - "gcp=5.4.0" - "github=4.0.2" - "gitlab=4.0.0" + "gcp=5.6.0" + "github=4.1.0" + "gitlab=4.1.0" "hcloud=1.0.0" - "kubernetes=3.2.0" + "kubernetes=3.3.0" "linode=3.1.0" "mailgun=3.1.0" "mysql=3.0.0" "openstack=3.2.0" "packet=3.2.2" - "postgresql=3.0.1" - "random=4.1.1" + "postgresql=3.1.0" + "random=4.2.0" "vault=4.1.0" "vsphere=3.1.0" ) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c10348fd711..52bce3f274d 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -131,10 +131,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "16.2.3"; + version = "16.2.4"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "sha256-K3T1Lob19p8ykYEmYumHS8hqj2uysCuE0EAKb1TMJ0Q="; + sha256 = "sha256-J6FVK7feNN8cGO5BSDlfRGACAzchmRUSWR+a4ZgeWy0="; }; in rec { ceph = stdenv.mkDerivation { diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/tools/misc/bsp-layout/default.nix new file mode 100644 index 00000000000..065c21e3f78 --- /dev/null +++ b/pkgs/tools/misc/bsp-layout/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, lib, bspwm, makeWrapper, git, bc }: + +stdenv.mkDerivation rec { + pname = "bsp-layout"; + version = "unstable-2021-05-10"; + + src = fetchFromGitHub { + owner = "phenax"; + repo = pname; + rev = "726b850b79eabdc6f4d236cff52e434848cb55e3"; + sha256 = "1wqlzbz7l9vz37gin2zckrnxkkabnd7x5mi9pb0x96w4yhld5mx6"; + }; + + nativeBuildInputs = [ makeWrapper git bc ]; + buildInputs = [ bspwm ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + substituteInPlace $out/bin/bsp-layout --replace 'bc ' '${bc}/bin/bc ' + ''; + + meta = with lib; { + description = "Manage layouts in bspwm"; + homepage = "https://github.com/phenax/bsp-layout"; + license = licenses.mit; + maintainers = with maintainers; [ devins2518 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/kalk/default.nix b/pkgs/tools/misc/kalk/default.nix new file mode 100644 index 00000000000..64fabd805a6 --- /dev/null +++ b/pkgs/tools/misc/kalk/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, m4 +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "kalk"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "PaddiM8"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-lHHnNiNy8L8GdjOj5EqtticnksPrCwhFoFatFrWEQJ4="; + }; + + cargoSha256 = "sha256-Qtip9CeurTM4aY67F5tSM3fis6W/dlnaIVMQ29UoBzc="; + + nativeBuildInputs = [ m4 ]; + + outputs = [ "out" "lib" ]; + + postInstall = '' + moveToOutput "lib" "$lib" + ''; + + meta = with lib; { + homepage = "https://kalk.strct.net"; + changelog = "https://github.com/PaddiM8/kalk/releases/tag/v${version}"; + description = "A command line calculator"; + longDescription = '' + A command line calculator that supports math-like syntax with user-defined + variables, functions, derivation, integration, and complex numbers + ''; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix new file mode 100644 index 00000000000..907e39a3f27 --- /dev/null +++ b/pkgs/tools/misc/xcp/default.nix @@ -0,0 +1,25 @@ +{ rustPlatform, fetchFromGitHub, lib }: + +rustPlatform.buildRustPackage rec { + pname = "xcp"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "tarka"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Kwt1qLuP63bIn0VY3oFEcbKh1GGBdObfOmtPV4DMQUU="; + }; + + # no such file or directory errors + doCheck = false; + + cargoSha256 = "sha256-wFOXRQSOfmGB6Zmkqn7KoK+vyHeFKyGNx7Zf2zzPcE4="; + + meta = with lib; { + description = "An extended cp(1)"; + homepage = "https://github.com/tarka/xcp"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index f62eba66f99..77aad6fa7b3 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -2,11 +2,11 @@ perlPackages.buildPerlPackage rec { pname = "ddclient"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { url = "mirror://sourceforge/ddclient/${pname}-${version}.tar.gz"; - sha256 = "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw"; + sha256 = "0w14qnn72j333i3j7flxkw6bzcg4n31d8jfnvhmwa7s9rharx5p4"; }; # perl packages by default get devdoc which isn't present diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index f260f1be5e0..7bedbb3a6dc 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WqUkl9NZMMQJknASadLJz3CslrplGuXLrlv6fiwWFoI="; + sha256 = "sha256-Tnwq86gAbi24O8/26134gJCf9+wol1zma980t9iHEKY="; }; - cargoSha256 = "sha256-mexiI9EHL2L4RNXCk133vriI5IGpdxLVy6xnBIqEH30="; + cargoSha256 = "sha256-Wy+i1lmXpsy0Sy0GF5XUfXsLQHeV7cQo9nUxUEFnHOU="; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 506bf0f719d..3eb5495d2c9 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchpatch , fetchFromGitHub , autoreconfHook , pcre @@ -11,17 +10,18 @@ , enableDotNet ? true , enableMacho ? true , enableMagic ? true, file +, enableStatic ? false }: stdenv.mkDerivation rec { - version = "4.0.5"; + version = "4.1.1"; pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "1gkdll2ygdlqy1f27a5b84gw2bq75ss7acsx06yhiss90qwdaalq"; + sha256 = "185j7firn7i5506rcp0va7sxdbminwrm06jsm4c70jf98qxmv522"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -34,19 +34,6 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap.sh"; - # If static builds are disabled, `make all-am` will fail to find libyara.a and - # cause a build failure. It appears that somewhere between yara 4.0.1 and - # 4.0.5, linking the yara binaries dynamically against libyara.so was broken. - # - # This was already fixed in yara master. Backport the patch to yara 4.0.5. - patches = [ - (fetchpatch { - name = "fix-build-with-no-static.patch"; - url = "https://github.com/VirusTotal/yara/commit/52e6866023b9aca26571c78fb8759bc3a51ba6dc.diff"; - sha256 = "074cf99j0rqiyacp60j1hkvjqxia7qwd11xjqgcr8jmfwihb38nr"; - }) - ]; - configureFlags = [ (lib.withFeature withCrypto "crypto") (lib.enableFeature enableCuckoo "cuckoo") @@ -54,8 +41,11 @@ stdenv.mkDerivation rec { (lib.enableFeature enableDotNet "dotnet") (lib.enableFeature enableMacho "macho") (lib.enableFeature enableMagic "magic") + (lib.enableFeature enableStatic "static") ]; + doCheck = enableStatic; + meta = with lib; { description = "The pattern matching swiss knife for malware researchers"; homepage = "http://Virustotal.github.io/yara/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 309a8b51878..503e5bdf5eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2014,6 +2014,8 @@ in bottom-rs = callPackage ../tools/misc/bottom-rs { }; + bsp-layout = callPackage ../tools/misc/bsp-layout {}; + buildtorrent = callPackage ../tools/misc/buildtorrent { }; bustle = haskellPackages.bustle; @@ -2832,6 +2834,8 @@ in kaldi = callPackage ../tools/audio/kaldi { }; + kalk = callPackage ../tools/misc/kalk { }; + kisslicer = callPackage ../tools/misc/kisslicer { }; klaus = with python3Packages; toPythonApplication klaus; @@ -5840,6 +5844,8 @@ in ipget = callPackage ../applications/networking/ipget { }; + iptsd = callPackage ../applications/misc/iptsd { }; + ipmitool = callPackage ../tools/system/ipmitool {}; ipmiutil = callPackage ../tools/system/ipmiutil {}; @@ -8604,6 +8610,8 @@ in tex = texlive.combined.scheme-small; }; + skytemple = callPackage ../applications/misc/skytemple {}; + sleuthkit = callPackage ../tools/system/sleuthkit {}; # Not updated upstream since 2018, doesn't support qt newer than 5.12 @@ -9367,6 +9375,8 @@ in usbmuxd = callPackage ../tools/misc/usbmuxd {}; + ustreamer = callPackage ../applications/video/ustreamer { }; + usync = callPackage ../applications/misc/usync { }; uwc = callPackage ../tools/text/uwc { }; @@ -31385,6 +31395,8 @@ in zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; + xcp = callPackage ../tools/misc/xcp { }; + xcpc = callPackage ../misc/emulators/xcpc { }; zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0f61402bb05..f7527d4df2a 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -138,6 +138,8 @@ lib.makeScope pkgs.newScope (self: with self; { smbclient = callPackage ../development/php-packages/smbclient { }; + snuffleupagus = callPackage ../development/php-packages/snuffleupagus { }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; swoole = callPackage ../development/php-packages/swoole { }; @@ -235,7 +237,7 @@ lib.makeScope pkgs.newScope (self: with self; { (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") internalDeps} ''; - checkPhase = "runHook preCheck; echo n | make test; runHook postCheck"; + checkPhase = "runHook preCheck; NO_INTERACTON=yes make test; runHook postCheck"; outputs = [ "out" "dev" ]; installPhase = '' mkdir -p $out/lib/php/extensions diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5be41683de8..7fa25d7f399 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2297,6 +2297,8 @@ in { expiringdict = callPackage ../development/python-modules/expiringdict { }; + explorerscript = callPackage ../development/python-modules/explorerscript { }; + exrex = callPackage ../development/python-modules/exrex { }; extractcode = callPackage ../development/python-modules/extractcode { }; @@ -2676,6 +2678,8 @@ in { gast = callPackage ../development/python-modules/gast { }; + garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { }; + gcovr = callPackage ../development/python-modules/gcovr { }; gcsfs = callPackage ../development/python-modules/gcsfs { }; @@ -4296,6 +4300,8 @@ in { mitmproxy = callPackage ../development/python-modules/mitmproxy { }; + mitogen = callPackage ../development/python-modules/mitogen { }; + mixpanel = callPackage ../development/python-modules/mixpanel { }; mkl-service = callPackage ../development/python-modules/mkl-service { }; @@ -4527,6 +4533,8 @@ in { ndjson = callPackage ../development/python-modules/ndjson { }; + ndspy = callPackage ../development/python-modules/ndspy { }; + ndtypes = callPackage ../development/python-modules/ndtypes { }; neo = callPackage ../development/python-modules/neo { }; @@ -5603,6 +5611,8 @@ in { pydenticon = callPackage ../development/python-modules/pydenticon { }; + py-desmume = callPackage ../development/python-modules/py-desmume { }; + pydexcom = callPackage ../development/python-modules/pydexcom { }; pydicom = callPackage ../development/python-modules/pydicom { }; @@ -5767,6 +5777,8 @@ in { pygtail = callPackage ../development/python-modules/pygtail { }; + pygtkspellcheck = callPackage ../development/python-modules/pygtkspellcheck { }; + pygtrie = callPackage ../development/python-modules/pygtrie { }; pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; @@ -6100,6 +6112,8 @@ in { pyppeteer = callPackage ../development/python-modules/pyppeteer { }; + pypresence = callPackage ../development/python-modules/pypresence { }; + pyprind = callPackage ../development/python-modules/pyprind { }; pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; @@ -6212,6 +6226,22 @@ in { pyroute2 = callPackage ../development/python-modules/pyroute2 { }; + pyroute2-core = callPackage ../development/python-modules/pyroute2-core { }; + + pyroute2-ethtool = callPackage ../development/python-modules/pyroute2-ethtool { }; + + pyroute2-ipdb = callPackage ../development/python-modules/pyroute2-ipdb { }; + + pyroute2-ipset = callPackage ../development/python-modules/pyroute2-ipset { }; + + pyroute2-ndb = callPackage ../development/python-modules/pyroute2-ndb { }; + + pyroute2-nftables = callPackage ../development/python-modules/pyroute2-nftables { }; + + pyroute2-nslink = callPackage ../development/python-modules/pyroute2-nslink { }; + + pyroute2-protocols = callPackage ../development/python-modules/pyroute2-protocols { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; @@ -7461,6 +7491,8 @@ in { scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { }; + scikit-hep-testdata = callPackage ../development/python-modules/scikit-hep-testdata { }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikit-learn = callPackage ../development/python-modules/scikit-learn { @@ -7687,6 +7719,18 @@ in { skybellpy = callPackage ../development/python-modules/skybellpy { }; + skytemple-dtef = callPackage ../development/python-modules/skytemple-dtef { }; + + skytemple-eventserver = callPackage ../development/python-modules/skytemple-eventserver { }; + + skytemple-files = callPackage ../development/python-modules/skytemple-files { }; + + skytemple-icons = callPackage ../development/python-modules/skytemple-icons { }; + + skytemple-rust = callPackage ../development/python-modules/skytemple-rust { }; + + skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { }; + slack-sdk = callPackage ../development/python-modules/slack-sdk { }; slackclient = callPackage ../development/python-modules/slackclient { }; @@ -8280,6 +8324,8 @@ in { inherit (pkgs) tiledb; }; + tilequant = callPackage ../development/python-modules/tilequant { }; + tilestache = callPackage ../development/python-modules/tilestache { }; timeago = callPackage ../development/python-modules/timeago { }; @@ -8586,6 +8632,8 @@ in { upnpy = callPackage ../development/python-modules/upnpy { }; + uproot = callPackage ../development/python-modules/uproot { }; + uproot3 = callPackage ../development/python-modules/uproot3 { }; uproot3-methods = callPackage ../development/python-modules/uproot3-methods { };