diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-04 12:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 12:00:55 +0000 |
| commit | 2c3155e94dcc07da0ae6687900b61763d527681d (patch) | |
| tree | f2580dab27781d27b7064ed27dc9d27a5eccce2a /pkgs/servers | |
| parent | 5aa2829060a7d98b818724e17c10bf3d74a5f212 (diff) | |
| parent | b4c0c733b32c8b1bbe3ae7f12544947f82986a87 (diff) | |
| download | nixpkgs-2c3155e94dcc07da0ae6687900b61763d527681d.tar nixpkgs-2c3155e94dcc07da0ae6687900b61763d527681d.tar.gz nixpkgs-2c3155e94dcc07da0ae6687900b61763d527681d.tar.bz2 nixpkgs-2c3155e94dcc07da0ae6687900b61763d527681d.tar.lz nixpkgs-2c3155e94dcc07da0ae6687900b61763d527681d.tar.xz nixpkgs-2c3155e94dcc07da0ae6687900b61763d527681d.tar.zst nixpkgs-2c3155e94dcc07da0ae6687900b61763d527681d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/isso/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/nosql/apache-jena/binary.nix | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 00432ab5fc6..735db1f0b43 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -23,6 +23,12 @@ buildPythonApplication rec { "doc" ]; + postPatch = '' + # Remove when https://github.com/posativ/isso/pull/973 is available. + substituteInPlace isso/tests/test_comments.py \ + --replace "self.client.delete_cookie('localhost.local', '1')" "self.client.delete_cookie(key='1', domain='localhost')" + ''; + propagatedBuildInputs = [ itsdangerous jinja2 diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 2277c997b7a..2b7e3c04735 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-kUsEdEKwYjyM5G8YKTt90fWzX21hiulRj3W5jK45Keg="; + hash = "sha256-G2kCh5F2WfrSOCr+fEO02mlOSVfV2Oy3uZGNEarLR+M="; }; nativeBuildInputs = [ makeWrapper |