about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pkgs/applications/editors/vscode/extensions/default.nix4
-rw-r--r--pkgs/by-name/bl/blockattack/package.nix76
-rw-r--r--pkgs/by-name/pi/pietrasanta-traceroute/package.nix40
-rw-r--r--pkgs/development/python-modules/crownstone-cloud/default.nix57
-rw-r--r--pkgs/development/python-modules/crownstone-sse/default.nix37
-rw-r--r--pkgs/development/python-modules/pycookiecheat/default.nix55
-rw-r--r--pkgs/games/blockattack/default.nix59
-rw-r--r--pkgs/tools/misc/gtkterm/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix2
9 files changed, 189 insertions, 149 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 1eeb0fdf89473..02c605fcc9502 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1477,8 +1477,8 @@ let
         mktplcRef = {
           name = "elixir-ls";
           publisher = "JakeBecker";
-          version = "0.21.1";
-          hash = "sha256-z/GhynjkoEcaRp59tYr1lnM5vfV0OaDCcCpC02OdVLE=";
+          version = "0.21.2";
+          hash = "sha256-UZthDY+O8rG+oz/jQyQKDPbdS+lVKiLyuicU+4SGivw=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix
new file mode 100644
index 0000000000000..f0de4f2de8afc
--- /dev/null
+++ b/pkgs/by-name/bl/blockattack/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  SDL2,
+  SDL2_image,
+  SDL2_mixer,
+  SDL2_ttf,
+  boost,
+  cmake,
+  fetchFromGitHub,
+  gettext,
+  gitUpdater,
+  ninja,
+  physfs,
+  pkg-config,
+  stdenv,
+  zip,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "blockattack";
+  version = "2.9.0";
+
+  src = fetchFromGitHub {
+    owner = "blockattack";
+    repo = "blockattack-game";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-6mPj6A7mYm4CXkSSemNPn1CPkd7+01yr8KvCBM3a5po=";
+  };
+
+  nativeBuildInputs = [
+    SDL2
+    cmake
+    ninja
+    pkg-config
+    gettext
+    zip
+  ];
+
+  buildInputs = [
+    SDL2
+    SDL2_image
+    SDL2_mixer
+    SDL2_ttf
+    SDL2_ttf
+    boost
+    physfs
+  ];
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  strictDeps = true;
+
+  preConfigure = ''
+    patchShebangs packdata.sh source/misc/translation/*.sh
+    chmod +x ./packdata.sh
+    ./packdata.sh
+  '';
+
+  passthru = {
+    updateScript = gitUpdater { };
+  };
+
+  meta = {
+    homepage = "https://blockattack.net/";
+    description = "An open source clone of Panel de Pon (aka Tetris Attack)";
+    broken = stdenv.isDarwin;
+    changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = with lib.licenses; [ gpl2Plus ];
+    mainProgram = "blockattack";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    inherit (SDL2.meta) platforms;
+  };
+})
diff --git a/pkgs/by-name/pi/pietrasanta-traceroute/package.nix b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix
new file mode 100644
index 0000000000000..fef33f4b1ba39
--- /dev/null
+++ b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix
@@ -0,0 +1,40 @@
+{ lib
+, fetchFromGitHub
+, unstableGitUpdater
+, stdenv
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pietrasanta-traceroute";
+  version = "0.0.5-unstable-2023-11-28";
+
+  src = fetchFromGitHub {
+    owner = "catchpoint";
+    repo = "Networking.traceroute";
+    rev = "c870c7bd7bafeab815f8564a67a281892c3a6230";
+    hash = "sha256-CKqm8b6qNLEpso25+uTvtiR/hFMKJzuXUZkQ7lWzGd8=";
+  };
+  passthru.updateScript = unstableGitUpdater { };
+
+  buildInputs = [ openssl ];
+  makeFlags = [ "prefix=$(out)" ];
+
+  meta = with lib; {
+    description = "ECN-aware version of traceroute";
+    longDescription = ''
+      An enhanced version of Dmitry Butskoy's traceroute, developed by Catchpoint.
+      - Support for "TCP InSession": opens a TCP connection with the destination and sends TCP probes with
+        increasing TTL values, to prevent false packet loss introduced by firewalls, and ensure packets
+        follow a single flow, akin to a normal TCP session.
+      - Similar QUIC-based traceroute.
+      - Enhanced ToS (DSCP/ECN) field report.
+    '';
+    homepage = "https://github.com/catchpoint/Networking.traceroute/";
+    changelog = "https://github.com/catchpoint/Networking.traceroute/blob/${src.rev}/ChangeLog";
+    license = with licenses; [ gpl2Only lgpl21Only ];
+    mainProgram = "traceroute";
+    maintainers = with maintainers; [ nicoo ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix
index d8ee18a090d4b..089d60fceb6f2 100644
--- a/pkgs/development/python-modules/crownstone-cloud/default.nix
+++ b/pkgs/development/python-modules/crownstone-cloud/default.nix
@@ -1,57 +1,42 @@
-{ lib
-, aiohttp
-, buildPythonPackage
-, fetchFromGitHub
-, fetchpatch
-, certifi
-, pythonOlder
-, pytestCheckHook
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchPypi,
+  certifi,
+  pythonOlder,
+  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "crownstone-cloud";
-  version = "1.4.9";
-  format = "setuptools";
+  version = "1.4.11";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchFromGitHub {
-    owner = "crownstone";
-    repo = "crownstone-lib-python-cloud";
-    rev = "refs/tags/${version}";
-    hash = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0=";
+  src = fetchPypi {
+    pname = "crownstone_cloud";
+    inherit version;
+    hash = "sha256-s84pK52uMupxQfdMldV14V3nj+yVku1Vw13CRX4o08U=";
   };
 
-  patches = [
-    # Remove asynctest, https://github.com/crownstone/crownstone-lib-python-cloud/pull/4
-    (fetchpatch {
-      name = "remove-asynctest.patch";
-      url = "https://github.com/crownstone/crownstone-lib-python-cloud/commit/7f22c9b284bf8d7f6f43e205816787dd3bb37e78.patch";
-      hash = "sha256-LS1O9LVB14WyBXfuHf/bs1juJ59zWhJ8pL4aGtVrTG8=";
-    })
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     certifi
   ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
-
-  postPatch = ''
-    sed -i '/codecov/d' requirements.txt
-  '';
+  nativeCheckInputs = [ pytestCheckHook ];
 
-  pythonImportsCheck = [
-    "crownstone_cloud"
-  ];
+  pythonImportsCheck = [ "crownstone_cloud" ];
 
   meta = with lib; {
     description = "Python module for communicating with Crownstone Cloud and devices";
-    homepage = "https://github.com/crownstone/crownstone-lib-python-cloud";
-    license = with licenses; [ mit ];
+    homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-cloud";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix
index ca2cd4e0d154d..82f106d8f9ec6 100644
--- a/pkgs/development/python-modules/crownstone-sse/default.nix
+++ b/pkgs/development/python-modules/crownstone-sse/default.nix
@@ -1,26 +1,29 @@
-{ lib
-, aiohttp
-, buildPythonPackage
-, certifi
-, fetchFromGitHub
-, pythonOlder
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  certifi,
+  fetchPypi,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "crownstone-sse";
-  version = "2.0.4";
-  format = "setuptools";
+  version = "2.0.5";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchFromGitHub {
-    owner = "crownstone";
-    repo = "crownstone-lib-python-sse";
-    rev = version;
-    hash = "sha256-z/z8MmydHkHubwuX02gGbOcOEZ+FHX4i82vAK5gAl+c=";
+  src = fetchPypi {
+    pname = "crownstone_sse";
+    inherit version;
+    hash = "sha256-RUqo68UAVGV+JmauKsGlp7dG8FzixHBDnr3eho/IQdY=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     certifi
   ];
@@ -28,13 +31,11 @@ buildPythonPackage rec {
   # Tests are only providing coverage
   doCheck = false;
 
-  pythonImportsCheck = [
-    "crownstone_sse"
-  ];
+  pythonImportsCheck = [ "crownstone_sse" ];
 
   meta = with lib; {
     description = "Python module for listening to Crownstone SSE events";
-    homepage = "https://github.com/crownstone/crownstone-lib-python-sse";
+    homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-sse";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix
index 4a539f5ee191c..3a1c3efdf3cd7 100644
--- a/pkgs/development/python-modules/pycookiecheat/default.nix
+++ b/pkgs/development/python-modules/pycookiecheat/default.nix
@@ -1,29 +1,30 @@
-{ stdenv
-, lib
-, buildPythonPackage
-, cryptography
-, fetchFromGitHub
-, keyring
-, pytestCheckHook
-, pythonOlder
-, pythonRelaxDepsHook
-, playwright
-, setuptools
-, setuptools-scm
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  cryptography,
+  fetchFromGitHub,
+  keyring,
+  pytestCheckHook,
+  pythonOlder,
+  pythonRelaxDepsHook,
+  playwright,
+  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "pycookiecheat";
-  version = "0.6.0";
-  format = "pyproject";
+  version = "0.7.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "n8henrie";
     repo = "pycookiecheat";
     rev = "refs/tags/v${version}";
-    hash = "sha256-mSc5FqMM8BICVEdSdsIny9Bnk6qCRekPk4RkBusDoVA=";
+    hash = "sha256-x568e4M7fz93hq0y06Grz9GlrjGV38GxWd+PhNiAyBY=";
   };
 
   pythonRelaxDeps = [
@@ -31,13 +32,14 @@ buildPythonPackage rec {
     "keyring"
   ];
 
-  nativeBuildInputs = [
-    pythonRelaxDepsHook
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  dependencies = [
     cryptography
     keyring
   ];
@@ -47,9 +49,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [
-    "pycookiecheat"
-  ];
+  pythonImportsCheck = [ "pycookiecheat" ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
@@ -57,15 +57,14 @@ buildPythonPackage rec {
 
   disabledTests = [
     # Tests want to use playwright executable
-    "test_no_cookies"
     "test_fake_cookie"
     "test_firefox_cookies"
-    "test_load_firefox_cookie_db"
-    "test_firefox_no_cookies"
     "test_firefox_get_default_profile"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "test_slack_config"
-  ];
+    "test_firefox_no_cookies"
+    "test_load_firefox_cookie_db"
+    "test_no_cookies"
+    "test_warns_for_string_browser"
+  ] ++ lib.optionals stdenv.isDarwin [ "test_slack_config" ];
 
   meta = with lib; {
     description = "Borrow cookies from your browser's authenticated session for use in Python scripts";
diff --git a/pkgs/games/blockattack/default.nix b/pkgs/games/blockattack/default.nix
deleted file mode 100644
index d59b93ae600c6..0000000000000
--- a/pkgs/games/blockattack/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, SDL2
-, SDL2_image
-, SDL2_mixer
-, SDL2_ttf
-, boost
-, cmake
-, gettext
-, physfs
-, pkg-config
-, zip
-}:
-
-stdenv.mkDerivation rec {
-  pname = "blockattack";
-  version = "2.8.0";
-
-  src = fetchFromGitHub {
-    owner = "blockattack";
-    repo = "blockattack-game";
-    rev = "v${version}";
-    hash = "sha256-2oKesdr2eNZhDlGrFRiH5/8APFkGJfxPCNvzFoIumdQ=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    gettext
-    zip
-  ];
-
-  buildInputs = [
-    SDL2
-    SDL2_image
-    SDL2_mixer
-    SDL2_ttf
-    SDL2_ttf
-    boost
-    physfs
-  ];
-
-  preConfigure = ''
-    patchShebangs packdata.sh source/misc/translation/*.sh
-    chmod +x ./packdata.sh
-    ./packdata.sh
-  '';
-
-  meta = with lib; {
-    homepage = "https://blockattack.net/";
-    description = "An open source clone of Panel de Pon (aka Tetris Attack)";
-    mainProgram = "blockattack";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.unix;
-    broken = stdenv.isDarwin;
-  };
-}
diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/tools/misc/gtkterm/default.nix
index d761cf0644a6e..7dac20b72c478 100644
--- a/pkgs/tools/misc/gtkterm/default.nix
+++ b/pkgs/tools/misc/gtkterm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gtkterm";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
-    owner = "Jeija";
+    owner = "wvdakker";
     repo = "gtkterm";
     rev = version;
-    sha256 = "sha256-KYkAHpyDl47LBKb7ZjxPCGw9XuMrqHPyejMhIvYAr68=";
+    sha256 = "sha256-oGqOXIu5P3KfdV6Unm7Nz+BRhb5Z6rne0+e0wZ2EcAI=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A simple, graphical serial port terminal emulator";
-    homepage = "https://github.com/Jeija/gtkterm";
+    homepage = "https://github.com/wvdakker/gtkterm";
     license = licenses.gpl3Plus;
     longDescription = ''
       GTKTerm is a simple, graphical serial port terminal emulator for
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c335647c0ece3..baccf09b9edbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36264,8 +36264,6 @@ with pkgs;
 
   ballerburg = callPackage ../games/ballerburg { } ;
 
-  blockattack = callPackage ../games/blockattack { } ;
-
   colobot = callPackage ../games/colobot { };
 
   corsix-th = callPackage ../games/corsix-th { };
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-17 06:31:22 +0000