Update dependencies
This commit is contained in:
parent
bf211dfd63
commit
a01adad339
2 changed files with 12 additions and 60 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -45,11 +45,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695519545,
|
||||
"narHash": "sha256-LV98zG/AfhPnE1Dat93cE6jcYBfPhW4g/ZqKpUVIomE=",
|
||||
"lastModified": 1695760843,
|
||||
"narHash": "sha256-+Q1XeDOH4GC4C8KE6EU3VcFH/f7JzlQzw9/1fRLa04E=",
|
||||
"owner": "accentor",
|
||||
"repo": "api",
|
||||
"rev": "854b6b8c16103e4d2526bdd37b85c2e906f8f017",
|
||||
"rev": "13719e2b695f51d0e201fbe5153105b3bc651241",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -71,11 +71,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695519797,
|
||||
"narHash": "sha256-E4L7wKGtVq/MhWAFIxK2U+yyG4He737HRFJCxGqLVds=",
|
||||
"lastModified": 1695761031,
|
||||
"narHash": "sha256-/peT+tsAEfAsFiPux2GX7WKMaplOZqbMp8jVFY5Ic2I=",
|
||||
"owner": "accentor",
|
||||
"repo": "web",
|
||||
"rev": "3e4b069250d46666f7ec604633531628f592d89e",
|
||||
"rev": "cabb24ed8b27f4c4255e8aca50f3895df7645d33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -431,11 +431,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1695360818,
|
||||
"narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
|
||||
"lastModified": 1695644571,
|
||||
"narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
|
||||
"rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -655,11 +655,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695519354,
|
||||
"narHash": "sha256-LyuqVvUdkuAmnwI0vnkWOgFSVt5GnXpvWOadVSvsRro=",
|
||||
"lastModified": 1695760609,
|
||||
"narHash": "sha256-Kbk66oG+LiuCeCjtaRG3lAT8weUo48edllRLgxctVKg=",
|
||||
"owner": "chvp",
|
||||
"repo": "tetris",
|
||||
"rev": "59d2908492d274007dd9acdb107a39af53080088",
|
||||
"rev": "aefa2bc7fbfe5ea83d76454a6b3b5a2dc433607a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix
|
||||
index de3ac08ec99da5..3e7dbc8e0108cc 100644
|
||||
--- a/pkgs/development/misc/resholve/oildev.nix
|
||||
+++ b/pkgs/development/misc/resholve/oildev.nix
|
||||
@@ -9,8 +9,7 @@
|
||||
, # py-yajl deps
|
||||
git
|
||||
, # oil deps
|
||||
- cmark
|
||||
-, file
|
||||
+ file
|
||||
, glibcLocales
|
||||
, six
|
||||
, typing
|
||||
@@ -80,8 +79,8 @@ rec {
|
||||
patchSrc = fetchFromGitHub {
|
||||
owner = "abathur";
|
||||
repo = "nix-py-dev-oil";
|
||||
- rev = "v0.14.0.0";
|
||||
- hash = "sha256-U6uR8G6yB2xwuDE/fznco23mVFSVdCxPUNdCRYz4Mj8=";
|
||||
+ rev = "v0.14.0.1";
|
||||
+ hash = "sha256-47+986+SohdtoNzTYAgF2vPPWgakyg0VCmR+MgxMzTk=";
|
||||
};
|
||||
patches = [
|
||||
"${patchSrc}/0001-add_setup_py.patch"
|
||||
@@ -93,6 +92,7 @@ rec {
|
||||
"${patchSrc}/0010-disable-line-input.patch"
|
||||
"${patchSrc}/0011-disable-fanos.patch"
|
||||
"${patchSrc}/0012-disable-doc-cmark.patch"
|
||||
+ "${patchSrc}/0013-fix-pyverify.patch"
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
@@ -118,14 +118,6 @@ rec {
|
||||
substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False'
|
||||
'';
|
||||
|
||||
- /*
|
||||
- We did convince oil to upstream an env for specifying
|
||||
- this to support a shell.nix. Would need a patch if they
|
||||
- later drop this support. See:
|
||||
- https://github.com/oilshell/oil/blob/46900310c7e4a07a6223eb6c08e4f26460aad285/doctools/cmark.py#L30-L34
|
||||
- */
|
||||
- _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
-
|
||||
# See earlier note on glibcLocales TODO: verify needed?
|
||||
LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue